Fixed patch to close Bug 56389, revision bump to make sure everyone get's the fix.

5 files changed, 20 insertions, 17 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 00dd41069ea5..78dfa916d6e1 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.84 2004/07/07 22:34:11 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.85 2004/07/08 02:12:57 merlin Exp $
+
+*cyrus-sasl-2.1.18-r2 (07 Jul 2004)
+
+  07 Jul 2004; Cory Visi <merlin@gentoo.org> cyrus-sasl-2.1.18-r1.ebuild,
+  cyrus-sasl-2.1.18-r2.ebuild, files/cyrus-sasl-2.1.18-sasl-path-fix.patch:
+  Fixed patch to close Bug 56389, revision bump to make sure everyone get's the fix.
 
   08 Jul 2004; Christian Birchinger <joker@gentoo.org>
   cyrus-sasl-2.1.18-r1.ebuild:
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 8ce49c91c2e2..f2286b1647bf 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,4 +1,4 @@
-MD5 5c6720729b689bd208d996805aa07f9c ChangeLog 15711
+MD5 b5013672612d9ab6a28546681a3be66e ChangeLog 15984
 MD5 3197fe37928e71d1072a187d59c7420f cyrus-sasl-1.5.27-r5.ebuild 2692
 MD5 371deb1330411da2c73d84bf46ee190e cyrus-sasl-1.5.27-r6.ebuild 2765
 MD5 0364033278f9f21b78e0a6cb0025db6b cyrus-sasl-2.1.14.ebuild 3917
@@ -6,7 +6,7 @@ MD5 9bec5bcd49985c0721eec238b54ccc3d cyrus-sasl-2.1.15.ebuild 3747
 MD5 6277febc050092fe764fe9c445a66570 cyrus-sasl-2.1.17.ebuild 4249
 MD5 a1468600bebea36437d458d047b417e7 cyrus-sasl-2.1.18.ebuild 4266
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 f3c3c97a18f44e532375b956233483bb cyrus-sasl-2.1.18-r1.ebuild 5372
+MD5 f3c3c97a18f44e532375b956233483bb cyrus-sasl-2.1.18-r2.ebuild 5372
 MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
 MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
 MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
@@ -24,7 +24,6 @@ MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
 MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
 MD5 6ba386a4eb5f9addf367d41093ba369e files/digest-cyrus-sasl-2.1.14 70
 MD5 6109117a3ea3c1141364d60d212f48d9 files/digest-cyrus-sasl-2.1.15 70
-MD5 960ffd4d83e165ccaa68cf43937ff63d files/digest-cyrus-sasl-2.1.17 70
 MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18 70
 MD5 a21930769b34c30d8166dc1d65482c26 files/pwcheck.rc6 546
 MD5 d1672e7dfaaa66893c8eefe0712b7e36 files/saslauthd.conf 896
@@ -33,7 +32,8 @@ MD5 65e5efdf063dbf2d5427b421343c9ff2 files/saslauthd.rc6 531
 MD5 1b1b242c70955511bc086ba8008d3536 files/saslauthd2.conf 744
 MD5 8d0729dbeb7685b261231cd0ddef4dfb files/saslauthd2.rc6 533
 MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451
+MD5 960ffd4d83e165ccaa68cf43937ff63d files/digest-cyrus-sasl-2.1.17 70
 MD5 e8b9357dba2bde4dac0b1cf38d5942eb files/cyrus-sasl-2.1.18-cvs-1.172.patch 5056
+MD5 4a80034f8ee3149c898aab4492d9cff8 files/cyrus-sasl-2.1.18-sasl-path-fix.patch 529
 MD5 d6cb936d23646d9e5312d63d08f6f563 files/cyrus-sasl-2.1.18-pam_mysql.patch 1388
-MD5 ce1f81db6a6296335c42103c3adc11cc files/cyrus-sasl-2.1.18-sasl-path-fix.patch 540
-MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18-r1 70
+MD5 fcf540108971d5aaa0bbfba381971ca7 files/digest-cyrus-sasl-2.1.18-r2 70
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r2.ebuild
index 67d44678b707..d53088871fa9 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r1.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r1.ebuild,v 1.6 2004/07/07 22:34:11 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.18-r2.ebuild,v 1.1 2004/07/08 02:12:57 merlin Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-sasl-path-fix.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-sasl-path-fix.patch
index 156d4a5da66f..060e87807137 100644
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-sasl-path-fix.patch
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.18-sasl-path-fix.patch
@@ -1,18 +1,15 @@
 diff -Naur cyrus-sasl-2.1.18-orig/lib/common.c cyrus-sasl-2.1.18/lib/common.c
 --- cyrus-sasl-2.1.18-orig/lib/common.c	2004-03-10 10:51:35.000000000 -0500
-+++ cyrus-sasl-2.1.18/lib/common.c	2004-07-07 12:15:19.570798953 -0400
-@@ -1794,9 +1794,11 @@
++++ cyrus-sasl-2.1.18/lib/common.c	2004-07-07 21:20:21.953011443 -0400
+@@ -1794,7 +1794,10 @@
    if (! path)
      return SASL_BADPARAM;
  
 -  *path = getenv(SASL_PATH_ENV_VAR);
--  if (! *path)
--    *path = PLUGINDIR;
-+  if (getuid() == geteuid() && getgid() == getegid()) {
++  /* Honor external variable only in a safe environment */
++  if (getuid() == geteuid() && getgid() == getegid())
 +    *path = getenv(SASL_PATH_ENV_VAR);
-+    if (! *path)
-+      *path = PLUGINDIR;
-+  }
++
+   if (! *path)
+     *path = PLUGINDIR;
  
-   return SASL_OK;
- }
diff --git a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18-r1 b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18-r2
index 2993b6dbb3ed..2993b6dbb3ed 100644
--- a/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18-r1
+++ b/dev-libs/cyrus-sasl/files/digest-cyrus-sasl-2.1.18-r2