diff options
Diffstat (limited to 'security')
21 files changed, 92 insertions, 118 deletions
diff --git a/security/cyrus-sasl/Makefile.common b/security/cyrus-sasl/Makefile.common index 16dd7a1c1ea..78141a4da6e 100644 --- a/security/cyrus-sasl/Makefile.common +++ b/security/cyrus-sasl/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2006/04/18 17:41:30 jlam Exp $ +# $NetBSD: Makefile.common,v 1.10 2006/10/04 12:07:53 obache Exp $ # # This file is currently included by: # @@ -16,7 +16,7 @@ # This Makefile fragment should be included _below_ any SASL_PLUGIN # definition and _above_ any CONFIGURE_ARGS definitions. -DISTNAME= cyrus-sasl-2.1.21 +DISTNAME= cyrus-sasl-2.1.22 CATEGORIES= security MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/ diff --git a/security/cyrus-sasl/PLIST b/security/cyrus-sasl/PLIST index 21a4eb0c511..824eae6322f 100644 --- a/security/cyrus-sasl/PLIST +++ b/security/cyrus-sasl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2006/04/18 17:41:30 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2006/10/04 12:07:53 obache Exp $ include/sasl/hmac-md5.h include/sasl/md5.h include/sasl/md5global.h @@ -30,6 +30,7 @@ man/man3/sasl_encodev.3 man/man3/sasl_errdetail.3 man/man3/sasl_errors.3 man/man3/sasl_errstring.3 +man/man3/sasl_getconfpath_t.3 man/man3/sasl_getopt_t.3 man/man3/sasl_getpath_t.3 man/man3/sasl_getprop.3 @@ -50,8 +51,10 @@ man/man3/sasl_setpass.3 man/man3/sasl_setprop.3 man/man3/sasl_user_exists.3 man/man3/sasl_verifyfile_t.3 +man/man8/pluginviewer.8 man/man8/sasldblistusers2.8 man/man8/saslpasswd2.8 +sbin/pluginviewer sbin/sasldblistusers2 sbin/saslpasswd2 share/doc/cyrus-sasl/advanced.html diff --git a/security/cyrus-sasl/distinfo b/security/cyrus-sasl/distinfo index 3b49a6a0606..9a7a2c61ff0 100644 --- a/security/cyrus-sasl/distinfo +++ b/security/cyrus-sasl/distinfo @@ -1,19 +1,17 @@ -$NetBSD: distinfo,v 1.15 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: distinfo,v 1.16 2006/10/04 12:07:53 obache Exp $ -SHA1 (cyrus-sasl-2.1.21.tar.gz) = 6449f730c963d29d43600a95373a6e2db52d6d66 -RMD160 (cyrus-sasl-2.1.21.tar.gz) = 93e0e1868453c5781602b5cce23e746b8823a26b -Size (cyrus-sasl-2.1.21.tar.gz) = 1584931 bytes -SHA1 (patch-aa) = 0267569a89aade1c5aa455d618ebb0016022ecc4 -SHA1 (patch-ab) = 55cd67f8856239ab90696456a16af9498a4354ae -SHA1 (patch-ac) = 671c462164f0c763b4a646aca9afe293be9448ef +SHA1 (cyrus-sasl-2.1.22.tar.gz) = d23454ab12054714ab97d229c86cb934ce63fbb1 +RMD160 (cyrus-sasl-2.1.22.tar.gz) = 086e20d01588cb86decad001244b72a37223354c +Size (cyrus-sasl-2.1.22.tar.gz) = 1609278 bytes +SHA1 (patch-aa) = a20fca0058a04d00debb78d8cc051ec8d8f57af2 +SHA1 (patch-ab) = e1cb24eb8888ae93846efbb5ef42028ac52a44bd +SHA1 (patch-ac) = 1b653bee1a1b98e8e197911cc193c2c9b6d9f736 SHA1 (patch-ad) = c3fe38777a281b6800115711b732254f72887107 -SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad -SHA1 (patch-af) = 40ec1378971536daddc543a66a1923451a4c381c +SHA1 (patch-ae) = ac9403e8cdbebb8be04947c9ff8a7505002b3a36 SHA1 (patch-ag) = 6a2713504078dad681dcc6f7ba296972d03d5b15 SHA1 (patch-ah) = 595e58bd756e75bda5f25a19119f2fc7c27bc7d9 -SHA1 (patch-ai) = 6309e9117be65e64de635cb004385e9badcd687c -SHA1 (patch-ak) = 1f727d2bc0536ac5d9ba28f5e4cf01c6c1998987 -SHA1 (patch-al) = d706fb15cdff279251bed0a2c0a7b5cd1bad3584 +SHA1 (patch-ai) = 8b09b26e66f64895de069ebccb582d6d5f38287d +SHA1 (patch-ak) = e76a0ac7559845ed374c63f0261df9817e383ac1 +SHA1 (patch-al) = d1bfddb749b2f234d3750e3a83bf800bdba4cec4 SHA1 (patch-ap) = eb87cd283f99da69916a7eb251000f2d9254f17d -SHA1 (patch-aq) = 6d2f126a52c589a4789d1d3e3d3e8ab5e31cd82f -SHA1 (patch-at) = cf35ac66873a5bc18216e13a1240019da99563ca +SHA1 (patch-aq) = e7ed617db1935ed8f8c23d934da70582468c7dea diff --git a/security/cyrus-sasl/patches/patch-aa b/security/cyrus-sasl/patches/patch-aa index 2327ba38e33..01b231bd4c5 100644 --- a/security/cyrus-sasl/patches/patch-aa +++ b/security/cyrus-sasl/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.8 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: patch-aa,v 1.9 2006/10/04 12:07:53 obache Exp $ ---- configure.in.orig 2005-05-07 00:54:18.000000000 -0400 +--- configure.in.orig 2006-05-18 15:06:13.000000000 -0400 +++ configure.in @@ -44,12 +44,7 @@ dnl AC_INIT(lib/saslint.h) @@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.8 2006/04/18 17:41:30 jlam Exp $ AC_CONFIG_AUX_DIR(config) AC_CANONICAL_HOST -@@ -506,7 +501,6 @@ SASL_KERBEROS_V4_CHK +@@ -528,7 +523,6 @@ SASL_KERBEROS_V4_CHK SASL_GSSAPI_CHK if test "$gssapi" != "no"; then diff --git a/security/cyrus-sasl/patches/patch-ab b/security/cyrus-sasl/patches/patch-ab index c09079943f3..796eb200cdf 100644 --- a/security/cyrus-sasl/patches/patch-ab +++ b/security/cyrus-sasl/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.5 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: patch-ab,v 1.6 2006/10/04 12:07:53 obache Exp $ ---- aclocal.m4.orig 2005-05-15 01:58:02.000000000 -0400 +--- aclocal.m4.orig 2006-05-18 15:30:08.000000000 -0400 +++ aclocal.m4 @@ -1696,7 +1696,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB], LIBS="$saved_LIBS -l$dbname" @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.5 2006/04/18 17:41:30 jlam Exp $ dblib="no") if test "$dblib" = "berkeley"; then break; fi done -@@ -3010,8 +3010,11 @@ if test "$gssapi" != no; then +@@ -3016,8 +3016,11 @@ if test "$gssapi" != no; then AC_MSG_RESULT([with implementation ${gss_impl}]) AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv") SASL_MECHS="$SASL_MECHS libgssapiv2.la" diff --git a/security/cyrus-sasl/patches/patch-ac b/security/cyrus-sasl/patches/patch-ac index 7759ed0cc78..9699b1d59ed 100644 --- a/security/cyrus-sasl/patches/patch-ac +++ b/security/cyrus-sasl/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.4 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: patch-ac,v 1.5 2006/10/04 12:07:53 obache Exp $ ---- cmulocal/sasl2.m4.orig 2005-05-07 00:15:17.000000000 -0400 +--- cmulocal/sasl2.m4.orig 2006-05-18 15:25:34.000000000 -0400 +++ cmulocal/sasl2.m4 -@@ -249,8 +249,11 @@ if test "$gssapi" != no; then +@@ -252,8 +252,11 @@ if test "$gssapi" != no; then AC_MSG_RESULT([with implementation ${gss_impl}]) AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv") SASL_MECHS="$SASL_MECHS libgssapiv2.la" diff --git a/security/cyrus-sasl/patches/patch-ae b/security/cyrus-sasl/patches/patch-ae index 92814ccb36c..6fd167613ed 100644 --- a/security/cyrus-sasl/patches/patch-ae +++ b/security/cyrus-sasl/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.3 2006/04/13 21:32:40 wiz Exp $ +$NetBSD: patch-ae,v 1.4 2006/10/04 12:07:53 obache Exp $ ---- sample/server.c.orig Sun Oct 27 14:15:37 2002 -+++ sample/server.c Sun Oct 27 14:15:40 2002 -@@ -117,9 +117,9 @@ +--- sample/server.c.orig 2004-03-29 09:56:40.000000000 -0500 ++++ sample/server.c +@@ -117,9 +117,9 @@ int *listensock(const char *port, const } #if defined(IPV6_V6ONLY) && !(defined(__FreeBSD__) && __FreeBSD__ < 3) if (r->ai_family == AF_INET6) { diff --git a/security/cyrus-sasl/patches/patch-af b/security/cyrus-sasl/patches/patch-af deleted file mode 100644 index 797c9a3254b..00000000000 --- a/security/cyrus-sasl/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.4 2006/04/13 21:32:40 wiz Exp $ - ---- lib/client.c.orig 2003-11-12 02:26:06.000000000 +1000 -+++ lib/client.c -@@ -61,8 +61,6 @@ - - static cmech_list_t *cmechlist; /* global var which holds the list */ - --static sasl_global_callbacks_t global_callbacks; -- - static int _sasl_client_active = 0; - - static int init_mechlist() diff --git a/security/cyrus-sasl/patches/patch-ai b/security/cyrus-sasl/patches/patch-ai index f25affc41e8..3f7d1004633 100644 --- a/security/cyrus-sasl/patches/patch-ai +++ b/security/cyrus-sasl/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.5 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: patch-ai,v 1.6 2006/10/04 12:07:53 obache Exp $ ---- configure.orig 2005-05-15 01:58:28.000000000 -0400 +--- configure.orig 2006-05-18 15:30:13.000000000 -0400 +++ configure -@@ -1331,8 +1331,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -1334,8 +1334,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.5 2006/04/18 17:41:30 jlam Exp $ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. -@@ -1350,8 +1348,6 @@ echo "$as_me: creating cache $cache_file +@@ -1353,8 +1351,6 @@ echo "$as_me: creating cache $cache_file >$cache_file fi @@ -20,7 +20,7 @@ $NetBSD: patch-ai,v 1.5 2006/04/18 17:41:30 jlam Exp $ ac_aux_dir= for ac_dir in config $srcdir/config; do if test -f $ac_dir/install-sh; then -@@ -5155,7 +5151,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -5156,7 +5152,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -29,7 +29,7 @@ $NetBSD: patch-ai,v 1.5 2006/04/18 17:41:30 jlam Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -5912,7 +5908,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -5913,7 +5909,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -38,7 +38,7 @@ $NetBSD: patch-ai,v 1.5 2006/04/18 17:41:30 jlam Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -11158,8 +11154,15 @@ if test $ac_cv_lib_resolv_res_search = y +@@ -11304,8 +11300,15 @@ if test $ac_cv_lib_resolv_res_search = y fi SASL_MECHS="$SASL_MECHS libgssapiv2.la" @@ -56,7 +56,7 @@ $NetBSD: patch-ai,v 1.5 2006/04/18 17:41:30 jlam Exp $ cmu_save_LIBS="$LIBS" LIBS="$LIBS $GSSAPIBASE_LIBS" -@@ -11257,11 +11260,6 @@ fi +@@ -11403,11 +11406,6 @@ fi if test "$gssapi" != "no"; then diff --git a/security/cyrus-sasl/patches/patch-ak b/security/cyrus-sasl/patches/patch-ak index 3bef823484e..a56cf5704c8 100644 --- a/security/cyrus-sasl/patches/patch-ak +++ b/security/cyrus-sasl/patches/patch-ak @@ -1,6 +1,6 @@ -$NetBSD: patch-ak,v 1.4 2006/04/13 21:32:41 wiz Exp $ +$NetBSD: patch-ak,v 1.5 2006/10/04 12:07:53 obache Exp $ ---- Makefile.am.orig 2004-10-19 19:48:11.000000000 -0400 +--- Makefile.am.orig 2006-05-19 10:29:48.000000000 -0400 +++ Makefile.am @@ -69,7 +69,7 @@ else INSTALLOSX = @@ -8,6 +8,6 @@ $NetBSD: patch-ak,v 1.4 2006/04/13 21:32:41 wiz Exp $ -SUBDIRS=include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD) +SUBDIRS=include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) - EXTRA_DIST=config cmulocal win32 mac dlcompat-20010505 NTMakefile + EXTRA_DIST=config cmulocal win32 mac dlcompat-20010505 NTMakefile INSTALL.TXT dist-hook: diff --git a/security/cyrus-sasl/patches/patch-al b/security/cyrus-sasl/patches/patch-al index cd30fb08e54..41d50a4256e 100644 --- a/security/cyrus-sasl/patches/patch-al +++ b/security/cyrus-sasl/patches/patch-al @@ -1,13 +1,13 @@ -$NetBSD: patch-al,v 1.4 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: patch-al,v 1.5 2006/10/04 12:07:53 obache Exp $ ---- Makefile.in.orig 2005-05-15 01:58:33.000000000 -0400 +--- Makefile.in.orig 2006-05-19 10:30:34.000000000 -0400 +++ Makefile.in -@@ -241,7 +241,7 @@ AUTOMAKE_OPTIONS = 1.7 +@@ -242,7 +242,7 @@ AUTOMAKE_OPTIONS = 1.7 @MACOSX_FALSE@INSTALLOSX = @MACOSX_TRUE@INSTALLOSX = install-exec-local-osx -SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) $(SAD) +SUBDIRS = include sasldb plugins lib utils doc man $(PWC) $(SAM) $(JAV) - EXTRA_DIST = config cmulocal win32 mac dlcompat-20010505 NTMakefile + EXTRA_DIST = config cmulocal win32 mac dlcompat-20010505 NTMakefile INSTALL.TXT framedir = /Library/Frameworks/SASL2.framework diff --git a/security/cyrus-sasl/patches/patch-aq b/security/cyrus-sasl/patches/patch-aq index cb7d2d1a66d..b5f01cc4018 100644 --- a/security/cyrus-sasl/patches/patch-aq +++ b/security/cyrus-sasl/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.4 2006/04/18 17:41:30 jlam Exp $ +$NetBSD: patch-aq,v 1.5 2006/10/04 12:07:53 obache Exp $ ---- sasldb/Makefile.in.orig 2005-05-15 01:58:41.000000000 -0400 +--- sasldb/Makefile.in.orig 2006-05-18 15:30:16.000000000 -0400 +++ sasldb/Makefile.in -@@ -239,26 +239,18 @@ extra_common_sources = db_none.c db_ndbm +@@ -240,26 +240,18 @@ extra_common_sources = db_none.c db_ndbm EXTRA_DIST = NTMakefile noinst_LTLIBRARIES = libsasldb.la @@ -29,7 +29,7 @@ $NetBSD: patch-aq,v 1.4 2006/04/18 17:41:30 jlam Exp $ LTLIBRARIES = $(noinst_LTLIBRARIES) libsasldb_la_LDFLAGS = -@@ -278,10 +270,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( +@@ -279,10 +271,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -42,7 +42,7 @@ $NetBSD: patch-aq,v 1.4 2006/04/18 17:41:30 jlam Exp $ all: all-am -@@ -542,8 +533,6 @@ uninstall-am: uninstall-info-am +@@ -543,8 +534,6 @@ uninstall-am: uninstall-info-am tags uninstall uninstall-am uninstall-info-am diff --git a/security/cyrus-sasl/patches/patch-at b/security/cyrus-sasl/patches/patch-at deleted file mode 100644 index c10bf85e66b..00000000000 --- a/security/cyrus-sasl/patches/patch-at +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-at,v 1.1 2006/04/13 21:32:41 wiz Exp $ - ---- plugins/ntlm.c.orig 2006-01-27 17:45:34.000000000 +0000 -+++ plugins/ntlm.c -@@ -74,6 +74,7 @@ - #endif /* WIN32 */ - - #include <openssl/md4.h> -+#include <openssl/md5.h> - #include <openssl/hmac.h> - #include <openssl/des.h> - #include <openssl/opensslv.h> diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile index 0f8b3df5936..7c52c1540e7 100644 --- a/security/cyrus-saslauthd/Makefile +++ b/security/cyrus-saslauthd/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2006/08/11 12:51:32 taca Exp $ +# $NetBSD: Makefile,v 1.34 2006/10/04 12:07:53 obache Exp $ -DISTNAME= cyrus-sasl-2.1.21 +DISTNAME= cyrus-sasl-2.1.22 PKGNAME= ${DISTNAME:S/sasl/saslauthd/} -PKGREVISION= 2 CATEGORIES= security MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/ diff --git a/security/cyrus-saslauthd/PLIST b/security/cyrus-saslauthd/PLIST index a289b356de0..7513dd9df83 100644 --- a/security/cyrus-saslauthd/PLIST +++ b/security/cyrus-saslauthd/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.6 2005/05/02 20:34:04 reed Exp $ +@comment $NetBSD: PLIST,v 1.7 2006/10/04 12:07:53 obache Exp $ bin/saslcache bin/testsaslauthd man/man8/saslauthd.8 sbin/saslauthd +sbin/testsaslauthd ${LDAP}share/doc/cyrus-saslauthd/LDAP_SASLAUTHD ${LDAP}@dirrm share/doc/cyrus-saslauthd share/examples/rc.d/saslauthd diff --git a/security/cyrus-saslauthd/distinfo b/security/cyrus-saslauthd/distinfo index 862a3aa1620..9894800908d 100644 --- a/security/cyrus-saslauthd/distinfo +++ b/security/cyrus-saslauthd/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.8 2006/08/11 12:51:32 taca Exp $ +$NetBSD: distinfo,v 1.9 2006/10/04 12:07:53 obache Exp $ -SHA1 (cyrus-sasl-2.1.21.tar.gz) = 6449f730c963d29d43600a95373a6e2db52d6d66 -RMD160 (cyrus-sasl-2.1.21.tar.gz) = 93e0e1868453c5781602b5cce23e746b8823a26b -Size (cyrus-sasl-2.1.21.tar.gz) = 1584931 bytes -SHA1 (patch-aa) = c507c791d94772909f8e56a1b81de17ebdb6c245 -SHA1 (patch-ab) = 1e410456cbe5d8711a08638038733f5513b917fb +SHA1 (cyrus-sasl-2.1.22.tar.gz) = d23454ab12054714ab97d229c86cb934ce63fbb1 +RMD160 (cyrus-sasl-2.1.22.tar.gz) = 086e20d01588cb86decad001244b72a37223354c +Size (cyrus-sasl-2.1.22.tar.gz) = 1609278 bytes +SHA1 (patch-aa) = f90f8f3a08108b32dfc21a2f959f8907619a245f +SHA1 (patch-ab) = 7457d4721a83dd61c9f3979267dce9ed1a6a8a44 SHA1 (patch-ac) = 79267ad3e175632728e43fb2ba159ab411e7ff3c SHA1 (patch-ad) = c14defd79e6e0cec153be004fff3016ad6f0e731 -SHA1 (patch-ae) = de944306bcc8609a3353bf713876e0d42c9d05f9 -SHA1 (patch-af) = 0477e862dbc10d67fb0b82862eea612c81e46e39 -SHA1 (patch-ag) = d0dbe55b9a91ed49e2e43c2ef44e141ac86a83c7 +SHA1 (patch-ae) = 2651dc035edebfb9ddc5bfc5bbb01b8e6b3dc588 +SHA1 (patch-af) = d55c3b3c6583f6dafb9fd758fc7b5aed1fdda7bb +SHA1 (patch-ag) = 6560d09edcbe8762d235bcf09ce24a49a6de8e26 SHA1 (patch-ah) = d4dc5858ef1b36d10fae729469262450ff2e3fef diff --git a/security/cyrus-saslauthd/patches/patch-aa b/security/cyrus-saslauthd/patches/patch-aa index 5993fa0a7fd..a200623833b 100644 --- a/security/cyrus-saslauthd/patches/patch-aa +++ b/security/cyrus-saslauthd/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.4 2006/04/18 17:42:59 jlam Exp $ +$NetBSD: patch-aa,v 1.5 2006/10/04 12:07:53 obache Exp $ ---- Makefile.am.orig 2005-01-10 00:39:54.000000000 -0500 +--- Makefile.am.orig 2006-05-18 01:46:17.000000000 +0900 +++ Makefile.am @@ -29,11 +29,8 @@ INCLUDES = -I$(top_srcdir)/include -I$(t DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I.. @@ -13,8 +13,7 @@ $NetBSD: patch-aa,v 1.4 2006/04/18 17:42:59 jlam Exp $ - nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8 - -install-data-local: saslauthd.8 -- $(mkinstalldirs) $(DESTDIR)$(mandir)/cat8 -- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.8 +install-data-local: saslauthd.mdoc -+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man8 + $(mkinstalldirs) $(DESTDIR)$(mandir)/man8 +- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8 + $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8 diff --git a/security/cyrus-saslauthd/patches/patch-ab b/security/cyrus-saslauthd/patches/patch-ab index 2354c69b85c..2a2f06a4101 100644 --- a/security/cyrus-saslauthd/patches/patch-ab +++ b/security/cyrus-saslauthd/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.5 2006/04/18 17:42:59 jlam Exp $ +$NetBSD: patch-ab,v 1.6 2006/10/04 12:07:53 obache Exp $ ---- Makefile.in.orig 2005-05-15 01:59:08.000000000 -0400 +--- Makefile.in.orig 2006-05-19 04:30:21.000000000 +0900 +++ Makefile.in -@@ -611,14 +611,11 @@ uninstall-am: uninstall-info-am uninstal +@@ -614,14 +614,11 @@ uninstall-am: uninstall-info-am uninstal uninstall-sbinPROGRAMS @@ -13,10 +13,9 @@ $NetBSD: patch-ab,v 1.5 2006/04/18 17:42:59 jlam Exp $ - nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8 - -install-data-local: saslauthd.8 -- $(mkinstalldirs) $(DESTDIR)$(mandir)/cat8 -- $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/cat8/saslauthd.8 +install-data-local: saslauthd.mdoc -+ $(mkinstalldirs) $(DESTDIR)$(mandir)/man8 + $(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. diff --git a/security/cyrus-saslauthd/patches/patch-ae b/security/cyrus-saslauthd/patches/patch-ae index f84b0c9dde9..3798a69b422 100644 --- a/security/cyrus-saslauthd/patches/patch-ae +++ b/security/cyrus-saslauthd/patches/patch-ae @@ -1,9 +1,9 @@ -$NetBSD: patch-ae,v 1.1 2006/04/18 17:42:59 jlam Exp $ +$NetBSD: patch-ae,v 1.2 2006/10/04 12:07:53 obache Exp $ ---- configure.in.orig 2005-05-07 00:54:18.000000000 -0400 +--- configure.in.orig 2006-05-18 01:46:17.000000000 +0900 +++ configure.in -@@ -80,20 +80,36 @@ if test "$authsasldb" != no; then - SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" +@@ -87,20 +87,36 @@ if test "$httpform" != no; then + AC_DEFINE(HAVE_HTTPFORM,[],[Include HTTP form Support]) fi -AC_ARG_WITH(pam, [ --with-pam=DIR use PAM (rooted in DIR) [yes] ], diff --git a/security/cyrus-saslauthd/patches/patch-af b/security/cyrus-saslauthd/patches/patch-af index 4571a6c17c3..0898bc89ae2 100644 --- a/security/cyrus-saslauthd/patches/patch-af +++ b/security/cyrus-saslauthd/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1 2006/04/18 17:42:59 jlam Exp $ +$NetBSD: patch-af,v 1.2 2006/10/04 12:07:53 obache Exp $ ---- configure.orig 2006-04-18 13:03:08.000000000 -0400 +--- configure.orig 2006-05-19 04:30:20.000000000 +0900 +++ configure -@@ -9322,75 +9322,23 @@ if test "$with_pam" != no; then +@@ -9458,75 +9458,23 @@ if test "$with_pam" != no; then CPPFLAGS="$CPPFLAGS -I${with_pam}/include" LDFLAGS="$LDFLAGS -L${with_pam}/lib" fi @@ -89,7 +89,7 @@ $NetBSD: patch-af,v 1.1 2006/04/18 17:42:59 jlam Exp $ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ -@@ -9399,7 +9347,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -9535,7 +9483,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -98,7 +98,7 @@ $NetBSD: patch-af,v 1.1 2006/04/18 17:42:59 jlam Exp $ _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -@@ -9425,8 +9373,8 @@ echo "$as_me:$LINENO: result: $ac_header +@@ -9561,8 +9509,8 @@ echo "$as_me:$LINENO: result: $ac_header echo "${ECHO_T}$ac_header_compiler" >&6 # Is the header present? @@ -109,7 +109,7 @@ $NetBSD: patch-af,v 1.1 2006/04/18 17:42:59 jlam Exp $ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ -@@ -9434,7 +9382,7 @@ _ACEOF +@@ -9570,7 +9518,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -118,7 +118,7 @@ $NetBSD: patch-af,v 1.1 2006/04/18 17:42:59 jlam Exp $ _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -@@ -9467,10 +9415,10 @@ echo "${ECHO_T}$ac_header_preproc" >&6 +@@ -9603,10 +9551,10 @@ echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? case $ac_header_compiler:$ac_header_preproc in yes:no ) @@ -133,7 +133,7 @@ $NetBSD: patch-af,v 1.1 2006/04/18 17:42:59 jlam Exp $ ( cat <<\_ASBOX ## ------------------------------------ ## -@@ -9481,12 +9429,12 @@ _ASBOX +@@ -9617,12 +9565,12 @@ _ASBOX sed "s/^/$as_me: WARNING: /" >&2 ;; no:yes ) @@ -152,7 +152,7 @@ $NetBSD: patch-af,v 1.1 2006/04/18 17:42:59 jlam Exp $ ( cat <<\_ASBOX ## ------------------------------------ ## -@@ -9497,29 +9445,157 @@ _ASBOX +@@ -9633,29 +9581,157 @@ _ASBOX sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -189,8 +189,7 @@ $NetBSD: patch-af,v 1.1 2006/04/18 17:42:59 jlam Exp $ +echo $ECHO_N "checking for pam_start... $ECHO_C" >&6 +if test "${ac_cv_func_pam_start+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 - else -- with_pam=no ++else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ @@ -248,7 +247,8 @@ $NetBSD: patch-af,v 1.1 2006/04/18 17:42:59 jlam Exp $ + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_pam_start=yes -+else + else +- with_pam=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + diff --git a/security/cyrus-saslauthd/patches/patch-ag b/security/cyrus-saslauthd/patches/patch-ag index 6d2f17dc764..fd790c82745 100644 --- a/security/cyrus-saslauthd/patches/patch-ag +++ b/security/cyrus-saslauthd/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.1 2006/04/18 17:42:59 jlam Exp $ +$NetBSD: patch-ag,v 1.2 2006/10/04 12:07:53 obache Exp $ ---- saslauthd.h.in.orig 2005-05-15 02:02:30.000000000 -0400 +--- saslauthd.h.in.orig 2006-05-19 04:38:27.000000000 +0900 +++ saslauthd.h.in -@@ -89,12 +89,18 @@ +@@ -95,12 +95,18 @@ /* Support for PAM? */ #undef HAVE_PAM |