summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsalo <salo@pkgsrc.org>2005-08-27 12:43:50 +0000
committersalo <salo@pkgsrc.org>2005-08-27 12:43:50 +0000
commit8084bf94ce1c21b32945cece51f3b63936509430 (patch)
treec4814f49b6548d74a5ef528e7fa2a0dc6ee57d0e
parent9e20675adf0867532b177118327d55e027b1721e (diff)
downloadpkgsrc-8084bf94ce1c21b32945cece51f3b63936509430.tar.gz
Pullup ticket 716 - requested by Adrian Portelli
security fix for cvs Revisions pulled up: - pkgsrc/devel/cvs/Makefile 1.86 - pkgsrc/devel/cvs/distinfo 1.27 - pkgsrc/devel/cvs/patches/patch-ba 1.1 Module Name: pkgsrc Committed By: adrianp Date: Fri Aug 26 21:36:29 UTC 2005 Modified Files: pkgsrc/devel/cvs: Makefile distinfo Added Files: pkgsrc/devel/cvs/patches: patch-ba Log Message: Fix for http://secunia.com/advisories/16553/ via RedHat.
-rw-r--r--devel/cvs/Makefile3
-rw-r--r--devel/cvs/distinfo6
-rw-r--r--devel/cvs/patches/patch-ba21
3 files changed, 25 insertions, 5 deletions
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 3d9ef849442..2f58fc46e9e 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.85 2005/05/31 21:28:22 wiz Exp $
+# $NetBSD: Makefile,v 1.85.2.1 2005/08/27 12:43:50 salo Exp $
#
DISTNAME= cvs-1.11.20
CATEGORIES= devel
+PKGREVISION= 2
# (SSL) download URL according to http://www.cvshome.org/ is
# https://ccvs.cvshome.org/files/documents/19/861/cvs-1.11.20.tar.bz2
MASTER_SITES= ${MASTER_SITE_BACKUP}
diff --git a/devel/cvs/distinfo b/devel/cvs/distinfo
index 2bb59932154..c715e1d5eea 100644
--- a/devel/cvs/distinfo
+++ b/devel/cvs/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.26 2005/04/19 12:39:18 wiz Exp $
+$NetBSD: distinfo,v 1.26.2.1 2005/08/27 12:43:50 salo Exp $
SHA1 (cvs-1.11.20.tar.bz2) = 47f51a96b5a73e18c96f431f3c494735aa9c0236
RMD160 (cvs-1.11.20.tar.bz2) = 4f926d661b35dc1bafb5ee5f98487289a907d34d
Size (cvs-1.11.20.tar.bz2) = 2414744 bytes
-SHA1 (cvs-1.11.19-v6-20050205.diff.gz) = 5cd1519d99c8a6bc124fd5e4daaf5202cde87f07
-RMD160 (cvs-1.11.19-v6-20050205.diff.gz) = a6c304badf71464798311f121f3eb2df50501c2f
-Size (cvs-1.11.19-v6-20050205.diff.gz) = 13004 bytes
SHA1 (patch-aa) = 57bcc59a51d44f436d2f79a0752e44e317589650
SHA1 (patch-ab) = 3c5ff65e7a087b2e73e933366aae99b6b5549371
SHA1 (patch-ac) = 4da02fe019da9721afe6f9af0cd1db44214b575e
@@ -29,3 +26,4 @@ SHA1 (patch-au) = ba788685ee842d07ac866183185e257ce2dcf749
SHA1 (patch-av) = d381dbf50a59d78e0a4bf8fff09b2570988d5647
SHA1 (patch-ay) = 7a0ee5bf1707afeaeb9092ce3faf7fc594044a2b
SHA1 (patch-az) = 4b773728b228af6c69d4e10cf59f1677feaa54ea
+SHA1 (patch-ba) = 25f9a2f7e35db0d2bfefae5ebf7be43d21a8a9ee
diff --git a/devel/cvs/patches/patch-ba b/devel/cvs/patches/patch-ba
new file mode 100644
index 00000000000..ab334843a68
--- /dev/null
+++ b/devel/cvs/patches/patch-ba
@@ -0,0 +1,21 @@
+$NetBSD: patch-ba,v 1.1.2.2 2005/08/27 12:43:50 salo Exp $
+
+--- src/cvsbug.in.orig 2005-08-26 22:30:56.000000000 +0100
++++ src/cvsbug.in
+@@ -109,14 +109,14 @@ elif [ -f /bin/domainname ]; then
+ /usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" |
+ cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
+ ORIGINATOR="`cat $TEMP`"
+- rm -f $TEMP
++ > $TEMP
+ fi
+ fi
+
+ if [ "$ORIGINATOR" = "" ]; then
+ grep "^$LOGNAME:" /etc/passwd | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP
+ ORIGINATOR="`cat $TEMP`"
+- rm -f $TEMP
++ > $TEMP
+ fi
+
+ if [ -n "$ORGANIZATION" ]; then