From f3ef435629971c6b829851d065850a23d901170e Mon Sep 17 00:00:00 2001 From: pkgsrc fixup Date: Mon, 13 May 2013 18:28:10 -0700 Subject: [PATCH] Fixup fromcvs/togit conversion --- doc/CHANGES-2013 | 4 +- editors/emacs-snapshot/Makefile.common | 4 +- editors/emacs-snapshot/distinfo | 16 +++---- security/mit-krb5/Makefile | 3 +- security/mit-krb5/distinfo | 1 + .../mit-krb5/patches/patch-kadmin_server_schpw.c | 53 ++++++++++++++++++++++ x11/gdm/Makefile | 4 +- 7 files changed, 71 insertions(+), 14 deletions(-) rewrite editors/emacs-snapshot/distinfo (62%) create mode 100644 security/mit-krb5/patches/patch-kadmin_server_schpw.c diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013 index 5670b8974a9..581cc2a5034 100644 --- a/doc/CHANGES-2013 +++ b/doc/CHANGES-2013 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2013,v 1.1639 2013/05/13 01:59:18 wen Exp $ +$NetBSD: CHANGES-2013,v 1.1641 2013/05/13 21:04:59 minskim Exp $ Changes to the packages collection and infrastructure in 2013: @@ -2494,3 +2494,5 @@ Changes to the packages collection and infrastructure in 2013: Updated devel/p5-autodie to 2.19 [wen 2013-05-13] Updated multimedia/ffmpeg to 20130510.1.2.1 [adam 2013-05-13] Updated multimedia/ffplay to 1.2.1 [adam 2013-05-13] + Updated editors/emacs-snapshot to 24.3.50.20130510 [minskim 2013-05-13] + Updated security/mit-krb5 to 1.10.5nb1 [tez 2013-05-13] diff --git a/editors/emacs-snapshot/Makefile.common b/editors/emacs-snapshot/Makefile.common index 1a67759ae62..76b5968b293 100644 --- a/editors/emacs-snapshot/Makefile.common +++ b/editors/emacs-snapshot/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.56 2013/03/05 17:38:31 dholland Exp $ +# $NetBSD: Makefile.common,v 1.57 2013/05/04 03:24:18 minskim Exp $ -DISTNAME= emacs-snapshot_20130427.orig +DISTNAME= emacs-snapshot_20130510.orig SNAPDATE= ${DISTNAME:S/emacs-snapshot_//:S/.orig//} PKGNAME= emacs${_EMACS_VERSION_MAJOR}-${EMACS_VERSION}.${SNAPDATE} CATEGORIES= editors diff --git a/editors/emacs-snapshot/distinfo b/editors/emacs-snapshot/distinfo dissimilarity index 62% index 3a37481fd77..90ca6fb1764 100644 --- a/editors/emacs-snapshot/distinfo +++ b/editors/emacs-snapshot/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.56 2013/02/12 04:47:31 minskim Exp $ - -SHA1 (emacs-snapshot_20130427.orig.tar.xz) = d303287ff0e0686f927d156786e1484b7d1f4fe0 -RMD160 (emacs-snapshot_20130427.orig.tar.xz) = 39d33b903fc86a93480eee9456008a3b335410fd -Size (emacs-snapshot_20130427.orig.tar.xz) = 24131864 bytes -SHA1 (patch-ad) = 5c2e132d64fddd900db762afee8086ff4f2d71da -SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095 -SHA1 (patch-ag) = d7e0875965317b862fd65c42aba3b98c0548ca3e +$NetBSD: distinfo,v 1.57 2013/05/04 03:24:18 minskim Exp $ + +SHA1 (emacs-snapshot_20130510.orig.tar.xz) = ca0ec951324660abfda4fe3d3fc405895d2c6821 +RMD160 (emacs-snapshot_20130510.orig.tar.xz) = 48d67839b1eb3fa1cfe9857b7f0584b71b745083 +Size (emacs-snapshot_20130510.orig.tar.xz) = 24165132 bytes +SHA1 (patch-ad) = 5c2e132d64fddd900db762afee8086ff4f2d71da +SHA1 (patch-ae) = 2dfe31015550feeaa47955136d3bbe2aa6790095 +SHA1 (patch-ag) = d7e0875965317b862fd65c42aba3b98c0548ca3e diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile index 570256a704f..63f5ec29516 100644 --- a/security/mit-krb5/Makefile +++ b/security/mit-krb5/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.68 2013/04/23 22:09:44 tez Exp $ +# $NetBSD: Makefile,v 1.69 2013/05/09 08:40:05 adam Exp $ DISTNAME= krb5-1.10.5 +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 79d51640e07..30ea454b996 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-kadmin_server_schpw.c) = 87d849b6dcc0ad22f377e18f57d0731e642943bc 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-kadmin_server_schpw.c b/security/mit-krb5/patches/patch-kadmin_server_schpw.c new file mode 100644 index 00000000000..87d0c9575de --- /dev/null +++ b/security/mit-krb5/patches/patch-kadmin_server_schpw.c @@ -0,0 +1,53 @@ +$NetBSD$ + +The kpasswd service provided by kadmind was vulnerable to a UDP +"ping-pong" attack [CVE-2002-2443]. Don't respond to packets unless +they pass some basic validation, and don't respond to our own error +packets. + +Some authors use CVE-1999-0103 to refer to the kpasswd UDP ping-pong +attack or UDP ping-pong attacks in general, but there is discussion +leading toward narrowing the definition of CVE-1999-0103 to the echo, +chargen, or other similar built-in inetd services. + +from https://github.com/krb5/krb5/commit/cf1a0c411b2668c57c41e9c4efd15ba17b6b322c + + +--- kadmin/server/schpw.c.orig 2013-05-13 22:31:47.496049500 +0000 ++++ kadmin/server/schpw.c +@@ -52,7 +52,7 @@ process_chpw_request(krb5_context contex + ret = KRB5KRB_AP_ERR_MODIFIED; + numresult = KRB5_KPASSWD_MALFORMED; + strlcpy(strresult, "Request was truncated", sizeof(strresult)); +- goto chpwfail; ++ goto bailout; + } + + ptr = req->data; +@@ -67,7 +67,7 @@ process_chpw_request(krb5_context contex + numresult = KRB5_KPASSWD_MALFORMED; + strlcpy(strresult, "Request length was inconsistent", + sizeof(strresult)); +- goto chpwfail; ++ goto bailout; + } + + /* verify version number */ +@@ -80,7 +80,7 @@ process_chpw_request(krb5_context contex + numresult = KRB5_KPASSWD_BAD_VERSION; + snprintf(strresult, sizeof(strresult), + "Request contained unknown protocol version number %d", vno); +- goto chpwfail; ++ goto bailout; + } + + /* read, check ap-req length */ +@@ -93,7 +93,7 @@ process_chpw_request(krb5_context contex + numresult = KRB5_KPASSWD_MALFORMED; + strlcpy(strresult, "Request was truncated in AP-REQ", + sizeof(strresult)); +- goto chpwfail; ++ goto bailout; + } + + /* verify ap_req */ diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index fb0087cf15d..4917867a9f7 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.173 2013/02/16 11:24:59 wiz Exp $ +# $NetBSD: Makefile,v 1.174 2013/05/10 21:01:16 richard Exp $ # DISTNAME= gdm-2.20.11 -PKGREVISION= 13 +PKGREVISION= 14 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.20/} EXTRACT_SUFX= .tar.bz2 -- 2.11.4.GIT