Received: by mail.netbsd.org (Postfix, from userid 605) id 85C8C84DF1; Wed, 18 Mar 2020 13:49:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0A6BA84DE5 for ; Wed, 18 Mar 2020 13:49:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id PWxzW6zpBm0C for ; Wed, 18 Mar 2020 13:49:30 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4CC0B84CDB for ; Wed, 18 Mar 2020 13:49:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 46C47FB27; Wed, 18 Mar 2020 13:49:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1584539370187700" MIME-Version: 1.0 Date: Wed, 18 Mar 2020 13:49:30 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/print/gutenprint-lib To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20200318134930.46C47FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1584539370187700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Wed Mar 18 13:49:30 UTC 2020 Modified Files: pkgsrc/print/gutenprint-lib: distinfo pkgsrc/print/gutenprint-lib/patches: patch-scripts_gversion patch-scripts_gversion.in patch-scripts_snapstamp Log Message: gutenprint-lib: Minor patch adjustments Quote variables formerly in [[ (thanks rillig@). Note upstream status. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/gutenprint-lib/distinfo cvs rdiff -u -r1.1 -r1.2 \ 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. --_----------=_1584539370187700 Content-Disposition: inline Content-Length: 6878 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/gutenprint-lib/distinfo diff -u pkgsrc/print/gutenprint-lib/distinfo:1.25 pkgsrc/print/gutenprint-lib/distinfo:1.26 --- pkgsrc/print/gutenprint-lib/distinfo:1.25 Tue Mar 17 23:06:08 2020 +++ pkgsrc/print/gutenprint-lib/distinfo Wed Mar 18 13:49:29 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2020/03/17 23:06:08 gdt Exp $ +$NetBSD: distinfo,v 1.26 2020/03/18 13:49:29 gdt Exp $ SHA1 (gutenprint-5.3.3.tar.xz) = edfab4bafe8e6420c7c321915eeb2dd16e899c59 RMD160 (gutenprint-5.3.3.tar.xz) = 3a1a9a66ad376294fbb10b547ff53481a81b0337 @@ -6,6 +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 +SHA1 (patch-scripts_gversion) = 117b9daa6b4807e1de73ae3711ea0101b2e3d738 +SHA1 (patch-scripts_gversion.in) = 03e74de2a33561125bc63912534cabf37d3ce5a7 +SHA1 (patch-scripts_snapstamp) = f910a3be5d07f438a12169e2d7cd63ee93889fa8 Index: pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion diff -u pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion:1.1 pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion:1.2 --- pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion:1.1 Tue Mar 17 23:06:08 2020 +++ pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion Wed Mar 18 13:49:30 2020 @@ -1,7 +1,9 @@ -$NetBSD: patch-scripts_gversion,v 1.1 2020/03/17 23:06:08 gdt Exp $ +$NetBSD: patch-scripts_gversion,v 1.2 2020/03/18 13:49:30 gdt Exp $ Remediate bashisms. +Sent upstream by email 20200317. + --- scripts/gversion.orig 2019-08-25 15:14:28.000000000 +0000 +++ scripts/gversion @@ -43,10 +43,10 @@ gutenprint_release=gutenprint-5.3 @@ -12,10 +14,10 @@ Remediate bashisms. - [[ -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) ++ [ -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 pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion.in:1.1 pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion.in:1.2 --- pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion.in:1.1 Tue Mar 17 23:06:08 2020 +++ pkgsrc/print/gutenprint-lib/patches/patch-scripts_gversion.in Wed Mar 18 13:49:30 2020 @@ -1,7 +1,9 @@ -$NetBSD: patch-scripts_gversion.in,v 1.1 2020/03/17 23:06:08 gdt Exp $ +$NetBSD: patch-scripts_gversion.in,v 1.2 2020/03/18 13:49:30 gdt Exp $ Remediate bashisms. +Sent upstream by email 20200317. + --- scripts/gversion.in.orig 2019-05-25 15:18:50.000000000 +0000 +++ scripts/gversion.in @@ -43,10 +43,10 @@ gutenprint_release=gutenprint-@GUTENPRIN @@ -12,10 +14,10 @@ Remediate bashisms. - [[ -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) ++ [ -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 pkgsrc/print/gutenprint-lib/patches/patch-scripts_snapstamp:1.1 pkgsrc/print/gutenprint-lib/patches/patch-scripts_snapstamp:1.2 --- pkgsrc/print/gutenprint-lib/patches/patch-scripts_snapstamp:1.1 Tue Mar 17 23:06:08 2020 +++ pkgsrc/print/gutenprint-lib/patches/patch-scripts_snapstamp Wed Mar 18 13:49:30 2020 @@ -1,7 +1,9 @@ -$NetBSD: patch-scripts_snapstamp,v 1.1 2020/03/17 23:06:08 gdt Exp $ +$NetBSD: patch-scripts_snapstamp,v 1.2 2020/03/18 13:49:30 gdt Exp $ Remediate bashisms. +Sent upstream by email 20200317. + --- scripts/snapstamp.orig 2019-05-25 19:15:55.000000000 +0000 +++ scripts/snapstamp @@ -17,4 +17,4 @@ @@ -9,4 +11,4 @@ Remediate bashisms. # along with this program. If not, see . -[[ -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 '*') ++[ -n "$STP_BUILD_SNAPSHOT" && -d .git ] && printf '%s%(%Y-%m-%dT%H-%M)T-%s' - -1 $(git describe --dirty --always --first-parent --exclude '*') --_----------=_1584539370187700--