kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated security/cyrus-sasl2 to 2.1.19. Changes from version 2.1.18

Browse source 
include:

* Support for forwarding of GSSAPI credentials
* A nontrivial number of small bugfixes.
This commit is contained in:
jlam 2004-08-04 19:41:06 +00:00
parent b0a4da5fd3
commit e3ac987879
13 changed files with 45 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/CHANGES
View file

@ -1,4 +1,4 @@
$NetBSD: CHANGES,v 1.6793 2004/08/04 17:40:21 tv Exp $
$NetBSD: CHANGES,v 1.6794 2004/08/04 19:41:15 jlam Exp $
Changes to the packages collection and infrastructure in 2004:
@ -3723,3 +3723,4 @@ Changes to the packages collection and infrastructure in 2004:
Updated http_load to 20020104nb3 [cube 2004-08-04]
Updated postgresql74-client to 7.4.3nb1 [recht 2004-08-04]
Updated p5-Sendmail-PMilter to 0.94 [tv 2004-08-04]
Updated cyrus-sasl2 to 2.1.19 [jlam 2004-08-04]

3
security/cy2-login/Makefile
View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.6 2004/03/29 05:47:31 jlam Exp $
# $NetBSD: Makefile,v 1.7 2004/08/04 19:41:07 jlam Exp $
PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-login/}
PKGREVISION= 1
COMMENT= Cyrus SASL LOGIN authentication plugin
SASL_PLUGIN= yes

4
security/cyrus-sasl2/Makefile
View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.33 2004/07/30 21:05:41 jlam Exp $
# $NetBSD: Makefile,v 1.34 2004/08/04 19:41:06 jlam Exp $
.include "Makefile.common"
PKGREVISION= 3
PKGREVISION= # empty
SVR4_PKGNAME= csasl
COMMENT= Simple Authentication and Security Layer

5
security/cyrus-sasl2/Makefile.common
View file

@ -1,15 +1,16 @@
# $NetBSD: Makefile.common,v 1.22 2004/08/03 23:40:23 jlam Exp $
# $NetBSD: Makefile.common,v 1.23 2004/08/04 19:41:07 jlam Exp $
#
# This file is currently included by:
#
# security/cyrus-sasl2/Makefile
# security/cy2-login/Makefile
# security/cy2-ntlm/Makefile
# security/cy2-sql/Makefile
#
# This Makefile fragment should be included _below_ any SASL_PLUGIN
# definition and _above_ any CONFIGURE_ARGS definitions.
DISTNAME= cyrus-sasl-2.1.18
DISTNAME= cyrus-sasl-2.1.19
CATEGORIES= security
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/

18
security/cyrus-sasl2/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2004/07/30 21:05:41 jlam Exp $
@comment $NetBSD: PLIST,v 1.2 2004/08/04 19:41:07 jlam Exp $
include/sasl/hmac-md5.h
include/sasl/md5.h
include/sasl/md5global.h
@ -10,35 +10,35 @@ lib/libsasl2.a
lib/libsasl2.la
lib/libsasl2.so
lib/libsasl2.so.2
lib/libsasl2.so.2.18
lib/libsasl2.so.2.19
lib/sasl2/libanonymous.la
lib/sasl2/libanonymous.so
lib/sasl2/libanonymous.so.2
lib/sasl2/libanonymous.so.2.18
lib/sasl2/libanonymous.so.2.19
lib/sasl2/libcrammd5.la
lib/sasl2/libcrammd5.so
lib/sasl2/libcrammd5.so.2
lib/sasl2/libcrammd5.so.2.18
lib/sasl2/libcrammd5.so.2.19
lib/sasl2/libdigestmd5.la
lib/sasl2/libdigestmd5.so
lib/sasl2/libdigestmd5.so.2
lib/sasl2/libdigestmd5.so.2.18
lib/sasl2/libdigestmd5.so.2.19
${GSSAPI}lib/sasl2/libgssapiv2.la
${GSSAPI}lib/sasl2/libgssapiv2.so
${GSSAPI}lib/sasl2/libgssapiv2.so.2
${GSSAPI}lib/sasl2/libgssapiv2.so.2.18
${GSSAPI}lib/sasl2/libgssapiv2.so.2.19
lib/sasl2/libotp.la
lib/sasl2/libotp.so
lib/sasl2/libotp.so.2
lib/sasl2/libotp.so.2.18
lib/sasl2/libotp.so.2.19
lib/sasl2/libplain.la
lib/sasl2/libplain.so
lib/sasl2/libplain.so.2
lib/sasl2/libplain.so.2.18
lib/sasl2/libplain.so.2.19
lib/sasl2/libsasldb.la
lib/sasl2/libsasldb.so
lib/sasl2/libsasldb.so.2
lib/sasl2/libsasldb.so.2.18
lib/sasl2/libsasldb.so.2.19
man/man3/sasl.3
man/man3/sasl_authorize_t.3
man/man3/sasl_auxprop.3

19
security/cyrus-sasl2/distinfo
View file

