summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsbd <sbd@pkgsrc.org>2011-12-04 22:23:04 +0000
committersbd <sbd@pkgsrc.org>2011-12-04 22:23:04 +0000
commit4408b7d2e525498f3356c093821730a11dd88952 (patch)
tree5c279fd691141205e954205609702b0acd64ce79
parentf9c0748056534c8cb38c1f168c60cd4349490eb6 (diff)
downloadpkgsrc-4408b7d2e525498f3356c093821730a11dd88952.tar.gz
Pullup ticket #3622 - requested by gls
www/py-clearsilver security fix Revisions pulled up: - www/clearsilver/distinfo 1.16 - www/clearsilver/patches/patch-python_neo__cgi.c 1.1 - www/py-clearsilver/Makefile 1.15 --- Module Name: pkgsrc Committed By: gls Date: Thu Dec 1 20:53:54 UTC 2011 Modified Files: pkgsrc/www/py-clearsilver: Makefile Log Message: Add a fix for CVE 2011-4357, taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649322 --- Module Name: pkgsrc Committed By: gls Date: Thu Dec 1 20:50:49 UTC 2011 Modified Files: pkgsrc/www/clearsilver: distinfo Added Files: pkgsrc/www/clearsilver/patches: patch-python_neo__cgi.c Log Message: Add a fix for CVE 2011-4357, taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649322
-rw-r--r--www/clearsilver/distinfo3
-rw-r--r--www/clearsilver/patches/patch-python_neo__cgi.c16
-rw-r--r--www/py-clearsilver/Makefile3
3 files changed, 20 insertions, 2 deletions
diff --git a/www/clearsilver/distinfo b/www/clearsilver/distinfo
index beba660af6d..44bded513d2 100644
--- a/www/clearsilver/distinfo
+++ b/www/clearsilver/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2010/09/13 03:05:24 taca Exp $
+$NetBSD: distinfo,v 1.15.10.1 2011/12/04 22:23:04 sbd Exp $
SHA1 (clearsilver-0.10.5.tar.gz) = 138865dc91e27328fe29fcaaac1bc6558f19dd75
RMD160 (clearsilver-0.10.5.tar.gz) = bd5c616f326b544df8a74eec71a98a474b408249
@@ -6,3 +6,4 @@ Size (clearsilver-0.10.5.tar.gz) = 439190 bytes
SHA1 (patch-aa) = cf8708c4bee271d39eca2b1833302fa13aee2b6d
SHA1 (patch-ae) = 58326210ecef3936579a19f3cbcb9b9374bc3541
SHA1 (patch-af) = e88106bb0c57d632c348bc16ff673e0ef7487847
+SHA1 (patch-python_neo__cgi.c) = 0baf7f06bdf7c5686131b1b1abbd4fb0fef11c85
diff --git a/www/clearsilver/patches/patch-python_neo__cgi.c b/www/clearsilver/patches/patch-python_neo__cgi.c
new file mode 100644
index 00000000000..f5049214dae
--- /dev/null
+++ b/www/clearsilver/patches/patch-python_neo__cgi.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-python_neo__cgi.c,v 1.1.2.2 2011/12/04 22:23:04 sbd Exp $
+
+Fix for 2011-4357
+Taken from: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649322
+
+--- python/neo_cgi.c.orig 2007-07-12 03:07:43.000000000 +0000
++++ python/neo_cgi.c
+@@ -178,7 +178,7 @@ static PyObject * p_cgi_error (PyObject
+ if (!PyArg_ParseTuple(args, "s:error(str)", &s))
+ return NULL;
+
+- cgi_error (cgi, s);
++ cgi_error (cgi, "%s", s);
+ rv = Py_None;
+ Py_INCREF(rv);
+ return rv;
diff --git a/www/py-clearsilver/Makefile b/www/py-clearsilver/Makefile
index 9358a06e142..2a7071b751e 100644
--- a/www/py-clearsilver/Makefile
+++ b/www/py-clearsilver/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2009/03/05 18:51:33 joerg Exp $
+# $NetBSD: Makefile,v 1.14.22.1 2011/12/04 22:23:04 sbd Exp $
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION= 1
PKG_DESTDIR_SUPPORT= user-destdir