[gentoo-commits] gentoo-x86 commit in mail-filter/amavisd-new: amavisd-new-2.5.2.ebuild ChangeLog amavisd-new-2.4.1.ebuild amavisd-new-2.5.3.ebuild amavisd-new-2.5.1.ebuild amavisd-new-2.4.2.ebuild amavisd-new-2.4.5-r1.ebuild amavisd-new-2.5.0.ebuild amavisd-new-2.4.4.ebuild amavisd-new-2.3.3-r2.ebuild amavisd-new-2.4.3.ebuild amavisd-new-2.4.2-r1.ebuild

[Andrej Kacian (ticho)]

ticho       07/12/27 12:21:42

  Modified:             amavisd-new-2.5.2.ebuild ChangeLog
                        amavisd-new-2.4.1.ebuild
  Added:                amavisd-new-2.5.3.ebuild
  Removed:              amavisd-new-2.5.1.ebuild amavisd-new-2.4.2.ebuild
                        amavisd-new-2.4.5-r1.ebuild
                        amavisd-new-2.5.0.ebuild amavisd-new-2.4.4.ebuild
                        amavisd-new-2.3.3-r2.ebuild
                        amavisd-new-2.4.3.ebuild
                        amavisd-new-2.4.2-r1.ebuild
  Log:
  Version bump. Bug #202230 by Jason Phillips <gentoo at jbpc.com>.
  (Portage version: 2.1.4_rc9)

Revision  Changes    Path
1.2                  mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild?rev=1.2&view=markup
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
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

Index: amavisd-new-2.5.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amavisd-new-2.5.2.ebuild	5 Jul 2007 19:05:18 -0000	1.1
+++ amavisd-new-2.5.2.ebuild	27 Dec 2007 12:21:42 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 inherit eutils
 
@@ -120,7 +120,7 @@
 		if [ -f ${AMAVIS_ROOT}/${i} ]; then
 			cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}"
 		else
-			touch ${D}/${AMAVIS_ROOT}/${i}
+			touch "${D}"/${AMAVIS_ROOT}/${i}
 		fi
 	done
 
@@ -133,8 +133,8 @@
 		newins LDAP.schema ${PN}.schema.default || die
 	fi
 
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
+	find "${D}"/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
+	find "${D}"/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
 }
 
 pkg_preinst() {
@@ -153,9 +153,9 @@
 		if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then
 			elog "Setting up initial razor config files..."
 
-			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
+			razor-admin -create -home="${D}"/${AMAVIS_ROOT}/.razor
 			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
+				"${D}"/${AMAVIS_ROOT}/.razor/razor-agent.conf
 		fi
 	fi
 }



1.112                mail-filter/amavisd-new/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/ChangeLog?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/ChangeLog?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/ChangeLog?r1=1.111&r2=1.112

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- ChangeLog	5 Jul 2007 19:05:18 -0000	1.111
+++ ChangeLog	27 Dec 2007 12:21:42 -0000	1.112
@@ -1,6 +1,23 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.111 2007/07/05 19:05:18 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.112 2007/12/27 12:21:42 ticho Exp $
+
+*amavisd-new-2.5.3 (27 Dec 2007)
+
+  27 Dec 2007; Andrej Kacian <ticho@g.o>
+  -files/amavisd-new-2.2.1-qmail-lf-workaround.patch,
+  -files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch,
+  -files/amavisd-new-2.3.3-bsmtp-quarantine.patch,
+  -files/amavisd-new-2.4.2-amavisd.conf-gentoo.patch,
+  -files/amavisd-new-2.4.4-qmail-lf-workaround.patch,
+  -amavisd-new-2.3.3-r2.ebuild, amavisd-new-2.4.1.ebuild,
+  -amavisd-new-2.4.2.ebuild, -amavisd-new-2.4.2-r1.ebuild,
+  -amavisd-new-2.4.3.ebuild, -amavisd-new-2.4.4.ebuild,
+  -amavisd-new-2.4.5-r1.ebuild, -amavisd-new-2.5.0.ebuild,
+  -amavisd-new-2.5.1.ebuild, amavisd-new-2.5.2.ebuild,
+  +amavisd-new-2.5.3.ebuild:
+  Version bump. Bug #202230 by Jason Phillips <gentoo at jbpc.com>. Shell
+  variables quoting fix. Old ebuilds cleanup.
 
 *amavisd-new-2.5.2 (05 Jul 2007)
 



