1 |
hasufell 14/06/01 20:09:55 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: jabberd2-2.3.2-r1.ebuild |
5 |
Log: |
6 |
fix logroate script wrt #505596 |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
9 |
|
10 |
Revision Changes Path |
11 |
1.62 net-im/jabberd2/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/jabberd2/ChangeLog?rev=1.62&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/jabberd2/ChangeLog?rev=1.62&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/jabberd2/ChangeLog?r1=1.61&r2=1.62 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v |
20 |
retrieving revision 1.61 |
21 |
retrieving revision 1.62 |
22 |
diff -u -r1.61 -r1.62 |
23 |
--- ChangeLog 8 Mar 2014 23:58:05 -0000 1.61 |
24 |
+++ ChangeLog 1 Jun 2014 20:09:54 -0000 1.62 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for net-im/jabberd2 |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.61 2014/03/08 23:58:05 hasufell Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.62 2014/06/01 20:09:54 hasufell Exp $ |
30 |
+ |
31 |
+*jabberd2-2.3.2-r1 (01 Jun 2014) |
32 |
+ |
33 |
+ 01 Jun 2014; Julian Ospald <hasufell@g.o> +jabberd2-2.3.2-r1.ebuild, |
34 |
+ +files/jabberd2-2.3.2.init, +files/jabberd2-2.3.2.logrotate: |
35 |
+ fix logroate script wrt #505596 |
36 |
|
37 |
08 Mar 2014; Julian Ospald <hasufell@g.o> jabberd2-2.3.2.ebuild, |
38 |
metadata.xml: |
39 |
|
40 |
|
41 |
|
42 |
1.1 net-im/jabberd2/jabberd2-2.3.2-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: jabberd2-2.3.2-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2014 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild,v 1.1 2014/06/01 20:09:54 hasufell Exp $ |
52 |
|
53 |
EAPI=5 |
54 |
|
55 |
inherit db-use eutils flag-o-matic pam |
56 |
|
57 |
DESCRIPTION="Open Source Jabber Server" |
58 |
HOMEPAGE="http://jabberd2.org" |
59 |
SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz" |
60 |
|
61 |
LICENSE="GPL-2" |
62 |
SLOT="0" |
63 |
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" |
64 |
IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test zlib" |
65 |
REQUIRED_USE="memdebug? ( debug )" |
66 |
|
67 |
# broken |
68 |
RESTRICT="test" |
69 |
|
70 |
DEPEND="dev-libs/expat |
71 |
net-libs/udns |
72 |
net-dns/libidn |
73 |
virtual/gsasl |
74 |
berkdb? ( >=sys-libs/db-4.1.25 ) |
75 |
ldap? ( net-nds/openldap ) |
76 |
mysql? ( virtual/mysql ) |
77 |
pam? ( virtual/pam ) |
78 |
postgres? ( dev-db/postgresql-base ) |
79 |
ssl? ( >=dev-libs/openssl-1.0.1:0 ) |
80 |
sqlite? ( dev-db/sqlite:3 ) |
81 |
zlib? ( sys-libs/zlib )" |
82 |
RDEPEND="${DEPEND} |
83 |
>=net-im/jabber-base-0.01" |
84 |
DEPEND="${DEPEND} |
85 |
app-arch/xz-utils |
86 |
virtual/pkgconfig |
87 |
test? ( dev-libs/check )" |
88 |
|
89 |
DOCS=( AUTHORS README ) |
90 |
|
91 |
S=${WORKDIR}/jabberd-${PV} |
92 |
|
93 |
src_prepare() { |
94 |
# Fix some default directory locations |
95 |
sed -i \ |
96 |
-e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ |
97 |
-e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ |
98 |
-e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ |
99 |
-e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ |
100 |
-e 's,@localstatedir@,/var/spool,g' \ |
101 |
-e 's,@package@,jabber,g' \ |
102 |
etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!" |
103 |
|
104 |
# If the package wasn't merged with sqlite then default to use berkdb |
105 |
use sqlite || |
106 |
sed -i \ |
107 |
-e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db</\1>,g' \ |
108 |
etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!" |
109 |
|
110 |
# avoid file collision with x11-misc/screen-message wrt #453994 |
111 |
sed -i \ |
112 |
-e 's/@jabberd_router_bin@/jabberd2-router/' \ |
113 |
-e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \ |
114 |
-e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \ |
115 |
-e 's/@jabberd_sm_bin@/jabberd2-sm/' \ |
116 |
etc/jabberd*.in || die "fixing file collisions failed!" |
117 |
|
118 |
# rename pid files wrt #241472 |
119 |
sed -i \ |
120 |
-e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \ |
121 |
-e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \ |
122 |
-e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \ |
123 |
-e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \ |
124 |
etc/*.xml.dist.in || die "renaming pid files failed!" |
125 |
} |
126 |
|
127 |
src_configure() { |
128 |
# https://bugs.gentoo.org/show_bug.cgi?id=207655#c3 |
129 |
# https://github.com/jabberd2/jabberd2/issues/34 |
130 |
replace-flags -O[3s] -O2 |
131 |
|
132 |
# --enable-pool-debug is currently broken |
133 |
econf \ |
134 |
--sysconfdir=/etc/jabber \ |
135 |
$(usex debug "--enable-debug" "") \ |
136 |
$(usex memdebug "--enable-nad-debug" "") \ |
137 |
$(use_enable ssl) \ |
138 |
$(use_enable mysql) \ |
139 |
$(use_enable postgres pgsql) \ |
140 |
$(use_enable sqlite) \ |
141 |
$(use_enable berkdb db) \ |
142 |
$(use_enable ldap) \ |
143 |
$(use_enable pam) \ |
144 |
--enable-pipe \ |
145 |
--enable-anon \ |
146 |
--enable-fs \ |
147 |
$(use_enable experimental) \ |
148 |
$(use_enable test tests) \ |
149 |
$(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \ |
150 |
$(use_with zlib) |
151 |
} |
152 |
|
153 |
src_install() { |
154 |
local i |
155 |
|
156 |
default |
157 |
prune_libtool_files --modules |
158 |
|
159 |
keepdir /var/spool/jabber/{fs,db} |
160 |
fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ |
161 |
/var/spool/jabber/{fs,db} |
162 |
fperms 770 /var/spool/jabber/{fs,db} |
163 |
fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} |
164 |
|
165 |
# avoid file collision with x11-misc/screen-message wrt #453994 |
166 |
for i in router sm c2s s2s ; do |
167 |
einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" |
168 |
mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die |
169 |
done |
170 |
|
171 |
newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd |
172 |
newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd |
173 |
insinto /etc/logrotate.d |
174 |
newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd |
175 |
|
176 |
docompress -x /usr/share/doc/${PF}/tools |
177 |
docinto tools |
178 |
dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \ |
179 |
tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} |
180 |
|
181 |
# remove useless upstart files wrt #498900 |
182 |
rm -rf "${ED%/}"/usr/etc |
183 |
} |
184 |
|
185 |
pkg_postinst() { |
186 |
if use pam; then |
187 |
echo |
188 |
ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' |
189 |
ewarn 'be in the form of "contactname@jabberdomain". This behavior' |
190 |
ewarn 'is likely to change in future versions of jabberd-2. It may' |
191 |
ewarn 'be advisable to avoid PAM authentication for the time being.' |
192 |
echo |
193 |
fi |
194 |
|
195 |
if use sqlite || use mysql || use postgres; then |
196 |
echo |
197 |
einfo "You will need to setup or update your database using the" |
198 |
einfo "scripts in /usr/share/doc/${PF}/tools/" |
199 |
echo |
200 |
fi |
201 |
|
202 |
ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have' |
203 |
ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because' |
204 |
ewarn 'the binaries have been renamed to avoid file collisions!' |
205 |
} |