CVS commit: pkgsrc/print/gutenprint-lib

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Mar 17 23:06:08 UTC 2020

Modified Files:
        pkgsrc/print/gutenprint-lib: distinfo
Added Files:
        pkgsrc/print/gutenprint-lib/patches: patch-scripts_gversion
            patch-scripts_gversion.in patch-scripts_snapstamp

Log Message:
gutenprint-lib: Remediate bashisms

These files aren't used, but the patches belong upstream, and it's
easier to patch than to explain why it's safe not to ptach.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/print/gutenprint-lib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion \
    pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion.in \
    pkgsrc/print/gutenprint-lib/patches/patch-scripts_snapstamp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/gutenprint-lib/distinfo
diff -u pkgsrc/print/gutenprint-lib/distinfo:1.24 pkgsrc/print/gutenprint-lib/distinfo:1.25
--- pkgsrc/print/gutenprint-lib/distinfo:1.24   Fri Oct 11 23:47:42 2019
+++ pkgsrc/print/gutenprint-lib/distinfo        Tue Mar 17 23:06:08 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2019/10/11 23:47:42 gdt Exp $
+$NetBSD: distinfo,v 1.25 2020/03/17 23:06:08 gdt Exp $
 
 SHA1 (gutenprint-5.3.3.tar.xz) = edfab4bafe8e6420c7c321915eeb2dd16e899c59
 RMD160 (gutenprint-5.3.3.tar.xz) = 3a1a9a66ad376294fbb10b547ff53481a81b0337
@@ -6,3 +6,6 @@ SHA512 (gutenprint-5.3.3.tar.xz) = d2c47
 Size (gutenprint-5.3.3.tar.xz) = 5050624 bytes
 SHA1 (patch-aa) = 711c925b330a4c4f960439a1722251a4f022ac9f
 SHA1 (patch-configure) = 92bf9185fc7fbadd05e1c8e4f59209d0de574dc8
+SHA1 (patch-scripts_gversion) = b352ed2690a8ccad3e730cec0cc12a790a9ab696
+SHA1 (patch-scripts_gversion.in) = 21d4891a013275a11aa7fc3bd49b0e11cdb0ec70
+SHA1 (patch-scripts_snapstamp) = 69d7b30608c90630cc0939ba12d8b0d42ec398f7

Added files:

Index: pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion
diff -u /dev/null pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion:1.1
--- /dev/null   Tue Mar 17 23:06:08 2020
+++ pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion  Tue Mar 17 23:06:08 2020
@@ -0,0 +1,21 @@
+$NetBSD: patch-scripts_gversion,v 1.1 2020/03/17 23:06:08 gdt Exp $
+
+Remediate bashisms.
+
+--- scripts/gversion.orig      2019-08-25 15:14:28.000000000 +0000
++++ scripts/gversion
+@@ -43,10 +43,10 @@ gutenprint_release=gutenprint-5.3
+ if [ -z "$3" ] ; then
+     if [ -d "$root/.git" ] ; then
+       tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_version//./_}*" 2>/dev/null)
+-      [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null)
+-      [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
+-      [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
+-      [[ -z $tag ]] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
++      [ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null)
++      [ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
++      [ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
++      [ -z $tag ] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
+       echo $tag | sed 's/^[^0-9]*-//' > "$root/git-version-stamp"
+     fi
+ 
Index: pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion.in
diff -u /dev/null pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion.in:1.1
--- /dev/null   Tue Mar 17 23:06:08 2020
+++ pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion.in       Tue Mar 17 23:06:08 2020
@@ -0,0 +1,21 @@
+$NetBSD: patch-scripts_gversion.in,v 1.1 2020/03/17 23:06:08 gdt Exp $
+
+Remediate bashisms.
+
+--- scripts/gversion.in.orig   2019-05-25 15:18:50.000000000 +0000
++++ scripts/gversion.in
+@@ -43,10 +43,10 @@ gutenprint_release=gutenprint-@GUTENPRIN
+ if [ -z "$3" ] ; then
+     if [ -d "$root/.git" ] ; then
+       tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_version//./_}*" 2>/dev/null)
+-      [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null)
+-      [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
+-      [[ -z $tag ]] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
+-      [[ -z $tag ]] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
++      [ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_base//./_}*" 2>/dev/null)
++      [ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "${gutenprint_release//./_}*" 2>/dev/null)
++      [ -z $tag ] && tag=$(git describe --tags --dirty --first-parent --candidates=1000 --match "gutenprint*" 2>/dev/null)
++      [ -z $tag ] && tag=$(git describe --tags --dirty --always --first-parent 2>/dev/null)
+       echo $tag | sed 's/^[^0-9]*-//' > "$root/git-version-stamp"
+     fi
+ 
Index: pkgsrc/print/gutenprint-lib/patches/patch-scripts_snapstamp
diff -u /dev/null pkgsrc/print/gutenprint-lib/patches/patch-scripts_snapstamp:1.1
--- /dev/null   Tue Mar 17 23:06:08 2020
+++ pkgsrc/print/gutenprint-lib/patches/patch-scripts_snapstamp Tue Mar 17 23:06:08 2020
@@ -0,0 +1,12 @@
+$NetBSD: patch-scripts_snapstamp,v 1.1 2020/03/17 23:06:08 gdt Exp $
+
+Remediate bashisms.
+
+--- scripts/snapstamp.orig     2019-05-25 19:15:55.000000000 +0000
++++ scripts/snapstamp
+@@ -17,4 +17,4 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ 
+-[[ -n $STP_BUILD_SNAPSHOT && -d .git ]] && printf '%s%(%Y-%m-%dT%H-%M)T-%s' - -1 $(git describe --dirty --always --first-parent --exclude '*')
++[ -n $STP_BUILD_SNAPSHOT && -d .git ] && printf '%s%(%Y-%m-%dT%H-%M)T-%s' - -1 $(git describe --dirty --always --first-parent --exclude '*')