1 |
gentoofan23 08/06/23 13:15:40 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: jabberd2-2.2.0.ebuild |
5 |
Removed: jabberd2-2.1.23.ebuild |
6 |
Log: |
7 |
Version bump, bug #225751 |
8 |
(Portage version: 2.1.4.4) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 net-im/jabberd2/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd2/metadata.xml?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd2/metadata.xml?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd2/metadata.xml?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-im/jabberd2/metadata.xml,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- metadata.xml 8 Oct 2007 12:59:52 -0000 1.1 |
24 |
+++ metadata.xml 23 Jun 2008 13:15:40 -0000 1.2 |
25 |
@@ -6,6 +6,10 @@ |
26 |
<name>Krzysiek Pawlik</name> |
27 |
</maintainer> |
28 |
<maintainer> |
29 |
+ <email>gentoofan23@g.o</email> |
30 |
+ <name>Thomas Anderson</name> |
31 |
+ </maintainer> |
32 |
+ <maintainer> |
33 |
<email>marko.durkovic@×××××.com</email> |
34 |
<name>Marko Durkovic</name> |
35 |
<description> |
36 |
|
37 |
|
38 |
|
39 |
1.14 net-im/jabberd2/ChangeLog |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd2/ChangeLog?rev=1.14&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd2/ChangeLog?rev=1.14&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd2/ChangeLog?r1=1.13&r2=1.14 |
44 |
|
45 |
Index: ChangeLog |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v |
48 |
retrieving revision 1.13 |
49 |
retrieving revision 1.14 |
50 |
diff -u -r1.13 -r1.14 |
51 |
--- ChangeLog 21 May 2008 18:55:11 -0000 1.13 |
52 |
+++ ChangeLog 23 Jun 2008 13:15:40 -0000 1.14 |
53 |
@@ -1,6 +1,14 @@ |
54 |
# ChangeLog for net-im/jabberd2 |
55 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.13 2008/05/21 18:55:11 dev-zero Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.14 2008/06/23 13:15:40 gentoofan23 Exp $ |
58 |
+ |
59 |
+*jabberd2-2.2.0 (23 Jun 2008) |
60 |
+ |
61 |
+ 23 Jun 2008; Thomas Anderson <gentoofan23@g.o> |
62 |
+ -files/jabberd2-2.1.23.init, -files/jabberd2-2.1.23.pamd, |
63 |
+ +files/jabberd2-2.2.0.init, +files/jabberd2-2.2.0.pamd, metadata.xml, |
64 |
+ -jabberd2-2.1.23.ebuild, +jabberd2-2.2.0.ebuild: |
65 |
+ Version bump, bug #225751 |
66 |
|
67 |
21 May 2008; Tiziano Müller <dev-zero@g.o> jabberd2-2.1.23.ebuild: |
68 |
Changed dependency for postgresql from dev-db/postgresql to |
69 |
|
70 |
|
71 |
|
72 |
1.1 net-im/jabberd2/jabberd2-2.2.0.ebuild |
73 |
|
74 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd2/jabberd2-2.2.0.ebuild?rev=1.1&view=markup |
75 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/jabberd2/jabberd2-2.2.0.ebuild?rev=1.1&content-type=text/plain |
76 |
|
77 |
Index: jabberd2-2.2.0.ebuild |
78 |
=================================================================== |
79 |
# Copyright 1999-2008 Gentoo Foundation |
80 |
# Distributed under the terms of the GNU General Public License v2 |
81 |
# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.0.ebuild,v 1.1 2008/06/23 13:15:40 gentoofan23 Exp $ |
82 |
|
83 |
inherit db-use eutils flag-o-matic pam |
84 |
|
85 |
DESCRIPTION="Open Source Jabber Server" |
86 |
HOMEPAGE="http://jabberd2.xiaoka.com/" |
87 |
SRC_URI="http://ftp.xiaoka.com/${PN}/releases/jabberd-${PV}.tar.bz2" |
88 |
|
89 |
SLOT="0" |
90 |
LICENSE="GPL-2" |
91 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
92 |
IUSE="debug memdebug ipv6 ldap mysql pam pipe postgres sqlite" |
93 |
|
94 |
DEPEND="dev-libs/expat |
95 |
>=dev-libs/openssl-0.9.6b |
96 |
net-libs/udns |
97 |
>=net-dns/libidn-0.3 |
98 |
ldap? ( net-nds/openldap ) |
99 |
>=sys-libs/db-4.1.24 |
100 |
pam? ( virtual/pam ) |
101 |
mysql? ( virtual/mysql ) |
102 |
postgres? ( virtual/postgresql-server ) |
103 |
sqlite? ( >=dev-db/sqlite-3 ) |
104 |
>=virtual/gsasl-0.2.26" |
105 |
RDEPEND="${DEPEND} |
106 |
>=net-im/jabber-base-0.01 |
107 |
!net-im/jabberd" |
108 |
|
109 |
S="${WORKDIR}/jabberd-${PV}" |
110 |
|
111 |
src_compile() { |
112 |
|
113 |
# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3 |
114 |
replace-flags -O[3s] -O2 |
115 |
|
116 |
local myconf="--with-sasl=gsasl" |
117 |
|
118 |
if use debug; then |
119 |
myconf="${myconf} --enable-debug" |
120 |
# --enable-pool-debug is currently broken |
121 |
use memdebug && myconf="${myconf} --enable-nad-debug" |
122 |
else |
123 |
if use memdebug; then |
124 |
ewarn |
125 |
ewarn '"memdebug" requires "debug" enabled.' |
126 |
ewarn |
127 |
fi |
128 |
fi |
129 |
|
130 |
econf \ |
131 |
--sysconfdir=/etc/jabber \ |
132 |
--enable-db \ |
133 |
--with-extra-include-path=$(db_includedir) \ |
134 |
${myconf} \ |
135 |
$(use_enable ipv6) \ |
136 |
$(use_enable ldap) \ |
137 |
$(use_enable mysql) \ |
138 |
$(use_enable pam) \ |
139 |
$(use_enable pipe) \ |
140 |
$(use_enable postgres pgsql) \ |
141 |
$(use_enable sqlite) |
142 |
emake || die "make failed" |
143 |
|
144 |
} |
145 |
|
146 |
src_install() { |
147 |
emake DESTDIR="${D}" install || die "make install failed" |
148 |
|
149 |
fowners jabber:jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s} |
150 |
fperms 750 /usr/bin/{jabberd,router,resolver,sm,c2s,s2s} |
151 |
|
152 |
newinitd "${FILESDIR}/${P}.init" jabberd || die "newinitd failed" |
153 |
newpamd "${FILESDIR}/${P}.pamd" jabberd || die "newpamd failed" |
154 |
|
155 |
dodoc AUTHORS README UPGRADE |
156 |
docinto tools |
157 |
dodoc tools/db-setup{.mysql,.pgsql,.sqlite} |
158 |
dodoc tools/{migrate.pl,pipe-auth.pl} |
159 |
|
160 |
cd "${D}/etc/jabber/" |
161 |
sed -i \ |
162 |
-e 's,/var/lib/jabberd/pid/,/var/run/jabber/,g' \ |
163 |
-e 's,/var/lib/jabberd/log/,/var/log/jabber/,g' \ |
164 |
-e 's,/var/lib/jabberd/db,/var/spool/jabber/,g' \ |
165 |
*.xml *.xml.dist || die "sed failed" |
166 |
sed -i \ |
167 |
-e 's,<module>mysql</module>,<module>db</module>,' \ |
168 |
c2s.xml* || die "sed failed" |
169 |
sed -i \ |
170 |
-e 's,<driver>mysql</driver>,<driver>db</driver>,' \ |
171 |
sm.xml* || die "sed failed" |
172 |
|
173 |
} |
174 |
|
175 |
pkg_postinst() { |
176 |
|
177 |
if use pam; then |
178 |
echo |
179 |
ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' |
180 |
ewarn 'be in the form of "contactname@jabberdomain". This behavior' |
181 |
ewarn 'is likely to change in future versions of jabberd-2. It may' |
182 |
ewarn 'be advisable to avoid PAM authentication for the time being.' |
183 |
echo |
184 |
ebeep |
185 |
fi |
186 |
|
187 |
} |
188 |
|
189 |
|
190 |
|
191 |
-- |
192 |
gentoo-commits@l.g.o mailing list |