1.12                 mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild?rev=1.12&view=markup
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
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

Index: amavisd-new-2.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- amavisd-new-2.4.1.ebuild	23 May 2007 22:51:10 -0000	1.11
+++ amavisd-new-2.4.1.ebuild	27 Dec 2007 12:21:42 -0000	1.12
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 inherit eutils
 
@@ -59,7 +59,7 @@
 		epause
 	fi
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	if $(has_version mail-mta/courier) ; then
 		elog "Patching with courier support."
 		epatch "amavisd-new-courier.patch" || die "patch failed"
@@ -132,8 +132,8 @@
 	fi
 
 	for i in whitelist blacklist spam_lovers; do
-		if [ ! -f ${D}/${AMAVIS_ROOT}/${i} ]; then
-			touch ${D}/${AMAVIS_ROOT}/${i}
+		if [ ! -f "${D}"/${AMAVIS_ROOT}/${i} ]; then
+			touch "${D}"/${AMAVIS_ROOT}/${i}
 		fi
 	done
 
@@ -141,9 +141,9 @@
 		if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then
 			elog "Setting up initial razor config files..."
 
-			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
+			razor-admin -create -home="${D}"/${AMAVIS_ROOT}/.razor
 			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
-				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
+				"${D}"/${AMAVIS_ROOT}/.razor/razor-agent.conf
 		else
 			elog "Copying existing razor config files..."
 			insinto ${AMAVIS_ROOT}/.razor
@@ -151,8 +151,8 @@
 		fi
 	fi
 
