pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Update security/cyrus-sasl2 to 2.1.17. Changes from v...

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fa5426bdda4e
branches:  trunk
changeset: 468467:fa5426bdda4e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Feb 14 03:16:58 2004 +0000

description:
Update security/cyrus-sasl2 to 2.1.17.  Changes from version 2.1.15 include:

* Now correctly do authorizaton callback in sasl_checkpass()
* Writable auxprop support
* Significantly improved documentation

diffstat:

 doc/CHANGES                           |   3 +-
 security/cyrus-sasl2/Makefile         |   8 ++-
 security/cyrus-sasl2/Makefile.common  |  14 ++++-
 security/cyrus-sasl2/PLIST.common     |   9 ++-
 security/cyrus-sasl2/PLIST.krb5       |   4 +-
 security/cyrus-sasl2/PLIST.plugins    |  14 ++--
 security/cyrus-sasl2/distinfo         |  22 ++++----
 security/cyrus-sasl2/patches/patch-aa |   8 +-
 security/cyrus-sasl2/patches/patch-ab |  13 -----
 security/cyrus-sasl2/patches/patch-af |   8 +-
 security/cyrus-sasl2/patches/patch-ah |  33 -------------
 security/cyrus-sasl2/patches/patch-ai |  86 ++--------------------------------
 security/cyrus-sasl2/patches/patch-aj |  76 ------------------------------
 security/cyrus-sasl2/patches/patch-ak |  13 +++++
 security/cyrus-sasl2/patches/patch-al |   8 +-
 security/cyrus-sasl2/patches/patch-ao |   9 +--
 security/cyrus-sasl2/patches/patch-as |  34 ++++++------
 17 files changed, 94 insertions(+), 268 deletions(-)

diffs (truncated from 634 to 300 lines):

diff -r c4d3849ef2e2 -r fa5426bdda4e doc/CHANGES
--- a/doc/CHANGES       Sat Feb 14 03:04:31 2004 +0000
+++ b/doc/CHANGES       Sat Feb 14 03:16:58 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4821 2004/02/14 01:04:52 grant Exp $
+$NetBSD: CHANGES,v 1.4822 2004/02/14 03:16:59 jlam Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -822,3 +822,4 @@
        Updated adzap to 20040104 [wiz 2004-02-13]
        Added atasm-1.04 [minskim 2004-02-13]
        Updated ns-remote to 1.9nb1 [grant 2004-02-14]
+       Updated cyrus-sasl2 to 2.1.17 [jlam 2004-02-14]
diff -r c4d3849ef2e2 -r fa5426bdda4e security/cyrus-sasl2/Makefile
--- a/security/cyrus-sasl2/Makefile     Sat Feb 14 03:04:31 2004 +0000
+++ b/security/cyrus-sasl2/Makefile     Sat Feb 14 03:16:58 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2004/02/12 13:34:29 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/14 03:16:58 jlam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   2
+PKGREVISION=   # empty
 SVR4_PKGNAME=  csasl
 COMMENT=       Simple Authentication and Security Layer
 
@@ -31,7 +31,9 @@
     (defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]))
 .  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-gssapi=${KRB5BASE}     # GSSAPI
-LIBS+=                 -lcrypto
+CONFIGURE_ARGS+=       --with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
+GSSIMPL.heimdal=       heimdal
+GSSIMPL.mit-krb5=      mit
 PLIST_SRC+=            ${PKGDIR}/PLIST.krb5
 .endif
 
diff -r c4d3849ef2e2 -r fa5426bdda4e security/cyrus-sasl2/Makefile.common
--- a/security/cyrus-sasl2/Makefile.common      Sat Feb 14 03:04:31 2004 +0000
+++ b/security/cyrus-sasl2/Makefile.common      Sat Feb 14 03:16:58 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.13 2004/02/12 13:34:29 jlam Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/02/14 03:16:58 jlam Exp $
 #
 # This Makefile fragment should be included _below_ any SASL_PLUGIN
 # definition and _above_ any CONFIGURE_ARGS definitions.
 
-DISTNAME=      cyrus-sasl-2.1.15
+DISTNAME=      cyrus-sasl-2.1.17
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
                ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
@@ -28,7 +28,10 @@
 
 USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
+
 GNU_CONFIGURE=         YES
+CONFIG_STATUS_OVERRIDE=        config.status
+
 USE_LIBTOOL=           YES
 LIBTOOL_OVERRIDE=      ${WRKSRC}/libtool
 MAKE_ENV+=             SHLIBTOOL=${SHLIBTOOL:Q}
@@ -82,3 +85,10 @@
 #      ${AUTOHEADER};                                  \
 #      ${AUTOMAKE} -a --gnu -i ;                       \
 #      ${AUTOCONF}
