summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorsalo <salo>2005-11-26 10:42:15 +0000
committersalo <salo>2005-11-26 10:42:15 +0000
commitf5e4cb89b83677de625fad258e01d42d7d0e57fe (patch)
tree4b66794d4e63914545836fdd18e22d1d4207dc1c /www
parent060bc1be0c008b89680e4fd90e2b5850fa64a524 (diff)
downloadpkgsrc-f5e4cb89b83677de625fad258e01d42d7d0e57fe.tar.gz
Pullup ticket 927 - requested by Adrian Portelli
security fix for thttpd Revisions pulled up: - pkgsrc/www/thttpd/Makefile 1.33 - pkgsrc/www/thttpd/distinfo 1.12 - pkgsrc/www/thttpd/patches/patch-ag 1.3 Module Name: pkgsrc Committed By: adrianp Date: Sat Nov 26 10:02:37 UTC 2005 Modified Files: pkgsrc/www/thttpd: Makefile distinfo Added Files: pkgsrc/www/thttpd/patches: patch-ag Log Message: Bump to thttpd-2.25bnb4 to address a security issue: http://secunia.com/advisories/17454/
Diffstat (limited to 'www')
-rw-r--r--www/thttpd/Makefile4
-rw-r--r--www/thttpd/distinfo15
-rw-r--r--www/thttpd/patches/patch-ag15
3 files changed, 25 insertions, 9 deletions
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index 9f90e58fe00..6cb171efe66 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2005/08/19 13:38:58 cube Exp $
+# $NetBSD: Makefile,v 1.32.2.1 2005/11/26 10:42:15 salo Exp $
DISTNAME= thttpd-2.25b
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= www
MASTER_SITES= http://www.acme.com/software/thttpd/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/www/thttpd/distinfo b/www/thttpd/distinfo
index e39d2a0cd71..ff66abab2b2 100644
--- a/www/thttpd/distinfo
+++ b/www/thttpd/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.11 2005/08/19 13:38:58 cube Exp $
+$NetBSD: distinfo,v 1.11.2.1 2005/11/26 10:42:15 salo Exp $
-SHA1 (thttpd-2.25bnb3/thttpd-2.25b.tar.gz) = cd0e823233ad73e34ee1c9b871b01050feb9db52
-RMD160 (thttpd-2.25bnb3/thttpd-2.25b.tar.gz) = 2b67abe40dfec7a21ed338a9082594825a9fef0e
-Size (thttpd-2.25bnb3/thttpd-2.25b.tar.gz) = 132275 bytes
-SHA1 (thttpd-2.25bnb3/sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
-RMD160 (thttpd-2.25bnb3/sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa
-Size (thttpd-2.25bnb3/sitedrivenby.gif) = 8519 bytes
+SHA1 (thttpd-2.25bnb4/thttpd-2.25b.tar.gz) = cd0e823233ad73e34ee1c9b871b01050feb9db52
+RMD160 (thttpd-2.25bnb4/thttpd-2.25b.tar.gz) = 2b67abe40dfec7a21ed338a9082594825a9fef0e
+Size (thttpd-2.25bnb4/thttpd-2.25b.tar.gz) = 132275 bytes
+SHA1 (thttpd-2.25bnb4/sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
+RMD160 (thttpd-2.25bnb4/sitedrivenby.gif) = 2e350e6531a800da8796207509c12fb590d0affa
+Size (thttpd-2.25bnb4/sitedrivenby.gif) = 8519 bytes
SHA1 (patch-aa) = 0f739bebf1ade45a9b9819fc92d48eeb1004eb66
SHA1 (patch-ab) = 3766ae48fabc1980483e482157d1267971e621df
SHA1 (patch-ac) = 71b2926a9513bd25a124510ad5f234d029492eb2
SHA1 (patch-ad) = 234127aaf4a3b5e6536bd08cc80f823800240fac
SHA1 (patch-af) = 2fa1603964383a745a82f1760faa947193764079
+SHA1 (patch-ag) = 01410f8d293e2d4033f2a1119b21c05e21dfefbe
diff --git a/www/thttpd/patches/patch-ag b/www/thttpd/patches/patch-ag
new file mode 100644
index 00000000000..38354fdd784
--- /dev/null
+++ b/www/thttpd/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.2.16.1 2005/11/26 10:42:15 salo Exp $
+
+--- extras/syslogtocern.orig 2005-11-26 09:54:31.000000000 +0000
++++ extras/syslogtocern
+@@ -31,8 +31,8 @@ if [ $# -lt 1 ] ; then
+ exit 1
+ fi
+
+-tmp1=/tmp/stc1.$$
+-rm -f $tmp1
++tmp1=``mktemp -t stc1.XXXXXX` || { echo "$0: Cannot create temporary file" >&2; exit 1; }
++trap " [ -f \"$tmp1\" ] && /bin/rm -f -- \"$tmp1\"" 0 1 2 3 13 15
+
+ # Gather up all the thttpd entries.
+ egrep -h ' thttpd\[' "$@" > $tmp1