Fixes for bugs #23175 and #23075

5 files changed, 49 insertions, 50 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 57314484114c..a1eef7eeb100 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.38 2003/06/15 12:13:56 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.39 2003/06/22 17:28:04 raker Exp $
 
 *cyrus-sasl-2.1.13 (09 Jun 2003)
 
-  15 Jun 2003; Guy Martin <gmsoft@gentoo.org> cyrus-sasl-2.1.13.ebuild :
+  22 Jun 2003; Nick Hadaway <raker@gentoo.org> files/saslauthd2.rc6:
+  Changed pid filename as noted in bug #23075.  Fixed conf.d file
+  so invalid options aren't passed to the daemon and added some better
+  comments.
+
+  15 Jun 2003; Guy Martin <gmsoft@gentoo.org> cyrus-sasl-2.1.13.ebuild:
   Added hppa to KEYWORDS.
 
   09 Jun 2003; Nick Hadaway <raker@gentoo.org> cyrus-sasl-2.1.13.ebuild,
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index becc50254786..2531fd590596 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,53 +1,28 @@
-MD5 d5d2498d0e9e2d84f68a4eede00392aa ChangeLog 7590
-MD5 b1e9974990d241c05f9cd91942d7a6ef cyrus-sasl-1.5.27-r4.ebuild 2540
-MD5 ea6ea07ae111539aa580d35a09bf2afe cyrus-sasl-1.5.27-r5.ebuild 2699
 MD5 3f81216b8fbe549b9c885473bfab579d cyrus-sasl-1.5.27-r6.ebuild 2774
-MD5 5bcfd89895270267a066c1d3a9b28923 cyrus-sasl-2.1.10-r1.ebuild 3208
-MD5 d78a79a5a68744d17bbd6fc13cb679ee cyrus-sasl-2.1.10-r2.ebuild 3301
-MD5 48500eedaf288a4df6a93732e118a554 cyrus-sasl-2.1.10-r3.ebuild 3369
-MD5 99dd77b1e254cd23ba82c875ff69b40b cyrus-sasl-2.1.10.ebuild 3123
-MD5 72f59bb22937f65913dc0e50e80ad541 cyrus-sasl-2.1.12.ebuild 3268
-MD5 cc4425110d66403aecc652026b515408 cyrus-sasl-2.1.13.ebuild 3297
-MD5 1db741b5018ea1107a49eeae3f245814 cyrus-sasl-2.1.5-r2.ebuild 2037
-MD5 c4e880dcb7d2f8679475398cdf81e0ff cyrus-sasl-2.1.7-r1.ebuild 2463
-MD5 f2aaec4d6e68ebcee0ba066641ff909e cyrus-sasl-2.1.7-r2.ebuild 2790
-MD5 8a92327ff3e70b717596aebe1c87ad59 cyrus-sasl-2.1.7-r3.ebuild 3001
-MD5 5f916ae424e35bdd452b0c81f12a6426 cyrus-sasl-2.1.7.ebuild 1976
-MD5 ddebad3ab49453cdec1b900bb7af4788 cyrus-sasl-2.1.9-r1.ebuild 3126
-MD5 d7e1a7368647506a27283f307b9638e6 cyrus-sasl-2.1.9.ebuild 2803
-MD5 b688f52b3c129bd50da0140b5d732e74 files/crypt.diff 529
-MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
+MD5 a783a23ae9de0370b0ab46779401d403 cyrus-sasl-2.1.13.ebuild 3285
+MD5 ea6ea07ae111539aa580d35a09bf2afe cyrus-sasl-1.5.27-r5.ebuild 2699
+MD5 e665b05e4f73c2d85adb37d6e4d5e901 ChangeLog 7808
+MD5 6d3c58ecd8d6d3da231db3e44d345bbe files/cyrus-sasl-2.1.6-iovec.diff 1405
 MD5 5d8f83e453b4f7dff5eeee74335de870 files/cyrus-sasl-1.5.24-rpath.patch 448
-MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
+MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
+MD5 5cae6fb7465603cab6243e14d0382543 files/saslauthd.confd 909
 MD5 2bdbac1797e21ecbd4f8f95475470e80 files/cyrus-sasl-2.1.10-db4.patch 1375
-MD5 a302e1b2ed33b7965de1a307cd25a32d files/cyrus-sasl-2.1.12-db4.patch 1902
+MD5 5f96ab675ae2ff1da8e0ee4503340df5 files/cyrus-sasl-1.5.27-scram.patch 480
+MD5 4c6ffed2ba584f75a0c948250f7a11b7 files/cyrus-sasl-1.5.21-des.patch 242
 MD5 5f2cc406af0465a53e2a4e72b6e79a12 files/cyrus-sasl-2.1.12-kerberos.patch 1529
-MD5 6d3c58ecd8d6d3da231db3e44d345bbe files/cyrus-sasl-2.1.6-iovec.diff 1405
-MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
+MD5 0ab944570bf61ce0ee9e907d7b1f9657 files/saslauthd.rc6 536
+MD5 b688f52b3c129bd50da0140b5d732e74 files/crypt.diff 529
 MD5 228579b200f0a570f9c02d222f400672 files/cyrus-sasl-gcc32.patch 426
-MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
-MD5 0a6a28252ab81d3b3765967b11517fa8 files/cyrus-sasl-iovec.diff 1405
+MD5 1c211557e54537ad23feb847b3a23b48 files/pwcheck.rc6 557
+MD5 f25434e48ed690ea166ed14c92ce4ef8 files/saslauthd.confd-2.1 749
+MD5 7c0958ee10762956aa0f7b2d549ca86e files/saslauthd2.rc6 542
+MD5 a302e1b2ed33b7965de1a307cd25a32d files/cyrus-sasl-2.1.12-db4.patch 1902
 MD5 9a317f7aa562936a829574f63aefce15 files/cyrus-sasl-saslauthd.patch 4938