+
+post-configure:
+       cd ${WRKSRC}; for file in plugins/Makefile; do                  \
+               ${SED}  -e "s|^\(LIBTOOL =\).*|\1 \$$(SHLIBTOOL)|g"     \
+                       $$file > $$file.new;                            \
+               ${MV} -f $$file.new $$file;                             \
+       done
diff -r c4d3849ef2e2 -r fa5426bdda4e security/cyrus-sasl2/PLIST.common
--- a/security/cyrus-sasl2/PLIST.common Sat Feb 14 03:04:31 2004 +0000
+++ b/security/cyrus-sasl2/PLIST.common Sat Feb 14 03:16:58 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.11 2004/01/09 19:37:48 jlam Exp $
+@comment $NetBSD: PLIST.common,v 1.12 2004/02/14 03:16:58 jlam Exp $
 include/sasl/hmac-md5.h
 include/sasl/md5.h
 include/sasl/md5global.h
@@ -10,7 +10,7 @@
 lib/libsasl2.la
 lib/libsasl2.so
 lib/libsasl2.so.2
-lib/libsasl2.so.2.15
+lib/libsasl2.so.2.17
 man/man3/sasl.3
 man/man3/sasl_authorize_t.3
 man/man3/sasl_auxprop.3
@@ -59,16 +59,17 @@
 sbin/saslpasswd2
 share/doc/html/cyrus-sasl/advanced.html
 share/doc/html/cyrus-sasl/appconvert.html
+share/doc/html/cyrus-sasl/components.html
 share/doc/html/cyrus-sasl/draft-burdis-cat-srp-sasl-08.txt
 share/doc/html/cyrus-sasl/draft-ietf-cat-sasl-gssapi-05.txt
 share/doc/html/cyrus-sasl/draft-ietf-sasl-anon-02.txt
 share/doc/html/cyrus-sasl/draft-ietf-sasl-crammd5-00.txt
 share/doc/html/cyrus-sasl/draft-ietf-sasl-plain-02.txt
-share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2222bis-01.txt
+share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2222bis-02.txt
 share/doc/html/cyrus-sasl/draft-ietf-sasl-rfc2831bis-02.txt
 share/doc/html/cyrus-sasl/draft-ietf-sasl-saslprep-03.txt
+share/doc/html/cyrus-sasl/draft-murchison-sasl-login-00.txt
 share/doc/html/cyrus-sasl/draft-newman-sasl-c-api-01.txt
-share/doc/html/cyrus-sasl/draft-sasl-login.txt
 share/doc/html/cyrus-sasl/gssapi.html
 share/doc/html/cyrus-sasl/index.html
 share/doc/html/cyrus-sasl/install.html
diff -r c4d3849ef2e2 -r fa5426bdda4e security/cyrus-sasl2/PLIST.krb5
--- a/security/cyrus-sasl2/PLIST.krb5   Sat Feb 14 03:04:31 2004 +0000
+++ b/security/cyrus-sasl2/PLIST.krb5   Sat Feb 14 03:16:58 2004 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.krb5,v 1.7 2003/09/13 19:08:51 jlam Exp $
+@comment $NetBSD: PLIST.krb5,v 1.8 2004/02/14 03:16:58 jlam Exp $
 lib/sasl2/libgssapiv2.la
 lib/sasl2/libgssapiv2.so
 lib/sasl2/libgssapiv2.so.2
-lib/sasl2/libgssapiv2.so.2.15
+lib/sasl2/libgssapiv2.so.2.17
diff -r c4d3849ef2e2 -r fa5426bdda4e security/cyrus-sasl2/PLIST.plugins
--- a/security/cyrus-sasl2/PLIST.plugins        Sat Feb 14 03:04:31 2004 +0000
+++ b/security/cyrus-sasl2/PLIST.plugins        Sat Feb 14 03:16:58 2004 +0000
@@ -1,25 +1,25 @@
-@comment $NetBSD: PLIST.plugins,v 1.6 2003/09/13 19:08:51 jlam Exp $
+@comment $NetBSD: PLIST.plugins,v 1.7 2004/02/14 03:16:58 jlam Exp $
 lib/sasl2/libanonymous.la
 lib/sasl2/libanonymous.so
 lib/sasl2/libanonymous.so.2
-lib/sasl2/libanonymous.so.2.15
+lib/sasl2/libanonymous.so.2.17
 lib/sasl2/libcrammd5.la
 lib/sasl2/libcrammd5.so
 lib/sasl2/libcrammd5.so.2
