[Glibc-bsd-commits] r5057 - in trunk/freebsd-sendpr/debian: . patches

[Guillem Jover]

Author: guillem
Date: 2013-10-19 05:15:41 +0000 (Sat, 19 Oct 2013)
New Revision: 5057

Modified:
   trunk/freebsd-sendpr/debian/changelog
   trunk/freebsd-sendpr/debian/patches/001_main.diff
   trunk/freebsd-sendpr/debian/patches/004_bashims.patch
Log:
Add a missing template placeholder for mktemp in trap call

Modified: trunk/freebsd-sendpr/debian/changelog
===================================================================
--- trunk/freebsd-sendpr/debian/changelog	2013-10-19 05:15:35 UTC (rev 5056)
+++ trunk/freebsd-sendpr/debian/changelog	2013-10-19 05:15:41 UTC (rev 5057)
@@ -4,6 +4,7 @@
   * Add a Homepage field pointing to the FreeBSD problem reporting webform.
   * Switch to canonical Vcs URLs.
   * Remove packaging history from debian/copyright.
+  * Add a missing template placeholder for mktemp in trap call.
 
  -- Guillem Jover <guillem at debian.org>  Sun, 29 May 2011 20:44:02 +0200
 

Modified: trunk/freebsd-sendpr/debian/patches/001_main.diff
===================================================================
--- trunk/freebsd-sendpr/debian/patches/001_main.diff	2013-10-19 05:15:35 UTC (rev 5056)
+++ trunk/freebsd-sendpr/debian/patches/001_main.diff	2013-10-19 05:15:41 UTC (rev 5057)
@@ -1,6 +1,6 @@
 ---
- gnu/usr.bin/send-pr/send-pr.sh |   31 +++++++++++++++++++++++--------
- 1 file changed, 23 insertions(+), 8 deletions(-)
+ gnu/usr.bin/send-pr/send-pr.sh |   33 ++++++++++++++++++++++++---------
+ 1 file changed, 24 insertions(+), 9 deletions(-)
 
 --- a/gnu/usr.bin/send-pr/send-pr.sh
 +++ b/gnu/usr.bin/send-pr/send-pr.sh
@@ -50,7 +50,7 @@
    fi
  fi
  
-@@ -257,8 +272,8 @@ HOW_TO_REPEAT_C='<code/input/activities
+@@ -257,12 +272,12 @@ HOW_TO_REPEAT_C='<code/input/activities
  FIX_C='<how to correct or work around the problem, if known (multiple lines)>'
  
  # Create temporary files, safely
@@ -61,6 +61,11 @@
  # Catch some signals. ($xs kludge needed by Sun /bin/sh)
  xs=0
  trap 'rm -f $REF $TEMP; exit $xs' 0
+-trap 'SAV=`mktemp -t pr`;echo "$COMMAND: Aborting ... saving unfinished PR into $SAV"; rm -f $REF ; mv $TEMP $SAV; xs=1; exit' 1 2 3 13 15
++trap 'SAV=`mktemp -t pr.XXXXXX`;echo "$COMMAND: Aborting ... saving unfinished PR into $SAV"; rm -f $REF ; mv $TEMP $SAV; xs=1; exit' 1 2 3 13 15
+ 
+ # If they told us to use a specific file, then do so.
+ if [ -n "$IN_FILE" ]; then
 @@ -494,7 +509,7 @@ while true; do
      case "$input" in
        a*)

Modified: trunk/freebsd-sendpr/debian/patches/004_bashims.patch
===================================================================
--- trunk/freebsd-sendpr/debian/patches/004_bashims.patch	2013-10-19 05:15:35 UTC (rev 5056)
+++ trunk/freebsd-sendpr/debian/patches/004_bashims.patch	2013-10-19 05:15:41 UTC (rev 5057)
@@ -8,8 +8,8 @@
  # Catch some signals. ($xs kludge needed by Sun /bin/sh)
  xs=0
  trap 'rm -f $REF $TEMP; exit $xs' 0
--trap 'SAV=`mktemp -t pr`;echo "$COMMAND: Aborting ... saving unfinished PR into $SAV"; rm -f $REF ; mv $TEMP $SAV; xs=1; exit' 1 2 3 13 15
-+trap 'SAV=`mktemp -t pr`;echo "$COMMAND: Aborting ... saving unfinished PR into $SAV"; rm -f $REF ; mv $TEMP $SAV; xs=1; exit' HUP INT QUIT PIPE TERM
+-trap 'SAV=`mktemp -t pr.XXXXXX`;echo "$COMMAND: Aborting ... saving unfinished PR into $SAV"; rm -f $REF ; mv $TEMP $SAV; xs=1; exit' 1 2 3 13 15
++trap 'SAV=`mktemp -t pr.XXXXXX`;echo "$COMMAND: Aborting ... saving unfinished PR into $SAV"; rm -f $REF ; mv $TEMP $SAV; xs=1; exit' HUP INT QUIT PIPE TERM
  
  # If they told us to use a specific file, then do so.
  if [ -n "$IN_FILE" ]; then