1 |
ticho 07/12/27 12:21:42 |
2 |
|
3 |
Modified: amavisd-new-2.5.2.ebuild ChangeLog |
4 |
amavisd-new-2.4.1.ebuild |
5 |
Added: amavisd-new-2.5.3.ebuild |
6 |
Removed: amavisd-new-2.5.1.ebuild amavisd-new-2.4.2.ebuild |
7 |
amavisd-new-2.4.5-r1.ebuild |
8 |
amavisd-new-2.5.0.ebuild amavisd-new-2.4.4.ebuild |
9 |
amavisd-new-2.3.3-r2.ebuild |
10 |
amavisd-new-2.4.3.ebuild |
11 |
amavisd-new-2.4.2-r1.ebuild |
12 |
Log: |
13 |
Version bump. Bug #202230 by Jason Phillips <gentoo at jbpc.com>. |
14 |
(Portage version: 2.1.4_rc9) |
15 |
|
16 |
Revision Changes Path |
17 |
1.2 mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild |
18 |
|
19 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild?rev=1.2&view=markup |
20 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild?rev=1.2&content-type=text/plain |
21 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild?r1=1.1&r2=1.2 |
22 |
|
23 |
Index: amavisd-new-2.5.2.ebuild |
24 |
=================================================================== |
25 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild,v |
26 |
retrieving revision 1.1 |
27 |
retrieving revision 1.2 |
28 |
diff -u -r1.1 -r1.2 |
29 |
--- amavisd-new-2.5.2.ebuild 5 Jul 2007 19:05:18 -0000 1.1 |
30 |
+++ amavisd-new-2.5.2.ebuild 27 Dec 2007 12:21:42 -0000 1.2 |
31 |
@@ -1,6 +1,6 @@ |
32 |
# Copyright 1999-2007 Gentoo Foundation |
33 |
# Distributed under the terms of the GNU General Public License v2 |
34 |
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild,v 1.1 2007/07/05 19:05:18 ticho Exp $ |
35 |
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild,v 1.2 2007/12/27 12:21:42 ticho Exp $ |
36 |
|
37 |
inherit eutils |
38 |
|
39 |
@@ -120,7 +120,7 @@ |
40 |
if [ -f ${AMAVIS_ROOT}/${i} ]; then |
41 |
cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}" |
42 |
else |
43 |
- touch ${D}/${AMAVIS_ROOT}/${i} |
44 |
+ touch "${D}"/${AMAVIS_ROOT}/${i} |
45 |
fi |
46 |
done |
47 |
|
48 |
@@ -133,8 +133,8 @@ |
49 |
newins LDAP.schema ${PN}.schema.default || die |
50 |
fi |
51 |
|
52 |
- find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \; |
53 |
- find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \; |
54 |
+ find "${D}"/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \; |
55 |
+ find "${D}"/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \; |
56 |
} |
57 |
|
58 |
pkg_preinst() { |
59 |
@@ -153,9 +153,9 @@ |
60 |
if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then |
61 |
elog "Setting up initial razor config files..." |
62 |
|
63 |
- razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor |
64 |
+ razor-admin -create -home="${D}"/${AMAVIS_ROOT}/.razor |
65 |
sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \ |
66 |
- ${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf |
67 |
+ "${D}"/${AMAVIS_ROOT}/.razor/razor-agent.conf |
68 |
fi |
69 |
fi |
70 |
} |
71 |
|
72 |
|
73 |
|
74 |
1.112 mail-filter/amavisd-new/ChangeLog |
75 |
|
76 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/ChangeLog?rev=1.112&view=markup |
77 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/ChangeLog?rev=1.112&content-type=text/plain |
78 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/ChangeLog?r1=1.111&r2=1.112 |
79 |
|
80 |
Index: ChangeLog |
81 |
=================================================================== |
82 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v |
83 |
retrieving revision 1.111 |
84 |
retrieving revision 1.112 |
85 |
diff -u -r1.111 -r1.112 |
86 |
--- ChangeLog 5 Jul 2007 19:05:18 -0000 1.111 |
87 |
+++ ChangeLog 27 Dec 2007 12:21:42 -0000 1.112 |
88 |
@@ -1,6 +1,23 @@ |
89 |
# ChangeLog for mail-filter/amavisd-new |
90 |
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
91 |
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.111 2007/07/05 19:05:18 ticho Exp $ |
92 |
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.112 2007/12/27 12:21:42 ticho Exp $ |
93 |
+ |
94 |
+*amavisd-new-2.5.3 (27 Dec 2007) |
95 |
+ |
96 |
+ 27 Dec 2007; Andrej Kacian <ticho@g.o> |
97 |
+ -files/amavisd-new-2.2.1-qmail-lf-workaround.patch, |
98 |
+ -files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch, |
99 |
+ -files/amavisd-new-2.3.3-bsmtp-quarantine.patch, |
100 |
+ -files/amavisd-new-2.4.2-amavisd.conf-gentoo.patch, |
101 |
+ -files/amavisd-new-2.4.4-qmail-lf-workaround.patch, |
102 |
+ -amavisd-new-2.3.3-r2.ebuild, amavisd-new-2.4.1.ebuild, |
103 |
+ -amavisd-new-2.4.2.ebuild, -amavisd-new-2.4.2-r1.ebuild, |
104 |
+ -amavisd-new-2.4.3.ebuild, -amavisd-new-2.4.4.ebuild, |
105 |
+ -amavisd-new-2.4.5-r1.ebuild, -amavisd-new-2.5.0.ebuild, |
106 |
+ -amavisd-new-2.5.1.ebuild, amavisd-new-2.5.2.ebuild, |
107 |
+ +amavisd-new-2.5.3.ebuild: |
108 |
+ Version bump. Bug #202230 by Jason Phillips <gentoo at jbpc.com>. Shell |
109 |
+ variables quoting fix. Old ebuilds cleanup. |
110 |
|
111 |
*amavisd-new-2.5.2 (05 Jul 2007) |
112 |
|
113 |
|
114 |
|
115 |
|
116 |
1.12 mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild |
117 |
|
118 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild?rev=1.12&view=markup |
119 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild?rev=1.12&content-type=text/plain |
120 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild?r1=1.11&r2=1.12 |
121 |
|
122 |
Index: amavisd-new-2.4.1.ebuild |
123 |
=================================================================== |
124 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v |
125 |
retrieving revision 1.11 |
126 |
retrieving revision 1.12 |
127 |
diff -u -r1.11 -r1.12 |
128 |
--- amavisd-new-2.4.1.ebuild 23 May 2007 22:51:10 -0000 1.11 |
129 |
+++ amavisd-new-2.4.1.ebuild 27 Dec 2007 12:21:42 -0000 1.12 |
130 |
@@ -1,6 +1,6 @@ |
131 |
# Copyright 1999-2007 Gentoo Foundation |
132 |
# Distributed under the terms of the GNU General Public License v2 |
133 |
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.11 2007/05/23 22:51:10 ticho Exp $ |
134 |
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.12 2007/12/27 12:21:42 ticho Exp $ |
135 |
|
136 |
inherit eutils |
137 |
|
138 |
@@ -59,7 +59,7 @@ |
139 |
epause |
140 |
fi |
141 |
unpack ${A} |
142 |
- cd ${S} |
143 |
+ cd "${S}" |
144 |
if $(has_version mail-mta/courier) ; then |
145 |
elog "Patching with courier support." |
146 |
epatch "amavisd-new-courier.patch" || die "patch failed" |
147 |
@@ -132,8 +132,8 @@ |
148 |
fi |
149 |
|
150 |
for i in whitelist blacklist spam_lovers; do |
151 |
- if [ ! -f ${D}/${AMAVIS_ROOT}/${i} ]; then |
152 |
- touch ${D}/${AMAVIS_ROOT}/${i} |
153 |
+ if [ ! -f "${D}"/${AMAVIS_ROOT}/${i} ]; then |
154 |
+ touch "${D}"/${AMAVIS_ROOT}/${i} |
155 |
fi |
156 |
done |
157 |
|
158 |
@@ -141,9 +141,9 @@ |
159 |
if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then |
160 |
elog "Setting up initial razor config files..." |
161 |
|
162 |
- razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor |
163 |
+ razor-admin -create -home="${D}"/${AMAVIS_ROOT}/.razor |
164 |
sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \ |
165 |
- ${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf |
166 |
+ "${D}"/${AMAVIS_ROOT}/.razor/razor-agent.conf |
167 |
else |
168 |
elog "Copying existing razor config files..." |
169 |
insinto ${AMAVIS_ROOT}/.razor |
170 |
@@ -151,8 +151,8 @@ |
171 |
fi |
172 |
fi |
173 |
|
174 |
- find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \; |
175 |
- find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \; |
176 |
+ find "${D}"/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \; |
177 |
+ find "${D}"/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \; |
178 |
} |
179 |
|
180 |
pkg_preinst() { |
181 |
|
182 |
|
183 |
|
184 |
1.1 mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild |
185 |
|
186 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild?rev=1.1&view=markup |
187 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild?rev=1.1&content-type=text/plain |
188 |
|
189 |
Index: amavisd-new-2.5.3.ebuild |
190 |
=================================================================== |
191 |
# Copyright 1999-2007 Gentoo Foundation |
192 |
# Distributed under the terms of the GNU General Public License v2 |
193 |
# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild,v 1.1 2007/12/27 12:21:42 ticho Exp $ |
194 |
|
195 |
inherit eutils |
196 |
|
197 |
DESCRIPTION="High-performance interface between the MTA and content checkers." |
198 |
HOMEPAGE="http://www.ijs.si/software/amavisd/" |
199 |
SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz" |
200 |
|
201 |
LICENSE="GPL-2" |
202 |
SLOT="0" |
203 |
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" |
204 |
IUSE="courier ldap milter mysql postgres qmail" |
205 |
|
206 |
DEPEND=">=sys-apps/sed-4 |
207 |
>=dev-lang/perl-5.8.2" |
208 |
|
209 |
RDEPEND="${DEPEND} |
210 |
>=sys-apps/coreutils-5.0-r3 |
211 |
app-arch/gzip |
212 |
app-arch/bzip2 |
213 |
app-arch/arc |
214 |
app-arch/cabextract |
215 |
app-arch/freeze |
216 |
app-arch/lha |
217 |
app-arch/unarj |
218 |
app-arch/unrar |
219 |
app-arch/zoo |
220 |
>=dev-perl/Archive-Zip-1.14 |
221 |
>=dev-perl/Compress-Zlib-1.35 |
222 |
dev-perl/Convert-TNEF |
223 |
>=dev-perl/Convert-UUlib-1.08 |
224 |
virtual/perl-MIME-Base64 |
225 |
>=dev-perl/MIME-tools-5.415 |
226 |
>=dev-perl/MailTools-1.58 |
227 |
>=dev-perl/net-server-0.91 |
228 |
virtual/perl-Digest-MD5 |
229 |
dev-perl/IO-stringy |
230 |
>=virtual/perl-Time-HiRes-1.49 |
231 |
dev-perl/Unix-Syslog |
232 |
>=sys-libs/db-3.2 |
233 |
dev-perl/BerkeleyDB |
234 |
virtual/mta |
235 |
ldap? ( >=dev-perl/perl-ldap-0.33 ) |
236 |
mysql? ( dev-perl/DBD-mysql ) |
237 |
postgres? ( dev-perl/DBD-Pg ) |
238 |
milter? ( || ( >=mail-mta/sendmail-8.12 mail-filter/libmilter ) )" |
239 |
|
240 |
AMAVIS_ROOT="/var/amavis" |
241 |
|
242 |
src_unpack() { |
243 |
unpack ${A} |
244 |
cd "${S}" |
245 |
|
246 |
if use courier ; then |
247 |
epatch amavisd-new-courier.patch |
248 |
fi |
249 |
|
250 |
if use qmail ; then |
251 |
epatch amavisd-new-qmqpqq.patch |
252 |
fi |
253 |
|
254 |
epatch "${FILESDIR}/${PN}-2.4.4-amavisd.conf-gentoo.patch" |
255 |
} |
256 |
|
257 |
src_compile() { |
258 |
if use milter ; then |
259 |
cd "${S}/helper-progs" |
260 |
|
261 |
econf --with-runtime-dir=${AMAVIS_ROOT} \ |
262 |
--with-sockname=${AMAVIS_ROOT}/amavisd.sock \ |
263 |
--with-user=amavis || die "helper-progs econf failed" |
264 |
emake || die "helper-progs compile problem" |
265 |
|
266 |
cd "${S}" |
267 |
fi |
268 |
} |
269 |
|
270 |
src_install() { |
271 |
dosbin amavisd amavisd-agent amavisd-nanny amavisd-release |
272 |
dobin p0f-analyzer.pl |
273 |
|
274 |
insinto /etc |
275 |
insopts -m0640 |
276 |
newins amavisd.conf-sample amavisd.conf |
277 |
|
278 |
dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \ |
279 |
/etc/amavisd.conf |
280 |
|
281 |
newinitd "${FILESDIR}/amavisd.rc6" amavisd |
282 |
dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd |
283 |
|
284 |
keepdir ${AMAVIS_ROOT} |
285 |
keepdir ${AMAVIS_ROOT}/db |
286 |
keepdir ${AMAVIS_ROOT}/quarantine |
287 |
keepdir ${AMAVIS_ROOT}/tmp |
288 |
|
289 |
newdoc test-messages/README README.samples |
290 |
dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES README_FILES/README.* \ |
291 |
test-messages/sample* amavisd.conf-default amavisd-agent \ |
292 |
amavisd-custom.conf |
293 |
|
294 |
dodir /usr/share/doc/${PF}/html |
295 |
insinto /usr/share/doc/${PF}/html |
296 |
doins README_FILES/*.{html,css} |
297 |
dodir /usr/share/doc/${PF}/html/images |
298 |
insinto /usr/share/doc/${PF}/html/images |
299 |
doins README_FILES/images/* |
300 |
|
301 |
if use milter ; then |
302 |
cd "${S}/helper-progs" |
303 |
einstall |
304 |
cd "${S}" |
305 |
fi |
306 |
|
307 |
for i in whitelist blacklist spam_lovers; do |
308 |
if [ -f ${AMAVIS_ROOT}/${i} ]; then |
309 |
cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}" |
310 |
else |
311 |
touch "${D}"/${AMAVIS_ROOT}/${i} |
312 |
fi |
313 |
done |
314 |
|
315 |
if use ldap ; then |
316 |
elog "Adding ${P} schema to openldap schema dir." |
317 |
dodir /etc/openldap/schema |
318 |
insinto /etc/openldap/schema |
319 |
insopts -o root -g root -m 644 |
320 |
newins LDAP.schema ${PN}.schema || die |
321 |
newins LDAP.schema ${PN}.schema.default || die |
322 |
fi |
323 |
|
324 |
find "${D}"/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \; |
325 |
find "${D}"/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \; |
326 |
} |
327 |
|
328 |
pkg_preinst() { |
329 |
enewgroup amavis |
330 |
enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis |
331 |
|
332 |
if [ -z "$(dnsdomainname)" ] ; then |
333 |
dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \ |
334 |
/etc/amavisd.conf |
335 |
else |
336 |
dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \ |
337 |
/etc/amavisd.conf |
338 |
fi |
339 |
|
340 |
if has_version mail-filter/razor ; then |
341 |
if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then |
342 |
elog "Setting up initial razor config files..." |
343 |
|
344 |
razor-admin -create -home="${D}"/${AMAVIS_ROOT}/.razor |
345 |
sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \ |
346 |
"${D}"/${AMAVIS_ROOT}/.razor/razor-agent.conf |
347 |
fi |
348 |
fi |
349 |
} |
350 |
|
351 |
pkg_postinst() { |
352 |
if ! has_version mail-filter/spamassassin ; then |
353 |
echo |
354 |
elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking" |
355 |
elog "will be performed without it. Since you do not have SpamAssassin installed," |
356 |
elog "all spam checks have been disabled. To enable them, install SpamAssassin" |
357 |
elog "and comment out the line containing: " |
358 |
elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf." |
359 |
fi |
360 |
echo |
361 |
ewarn "As of amavisd-new-2.4.5 p0f-analyzer.pl only binds to the loopback interface" |
362 |
ewarn "by default instead of to all interfaces. You will need to change $bind_addr" |
363 |
ewarn "in p0f-analyzer.pl to '0.0.0.0' if p0f-analyzer.pl is running on a different" |
364 |
ewarn "host from amavisd or from other querying clients." |
365 |
echo |
366 |
ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)" |
367 |
echo |
368 |
chmod o-rwx /etc/amavisd.conf |
369 |
chown root:amavis /etc/amavisd.conf |
370 |
chown -R amavis:amavis ${AMAVIS_ROOT} |
371 |
} |
372 |
|
373 |
|
374 |
|
375 |
-- |
376 |
gentoo-commits@g.o mailing list |