-lib/sasl2/libcrammd5.so.2.15
+lib/sasl2/libcrammd5.so.2.17
 lib/sasl2/libdigestmd5.la
 lib/sasl2/libdigestmd5.so
 lib/sasl2/libdigestmd5.so.2
-lib/sasl2/libdigestmd5.so.2.15
+lib/sasl2/libdigestmd5.so.2.17
 lib/sasl2/libotp.la
 lib/sasl2/libotp.so
 lib/sasl2/libotp.so.2
-lib/sasl2/libotp.so.2.15
+lib/sasl2/libotp.so.2.17
 lib/sasl2/libplain.la
 lib/sasl2/libplain.so
 lib/sasl2/libplain.so.2
-lib/sasl2/libplain.so.2.15
+lib/sasl2/libplain.so.2.17
 lib/sasl2/libsasldb.la
 lib/sasl2/libsasldb.so
 lib/sasl2/libsasldb.so.2
-lib/sasl2/libsasldb.so.2.15
+lib/sasl2/libsasldb.so.2.17
diff -r c4d3849ef2e2 -r fa5426bdda4e security/cyrus-sasl2/distinfo
--- a/security/cyrus-sasl2/distinfo     Sat Feb 14 03:04:31 2004 +0000
+++ b/security/cyrus-sasl2/distinfo     Sat Feb 14 03:16:58 2004 +0000
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.13 2004/01/09 20:29:47 jlam Exp $
+$NetBSD: distinfo,v 1.14 2004/02/14 03:16:58 jlam Exp $
 
-SHA1 (cyrus-sasl-2.1.15.tar.gz) = 747101ffec482ca566f00a9d34124ec8e79f6589
-Size (cyrus-sasl-2.1.15.tar.gz) = 1390131 bytes
-SHA1 (patch-aa) = f5a772976839388078a26f287844ba35bdf1a3b7
-SHA1 (patch-ab) = 711dd3d73da611bb5679bc8415e96517bf239778
+SHA1 (cyrus-sasl-2.1.17.tar.gz) = c91e073274279ea59d8ca9514559140e23e3be57
+Size (cyrus-sasl-2.1.17.tar.gz) = 1499725 bytes
+SHA1 (patch-aa) = 8844b837470fa171a0d0c8030107f9f9e93dac1a
 SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
-SHA1 (patch-af) = 305feccbe1d8545480f01b2797f9fd542fa951c7
-SHA1 (patch-ah) = 50ff4e8ec0f4232bd8c2121b105d4818b978b950
-SHA1 (patch-ai) = 743dddbd54ac19266fd66ef0c5a3e87ba7437ee9
-SHA1 (patch-aj) = e841641a92dacd0f38fc0f86391b54b394e5a54c
-SHA1 (patch-al) = 286b1c6c9980525f5ad8e1507dc3fe9708e755ca
+SHA1 (patch-af) = a25efa52dd7c77cebb5432af1617877935a46918
+SHA1 (patch-ai) = ba5778bb8a373138d5bf7a895c4ff0f41d497c26
+SHA1 (patch-ak) = aa71ba83a0d805f8595a64faf9afd76f8667bb6c
+SHA1 (patch-al) = 68576f62af7517dc09014d61427b58e76d361f8a
 SHA1 (patch-am) = f0bd15b4f55e5204936a25c558d4bd2b1d4816d5
 SHA1 (patch-an) = 65a0ec173ea1f0114318ffb922cad4470e1cd7e9
-SHA1 (patch-ao) = bb10eb052278c817603dd18128e711a9fedce840
-SHA1 (patch-as) = c8d35da93afe8be5e535b88681b23b169e813c02
+SHA1 (patch-ao) = 2d26106ea33ac0625195214e18fc9e00deb9dc15
+SHA1 (patch-as) = 0371be5fdd00df1e741753d6cc9b9f71b582874c
diff -r c4d3849ef2e2 -r fa5426bdda4e security/cyrus-sasl2/patches/patch-aa
--- a/security/cyrus-sasl2/patches/patch-aa     Sat Feb 14 03:04:31 2004 +0000
+++ b/security/cyrus-sasl2/patches/patch-aa     Sat Feb 14 03:16:58 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2003/08/16 09:06:42 recht Exp $
+$NetBSD: patch-aa,v 1.5 2004/02/14 03:16:59 jlam Exp $
 
---- configure.in.orig  2003-07-15 17:39:21.000000000 +0200
-+++ configure.in       2003-07-26 12:28:18.000000000 +0200
-@@ -114,6 +114,13 @@
+--- configure.in.orig  Fri Nov 28 10:37:10 2003
++++ configure.in
+@@ -104,6 +104,13 @@ target=$save_target
  
  dnl ltconfig might not have found support for shared libs
  dnl just do static libs if so.
