From 5af1e322deb5f95e1dc3e038d492d2a42731e5b0 Mon Sep 17 00:00:00 2001 From: Eray Aslan Date: Wed, 26 Jan 2011 13:43:00 +0000 Subject: version bump and remove old for beta version (Portage version: 2.1.9.35/cvs/Linux x86_64) --- mail-filter/amavisd-new/ChangeLog | 8 +- .../amavisd-new/amavisd-new-2.7.0_pre12.ebuild | 171 -------------------- .../amavisd-new/amavisd-new-2.7.0_pre13.ebuild | 172 +++++++++++++++++++++ 3 files changed, 179 insertions(+), 172 deletions(-) delete mode 100644 mail-filter/amavisd-new/amavisd-new-2.7.0_pre12.ebuild create mode 100644 mail-filter/amavisd-new/amavisd-new-2.7.0_pre13.ebuild (limited to 'mail-filter') diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog index bb997f3c1366..a388a70879e5 100644 --- a/mail-filter/amavisd-new/ChangeLog +++ b/mail-filter/amavisd-new/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for mail-filter/amavisd-new # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.160 2011/01/12 12:31:22 eras Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.161 2011/01/26 13:43:00 eras Exp $ + +*amavisd-new-2.7.0_pre13 (26 Jan 2011) + + 26 Jan 2011; Eray Aslan -amavisd-new-2.7.0_pre12.ebuild, + +amavisd-new-2.7.0_pre13.ebuild: + Version bump and remove old - beta version 12 Jan 2011; Eray Aslan amavisd-new-2.7.0_pre12.ebuild: Add missing dependency. diff --git a/mail-filter/amavisd-new/amavisd-new-2.7.0_pre12.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.0_pre12.ebuild deleted file mode 100644 index c882e7dfa9b0..000000000000 --- a/mail-filter/amavisd-new/amavisd-new-2.7.0_pre12.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2011 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.7.0_pre12.ebuild,v 1.2 2011/01/12 12:31:22 eras Exp $ - -EAPI=3 - -inherit eutils - -MY_P="${P/_/-}" -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/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin" - -DEPEND=">=sys-apps/sed-4 - >=dev-lang/perl-5.8.2" - -RDEPEND="${DEPEND} - >=sys-apps/coreutils-5.0-r3 - app-arch/cpio - app-arch/gzip - app-arch/bzip2 - app-arch/arc - app-arch/cabextract - app-arch/freeze - app-arch/lha - app-arch/ncompress - app-arch/pax - app-arch/unarj - || ( app-arch/unrar app-arch/rar ) - app-arch/zoo - >=dev-perl/Archive-Zip-1.14 - >=virtual/perl-IO-Compress-1.35 - >=virtual/perl-Compress-Raw-Zlib-2.017 - 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-apps/file - >=sys-libs/db-4.4.20 - dev-perl/BerkeleyDB - dev-perl/Convert-BinHex - >=dev-perl/Mail-DKIM-0.31 - virtual/mta - ldap? ( >=dev-perl/perl-ldap-0.33 ) - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - razor? ( mail-filter/razor ) - snmp? ( net-analyzer/net-snmp ) - spamassassin? ( mail-filter/spamassassin )" - -AMAVIS_ROOT="/var/amavis" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - if use courier ; then - epatch amavisd-new-courier.patch - fi - - if use qmail ; then - epatch amavisd-new-qmqpqq.patch - fi - - sed -i \ - -e '/daemon/s/vscan/amavis/' \ - -e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \ - "${S}/amavisd.conf" || die "missing conf file" - - if ! use dkim ; then - sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \ - || die "missing conf file" - fi -} - -pkg_setup() { - enewgroup amavis - enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis -} - -src_install() { - dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \ - amavisd-signer || die - dobin p0f-analyzer.pl amavisd-submit || die - - if use snmp ; then - dosbin amavisd-snmp-subagent || die - dodoc AMAVIS-MIB.txt || die - fi - - insinto /etc - insopts -m0640 - doins amavisd.conf || die "doins failed" - - newinitd "${FILESDIR}/amavisd.initd" amavisd || die "initd failed" - - keepdir "${AMAVIS_ROOT}" - keepdir "${AMAVIS_ROOT}/db" - keepdir "${AMAVIS_ROOT}/quarantine" - keepdir "${AMAVIS_ROOT}/tmp" - keepdir "${AMAVIS_ROOT}/var" - - dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \ - amavisd.conf-default amavisd-custom.conf - - docinto README_FILES - dodoc README_FILES/README* - dohtml README_FILES/*.{html,css} - docinto README_FILES/images - dodoc README_FILES/images/*.png - docinto README_FILES/images/callouts - dodoc README_FILES/images/callouts/*.png - - docinto test-messages - dodoc test-messages/README - dodoc test-messages/sample.tar.gz.compl - - #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 - dodir /etc/openldap/schema - insinto /etc/openldap/schema - insopts -o root -g root -m 644 - newins LDAP.schema ${PN}.schema || die - fi -} - -pkg_preinst() { - if use razor ; then - if [ ! -d "${ROOT}${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 - - if ! use spamassassin ; then - elog "Disabling anti-spam code in amavisd.conf..." - sed -i -e \ - "/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \ - "${D}/etc/amavisd.conf" - fi - - if has_version "<${CATEGORY}/${PN}-2.7.0" ; then - elog "Amavisd-new ships with a short and condensed config file now." - elog "Transferring your current settings to the new format is" - elog "recommended for ease of future upgrades." - fi -} - -pkg_postinst() { - chown root:amavis "${ROOT}/etc/amavisd.conf" - chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}" -} diff --git a/mail-filter/amavisd-new/amavisd-new-2.7.0_pre13.ebuild b/mail-filter/amavisd-new/amavisd-new-2.7.0_pre13.ebuild new file mode 100644 index 000000000000..47ae60748cb4 --- /dev/null +++ b/mail-filter/amavisd-new/amavisd-new-2.7.0_pre13.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2011 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.7.0_pre13.ebuild,v 1.1 2011/01/26 13:43:00 eras Exp $ + +EAPI=3 + +inherit eutils + +MY_P="${P/_/-}" +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/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="courier dkim ldap mysql postgres qmail razor snmp spamassassin" + +DEPEND=">=sys-apps/sed-4 + >=dev-lang/perl-5.8.2" + +RDEPEND="${DEPEND} + >=sys-apps/coreutils-5.0-r3 + app-arch/cpio + app-arch/gzip + app-arch/bzip2 + app-arch/arc + app-arch/cabextract + app-arch/freeze + app-arch/lha + app-arch/ncompress + app-arch/pax + app-arch/unarj + app-arch/xz-utils + || ( app-arch/unrar app-arch/rar ) + app-arch/zoo + >=dev-perl/Archive-Zip-1.14 + >=virtual/perl-IO-Compress-1.35 + >=virtual/perl-Compress-Raw-Zlib-2.017 + 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-apps/file + >=sys-libs/db-4.4.20 + dev-perl/BerkeleyDB + dev-perl/Convert-BinHex + >=dev-perl/Mail-DKIM-0.31 + virtual/mta + ldap? ( >=dev-perl/perl-ldap-0.33 ) + mysql? ( dev-perl/DBD-mysql ) + postgres? ( dev-perl/DBD-Pg ) + razor? ( mail-filter/razor ) + snmp? ( net-analyzer/net-snmp ) + spamassassin? ( mail-filter/spamassassin )" + +AMAVIS_ROOT="/var/amavis" +S="${WORKDIR}/${MY_P}" + +src_prepare() { + if use courier ; then + epatch amavisd-new-courier.patch + fi + + if use qmail ; then + epatch amavisd-new-qmqpqq.patch + fi + + sed -i \ + -e '/daemon/s/vscan/amavis/' \ + -e "s:'/var/virusmails':\"\$MYHOME/quarantine\":" \ + "${S}/amavisd.conf" || die "missing conf file" + + if ! use dkim ; then + sed -i -e '/enable_dkim/s/1/0/' "${S}/amavisd.conf" \ + || die "missing conf file" + fi +} + +pkg_setup() { + enewgroup amavis + enewuser amavis -1 -1 "${AMAVIS_ROOT}" amavis +} + +src_install() { + dosbin amavisd amavisd-agent amavisd-nanny amavisd-release \ + amavisd-signer || die + dobin p0f-analyzer.pl amavisd-submit || die + + if use snmp ; then + dosbin amavisd-snmp-subagent || die + dodoc AMAVIS-MIB.txt || die + fi + + insinto /etc + insopts -m0640 + doins amavisd.conf || die "doins failed" + + newinitd "${FILESDIR}/amavisd.initd" amavisd || die "initd failed" + + keepdir "${AMAVIS_ROOT}" + keepdir "${AMAVIS_ROOT}/db" + keepdir "${AMAVIS_ROOT}/quarantine" + keepdir "${AMAVIS_ROOT}/tmp" + keepdir "${AMAVIS_ROOT}/var" + + dodoc AAAREADME.first INSTALL MANIFEST RELEASE_NOTES TODO \ + amavisd.conf-default amavisd-custom.conf + + docinto README_FILES + dodoc README_FILES/README* + dohtml README_FILES/*.{html,css} + docinto README_FILES/images + dodoc README_FILES/images/*.png + docinto README_FILES/images/callouts + dodoc README_FILES/images/callouts/*.png + + docinto test-messages + dodoc test-messages/README + dodoc test-messages/sample.tar.gz.compl + + #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 + dodir /etc/openldap/schema + insinto /etc/openldap/schema + insopts -o root -g root -m 644 + newins LDAP.schema ${PN}.schema || die + fi +} + +pkg_preinst() { + if use razor ; then + if [ ! -d "${ROOT}${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 + + if ! use spamassassin ; then + elog "Disabling anti-spam code in amavisd.conf..." + sed -i -e \ + "/^#[[:space:]]*@bypass_spam_checks_maps[[:space:]]*=[[:space:]]*(1)/s/^#//" \ + "${D}/etc/amavisd.conf" + fi + + if has_version "<${CATEGORY}/${PN}-2.7.0" ; then + elog "Amavisd-new ships with a short and condensed config file now." + elog "Transferring your current settings to the new format is" + elog "recommended for ease of future upgrades." + fi +} + +pkg_postinst() { + chown root:amavis "${ROOT}/etc/amavisd.conf" + chown -R amavis:amavis "${ROOT}/${AMAVIS_ROOT}" +} -- cgit v1.2.3-65-gdbad