+MD5 75aaabf38cf470bae9a928a334c3cb59 files/cyrus-sasl-configdir.patch 8510
+MD5 692a355142b7cfb937cd8a3a655c0310 files/cyrus-sasl-heimdal-deps.patch 624
 MD5 c1e3be15214652c1d1036f7cb84fe8fe files/cyrus-sasl2-heimdal-deps.patch 1478
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r4 69
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
-MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
-MD5 85390378a069cb37e50f662926f5fc99 files/digest-cyrus-sasl-2.1.10 70
-MD5 85390378a069cb37e50f662926f5fc99 files/digest-cyrus-sasl-2.1.10-r1 70
-MD5 85390378a069cb37e50f662926f5fc99 files/digest-cyrus-sasl-2.1.10-r2 70
-MD5 85390378a069cb37e50f662926f5fc99 files/digest-cyrus-sasl-2.1.10-r3 70
-MD5 dbedf561a9c3b5295a76a31225d3dfcf files/digest-cyrus-sasl-2.1.12 70
-MD5 1d5bc32d69dbcb3c053f0f336086218e files/digest-cyrus-sasl-2.1.13 70
-MD5 db12b1e88db9041a08cce7987e6e5183 files/digest-cyrus-sasl-2.1.5-r2 69
-MD5 3210d9146194268368b84240b8933352 files/digest-cyrus-sasl-2.1.7 69
-MD5 3210d9146194268368b84240b8933352 files/digest-cyrus-sasl-2.1.7-r1 69
-MD5 3210d9146194268368b84240b8933352 files/digest-cyrus-sasl-2.1.7-r2 69
-MD5 3210d9146194268368b84240b8933352 files/digest-cyrus-sasl-2.1.7-r3 69
-MD5 110e3bc4f49c0b2b791b9bca087b66a5 files/digest-cyrus-sasl-2.1.9 69
-MD5 110e3bc4f49c0b2b791b9bca087b66a5 files/digest-cyrus-sasl-2.1.9-r1 69
 MD5 e13f74e7ff91c036fa377c50fefe223b files/digestmd5.patch 2839
+MD5 0a6a28252ab81d3b3765967b11517fa8 files/cyrus-sasl-iovec.diff 1405
+MD5 1d5bc32d69dbcb3c053f0f336086218e files/digest-cyrus-sasl-2.1.13 70
 MD5 38fca8679fe76370d26c76b9063c25b8 files/gssapi-sefault.patch 1311
-MD5 1c211557e54537ad23feb847b3a23b48 files/pwcheck.rc6 557
-MD5 5cae6fb7465603cab6243e14d0382543 files/saslauthd.confd 909
-MD5 0ab944570bf61ce0ee9e907d7b1f9657 files/saslauthd.rc6 536
-MD5 a715288937fdb0b62beff17dfa5bd3d4 files/saslauthd2.rc6 536
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.13.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.13.ebuild
index c2948f855ff0..0316587b49ee 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.13.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.13.ebuild,v 1.3 2003/06/15 12:13:56 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.13.ebuild,v 1.4 2003/06/22 17:28:04 raker Exp $
 
 inherit eutils
 
@@ -104,8 +104,8 @@ src_install () {
 	export LD_LIBRARY_PATH=${LD_OLD}
 	chown root.mail ${D}etc/sasl2/sasldb2
 	chmod 0640 ${D}etc/sasl2/sasldb2
-																
-	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd saslauthd
+
+	insinto /etc/conf.d ; newins ${FILESDIR}/saslauthd.confd-2.1 saslauthd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/saslauthd2.rc6 saslauthd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/pwcheck.rc6 pwcheck
 }
diff --git a/dev-libs/cyrus-sasl/files/saslauthd.confd-2.1 b/dev-libs/cyrus-sasl/files/saslauthd.confd-2.1
new file mode 100644
index 000000000000..160668f3297e
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/saslauthd.confd-2.1
@@ -0,0 +1,19 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/files/saslauthd.confd-2.1,v 1.1 2003/06/22 17:28:04 raker Exp $
+
+# Config file for /etc/init.d/saslauthd
+
+# Authentications mechanism (for list see saslauthd -v)
+# Examples: getpwent pam rimap shadow ldap
+SASL_AUTHMECH=pam
+
+# Put other startup options here.  Many options have changed recently.
+# Use -O to do things previously broken out into separate flags.
+SASL_DAEMON_OPTS=""
+
+# Tack the above options together
+[ -n ${SASL_AUTHMECH} ] && \
+	SASLAUTHD_OPTS="-a ${SASL_AUTHMECH}"
+[ -n ${SASL_DAEMON_OPTS} ] && \
+	SASLAUTHD_OPTS="${SASLAUTHD_OPTS} ${SASL_DAEMON_OPTS}"
diff --git a/dev-libs/cyrus-sasl/files/saslauthd2.rc6 b/dev-libs/cyrus-sasl/files/saslauthd2.rc6
index d70408e8046c..eb0d8ae5dc8c 100644
--- a/dev-libs/cyrus-sasl/files/saslauthd2.rc6
+++ b/dev-libs/cyrus-sasl/files/saslauthd2.rc6
@@ -16,6 +16,6 @@ start() {
 
 stop() {
 	ebegin "Stopping saslauthd"
-	start-stop-daemon --stop --quiet --pidfile /var/lib/sasl2/mux.pid
+	start-stop-daemon --stop --quiet --pidfile /var/lib/sasl2/saslauthd.pid
 	eend $?
 }