diff -r c4d3849ef2e2 -r fa5426bdda4e security/cyrus-sasl2/patches/patch-ab
--- a/security/cyrus-sasl2/patches/patch-ab     Sat Feb 14 03:04:31 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/09/13 19:08:53 jlam Exp $
-
---- plugins/Makefile.in.orig   Sat Sep 13 14:38:42 2003
-+++ plugins/Makefile.in        Sat Sep 13 14:43:04 2003
-@@ -147,7 +147,7 @@
- LIBSSL_INC_FLAGS = @LIBSSL_INC_FLAGS@
- LIBSSL_LIB_DIR = @LIBSSL_LIB_DIR@
- LIBSSL_LIB_FLAGS = @LIBSSL_LIB_FLAGS@
--LIBTOOL = @LIBTOOL@
-+LIBTOOL = $(SHLIBTOOL)
- LIB_CRYPT = @LIB_CRYPT@
- LIB_DES = @LIB_DES@
- LIB_DYN_SASL = @LIB_DYN_SASL@
diff -r c4d3849ef2e2 -r fa5426bdda4e security/cyrus-sasl2/patches/patch-af
--- a/security/cyrus-sasl2/patches/patch-af     Sat Feb 14 03:04:31 2004 +0000
+++ b/security/cyrus-sasl2/patches/patch-af     Sat Feb 14 03:16:58 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2004/01/09 20:29:47 jlam Exp $
+$NetBSD: patch-af,v 1.5 2004/02/14 03:16:59 jlam Exp $
 
---- plugins/cram.c.orig        2003-02-18 13:27:37.000000000 -0500
-+++ plugins/cram.c     2003-10-06 12:09:33.000000000 -0400
-@@ -544,7 +544,8 @@
+--- plugins/cram.c.orig        Mon Nov  3 10:25:24 2003
++++ plugins/cram.c
+@@ -531,7 +531,8 @@ static int crammd5_client_mech_step(void
        
        if ((auth_result != SASL_OK) && (auth_result != SASL_INTERACT))
            return auth_result;
diff -r c4d3849ef2e2 -r fa5426bdda4e security/cyrus-sasl2/patches/patch-ah
--- a/security/cyrus-sasl2/patches/patch-ah     Sat Feb 14 03:04:31 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2002/12/11 23:48:59 chris Exp $
-
---- lib/Makefile.am.orig       Wed Dec 11 23:29:42 2002
-+++ lib/Makefile.am    Wed Dec 11 23:30:35 2002
-@@ -51,10 +51,7 @@
- libsasl2_a_SOURCES=
- 
- common_headers = saslint.h
--common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c dlopen.c
--
--LTLIBOBJS = @LTLIBOBJS@ plugin_common.lo
--LIBOBJS = @LIBOBJS@ plugin_common.o
-+common_sources = auxprop.c canonusr.c checkpw.c client.c common.c config.c external.c md5.c saslutil.c server.c seterror.c dlopen.c plugin_common.c
- 
- lib_LTLIBRARIES = libsasl2.la
- 
-@@ -63,13 +60,9 @@
- libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
- libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET)
- 
--plugin_common.lo: plugin_common.o
--      rm -f plugin_common.lo
--      ln -s $(top_builddir)/plugins/plugin_common.lo plugin_common.lo
--
--plugin_common.o:
--      rm -f plugin_common.o
--      ln -s $(top_builddir)/plugins/plugin_common.o plugin_common.o
-+plugin_common.c:
-+      rm -f plugin_common.c
-+      ln -s $(top_builddir)/plugins/plugin_common.c plugin_common.c
- 
- if MACOSX
- framedir = /Library/Frameworks/SASL2.framework
diff -r c4d3849ef2e2 -r fa5426bdda4e security/cyrus-sasl2/patches/patch-ai
--- a/security/cyrus-sasl2/patches/patch-ai     Sat Feb 14 03:04:31 2004 +0000
+++ b/security/cyrus-sasl2/patches/patch-ai     Sat Feb 14 03:16:58 2004 +0000
@@ -1,93 +1,17 @@
-$NetBSD: patch-ai,v 1.5 2004/01/05 12:10:29 markd Exp $
+$NetBSD: patch-ai,v 1.6 2004/02/14 03:16:59 jlam Exp $
 
---- configure.orig     2003-07-16 03:42:27.000000000 +1200
+--- configure.orig     Mon Dec  1 08:35:06 2003
 +++ configure
-@@ -675,6 +675,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:
-@@ -842,29 +843,29 @@ EOF
- 
- 
- missing_dir=`cd $ac_aux_dir && pwd`
--echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
Home | Main Index | Thread Index | Old Index