fix sanity-checker more, and minor typo in -r15 ebuild

4 files changed, 15 insertions, 9 deletions

diff --git a/net-mail/qmail/ChangeLog b/net-mail/qmail/ChangeLog
index a0fd4ab7c190..33483b22bd53 100644
--- a/net-mail/qmail/ChangeLog
+++ b/net-mail/qmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/qmail
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.56 2004/01/20 21:02:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.57 2004/01/22 20:58:28 robbat2 Exp $
+
+*qmail-1.03-r15 (22 Jan 2004)
+
+  22 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r15.ebuild,
+  files/config-sanity-check:
+  fix sanity-checker more, and minor typo in -r15 ebuild
 
   20 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
   files/1.03-r15/qmail-pop3d-top-outputfix.patch:
diff --git a/net-mail/qmail/Manifest b/net-mail/qmail/Manifest
index ac405b6954c8..500ee6ae0f76 100644
--- a/net-mail/qmail/Manifest
+++ b/net-mail/qmail/Manifest
@@ -2,11 +2,11 @@ MD5 3858784d3e5483e9a472726c730a2bdb qmail-1.03-r14.ebuild 15819
 MD5 ded2ff2bdb5763a3cca002f79425be66 qmail-1.03-r11.ebuild 11395
 MD5 bc20b8ab3977f5ae84b74e3c6eec2f3b qmail-1.03-r9.ebuild 9963
 MD5 0bff42dc7525662e4df321c69fbc83cc qmail-1.03-r13.ebuild 14085
-MD5 ccf472a072cbdec3180b1e35bae38a88 qmail-1.03-r15.ebuild 16677
+MD5 6794d1eed52d1ac325c642e0b99f9f85 qmail-1.03-r15.ebuild 16678
 MD5 4ec9b420e902b04f70b810720a5d5bd7 qmail-1.03-r10.ebuild 11151
 MD5 42789d45c1d7895767ef8d7007ac5caf qmail-1.03-r8.ebuild 8114
 MD5 0a96bc3cc02a2fd9d408d134efcf6801 qmail-1.03-r12.ebuild 13689
-MD5 81140b6212ed64b7708193dec77fb63c ChangeLog 15825
+MD5 2e9945683217ead22d469f89a5e5fad9 ChangeLog 16019
 MD5 ff596e74b015e067a180fc78855aa87a metadata.xml 360
 MD5 f376490154b9fce6c3d79640a7aed64e files/rc 280
 MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
@@ -43,7 +43,7 @@ MD5 5ddcb673977385f4bfdc93a2d4e65162 files/run-qmailsendlog 143
 MD5 d0847a866b79499bb21311a49ae0a0b6 files/mkservercert 1425
 MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
 MD5 c22e9634af5b10b1168889a2216d77c1 files/conf-common 2327
-MD5 f52cd62754b76cb8bc178c02d78c6618 files/config-sanity-check 1193
+MD5 e21afa3a603cd269050257241df8d8d1 files/config-sanity-check 1219
 MD5 a72db0af2fb1e4784c0faae4e0c08b7b files/run-qmailsend 164
 MD5 16a9a02133fa49ec4bce592221ddf304 files/run-qmailpop3dlog 315
 MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r8/rc 108
diff --git a/net-mail/qmail/files/config-sanity-check b/net-mail/qmail/files/config-sanity-check
index a4441163732e..074df4b87734 100644
--- a/net-mail/qmail/files/config-sanity-check
+++ b/net-mail/qmail/files/config-sanity-check
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Configuration Sanity Checking for qmail
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/config-sanity-check,v 1.2 2004/01/20 09:35:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/config-sanity-check,v 1.3 2004/01/22 20:58:29 robbat2 Exp $
 # This is intended solely to stop qmail eating up all your hard disk space with logs
 
 CONFIG_SANITY_GOOD=1
@@ -22,7 +22,7 @@ if [ ! -f ${QMAIL_CONTROLDIR}/rcpthosts -a -z "${QMAIL_DISABLE_SANITY_CHECK}" -a
     CONFIG_SANITY_GOOD=0
 fi
 
-if [ ! -f "${TCPSERVER_RULESCDB}" ]; then
+if [ "${SERVICE}" != "send" -a ! -f "${TCPSERVER_RULESCDB}" ]; then
     echo "No CDB file found (${TCPSERVER_RULESCDB})"
     CONFIG_SANITY_GOOD=0
 fi
diff --git a/net-mail/qmail/qmail-1.03-r15.ebuild b/net-mail/qmail/qmail-1.03-r15.ebuild
index 32a64a95e38e..2f182ee71726 100644
--- a/net-mail/qmail/qmail-1.03-r15.ebuild
+++ b/net-mail/qmail/qmail-1.03-r15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r15.ebuild,v 1.1 2004/01/20 09:35:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r15.ebuild,v 1.2 2004/01/22 20:58:28 robbat2 Exp $
 
 inherit eutils fixheadtails
 
@@ -443,7 +443,7 @@ 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" -a ! -f "$new" ]; then
 				einfo "Moving $old to $new"
 				cp $old $new || fail=1
 			else