[Pkg-octave-commit] rev 716 - in trunk/packages/octave/debian: . in patches

[Rafael Laboissiere]

Author: rafael
Date: 2006-08-19 09:27:38 +0000 (Sat, 19 Aug 2006)
New Revision: 716

Added:
   trunk/packages/octave/debian/patches/50_octave-bug-tempfile.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/octave2.1-00list
   trunk/packages/octave/debian/in/octave2.9-00list
   trunk/packages/octave/debian/rules
Log:
Manipulate octave-bug.in in a dpatch instead of using Perl code in
debian/rules 

Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-08-19 09:16:17 UTC (rev 715)
+++ trunk/packages/octave/debian/changelog	2006-08-19 09:27:38 UTC (rev 716)
@@ -7,6 +7,11 @@
     /usr, which is the correct value in Debian systems
   * debian/in/octave2.1-00list: Include the above
 
+  * debian/patches/50_octave-bug-tempfile.dpatch: In octave-bug, use
+    Debian's tempfile(1) for enhanced security
+  * debian/rules: Removed the Perl hack that used to implement the
+    patch above
+
  --
 
 octave2.1 (1:2.1.73-10) unstable; urgency=low

Modified: trunk/packages/octave/debian/in/octave2.1-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.1-00list	2006-08-19 09:16:17 UTC (rev 715)
+++ trunk/packages/octave/debian/in/octave2.1-00list	2006-08-19 09:27:38 UTC (rev 716)
@@ -5,3 +5,4 @@
 50_return-deffn
 50_fixed-freqz
 50_OCTAVEHOME-texi.dpatch
+50_octave-bug-tempfile

Modified: trunk/packages/octave/debian/in/octave2.9-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.9-00list	2006-08-19 09:16:17 UTC (rev 715)
+++ trunk/packages/octave/debian/in/octave2.9-00list	2006-08-19 09:27:38 UTC (rev 716)
@@ -1 +1 @@
- 
+50_octave-bug-tempfile

Added: trunk/packages/octave/debian/patches/50_octave-bug-tempfile.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_octave-bug-tempfile.dpatch	2006-08-19 09:16:17 UTC (rev 715)
+++ trunk/packages/octave/debian/patches/50_octave-bug-tempfile.dpatch	2006-08-19 09:27:38 UTC (rev 716)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_octave-bug-tempfile.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Use Debian's tempfile(1) for enhanced security
+
+ at DPATCH@
+
+--- octave2.1-2.1.73.orig/octave-bug.in	2006-08-19 02:58:39.000000000 +0200
++++ octave2.1-2.1.73/octave-bug.in	2006-08-19 11:11:51.172397104 +0200
+@@ -61,7 +61,7 @@
+ PATH=/bin:/usr/bin:/usr/ucb:/usr/local/bin:$PATH
+ export PATH
+ 
+-TEMP=/tmp/octave-bug.$$
++TEMP=`tempfile`
+ 
+ if [ -z "$DEFEDITOR" ] && [ -z "$EDITOR" ]; then
+   if [ -x /usr/bin/editor ]; then

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2006-08-19 09:16:17 UTC (rev 715)
+++ trunk/packages/octave/debian/rules	2006-08-19 09:27:38 UTC (rev 716)
@@ -113,10 +113,6 @@
 configure-stamp:
 	dh_testdir
 
-        # use Debian's tempfile(1) for enhanced security
-	cp octave-bug.in octave-bug.in.orig
-	perl -p -i -e 's|/tmp/octave-bug.\$$\$$|`tempfile`|' octave-bug.in
-
 	[ -f autogen.sh ] &&  ./autogen.sh && chmod 0755 configure
 
 	DEFAULT_PAGER=pager				\
@@ -204,8 +200,6 @@
 	find doc -name \*.html -exec rm -f \{} \;
 	find doc -name HTML -exec rm -rf \{} \;
 
-	test ! -f octave-bug.in.orig || mv octave-bug.in.orig octave-bug.in
-
 	rm -f `ls debian/in/PACKAGE* | sed 's/PACKAGE/$(PACKAGE)/;s:/in::'`
 	rm -f octave-depends-$(version).1
 	( cd debian ; rm -f watch octave-depends defs.make )