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

[Guillem Jover]

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

Modified:
   trunk/freebsd-sendpr/debian/changelog
   trunk/freebsd-sendpr/debian/patches/001_main.diff
   trunk/freebsd-sendpr/debian/patches/004_bashims.patch
Log:
New sendpr 9.2 upstream release

Modified: trunk/freebsd-sendpr/debian/changelog
===================================================================
--- trunk/freebsd-sendpr/debian/changelog	2013-10-19 05:15:41 UTC (rev 5057)
+++ trunk/freebsd-sendpr/debian/changelog	2013-10-19 05:15:47 UTC (rev 5058)
@@ -1,5 +1,6 @@
-freebsd-sendpr (3.113+8.2-2) UNRELEASED; urgency=low
+freebsd-sendpr (3.113+9.2-1) UNRELEASED; urgency=low
 
+  * New upstream release.
   * Refactor source and tar name into SOURCE and TARNAME in debian/rules.
   * Add a Homepage field pointing to the FreeBSD problem reporting webform.
   * Switch to canonical Vcs URLs.

Modified: trunk/freebsd-sendpr/debian/patches/001_main.diff
===================================================================
--- trunk/freebsd-sendpr/debian/patches/001_main.diff	2013-10-19 05:15:41 UTC (rev 5057)
+++ trunk/freebsd-sendpr/debian/patches/001_main.diff	2013-10-19 05:15:47 UTC (rev 5058)
@@ -1,10 +1,10 @@
 ---
- gnu/usr.bin/send-pr/send-pr.sh |   33 ++++++++++++++++++++++++---------
- 1 file changed, 24 insertions(+), 9 deletions(-)
+ gnu/usr.bin/send-pr/send-pr.sh |   35 +++++++++++++++++++++++++----------
+ 1 file changed, 25 insertions(+), 10 deletions(-)
 
 --- a/gnu/usr.bin/send-pr/send-pr.sh
 +++ b/gnu/usr.bin/send-pr/send-pr.sh
-@@ -88,10 +88,12 @@ fi
+@@ -88,11 +88,13 @@ fi
  # Find out the name of the originator of this PR.
  if [ -n "$NAME" ]; then
    ORIGINATOR="$NAME"
@@ -14,13 +14,15 @@
    ORIGINATOR="`sed -e '1q' $HOME/.fullname`"
 -else
 -  PTEMP=`mktemp -t p` || exit 1
+-  PTEMP2=`mktemp -t p` || exit 1
 +elif test -e $PW ; then
 +  PTEMP=`mktemp -t p.XXXXXX` || exit 1
++  PTEMP2=`mktemp -t p.XXXXXX` || exit 1
    # Must use temp file due to incompatibilities in quoting behavior
    # and to protect shell metacharacters in the expansion of $LOGNAME
-   $PW usershow $LOGNAME | awk -F: '{ print $8 }' | sed -e 's/,.*//' > $PTEMP
-@@ -99,8 +101,17 @@ else
-   rm -f $PTEMP
+   $ECHON1 $LOGNAME | awk '{print toupper(substr($1,1,1))substr($1,2)}' > $PTEMP2
+@@ -104,8 +106,17 @@ else
+   rm -f "$PTEMP" "$PTEMP2"
  fi
  
 -FROM="$ORIGINATOR <$LOGNAME>"
@@ -39,7 +41,7 @@
  
  if [ -n "$ORGANIZATION" ]; then
    if [ -f "$ORGANIZATION" ]; then
-@@ -111,6 +122,10 @@ else
+@@ -116,6 +127,10 @@ else
      ORGANIZATION="$DEFAULT_ORGANIZATION"
    elif [ -f $HOME/.organization ]; then
      ORGANIZATION="`cat $HOME/.organization`"
@@ -50,7 +52,7 @@
    fi
  fi
  
-@@ -257,12 +272,12 @@ HOW_TO_REPEAT_C='<code/input/activities
+@@ -262,12 +277,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
@@ -66,7 +68,7 @@
  
  # If they told us to use a specific file, then do so.
  if [ -n "$IN_FILE" ]; then
-@@ -494,7 +509,7 @@ while true; do
+@@ -499,7 +514,7 @@ while true; do
      case "$input" in
        a*)
  	if [ -z "$BATCH" ]; then
@@ -75,7 +77,7 @@
  	  echo "$COMMAND: the problem report remains in $BAD and is not sent."
  	  mv $TEMP $BAD
          else
-@@ -576,7 +591,7 @@ if $MAIL_AGENT < $REF; then
+@@ -581,7 +596,7 @@ if $MAIL_AGENT < $REF; then
  else
    echo "$COMMAND: mysterious mail failure."
    if [ -z "$BATCH" ]; then

Modified: trunk/freebsd-sendpr/debian/patches/004_bashims.patch
===================================================================
--- trunk/freebsd-sendpr/debian/patches/004_bashims.patch	2013-10-19 05:15:41 UTC (rev 5057)
+++ trunk/freebsd-sendpr/debian/patches/004_bashims.patch	2013-10-19 05:15:47 UTC (rev 5058)
@@ -4,7 +4,7 @@
 
 --- a/gnu/usr.bin/send-pr/send-pr.sh
 +++ b/gnu/usr.bin/send-pr/send-pr.sh
-@@ -277,7 +277,7 @@ TEMP=`mktemp -t pf.XXXXXX` || exit 1
+@@ -282,7 +282,7 @@ TEMP=`mktemp -t pf.XXXXXX` || exit 1
  # Catch some signals. ($xs kludge needed by Sun /bin/sh)
  xs=0
  trap 'rm -f $REF $TEMP; exit $xs' 0