revision bump, -fPIC added upstream
authorJory Pratt <anarchy@gentoo.org>
Thu, 3 Nov 2005 04:02:26 +0000 (04:02 +0000)
committerJory Pratt <anarchy@gentoo.org>
Thu, 3 Nov 2005 04:02:26 +0000 (04:02 +0000)
Package-Manager: portage-2.0.53_rc7

net-mail/vpopmail/ChangeLog
net-mail/vpopmail/Manifest
net-mail/vpopmail/files/digest-vpopmail-5.4.13 [new file with mode: 0644]
net-mail/vpopmail/vpopmail-5.4.13.ebuild [new file with mode: 0644]

index 75b5b58d9e118e9010124e0975b0db22b13fa833..8cb2e17bff015dc7f2a1390bdd644a00c67c6be0 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/vpopmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.61 2005/08/24 09:33:08 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.62 2005/11/03 04:02:26 anarchy Exp $
+
+*vpopmail-5.4.13 (03 Nov 2005)
+
+  03 Nov 2005; Jory A. Pratt <anarchy@gentoo.org> +vpopmail-5.4.13.ebuild:
+  revision bump, -fPIC support added upstream
 
   24 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
   vpopmail-5.4.6-r1.ebuild, vpopmail-5.4.9-r2.ebuild,
index 5fbacb85389797bfd3b77658aad4594ee5edafa2..6209ca3f20ce44d851f5462663907d48add1dea9 100644 (file)
@@ -1,27 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6c2f97b7d1bc24143fb775daf0ec27f5 vpopmail-5.4.9-r2.ebuild 7825
-MD5 99a7c3865421e69d06bb053a9940bee3 vpopmail-5.4.10.ebuild 7830
-MD5 2e61dc38b00dcafb76d248bbbb1c4b12 vpopmail-5.4.6-r1.ebuild 7636
-MD5 ed1e2d9c4678b62c6fce8c6bb87d9f05 ChangeLog 10098
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 8c6ca78a4c32c9a267dd9c3f7e9db5f1 files/vpopmail-Maildir-dotmaildir-fix.sh 1480
+MD5 3dbc9ad11a6c2b5a46d4bf5c87ece431 ChangeLog 10254
 MD5 3041a3223960dc956b67ac1230f00db7 files/99vpopmail 86
-MD5 aa40d1572827d929f64cdcdabb71f437 files/vpopmail-fPIC.patch 7397
-MD5 7bdd629eebc8f1ea4ba47e8cd4f3f3eb files/vpopmail-5.2.1-showall.patch 754
-MD5 4b9ecca5815031b05bd173888da4d228 files/vpopmail-cdb-Makefile.patch 363
+MD5 175cc82c17dfbb2ab785271ff71e8f5c files/digest-vpopmail-5.4.10 67
+MD5 932b241ee21fdbe7601622592f4ef78e files/digest-vpopmail-5.4.13 67
 MD5 1c75d4c70c599202edf1d9599bf40ef2 files/digest-vpopmail-5.4.6-r1 66
 MD5 aea08e2e6df4cf89a2a32a8817cc7135 files/digest-vpopmail-5.4.9-r2 66
+MD5 7bdd629eebc8f1ea4ba47e8cd4f3f3eb files/vpopmail-5.2.1-showall.patch 754
+MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.6-access.violation.patch 918
 MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.9-access.violation.patch 918
-MD5 63284ad7aa0644157e4b754b969a8421 files/vpopmail.conf 466
+MD5 8c6ca78a4c32c9a267dd9c3f7e9db5f1 files/vpopmail-Maildir-dotmaildir-fix.sh 1480
+MD5 4b9ecca5815031b05bd173888da4d228 files/vpopmail-cdb-Makefile.patch 363
+MD5 aa40d1572827d929f64cdcdabb71f437 files/vpopmail-fPIC.patch 7397
 MD5 851f9c731b7d03472a08ee21c046823d files/vpopmail.clearopensmtp 235
