[pkgsrc/pkgsrc-2005Q2]: pkgsrc/devel/cvs Pullup ticket 716 - requested by Adr...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf883ca86ef6
branches:  pkgsrc-2005Q2
changeset: 496037:bf883ca86ef6
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Aug 27 12:43:50 2005 +0000

description:
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.

diffstat:

 devel/cvs/Makefile         |   3 ++-
 devel/cvs/distinfo         |   6 ++----
 devel/cvs/patches/patch-ba |  21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r 4e185c223881 -r bf883ca86ef6 devel/cvs/Makefile
--- a/devel/cvs/Makefile        Wed Aug 24 13:06:26 2005 +0000
+++ b/devel/cvs/Makefile        Sat Aug 27 12:43:50 2005 +0000
@@ -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 -r 4e185c223881 -r bf883ca86ef6 devel/cvs/distinfo
--- a/devel/cvs/distinfo        Wed Aug 24 13:06:26 2005 +0000
+++ b/devel/cvs/distinfo        Sat Aug 27 12:43:50 2005 +0000
@@ -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-av) = d381dbf50a59d78e0a4bf8fff09b2570988d5647
 SHA1 (patch-ay) = 7a0ee5bf1707afeaeb9092ce3faf7fc594044a2b
 SHA1 (patch-az) = 4b773728b228af6c69d4e10cf59f1677feaa54ea
+SHA1 (patch-ba) = 25f9a2f7e35db0d2bfefae5ebf7be43d21a8a9ee
diff -r 4e185c223881 -r bf883ca86ef6 devel/cvs/patches/patch-ba
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cvs/patches/patch-ba        Sat Aug 27 12:43:50 2005 +0000
@@ -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