@ -1,18 +1,17 @@
$NetBSD: distinfo,v 1.19 2004/07/08 21:11:25 recht Exp $
$NetBSD: distinfo,v 1.20 2004/08/04 19:41:07 jlam Exp $
SHA1 (cyrus-sasl-2.1.18.tar.gz) = 74496a61a87edd710303d13f8df0534d6765f6ec
Size (cyrus-sasl-2.1.18.tar.gz) = 1522578 bytes
SHA1 (patch-aa) = 04dcce761b77b7abb218837ae1ff0410a02669dc
SHA1 (patch-ab) = 7d8e74662718cffe38a55dc226300b9000471951
SHA1 (cyrus-sasl-2.1.19.tar.gz) = 9512d70ecea33b9d44e69d185a323a0f7b133705
Size (cyrus-sasl-2.1.19.tar.gz) = 1537350 bytes
SHA1 (patch-aa) = c81a2f854ee445fde7a480c9f6c64dfa55f168c2
SHA1 (patch-ab) = 33be71f563bdfeee75c9b965ca8ef8d85d38968a
SHA1 (patch-ac) = 8536fec6241a87e2a199b4aa8da788a2439f5507
SHA1 (patch-ad) = 351184f685a8e71f1add59452cca44728ddfec25
SHA1 (patch-ae) = cfd176eea2e1dba320be14a7d9bf2a4426ba39ad
SHA1 (patch-af) = c024ff3fe7712b9fce2e064bdc037323838231ef
SHA1 (patch-ag) = 3b269393d240cc9c77fb7ad5b5fcf71d26bed592
SHA1 (patch-ai) = ec9b2c155d3615d4e9443e314235484d8de2ad4c
SHA1 (patch-ag) = f62062ecee2bf133572d09049a77c5624ddb7f70
SHA1 (patch-ai) = 6cc7ee82c3e0faad0c39868ac156fddf53d36ba7
SHA1 (patch-ak) = 32521eef7f8a9b590089f078edaa706c74d91651
SHA1 (patch-al) = f4a2c97d4894a4089b6960bf5a2542dfdec4df6e
SHA1 (patch-al) = fd99c13ec5618888eb79201363475da6e376d7cb
SHA1 (patch-am) = f0bd15b4f55e5204936a25c558d4bd2b1d4816d5
SHA1 (patch-an) = d6ccabc24d16b63a1c1f4b4f2667b60c37aa88ec
SHA1 (patch-ao) = 727830d2f72d6a18a8f0f2959c76dee0c58c5b2c
SHA1 (patch-ap) = 3eeb15a7d3dfec8a85bd475faa1076315dfd3cdc
SHA1 (patch-ao) = c4388bd3d467a91539e9adedc287a2a7ba333744

6
security/cyrus-sasl2/patches/patch-aa
View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.7 2004/03/29 05:47:31 jlam Exp $
$NetBSD: patch-aa,v 1.8 2004/08/04 19:41:07 jlam Exp $
--- configure.in.orig Tue Mar 9 11:54:13 2004
--- configure.in.orig Fri Jul 2 15:39:34 2004
+++ configure.in
@@ -483,10 +483,6 @@ SASL_KERBEROS_V4_CHK
@@ -485,10 +485,6 @@ SASL_KERBEROS_V4_CHK
SASL_GSSAPI_CHK
SASL_PLAIN_CHK

6
security/cyrus-sasl2/patches/patch-ab
View file