-MD5 eb33b7205c4d4d75c4fc3710d7774e07 files/vpopmail-5.4.6-access.violation.patch 918
-MD5 175cc82c17dfbb2ab785271ff71e8f5c files/digest-vpopmail-5.4.10 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDDD75ViELBEf1JB0RAs/YAJ9NhfYIbbr958J1MF6mP/1M2chgbACeKJHv
-fhvxn29rN0LKwSfhzaE1FSA=
-=R8tm
------END PGP SIGNATURE-----
+MD5 63284ad7aa0644157e4b754b969a8421 files/vpopmail.conf 466
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 99a7c3865421e69d06bb053a9940bee3 vpopmail-5.4.10.ebuild 7830
+MD5 324ec743fecd3312d323f90b94bb948b vpopmail-5.4.13.ebuild 7678
+MD5 2e61dc38b00dcafb76d248bbbb1c4b12 vpopmail-5.4.6-r1.ebuild 7636
+MD5 6c2f97b7d1bc24143fb775daf0ec27f5 vpopmail-5.4.9-r2.ebuild 7825
diff --git a/net-mail/vpopmail/files/digest-vpopmail-5.4.13 b/net-mail/vpopmail/files/digest-vpopmail-5.4.13
new file mode 100644 (file)
index 0000000..a221895
--- /dev/null
@@ -0,0 +1 @@
+MD5 da0bf4dd773ec725171dc6d41ee4b3cd vpopmail-5.4.13.tar.gz 434719
diff --git a/net-mail/vpopmail/vpopmail-5.4.13.ebuild b/net-mail/vpopmail/vpopmail-5.4.13.ebuild
new file mode 100644 (file)
index 0000000..b3ea047
--- /dev/null
@@ -0,0 +1,250 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.13.ebuild,v 1.1 2005/11/03 04:02:26 anarchy Exp $
+
+inherit eutils gnuconfig fixheadtails
+
+# TODO: all ldap, sybase support
+#MY_PV=${PV/_/-}
+#MY_P=${PN}-${MY_PV}
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail or Postfix mail servers."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+IUSE="mysql ipalias clearpasswd"
+# vpopmail will NOT build if non-root.
+RESTRICT="nouserpriv"
+DEPEND_COMMON="mail-mta/qmail
+       mysql? ( >=dev-db/mysql-3.23 )"
+DEPEND="sys-apps/sed
+       sys-apps/ucspi-tcp
+       ${DEPEND_COMMON}"
+RDEPEND="${DEPEND_COMMON}
+       virtual/cron"
+
+# S="${WORKDIR}/${MY_P}"
+
+# Define vpopmail home dir in /etc/password if different
+VPOP_DEFAULT_HOME="/var/vpopmail"
+VPOP_HOME="$VPOP_DEFAULT_HOME"
+
+# This makes sure the variable is set, and that it isn't null.
+vpopmail_set_homedir() {
+       VPOP_HOME=`getent passwd vpopmail | cut -d: -f6`
+       if [ -z "$VPOP_HOME" ]; then
+               echo -ne "\a"
+               eerror "vpopmail's home directory is null in passwd data!"
+               eerror "You probably want to check that out."
+               eerror "Continuing with default."
+               VPOP_HOME="${VPOP_DEFAULT_HOME}"
+       else
+               einfo "Setting VPOP_HOME to: $VPOP_HOME"
+       fi
+}
+
+pkg_setup() {
+       enewgroup vpopmail 89
+       enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
+       upgradewarning
+}
+
+src_unpack() {
+       # cd ${WORKDIR}
+       # unpack ${MY_P}.tar.gz
+       unpack ${A}
+       cd ${S}
+
+       epatch ${FILESDIR}/${PN}-5.4.9-access.violation.patch || die "failed to patch."
+
+       sed -i \
+               's|Maildir|.maildir|g' \
+               vchkpw.c vconvert.c vdelivermail.c \
+               vpopbull.c vpopmail.c vqmaillocal.c \
+               vuserinfo.c maildirquota.c \
+               || die "failed to change Maildir to .maildir"
+       sed -i \
+               '/printf.*vpopmail/s:vpopmail (:(:' \
+               vdelivermail.c vpopbull.c vqmaillocal.c \
+               || die "failed to remove vpopmail advertisement"
+
+       gnuconfig_update
+       autoconf || die "reconfigure failed."
+       ht_fix_file ${S}/cdb/Makefile || die "failed to fix file"
+}
+
+src_compile() {
+       vpopmail_set_homedir
+
+       use ipalias \
+               && myopts="${myopts} --enable-ip-alias-domains=y" \
+               || myopts="${myopts} --enable-ip-alias-domains=n"
+
+       use mysql \
+               && myopts="${myopts} --enable-auth-module=mysql \
+                       --enable-libs=/usr/include/mysql \
+                       --enable-libdir=/usr/lib/mysql \
+                       --enable-sql-logging=y \
+                       --enable-auth-logging=y \
+                       --enable-valias=y \
+                       --enable-mysql-replication=n \
+                       --enable-mysql-limits"
+
+       # Bug 20127
+       use clearpasswd \
+               && myopts="${myopts} --enable-clear-passwd=y" \
+               || myopts="${myopts} --enable-clear-passwd=n"
+
+       econf \
+               ${myopts} \
+               --sbindir=/usr/sbin \
+               --bindir=/usr/bin \
+               --sysconfdir=${VPOP_HOME}/etc \
+               --enable-qmaildir=/var/qmail \
+               --enable-qmail-newu=/var/qmail/bin/qmail-newu \
+               --enable-qmail-inject=/var/qmail/bin/qmail-inject \
+               --enable-qmail-newmrh=/var/qmail/bin/qmail-newmrh \
+               --enable-vpopuser=vpopmail \
+               --enable-many-domains=y \
+               --enable-vpopgroup=vpopmail \
+               --enable-file-locking=y \
+               --enable-file-sync=y \
+               --enable-md5-passwords=y \
+               --enable-logging=y \
+               --enable-log-name=vpopmail \
+               --enable-qmail-ext \
+               --enable-domainquotas \
+               --disable-tcp-rules-prog --disable-tcpserver-file --disable-roaming-users \
+               || die
+
+       # TCPRULES for relaying is now considered obsolete, use relay-ctrl instead
+       #--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
+       #--enable-roaming-users=y --enable-relay-clear-minutes=60 \
+       #--disable-rebuild-tcpserver-file \
+
+       # Copy compile from automake-1.6 
+       cp /usr/share/automake-1.6/compile ./ || die "failed to copy file"
+
+       emake || die "Make failed."
+}
+
+src_install() {
+       vpopmail_set_homedir
+
+       make DESTDIR=${D} install || die
+       dosed ${VPOP_HOME}/etc/inc_deps
+       dosed ${VPOP_HOME}/etc/lib_deps
+
+       into /var/vpopmail
+       dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
+       into /usr
+
+       # Install documentation.
+       dodoc AUTHORS ChangeLog FAQ INSTALL README*
+       dodoc doc/doc_html/* doc/man_html/*
+       rm -rf ${D}/${VPOP_HOME}/doc
+       dosym /usr/share/doc/${PF}/ ${VPOP_HOME}/doc
+
+       # Create /etc/vpopmail.conf
+       if use mysql ; then
+               einfo "Installing vpopmail mysql configuration file"
+               dodir /etc
+               #config file position
+               mv ${D}/var/vpopmail/etc/vpopmail.mysql ${D}/etc/vpopmail.conf
+               dosym /etc/vpopmail.conf /var/vpopmail/etc/vpopmail.mysql
+               sed -e '12d' -i ${D}/etc/vpopmail.conf
+               echo '# Read-only DB' >>${D}/etc/vpopmail.conf
+               echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
+               echo '# Write DB' >>${D}/etc/vpopmail.conf
+               echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
+               # lock down perms
+               fperms 640 /etc/vpopmail.conf
+               fowners root:vpopmail /etc/vpopmail.conf
+       fi
+
+       # Install a proper cronjob instead of the old nastiness
+       #einfo "Installing cronjob"
+       #dodir /etc/cron.hourly
+       #insinto /etc/cron.hourly
+       #doins ${FILESDIR}/vpopmail.clearopensmtp
+       #fperms +x /etc/cron.hourly/vpopmail.clearopensmtp
+
+       einfo "Installing env.d entry"
+       dodir /etc/env.d
+       insinto /etc/env.d
+       doins ${FILESDIR}/99vpopmail
+
+       # Configure b0rked. We'll do this manually
+       #echo "-I${VPOP_HOME}/include" > ${D}/${VPOP_HOME}/etc/inc_deps
+       #local libs_extra
+       #use mysql && libs_extra="-L/usr/lib/mysql -lmysqlclient -lz" || libs_extra=""
+       #echo "-L${VPOP_HOME}/lib -lvpopmail ${libs_extra}" > ${D}/${VPOP_HOME}/etc/lib_deps
+
+       einfo "Locking down vpopmail permissions"
+       # secure things more, i don't want the vpopmail user being able to write this stuff!
+       chown -R root:0 ${D}${VPOP_HOME}/{bin,etc,include}
+       chown root:vpopmail ${D}${VPOP_HOME}/bin/vchkpw
+       chmod 4711 ${D}${VPOP_HOME}/bin/vchkpw
+}
+
+pkg_preinst() {
+       vpopmail_set_homedir
+
+       # Keep DATA
+       keepdir ${VPOP_HOME}/domains
+
+       # This is a workaround until portage handles binary packages+users better.
+       pkg_setup
+
+       upgradewarning
+}
+
+pkg_postinst() {
+       einfo "Performing post-installation routines for ${P}."
+
+       if use mysql ; then
+               echo
+               einfo "You have 'mysql' turned on in your USE"
+               einfo "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+               einfo "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+               echo
+               einfo "First log into mysql as your mysql root user and pass. Then:"
+               einfo "> create database vpopmail;"
+               einfo "> use mysql;"
+               einfo "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+               einfo "  vpopmail@localhost identified by 'your password';"
+               einfo "> flush privileges;"
+               echo
+               einfo "If you have problems with vpopmail not accepting mail properly,"
+               einfo "please ensure that /etc/vpopmail.conf is chmod 640 and"
+               einfo "owned by root:vpopmail"
+       fi
+       # do this for good measure
+       if [ -e /etc/vpopmail.conf ] ; then
+               chmod 640 /etc/vpopmail.conf
+               chown root:vpopmail /etc/vpopmail.conf
+       fi
+
+       upgradewarning
+}
+
+pkg_postrm() {
+       vpopmail_set_homedir
+
+       einfo "The vpopmail DATA will NOT be removed automatically."
+       einfo "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+       ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+       ewarn "The internal structure of the mail storage has changed for"
+       ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+       ewarn "script at /var/vpopmail/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+       ewarn "to upgrade your system! (It can do conversions both ways)."
+       ewarn "You should be able to run it right away without any changes."
+       echo
+       einfo "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+       einfo "using net-mail/relay-ctrl instead."
+}