1 |
commit: a242ed3811b5d852766dd960814e49262e12cf69 |
2 |
Author: Austin English <wizardedit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 2 18:45:23 2016 +0000 |
4 |
Commit: Austin English <wizardedit <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 2 22:21:47 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a242ed38 |
7 |
|
8 |
net-im/jabberd2: use #!/sbin/openrc-run instead of #!/sbin/runscript |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/573846 |
11 |
|
12 |
Package-Manager: portage-2.2.26 |
13 |
|
14 |
net-im/jabberd2/files/jabberd2-2.3.1.init | 4 +- |
15 |
net-im/jabberd2/files/jabberd2-2.3.2.init | 4 +- |
16 |
net-im/jabberd2/jabberd2-2.3.1-r2.ebuild | 156 ++++++++++++++++++++++++++ |
17 |
net-im/jabberd2/jabberd2-2.3.2-r2.ebuild | 157 ++++++++++++++++++++++++++ |
18 |
net-im/jabberd2/jabberd2-2.3.3-r2.ebuild | 160 ++++++++++++++++++++++++++ |
19 |
net-im/jabberd2/jabberd2-2.3.4-r1.ebuild | 180 ++++++++++++++++++++++++++++++ |
20 |
6 files changed, 657 insertions(+), 4 deletions(-) |
21 |
|
22 |
diff --git a/net-im/jabberd2/files/jabberd2-2.3.1.init b/net-im/jabberd2/files/jabberd2-2.3.1.init |
23 |
index 696a944..4f885c7 100644 |
24 |
--- a/net-im/jabberd2/files/jabberd2-2.3.1.init |
25 |
+++ b/net-im/jabberd2/files/jabberd2-2.3.1.init |
26 |
@@ -1,5 +1,5 @@ |
27 |
-#!/sbin/runscript |
28 |
-# Copyright 1999-2013 Gentoo Foundation |
29 |
+#!/sbin/openrc-run |
30 |
+# Copyright 1999-2016 Gentoo Foundation |
31 |
# Distributed under the terms of the GNU General Public License v2 |
32 |
# $Id$ |
33 |
|
34 |
|
35 |
diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.init b/net-im/jabberd2/files/jabberd2-2.3.2.init |
36 |
index 108923f..cf650fd 100644 |
37 |
--- a/net-im/jabberd2/files/jabberd2-2.3.2.init |
38 |
+++ b/net-im/jabberd2/files/jabberd2-2.3.2.init |
39 |
@@ -1,5 +1,5 @@ |
40 |
-#!/sbin/runscript |
41 |
-# Copyright 1999-2014 Gentoo Foundation |
42 |
+#!/sbin/openrc-run |
43 |
+# Copyright 1999-2016 Gentoo Foundation |
44 |
# Distributed under the terms of the GNU General Public License v2 |
45 |
# $Id$ |
46 |
|
47 |
|
48 |
diff --git a/net-im/jabberd2/jabberd2-2.3.1-r2.ebuild b/net-im/jabberd2/jabberd2-2.3.1-r2.ebuild |
49 |
new file mode 100644 |
50 |
index 0000000..17cab15 |
51 |
--- /dev/null |
52 |
+++ b/net-im/jabberd2/jabberd2-2.3.1-r2.ebuild |
53 |
@@ -0,0 +1,156 @@ |
54 |
+# Copyright 1999-2016 Gentoo Foundation |
55 |
+# Distributed under the terms of the GNU General Public License v2 |
56 |
+# $Id$ |
57 |
+ |
58 |
+EAPI=5 |
59 |
+ |
60 |
+inherit db-use eutils flag-o-matic pam |
61 |
+ |
62 |
+DESCRIPTION="Open Source Jabber Server" |
63 |
+HOMEPAGE="http://jabberd2.org" |
64 |
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz" |
65 |
+ |
66 |
+LICENSE="GPL-2" |
67 |
+SLOT="0" |
68 |
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd" |
69 |
+IUSE="berkdb debug ldap memdebug mysql pam postgres sqlite ssl test zlib" |
70 |
+REQUIRED_USE="memdebug? ( debug )" |
71 |
+ |
72 |
+# broken |
73 |
+RESTRICT="test" |
74 |
+ |
75 |
+DEPEND="dev-libs/expat |
76 |
+ net-libs/udns |
77 |
+ net-dns/libidn |
78 |
+ virtual/gsasl |
79 |
+ berkdb? ( >=sys-libs/db-4.1.25 ) |
80 |
+ ldap? ( net-nds/openldap ) |
81 |
+ mysql? ( virtual/mysql ) |
82 |
+ pam? ( virtual/pam ) |
83 |
+ postgres? ( dev-db/postgresql ) |
84 |
+ ssl? ( >=dev-libs/openssl-1.0.1:0 ) |
85 |
+ sqlite? ( dev-db/sqlite:3 ) |
86 |
+ zlib? ( sys-libs/zlib )" |
87 |
+RDEPEND="${DEPEND} |
88 |
+ >=net-im/jabber-base-0.01" |
89 |
+DEPEND="${DEPEND} |
90 |
+ app-arch/xz-utils |
91 |
+ virtual/pkgconfig |
92 |
+ test? ( dev-libs/check )" |
93 |
+ |
94 |
+DOCS=( AUTHORS README ) |
95 |
+ |
96 |
+S=${WORKDIR}/jabberd-${PV} |
97 |
+ |
98 |
+src_prepare() { |
99 |
+ # Fix some default directory locations |
100 |
+ sed -i \ |
101 |
+ -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ |
102 |
+ -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ |
103 |
+ -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ |
104 |
+ -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ |
105 |
+ -e 's,@localstatedir@,/var/spool,g' \ |
106 |
+ -e 's,@package@,jabber,g' \ |
107 |
+ etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!" |
108 |
+ |
109 |
+ # If the package wasn't merged with sqlite then default to use berkdb |
110 |
+ use sqlite || |
111 |
+ sed -i \ |
112 |
+ -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \ |
113 |
+ etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!" |
114 |
+ |
115 |
+ # avoid file collision with x11-misc/screen-message wrt #453994 |
116 |
+ sed -i \ |
117 |
+ -e 's/@jabberd_router_bin@/jabberd2-router/' \ |
118 |
+ -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \ |
119 |
+ -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \ |
120 |
+ -e 's/@jabberd_sm_bin@/jabberd2-sm/' \ |
121 |
+ etc/jabberd*.in || die "fixing file collisions failed!" |
122 |
+ |
123 |
+ # rename pid files wrt #241472 |
124 |
+ sed -i \ |
125 |
+ -e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \ |
126 |
+ -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \ |
127 |
+ -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \ |
128 |
+ -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \ |
129 |
+ etc/*.xml.dist.in || die "renaming pid files failed!" |
130 |
+} |
131 |
+ |
132 |
+src_configure() { |
133 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3 |
134 |
+ # https://github.com/jabberd2/jabberd2/issues/34 |
135 |
+ replace-flags -O[3s] -O2 |
136 |
+ |
137 |
+ # --enable-pool-debug is currently broken |
138 |
+ econf \ |
139 |
+ --sysconfdir=/etc/jabber \ |
140 |
+ $(usex debug "--enable-debug" "") \ |
141 |
+ $(usex memdebug "--enable-nad-debug" "") \ |
142 |
+ $(use_enable ssl) \ |
143 |
+ $(use_enable mysql) \ |
144 |
+ $(use_enable postgres pgsql) \ |
145 |
+ $(use_enable sqlite) \ |
146 |
+ $(use_enable berkdb db) \ |
147 |
+ $(use_enable ldap) \ |
148 |
+ $(use_enable pam) \ |
149 |
+ --enable-pipe \ |
150 |
+ --enable-anon \ |
151 |
+ --enable-fs \ |
152 |
+ $(use_enable test tests) \ |
153 |
+ $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \ |
154 |
+ $(use_with zlib) |
155 |
+} |
156 |
+ |
157 |
+src_install() { |
158 |
+ local i |
159 |
+ |
160 |
+ default |
161 |
+ prune_libtool_files --modules |
162 |
+ |
163 |
+ keepdir /var/spool/jabber/{fs,db} |
164 |
+ fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ |
165 |
+ /var/spool/jabber/{fs,db} |
166 |
+ fperms 770 /var/spool/jabber/{fs,db} |
167 |
+ fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} |
168 |
+ |
169 |
+ # avoid file collision with x11-misc/screen-message wrt #453994 |
170 |
+ for i in router sm c2s s2s ; do |
171 |
+ einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" |
172 |
+ mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die |
173 |
+ done |
174 |
+ |
175 |
+ newinitd "${FILESDIR}/${P}.init" jabberd |
176 |
+ newpamd "${FILESDIR}/${P}.pamd" jabberd |
177 |
+ insinto /etc/logrotate.d |
178 |
+ newins "${FILESDIR}/${P}.logrotate" jabberd |
179 |
+ |
180 |
+ docompress -x /usr/share/doc/${PF}/tools |
181 |
+ docinto tools |
182 |
+ dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \ |
183 |
+ tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} |
184 |
+ |
185 |
+ # remove useless upstart files wrt #498900 |
186 |
+ rm -rf "${ED%/}"/usr/etc |
187 |
+} |
188 |
+ |
189 |
+pkg_postinst() { |
190 |
+ if use pam; then |
191 |
+ echo |
192 |
+ ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' |
193 |
+ ewarn 'be in the form of "contactname@jabberdomain". This behavior' |
194 |
+ ewarn 'is likely to change in future versions of jabberd-2. It may' |
195 |
+ ewarn 'be advisable to avoid PAM authentication for the time being.' |
196 |
+ echo |
197 |
+ fi |
198 |
+ |
199 |
+ if use sqlite || use mysql || use postgres; then |
200 |
+ echo |
201 |
+ einfo "You will need to setup or update your database using the" |
202 |
+ einfo "scripts in /usr/share/doc/${PF}/tools/" |
203 |
+ echo |
204 |
+ fi |
205 |
+ |
206 |
+ ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have' |
207 |
+ ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because' |
208 |
+ ewarn 'the binaries have been renamed to avoid file collisions!' |
209 |
+} |
210 |
|
211 |
diff --git a/net-im/jabberd2/jabberd2-2.3.2-r2.ebuild b/net-im/jabberd2/jabberd2-2.3.2-r2.ebuild |
212 |
new file mode 100644 |
213 |
index 0000000..bc2e94b |
214 |
--- /dev/null |
215 |
+++ b/net-im/jabberd2/jabberd2-2.3.2-r2.ebuild |
216 |
@@ -0,0 +1,157 @@ |
217 |
+# Copyright 1999-2016 Gentoo Foundation |
218 |
+# Distributed under the terms of the GNU General Public License v2 |
219 |
+# $Id$ |
220 |
+ |
221 |
+EAPI=5 |
222 |
+ |
223 |
+inherit db-use eutils flag-o-matic pam |
224 |
+ |
225 |
+DESCRIPTION="Open Source Jabber Server" |
226 |
+HOMEPAGE="http://jabberd2.org" |
227 |
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz" |
228 |
+ |
229 |
+LICENSE="GPL-2" |
230 |
+SLOT="0" |
231 |
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd" |
232 |
+IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test zlib" |
233 |
+REQUIRED_USE="memdebug? ( debug )" |
234 |
+ |
235 |
+# broken |
236 |
+RESTRICT="test" |
237 |
+ |
238 |
+DEPEND="dev-libs/expat |
239 |
+ net-libs/udns |
240 |
+ net-dns/libidn |
241 |
+ virtual/gsasl |
242 |
+ berkdb? ( >=sys-libs/db-4.1.25 ) |
243 |
+ ldap? ( net-nds/openldap ) |
244 |
+ mysql? ( virtual/mysql ) |
245 |
+ pam? ( virtual/pam ) |
246 |
+ postgres? ( dev-db/postgresql ) |
247 |
+ ssl? ( >=dev-libs/openssl-1.0.1:0 ) |
248 |
+ sqlite? ( dev-db/sqlite:3 ) |
249 |
+ zlib? ( sys-libs/zlib )" |
250 |
+RDEPEND="${DEPEND} |
251 |
+ >=net-im/jabber-base-0.01" |
252 |
+DEPEND="${DEPEND} |
253 |
+ app-arch/xz-utils |
254 |
+ virtual/pkgconfig |
255 |
+ test? ( dev-libs/check )" |
256 |
+ |
257 |
+DOCS=( AUTHORS README ) |
258 |
+ |
259 |
+S=${WORKDIR}/jabberd-${PV} |
260 |
+ |
261 |
+src_prepare() { |
262 |
+ # Fix some default directory locations |
263 |
+ sed -i \ |
264 |
+ -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ |
265 |
+ -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ |
266 |
+ -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ |
267 |
+ -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ |
268 |
+ -e 's,@localstatedir@,/var/spool,g' \ |
269 |
+ -e 's,@package@,jabber,g' \ |
270 |
+ etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!" |
271 |
+ |
272 |
+ # If the package wasn't merged with sqlite then default to use berkdb |
273 |
+ use sqlite || |
274 |
+ sed -i \ |
275 |
+ -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \ |
276 |
+ etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!" |
277 |
+ |
278 |
+ # avoid file collision with x11-misc/screen-message wrt #453994 |
279 |
+ sed -i \ |
280 |
+ -e 's/@jabberd_router_bin@/jabberd2-router/' \ |
281 |
+ -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \ |
282 |
+ -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \ |
283 |
+ -e 's/@jabberd_sm_bin@/jabberd2-sm/' \ |
284 |
+ etc/jabberd*.in || die "fixing file collisions failed!" |
285 |
+ |
286 |
+ # rename pid files wrt #241472 |
287 |
+ sed -i \ |
288 |
+ -e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \ |
289 |
+ -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \ |
290 |
+ -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \ |
291 |
+ -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \ |
292 |
+ etc/*.xml.dist.in || die "renaming pid files failed!" |
293 |
+} |
294 |
+ |
295 |
+src_configure() { |
296 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3 |
297 |
+ # https://github.com/jabberd2/jabberd2/issues/34 |
298 |
+ replace-flags -O[3s] -O2 |
299 |
+ |
300 |
+ # --enable-pool-debug is currently broken |
301 |
+ econf \ |
302 |
+ --sysconfdir=/etc/jabber \ |
303 |
+ $(usex debug "--enable-debug" "") \ |
304 |
+ $(usex memdebug "--enable-nad-debug" "") \ |
305 |
+ $(use_enable ssl) \ |
306 |
+ $(use_enable mysql) \ |
307 |
+ $(use_enable postgres pgsql) \ |
308 |
+ $(use_enable sqlite) \ |
309 |
+ $(use_enable berkdb db) \ |
310 |
+ $(use_enable ldap) \ |
311 |
+ $(use_enable pam) \ |
312 |
+ --enable-pipe \ |
313 |
+ --enable-anon \ |
314 |
+ --enable-fs \ |
315 |
+ $(use_enable experimental) \ |
316 |
+ $(use_enable test tests) \ |
317 |
+ $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \ |
318 |
+ $(use_with zlib) |
319 |
+} |
320 |
+ |
321 |
+src_install() { |
322 |
+ local i |
323 |
+ |
324 |
+ default |
325 |
+ prune_libtool_files --modules |
326 |
+ |
327 |
+ keepdir /var/spool/jabber/{fs,db} |
328 |
+ fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ |
329 |
+ /var/spool/jabber/{fs,db} |
330 |
+ fperms 770 /var/spool/jabber/{fs,db} |
331 |
+ fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} |
332 |
+ |
333 |
+ # avoid file collision with x11-misc/screen-message wrt #453994 |
334 |
+ for i in router sm c2s s2s ; do |
335 |
+ einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" |
336 |
+ mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die |
337 |
+ done |
338 |
+ |
339 |
+ newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd |
340 |
+ newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd |
341 |
+ insinto /etc/logrotate.d |
342 |
+ newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd |
343 |
+ |
344 |
+ docompress -x /usr/share/doc/${PF}/tools |
345 |
+ docinto tools |
346 |
+ dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \ |
347 |
+ tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} |
348 |
+ |
349 |
+ # remove useless upstart files wrt #498900 |
350 |
+ rm -rf "${ED%/}"/usr/etc |
351 |
+} |
352 |
+ |
353 |
+pkg_postinst() { |
354 |
+ if use pam; then |
355 |
+ echo |
356 |
+ ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' |
357 |
+ ewarn 'be in the form of "contactname@jabberdomain". This behavior' |
358 |
+ ewarn 'is likely to change in future versions of jabberd-2. It may' |
359 |
+ ewarn 'be advisable to avoid PAM authentication for the time being.' |
360 |
+ echo |
361 |
+ fi |
362 |
+ |
363 |
+ if use sqlite || use mysql || use postgres; then |
364 |
+ echo |
365 |
+ einfo "You will need to setup or update your database using the" |
366 |
+ einfo "scripts in /usr/share/doc/${PF}/tools/" |
367 |
+ echo |
368 |
+ fi |
369 |
+ |
370 |
+ ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have' |
371 |
+ ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because' |
372 |
+ ewarn 'the binaries have been renamed to avoid file collisions!' |
373 |
+} |
374 |
|
375 |
diff --git a/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild b/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild |
376 |
new file mode 100644 |
377 |
index 0000000..1389115 |
378 |
--- /dev/null |
379 |
+++ b/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild |
380 |
@@ -0,0 +1,160 @@ |
381 |
+# Copyright 1999-2016 Gentoo Foundation |
382 |
+# Distributed under the terms of the GNU General Public License v2 |
383 |
+# $Id$ |
384 |
+ |
385 |
+EAPI=5 |
386 |
+ |
387 |
+inherit db-use eutils flag-o-matic pam |
388 |
+ |
389 |
+DESCRIPTION="Open Source Jabber Server" |
390 |
+HOMEPAGE="http://jabberd2.org" |
391 |
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz" |
392 |
+ |
393 |
+LICENSE="GPL-2" |
394 |
+SLOT="0" |
395 |
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" |
396 |
+IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test zlib" |
397 |
+REQUIRED_USE="memdebug? ( debug )" |
398 |
+ |
399 |
+# broken |
400 |
+RESTRICT="test" |
401 |
+ |
402 |
+DEPEND="dev-libs/expat |
403 |
+ net-libs/udns |
404 |
+ net-dns/libidn |
405 |
+ virtual/gsasl |
406 |
+ berkdb? ( >=sys-libs/db-4.1.25:* ) |
407 |
+ ldap? ( net-nds/openldap ) |
408 |
+ mysql? ( virtual/mysql ) |
409 |
+ pam? ( virtual/pam ) |
410 |
+ postgres? ( dev-db/postgresql:* ) |
411 |
+ ssl? ( |
412 |
+ !libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] ) |
413 |
+ libressl? ( dev-libs/libressl ) |
414 |
+ ) |
415 |
+ sqlite? ( dev-db/sqlite:3 ) |
416 |
+ zlib? ( sys-libs/zlib )" |
417 |
+RDEPEND="${DEPEND} |
418 |
+ >=net-im/jabber-base-0.01" |
419 |
+DEPEND="${DEPEND} |
420 |
+ app-arch/xz-utils |
421 |
+ virtual/pkgconfig |
422 |
+ test? ( dev-libs/check )" |
423 |
+ |
424 |
+DOCS=( AUTHORS README ) |
425 |
+ |
426 |
+S=${WORKDIR}/jabberd-${PV} |
427 |
+ |
428 |
+src_prepare() { |
429 |
+ # Fix some default directory locations |
430 |
+ sed -i \ |
431 |
+ -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ |
432 |
+ -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ |
433 |
+ -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ |
434 |
+ -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ |
435 |
+ -e 's,@localstatedir@,/var/spool,g' \ |
436 |
+ -e 's,@package@,jabber,g' \ |
437 |
+ etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!" |
438 |
+ |
439 |
+ # If the package wasn't merged with sqlite then default to use berkdb |
440 |
+ use sqlite || |
441 |
+ sed -i \ |
442 |
+ -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \ |
443 |
+ etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!" |
444 |
+ |
445 |
+ # avoid file collision with x11-misc/screen-message wrt #453994 |
446 |
+ sed -i \ |
447 |
+ -e 's/@jabberd_router_bin@/jabberd2-router/' \ |
448 |
+ -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \ |
449 |
+ -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \ |
450 |
+ -e 's/@jabberd_sm_bin@/jabberd2-sm/' \ |
451 |
+ etc/jabberd*.in || die "fixing file collisions failed!" |
452 |
+ |
453 |
+ # rename pid files wrt #241472 |
454 |
+ sed -i \ |
455 |
+ -e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \ |
456 |
+ -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \ |
457 |
+ -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \ |
458 |
+ -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \ |
459 |
+ etc/*.xml.dist.in || die "renaming pid files failed!" |
460 |
+} |
461 |
+ |
462 |
+src_configure() { |
463 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3 |
464 |
+ # https://github.com/jabberd2/jabberd2/issues/34 |
465 |
+ replace-flags -O[3s] -O2 |
466 |
+ |
467 |
+ # --enable-pool-debug is currently broken |
468 |
+ econf \ |
469 |
+ --sysconfdir=/etc/jabber \ |
470 |
+ $(usex debug "--enable-debug" "") \ |
471 |
+ $(usex memdebug "--enable-nad-debug" "") \ |
472 |
+ $(use_enable ssl) \ |
473 |
+ $(use_enable mysql) \ |
474 |
+ $(use_enable postgres pgsql) \ |
475 |
+ $(use_enable sqlite) \ |
476 |
+ $(use_enable berkdb db) \ |
477 |
+ $(use_enable ldap) \ |
478 |
+ $(use_enable pam) \ |
479 |
+ --enable-pipe \ |
480 |
+ --enable-anon \ |
481 |
+ --enable-fs \ |
482 |
+ $(use_enable experimental) \ |
483 |
+ $(use_enable test tests) \ |
484 |
+ $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \ |
485 |
+ $(use_with zlib) |
486 |
+} |
487 |
+ |
488 |
+src_install() { |
489 |
+ local i |
490 |
+ |
491 |
+ default |
492 |
+ prune_libtool_files --modules |
493 |
+ |
494 |
+ keepdir /var/spool/jabber/{fs,db} |
495 |
+ fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ |
496 |
+ /var/spool/jabber/{fs,db} |
497 |
+ fperms 770 /var/spool/jabber/{fs,db} |
498 |
+ fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} |
499 |
+ |
500 |
+ # avoid file collision with x11-misc/screen-message wrt #453994 |
501 |
+ for i in router sm c2s s2s ; do |
502 |
+ einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" |
503 |
+ mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die |
504 |
+ done |
505 |
+ |
506 |
+ newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd |
507 |
+ newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd |
508 |
+ insinto /etc/logrotate.d |
509 |
+ newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd |
510 |
+ |
511 |
+ docompress -x /usr/share/doc/${PF}/tools |
512 |
+ docinto tools |
513 |
+ dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \ |
514 |
+ tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} |
515 |
+ |
516 |
+ # remove useless upstart files wrt #498900 |
517 |
+ rm -rf "${ED%/}"/usr/etc |
518 |
+} |
519 |
+ |
520 |
+pkg_postinst() { |
521 |
+ if use pam; then |
522 |
+ echo |
523 |
+ ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' |
524 |
+ ewarn 'be in the form of "contactname@jabberdomain". This behavior' |
525 |
+ ewarn 'is likely to change in future versions of jabberd-2. It may' |
526 |
+ ewarn 'be advisable to avoid PAM authentication for the time being.' |
527 |
+ echo |
528 |
+ fi |
529 |
+ |
530 |
+ if use sqlite || use mysql || use postgres; then |
531 |
+ echo |
532 |
+ einfo "You will need to setup or update your database using the" |
533 |
+ einfo "scripts in /usr/share/doc/${PF}/tools/" |
534 |
+ echo |
535 |
+ fi |
536 |
+ |
537 |
+ ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have' |
538 |
+ ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because' |
539 |
+ ewarn 'the binaries have been renamed to avoid file collisions!' |
540 |
+} |
541 |
|
542 |
diff --git a/net-im/jabberd2/jabberd2-2.3.4-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.4-r1.ebuild |
543 |
new file mode 100644 |
544 |
index 0000000..e48dd23 |
545 |
--- /dev/null |
546 |
+++ b/net-im/jabberd2/jabberd2-2.3.4-r1.ebuild |
547 |
@@ -0,0 +1,180 @@ |
548 |
+# Copyright 1999-2016 Gentoo Foundation |
549 |
+# Distributed under the terms of the GNU General Public License v2 |
550 |
+# $Id$ |
551 |
+ |
552 |
+EAPI=5 |
553 |
+ |
554 |
+inherit autotools db-use eutils flag-o-matic pam |
555 |
+ |
556 |
+DESCRIPTION="Open Source Jabber Server" |
557 |
+HOMEPAGE="http://jabberd2.org" |
558 |
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz" |
559 |
+ |
560 |
+LICENSE="GPL-2" |
561 |
+SLOT="0" |
562 |
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" |
563 |
+IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test websocket zlib" |
564 |
+REQUIRED_USE="memdebug? ( debug )" |
565 |
+ |
566 |
+# broken |
567 |
+RESTRICT="test" |
568 |
+ |
569 |
+DEPEND="dev-libs/expat |
570 |
+ net-libs/udns |
571 |
+ net-dns/libidn |
572 |
+ virtual/gsasl |
573 |
+ berkdb? ( >=sys-libs/db-4.1.25:= ) |
574 |
+ ldap? ( net-nds/openldap ) |
575 |
+ mysql? ( |
576 |
+ virtual/libmysqlclient:= |
577 |
+ virtual/mysql:= |
578 |
+ ) |
579 |
+ pam? ( virtual/pam ) |
580 |
+ postgres? ( dev-db/postgresql:= ) |
581 |
+ ssl? ( |
582 |
+ !libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] ) |
583 |
+ libressl? ( dev-libs/libressl:= ) |
584 |
+ ) |
585 |
+ sqlite? ( dev-db/sqlite:3 ) |
586 |
+ websocket? ( net-libs/http-parser:= ) |
587 |
+ zlib? ( sys-libs/zlib )" |
588 |
+RDEPEND="${DEPEND} |
589 |
+ >=net-im/jabber-base-0.01" |
590 |
+DEPEND="${DEPEND} |
591 |
+ app-arch/xz-utils |
592 |
+ virtual/pkgconfig |
593 |
+ test? ( dev-libs/check )" |
594 |
+ |
595 |
+DOCS=( AUTHORS README ) |
596 |
+ |
597 |
+S=${WORKDIR}/jabberd-${PV} |
598 |
+ |
599 |
+pkg_pretend() { |
600 |
+ if is-flagq '-O[3s]' ; then |
601 |
+ ewarn "O3/Os compiler flags have been known to cause problems" |
602 |
+ ewarn "with old gcc version. Be aware that this could break" |
603 |
+ ewarn "port binding. Make sure to test this." |
604 |
+ ewarn "See https://github.com/jabberd2/jabberd2/issues/34" |
605 |
+ fi |
606 |
+} |
607 |
+ |
608 |
+src_prepare() { |
609 |
+ # Fix some default directory locations |
610 |
+ sed -i \ |
611 |
+ -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ |
612 |
+ -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ |
613 |
+ -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ |
614 |
+ -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ |
615 |
+ -e 's,@localstatedir@,/var/spool,g' \ |
616 |
+ -e 's,@package@,jabber,g' \ |
617 |
+ etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!" |
618 |
+ |
619 |
+ # If the package wasn't merged with sqlite then default to use berkdb |
620 |
+ use sqlite || |
621 |
+ sed -i \ |
622 |
+ -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \ |
623 |
+ etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!" |
624 |
+ |
625 |
+ # avoid file collision with x11-misc/screen-message wrt #453994 |
626 |
+ sed -i \ |
627 |
+ -e 's/@jabberd_router_bin@/jabberd2-router/' \ |
628 |
+ -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \ |
629 |
+ -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \ |
630 |
+ -e 's/@jabberd_sm_bin@/jabberd2-sm/' \ |
631 |
+ etc/jabberd*.in || die "fixing file collisions failed!" |
632 |
+ |
633 |
+ # rename pid files wrt #241472 |
634 |
+ sed -i \ |
635 |
+ -e '/pidfile/s/${id}\.pid/jabberd2-c2s\.pid/' \ |
636 |
+ etc/c2s.xml.dist.in || die |
637 |
+ sed -i \ |
638 |
+ -e '/pidfile/s/${id}\.pid/jabberd2-router\.pid/' \ |
639 |
+ etc/router.xml.dist.in || die |
640 |
+ sed -i \ |
641 |
+ -e '/pidfile/s/${id}\.pid/jabberd2-s2s\.pid/' \ |
642 |
+ etc/s2s.xml.dist.in || die |
643 |
+ sed -i \ |
644 |
+ -e '/pidfile/s/${id}\.pid/jabberd2-sm\.pid/' \ |
645 |
+ etc/sm.xml.dist.in || die |
646 |
+ |
647 |
+ epatch "${FILESDIR}"/${P}-optimization.patch \ |
648 |
+ "${FILESDIR}"/${P}-websocket.patch |
649 |
+ eautoreconf |
650 |
+} |
651 |
+ |
652 |
+src_configure() { |
653 |
+ # --enable-pool-debug is currently broken |
654 |
+ econf \ |
655 |
+ --sysconfdir=/etc/jabber \ |
656 |
+ $(usex debug "--enable-debug" "") \ |
657 |
+ $(usex memdebug "--enable-nad-debug" "") \ |
658 |
+ $(use_enable ssl) \ |
659 |
+ $(use_enable mysql) \ |
660 |
+ $(use_enable postgres pgsql) \ |
661 |
+ $(use_enable sqlite) \ |
662 |
+ $(use_enable berkdb db) \ |
663 |
+ $(use_enable ldap) \ |
664 |
+ $(use_enable pam) \ |
665 |
+ --enable-pipe \ |
666 |
+ --enable-anon \ |
667 |
+ --enable-fs \ |
668 |
+ $(use_enable websocket) \ |
669 |
+ $(use_enable experimental) \ |
670 |
+ $(use_enable test tests) \ |
671 |
+ $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \ |
672 |
+ $(use_with zlib) |
673 |
+} |
674 |
+ |
675 |
+src_install() { |
676 |
+ local i |
677 |
+ |
678 |
+ default |
679 |
+ prune_libtool_files --modules |
680 |
+ |
681 |
+ keepdir /var/spool/jabber/{fs,db} |
682 |
+ fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ |
683 |
+ /var/spool/jabber/{fs,db} |
684 |
+ fperms 770 /var/spool/jabber/{fs,db} |
685 |
+ fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} |
686 |
+ |
687 |
+ # avoid file collision with x11-misc/screen-message wrt #453994 |
688 |
+ for i in router sm c2s s2s ; do |
689 |
+ einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" |
690 |
+ mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die |
691 |
+ done |
692 |
+ |
693 |
+ newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd |
694 |
+ newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd |
695 |
+ insinto /etc/logrotate.d |
696 |
+ newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd |
697 |
+ |
698 |
+ docompress -x /usr/share/doc/${PF}/tools |
699 |
+ docinto tools |
700 |
+ dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \ |
701 |
+ tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} |
702 |
+ |
703 |
+ # remove useless upstart files wrt #498900 |
704 |
+ rm -rf "${ED%/}"/usr/etc |
705 |
+} |
706 |
+ |
707 |
+pkg_postinst() { |
708 |
+ if use pam; then |
709 |
+ echo |
710 |
+ ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' |
711 |
+ ewarn 'be in the form of "contactname@jabberdomain". This behavior' |
712 |
+ ewarn 'is likely to change in future versions of jabberd-2. It may' |
713 |
+ ewarn 'be advisable to avoid PAM authentication for the time being.' |
714 |
+ echo |
715 |
+ fi |
716 |
+ |
717 |
+ if use sqlite || use mysql || use postgres; then |
718 |
+ echo |
719 |
+ einfo "You will need to setup or update your database using the" |
720 |
+ einfo "scripts in /usr/share/doc/${PF}/tools/" |
721 |
+ echo |
722 |
+ fi |
723 |
+ |
724 |
+ ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have' |
725 |
+ ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because' |
726 |
+ ewarn 'the binaries have been renamed to avoid file collisions!' |
727 |
+} |