diff options
| -rw-r--r-- | mail-mta/qmail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail-mta/qmail/Manifest | 100 | ||||
| -rw-r--r-- | mail-mta/qmail/qmail-1.03-r16.ebuild | 21 |
3 files changed, 59 insertions, 67 deletions
diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog index d9b808872b9e..97b68d43e78a 100644 --- a/mail-mta/qmail/ChangeLog +++ b/mail-mta/qmail/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for mail-mta/qmail # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.59 2005/08/14 11:01:44 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.60 2005/09/11 21:56:37 hansmi Exp $ + + 11 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r16.ebuild: + Fixed bug 105450, cleaned ebuild a bit. 14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> files/conf-smtpd-r16, qmail-1.03-r16.ebuild: diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest index a891dc32ffa5..24049d3dccfa 100644 --- a/mail-mta/qmail/Manifest +++ b/mail-mta/qmail/Manifest @@ -1,80 +1,70 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 f6c4d0c0d91b1a1a8c7bc89b17d44040 qmail-1.03-r16.ebuild 21428 -MD5 85378e7d3c494be73cefbf7e9863365d qmail-1.03-r15.ebuild 18807 -MD5 c4a45ded213c13f7bca0c31f85f1c11b ChangeLog 31768 MD5 e60e7e9ed6a2c7d3a2ebcee6a6af429e metadata.xml 277 -MD5 ed8621dc81c25323e10609fc05d861df files/rc 284 -MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399 +MD5 4d5830e3c5bc33423ccea8e90b3abdb5 ChangeLog 31888 +MD5 139f88c139d8247637f79a13897ba5a1 qmail-1.03-r16.ebuild 21430 +MD5 85378e7d3c494be73cefbf7e9863365d qmail-1.03-r15.ebuild 18807 +MD5 7db09ceb9337348431fb9f8418e5892e files/dot_qmail-log 276 +MD5 180a513f34e3f00abc609672a190072c files/99qmail 137 +MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098 +MD5 55e71180b55e809b7bc8ccbd86c92dc4 files/digest-qmail-1.03-r15 1719 +MD5 c47d861aeef098d12d022d44c27386b5 files/errno.patch 850 +MD5 1a4fbc35caee388c5ee4f7413ce63148 files/run-qmailsmtpdlog 321 MD5 836c401d53b4f1d40872dcb3c3ccbd46 files/conf-send 235 -MD5 5d982dc0db68c72cde9ce03f0da37ce4 files/run-qmailpop3d 909 -MD5 15cef40ec6b06900d3a2cbff9a2c0968 files/run-qmailqmqpd 839 +MD5 70f7b1f551a6dce51f65e2e8b7d7d37a files/run-qmailsend 165 +MD5 86afe93a8dea5d63c6642aea31bb7386 files/qmail-config-system 1073 +MD5 52892cdf994815c6767ffbafc49df454 files/conf-qmqpd 465 +MD5 4ee8193d6da00d6930ecadb1e91fd964 files/run-qmailqmqpdlog 321 MD5 05c7891e3fde628aa9aada21a4d6eebe files/run-qmailqmtpd 839 +MD5 9e5d2ac8b47e094d63eb620f5067446f files/conf-qmtpd 557 +MD5 5f99cabfe0275b576d8d33c538b676ea files/conf-smtpd-r16 2070 +MD5 9cc72fa27c9643d8b7d8388d6e045d6f files/config-sanity-check 1296 +MD5 ed8621dc81c25323e10609fc05d861df files/rc 284 MD5 6e7b856c1034c00ee4ff63209c354c25 files/run-qmailsmtpd 839 -MD5 180a513f34e3f00abc609672a190072c files/99qmail 137 -MD5 c47d861aeef098d12d022d44c27386b5 files/errno.patch 850 -MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166 MD5 c8254c53c104004d5beecb39ca689d48 files/gencert.sh 224 -MD5 5f99cabfe0275b576d8d33c538b676ea files/conf-smtpd-r16 2070 -MD5 4ee8193d6da00d6930ecadb1e91fd964 files/run-qmailqmqpdlog 321 -MD5 7db09ceb9337348431fb9f8418e5892e files/dot_qmail-log 276 +MD5 84f1655093d0de27bebc48111dddba5f files/conf-smtpd 1935 +MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166 MD5 f278840a9cd62309d70cb339fbf1f6a6 files/run-qmailqmtpdlog 321 MD5 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335 +MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399 +MD5 fd098ab9ede9c74f209bf16e168ab185 files/conf-common 2328 +MD5 9867559d416bd731eed63709f5eef841 files/run-qmailpop3dlog 321 MD5 73db31418bb525a8a5653b435ea07315 files/qmail-genrsacert.sh 1464 -MD5 55e71180b55e809b7bc8ccbd86c92dc4 files/digest-qmail-1.03-r15 1719 -MD5 f681f647ece2b703dc75a2a8e6899432 files/digest-qmail-1.03-r16 1948 -MD5 c369664bce0646b3d323d08f9ba5b8ce files/dot_qmail 82 -MD5 1a4fbc35caee388c5ee4f7413ce63148 files/run-qmailsmtpdlog 321 -MD5 ae967da8c38fde8f69960392f89e262f files/conf-pop3d 1207 -MD5 52892cdf994815c6767ffbafc49df454 files/conf-qmqpd 465 -MD5 9e5d2ac8b47e094d63eb620f5067446f files/conf-qmtpd 557 -MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098 -MD5 84f1655093d0de27bebc48111dddba5f files/conf-smtpd 1935 -MD5 86afe93a8dea5d63c6642aea31bb7386 files/qmail-config-system 1073 +MD5 5d982dc0db68c72cde9ce03f0da37ce4 files/run-qmailpop3d 909 +MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821 MD5 60de9dacc5289d44d64603d76e5ebc99 files/run-qmailsendlog 320 MD5 24d7af84c757b2892e51d1f88a264983 files/mkservercert 1425 -MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821 -MD5 fd098ab9ede9c74f209bf16e168ab185 files/conf-common 2328 -MD5 9cc72fa27c9643d8b7d8388d6e045d6f files/config-sanity-check 1296 -MD5 70f7b1f551a6dce51f65e2e8b7d7d37a files/run-qmailsend 165 -MD5 9867559d416bd731eed63709f5eef841 files/run-qmailpop3dlog 321 +MD5 ae967da8c38fde8f69960392f89e262f files/conf-pop3d 1207 +MD5 15cef40ec6b06900d3a2cbff9a2c0968 files/run-qmailqmqpd 839 +MD5 f681f647ece2b703dc75a2a8e6899432 files/digest-qmail-1.03-r16 1948 +MD5 c369664bce0646b3d323d08f9ba5b8ce files/dot_qmail 82 MD5 cc5c84d3a0837007b8af4a1f2e657872 files/1.03-r14/auth-after-tls-only.patch 2151 -MD5 518aef241cd482233a3c07608e12276c files/1.03-r14/qmail-1.03-accept-5xx.tls.patch 882 -MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r14/maildir-quota-fix.patch 547 -MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r14/smtp-auth-close3.patch 728 MD5 9fa1fc2153d5a4659ddf02d9e3a1f9ba files/1.03-r14/qmail-pop3d-stat.tls.patch 750 -MD5 b8f5d6adfb941c184715695cc58a5c72 files/1.03-r14/nullenvsender-recipcount.tls.patch 1616 -MD5 d046c053c7dd353891dd6778000890bf files/1.03-r14/qmail-pop3d-capa-outputfix.patch 424 +MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r14/maildir-quota-fix.patch 547 +MD5 2a725c31201c59077cd389486407624f files/1.03-r14/qmail-smtpd-esmtp-size-gentoo.patch 2131 MD5 a8bfc3cf2c69e8e46b07a357a8572e5e files/1.03-r14/qmail-1.03-qregex-memleak-fix.patch 498 +MD5 d046c053c7dd353891dd6778000890bf files/1.03-r14/qmail-pop3d-capa-outputfix.patch 424 +MD5 518aef241cd482233a3c07608e12276c files/1.03-r14/qmail-1.03-accept-5xx.tls.patch 882 +MD5 b8f5d6adfb941c184715695cc58a5c72 files/1.03-r14/nullenvsender-recipcount.tls.patch 1616 MD5 34a2e22386f4d11874e33b38576a7958 files/1.03-r14/qmail-gentoo-branding.patch 375 MD5 a91645f4af61ce981e01ef84bc2ae7b6 files/1.03-r14/qmail-qmailqueue-docs.patch 1085 -MD5 2a725c31201c59077cd389486407624f files/1.03-r14/qmail-smtpd-esmtp-size-gentoo.patch 2131 +MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r14/smtp-auth-close3.patch 728 MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r14/qmail-smtpd-relay-reject.gentoo.patch 1433 -MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574 -MD5 47aab2c1e0357f8cf6f173caeca60419 files/1.03-r15/tlsbeforeauth-fix.patch 969 -MD5 3a5f3dbe17b1f4f4318b8941bb55743e files/1.03-r15/Makefile-relaymxlookup.patch 1947 -MD5 fe69ece20420ed8c2400dc423cdd5c22 files/1.03-r15/qmail-macos-dns-fix.patch 336 -MD5 118a42c2a167a1081ccd820f5b7f76db files/1.03-r15/spawn-alloc-h.patch 256 -MD5 0494b42b8f85e67f82f892024b18e6af files/1.03-r16/virtual-domain-outgoing-IP-address.patch 4040 MD5 a963429b55bc3713ff3a22674101dfdb files/1.03-r16/auth-after-tls-only.patch 2241 +MD5 c0d3c5bd70a49284eb8cc8a5f952202e files/1.03-r16/Makefile-relaymxlookup.patch 1988 +MD5 0600d03067d6a112ff8fef64f8952f5c files/1.03-r16/qmail-1.03-env-servercert.patch 1306 +MD5 a8f7776c6f7e51e1d23c5d086714b329 files/1.03-r16/invalid-envelope-sender-log.patch 418 +MD5 0494b42b8f85e67f82f892024b18e6af files/1.03-r16/virtual-domain-outgoing-IP-address.patch 4040 MD5 dbfe7d95b274567088123575d5da00ba files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch 571 -MD5 81330827d80408f9bb6eab01857849dc files/1.03-r16/starttls-recordio.patch 390 MD5 a1e8f454e96a2b23e9daae34fa6b6b5e files/1.03-r16/qmail-1.03-accept-5xx.tls.patch 930 MD5 8f196c7649132af2c0c3745c1a5f1e9c files/1.03-r16/famd-dnotify.patch 555 MD5 d48eeee899c7999925dd64afd4109269 files/1.03-r16/nullenvsender-recipcount.tls.patch 1479 +MD5 0f5e8b8c5d8ab208beee57281c7cf215 files/1.03-r16/qmail-remote-auth-log-fix.patch 475 MD5 72c4027c99c19158d4bbe3ed77efcae6 files/1.03-r16/double-bounce-trim.patch 1662 MD5 8d015331a1c3f0ad22f40bb6837569ca files/1.03-r16/qmail-logmail.patch 269 -MD5 c0d3c5bd70a49284eb8cc8a5f952202e files/1.03-r16/Makefile-relaymxlookup.patch 1988 MD5 a8af4cf9b59e294737987624bc917e80 files/1.03-r16/smtpplugins 614 -MD5 0f5e8b8c5d8ab208beee57281c7cf215 files/1.03-r16/qmail-remote-auth-log-fix.patch 475 -MD5 0600d03067d6a112ff8fef64f8952f5c files/1.03-r16/qmail-1.03-env-servercert.patch 1306 +MD5 81330827d80408f9bb6eab01857849dc files/1.03-r16/starttls-recordio.patch 390 MD5 b968f9de39ff3cac7e6abbd8705af5f2 files/1.03-r16/qmail-smtpd-relay-reject.gentoo.patch 1206 -MD5 a8f7776c6f7e51e1d23c5d086714b329 files/1.03-r16/invalid-envelope-sender-log.patch 418 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDCyYpQlM6RnzZP+IRArMdAJ9fCXBqUFUZ2/tVDmRsj5ocXuB+AgCgkAiW -X67vDQ8iT0XEjogqNj4QG3k= -=wbM0 ------END PGP SIGNATURE----- +MD5 118a42c2a167a1081ccd820f5b7f76db files/1.03-r15/spawn-alloc-h.patch 256 +MD5 3a5f3dbe17b1f4f4318b8941bb55743e files/1.03-r15/Makefile-relaymxlookup.patch 1947 +MD5 fe69ece20420ed8c2400dc423cdd5c22 files/1.03-r15/qmail-macos-dns-fix.patch 336 +MD5 47aab2c1e0357f8cf6f173caeca60419 files/1.03-r15/tlsbeforeauth-fix.patch 969 +MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574 diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild index e093defcaecc..832a17ec5fe0 100644 --- a/mail-mta/qmail/qmail-1.03-r16.ebuild +++ b/mail-mta/qmail/qmail-1.03-r16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.36 2005/08/23 13:35:12 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.37 2005/09/11 21:56:37 hansmi Exp $ inherit toolchain-funcs eutils fixheadtails flag-o-matic @@ -304,7 +304,6 @@ src_compile() { } src_install() { - einfo "Setting up directory hierarchy ..." diropts -m 755 -o root -g qmail @@ -356,7 +355,7 @@ src_install() { # use the correct maildirmake # the courier-imap one has some extensions that are nicer - [ -e /usr/bin/maildirmake ] && \ + [[ -e /usr/bin/maildirmake ]] && \ MAILDIRMAKE="/usr/bin/maildirmake" || \ MAILDIRMAKE="${D}/var/qmail/bin/maildirmake" @@ -464,7 +463,7 @@ src_install() { rootmailfixup() { # so you can check mail as root easily local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir" - if [ -d "${ROOT}/root/.maildir" ] && [ ! -L "${ROOT}/root/.maildir" ] ; then + if [[ -d "${ROOT}/root/.maildir" && ! -L "${ROOT}/root/.maildir" ]] ; then einfo "Previously the qmail ebuilds created /root/.maildir/ but not" einfo "every mail was delivered there. If the directory does not" einfo "contain any mail, please delete it and run:" @@ -483,7 +482,7 @@ buildtcprules() { src=${ROOT}${TCPRULES_DIR}/${f} cdb=${ROOT}${TCPRULES_DIR}/${f}.cdb tmp=${ROOT}${TCPRULES_DIR}/.${f}.tmp - cat ${src} 2>/dev/null | tcprules ${cdb} ${tmp} < ${src} + [[ -e ${src} ]] && tcprules ${cdb} ${tmp} < ${src} done } @@ -546,13 +545,13 @@ pkg_preinst() { old="/etc/tcp.${proto}${ext}" new="${TCPRULES_DIR}/tcp.qmail-${proto}${ext}" fail=0 - if [ -f "$old" -a ! -f "$new" ]; then + if [[ -f "$old" && ! -f "$new" ]]; then einfo "Moving $old to $new" cp $old $new || fail=1 else fail=1 fi - if [ "${fail}" = 1 -a -f ${old} ]; then + if [[ "${fail}" = 1 && -f ${old} ]]; then eerror "Error moving $old to $new, be sure to check the" eerror "configuration! You may have already moved the files," eerror "in which case you can delete $old" @@ -577,9 +576,9 @@ pkg_config() { # avoid some weird locale problems export LC_ALL="C" - if [ ${ROOT} = "/" ] ; then - if [ ! -f ${ROOT}var/qmail/control/me ] ; then - export qhost=`hostname --fqdn` + if [[ ${ROOT} = / ]] ; then + if [[ ! -f ${ROOT}var/qmail/control/me ]] ; then + export qhost=$(hostname --fqdn) ${ROOT}var/qmail/bin/config-fast $qhost fi else @@ -587,7 +586,7 @@ pkg_config() { fi einfo "Accepting relaying by default from all ips configured on this machine." - LOCALIPS=`/sbin/ifconfig | grep inet | cut -d' ' -f 12 -s | cut -b 6-20` + LOCALIPS=$(/sbin/ifconfig | grep inet | cut -d' ' -f 12 -s | cut -b 6-20) TCPSTRING=":allow,RELAYCLIENT=\"\",RBLSMTPD=\"\"" for ip in $LOCALIPS; do myline="${ip}${TCPSTRING}" |