-	find ${D}/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
-	find ${D}/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
+	find "${D}"/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
+	find "${D}"/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
 }
 
 pkg_preinst() {



1.1                  mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.5.3.ebuild?rev=1.1&view=markup
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

Index: amavisd-new-2.5.3.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $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 $

inherit eutils

DESCRIPTION="High-performance interface between the MTA and content checkers."
HOMEPAGE="http://www.ijs.si/software/amavisd/"
SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="courier ldap milter mysql postgres qmail"

DEPEND=">=sys-apps/sed-4
	>=dev-lang/perl-5.8.2"

RDEPEND="${DEPEND}
	>=sys-apps/coreutils-5.0-r3
	app-arch/gzip
	app-arch/bzip2
	app-arch/arc
	app-arch/cabextract
	app-arch/freeze
	app-arch/lha
	app-arch/unarj
	app-arch/unrar
	app-arch/zoo
	>=dev-perl/Archive-Zip-1.14
	>=dev-perl/Compress-Zlib-1.35
	dev-perl/Convert-TNEF
	>=dev-perl/Convert-UUlib-1.08
	virtual/perl-MIME-Base64
	>=dev-perl/MIME-tools-5.415
	>=dev-perl/MailTools-1.58
	>=dev-perl/net-server-0.91
	virtual/perl-Digest-MD5
	dev-perl/IO-stringy
	>=virtual/perl-Time-HiRes-1.49
	dev-perl/Unix-Syslog
	>=sys-libs/db-3.2
	dev-perl/BerkeleyDB
	virtual/mta
	ldap? ( >=dev-perl/perl-ldap-0.33 )
	mysql? ( dev-perl/DBD-mysql )
	postgres? ( dev-perl/DBD-Pg )
	milter? ( || ( >=mail-mta/sendmail-8.12 mail-filter/libmilter ) )"

AMAVIS_ROOT="/var/amavis"

src_unpack() {
	unpack ${A}
	cd "${S}"

	if use courier ; then
		epatch amavisd-new-courier.patch
	fi

	if use qmail ; then
		epatch amavisd-new-qmqpqq.patch
	fi

	epatch "${FILESDIR}/${PN}-2.4.4-amavisd.conf-gentoo.patch"
}

src_compile() {
	if use milter ; then
		cd "${S}/helper-progs"

		econf --with-runtime-dir=${AMAVIS_ROOT} \
			--with-sockname=${AMAVIS_ROOT}/amavisd.sock \
			--with-user=amavis || die "helper-progs econf failed"
		emake || die "helper-progs compile problem"

		cd "${S}"
	fi
}

src_install() {
	dosbin amavisd amavisd-agent amavisd-nanny amavisd-release
	dobin p0f-analyzer.pl

	insinto /etc
	insopts -m0640
	newins amavisd.conf-sample amavisd.conf

	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
		/etc/amavisd.conf

	newinitd "${FILESDIR}/amavisd.rc6" amavisd
	dosed "s:/var/run/amavis/:$AMAVIS_ROOT/:g" /etc/init.d/amavisd

	keepdir ${AMAVIS_ROOT}
	keepdir ${AMAVIS_ROOT}/db
	keepdir ${AMAVIS_ROOT}/quarantine
	keepdir ${AMAVIS_ROOT}/tmp

	newdoc test-messages/README README.samples
	dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES README_FILES/README.* \
		test-messages/sample* amavisd.conf-default amavisd-agent \
		amavisd-custom.conf

	dodir /usr/share/doc/${PF}/html
	insinto /usr/share/doc/${PF}/html
	doins README_FILES/*.{html,css}
	dodir /usr/share/doc/${PF}/html/images
	insinto /usr/share/doc/${PF}/html/images
	doins README_FILES/images/*

	if use milter ; then
		cd "${S}/helper-progs"
		einstall
		cd "${S}"
	fi

	for i in whitelist blacklist spam_lovers; do
		if [ -f ${AMAVIS_ROOT}/${i} ]; then
			cp "${AMAVIS_ROOT}/${i}" "${D}/${AMAVIS_ROOT}"
		else
			touch "${D}"/${AMAVIS_ROOT}/${i}
		fi
	done

	if use ldap ; then
		elog "Adding ${P} schema to openldap schema dir."
		dodir /etc/openldap/schema
		insinto /etc/openldap/schema
		insopts -o root -g root -m 644
		newins LDAP.schema ${PN}.schema || die
		newins LDAP.schema ${PN}.schema.default || die
	fi

	find "${D}"/${AMAVIS_ROOT} -name "*" -type d -exec chmod 0750 \{\} \;
	find "${D}"/${AMAVIS_ROOT} -name "*" -type f -exec chmod 0640 \{\} \;
}

pkg_preinst() {
	enewgroup amavis
	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis

	if [ -z "$(dnsdomainname)" ] ; then
		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(hostname)';:" \
			/etc/amavisd.conf
	else
		dosed "s:^#\\?\\\$mydomain[^;]*;:\$mydomain = '$(dnsdomainname)';:" \
			/etc/amavisd.conf
	fi

	if has_version mail-filter/razor ; then
		if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then
			elog "Setting up initial razor config files..."

			razor-admin -create -home="${D}"/${AMAVIS_ROOT}/.razor
			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
				"${D}"/${AMAVIS_ROOT}/.razor/razor-agent.conf
		fi
	fi
}

pkg_postinst() {
	if ! has_version mail-filter/spamassassin ; then
		echo
		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
		elog "will be performed without it. Since you do not have SpamAssassin installed,"
		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
		elog "and comment out the line containing: "
		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
	fi
	echo
	ewarn "As of amavisd-new-2.4.5 p0f-analyzer.pl only binds to the loopback interface"
	ewarn "by default instead of to all interfaces. You will need to change $bind_addr"
	ewarn "in p0f-analyzer.pl to '0.0.0.0' if p0f-analyzer.pl is running on a different"
	ewarn "host from amavisd or from other querying clients."
	echo
	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
	echo
	chmod o-rwx /etc/amavisd.conf
	chown root:amavis /etc/amavisd.conf
	chown -R amavis:amavis ${AMAVIS_ROOT}
}



-- 
gentoo-commits@g.o mailing list