From 9f064eac14e4d1dec3286c5d8d219ab808643104 Mon Sep 17 00:00:00 2001 From: Jory Pratt Date: Tue, 10 May 2005 02:07:43 +0000 Subject: wrong ebuilds and patches added oops (Portage version: 2.0.51.21-r1) --- net-mail/vpopmail/ChangeLog | 6 +- .../vpopmail/files/vpopmail-5.4.9-Makefile.patch | 12 - net-mail/vpopmail/vpopmail-5.4.9-r2.ebuild | 246 --------------------- 3 files changed, 5 insertions(+), 259 deletions(-) delete mode 100644 net-mail/vpopmail/files/vpopmail-5.4.9-Makefile.patch delete mode 100644 net-mail/vpopmail/vpopmail-5.4.9-r2.ebuild (limited to 'net-mail') diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog index fd388bfbd4c6..b3e1bafbdf64 100644 --- a/net-mail/vpopmail/ChangeLog +++ b/net-mail/vpopmail/ChangeLog @@ -1,6 +1,10 @@ # 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.54 2005/05/10 02:03:17 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.55 2005/05/10 02:07:43 anarchy Exp $ + + 10 May 2005; -files/vpopmail-5.4.9-Makefile.patch, + -vpopmail-5.4.9-r2.ebuild: + wrong ebuilds and patches were added OOPS *vpopmail-5.4.9-r2 (10 May 2005) diff --git a/net-mail/vpopmail/files/vpopmail-5.4.9-Makefile.patch b/net-mail/vpopmail/files/vpopmail-5.4.9-Makefile.patch deleted file mode 100644 index d121dd569a31..000000000000 --- a/net-mail/vpopmail/files/vpopmail-5.4.9-Makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- Makefile.am.orig 2005-05-09 21:51:12.464218936 -0400 -+++ Makefile.am 2005-05-09 21:51:46.631024792 -0400 -@@ -16,7 +16,8 @@ - MYSQLCONF=$(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql - VLIMITS=$(DESTDIR)@vpopmaildir@/etc/vlimits.default - --libvpopmail_a_SOURCES=$(COMMONSOURCES) -+libvpopmail_a_SOURCES=$(COMMONSOURCES) -+libvpopmail_a_CFLAGS= $CFLAGS -fPIC - libvpopmail_a_LIBADD = cdb/*.o - - vpopmailbindir=@vpopmaildir@/bin diff --git a/net-mail/vpopmail/vpopmail-5.4.9-r2.ebuild b/net-mail/vpopmail/vpopmail-5.4.9-r2.ebuild deleted file mode 100644 index f16289b17bc6..000000000000 --- a/net-mail/vpopmail/vpopmail-5.4.9-r2.ebuild +++ /dev/null @@ -1,246 +0,0 @@ -# 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.9-r2.ebuild,v 1.1 2005/05/10 02:03:17 anarchy Exp $ - -inherit eutils gnuconfig fixheadtails flag-o-matic - -# 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 /bin/false ${VPOP_DEFAULT_HOME} vpopmail - upgradewarning -} - -src_unpack() { - - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${P}-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" - epatch ${FILESDIR}/vpopmail-cdb-Makefile.patch || die "failed to patch cdb Makefile" - epatch ${FILESDIR}/${P}-Makefile.patch || die "failed to patch Makefile.am" -} - -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 \ - 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:root ${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." -} -- cgit v1.2.3-65-gdbad