1 |
commit: 647746d92449ee90a7bf7f78c089c7e8354397c8 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 22 10:08:21 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 22 10:08:36 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=647746d9 |
7 |
|
8 |
net-im/jabberd2: Bump to version 2.6.1 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
11 |
|
12 |
net-im/jabberd2/Manifest | 1 + |
13 |
net-im/jabberd2/jabberd2-2.6.1.ebuild | 188 ++++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 189 insertions(+) |
15 |
|
16 |
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest |
17 |
index 030fdf124dd..c1aa4a4aa25 100644 |
18 |
--- a/net-im/jabberd2/Manifest |
19 |
+++ b/net-im/jabberd2/Manifest |
20 |
@@ -1,3 +1,4 @@ |
21 |
DIST jabberd-2.3.3.tar.xz 1457340 SHA256 c6c2f34d0811e90c5c791143018bb5b07ecbe2ea5d8cc10140235d25815cb030 SHA512 c3c8d6829c3bc61555280d90edc1bef0228e4cec2684ba283373075883ef64bfa5e9118dad96d7a1193bb2afb6b2e7c78e24267e6feb6e7b191138bf8c79a7da WHIRLPOOL 0c590d79905ff95d2e18362065e0ba4e2341fdc95a61d3e157993d7d16976480b81f2f4b0479516538b1c5c0c9b496b446383da89c2e17539f8f9cb59db62463 |
22 |
DIST jabberd-2.3.4.tar.xz 1482736 SHA256 9a17fae72460dd4454814edb48a7a1af7071cf331dabc2b0b6029661a36bb671 SHA512 593c1a80de52447fa18e448627bdbf85605e8a406129808cd2081576c26d65df3315c5fc91b37d5e832e1a89b4083d873b2db1e65d6ad76fa5b9b4f125786b7f WHIRLPOOL 67a0e96a872a08975d981e1697fab5cf154b4cbea4c698d41d250c1314bc7303a3c15e871fc8b3c4f3769acd91773734ef61b880900132e435d17f9bde587b08 |
23 |
DIST jabberd-2.5.0.tar.xz 1507916 SHA256 9ec4a8be6c01fe68cccee347e08aab34399205ecfe3557985debc368b86aeb8a SHA512 e1298f42a199bb31cea324f239368327a259eaaa3e4624eac5b6aca983f32467c47248c57e4621fd7f7eb64a3b86d760f5e9a57b4307174d820d20e77ae3229e WHIRLPOOL 4479955ba6f2511fda98660f51d1355532bf8f26c23a74b8aa892810d45c3ff3cdfbb7398d501c44048082e2d4dc50eb88dc135595ef0b35ba1c06c7dbe91d57 |
24 |
+DIST jabberd-2.6.1.tar.xz 1542156 SHA256 c22d45bd4105b344351cbbfd6da99755182f64120747d18e91b6267a73775099 SHA512 845347d2b812f6232ac84771e276c0783636406d73ae3cedbc5c28119f33c40a1c995827050c0227d7260dadba81434692059ff5a0b911e1c0c92f821e33eeea WHIRLPOOL d8b3d9d1f51e90ba5ca2a8b7b44133938014b7084112d1ea3ae31426948d345aa1470055c4944f1c3c90145d31b4e8f67a23b372ad7a30ebf2305f335547d478 |
25 |
|
26 |
diff --git a/net-im/jabberd2/jabberd2-2.6.1.ebuild b/net-im/jabberd2/jabberd2-2.6.1.ebuild |
27 |
new file mode 100644 |
28 |
index 00000000000..cf3d63e5a4c |
29 |
--- /dev/null |
30 |
+++ b/net-im/jabberd2/jabberd2-2.6.1.ebuild |
31 |
@@ -0,0 +1,188 @@ |
32 |
+# Copyright 1999-2017 Gentoo Foundation |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+ |
35 |
+EAPI=6 |
36 |
+ |
37 |
+inherit autotools db-use eutils flag-o-matic pam |
38 |
+ |
39 |
+DESCRIPTION="Open Source Jabber Server" |
40 |
+HOMEPAGE="http://jabberd2.org" |
41 |
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz" |
42 |
+ |
43 |
+LICENSE="GPL-2" |
44 |
+SLOT="0" |
45 |
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" |
46 |
+IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test websocket zlib" |
47 |
+REQUIRED_USE="memdebug? ( debug )" |
48 |
+ |
49 |
+DEPEND=" |
50 |
+ dev-libs/expat |
51 |
+ net-libs/udns |
52 |
+ net-dns/libidn |
53 |
+ virtual/gsasl |
54 |
+ berkdb? ( >=sys-libs/db-4.1.25:= ) |
55 |
+ ldap? ( net-nds/openldap ) |
56 |
+ mysql? ( |
57 |
+ virtual/libmysqlclient:= |
58 |
+ virtual/mysql:= |
59 |
+ ) |
60 |
+ pam? ( virtual/pam ) |
61 |
+ postgres? ( dev-db/postgresql:= ) |
62 |
+ ssl? ( |
63 |
+ !libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] ) |
64 |
+ libressl? ( dev-libs/libressl:= ) |
65 |
+ ) |
66 |
+ sqlite? ( dev-db/sqlite:3 ) |
67 |
+ websocket? ( net-libs/http-parser:= ) |
68 |
+ zlib? ( sys-libs/zlib ) |
69 |
+" |
70 |
+RDEPEND=" |
71 |
+ ${DEPEND} |
72 |
+ >=net-im/jabber-base-0.01 |
73 |
+" |
74 |
+DEPEND=" |
75 |
+ ${DEPEND} |
76 |
+ app-arch/xz-utils |
77 |
+ sys-devel/autoconf-archive |
78 |
+ virtual/pkgconfig |
79 |
+ test? ( dev-libs/check ) |
80 |
+" |
81 |
+ |
82 |
+DOCS=( AUTHORS README ) |
83 |
+ |
84 |
+#PATCHES=( |
85 |
+#) |
86 |
+ |
87 |
+S="${WORKDIR}/jabberd-${PV}" |
88 |
+ |
89 |
+pkg_pretend() { |
90 |
+ if is-flagq '-O[3s]' ; then |
91 |
+ ewarn "O3/Os compiler flags have been known to cause problems" |
92 |
+ ewarn "with old gcc version. Be aware that this could break" |
93 |
+ ewarn "port binding. Make sure to test this." |
94 |
+ ewarn "See https://github.com/jabberd2/jabberd2/issues/34" |
95 |
+ fi |
96 |
+} |
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/${id}\.pid/jabberd2-c2s\.pid/' \ |
126 |
+ etc/c2s.xml.dist.in || die |
127 |
+ sed -i \ |
128 |
+ -e '/pidfile/s/${id}\.pid/jabberd2-router\.pid/' \ |
129 |
+ etc/router.xml.dist.in || die |
130 |
+ sed -i \ |
131 |
+ -e '/pidfile/s/${id}\.pid/jabberd2-s2s\.pid/' \ |
132 |
+ etc/s2s.xml.dist.in || die |
133 |
+ sed -i \ |
134 |
+ -e '/pidfile/s/${id}\.pid/jabberd2-sm\.pid/' \ |
135 |
+ etc/sm.xml.dist.in || die |
136 |
+ |
137 |
+ default |
138 |
+ |
139 |
+ eautoreconf |
140 |
+} |
141 |
+ |
142 |
+src_configure() { |
143 |
+ # --enable-pool-debug is currently broken |
144 |
+ myeconfargs=( |
145 |
+ --sysconfdir=/etc/jabber |
146 |
+ --enable-pipe |
147 |
+ --enable-anon |
148 |
+ --enable-fs |
149 |
+ $(usex debug "--enable-debug" "") |
150 |
+ $(usex memdebug "--enable-nad-debug" "") |
151 |
+ $(use_enable ssl) |
152 |
+ $(use_enable mysql) |
153 |
+ $(use_enable postgres pgsql) |
154 |
+ $(use_enable sqlite) |
155 |
+ $(use_enable berkdb db) |
156 |
+ $(use_enable ldap) |
157 |
+ $(use_enable pam) |
158 |
+ $(use_enable websocket) |
159 |
+ $(use_enable experimental) |
160 |
+ $(use_enable test tests) |
161 |
+ $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") |
162 |
+ $(use_with zlib) |
163 |
+ ) |
164 |
+ econf "${myeconfargs[@]}" |
165 |
+} |
166 |
+ |
167 |
+src_install() { |
168 |
+ local i |
169 |
+ |
170 |
+ default |
171 |
+ prune_libtool_files --modules |
172 |
+ |
173 |
+ keepdir /var/spool/jabber/{fs,db} |
174 |
+ fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ |
175 |
+ /var/spool/jabber/{fs,db} |
176 |
+ fperms 770 /var/spool/jabber/{fs,db} |
177 |
+ fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} |
178 |
+ |
179 |
+ # avoid file collision with x11-misc/screen-message wrt #453994 |
180 |
+ for i in router sm c2s s2s ; do |
181 |
+ einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" |
182 |
+ mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die |
183 |
+ done |
184 |
+ |
185 |
+ newinitd "${FILESDIR}/${PN}-2.5.0.init" jabberd |
186 |
+ newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd |
187 |
+ insinto /etc/logrotate.d |
188 |
+ newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd |
189 |
+ |
190 |
+ docompress -x /usr/share/doc/${PF}/tools |
191 |
+ docinto tools |
192 |
+ dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \ |
193 |
+ tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} |
194 |
+ |
195 |
+ # remove useless upstart files wrt #498900 |
196 |
+ rm -rf "${ED%/}"/usr/etc |
197 |
+} |
198 |
+ |
199 |
+pkg_postinst() { |
200 |
+ if use pam; then |
201 |
+ echo |
202 |
+ ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' |
203 |
+ ewarn 'be in the form of "contactname@jabberdomain". This behavior' |
204 |
+ ewarn 'is likely to change in future versions of jabberd-2. It may' |
205 |
+ ewarn 'be advisable to avoid PAM authentication for the time being.' |
206 |
+ echo |
207 |
+ fi |
208 |
+ |
209 |
+ if use sqlite || use mysql || use postgres; then |
210 |
+ echo |
211 |
+ einfo "You will need to setup or update your database using the" |
212 |
+ einfo "scripts in /usr/share/doc/${PF}/tools/" |
213 |
+ echo |
214 |
+ fi |
215 |
+ |
216 |
+ ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have' |
217 |
+ ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because' |
218 |
+ ewarn 'the binaries have been renamed to avoid file collisions!' |
219 |
+} |