From c74ddb42b371e33020538f676a81dd66a9ae8a47 Mon Sep 17 00:00:00 2001 From: pkgsrc fixup Date: Tue, 23 Apr 2013 18:27:15 -0700 Subject: [PATCH] Fixup fromcvs/togit conversion --- doc/CHANGES-2013 | 3 ++- security/mit-krb5/Makefile | 1 + security/mit-krb5/distinfo | 1 + security/mit-krb5/patches/patch-kdc_do_tgs_req.c | 27 ++++++++++++++++++++++++ www/firefox17/Makefile | 9 ++++---- 5 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 security/mit-krb5/patches/patch-kdc_do_tgs_req.c diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013 index 7114953d948..cc466578423 100644 --- a/doc/CHANGES-2013 +++ b/doc/CHANGES-2013 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2013,v 1.1482 2013/04/23 18:28:29 adam Exp $ +$NetBSD: CHANGES-2013,v 1.1483 2013/04/23 18:45:39 shattered Exp $ Changes to the packages collection and infrastructure in 2013: @@ -2282,3 +2282,4 @@ Changes to the packages collection and infrastructure in 2013: Updated misc/py-anita to 1.30 [gson 2013-04-23] Updated security/clamav to 0.97.8 [adam 2013-04-23] Updated x11/xvidtune to 1.0.3 [shattered 2013-04-23] + Updated security/mit-krb5 to 1.10.4nb1 [tez 2013-04-23] diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile index d104cff8a29..5cd6e78bbde 100644 --- a/security/mit-krb5/Makefile +++ b/security/mit-krb5/Makefile @@ -1,6 +1,7 @@ # $NetBSD: Makefile,v 1.66 2013/03/13 12:35:40 adam Exp $ DISTNAME= krb5-1.10.4 +PKGREVISION= 1 PKGNAME= mit-${DISTNAME} CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION_NOREV:R}/ diff --git a/security/mit-krb5/distinfo b/security/mit-krb5/distinfo index 0a383988d9a..3158fa4303b 100644 --- a/security/mit-krb5/distinfo +++ b/security/mit-krb5/distinfo @@ -19,5 +19,6 @@ SHA1 (patch-ci) = 4e310f0a4dfe27cf94d0e63d623590691b6c5970 SHA1 (patch-cj) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b SHA1 (patch-ck) = 37bfef80329f8ae0fb35c35e70032a0040ba5591 SHA1 (patch-kadmin_dbutil_dump.c) = 4b49c116dbed9e6be4a0bf0a731c3ae82808d82e +SHA1 (patch-kdc_do_tgs_req.c) = a7c89338eab17f98c5e2b5d426b3696cc9b4b081 SHA1 (patch-lib_krb5_asn.1_asn1buf.h) = a1e46ca9256aea4facc1d41841b1707b044a69e7 SHA1 (patch-util_k5ev_verto-k5ev.c) = 79a2be64fa4f9b0dc3a333271e8a3ff7944e5c18 diff --git a/security/mit-krb5/patches/patch-kdc_do_tgs_req.c b/security/mit-krb5/patches/patch-kdc_do_tgs_req.c new file mode 100644 index 00000000000..78ebe0d4219 --- /dev/null +++ b/security/mit-krb5/patches/patch-kdc_do_tgs_req.c @@ -0,0 +1,27 @@ +$NetBSD$ + +Fix for CVE-2013-1416 from: + http://krbdev.mit.edu/rt/Ticket/Display.html?user=guest&pass=guest&id=7600 + +--- kdc/do_tgs_req.c.orig 2013-04-17 20:50:13.528009200 +0000 ++++ kdc/do_tgs_req.c +@@ -1141,7 +1141,8 @@ prep_reprocess_req(krb5_kdc_req *request + retval = ENOMEM; + goto cleanup; + } +- strlcpy(comp1_str,comp1->data,comp1->length+1); ++ if (comp1->data != NULL) ++ memcpy(comp1_str, comp1->data, comp1->length); + + if ((krb5_princ_type(kdc_context, request->server) == KRB5_NT_SRV_HST || + krb5_princ_type(kdc_context, request->server) == KRB5_NT_SRV_INST || +@@ -1164,7 +1165,8 @@ prep_reprocess_req(krb5_kdc_req *request + retval = ENOMEM; + goto cleanup; + } +- strlcpy(temp_buf, comp2->data,comp2->length+1); ++ if (comp2->data != NULL) ++ memcpy(temp_buf, comp2->data, comp2->length); + retval = krb5int_get_domain_realm_mapping(kdc_context, temp_buf, &realms); + free(temp_buf); + if (retval) { diff --git a/www/firefox17/Makefile b/www/firefox17/Makefile index a7e40bc5e9e..c8860a4f2cf 100644 --- a/www/firefox17/Makefile +++ b/www/firefox17/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2013/02/16 11:24:52 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2013/02/24 14:18:01 ryoon Exp $ .include "../../devel/xulrunner17/dist.mk" PKGNAME= firefox17-${MOZ_BRANCH} +PKGREVISION= 1 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org @@ -25,7 +26,7 @@ LDFLAGS.Linux= -lnspr4 .include "../../devel/xulrunner17/mozilla-common.mk" .include "options.mk" -MOZILLA=firefox +MOZILLA=firefox17 MOZILLA_ICON= ${WRKSRC}/dist/firefox/chrome/icons/default/default48.png .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) MOZILLA_NAME= Firefox @@ -50,9 +51,9 @@ post-build: INSTALLATION_DIRS+= share/applications share/pixmaps post-install: ${INSTALL_DATA} ${WRKDIR}/desktop \ - ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}17.desktop + ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop ${INSTALL_DATA} ${MOZILLA_ICON} \ - ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}17.png + ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png rm -f ${DESTDIR}${PREFIX}/bin/firefox ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin/firefox17 -- 2.11.4.GIT