diff options
-rw-r--r-- | mail-mta/postfix/ChangeLog | 8 | ||||
-rw-r--r-- | mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild | 10 | ||||
-rw-r--r-- | mail-mta/postfix/postfix-1.1.11.20020917.ebuild | 10 | ||||
-rw-r--r-- | mail-mta/postfix/postfix-2.0.11.ebuild | 22 | ||||
-rw-r--r-- | mail-mta/postfix/postfix-2.0.16-r1.ebuild | 32 | ||||
-rw-r--r-- | mail-mta/postfix/postfix-2.0.18.ebuild | 32 | ||||
-rw-r--r-- | mail-mta/postfix/postfix-2.0.19.ebuild | 32 | ||||
-rw-r--r-- | mail-mta/qmail-ldap/ChangeLog | 6 | ||||
-rw-r--r-- | mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild | 6 | ||||
-rw-r--r-- | mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild | 6 | ||||
-rw-r--r-- | mail-mta/qmail/ChangeLog | 6 | ||||
-rw-r--r-- | mail-mta/qmail/qmail-1.03-r10.ebuild | 6 | ||||
-rw-r--r-- | mail-mta/qmail/qmail-1.03-r11.ebuild | 6 | ||||
-rw-r--r-- | mail-mta/qmail/qmail-1.03-r9.ebuild | 6 | ||||
-rw-r--r-- | mail-mta/ssmtp/ChangeLog | 9 | ||||
-rw-r--r-- | mail-mta/ssmtp/ssmtp-2.60.4-r2.ebuild | 4 | ||||
-rw-r--r-- | mail-mta/ssmtp/ssmtp-2.60.4.ebuild | 4 | ||||
-rw-r--r-- | mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild | 6 | ||||
-rw-r--r-- | mail-mta/ssmtp/ssmtp-2.60.7.ebuild | 4 | ||||
-rw-r--r-- | mail-mta/ssmtp/ssmtp-2.60.9.ebuild | 12 |
20 files changed, 124 insertions, 103 deletions
diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog index 68778f255ea1..3893d2d78b70 100644 --- a/mail-mta/postfix/ChangeLog +++ b/mail-mta/postfix/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-mail/postfix # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.4 2004/06/05 12:35:25 g2boojum Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.5 2004/06/07 20:54:05 agriffis Exp $ + + 07 Jun 2004; Aron Griffis <agriffis@gentoo.org> + postfix-1.1.11.20020917-r1.ebuild, postfix-1.1.11.20020917.ebuild, + postfix-2.0.11.ebuild, postfix-2.0.16-r1.ebuild, postfix-2.0.18.ebuild, + postfix-2.0.19.ebuild: + Fix use invocation 05 Jun 2004; Grant Goodyear <g2boojum@gentoo.org> : Adding the new postfix to the tree (bug # 48796). Thanks to diff --git a/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild b/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild index 3c23739778a7..f89938bf22d9 100644 --- a/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild +++ b/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-1.1.11.20020917-r1.ebuild,v 1.2 2004/06/07 20:54:05 agriffis Exp $ IUSE="ssl mysql sasl ldap ipv6" @@ -51,13 +51,13 @@ src_unpack() { cd ${WORKDIR} unpack ${DISTFILES}/${PF_P}.tar.gz - if [ `use ssl` ] && [ `use ipv6` ] + if use ssl && use ipv6 then cd ${S} bzcat ${FILESDIR}/${IPV6_P}.patch.bz2 | patch -p1 || die "patch failed" CCARGS="${CCARGS} -DHAS_SSL" AUXLIBS="${AUXLIBS} -lssl -lcrypto" - elif [ `use ssl` ] + elif use ssl then unpack ${DISTFILES}/${TLS_P}.tar.gz cd ${S} @@ -70,7 +70,7 @@ src_unpack() { cp main.cf main.cf.orig sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf - if [ "`use sasl`" ] + if use sasl then if [ -e /usr/include/sasl/sasl.h ] then @@ -151,7 +151,7 @@ src_install () { exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp - if [ "`use sasl`" ] + if use sasl then if [ -e /usr/include/sasl.h ] then diff --git a/mail-mta/postfix/postfix-1.1.11.20020917.ebuild b/mail-mta/postfix/postfix-1.1.11.20020917.ebuild index f8acda5c22a9..520d2ee647d5 100644 --- a/mail-mta/postfix/postfix-1.1.11.20020917.ebuild +++ b/mail-mta/postfix/postfix-1.1.11.20020917.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-1.1.11.20020917.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-1.1.11.20020917.ebuild,v 1.2 2004/06/07 20:54:05 agriffis Exp $ IUSE="ssl mysql sasl ldap" @@ -51,13 +51,13 @@ src_unpack() { cd ${WORKDIR} unpack ${DISTFILES}/${PF_P}.tar.gz - if [ `use ssl` ] && [ `use ipv6` ] + if use ssl && use ipv6 then cd ${S} bzcat ${FILESDIR}/${IPV6_P}.patch.bz2 | patch -p1 || die "patch failed" CCARGS="${CCARGS} -DHAS_SSL" AUXLIBS="${AUXLIBS} -lssl -lcrypto" - elif [ `use ssl` ] + elif use ssl then unpack ${DISTFILES}/${TLS_P}.tar.gz cd ${S} @@ -70,7 +70,7 @@ src_unpack() { cp main.cf main.cf.orig sed -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf.orig > main.cf - if [ "`use sasl`" ] + if use sasl then if [ -e /usr/include/sasl/sasl.h ] then @@ -151,7 +151,7 @@ src_install () { exeinto /etc/init.d ; newexe ${FILESDIR}/postfix.rc6 postfix insinto /etc/pam.d ; newins ${FILESDIR}/smtp.pam smtp - if [ "`use sasl`" ] + if use sasl then if [ -e /usr/include/sasl.h ] then diff --git a/mail-mta/postfix/postfix-2.0.11.ebuild b/mail-mta/postfix/postfix-2.0.11.ebuild index ca3edab1fd23..2e25f52ff8b8 100644 --- a/mail-mta/postfix/postfix-2.0.11.ebuild +++ b/mail-mta/postfix/postfix-2.0.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.11.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.11.ebuild,v 1.2 2004/06/07 20:54:05 agriffis Exp $ IUSE="ssl mysql sasl ldap ipv6 maildir mbox" @@ -90,8 +90,8 @@ pkg_setup() { src_unpack() { unpack ${P}.tar.gz cd ${S} - if [ "`use ssl`" ]; then - if [ "`use ipv6`" ]; then + if use ssl; then + if use ipv6; then epatch ${DISTDIR}/${IPV6_TLS_P}.patch.gz else unpack ${TLS_P}.tar.gz @@ -99,13 +99,13 @@ src_unpack() { fi CCARGS="${CCARGS} -DHAS_SSL" AUXLIBS="${AUXLIBS} -lssl -lcrypto" - elif [ "`use ipv6`" ]; then + elif use ipv6; then epatch ${DISTDIR}/${IPV6_P}.patch.gz fi cd ${S}/conf sed -i -e "s:/usr/libexec/postfix:/usr/lib/postfix:" main.cf - if [ "`use sasl`" ] ; then + if use sasl ; then # sasl 2 if [ -f /usr/include/sasl/sasl.h ]; then AUXLIBS="${AUXLIBS} -lsasl2" @@ -120,17 +120,17 @@ src_unpack() { cd ${S}/src/global sed -i -e "s:/usr/libexec/postfix:/usr/lib/postfix:" mail_params.h - if [ "`use mysql`" ] ; then + if use mysql ; then CCARGS="${CCARGS} -DHAS_MYSQL -I/usr/include/mysql" AUXLIBS="${AUXLIBS} -lmysqlclient -lm -lz" fi - if [ "`use ldap`" ] ; then + if use ldap ; then CCARGS="${CCARGS} -DHAS_LDAP" AUXLIBS="${AUXLIBS} -lldap -llber" fi - if [ "`use pam`" ] ; then + if use pam ; then AUXLIBS="${AUXLIBS} -lpam" fi @@ -206,15 +206,15 @@ src_install () { insinto /etc/sasl2 doins ${FILESDIR}/smtpd.conf - if [ "`use sasl`" ] ; then + if use sasl ; then dodir /usr/lib/sasl2 dosym ../../../etc/sasl2/smtpd.conf /usr/lib/sasl2/smtpd.conf fi cd ${D}/etc/postfix - if [ "`use maildir`" ]; then + if use maildir; then sed -i -e "s:^#\(home_mailbox = \)Maildir/:\1.maildir/:" main.cf - elif [ "`use mbox`" ]; then + elif use mbox; then sed -i -e "s:^#\(mail_spool_directory = /var/spool/mail\):\1:" main.cf fi diff --git a/mail-mta/postfix/postfix-2.0.16-r1.ebuild b/mail-mta/postfix/postfix-2.0.16-r1.ebuild index 0b2e63577141..76308e990cbb 100644 --- a/mail-mta/postfix/postfix-2.0.16-r1.ebuild +++ b/mail-mta/postfix/postfix-2.0.16-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.16-r1.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.16-r1.ebuild,v 1.2 2004/06/07 20:54:05 agriffis Exp $ inherit eutils ssl-cert @@ -69,17 +69,17 @@ pkg_setup() { src_unpack() { unpack ${A} && cd "${S}" - if [ "`use ssl`" ] ; then - if [ "`use ipv6`" ] ; then + if use ssl ; then + if use ipv6 ; then epatch "${WORKDIR}/${IPV6_TLS_P}.patch" else epatch "${WORKDIR}/${TLS_P}/pfixtls.diff" fi - elif [ "`use ipv6`" ]; then + elif use ipv6; then epatch "${WORKDIR}/${IPV6_P}.patch" fi - if [ "`use postgres`" ] ; then + if use postgres ; then epatch "${DISTDIR}/${PGSQL_P}.patch" fi @@ -97,18 +97,18 @@ src_unpack() { src_compile() { local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread" - if [ "`use pam`" ] ; then + if use pam ; then mylibs="${mylibs} -lpam" fi - if [ "`use ldap`" ] ; then + if use ldap ; then mycc="${mycc} -DHAS_LDAP" mylibs="${mylibs} -lldap -llber" fi - if [ "`use mysql`" ] ; then + if use mysql ; then mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql" mylibs="${mylibs} -lmysqlclient -lm -lz" fi - if [ "`use postgres`" ] ; then + if use postgres ; then if [ "`best_version '=dev-db/postgresql-7.3*'`" ] ; then mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql" else @@ -116,11 +116,11 @@ src_compile() { fi mylibs="${mylibs} -lpq" fi - if [ "`use ssl`" ] ; then + if use ssl ; then mycc="${mycc} -DUSE_SSL" mylibs="${mylibs} -lssl -lcrypto" fi - if [ "`use sasl`" ] ; then + if use sasl ; then mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl" mylibs="${mylibs} -lsasl2" fi @@ -163,9 +163,9 @@ src_install () { keepdir /etc/postfix mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix" - if [ "`use maildir`" ] ; then + if use maildir ; then mypostconf="home_mailbox=.maildir/" - elif [ "`use mbox`" ] ; then + elif use mbox ; then mypostconf="mail_spool_directory=/var/spool/mail" fi "${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \ @@ -185,17 +185,17 @@ src_install () { dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES* dohtml html/* - if [ "`use pam`" ] ; then + if use pam ; then insinto /etc/pam.d newins "${FILESDIR}/smtp.pam" smtp fi - if [ "`use ssl`" ] ; then + if use ssl ; then SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}" insinto /etc/ssl/postfix docert server fowners postfix:mail /etc/ssl/postfix/server.{key,pem} fi - if [ "`use sasl`" ] ; then + if use sasl ; then insinto /etc/sasl2 newins "${FILESDIR}/smtp.sasl" smtpd.conf fi diff --git a/mail-mta/postfix/postfix-2.0.18.ebuild b/mail-mta/postfix/postfix-2.0.18.ebuild index 13bcc5c1b8ea..6d5489f6130c 100644 --- a/mail-mta/postfix/postfix-2.0.18.ebuild +++ b/mail-mta/postfix/postfix-2.0.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.18.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.18.ebuild,v 1.2 2004/06/07 20:54:05 agriffis Exp $ inherit eutils ssl-cert @@ -69,17 +69,17 @@ pkg_setup() { src_unpack() { unpack ${A} && cd "${S}" - if [ "`use ssl`" ] ; then - if [ "`use ipv6`" ] ; then + if use ssl ; then + if use ipv6 ; then epatch "${WORKDIR}/${IPV6_TLS_P}.patch" else epatch "${WORKDIR}/${TLS_P}/pfixtls.diff" fi - elif [ "`use ipv6`" ]; then + elif use ipv6; then epatch "${WORKDIR}/${IPV6_P}.patch" fi - if [ "`use postgres`" ] ; then + if use postgres ; then epatch "${DISTDIR}/${PGSQL_P}.patch" fi @@ -97,18 +97,18 @@ src_unpack() { src_compile() { local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread" - if [ "`use pam`" ] ; then + if use pam ; then mylibs="${mylibs} -lpam" fi - if [ "`use ldap`" ] ; then + if use ldap ; then mycc="${mycc} -DHAS_LDAP" mylibs="${mylibs} -lldap -llber" fi - if [ "`use mysql`" ] ; then + if use mysql ; then mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql" mylibs="${mylibs} -lmysqlclient -lm -lz" fi - if [ "`use postgres`" ] ; then + if use postgres ; then if [ "`best_version '=dev-db/postgresql-7.3*'`" ] ; then mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql" else @@ -116,11 +116,11 @@ src_compile() { fi mylibs="${mylibs} -lpq" fi - if [ "`use ssl`" ] ; then + if use ssl ; then mycc="${mycc} -DUSE_SSL" mylibs="${mylibs} -lssl -lcrypto" fi - if [ "`use sasl`" ] ; then + if use sasl ; then mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl" mylibs="${mylibs} -lsasl2" fi @@ -163,9 +163,9 @@ src_install () { keepdir /etc/postfix mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix" - if [ "`use maildir`" ] ; then + if use maildir ; then mypostconf="home_mailbox=.maildir/" - elif [ "`use mbox`" ] ; then + elif use mbox ; then mypostconf="mail_spool_directory=/var/spool/mail" fi "${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \ @@ -185,17 +185,17 @@ src_install () { dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES* dohtml html/* - if [ "`use pam`" ] ; then + if use pam ; then insinto /etc/pam.d newins "${FILESDIR}/smtp.pam" smtp fi - if [ "`use ssl`" ] ; then + if use ssl ; then SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}" insinto /etc/ssl/postfix docert server fowners postfix:mail /etc/ssl/postfix/server.{key,pem} fi - if [ "`use sasl`" ] ; then + if use sasl ; then insinto /etc/sasl2 newins "${FILESDIR}/smtp.sasl" smtpd.conf fi diff --git a/mail-mta/postfix/postfix-2.0.19.ebuild b/mail-mta/postfix/postfix-2.0.19.ebuild index 5c3f9b9ea82c..5ce7c73c2c6e 100644 --- a/mail-mta/postfix/postfix-2.0.19.ebuild +++ b/mail-mta/postfix/postfix-2.0.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19.ebuild,v 1.1 2004/05/30 09:38:31 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.0.19.ebuild,v 1.2 2004/06/07 20:54:05 agriffis Exp $ inherit eutils ssl-cert @@ -69,17 +69,17 @@ pkg_setup() { src_unpack() { unpack ${A} && cd "${S}" - if [ "`use ssl`" ] ; then - if [ "`use ipv6`" ] ; then + if use ssl ; then + if use ipv6 ; then epatch "${WORKDIR}/${IPV6_TLS_P}.patch" else epatch "${WORKDIR}/${TLS_P}/pfixtls.diff" fi - elif [ "`use ipv6`" ]; then + elif use ipv6; then epatch "${WORKDIR}/${IPV6_P}.patch" fi - if [ "`use postgres`" ] ; then + if use postgres ; then epatch "${DISTDIR}/${PGSQL_P}.patch" fi @@ -97,18 +97,18 @@ src_unpack() { src_compile() { local mycc="-DHAS_PCRE" mylibs="-L/usr/lib -lpcre -ldl -lcrypt -lpthread" - if [ "`use pam`" ] ; then + if use pam ; then mylibs="${mylibs} -lpam" fi - if [ "`use ldap`" ] ; then + if use ldap ; then mycc="${mycc} -DHAS_LDAP" mylibs="${mylibs} -lldap -llber" fi - if [ "`use mysql`" ] ; then + if use mysql ; then mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql" mylibs="${mylibs} -lmysqlclient -lm -lz" fi - if [ "`use postgres`" ] ; then + if use postgres ; then if [ "`best_version '=dev-db/postgresql-7.3*'`" ] ; then mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql" else @@ -116,11 +116,11 @@ src_compile() { fi mylibs="${mylibs} -lpq" fi - if [ "`use ssl`" ] ; then + if use ssl ; then mycc="${mycc} -DUSE_SSL" mylibs="${mylibs} -lssl -lcrypto" fi - if [ "`use sasl`" ] ; then + if use sasl ; then mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl" mylibs="${mylibs} -lsasl2" fi @@ -166,9 +166,9 @@ src_install () { keepdir /etc/postfix mv "${D}/usr/share/doc/${PF}/defaults/"{*.cf,post*-*} "${D}/etc/postfix" - if [ "`use maildir`" ] ; then + if use maildir ; then mypostconf="home_mailbox=.maildir/" - elif [ "`use mbox`" ] ; then + elif use mbox ; then mypostconf="mail_spool_directory=/var/spool/mail" fi "${D}/usr/sbin/postconf" -c "${D}/etc/postfix" -e \ @@ -188,17 +188,17 @@ src_install () { dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES* dohtml html/* - if [ "`use pam`" ] ; then + if use pam ; then insinto /etc/pam.d newins "${FILESDIR}/smtp.pam" smtp fi - if [ "`use ssl`" ] ; then + if use ssl ; then SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}" insinto /etc/ssl/postfix docert server fowners postfix:mail /etc/ssl/postfix/server.{key,pem} fi - if [ "`use sasl`" ] ; then + if use sasl ; then insinto /etc/sasl2 newins "${FILESDIR}/smtp.sasl" smtpd.conf fi diff --git a/mail-mta/qmail-ldap/ChangeLog b/mail-mta/qmail-ldap/ChangeLog index 856955ead635..5f3a21f47e64 100644 --- a/mail-mta/qmail-ldap/ChangeLog +++ b/mail-mta/qmail-ldap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-mail/qmail-ldap # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/ChangeLog,v 1.1 2004/05/30 10:52:45 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/ChangeLog,v 1.2 2004/06/07 20:52:11 agriffis Exp $ + + 07 Jun 2004; Aron Griffis <agriffis@gentoo.org> qmail-ldap-1.03-r1.ebuild, + qmail-ldap-1.03-r2.ebuild: + Fix use invocation *qmail-ldap-1.03-r4 (06 Apr 2004) diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild index 9357e83d9e17..b7a79c6ca53e 100644 --- a/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild +++ b/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild,v 1.1 2004/05/30 10:52:45 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild,v 1.2 2004/06/07 20:52:11 agriffis Exp $ IUSE="ssl" @@ -77,7 +77,7 @@ src_unpack() { #SMTP_AUTH PATCH epatch ${DISTDIR}/smtp-auth-20030301.patch || die "SMTP_AUTH patch did not apply" - if [ `use ssl` ]; then + if use ssl; then use ssl && { epatch ${FILESDIR}/tls.patch.bz2 || die "tls+auth patch failed"; } fi @@ -310,7 +310,7 @@ pkg_postinst() { echo -e "\e[32;01m ldap settings and add the qmail.schema to your slapd.conf. For sample ldifs,\033[0m" echo -e "\e[32;01m please check /usr/share/doc/${PN}-${PV}-${PR}/samples.ldif.gz \033[0m" - if [ `use ssl` ]; then + if use ssl; then echo "Creating a self-signed ssl-cert:" /usr/bin/openssl req -new -x509 -nodes -out /var/qmail/control/servercert.pem -days 366 -keyout /var/qmail/control/servercert.pem chmod 640 /var/qmail/control/servercert.pem diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild index 842187a98ae9..f89b9b4e9ed1 100644 --- a/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild +++ b/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild,v 1.1 2004/05/30 10:52:45 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild,v 1.2 2004/06/07 20:52:11 agriffis Exp $ IUSE="ssl" @@ -73,7 +73,7 @@ src_unpack() { # If you really want, uncomment it yourself, as mail really should be in GMT #epatch ${DISTDIR}/qmail-date-localtime.patch.txt - if [ `use ssl` ]; then + if use ssl; then epatch ${DISTDIR}/${P}-r2-tls.patch.bz2 || die "tls+auth patch failed" fi @@ -315,7 +315,7 @@ pkg_postinst() { echo -e "\e[32;01m slapd.conf. For sample ldifs, please check \033[0m" echo -e "\e[32;01m /usr/share/doc/${PN}-${PV}-${PR}/samples.ldif.gz \033[0m" - if [ `use ssl` ]; then + if use ssl; then echo "Creating a self-signed ssl-cert:" /usr/bin/openssl req -new -x509 -nodes -out /var/qmail/control/servercert.pem -days 366 -keyout /var/qmail/control/servercert.pem chmod 640 /var/qmail/control/servercert.pem diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog index 7f0f337465f8..d3df6b177b81 100644 --- a/mail-mta/qmail/ChangeLog +++ b/mail-mta/qmail/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-mail/qmail # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.2 2004/06/05 09:34:28 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.3 2004/06/07 20:47:53 agriffis Exp $ + + 07 Jun 2004; Aron Griffis <agriffis@gentoo.org> qmail-1.03-r10.ebuild, + qmail-1.03-r11.ebuild, qmail-1.03-r9.ebuild: + Fix use invocation 05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> qmail-1.03-r15.ebuild: Stable on alpha. diff --git a/mail-mta/qmail/qmail-1.03-r10.ebuild b/mail-mta/qmail/qmail-1.03-r10.ebuild index e8cacd753c6f..bcc6e6b8c727 100644 --- a/mail-mta/qmail/qmail-1.03-r10.ebuild +++ b/mail-mta/qmail/qmail-1.03-r10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r10.ebuild,v 1.1 2004/05/30 10:50:13 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r10.ebuild,v 1.2 2004/06/07 20:47:53 agriffis Exp $ inherit gcc eutils @@ -79,7 +79,7 @@ src_unpack() { # Let the system decide how to define errno epatch ${FILESDIR}/${PV}-${PR}/errno.patch - if [ `use ssl` ]; then + if use ssl; then echo "gcc ${CFLAGS} -DTLS" > conf-cc else echo "gcc ${CFLAGS}" > conf-cc @@ -321,7 +321,7 @@ export qhost=`hostname --fqdn` tcprules /etc/tcp.smtp.cdb /etc/tcp.smtp.tmp < /etc/tcp.smtp - if [ `use ssl` ]; then + if use ssl; then if [ ! -f /var/qmail/control/servercert.pem ]; then echo "Creating a self-signed ssl-cert:" /usr/bin/openssl req -new -x509 -nodes -out /var/qmail/control/servercert.pem -days 366 -keyout /var/qmail/control/servercert.pem diff --git a/mail-mta/qmail/qmail-1.03-r11.ebuild b/mail-mta/qmail/qmail-1.03-r11.ebuild index 0d93a2c41f15..6f9c13406b61 100644 --- a/mail-mta/qmail/qmail-1.03-r11.ebuild +++ b/mail-mta/qmail/qmail-1.03-r11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r11.ebuild,v 1.1 2004/05/30 10:50:13 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r11.ebuild,v 1.2 2004/06/07 20:47:53 agriffis Exp $ inherit gcc eutils @@ -107,7 +107,7 @@ src_unpack() { cd ${S} - if [ `use ssl` ]; then + if use ssl; then echo "$(gcc-getCC) ${CFLAGS} -DTLS" > conf-cc else echo "$(gcc-getCC) ${CFLAGS}" > conf-cc @@ -338,7 +338,7 @@ pkg_config() { tcprules /etc/tcp.${i}.cdb /etc/tcp.${i}.tmp < /etc/tcp.${i} done - if [ `use ssl` ]; then + if use ssl; then if [ ! -f /var/qmail/control/servercert.pem ]; then echo "Creating a self-signed ssl-cert:" /usr/bin/openssl req -new -x509 -nodes -out /var/qmail/control/servercert.pem -days 366 -keyout /var/qmail/control/servercert.pem diff --git a/mail-mta/qmail/qmail-1.03-r9.ebuild b/mail-mta/qmail/qmail-1.03-r9.ebuild index b1f2bbd03619..5e4b8b53b02d 100644 --- a/mail-mta/qmail/qmail-1.03-r9.ebuild +++ b/mail-mta/qmail/qmail-1.03-r9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r9.ebuild,v 1.1 2004/05/30 10:50:13 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r9.ebuild,v 1.2 2004/06/07 20:47:53 agriffis Exp $ IUSE="ssl ldap" @@ -56,7 +56,7 @@ src_unpack() { echo "Applying QMAILQUEUE patch..." patch < ${FILESDIR}/${PV}-${PR}/qmail-queue.patch || die "qmail queue patch failed" - if [ `use ldap` ]; then + if use ldap; then echo "Applying ldap patches..." patch -p1 < ${WORKDIR}/qmail-ldap-1.03-20020901.patch || die "ldap patch failed" #patch -p1 < ${FILESDIR}/${PV}-${PR}/ldap-config.diff || die "ldap config patch failed" @@ -70,7 +70,7 @@ src_unpack() { use ssl && patch < ${FILESDIR}/${PV}-${PR}/qmail-1.03-starttls-smtp-auth.patch || die "tls+auth patch failed" fi - if [ `use ssl` ]; then + if use ssl; then echo "gcc ${CFLAGS} -DTLS" > conf-cc else echo "gcc ${CFLAGS}" > conf-cc diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog index 6009694cedf7..f8e31bcd5b20 100644 --- a/mail-mta/ssmtp/ChangeLog +++ b/mail-mta/ssmtp/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-mail/ssmtp # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.3 2004/06/06 23:09:56 g2boojum Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.4 2004/06/07 20:52:05 agriffis Exp $ + +*ssmtp-2.60.9 (07 Jun 2004) + + 07 Jun 2004; Aron Griffis <agriffis@gentoo.org> ssmtp-2.60.4-r2.ebuild, + ssmtp-2.60.4.ebuild, ssmtp-2.60.7-r1.ebuild, ssmtp-2.60.7.ebuild, + ssmtp-2.60.9.ebuild: + Fix use invocation 06 Jun 2004; Grant Goodyear <g2boojum@gentoo.org> : Version bump. Patches no longer required. Fixes STARTTLS before ehlo bug. diff --git a/mail-mta/ssmtp/ssmtp-2.60.4-r2.ebuild b/mail-mta/ssmtp/ssmtp-2.60.4-r2.ebuild index 515afb96899d..5bbd0461e13a 100644 --- a/mail-mta/ssmtp/ssmtp-2.60.4-r2.ebuild +++ b/mail-mta/ssmtp/ssmtp-2.60.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.4-r2.ebuild,v 1.2 2004/05/30 22:15:10 g2boojum Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.4-r2.ebuild,v 1.3 2004/06/07 20:52:05 agriffis Exp $ inherit eutils @@ -76,7 +76,7 @@ src_install() { # -e "s:_HOSTNAME_:${hostname}:" \ # -e "s:^mailhub=mail:mailhub=mail.${domainname}:g" \ # ${conffile}.orig > ${conffile}.pre - #if [ `use ssl` ]; + #if use ssl; #then # sed -e "s:^#UseTLS=YES:UseTLS=YES:g" \ # ${conffile}.pre > ${conffile} diff --git a/mail-mta/ssmtp/ssmtp-2.60.4.ebuild b/mail-mta/ssmtp/ssmtp-2.60.4.ebuild index 144c300df229..a68f47d7cb84 100644 --- a/mail-mta/ssmtp/ssmtp-2.60.4.ebuild +++ b/mail-mta/ssmtp/ssmtp-2.60.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.4.ebuild,v 1.1 2004/05/30 09:56:46 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.4.ebuild,v 1.2 2004/06/07 20:52:05 agriffis Exp $ inherit eutils @@ -72,7 +72,7 @@ src_install() { # -e "s:_HOSTNAME_:${hostname}:" \ # -e "s:^mailhub=mail:mailhub=mail.${domainname}:g" \ # ${conffile}.orig > ${conffile}.pre - #if [ `use ssl` ]; + #if use ssl; #then # sed -e "s:^#UseTLS=YES:UseTLS=YES:g" \ # ${conffile}.pre > ${conffile} diff --git a/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild b/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild index 23309afd3c95..1ce55e181f13 100644 --- a/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild +++ b/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild,v 1.4 2004/05/30 23:12:09 g2boojum Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild,v 1.5 2004/06/07 20:52:05 agriffis Exp $ inherit eutils @@ -52,7 +52,7 @@ src_install() { # See bug #7448 #dosym /usr/sbin/ssmtp /usr/bin/mail #The sendmail symlink is now handled by mailwrapper if used - ! use mailwrapper && \ + use mailwrapper || \ dosym /usr/sbin/ssmtp /usr/sbin/sendmail dosym /usr/sbin/sendmail /usr/lib/sendmail doman ssmtp.8 @@ -79,7 +79,7 @@ src_install() { # -e "s:_HOSTNAME_:${hostname}:" \ # -e "s:^mailhub=mail:mailhub=mail.${domainname}:g" \ # ${conffile}.orig > ${conffile}.pre - #if [ `use ssl` ]; + #if use ssl; #then # sed -e "s:^#UseTLS=YES:UseTLS=YES:g" \ # ${conffile}.pre > ${conffile} diff --git a/mail-mta/ssmtp/ssmtp-2.60.7.ebuild b/mail-mta/ssmtp/ssmtp-2.60.7.ebuild index 98d7ed52ec66..8c88e6ff9213 100644 --- a/mail-mta/ssmtp/ssmtp-2.60.7.ebuild +++ b/mail-mta/ssmtp/ssmtp-2.60.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.7.ebuild,v 1.2 2004/05/30 22:15:10 g2boojum Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.7.ebuild,v 1.3 2004/06/07 20:52:05 agriffis Exp $ inherit eutils @@ -73,7 +73,7 @@ src_install() { # -e "s:_HOSTNAME_:${hostname}:" \ # -e "s:^mailhub=mail:mailhub=mail.${domainname}:g" \ # ${conffile}.orig > ${conffile}.pre - #if [ `use ssl` ]; + #if use ssl; #then # sed -e "s:^#UseTLS=YES:UseTLS=YES:g" \ # ${conffile}.pre > ${conffile} diff --git a/mail-mta/ssmtp/ssmtp-2.60.9.ebuild b/mail-mta/ssmtp/ssmtp-2.60.9.ebuild index ec2da2c57f95..30f87daf8902 100644 --- a/mail-mta/ssmtp/ssmtp-2.60.9.ebuild +++ b/mail-mta/ssmtp/ssmtp-2.60.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.9.ebuild,v 1.1 2004/06/06 23:09:56 g2boojum Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.9.ebuild,v 1.2 2004/06/07 20:52:05 agriffis Exp $ inherit eutils @@ -26,9 +26,9 @@ S=${WORKDIR}/ssmtp-2.60 src_compile() { econf \ --sysconfdir=/etc/ssmtp \ - `use_enable ssl` \ - `use_enable ipv6 inet6` \ - `use_enable md5sum md5suth` \ + $(use_enable ssl) \ + $(use_enable ipv6 inet6) \ + $(use_enable md5sum md5suth) \ || die make clean || die make etcdir=/etc || die @@ -44,7 +44,7 @@ src_install() { # See bug #7448 #dosym /usr/sbin/ssmtp /usr/bin/mail #The sendmail symlink is now handled by mailwrapper if used - ! use mailwrapper && \ + use mailwrapper || \ dosym /usr/sbin/ssmtp /usr/sbin/sendmail dosym /usr/sbin/sendmail /usr/lib/sendmail doman ssmtp.8 @@ -71,7 +71,7 @@ src_install() { # -e "s:_HOSTNAME_:${hostname}:" \ # -e "s:^mailhub=mail:mailhub=mail.${domainname}:g" \ # ${conffile}.orig > ${conffile}.pre - #if [ `use ssl` ]; + #if use ssl; #then # sed -e "s:^#UseTLS=YES:UseTLS=YES:g" \ # ${conffile}.pre > ${conffile} |