From 49f07cae53afbe5747b93cdbb067efd4499da679 Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 30 Aug 2008 12:10:41 +0000 Subject: Pullup ticket #2507 - requested by drochner Revisions pulled up: - misc/yelp/Makefile 1.77 - misc/yelp/distinfo 1.24 - misc/yelp/patches/patch-ac 1.3 --- Module Name: pkgsrc Committed By: drochner Date: Wed Aug 27 09:56:34 UTC 2008 Modified Files: pkgsrc/misc/yelp: Makefile distinfo Added Files: pkgsrc/misc/yelp/patches: patch-ac Log Message: add patch from upstream CVS to fix a format string vulnerability (CVE-2008-3533), bump PKGREVISION --- misc/yelp/Makefile | 3 ++- misc/yelp/distinfo | 3 ++- misc/yelp/patches/patch-ac | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 misc/yelp/patches/patch-ac diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile index 0ca8bf301a9..70e2f8a8b72 100644 --- a/misc/yelp/Makefile +++ b/misc/yelp/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.76 2008/04/15 18:27:48 drochner Exp $ +# $NetBSD: Makefile,v 1.76.4.1 2008/08/30 12:10:41 tron Exp $ # DISTNAME= yelp-2.22.1 +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_GNOME:=sources/yelp/2.22/} EXTRACT_SUFX= .tar.bz2 diff --git a/misc/yelp/distinfo b/misc/yelp/distinfo index 79a03fc6e2b..425004b24d7 100644 --- a/misc/yelp/distinfo +++ b/misc/yelp/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.23 2008/04/15 18:27:48 drochner Exp $ +$NetBSD: distinfo,v 1.23.4.1 2008/08/30 12:10:41 tron Exp $ SHA1 (yelp-2.22.1.tar.bz2) = 29586dd5415fc6470c43dbd68fdb491f91778231 RMD160 (yelp-2.22.1.tar.bz2) = 236acd566b5e0cde0cc1365b1fdae75b2451bcce Size (yelp-2.22.1.tar.bz2) = 995734 bytes SHA1 (patch-ab) = 67b55fe06a9bceccd9e43ff85d49a92ab6cc67ea +SHA1 (patch-ac) = 108ebf660f7b0cad15a8f57a8f5ac2271b7c67d2 diff --git a/misc/yelp/patches/patch-ac b/misc/yelp/patches/patch-ac new file mode 100644 index 00000000000..9febf889660 --- /dev/null +++ b/misc/yelp/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.2.2.1 2008/08/30 12:10:41 tron Exp $ + +--- src/yelp-window.c.orig 2008-04-07 20:16:39.000000000 +0200 ++++ src/yelp-window.c +@@ -1152,9 +1152,9 @@ window_error (YelpWindow *window, gchar + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, +- title); ++ "%s", title); + gtk_message_dialog_format_secondary_markup +- (GTK_MESSAGE_DIALOG (dialog), message); ++ (GTK_MESSAGE_DIALOG (dialog), "%s", message); + gtk_dialog_run (GTK_DIALOG (dialog)); + + gtk_widget_destroy (dialog); -- cgit v1.2.3