head	1.2;
access;
symbols
	pkgsrc-2017Q3:1.1.0.82
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.78
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.76
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.74
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.72
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.70
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.68
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.66
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.64
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.62
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.60
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.58
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.56
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.54
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.52
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.50
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.48
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.46
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.44
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.42
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.40
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.38
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.36
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.34
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.32
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.30
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.28
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.26
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.24
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.22
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.20
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.18
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.16
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.14
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.12
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.10
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.8
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.6
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.4
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2017.11.15.15.00.38;	author hauke;	state dead;
branches;
next	1.1;
commitid	Lad0VcOTUFgXW8fA;

1.1
date	2008.05.04.22.27.07;	author tonnerre;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Upgrade to XEmacs 21.5.34

Obsolete, fixed upstream
@
text
@$NetBSD: patch-am,v 1.1 2008/05/04 22:27:07 tonnerre Exp $

--- lib-src/vcdiff.orig	1996-12-18 22:42:33.000000000 +0000
+++ lib-src/vcdiff	2008-04-29 13:27:28.000000000 +0100
@@@@ -1,23 +1,35 @@@@
-#!/bin/sh
+#! /bin/sh
 #
 # Enhanced sccs diff utility for use with vc mode.
 # This version is more compatible with rcsdiff(1).
 #
-#	!Id: vcdiff,v 1.4 1993/12/03 09:29:18 eggert Exp !
+# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
+#               2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
-# Modified by: vladimir@@Eng.Sun.COM on 95-06-07
-# * Made sure that file arguments are specifed as s.<filename>.
-# * Switched the assignments to $f inside the 3rd and 4th case statements of
-#   the first for-loop
-# * Removed the incorrect initialization of sid1 before the first for-loop.
+# This file is part of GNU Emacs.
+#
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 #
 
 DIFF="diff"
 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
 
-PATH=$PATH:/usr/ccs/bin:/usr/sccs # common SCCS hangouts
+PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
 
-echo=
+echo="echo"
 sid1= sid2=
 
 for f
@@@@ -31,14 +43,14 @@@@
 			echo=:;;
 		-r?*)
 			case $sid1 in
-			-r*)
-				sid2=$f
+			'')
+				sid1=$f
 				;;
-			*) 
+			*)
 				case $sid2 in
-				  ?*) echo "$usage" >&2; exit 2 ;;
+				?*) echo "$usage" >&2; exit 2 ;;
 				esac
-				sid1=$f
+				sid2=$f
 				;;
 			esac
 			;;
@@@@ -67,31 +79,24 @@@@
 
 for f
 do
-  s=2
-
-  # For files under SCCS control, fixup the file name to be the s. filename
-  if [ -d SCCS ]; then
-    if [ $f = `echo $f | sed -e 's|SCCS/s.||'` ]; then
-      f="SCCS/s.$f"
-    fi
-  fi 
+	s=2
 
 	case $f in
 	s.* | */s.*)
 		if
-			rev1=/tmp/geta$$
+			rev1=`mktemp /tmp/geta.XXXXXXXX`
 			get -s -p -k $sid1 "$f" > $rev1 &&
 			case $sid2 in
 			'')
 				workfile=`expr " /$f" : '.*/s.\(.*\)'`
 				;;
 			*)
-				rev2=/tmp/getb$$
+				rev2=`mktemp /tmp/getb.XXXXXXXX`
 				get -s -p -k $sid2 "$f" > $rev2
 				workfile=$rev2
 			esac
 		then
-			$echo $DIFF $options $sid1 $sid2 $workfile >&2
+			$echo $DIFF $options $rev1 $workfile >&2
 			$DIFF $options $rev1 $workfile
 			s=$?
 		fi
@@@@ -104,3 +109,5 @@@@
 	then status=$s
 	fi
 done
+
+# arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a
@


1.1
log
@Fix vcdiff insecure temp file creation vulnerability (CVE-2008-1694) for
xemacs-current as well.
@
text
@d1 1
a1 1
$NetBSD: patch-ag,v 1.3 2008/04/29 14:07:15 tonnerre Exp $
@