diff options
author | martti <martti> | 2003-05-26 06:53:08 +0000 |
---|---|---|
committer | martti <martti> | 2003-05-26 06:53:08 +0000 |
commit | 89cce7d749bf62e237594483a7e6702023d872b8 (patch) | |
tree | a1361bb0c15cf385a24490a3cb77fd7e22ef9df8 /security/cyrus-sasl2/patches | |
parent | b822be84ffc642f56182e1b2f79019c10def460f (diff) | |
download | pkgsrc-89cce7d749bf62e237594483a7e6702023d872b8.tar.gz |
Updated cyrus-sasl to 2.1.13
* several bug fixes
Approved by chris.
Diffstat (limited to 'security/cyrus-sasl2/patches')
-rw-r--r-- | security/cyrus-sasl2/patches/patch-aa | 16 | ||||
-rw-r--r-- | security/cyrus-sasl2/patches/patch-ac | 10 | ||||
-rw-r--r-- | security/cyrus-sasl2/patches/patch-af | 8 | ||||
-rw-r--r-- | security/cyrus-sasl2/patches/patch-ai | 57 |
4 files changed, 42 insertions, 49 deletions
diff --git a/security/cyrus-sasl2/patches/patch-aa b/security/cyrus-sasl2/patches/patch-aa index a3ca7b8e0a1..b2af04e3fca 100644 --- a/security/cyrus-sasl2/patches/patch-aa +++ b/security/cyrus-sasl2/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2002/11/14 22:21:14 seb Exp $ +$NetBSD: patch-aa,v 1.3 2003/05/26 06:53:09 martti Exp $ ---- configure.in.orig Fri Oct 11 22:56:29 2002 -+++ configure.in -@@ -114,6 +114,13 @@ target=$save_target +--- configure.in.orig 2003-04-14 20:59:44.000000000 +0300 ++++ configure.in 2003-05-21 09:11:03.000000000 +0300 +@@ -114,6 +114,13 @@ dnl ltconfig might not have found support for shared libs dnl just do static libs if so. @@ -16,13 +16,13 @@ $NetBSD: patch-aa,v 1.2 2002/11/14 22:21:14 seb Exp $ if test "$ac_cv_can_build_shared" = no; then enable_shared=no enable_static=yes -@@ -832,6 +839,9 @@ AC_SUBST(LTGETNAMEINFOOBJS) - LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'` +@@ -805,6 +812,9 @@ AC_SUBST(LIBOBJS) AC_SUBST(LTLIBOBJS) -+ + +dnl Check for /dev/urandom +AC_CHECK_FILE(/dev/urandom, AC_DEFINE_UNQUOTED(SASL_DEV_RANDOM, "/dev/urandom")) - ++ AC_C_CONST AC_C_INLINE + AC_TYPE_MODE_T diff --git a/security/cyrus-sasl2/patches/patch-ac b/security/cyrus-sasl2/patches/patch-ac index 633112324b1..270b6e29e17 100644 --- a/security/cyrus-sasl2/patches/patch-ac +++ b/security/cyrus-sasl2/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $ +$NetBSD: patch-ac,v 1.2 2003/05/26 06:53:09 martti Exp $ ---- acconfig.h.orig Sun Oct 27 14:12:42 2002 -+++ acconfig.h Sun Oct 27 14:12:46 2002 -@@ -202,6 +202,9 @@ +--- acconfig.h.orig 2003-02-13 21:55:48.000000000 +0200 ++++ acconfig.h 2003-05-21 09:11:26.000000000 +0300 +@@ -205,6 +205,9 @@ /* do we use doors for IPC? */ #undef USE_DOORS @@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $ @BOTTOM@ /* Create a struct iovec if we need one */ -@@ -217,7 +220,9 @@ +@@ -220,7 +223,9 @@ #endif /* location of the random number generator */ diff --git a/security/cyrus-sasl2/patches/patch-af b/security/cyrus-sasl2/patches/patch-af index af63df68ef2..fdc09450f3b 100644 --- a/security/cyrus-sasl2/patches/patch-af +++ b/security/cyrus-sasl2/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/10/27 15:09:00 chris Exp $ +$NetBSD: patch-af,v 1.2 2003/05/26 06:53:09 martti Exp $ ---- plugins/cram.c.orig Sun Oct 27 14:17:33 2002 -+++ plugins/cram.c Sun Oct 27 14:17:47 2002 -@@ -235,7 +235,7 @@ +--- plugins/cram.c.orig 2003-02-18 20:27:37.000000000 +0200 ++++ plugins/cram.c 2003-05-21 09:11:53.000000000 +0300 +@@ -230,7 +230,7 @@ HMAC_MD5_STATE md5state; int clear_md5state = 0; char *digest_str = NULL; diff --git a/security/cyrus-sasl2/patches/patch-ai b/security/cyrus-sasl2/patches/patch-ai index 3ad167994cc..4924a030879 100644 --- a/security/cyrus-sasl2/patches/patch-ai +++ b/security/cyrus-sasl2/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.2 2003/02/27 13:18:07 seb Exp $ +$NetBSD: patch-ai,v 1.3 2003/05/26 06:53:09 martti Exp $ ---- configure.orig Mon Feb 3 18:50:30 2003 -+++ configure -@@ -673,6 +673,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- +--- configure.orig 2003-04-14 21:07:48.000000000 +0300 ++++ configure 2003-05-21 10:00:35.000000000 +0300 +@@ -673,6 +673,7 @@ echo "$ac_t""$host" 1>&6 @@ -10,7 +10,7 @@ $NetBSD: patch-ai,v 1.2 2003/02/27 13:18:07 seb Exp $ # 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 +@@ -840,16 +841,16 @@ missing_dir=`cd $ac_aux_dir && pwd` @@ -32,7 +32,7 @@ $NetBSD: patch-ai,v 1.2 2003/02/27 13:18:07 seb Exp $ echo "$ac_t""missing" 1>&6 fi -@@ -866,16 +867,16 @@ else +@@ -866,16 +867,16 @@ echo "$ac_t""missing" 1>&6 fi @@ -54,7 +54,7 @@ $NetBSD: patch-ai,v 1.2 2003/02/27 13:18:07 seb Exp $ echo "$ac_t""missing" 1>&6 fi -@@ -1949,6 +1950,13 @@ fi +@@ -1949,6 +1950,13 @@ target=$save_target @@ -68,42 +68,35 @@ $NetBSD: patch-ai,v 1.2 2003/02/27 13:18:07 seb Exp $ if test "$ac_cv_can_build_shared" = no; then enable_shared=no enable_static=yes -@@ -6822,8 +6830,37 @@ LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/ +@@ -6828,6 +6836,31 @@ -+ -+ac_safe=`echo "/dev/urandom" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for /dev/urandom""... $ac_c" 1>&6 -+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 ++echo "$as_me:$LINENO: checking for /dev/urandom" >&5 ++echo $ECHO_N "checking for /dev/urandom... $ECHO_C" >&6 ++if test "${ac_cv_file__dev_urandom+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 +else -+ if test "$cross_compiling" = yes; then -+ { echo "configure: error: Cannot check for file existence when cross compiling" 1>&2; exit 1; } ++ test "$cross_compiling" = yes && ++ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 ++echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} ++ { (exit 1); exit 1; }; } ++if test -r "/dev/urandom"; then ++ ac_cv_file__dev_urandom=yes +else -+ if test -r /dev/urandom; then -+ eval "ac_cv_file_$ac_safe=yes" -+ else -+ eval "ac_cv_file_$ac_safe=no" -+ fi ++ ac_cv_file__dev_urandom=no +fi +fi -+if eval "test \"`echo '$ac_cv_file_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.h <<EOF ++echo "$as_me:$LINENO: result: $ac_cv_file__dev_urandom" >&5 ++echo "${ECHO_T}$ac_cv_file__dev_urandom" >&6 ++if test $ac_cv_file__dev_urandom = yes; then ++ cat >>confdefs.h <<_ACEOF +#define SASL_DEV_RANDOM "/dev/urandom" -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 ++_ACEOF + +fi + + echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:6827: checking for working const" >&5 -+echo "configure:6864: checking for working const" >&5 + echo "configure:6833: 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 |