rpms/xmldiff/FC-4 xmldiff-0.6.7-clean-tmp.patch, NONE, 1.1 xmldiff.spec, 1.2, 1.3

Paul W. Frields (pfrields) fedora-extras-commits at redhat.com
Wed Jan 25 06:19:19 UTC 2006


Author: pfrields

Update of /cvs/extras/rpms/xmldiff/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29569

Modified Files:
	xmldiff.spec 
Added Files:
	xmldiff-0.6.7-clean-tmp.patch 
Log Message:
Prevent temp file logjam (#177800)

xmldiff-0.6.7-clean-tmp.patch:

--- NEW FILE xmldiff-0.6.7-clean-tmp.patch ---
diff -uNr xmldiff-0.6.7-original/bin/xmlrev xmldiff-0.6.7/bin/xmlrev
--- xmldiff-0.6.7-original/bin/xmlrev	2006-01-24 22:10:13.000000000 -0800
+++ xmldiff-0.6.7/bin/xmlrev	2006-01-24 22:11:17.000000000 -0800
@@ -10,7 +10,7 @@
 TMPFILE_D=$(mktemp /tmp/xmlrev.xupdate.XXXXXX) || exit 1
 TMPFILE_XSLT=$(mktemp /tmp/xmlrev.xslt.XXXXXX) || exit 1
 TMPFILES="$TMPFILE_S $TMPFILE_X $TMPFILE_D $TMPFILE_XSLT"
-
+trap "rm -f $TMPFILES" exit
 
 function guess_doc_type() {
     # $1 filepath
@@ -124,5 +124,3 @@
 	revision "$1" "$2"
 	;;
 esac
-
-rm -f $TMPFILES


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/FC-4/xmldiff.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmldiff.spec	12 Jan 2006 15:53:42 -0000	1.2
+++ xmldiff.spec	25 Jan 2006 06:19:19 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -12,6 +12,7 @@
 # No license in original tarball, but referenced in docs
 Source1:	GPL
 Patch0:		xmldiff-0.6.7-xsldata.patch
+Patch1:		xmldiff-0.6.7-clean-tmp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python
@@ -35,6 +36,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 for i in man/*.1 __pkginfo__.py doc/*.txt
 do
 	iconv -f iso-8859-1 -t UTF-8 "$i" > "${i}_" ; mv "${i}_" "$i"
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-6
+- Prevent temp file logjam (#177800)
+
 * Thu Jan 12 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
 - Add Requires: file
 - xmlrev: use proper XSL location




More information about the fedora-extras-commits mailing list