[Midnightbsd-cvs] mports [16967] trunk/security/cyrus-sasl2: cyrus-sasl-2.1.26
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Sep 8 22:07:07 EDT 2014
Revision: 16967
http://svnweb.midnightbsd.org/mports/?rev=16967
Author: laffer1
Date: 2014-09-08 22:07:07 -0400 (Mon, 08 Sep 2014)
Log Message:
-----------
cyrus-sasl-2.1.26
Modified Paths:
--------------
trunk/security/cyrus-sasl2/Makefile
trunk/security/cyrus-sasl2/distinfo
trunk/security/cyrus-sasl2/files/patch-configure
trunk/security/cyrus-sasl2/pkg-plist
Added Paths:
-----------
trunk/security/cyrus-sasl2/files/patch-include__sasl.h
trunk/security/cyrus-sasl2/files/patch-libsasl2.pc.in
trunk/security/cyrus-sasl2/files/patch-plugins__ldapdb.c
trunk/security/cyrus-sasl2/files/patch-saslauthd__Makefile.in
trunk/security/cyrus-sasl2/files/patch-saslauthd__configure
trunk/security/cyrus-sasl2/files/patch-saslauthd__saslcache.c
Removed Paths:
-------------
trunk/security/cyrus-sasl2/files/patch-config::ltmain.sh
trunk/security/cyrus-sasl2/files/patch-lib::Makefile.in
trunk/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in
trunk/security/cyrus-sasl2/files/patch-saslauthd::configure
trunk/security/cyrus-sasl2/files/patch-saslauthd::saslcache.c
Modified: trunk/security/cyrus-sasl2/Makefile
===================================================================
--- trunk/security/cyrus-sasl2/Makefile 2014-09-07 18:27:12 UTC (rev 16966)
+++ trunk/security/cyrus-sasl2/Makefile 2014-09-09 02:07:07 UTC (rev 16967)
@@ -1,8 +1,7 @@
# $MidnightBSD$
PORTNAME= cyrus-sasl
-PORTVERSION= 2.1.23
-PORTREVISION= 1
+PORTVERSION= 2.1.26
CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \
Modified: trunk/security/cyrus-sasl2/distinfo
===================================================================
--- trunk/security/cyrus-sasl2/distinfo 2014-09-07 18:27:12 UTC (rev 16966)
+++ trunk/security/cyrus-sasl2/distinfo 2014-09-09 02:07:07 UTC (rev 16967)
@@ -1,3 +1,2 @@
-SHA256 (cyrus-sasl-2.1.23.tar.gz) = 20efcc4040cbab6e89a636a07dcf5720ee07b5c62359a4e7bf2500ef6020b136
-RMD160 (cyrus-sasl-2.1.23.tar.gz) = b2cd9734fa8b4bad82663517f019f9b92d9d3519
-SIZE (cyrus-sasl-2.1.23.tar.gz) = 1613642
+SHA256 (cyrus-sasl-2.1.26.tar.gz) = 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3
+SIZE (cyrus-sasl-2.1.26.tar.gz) = 5220231
Deleted: trunk/security/cyrus-sasl2/files/patch-config::ltmain.sh
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-config::ltmain.sh 2014-09-07 18:27:12 UTC (rev 16966)
+++ trunk/security/cyrus-sasl2/files/patch-config::ltmain.sh 2014-09-09 02:07:07 UTC (rev 16967)
@@ -1,33 +0,0 @@
-Index: config/ltmain.sh
-diff -u config/ltmain.sh.orig config/ltmain.sh
---- 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
- 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
-@@ -3396,8 +3396,8 @@
- # Install the pseudo-library for information purposes.
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
-- $show "$install_prog $instname $destdir/$name"
-- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ #$show "$install_prog $instname $destdir/$name"
-+ #$run eval "$install_prog $instname $destdir/$name" || exit $?
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
Modified: trunk/security/cyrus-sasl2/files/patch-configure
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-configure 2014-09-07 18:27:12 UTC (rev 16966)
+++ trunk/security/cyrus-sasl2/files/patch-configure 2014-09-09 02:07:07 UTC (rev 16967)
@@ -1,50 +1,32 @@
Index: configure
diff -u configure.orig configure
---- configure.orig Fri May 19 04:30:13 2006
-+++ configure Sat May 20 04:04:39 2006
-@@ -1586,6 +1586,7 @@
+--- configure.orig 2012-11-07 04:21:37.000000000 +0900
++++ configure 2014-03-25 18:24:59.021374856 +0900
+@@ -2365,6 +2365,7 @@
fi
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
+program_prefix=NONE
test "$program_prefix" != NONE &&
- program_transform_name="s,^,$program_prefix,;$program_transform_name"
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
-@@ -5125,7 +5126,7 @@
- fi
-
- saved_LIBS=$LIBS
-- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 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.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 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
- LIBS="$saved_LIBS -l$dbname"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5135,6 +5136,7 @@
+@@ -6329,6 +6330,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <stdio.h>
#include <db.h>
- int
- main ()
-@@ -5882,7 +5884,7 @@
- fi
-
- saved_LIBS=$LIBS
-- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 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.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 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
- LIBS="$saved_LIBS -l$dbname"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5892,6 +5894,7 @@
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+@@ -7156,6 +7158,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <stdio.h>
#include <db.h>
- int
- main ()
-@@ -7193,6 +7196,8 @@
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+@@ -8700,6 +8703,8 @@
SASLAUTHD_TRUE='#'
SASLAUTHD_FALSE=
fi
@@ -51,32 +33,64 @@
+SASLAUTHD_TRUE='#'
+SASLAUTHD_FALSE=
- echo "$as_me:$LINENO: checking if I should include saslauthd" >&5
- echo $ECHO_N "checking if I should include saslauthd... $ECHO_C" >&6
-@@ -10650,7 +10655,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:$LINENO: checking if I should include saslauthd" >&5
+ $as_echo_n "checking if I should include saslauthd... " >&6; }
+@@ -12552,6 +12557,7 @@
+ gssapi_dir="${gssapi}/lib"
+ GSSAPIBASE_LIBS="-L$gssapi_dir"
+ GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
++ gssapi_bindir="${gssapi}/bin/"
+ else
+ # FIXME: This is only used for building cyrus, and then only as
+ # a real hack. it needs to be fixed.
+@@ -12571,7 +12577,7 @@
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
-+LIBS="${GSSAPIBASE_LIBS} `krb5-config --libs gssapi` $LIBS"
++LIBS="${GSSAPIBASE_LIBS} `${gssapi_bindir}krb5-config --libs gssapi` $LIBS"
cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
/* confdefs.h. */
-@@ -11060,7 +11065,7 @@
+ _ACEOF
+@@ -13047,7 +13053,7 @@
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
elif test "$gss_impl" = "heimdal"; then
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
-+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`"
++ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `${gssapi_bindir}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}"
elif test "$gss_impl" = "cybersafe03"; then
# Version of CyberSafe with two libraries
-@@ -11898,7 +11903,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14479,7 +14485,7 @@
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpq $LIBS"
+LIBS="-lpq $GSSAPIBASE_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
/* confdefs.h. */
+ _ACEOF
+@@ -14591,9 +14597,9 @@
+ $as_echo "$as_me: WARNING: SQLite Library not found" >&2;}; true;;
+ *)
+ if test -d ${with_sqlite}/lib; then
+- LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
++ LIB_SQLITE="-L${with_sqlite}/lib $andrew_cv_runpath_switch${with_sqlite}/lib"
+ else
+- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
++ LIB_SQLITE="-L${with_sqlite} $andrew_cv_runpath_switch${with_sqlite}"
+ fi
+
+ LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -14721,9 +14727,9 @@
+ $as_echo "$as_me: WARNING: SQLite3 Library not found" >&2;}; true;;
+ *)
+ if test -d ${with_sqlite3}/lib; then
+- LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
++ LIB_SQLITE3="-L${with_sqlite3}/lib $andrew_cv_runpath_switch${with_sqlite3}/lib"
+ else
+- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
++ LIB_SQLITE3="-L${with_sqlite3} $andrew_cv_runpath_switch${with_sqlite3}"
+ fi
+
+ LIB_SQLITE3_DIR=$LIB_SQLITE3
Added: trunk/security/cyrus-sasl2/files/patch-include__sasl.h
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-include__sasl.h (rev 0)
+++ trunk/security/cyrus-sasl2/files/patch-include__sasl.h 2014-09-09 02:07:07 UTC (rev 16967)
@@ -0,0 +1,23 @@
+From 67a188693796a14e3a76ac603104807fbbfddfc4 Mon Sep 17 00:00:00 2001
+From: Ken Murchison <murch at andrew.cmu.edu>
+Date: Thu, 20 Dec 2012 23:14:50 +0000
+Subject: sasl.h: #include <stddef.h> for size_t on NetBSD
+
+---
+(limited to 'include/sasl.h')
+
+diff --git a/include/sasl.h b/include/sasl.h
+index fef4d51..8b8a63f 100755
+--- include/sasl.h
++++ include/sasl.h
+@@ -121,6 +121,8 @@
+ #ifndef SASL_H
+ #define SASL_H 1
+
++#include <stddef.h> /* For size_t */
++
+ /* Keep in sync with win32/common.mak */
+ #define SASL_VERSION_MAJOR 2
+ #define SASL_VERSION_MINOR 1
+--
+cgit v0.9.0.2
Deleted: trunk/security/cyrus-sasl2/files/patch-lib::Makefile.in
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-lib::Makefile.in 2014-09-07 18:27:12 UTC (rev 16966)
+++ trunk/security/cyrus-sasl2/files/patch-lib::Makefile.in 2014-09-09 02:07:07 UTC (rev 16967)
@@ -1,24 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig Sun May 15 14:58:38 2005
-+++ lib/Makefile.in Wed May 18 01:12:50 2005
-@@ -12,6 +12,8 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
-+.PATH: ${.CURDIR}/../plugins ${.CURDIR}/../sasldb
-+
- @SET_MAKE@
-
- # Makefile.am for the SASL library
-@@ -645,10 +647,6 @@
- rm -f $@
- ln -s .libs/$@ $@
-
--$(SASL_STATIC_OBJS): linksrcs
--
--linksrcs:
-- -ln -s $(SASL_STATIC_SRCS) .
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
Added: trunk/security/cyrus-sasl2/files/patch-libsasl2.pc.in
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-libsasl2.pc.in (rev 0)
+++ trunk/security/cyrus-sasl2/files/patch-libsasl2.pc.in 2014-09-09 02:07:07 UTC (rev 16967)
@@ -0,0 +1,17 @@
+Index: libsasl2.pc.in
+diff -u libsasl2.pc.in.orig libsasl2.pc.in
+--- libsasl2.pc.in.orig 2012-10-12 23:05:48.000000000 +0900
++++ libsasl2.pc.in 2014-03-22 02:41:33.668062061 +0900
+@@ -1,8 +1,12 @@
++prefix = @prefix@
++exec_prefix = @exec_prefix@
++includedir = @includedir@
+ libdir = @libdir@
+
+ Name: Cyrus SASL
+ Description: Cyrus SASL implementation
+ URL: http://www.cyrussasl.org/
+ Version: @VERSION@
++Cflags: -I${includedir}
+ Libs: -L${libdir} -lsasl2
+ Libs.private: @LIB_DOOR@ @SASL_DL_LIB@ @LIBS@
Added: trunk/security/cyrus-sasl2/files/patch-plugins__ldapdb.c
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-plugins__ldapdb.c (rev 0)
+++ trunk/security/cyrus-sasl2/files/patch-plugins__ldapdb.c 2014-09-09 02:07:07 UTC (rev 16967)
@@ -0,0 +1,13 @@
+Index: plugins/ldapdb.c
+diff -u -p plugins/ldapdb.c.orig plugins/ldapdb.c
+--- plugins/ldapdb.c.orig 2011-05-12 04:25:55.000000000 +0900
++++ plugins/ldapdb.c 2011-09-24 17:25:23.465329876 +0900
+@@ -251,6 +251,8 @@ static int ldapdb_auxprop_lookup(void *g
+
+ #if defined(LDAP_PROXY_AUTHZ_FAILURE)
+ case LDAP_PROXY_AUTHZ_FAILURE:
++#else
++ case LDAP_X_PROXY_AUTHZ_FAILURE:
+ #endif
+ case LDAP_INAPPROPRIATE_AUTH:
+ case LDAP_INVALID_CREDENTIALS:
Deleted: trunk/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in 2014-09-07 18:27:12 UTC (rev 16966)
+++ trunk/security/cyrus-sasl2/files/patch-saslauthd::Makefile.in 2014-09-09 02:07:07 UTC (rev 16967)
@@ -1,13 +0,0 @@
-Index: saslauthd/Makefile.in
-diff -u saslauthd/Makefile.in.orig saslauthd/Makefile.in
---- saslauthd/Makefile.in.orig Fri May 19 04:30:21 2006
-+++ saslauthd/Makefile.in Sat May 20 05:21:31 2006
-@@ -621,7 +621,7 @@
-
- install-data-local: saslauthd.8
- $(mkinstalldirs) $(DESTDIR)$(mandir)/man8
-- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
-+ $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
Deleted: trunk/security/cyrus-sasl2/files/patch-saslauthd::configure
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-saslauthd::configure 2014-09-07 18:27:12 UTC (rev 16966)
+++ trunk/security/cyrus-sasl2/files/patch-saslauthd::configure 2014-09-09 02:07:07 UTC (rev 16967)
@@ -1,71 +0,0 @@
---- saslauthd/configure.orig 2006-05-19 03:30:20.000000000 +0800
-+++ saslauthd/configure 2008-05-21 10:00:20.000000000 +0800
-@@ -1234,7 +1234,7 @@
- ac_cache_corrupted=: ;;
- ,);;
- *)
-- if test "x$ac_old_val" != "x$ac_new_val"; then
-+ if test "`echo $ac_old_val`" != "`echo $ac_new_val`"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
- echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-@@ -1526,6 +1526,7 @@
- fi
- echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-+program_prefix=NONE
- test "$program_prefix" != NONE &&
- program_transform_name="s,^,$program_prefix,;$program_transform_name"
- # Use a double $ so make ignores it.
-@@ -6843,7 +6844,7 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
-+LIBS="${GSSAPIBASE_LIBS} `krb5-config --libs gssapi` $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -7253,7 +7254,7 @@
- GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
- elif test "$gss_impl" = "heimdal"; then
- CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
-- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -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}"
- elif test "$gss_impl" = "cybersafe03"; then
- # Version of CyberSafe with two libraries
-@@ -8010,7 +8011,7 @@
- fi
-
- saved_LIBS=$LIBS
-- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 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.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 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
- LIBS="$saved_LIBS -l$dbname"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8020,6 +8021,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <stdio.h>
- #include <db.h>
- int
- main ()
-@@ -8767,7 +8769,7 @@
- fi
-
- saved_LIBS=$LIBS
-- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 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.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 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
- LIBS="$saved_LIBS -l$dbname"
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8777,6 +8779,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <stdio.h>
- #include <db.h>
- int
- main ()
Deleted: trunk/security/cyrus-sasl2/files/patch-saslauthd::saslcache.c
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-saslauthd::saslcache.c 2014-09-07 18:27:12 UTC (rev 16966)
+++ trunk/security/cyrus-sasl2/files/patch-saslauthd::saslcache.c 2014-09-09 02:07:07 UTC (rev 16967)
@@ -1,13 +0,0 @@
-Index: saslauthd/saslcache.c
-diff -u -p saslauthd/saslcache.c.orig saslauthd/saslcache.c
---- saslauthd/saslcache.c.orig Sat Mar 29 04:59:24 2003
-+++ saslauthd/saslcache.c Thu Dec 14 13:44:41 2006
-@@ -137,7 +137,7 @@ int main(int argc, char **argv) {
- }
-
- table_stats = shm_base + 64;
-- (char *)table = (char *)table_stats + 128;
-+ table = (struct bucket *)((char *)table_stats + 128);
-
- if (dump_stat_info == 0 && dump_user_info == 0)
- dump_stat_info = 1;
Added: trunk/security/cyrus-sasl2/files/patch-saslauthd__Makefile.in
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-saslauthd__Makefile.in (rev 0)
+++ trunk/security/cyrus-sasl2/files/patch-saslauthd__Makefile.in 2014-09-09 02:07:07 UTC (rev 16967)
@@ -0,0 +1,13 @@
+Index: saslauthd/Makefile.in
+diff -u saslauthd/Makefile.in.orig saslauthd/Makefile.in
+--- saslauthd/Makefile.in.orig 2011-09-07 22:13:56.000000000 +0900
++++ saslauthd/Makefile.in 2011-09-14 15:16:53.207259788 +0900
+@@ -722,7 +722,7 @@
+
+ install-data-local: saslauthd.8
+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man8
+- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
++ $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Added: trunk/security/cyrus-sasl2/files/patch-saslauthd__configure
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-saslauthd__configure (rev 0)
+++ trunk/security/cyrus-sasl2/files/patch-saslauthd__configure 2014-09-09 02:07:07 UTC (rev 16967)
@@ -0,0 +1,54 @@
+Index: saslauthd/configure
+diff -u saslauthd/configure.orig saslauthd/configure
+--- saslauthd/configure.orig 2012-11-07 04:21:44.000000000 +0900
++++ saslauthd/configure 2013-01-06 17:15:30.597678365 +0900
+@@ -2185,6 +2185,7 @@
+ fi
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+ $as_echo "yes" >&6; }
++program_prefix=NONE
+ test "$program_prefix" != NONE &&
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+@@ -8301,6 +8302,7 @@
+ gssapi_dir="${gssapi}/lib"
+ GSSAPIBASE_LIBS="-L$gssapi_dir"
+ GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
++ gssapi_bindir="${gssapi}/bin/"
+ else
+ # FIXME: This is only used for building cyrus, and then only as
+ # a real hack. it needs to be fixed.
+@@ -8320,7 +8322,7 @@
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
++LIBS="${GSSAPIBASE_LIBS} `${gssapi_bindir}krb5-config --libs gssapi` $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -8796,7 +8798,7 @@
+ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
+ elif test "$gss_impl" = "heimdal"; then
+ CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
+- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
++ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `${gssapi_bindir}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}"
+ elif test "$gss_impl" = "cybersafe03"; then
+ # Version of CyberSafe with two libraries
+@@ -10065,6 +10067,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
++#include <stdio.h>
+ #include <db.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+@@ -10892,6 +10895,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
++#include <stdio.h>
+ #include <db.h>
+ _ACEOF
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
Added: trunk/security/cyrus-sasl2/files/patch-saslauthd__saslcache.c
===================================================================
--- trunk/security/cyrus-sasl2/files/patch-saslauthd__saslcache.c (rev 0)
+++ trunk/security/cyrus-sasl2/files/patch-saslauthd__saslcache.c 2014-09-09 02:07:07 UTC (rev 16967)
@@ -0,0 +1,13 @@
+Index: saslauthd/saslcache.c
+diff -u -p saslauthd/saslcache.c.orig saslauthd/saslcache.c
+--- saslauthd/saslcache.c.orig Sat Mar 29 04:59:24 2003
++++ saslauthd/saslcache.c Thu Dec 14 13:44:41 2006
+@@ -137,7 +137,7 @@ int main(int argc, char **argv) {
+ }
+
+ table_stats = shm_base + 64;
+- (char *)table = (char *)table_stats + 128;
++ table = (struct bucket *)((char *)table_stats + 128);
+
+ if (dump_stat_info == 0 && dump_user_info == 0)
+ dump_stat_info = 1;
Modified: trunk/security/cyrus-sasl2/pkg-plist
===================================================================
--- trunk/security/cyrus-sasl2/pkg-plist 2014-09-07 18:27:12 UTC (rev 16966)
+++ trunk/security/cyrus-sasl2/pkg-plist 2014-09-09 02:07:07 UTC (rev 16967)
@@ -9,51 +9,51 @@
lib/libsasl2.a
lib/libsasl2.la
lib/libsasl2.so
-lib/libsasl2.so.2
+lib/libsasl2.so.3
lib/sasl2/libanonymous.a
lib/sasl2/libanonymous.la
lib/sasl2/libanonymous.so
-lib/sasl2/libanonymous.so.2
+lib/sasl2/libanonymous.so.3
%%CRAM%%lib/sasl2/libcrammd5.a
%%CRAM%%lib/sasl2/libcrammd5.la
%%CRAM%%lib/sasl2/libcrammd5.so
-%%CRAM%%lib/sasl2/libcrammd5.so.2
+%%CRAM%%lib/sasl2/libcrammd5.so.3
%%DIGEST%%lib/sasl2/libdigestmd5.a
%%DIGEST%%lib/sasl2/libdigestmd5.la
%%DIGEST%%lib/sasl2/libdigestmd5.so
-%%DIGEST%%lib/sasl2/libdigestmd5.so.2
+%%DIGEST%%lib/sasl2/libdigestmd5.so.3
%%GSSAPI%%lib/sasl2/libgssapiv2.a
%%GSSAPI%%lib/sasl2/libgssapiv2.la
%%GSSAPI%%lib/sasl2/libgssapiv2.so
-%%GSSAPI%%lib/sasl2/libgssapiv2.so.2
+%%GSSAPI%%lib/sasl2/libgssapiv2.so.3
%%EBONES%%lib/sasl2/libkerberos4.a
%%EBONES%%lib/sasl2/libkerberos4.la
%%EBONES%%lib/sasl2/libkerberos4.so
-%%EBONES%%lib/sasl2/libkerberos4.so.2
+%%EBONES%%lib/sasl2/libkerberos4.so.3
%%LOGIN%%lib/sasl2/liblogin.a
%%LOGIN%%lib/sasl2/liblogin.la
%%LOGIN%%lib/sasl2/liblogin.so
-%%LOGIN%%lib/sasl2/liblogin.so.2
+%%LOGIN%%lib/sasl2/liblogin.so.3
%%SQL%%lib/sasl2/libsql.a
%%SQL%%lib/sasl2/libsql.la
%%SQL%%lib/sasl2/libsql.so
-%%SQL%%lib/sasl2/libsql.so.2
+%%SQL%%lib/sasl2/libsql.so.3
%%NTLM%%lib/sasl2/libntlm.a
%%NTLM%%lib/sasl2/libntlm.la
%%NTLM%%lib/sasl2/libntlm.so
-%%NTLM%%lib/sasl2/libntlm.so.2
+%%NTLM%%lib/sasl2/libntlm.so.3
%%OTP%%lib/sasl2/libotp.a
%%OTP%%lib/sasl2/libotp.la
%%OTP%%lib/sasl2/libotp.so
-%%OTP%%lib/sasl2/libotp.so.2
+%%OTP%%lib/sasl2/libotp.so.3
%%PLAIN%%lib/sasl2/libplain.a
%%PLAIN%%lib/sasl2/libplain.la
%%PLAIN%%lib/sasl2/libplain.so
-%%PLAIN%%lib/sasl2/libplain.so.2
+%%PLAIN%%lib/sasl2/libplain.so.3
lib/sasl2/libsasldb.a
lib/sasl2/libsasldb.la
lib/sasl2/libsasldb.so
-lib/sasl2/libsasldb.so.2
+lib/sasl2/libsasldb.so.3
sbin/pluginviewer
sbin/sasldblistusers2
sbin/saslpasswd2
More information about the Midnightbsd-cvs
mailing list