diff options
author | seb <seb> | 2003-02-27 13:18:06 +0000 |
---|---|---|
committer | seb <seb> | 2003-02-27 13:18:06 +0000 |
commit | 55c838a3372cbdc131baaa41ae11ca13ce7904c2 (patch) | |
tree | 276dc84475b95162ff167007a46d7e1d7b09d8cb /security/cyrus-sasl2/patches | |
parent | bdd960640a4c52b8261e122f47af0bceed05cfa5 (diff) | |
download | pkgsrc-55c838a3372cbdc131baaa41ae11ca13ce7904c2.tar.gz |
Update to version 2.1.12.
New in 2.1.12
-------------
* Distribute in Solaris tar (not GNU tar format)
* Fix a number of build/configure related issues.
New in 2.1.11
-------------
* Add the fastbind auth method to the saslauthd LDAP module.
* Fix a potential memory leak in the doors version of saslauthd.
* NTLM now only requires one of LM or NT, not both.
* Fix a variety of Berkeley DB, LDAP, OpenSSL, and other build issues.
* Win32 support compiles, but no documentation as of yet.
Diffstat (limited to 'security/cyrus-sasl2/patches')
-rw-r--r-- | security/cyrus-sasl2/patches/patch-ai | 66 | ||||
-rw-r--r-- | security/cyrus-sasl2/patches/patch-aj | 28 |
2 files changed, 73 insertions, 21 deletions
diff --git a/security/cyrus-sasl2/patches/patch-ai b/security/cyrus-sasl2/patches/patch-ai index 372b355add9..3ad167994cc 100644 --- a/security/cyrus-sasl2/patches/patch-ai +++ b/security/cyrus-sasl2/patches/patch-ai @@ -1,8 +1,60 @@ -$NetBSD: patch-ai,v 1.1 2002/11/14 22:21:15 seb Exp $ +$NetBSD: patch-ai,v 1.2 2003/02/27 13:18:07 seb Exp $ ---- configure.orig Wed Nov 13 12:57:20 2002 +--- configure.orig Mon Feb 3 18:50:30 2003 +++ configure -@@ -1949,6 +1949,13 @@ fi +@@ -673,6 +673,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- + echo "$ac_t""$host" 1>&6 + + ++am__api_version="1.4" + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or + # incompatible versions: +@@ -840,16 +841,16 @@ EOF + + + missing_dir=`cd $ac_aux_dir && pwd` +-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 +-echo "configure:845: checking for working aclocal" >&5 ++echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6 ++echo "configure:846: checking for working aclocal-${am__api_version}" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +-if (aclocal --version) < /dev/null > /dev/null 2>&1; then +- ACLOCAL=aclocal ++if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then ++ ACLOCAL=aclocal-${am__api_version} + echo "$ac_t""found" 1>&6 + else +- ACLOCAL="$missing_dir/missing aclocal" ++ ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" + echo "$ac_t""missing" 1>&6 + fi + +@@ -866,16 +867,16 @@ else + echo "$ac_t""missing" 1>&6 + fi + +-echo $ac_n "checking for working automake""... $ac_c" 1>&6 +-echo "configure:871: checking for working automake" >&5 ++echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6 ++echo "configure:872: checking for working automake-${am__api_version}" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +-if (automake --version) < /dev/null > /dev/null 2>&1; then +- AUTOMAKE=automake ++if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then ++ AUTOMAKE=automake-${am__api_version} + echo "$ac_t""found" 1>&6 + else +- AUTOMAKE="$missing_dir/missing automake" ++ AUTOMAKE="$missing_dir/missing automake-${am__api_version}" + echo "$ac_t""missing" 1>&6 + fi + +@@ -1949,6 +1950,13 @@ fi target=$save_target @@ -16,14 +68,14 @@ $NetBSD: patch-ai,v 1.1 2002/11/14 22:21:15 seb Exp $ if test "$ac_cv_can_build_shared" = no; then enable_shared=no enable_static=yes -@@ -6676,8 +6683,37 @@ LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/ +@@ -6822,8 +6830,37 @@ LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/ + +ac_safe=`echo "/dev/urandom" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for /dev/urandom""... $ac_c" 1>&6 -+echo "configure:6690: checking for /dev/urandom" >&5 ++echo "configure:6837: checking for /dev/urandom" >&5 +if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else @@ -50,8 +102,8 @@ $NetBSD: patch-ai,v 1.1 2002/11/14 22:21:15 seb Exp $ + + echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:6681: checking for working const" >&5 -+echo "configure:6717: checking for working const" >&5 +-echo "configure:6827: checking for working const" >&5 ++echo "configure:6864: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/security/cyrus-sasl2/patches/patch-aj b/security/cyrus-sasl2/patches/patch-aj index 68fee71549c..7aa1f2292d1 100644 --- a/security/cyrus-sasl2/patches/patch-aj +++ b/security/cyrus-sasl2/patches/patch-aj @@ -1,7 +1,7 @@ -$NetBSD: patch-aj,v 1.2 2002/12/11 23:48:59 chris Exp $ +$NetBSD: patch-aj,v 1.3 2003/02/27 13:18:07 seb Exp $ ---- lib/Makefile.in.orig Wed Dec 11 23:31:59 2002 -+++ lib/Makefile.in Wed Dec 11 23:32:12 2002 +--- lib/Makefile.in.orig Mon Feb 3 18:50:31 2003 ++++ lib/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am @@ -11,15 +11,15 @@ $NetBSD: patch-aj,v 1.2 2002/12/11 23:48:59 chris Exp $ # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -@@ -122,6 +122,7 @@ - JAVAH = @JAVAH@ - JAVAROOT = @JAVAROOT@ +@@ -137,6 +137,7 @@ JAVAROOT = @JAVAROOT@ JAVA_INCLUDES = @JAVA_INCLUDES@ + KRB_INC_FLAGS = @KRB_INC_FLAGS@ + KRB_LIB_FLAGS = @KRB_LIB_FLAGS@ +LIBOBJS = @LIBOBJS@ - LIBTOOL = @LIBTOOL@ - LIB_CRYPT = @LIB_CRYPT@ - LIB_DES = @LIB_DES@ -@@ -133,6 +134,7 @@ + LIBSSL_INC_DIR = @LIBSSL_INC_DIR@ + LIBSSL_INC_FLAGS = @LIBSSL_INC_FLAGS@ + LIBSSL_LIB_DIR = @LIBSSL_LIB_DIR@ +@@ -152,6 +153,7 @@ LIB_SOCKET = @LIB_SOCKET@ LN_S = @LN_S@ LTGETADDRINFOOBJS = @LTGETADDRINFOOBJS@ LTGETNAMEINFOOBJS = @LTGETNAMEINFOOBJS@ @@ -27,7 +27,7 @@ $NetBSD: patch-aj,v 1.2 2002/12/11 23:48:59 chris Exp $ LTSNPRINTFOBJS = @LTSNPRINTFOBJS@ MAKEINFO = @MAKEINFO@ NM = @NM@ -@@ -177,10 +179,7 @@ +@@ -197,10 +199,7 @@ noinst_LIBRARIES = @SASL_STATIC_LIBS@ libsasl2_a_SOURCES = common_headers = saslint.h @@ -39,7 +39,7 @@ $NetBSD: patch-aj,v 1.2 2002/12/11 23:48:59 chris Exp $ lib_LTLIBRARIES = libsasl2.la -@@ -207,7 +206,7 @@ +@@ -227,7 +226,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libsasl2_la_OBJECTS = auxprop.lo canonusr.lo checkpw.lo client.lo \ common.lo config.lo external.lo md5.lo saslutil.lo server.lo \ @@ -48,7 +48,7 @@ $NetBSD: patch-aj,v 1.2 2002/12/11 23:48:59 chris Exp $ CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -219,7 +218,7 @@ +@@ -239,7 +238,7 @@ getsubopt.c snprintf.c DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -57,7 +57,7 @@ $NetBSD: patch-aj,v 1.2 2002/12/11 23:48:59 chris Exp $ GZIP_ENV = --best SOURCES = $(libsasl2_a_SOURCES) $(libsasl2_la_SOURCES) OBJECTS = $(libsasl2_a_OBJECTS) $(libsasl2_la_OBJECTS) -@@ -436,13 +435,9 @@ +@@ -456,13 +455,9 @@ distclean-generic clean-generic maintain mostlyclean distclean maintainer-clean |