1 |
caleb 08/05/22 12:26:06 |
2 |
|
3 |
Modified: ChangeLog ejabberd-2.0.1.ebuild |
4 |
Log: |
5 |
add some more fixes from bug 207586 |
6 |
(Portage version: 2.1.5_rc10) |
7 |
|
8 |
Revision Changes Path |
9 |
1.37 net-im/ejabberd/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.37&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.37&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ChangeLog?r1=1.36&r2=1.37 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v |
18 |
retrieving revision 1.36 |
19 |
retrieving revision 1.37 |
20 |
diff -u -r1.36 -r1.37 |
21 |
--- ChangeLog 22 May 2008 11:43:10 -0000 1.36 |
22 |
+++ ChangeLog 22 May 2008 12:26:06 -0000 1.37 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for net-im/ejabberd |
25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.36 2008/05/22 11:43:10 caleb Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.37 2008/05/22 12:26:06 caleb Exp $ |
28 |
+ |
29 |
+ 22 May 2008; Caleb Tennis <caleb@g.o> files/ejabberd-2.0.1.initd, |
30 |
+ +files/ejabberd-wrapper-2.0.1.template, |
31 |
+ +files/ejabberdctl-wrapper-2.0.1.template, ejabberd-2.0.1.ebuild: |
32 |
+ add some fixes from 207586 |
33 |
|
34 |
*ejabberd-2.0.1 (22 May 2008) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.2 net-im/ejabberd/ejabberd-2.0.1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-2.0.1.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-2.0.1.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/ejabberd/ejabberd-2.0.1.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: ejabberd-2.0.1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.1.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- ejabberd-2.0.1.ebuild 22 May 2008 11:43:10 -0000 1.1 |
52 |
+++ ejabberd-2.0.1.ebuild 22 May 2008 12:26:06 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2008 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.1.ebuild,v 1.1 2008/05/22 11:43:10 caleb Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.1.ebuild,v 1.2 2008/05/22 12:26:06 caleb Exp $ |
58 |
|
59 |
inherit eutils multilib |
60 |
|
61 |
@@ -37,11 +37,6 @@ |
62 |
|
63 |
# Bug #171427 |
64 |
epatch "${FILESDIR}/2.0.0-missing-declaration.patch" |
65 |
- # Bug #215853 |
66 |
- #epatch "${FILESDIR}/${MY_PV}-erlang12-s2s-in.patch" |
67 |
- # patch for mod_proxy65 using erlang12 |
68 |
- # http://support.process-one.net/browse/EJAB-542 |
69 |
- #epatch "${FILESDIR}/${MY_PV}-ejab-542-mod_proxy65.patch" |
70 |
|
71 |
# get rid of the prefix |
72 |
sed -i -e "s/\\@prefix\\@//" "${S}/Makefile.in" \ |
73 |
@@ -79,7 +74,7 @@ |
74 |
install || die "install failed" |
75 |
|
76 |
# remove the default ejabberdctl as we use our own |
77 |
- rm "${D}/usr/sbin/ejabberdctl" |
78 |
+ rm "${D}/sbin/ejabberdctl" |
79 |
|
80 |
insinto ${JABBER_ETC} |
81 |
|
82 |
@@ -97,14 +92,14 @@ |
83 |
dohtml *.{html,png} |
84 |
|
85 |
# set up /usr/sbin/ejabberd wrapper |
86 |
- cat "${FILESDIR}/ejabberd-wrapper-2.0.0.template" \ |
87 |
+ cat "${FILESDIR}/ejabberd-wrapper-${MY_PV}.template" \ |
88 |
| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \ |
89 |
> "${T}/ejabberd" |
90 |
exeinto /usr/sbin |
91 |
doexe "${T}/ejabberd" |
92 |
|
93 |
# set up /usr/sbin/ejabberdctl wrapper |
94 |
- cat "${FILESDIR}/ejabberdctl-wrapper-2.0.0.template" \ |
95 |
+ cat "${FILESDIR}/ejabberdctl-wrapper-${MY_PV}.template" \ |
96 |
| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \ |
97 |
> "${T}/ejabberdctl" |
98 |
doexe "${T}/ejabberdctl" |
99 |
|
100 |
|
101 |
|
102 |
-- |
103 |
gentoo-commits@l.g.o mailing list |