Update to 2.1.15.

3 files changed, 2 insertions, 36 deletions

diff --git a/security/cyrus-sasl2/files/patch-config::ltmain.sh b/security/cyrus-sasl2/files/patch-config::ltmain.sh
index 51dd0492008d..0471b82685ca 100644
--- a/security/cyrus-sasl2/files/patch-config::ltmain.sh
+++ b/security/cyrus-sasl2/files/patch-config::ltmain.sh
@@ -1,7 +1,7 @@
 Index: config/ltmain.sh
 diff -u config/ltmain.sh.orig config/ltmain.sh
---- config/ltmain.sh.orig	Thu Jun 12 09:32:43 2003
-+++ config/ltmain.sh	Wed Jul  2 11:50:04 2003
+--- config/ltmain.sh.orig	Wed Jul  2 22:29:00 2003
++++ config/ltmain.sh	Wed Jul 16 02:57:20 2003
 @@ -1901,7 +1901,7 @@
  		deplib_matches=`eval \\$echo \"$library_names_spec\"`
  		set dummy $deplib_matches
@@ -20,15 +20,6 @@ diff -u config/ltmain.sh.orig config/ltmain.sh
  		    newdeplibs="$newdeplibs $i"
  		  else
  		    droppeddeps=yes
-@@ -1959,7 +1959,7 @@
- 	  set dummy $deplibs_check_method
- 	  file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
- 	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    name="`expr X$a_deplib : 'X-l\(.*\)'`"
- 	    # If $name is empty we are operating on a -L argument.
- 	    if test "$name" != "" ; then
- 	      libname=`eval \\$echo \"$libname_spec\"`
 @@ -3396,8 +3396,8 @@
  	# Install the pseudo-library for information purposes.
  	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
diff --git a/security/cyrus-sasl2/files/patch-plugins::mysql.c b/security/cyrus-sasl2/files/patch-plugins::mysql.c
deleted file mode 100644
index 4acc910a0e55..000000000000
--- a/security/cyrus-sasl2/files/patch-plugins::mysql.c
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: plugins/mysql.c
-diff -u plugins/mysql.c.orig plugins/mysql.c
---- plugins/mysql.c.orig	Thu May 15 03:46:02 2003
-+++ plugins/mysql.c	Tue Jul  1 02:00:55 2003
-@@ -326,6 +326,7 @@
- 				"mysql plugin try and connect to %s\n",
- 				cur_host);
- 
-+	mysql_init(&mysql);
- 	sock = mysql_real_connect(&mysql,cur_host,
- 				  settings->mysql_user,
- 			          settings->mysql_passwd,
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh b/security/cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh
deleted file mode 100644
index db4c003e85c3..000000000000
--- a/security/cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: saslauthd/config/ltmain.sh
-diff -u saslauthd/config/ltmain.sh.orig saslauthd/config/ltmain.sh
---- saslauthd/config/ltmain.sh.orig	Wed Apr 16 07:28:26 2003
-+++ saslauthd/config/ltmain.sh	Tue Jul  1 01:24:38 2003
-@@ -1959,7 +1959,7 @@
- 	  set dummy $deplibs_check_method
- 	  file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
- 	  for a_deplib in $deplibs; do
--	    name="`expr $a_deplib : '-l\(.*\)'`"
-+	    name="`expr X$a_deplib : 'X-l\(.*\)'`"
- 	    # If $name is empty we are operating on a -L argument.
- 	    if test "$name" != "" ; then
- 	      libname=`eval \\$echo \"$libname_spec\"`