ports/53932: [PATCH] update of port security/cyrus-sasl2 to 2.1.14
Oliver Eikemeier
eikemeier at fillmore-labs.com
Mon Jun 30 17:40:15 UTC 2003
>Number: 53932
>Category: ports
>Synopsis: [PATCH] update of port security/cyrus-sasl2 to 2.1.14
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jun 30 10:40:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Oliver Eikemeier
>Release: FreeBSD 4.8-STABLE i386
>Organization:
Fillmore Labs - http://www.fillmore-labs.com
>Environment:
System: FreeBSD nuuk.fillmore-labs.com 4.8-STABLE
>Description:
OpenLDAP 2.1.14 is available
- made old distfile fetchable after an update
- removed old expr fixes, added new ones
- fixed plist
- removed mysql plugin patch
- updated port security/cyrus-sasl2-saslauthd
- added support for OpenLDAP22 (PR ports/53571 ;-)
>How-To-Repeat:
>Fix:
patch -p0 -E -d /usr/ports < cyrus-sasl2-2.1.14.patch
--- cyrus-sasl2-2.1.14.patch begins here ---
diff -Nur security/cyrus-sasl2/Makefile.orig security/cyrus-sasl2/Makefile
--- security/cyrus-sasl2/Makefile.orig Thu Jun 5 02:07:21 2003
+++ security/cyrus-sasl2/Makefile Mon Jun 30 18:27:53 2003
@@ -6,12 +6,13 @@
#
PORTNAME= cyrus-sasl
-PORTVERSION= 2.1.13
-PORTREVISION= 4
+PORTVERSION= 2.1.14
CATEGORIES= security ipv6
-MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
- ftp://ftp.westbend.net/pub/cyrus-mail/ \
- ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
+ ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
+ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/
+
+MASTER_SITE_SUBDIR= . OLD-VERSIONS/sasl
MAINTAINER= ume at FreeBSD.org
COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer)
@@ -155,9 +156,9 @@
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-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 \
@@ -165,7 +166,7 @@
testing.txt
HTDOCS= advanced appconvert gssapi index install macosx mechanisms \
- options plugprog programming readme sysadmin upgrading
+ options plugprog programming readme sysadmin upgrading windows
PLIST_SUB= PREFIX=${PREFIX} \
OTP=${OTP} \
diff -Nur security/cyrus-sasl2/distinfo.orig security/cyrus-sasl2/distinfo
--- security/cyrus-sasl2/distinfo.orig Tue Apr 15 19:03:27 2003
+++ security/cyrus-sasl2/distinfo Mon Jun 30 17:52:13 2003
@@ -1 +1 @@
-MD5 (cyrus-sasl-2.1.13.tar.gz) = 1114d59d970791932e96de8557472672
+MD5 (cyrus-sasl-2.1.14.tar.gz) = f2c5adf17029fc103903a3c801d95107
diff -Nur security/cyrus-sasl2/files/patch-config::ltmain.sh.orig security/cyrus-sasl2/files/patch-config::ltmain.sh
--- security/cyrus-sasl2/files/patch-config::ltmain.sh.orig Tue Apr 15 19:03:28 2003
+++ security/cyrus-sasl2/files/patch-config::ltmain.sh Mon Jun 30 18:40:40 2003
@@ -1,23 +1,23 @@
---- 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
+--- config/ltmain.sh.orig Thu Jun 12 02:32:43 2003
++++ config/ltmain.sh Mon Jun 30 18:39:35 2003
+@@ -1901,7 +1901,7 @@
+ deplib_matches=`eval \\$echo \"$library_names_spec\"`
+ set dummy $deplib_matches
+ deplib_match=$2
+- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++ if test `expr "X$ldd_output" : "X.*$deplib_match"` -ne 0 ; then
+ newdeplibs="$newdeplibs $i"
+ else
+ droppeddeps=yes
+@@ -1931,7 +1931,7 @@
+ deplib_matches=`eval \\$echo \"$library_names_spec\"`
+ set dummy $deplib_matches
+ deplib_match=$2
+- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++ if test `expr "X$ldd_output" : "X.*$deplib_match"` -ne 0 ; then
+ newdeplibs="$newdeplibs $i"
+ else
+ droppeddeps=yes
@@ -1959,7 +1959,7 @@
set dummy $deplibs_check_method
file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
@@ -27,7 +27,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 -Nur security/cyrus-sasl2/files/patch-configure.orig security/cyrus-sasl2/files/patch-configure
--- security/cyrus-sasl2/files/patch-configure.orig Mon Jun 2 02:06:45 2003
+++ security/cyrus-sasl2/files/patch-configure Mon Jun 30 18:07:43 2003
@@ -6,8 +6,8 @@
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
@@ -15,8 +15,8 @@
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
diff -Nur security/cyrus-sasl2/files/patch-plugins::mysql.c.orig security/cyrus-sasl2/files/patch-plugins::mysql.c
--- security/cyrus-sasl2/files/patch-plugins::mysql.c.orig Sun Jun 1 05:55:35 2003
+++ security/cyrus-sasl2/files/patch-plugins::mysql.c Thu Jan 1 01:00:00 1970
@@ -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 -Nur security/cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh.orig security/cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh
--- security/cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh.orig Tue Apr 15 20:09:30 2003
+++ security/cyrus-sasl2/files/patch-saslauthd::config::ltmain.sh Thu Jan 1 01:00:00 1970
@@ -1,29 +0,0 @@
---- 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 @@
- 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\"`
diff -Nur security/cyrus-sasl2/files/patch-saslauthd::configure.orig security/cyrus-sasl2/files/patch-saslauthd::configure
--- security/cyrus-sasl2/files/patch-saslauthd::configure.orig Thu Apr 17 19:54:43 2003
+++ security/cyrus-sasl2/files/patch-saslauthd::configure Mon Jun 30 18:13:08 2003
@@ -22,8 +22,8 @@
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
@@ -31,8 +31,8 @@
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
diff -Nur security/cyrus-sasl2/pkg-plist.orig security/cyrus-sasl2/pkg-plist
--- security/cyrus-sasl2/pkg-plist.orig Mon Jun 2 02:06:45 2003
+++ security/cyrus-sasl2/pkg-plist Mon Jun 30 18:33:17 2003
@@ -55,11 +55,11 @@
%%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
@@ -90,6 +90,7 @@
%%PORTDOCS%%%%DOCSDIR%%/html/readme.html
%%PORTDOCS%%%%DOCSDIR%%/html/sysadmin.html
%%PORTDOCS%%%%DOCSDIR%%/html/upgrading.html
+%%PORTDOCS%%%%DOCSDIR%%/html/windows.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/sasl2
diff -Nur security/cyrus-sasl2-saslauthd/Makefile.orig security/cyrus-sasl2-saslauthd/Makefile
--- security/cyrus-sasl2-saslauthd/Makefile.orig Sun Jun 1 07:45:41 2003
+++ security/cyrus-sasl2-saslauthd/Makefile Mon Jun 30 19:18:40 2003
@@ -6,12 +6,13 @@
#
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/ \
- ftp://ftp.westbend.net/pub/cyrus-mail/ \
- ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
+ ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
+ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/
+MASTER_SITE_SUBDIR= . OLD-VERSIONS/sasl
PKGNAMEPREFIX= cyrus-sasl-
DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}
@@ -58,12 +59,12 @@
.endif
.if defined(WITH_OPENLDAP_VER)
-.if ${WITH_OPENLDAP_VER} == 20 || ${WITH_OPENLDAP_VER} == 21
+.if ${WITH_OPENLDAP_VER} == 20 || ${WITH_OPENLDAP_VER} == 21 || ${WITH_OPENLDAP_VER} == 22
LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap${WITH_OPENLDAP_VER}
LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap${WITH_OPENLDAP_VER}
CONFIGURE_ARGS+=--with-ldap=${PREFIX}
.else
-BROKEN= "WITH_OPENLDAP_VER must be 20 or 21"
+BROKEN= "WITH_OPENLDAP_VER must be 20, 21 or 22"
.endif
.endif
--- cyrus-sasl2-2.1.14.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list