@ -1,6 +1,6 @@
$NetBSD: patch-ab,v 1.6 2004/03/29 05:47:31 jlam Exp $
$NetBSD: patch-ab,v 1.7 2004/08/04 19:41:07 jlam Exp $
--- aclocal.m4.orig Wed Mar 10 10:56:07 2004
--- aclocal.m4.orig Fri Jul 2 15:39:50 2004
+++ aclocal.m4
@@ -1714,7 +1714,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK],
dnl Note that FreeBSD puts it in a wierd place
@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2004/03/29 05:47:31 jlam Exp $
dblib="no")
CPPFLAGS=$cmu_save_CPPFLAGS
@@ -2908,7 +2908,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
@@ -2910,7 +2910,10 @@ AC_DEFUN([SASL_GSSAPI_CHK],[
AC_MSG_RESULT(with implementation ${gss_impl})
AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
SASL_MECHS="$SASL_MECHS libgssapiv2.la"

6
security/cyrus-sasl2/patches/patch-ag
View file

@ -1,6 +1,6 @@
$NetBSD: patch-ag,v 1.6 2004/07/06 04:20:59 jlam Exp $
$NetBSD: patch-ag,v 1.7 2004/08/04 19:41:07 jlam Exp $
--- plugins/Makefile.in.orig Sun Jul 4 02:24:08 2004
--- plugins/Makefile.in.orig Fri Jul 2 15:40:16 2004
+++ plugins/Makefile.in
@@ -125,7 +125,7 @@ JAVA_TRUE = @JAVA_TRUE@
LDFLAGS = @LDFLAGS@
@ -10,4 +10,4 @@ $NetBSD: patch-ag,v 1.6 2004/07/06 04:20:59 jlam Exp $
+LIBTOOL = $(SHLIBTOOL)
LIB_CRYPT = @LIB_CRYPT@
LIB_DES = @LIB_DES@
LIB_DOOR = @LIB_DOOR@

8
security/cyrus-sasl2/patches/patch-ai
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ai,v 1.8 2004/03/29 05:47:31 jlam Exp $
$NetBSD: patch-ai,v 1.9 2004/08/04 19:41:07 jlam Exp $
--- configure.orig Wed Mar 10 10:56:10 2004
--- configure.orig Fri Jul 2 15:39:54 2004
+++ configure
@@ -10762,7 +10762,14 @@ if test $ac_cv_lib_resolv_res_search = y
@@ -10765,7 +10765,14 @@ if test $ac_cv_lib_resolv_res_search = y
fi
SASL_MECHS="$SASL_MECHS libgssapiv2.la"
@ -18,7 +18,7 @@ $NetBSD: patch-ai,v 1.8 2004/03/29 05:47:31 jlam Exp $
cmu_save_LIBS="$LIBS"
LIBS="$LIBS $GSSAPIBASE_LIBS"
@@ -10896,14 +10903,6 @@ _ACEOF
@@ -10899,14 +10906,6 @@ _ACEOF
echo "${ECHO_T}disabled" >&6
fi

6
security/cyrus-sasl2/patches/patch-al
View file

@ -1,8 +1,8 @@
$NetBSD: patch-al,v 1.3 2004/03/29 05:47:31 jlam Exp $
$NetBSD: patch-al,v 1.4 2004/08/04 19:41:07 jlam Exp $
--- Makefile.in.orig Wed Mar 10 10:56:11 2004
--- Makefile.in.orig Fri Jul 2 15:39:53 2004
+++ Makefile.in
@@ -235,7 +235,7 @@ target_vendor = @target_vendor@
@@ -237,7 +237,7 @@ target_vendor = @target_vendor@
@MACOSX_FALSE@INSTALLOSX =
@MACOSX_TRUE@INSTALLOSX = install-exec-local-osx

6
security/cyrus-sasl2/patches/patch-ao
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ao,v 1.3 2004/03/29 05:47:31 jlam Exp $
$NetBSD: patch-ao,v 1.4 2004/08/04 19:41:07 jlam Exp $
--- include/Makefile.in.orig Wed Mar 10 10:56:11 2004
--- include/Makefile.in.orig Fri Jul 2 15:40:19 2004
+++ include/Makefile.in
@@ -560,9 +560,6 @@ uninstall-am: uninstall-frameheaderDATA
@@ -562,9 +562,6 @@ uninstall-am: uninstall-frameheaderDATA
uninstall-info-am uninstall-saslincludeHEADERS

52
security/cyrus-sasl2/patches/patch-ap
View file

@ -1,52 +0,0 @@
$NetBSD: patch-ap,v 1.2 2004/07/08 21:11:26 recht Exp $
--- plugins/gssapi.c.orig Fri Feb 6 18:23:51 2004
+++ plugins/gssapi.c Wed Jul 7 12:09:07 2004
@@ -990,8 +990,14 @@
GSS_C_QOP_DEFAULT,
(OM_uint32) oparams->maxoutbuf,
&max_input);
-
- oparams->maxoutbuf -= (max_input - oparams->maxoutbuf);
+
+ if(max_input > oparams->maxoutbuf) {
+ /* Heimdal appears to get this wrong */
+ oparams->maxoutbuf -= (max_input - oparams->maxoutbuf);
+ } else {
+ /* This code is actually correct */
+ oparams->maxoutbuf = max_input;
+ }
}
gss_release_buffer(&min_stat, output_token);
@@ -1134,6 +1140,7 @@
gss_buffer_t input_token, output_token;
gss_buffer_desc real_input_token, real_output_token;
OM_uint32 maj_stat = 0, min_stat = 0;
+ OM_uint32 max_input;
gss_buffer_desc name_token;
int ret;
OM_uint32 req_flags, out_req_flags;
@@ -1418,8 +1425,20 @@
(((unsigned char *) output_token->value)[3] << 0);
if(oparams->mech_ssf) {
- /* xxx probably too large */
- oparams->maxoutbuf -= 50;
+ maj_stat = gss_wrap_size_limit( &min_stat,
+ text->gss_ctx,
+ 1,
+ GSS_C_QOP_DEFAULT,
+ (OM_uint32) oparams->maxoutbuf,
+ &max_input);
+
+ if(max_input > oparams->maxoutbuf) {
+ /* Heimdal appears to get this wrong */
+ oparams->maxoutbuf -= (max_input - oparams->maxoutbuf);
+ } else {
+ /* This code is actually correct */
+ oparams->maxoutbuf = max_input;
+ }
}
gss_release_buffer(&min_stat, output_token);