| 1 |
dertobi123 09/07/30 17:49:59 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: amavisd-new-2.6.3-r2.ebuild |
| 5 |
Removed: amavisd-new-2.6.3-r1.ebuild |
| 6 |
Log: |
| 7 |
Revbump, fix startup failure w/ antispam disabled, #277363 |
| 8 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.146 mail-filter/amavisd-new/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/ChangeLog?rev=1.146&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/ChangeLog?rev=1.146&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/ChangeLog?r1=1.145&r2=1.146 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v |
| 20 |
retrieving revision 1.145 |
| 21 |
retrieving revision 1.146 |
| 22 |
diff -u -r1.145 -r1.146 |
| 23 |
--- ChangeLog 19 Jul 2009 17:52:28 -0000 1.145 |
| 24 |
+++ ChangeLog 30 Jul 2009 17:49:59 -0000 1.146 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for mail-filter/amavisd-new |
| 27 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.145 2009/07/19 17:52:28 tove Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.146 2009/07/30 17:49:59 dertobi123 Exp $ |
| 30 |
+ |
| 31 |
+*amavisd-new-2.6.3-r2 (30 Jul 2009) |
| 32 |
+ |
| 33 |
+ 30 Jul 2009; Tobias Scherbaum <dertobi123@g.o> |
| 34 |
+ -amavisd-new-2.6.3-r1.ebuild, +amavisd-new-2.6.3-r2.ebuild, |
| 35 |
+ +files/amavisd-new-2.6.3-startup.patch: |
| 36 |
+ Revbump, fix startup failure w/ antispam disabled, #277363 |
| 37 |
|
| 38 |
19 Jul 2009; Torsten Veller <tove@g.o> amavisd-new-2.6.1-r1.ebuild, |
| 39 |
amavisd-new-2.6.3-r1.ebuild, amavisd-new-2.6.4.ebuild: |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 mail-filter/amavisd-new/amavisd-new-2.6.3-r2.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.6.3-r2.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.6.3-r2.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: amavisd-new-2.6.3-r2.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2009 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.6.3-r2.ebuild,v 1.1 2009/07/30 17:49:59 dertobi123 Exp $ |
| 53 |
|
| 54 |
inherit eutils |
| 55 |
|
| 56 |
DESCRIPTION="High-performance interface between the MTA and content checkers." |
| 57 |
HOMEPAGE="http://www.ijs.si/software/amavisd/" |
| 58 |
SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz" |
| 59 |
|
| 60 |
LICENSE="GPL-2" |
| 61 |
SLOT="0" |
| 62 |
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
| 63 |
IUSE="courier dkim ldap milter mysql postgres qmail razor spamassassin" |
| 64 |
|
| 65 |
DEPEND=">=sys-apps/sed-4 |
| 66 |
>=dev-lang/perl-5.8.2 |
| 67 |
milter? ( || ( mail-filter/libmilter >=mail-mta/sendmail-8.12 ) )" |
| 68 |
|
| 69 |
RDEPEND="${DEPEND} |
| 70 |
>=sys-apps/coreutils-5.0-r3 |
| 71 |
app-arch/gzip |
| 72 |
app-arch/bzip2 |
| 73 |
app-arch/arc |
| 74 |
app-arch/cabextract |
| 75 |
app-arch/freeze |
| 76 |
app-arch/lha |
| 77 |
app-arch/unarj |
| 78 |
|| ( app-arch/unrar app-arch/rar ) |
| 79 |
app-arch/zoo |
| 80 |
>=dev-perl/Archive-Zip-1.14 |
| 81 |
>=virtual/perl-IO-Compress-1.35 |
| 82 |
dev-perl/Convert-TNEF |
| 83 |
>=dev-perl/Convert-UUlib-1.08 |
| 84 |
virtual/perl-MIME-Base64 |
| 85 |
>=dev-perl/MIME-tools-5.415 |
| 86 |
>=dev-perl/MailTools-1.58 |
| 87 |
>=dev-perl/net-server-0.91 |
| 88 |
virtual/perl-Digest-MD5 |
| 89 |
dev-perl/IO-stringy |
| 90 |
>=virtual/perl-Time-HiRes-1.49 |
| 91 |
dev-perl/Unix-Syslog |
| 92 |
>=sys-libs/db-3.2 |
| 93 |
dev-perl/BerkeleyDB |
| 94 |
dev-perl/Convert-BinHex |
| 95 |
>=dev-perl/Mail-DKIM-0.31 |
| 96 |
virtual/mta |
| 97 |
ldap? ( >=dev-perl/perl-ldap-0.33 ) |
| 98 |
mysql? ( dev-perl/DBD-mysql ) |
| 99 |
postgres? ( dev-perl/DBD-Pg ) |
| 100 |
razor? ( mail-filter/razor ) |
| 101 |
spamassassin? ( mail-filter/spamassassin )" |
| 102 |
|
| 103 |
AMAVIS_ROOT="/var/amavis" |
| 104 |
|
| 105 |
src_unpack() { |
| 106 |
unpack ${A} |
| 107 |
cd "${S}" |
| 108 |
|
| 109 |
if use courier ; then |
| 110 |
epatch amavisd-new-courier.patch |
| 111 |
fi |
| 112 |
|
| 113 |
if use qmail ; then |
| 114 |
epatch amavisd-new-qmqpqq.patch |
| 115 |
fi |
| 116 |
|
| 117 |
epatch "${FILESDIR}/${P}-amavisd.conf-gentoo.patch" |
| 118 |
epatch "${FILESDIR}/${P}-startup.patch" |
| 119 |
|
| 120 |
if ! use dkim ; then |
| 121 |
epatch "${FILESDIR}/${P}-dkimconf.patch" |
| 122 |
fi |
| 123 |
} |
| 124 |
|
| 125 |
src_compile() { |
| 126 |
if use milter ; then |
| 127 |
cd "${S}/helper-progs" |
| 128 |
|
| 129 |
econf --with-runtime-dir=${AMAVIS_ROOT} \ |
| 130 |
--with-sockname=${AMAVIS_ROOT}/amavisd.sock \ |
| 131 |
--with-user=amavis || die "helper-progs econf failed" |
| 132 |
emake || die "helper-progs compile problem" |
| 133 |
|
| 134 |
cd "${S}" |
| 135 |
fi |
| 136 |
} |
| 137 |
|
| 138 |
src_install() { |
| 139 |
dosbin amavisd amavisd-agent amavisd-nanny amavisd-release |
| 140 |
dobin p0f-analyzer.pl |
| 141 |
|
| 142 |
insinto /etc |
| 143 |
insopts -m0640 |
| 144 |
newins amavisd.conf-sample amavisd.conf |
| 145 |
|
| 146 |
dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \ |
| 147 |
/etc/amavisd.conf |
| 148 |
|
| 149 |
newinitd "${FILESDIR}/amavisd.rc6" amavisd |
| 150 |
dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd |
| 151 |
|
| 152 |
keepdir ${AMAVIS_ROOT} |
| 153 |
keepdir ${AMAVIS_ROOT}/db |
| 154 |
keepdir ${AMAVIS_ROOT}/quarantine |
| 155 |
keepdir ${AMAVIS_ROOT}/tmp |
| 156 |
|
| 157 |
newdoc test-messages/README README.samples |
| 158 |
dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES README_FILES/README.* \ |
| 159 |
test-messages/sample* amavisd.conf-default amavisd-agent \ |
| 160 |
amavisd-custom.conf |
| 161 |
|
| 162 |
dodir /usr/share/doc/${PF}/html |
| 163 |
insinto /usr/share/doc/${PF}/html |
| 164 |
doins README_FILES/*.{html,css} |
| 165 |
dodir /usr/share/doc/${PF}/html/images |
| 166 |
insinto /usr/share/doc/${PF}/html/images |
| 167 |
doins README_FILES/images/* |
| 168 |
|
| 169 |
if use milter ; then |
| 170 |
cd "${S}/helper-progs" |
| 171 |
einstall |
| 172 |
cd "${S}" |
| 173 |
fi |
| 174 |
|
| 175 |
for i in whitelist blacklist spam_lovers; do |
| 176 |
if [ -f ${AMAVIS_ROOT}/${i} ]; then |
| 177 |
cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}" |
| 178 |
else |
| 179 |
touch "${D}"/${AMAVIS_ROOT}/${i} |
| 180 |
fi |
| 181 |
done |
| 182 |
|
| 183 |
if use ldap ; then |
| 184 |
elog "Adding ${P} schema to openldap schema dir." |
| 185 |
dodir /etc/openldap/schema |
| 186 |
insinto /etc/openldap/schema |
| 187 |
insopts -o root -g root -m 644 |
| 188 |
newins LDAP.schema ${PN}.schema || die |
| 189 |
newins LDAP.schema ${PN}.schema.default || die |
| 190 |
fi |
| 191 |
|
| 192 |
find "${D}"/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \; |
| 193 |
find "${D}"/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \; |
| 194 |
} |
| 195 |
|
| 196 |
pkg_preinst() { |
| 197 |
enewgroup amavis |
| 198 |
enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis |
| 199 |
|
| 200 |
if [ -z "$(dnsdomainname)" ] ; then |
| 201 |
dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \ |
| 202 |
/etc/amavisd.conf |
| 203 |
else |
| 204 |
dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \ |
| 205 |
/etc/amavisd.conf |
| 206 |
fi |
| 207 |
|
| 208 |
if use razor ; then |
| 209 |
if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then |
| 210 |
elog "Setting up initial razor config files..." |
| 211 |
|
| 212 |
razor-admin -create -home="${D}"/${AMAVIS_ROOT}/.razor |
| 213 |
sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \ |
| 214 |
"${D}"/${AMAVIS_ROOT}/.razor/razor-agent.conf |
| 215 |
fi |
| 216 |
fi |
| 217 |
|
| 218 |
if ! use spamassassin ; then |
| 219 |
einfo "Disabling anti-spam code in amavisd.conf..." |
| 220 |
|
| 221 |
dosed "s:^#[\t ]*@bypass_spam_checks_maps[\t ]*=[\t ]*(1);:\@bypass_spam_checks_maps = (1);:" \ |
| 222 |
/etc/amavisd.conf |
| 223 |
fi |
| 224 |
} |
| 225 |
|
| 226 |
pkg_postinst() { |
| 227 |
if ! use spamassassin ; then |
| 228 |
echo |
| 229 |
elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking" |
| 230 |
elog "will be performed without it. Since you do not have SpamAssassin installed," |
| 231 |
elog "all spam checks have been disabled. To enable them, install SpamAssassin" |
| 232 |
elog "and comment out the line containing: " |
| 233 |
elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf." |
| 234 |
fi |
| 235 |
echo |
| 236 |
ewarn "As of amavisd-new-2.4.5 p0f-analyzer.pl only binds to the loopback interface" |
| 237 |
ewarn "by default instead of to all interfaces. You will need to change $bind_addr" |
| 238 |
ewarn "in p0f-analyzer.pl to '0.0.0.0' if p0f-analyzer.pl is running on a different" |
| 239 |
ewarn "host from amavisd or from other querying clients." |
| 240 |
echo |
| 241 |
ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)" |
| 242 |
echo |
| 243 |
chmod o-rwx /etc/amavisd.conf |
| 244 |
chown root:amavis /etc/amavisd.conf |
| 245 |
chown -R amavis:amavis ${AMAVIS_ROOT} |
| 246 |
} |
Archives