summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--security/cyrus-sasl2-saslauthd/Makefile2
-rw-r--r--security/cyrus-sasl2/Makefile19
-rw-r--r--security/cyrus-sasl2/distinfo2
-rw-r--r--security/cyrus-sasl2/files/patch-config::ltmain.sh26
-rw-r--r--security/cyrus-sasl2/files/patch-configure34
-rw-r--r--security/cyrus-sasl2/files/patch-plugins::mysql.c19
-rw-r--r--security/cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh26
-rw-r--r--security/cyrus-sasl2/files/patch-saslauthd::configure32
-rw-r--r--security/cyrus-sasl2/pkg-plist10
9 files changed, 60 insertions, 110 deletions
diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index 2f9d479085e5..4f964793ec01 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= saslauthd
-PORTVERSION= 2.1.13
+PORTVERSION= 2.1.14
#PORTREVISION= 0
CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index aa02e278a562..3fe9052d3bb4 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= cyrus-sasl
-PORTVERSION= 2.1.13
-PORTREVISION= 4
+PORTVERSION= 2.1.14
+#PORTREVISION= 0
CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.westbend.net/pub/cyrus-mail/ \
@@ -155,14 +155,13 @@ CYRUS_GROUP?= cyrus
DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README
DOC2= ONEWS TODO draft-burdis-cat-srp-sasl-06.txt \
- draft-ietf-cat-sasl-gssapi-05.txt draft-ietf-sasl-anon-00.txt \
- draft-ietf-sasl-plain-00.txt draft-ietf-sasl-rfc2831bis-00.txt \
- draft-myers-saslrev-02.txt draft-nerenberg-sasl-crammd5-03.txt \
- draft-newman-sasl-c-api-01.txt draft-sasl-login.txt \
- rfc1321.txt rfc1939.txt rfc2104.txt rfc2195.txt rfc2222.txt \
- rfc2243.txt rfc2245.txt rfc2289.txt rfc2444.txt rfc2595.txt \
- rfc2831.txt rfc2945.txt rfc3174.txt server-plugin-flow.fig \
- testing.txt
+ draft-ietf-cat-sasl-gssapi-05.txt draft-ietf-sasl-anon-01.txt \
+ draft-ietf-sasl-crammd5-00.txt draft-ietf-sasl-plain-01.txt \
+ draft-ietf-sasl-rfc2222bis-00.txt draft-ietf-sasl-rfc2831bis-01.txt \
+ draft-newman-sasl-c-api-01.txt draft-sasl-login.txt rfc1321.txt \
+ rfc1939.txt rfc2104.txt rfc2195.txt rfc2222.txt rfc2243.txt \
+ rfc2245.txt rfc2289.txt rfc2444.txt rfc2595.txt rfc2831.txt \
+ rfc2945.txt rfc3174.txt server-plugin-flow.fig testing.txt
HTDOCS= advanced appconvert gssapi index install macosx mechanisms \
options plugprog programming readme sysadmin upgrading
diff --git a/security/cyrus-sasl2/distinfo b/security/cyrus-sasl2/distinfo
index 9f3654626543..63405cf9de9a 100644
--- a/security/cyrus-sasl2/distinfo
+++ b/security/cyrus-sasl2/distinfo
@@ -1 +1 @@
-MD5 (cyrus-sasl-2.1.13.tar.gz) = 1114d59d970791932e96de8557472672
+MD5 (cyrus-sasl-2.1.14.tar.gz) = f2c5adf17029fc103903a3c801d95107
diff --git a/security/cyrus-sasl2/files/patch-config::ltmain.sh b/security/cyrus-sasl2/files/patch-config::ltmain.sh
index ae5ba843aee9..9f453aa05c76 100644
--- a/security/cyrus-sasl2/files/patch-config::ltmain.sh
+++ b/security/cyrus-sasl2/files/patch-config::ltmain.sh
@@ -1,23 +1,7 @@
---- config/ltmain.sh.orig Tue Sep 3 23:59:40 2002
-+++ config/ltmain.sh Sat Oct 12 08:03:59 2002
-@@ -1894,7 +1894,7 @@
- if test $? -eq 0 ; then
- ldd_output=`ldd conftest`
- for i in $deplibs; do
-- name="`expr $i : '-l\(.*\)'`"
-+ name="`expr X$i : 'X-l\(.*\)'`"
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" ; then
- libname=`eval \\$echo \"$libname_spec\"`
-@@ -1919,7 +1919,7 @@
- # Error occured in the first compile. Let's try to salvage the situation:
- # Compile a seperate program for each library.
- for i in $deplibs; do
-- name="`expr $i : '-l\(.*\)'`"
-+ name="`expr X$i : 'X-l\(.*\)'`"
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" ; then
- $rm conftest
+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 Tue Jul 1 01:07:11 2003
@@ -1959,7 +1959,7 @@
set dummy $deplibs_check_method
file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
@@ -27,7 +11,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" ; then
libname=`eval \\$echo \"$libname_spec\"`
-@@ -3391,8 +3391,8 @@
+@@ -3396,8 +3396,8 @@
# Install the pseudo-library for information purposes.
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
diff --git a/security/cyrus-sasl2/files/patch-configure b/security/cyrus-sasl2/files/patch-configure
index f80f687b22b2..5274e76a4e0e 100644
--- a/security/cyrus-sasl2/files/patch-configure
+++ b/security/cyrus-sasl2/files/patch-configure
@@ -1,49 +1,49 @@
Index: configure
diff -u configure.orig configure
---- configure.orig Tue Apr 15 03:07:48 2003
-+++ configure Tue May 27 17:29:16 2003
-@@ -2652,7 +2652,7 @@
+--- configure.orig Sat Jun 28 06:21:13 2003
++++ configure Tue Jul 1 01:09:52 2003
+@@ -2654,7 +2654,7 @@
BDB_LIBADD=""
fi
-- for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
+- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
do
echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
- echo "configure:2659: checking for db_create in -l$dbname" >&5
-@@ -3043,7 +3043,7 @@
+ echo "configure:2661: checking for db_create in -l$dbname" >&5
+@@ -3045,7 +3045,7 @@
BDB_LIBADD=""
fi
-- for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
+- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
do
echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
- echo "configure:3050: checking for db_create in -l$dbname" >&5
-@@ -3761,6 +3761,8 @@
+ echo "configure:3052: checking for db_create in -l$dbname" >&5
+@@ -3791,6 +3791,8 @@
SASLAUTHD_TRUE='#'
SASLAUTHD_FALSE=
fi
+SASLAUTHD_TRUE='#'
+SASLAUTHD_FALSE=
echo $ac_n "checking if I should include saslauthd""... $ac_c" 1>&6
- echo "configure:3766: checking if I should include saslauthd" >&5
+ echo "configure:3796: checking if I should include saslauthd" >&5
echo "$ac_t""$with_saslauthd" 1>&6
-@@ -5456,7 +5458,7 @@
+@@ -5487,7 +5489,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
+LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi` $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 5462 "configure"
+ #line 5493 "configure"
#include "confdefs.h"
-@@ -5494,7 +5496,7 @@
+@@ -5568,7 +5570,7 @@
GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
elif test "$gss_impl" = "heimdal"; then
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`"
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
- else
- gssapi="no"
+ elif test "$gss_impl" = "seam"; then
+ GSSAPIBASE_LIBS=-lgss
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 30850d3bbdc4..000000000000
--- a/security/cyrus-sasl2/files/patch-plugins::mysql.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- plugins/mysql.c.orig Fri Mar 7 13:26:42 2003
-+++ plugins/mysql.c Fri Mar 7 13:30:38 2003
-@@ -325,8 +325,15 @@
- sparams->utils->log(NULL, SASL_LOG_WARN,
- "mysql plugin try and connect to %s\n",
- cur_host);
-+#ifdef HAVE_MYSQL_REAL_CONNECT
-+ mysql_init(&mysql);
-+ sock = mysql_real_connect(&mysql,cur_host,settings->mysql_user,
-+ settings->mysql_passwd,
-+ NULL,0,NULL,CLIENT_COMPRESS);
-+#else
- sock = mysql_connect(&mysql,cur_host,settings->mysql_user,
- settings->mysql_passwd);
-+#endif
- if (sock) break;
-
- cur_host = db_host;
-
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh b/security/cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh
index c38a8084572f..db4c003e85c3 100644
--- a/security/cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh
+++ b/security/cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh
@@ -1,24 +1,8 @@
---- saslauthd/config/ltmain.sh.orig Tue Dec 4 03:06:57 2001
-+++ saslauthd/config/ltmain.sh Tue Apr 15 02:33:18 2003
-@@ -1861,7 +1861,7 @@
- if test $? -eq 0 ; then
- ldd_output=`ldd conftest`
- for i in $deplibs; do
-- name="`expr $i : '-l\(.*\)'`"
-+ name="`expr X$i : 'X-l\(.*\)'`"
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" ; then
- libname=`eval \\$echo \"$libname_spec\"`
-@@ -1886,7 +1886,7 @@
- # Error occured in the first compile. Let's try to salvage the situation:
- # Compile a seperate program for each library.
- for i in $deplibs; do
-- name="`expr $i : '-l\(.*\)'`"
-+ name="`expr X$i : 'X-l\(.*\)'`"
- # If $name is empty we are operating on a -L argument.
- if test "$name" != "" ; then
- $rm conftest
-@@ -1926,7 +1926,7 @@
+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
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::configure b/security/cyrus-sasl2/files/patch-saslauthd::configure
index 4e16075fc650..a9c749830474 100644
--- a/security/cyrus-sasl2/files/patch-saslauthd::configure
+++ b/security/cyrus-sasl2/files/patch-saslauthd::configure
@@ -1,38 +1,40 @@
---- saslauthd/configure.orig Mon Apr 14 20:07:50 2003
-+++ saslauthd/configure Tue Apr 15 01:39:33 2003
-@@ -2988,7 +2988,7 @@
+Index: saslauthd/configure
+diff -u saslauthd/configure.orig saslauthd/configure
+--- saslauthd/configure.orig Sat Jun 28 06:21:15 2003
++++ saslauthd/configure Tue Jul 1 01:26:30 2003
+@@ -2990,7 +2990,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
+LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi` $LIBS"
cat > conftest.$ac_ext <<EOF
- #line 2994 "configure"
+ #line 2996 "configure"
#include "confdefs.h"
-@@ -3026,7 +3026,7 @@
+@@ -3071,7 +3071,7 @@
GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
elif test "$gss_impl" = "heimdal"; then
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`"
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
- else
- gssapi="no"
-@@ -3441,7 +3441,7 @@
+ elif test "$gss_impl" = "seam"; then
+ GSSAPIBASE_LIBS=-lgss
+@@ -3486,7 +3486,7 @@
BDB_LIBADD=""
fi
-- for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
+- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
do
echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
- echo "configure:3448: checking for db_create in -l$dbname" >&5
-@@ -3832,7 +3832,7 @@
+ echo "configure:3493: checking for db_create in -l$dbname" >&5
+@@ -3877,7 +3877,7 @@
BDB_LIBADD=""
fi
-- for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
+- for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++ for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
do
echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
- echo "configure:3839: checking for db_create in -l$dbname" >&5
+ echo "configure:3884: checking for db_create in -l$dbname" >&5
diff --git a/security/cyrus-sasl2/pkg-plist b/security/cyrus-sasl2/pkg-plist
index d6d8a6eb9d74..210b311dae77 100644
--- a/security/cyrus-sasl2/pkg-plist
+++ b/security/cyrus-sasl2/pkg-plist
@@ -55,11 +55,11 @@ sbin/saslpasswd2
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/draft-burdis-cat-srp-sasl-06.txt
%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-cat-sasl-gssapi-05.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-anon-00.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-plain-00.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2831bis-00.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-myers-saslrev-02.txt
-%%PORTDOCS%%%%DOCSDIR%%/draft-nerenberg-sasl-crammd5-03.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-anon-01.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-crammd5-00.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-plain-01.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2222bis-00.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-sasl-rfc2831bis-01.txt
%%PORTDOCS%%%%DOCSDIR%%/draft-newman-sasl-c-api-01.txt
%%PORTDOCS%%%%DOCSDIR%%/draft-sasl-login.txt
%%PORTDOCS%%%%DOCSDIR%%/rfc1321.txt
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-28 19:08:00 +0000