diff options
author | adam <adam@pkgsrc.org> | 2012-02-26 13:16:32 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2012-02-26 13:16:32 +0000 |
commit | ab6d7545edce5203e958dd2ebde10a220912d377 (patch) | |
tree | 2460ac46995492f9a4b802b1af0aee8b3993363e /security/mit-krb5-appl | |
parent | f9d435b66b841e110f713b2b5e560dc914fe08be (diff) | |
download | pkgsrc-ab6d7545edce5203e958dd2ebde10a220912d377.tar.gz |
Changes 1.0.3:
This is primarily a bugfix release.
Diffstat (limited to 'security/mit-krb5-appl')
-rw-r--r-- | security/mit-krb5-appl/Makefile | 18 | ||||
-rw-r--r-- | security/mit-krb5-appl/distinfo | 13 | ||||
-rw-r--r-- | security/mit-krb5-appl/patches/patch-gssftp_ftp_ftp_var.h | 16 | ||||
-rw-r--r-- | security/mit-krb5-appl/patches/patch-telnet_libtelnet_encrypt.c | 19 |
4 files changed, 28 insertions, 38 deletions
diff --git a/security/mit-krb5-appl/Makefile b/security/mit-krb5-appl/Makefile index 9aa53a4e656..fb3e484549c 100644 --- a/security/mit-krb5-appl/Makefile +++ b/security/mit-krb5-appl/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.4 2011/12/23 16:44:24 tez Exp $ +# $NetBSD: Makefile,v 1.5 2012/02/26 13:16:32 adam Exp $ -DISTNAME= krb5-appl-1.0.1 +DISTNAME= krb5-appl-1.0.3 PKGNAME= mit-${DISTNAME} -PKGREVISION= 3 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5-appl/1.0/ -DISTFILES= ${DISTNAME}-signed${EXTRACT_SUFX} EXTRACT_SUFX= .tar +DISTFILES= ${DISTNAME}-signed${EXTRACT_SUFX} -PATCH_SITES= http://web.mit.edu/kerberos/advisories/ - -PATCHFILES= 2011-005-patch.txt +#PATCH_SITES= http://web.mit.edu/kerberos/advisories/ +#PATCHFILES= 2011-005-patch.txt MAINTAINER= tez@NetBSD.org HOMEPAGE= http://web.mit.edu/kerberos/ @@ -25,11 +23,9 @@ CONFLICTS+= heimdal-[0-9]* CONFLICTS+= kth-krb4-[0-9]* CONFLICTS+= mit-krb5<1.8 -USE_TOOLS+= yacc -USE_TOOLS+= autoconf +USE_TOOLS+= autoconf autoheader yacc GNU_CONFIGURE= yes - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} PATCH_DIST_ARGS= -d ${WRKSRC} -p1 diff --git a/security/mit-krb5-appl/distinfo b/security/mit-krb5-appl/distinfo index bf67beeebcb..cd23a883da3 100644 --- a/security/mit-krb5-appl/distinfo +++ b/security/mit-krb5-appl/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.4 2011/12/23 16:44:24 tez Exp $ +$NetBSD: distinfo,v 1.5 2012/02/26 13:16:32 adam Exp $ -SHA1 (2011-005-patch.txt) = 5e52a66b299407f54038fc287732160aabce51ff -RMD160 (2011-005-patch.txt) = 780d9769e3b2661b927b26295f14a31dee314213 -Size (2011-005-patch.txt) = 2076 bytes -SHA1 (krb5-appl-1.0.1-signed.tar) = 128662c9860f61a51c9bcaf1b6217467faa12324 -RMD160 (krb5-appl-1.0.1-signed.tar) = ca0668b623dcf4dc5a0699fa47d86660aac5544a -Size (krb5-appl-1.0.1-signed.tar) = 645120 bytes +SHA1 (krb5-appl-1.0.3-signed.tar) = 6711c1b46633e666e6e707363ffffce5e1c84d9d +RMD160 (krb5-appl-1.0.3-signed.tar) = 491359af5da2ea3c680811b08d9696eb43794a21 +Size (krb5-appl-1.0.3-signed.tar) = 634880 bytes SHA1 (patch-ab) = 4522fcdb396d2079ac6405926a64f907d94a2593 SHA1 (patch-gssftp_ftp_cmds_c) = 24942a2bcfc0cb0ce3045da5468d315c5b1bfadb -SHA1 (patch-telnet_libtelnet_encrypt.c) = 26e21d72c6f5bad4af2c733c2fe63fdc65a78bf2 +SHA1 (patch-gssftp_ftp_ftp_var.h) = bd851e19a70db30bec53d20d75bb1855a13b3084 diff --git a/security/mit-krb5-appl/patches/patch-gssftp_ftp_ftp_var.h b/security/mit-krb5-appl/patches/patch-gssftp_ftp_ftp_var.h new file mode 100644 index 00000000000..2e558fe9e4c --- /dev/null +++ b/security/mit-krb5-appl/patches/patch-gssftp_ftp_ftp_var.h @@ -0,0 +1,16 @@ +$NetBSD: patch-gssftp_ftp_ftp_var.h,v 1.1 2012/02/26 13:16:32 adam Exp $ + +Don't redefine sig_t and sigtype. + +--- gssftp/ftp/ftp_var.h.orig 2012-02-26 13:04:30.000000000 +0000 ++++ gssftp/ftp/ftp_var.h +@@ -57,9 +57,7 @@ FILE* fdopen_socket(SOCKET s, char* mode + typedef void (*sig_t)(int); + typedef void sigtype; + #else +-#define sig_t my_sig_t + #define sigtype krb5_sigtype +-typedef sigtype (*sig_t)(); + #endif + + /* diff --git a/security/mit-krb5-appl/patches/patch-telnet_libtelnet_encrypt.c b/security/mit-krb5-appl/patches/patch-telnet_libtelnet_encrypt.c deleted file mode 100644 index 726da519efe..00000000000 --- a/security/mit-krb5-appl/patches/patch-telnet_libtelnet_encrypt.c +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-telnet_libtelnet_encrypt.c,v 1.1 2011/12/23 16:44:24 tez Exp $ - -Fix for CVE-2011-4862 from FreeBSD - -When an encryption key is supplied via the TELNET protocol, its length -is not validated before the key is copied into a fixed-size buffer. - ---- telnet/libtelnet/encrypt.c.orig 2011-12-23 10:14:18.191614600 -0600 -+++ telnet/libtelnet/encrypt.c 2011-12-23 10:15:26.640275300 -0600 -@@ -757,6 +757,9 @@ - int dir = kp->dir; - register int ret = 0; - -+ if (len > MAXKEYLEN) -+ len = MAXKEYLEN; -+ - if (!(ep = (*kp->getcrypt)(*kp->modep))) { - if (len == 0) - return; |