NetBSD Problem Report #54609
From triaxx@netbsd.org Tue Oct 8 06:21:58 2019
Return-Path: <triaxx@netbsd.org>
Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified))
by mollari.NetBSD.org (Postfix) with ESMTPS id 40A167A1B2
for <gnats-bugs@gnats.NetBSD.org>; Tue, 8 Oct 2019 06:21:58 +0000 (UTC)
Message-Id: <20191008062157.1D66F7A252@mollari.NetBSD.org>
Date: Tue, 8 Oct 2019 06:21:57 +0000 (UTC)
From: triaxx@netbsd.org
Reply-To: triaxx@netbsd.org
To: gnats-bugs@NetBSD.org
Subject: security/libgpg-error: build failure on Arch Linux due to gwak 5
X-Send-Pr-Version: 3.95
>Number: 54609
>Category: pkg
>Synopsis: security/libgpg-error: build failure on Arch Linux due to gwak 5
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: pkg-manager
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Tue Oct 08 06:25:00 +0000 2019
>Closed-Date: Tue Oct 08 06:41:53 +0000 2019
>Last-Modified: Tue Oct 08 06:41:53 +0000 2019
>Originator: Frédéric Fauberteau
>Release: Linux 5.3.1-arch1-1-ARCH | pkgsrc-HEAD
>Organization:
>Environment:
System: Linux guardian 5.3.1-arch1-1-ARCH #1 SMP PREEMPT Sat Sep 21 11:33:49 UTC 2019 x86_64 GNU/Linux
Architecture: x86_64
Machine: amd64
>Description:
Arch Linux updated GNU awk to version 5.x:
$ pacman -Q | grep gawk
gawk 5.0.1-1
The build against this new release produces errors.
>How-To-Repeat:
cd /usr/pkgsrc/security/libpgp-error && bmake build
>Fix:
The issue has been fixed upstream (https://github.com/gpg/libgpg-error/commit/7865041). I have to test the following patch on NetBSD to verify that no regression is introduced.
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/libgpg-error/Makefile,v
retrieving revision 1.72
diff -u -r1.72 Makefile
--- Makefile 3 Jul 2019 17:17:58 -0000 1.72
+++ Makefile 8 Oct 2019 06:14:39 -0000
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.72 2019/07/03 17:17:58 sevan Exp $
DISTNAME= libgpg-error-1.36
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgpg-error/
MASTER_SITES+= ftp://ftp.ring.gr.jp/pub/net/gnupg/libgpg-error/
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/security/libgpg-error/distinfo,v
retrieving revision 1.45
diff -u -r1.45 distinfo
--- distinfo 20 Mar 2019 05:43:20 -0000 1.45
+++ distinfo 8 Oct 2019 06:14:39 -0000
@@ -4,4 +4,12 @@
RMD160 (libgpg-error-1.36.tar.bz2) = 13a9405bcb8ef179fff58e72f47a54889ddd287f
SHA512 (libgpg-error-1.36.tar.bz2) = 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
Size (libgpg-error-1.36.tar.bz2) = 920542 bytes
+SHA1 (patch-lang_cl_mkerrcodes.awk) = 766a3a548932069a05954297641fa3d93149faa0
+SHA1 (patch-src_Makefile.am) = 97842d55345ebf8c3846a8986568c4399c984e52
+SHA1 (patch-src_Makefile.in) = 0ab0b6b7e157e7d8d55ebc3818f9790dfb16ebe2
SHA1 (patch-src_estream.c) = 0502a55403062abeab22c83a6d919c57ff1c5d82
+SHA1 (patch-src_mkerrcodes.awk) = c10fc74db4553a51f9a42902cc2b704c5b3ce70e
+SHA1 (patch-src_mkerrcodes1.awk) = e199d83906354d80057b768f95fb8a99c484e128
+SHA1 (patch-src_mkerrcodes2.awk) = 2ef123f3a131ac6cfbc413b71d8834070a37ebe9
+SHA1 (patch-src_mkerrnos.awk) = 39998d8737b34ec56c0f95076092979d6323ed61
+SHA1 (patch-src_mkstrtable.awk) = 3b7c8d5406594ba24d934f1c7c5ef495df6c6fbe
Index: patches/patch-lang_cl_mkerrcodes.awk
===================================================================
RCS file: patches/patch-lang_cl_mkerrcodes.awk
diff -N patches/patch-lang_cl_mkerrcodes.awk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lang_cl_mkerrcodes.awk 8 Oct 2019 06:14:39 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Prepare for Gawk 5.0.
+Don't escape # in regexp.
+https://github.com/gpg/libgpg-error/commit/7865041
+
+--- lang/cl/mkerrcodes.awk.orig 2013-03-15 19:24:25.000000000 +0000
++++ lang/cl/mkerrcodes.awk
+@@ -122,7 +122,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
Index: patches/patch-src_Makefile.am
===================================================================
RCS file: patches/patch-src_Makefile.am
diff -N patches/patch-src_Makefile.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Makefile.am 8 Oct 2019 06:14:39 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Prepare for Gawk 5.0.
+Use pkg_namespace (instead of namespace).
+https://github.com/gpg/libgpg-error/commit/7865041
+
+--- src/Makefile.am.orig 2018-12-12 08:14:31.000000000 +0000
++++ src/Makefile.am
+@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO
+
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+- -v prefix=GPG_ERR_ -v namespace=errnos_ \
++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
+ $(srcdir)/errnos.in >$@
+
+
Index: patches/patch-src_Makefile.in
===================================================================
RCS file: patches/patch-src_Makefile.in
diff -N patches/patch-src_Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Makefile.in 8 Oct 2019 06:14:39 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Prepare for Gawk 5.0.
+Use pkg_namespace (instead of namespace).
+https://github.com/gpg/libgpg-error/commit/7865041
+
+--- src/Makefile.in.orig 2019-03-19 08:58:04.000000000 +0000
++++ src/Makefile.in
+@@ -1615,7 +1615,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FO
+
+ errnos-sym.h: Makefile mkstrtable.awk errnos.in
+ $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
+- -v prefix=GPG_ERR_ -v namespace=errnos_ \
++ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
+ $(srcdir)/errnos.in >$@
+
+ mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile
Index: patches/patch-src_mkerrcodes.awk
===================================================================
RCS file: patches/patch-src_mkerrcodes.awk
diff -N patches/patch-src_mkerrcodes.awk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mkerrcodes.awk 8 Oct 2019 06:14:39 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Prepare for Gawk 5.0.
+Don't escape # in regexp.
+https://github.com/gpg/libgpg-error/commit/7865041
+
+--- src/mkerrcodes.awk.orig 2013-03-15 19:24:25.000000000 +0000
++++ src/mkerrcodes.awk
+@@ -85,7 +85,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
Index: patches/patch-src_mkerrcodes1.awk
===================================================================
RCS file: patches/patch-src_mkerrcodes1.awk
diff -N patches/patch-src_mkerrcodes1.awk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mkerrcodes1.awk 8 Oct 2019 06:14:39 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Prepare for Gawk 5.0.
+Don't escape # in regexp.
+https://github.com/gpg/libgpg-error/commit/7865041
+
+--- src/mkerrcodes1.awk.orig 2013-03-15 19:24:25.000000000 +0000
++++ src/mkerrcodes1.awk
+@@ -81,7 +81,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
Index: patches/patch-src_mkerrcodes2.awk
===================================================================
RCS file: patches/patch-src_mkerrcodes2.awk
diff -N patches/patch-src_mkerrcodes2.awk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mkerrcodes2.awk 8 Oct 2019 06:14:39 -0000
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Prepare for Gawk 5.0.
+Don't escape # in regexp.
+https://github.com/gpg/libgpg-error/commit/7865041
+
+--- src/mkerrcodes2.awk.orig 2013-03-15 19:24:25.000000000 +0000
++++ src/mkerrcodes2.awk
+@@ -91,7 +91,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
Index: patches/patch-src_mkerrnos.awk
===================================================================
RCS file: patches/patch-src_mkerrnos.awk
diff -N patches/patch-src_mkerrnos.awk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mkerrnos.awk 8 Oct 2019 06:14:39 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/mkerrnos.awk.orig 2013-03-15 19:24:25.000000000 +0000
++++ src/mkerrnos.awk
+@@ -83,7 +83,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
Index: patches/patch-src_mkerrnos.awk.orig
===================================================================
RCS file: patches/patch-src_mkerrnos.awk.orig
diff -N patches/patch-src_mkerrnos.awk.orig
Index: patches/patch-src_mkstrtable.awk
===================================================================
RCS file: patches/patch-src_mkstrtable.awk
diff -N patches/patch-src_mkstrtable.awk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_mkstrtable.awk 8 Oct 2019 06:14:39 -0000
@@ -0,0 +1,54 @@
+$NetBSD$
+
+Prepare for Gawk 5.0.
+Use pkg_namespace (instead of namespace).
+Don't escape # in regexp.
+https://github.com/gpg/libgpg-error/commit/7865041
+
+--- src/mkstrtable.awk.orig 2013-03-15 19:24:25.000000000 +0000
++++ src/mkstrtable.awk
+@@ -77,7 +77,7 @@
+ #
+ # The variable prefix can be used to prepend a string to each message.
+ #
+-# The variable namespace can be used to prepend a string to each
++# The variable pkg_namespace can be used to prepend a string to each
+ # variable and macro name.
+
+ BEGIN {
+@@ -102,7 +102,7 @@ header {
+ print "/* The purpose of this complex string table is to produce";
+ print " optimal code with a minimum of relocations. */";
+ print "";
+- print "static const char " namespace "msgstr[] = ";
++ print "static const char " pkg_namespace "msgstr[] = ";
+ header = 0;
+ }
+ else
+@@ -110,7 +110,7 @@ header {
+ }
+
+ !header {
+- sub (/\#.+/, "");
++ sub (/#.+/, "");
+ sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
+
+ if (/^$/)
+@@ -150,7 +150,7 @@ END {
+ else
+ print " gettext_noop (\"" last_msgstr "\");";
+ print "";
+- print "static const int " namespace "msgidx[] =";
++ print "static const int " pkg_namespace "msgidx[] =";
+ print " {";
+ for (i = 0; i < coded_msgs; i++)
+ print " " pos[i] ",";
+@@ -158,7 +158,7 @@ END {
+ print " };";
+ print "";
+ print "static GPG_ERR_INLINE int";
+- print namespace "msgidxof (int code)";
++ print pkg_namespace "msgidxof (int code)";
+ print "{";
+ print " return (0 ? 0";
+
>Release-Note:
>Audit-Trail:
From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= <triaxx@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/54609 CVS commit: pkgsrc/security/libgpg-error
Date: Tue, 8 Oct 2019 06:36:14 +0000
Module Name: pkgsrc
Committed By: triaxx
Date: Tue Oct 8 06:36:13 UTC 2019
Modified Files:
pkgsrc/security/libgpg-error: Makefile distinfo
Added Files:
pkgsrc/security/libgpg-error/patches: patch-lang_cl_mkerrcodes.awk
patch-src_Makefile.am patch-src_Makefile.in
patch-src_mkerrcodes.awk patch-src_mkerrcodes1.awk
patch-src_mkerrcodes2.awk patch-src_mkerrnos.awk
patch-src_mkstrtable.awk
Log Message:
libgpg-error: fix PR pkg/54609
pkgsrc changes:
---------------
* Apply upstream patches that will be removed in next release
(https://github.com/gpg/libgpg-error/commit/7865041)
* Bump revision
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/security/libgpg-error/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/security/libgpg-error/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/security/libgpg-error/patches/patch-lang_cl_mkerrcodes.awk \
pkgsrc/security/libgpg-error/patches/patch-src_Makefile.am \
pkgsrc/security/libgpg-error/patches/patch-src_Makefile.in \
pkgsrc/security/libgpg-error/patches/patch-src_mkerrcodes.awk \
pkgsrc/security/libgpg-error/patches/patch-src_mkerrcodes1.awk \
pkgsrc/security/libgpg-error/patches/patch-src_mkerrcodes2.awk \
pkgsrc/security/libgpg-error/patches/patch-src_mkerrnos.awk \
pkgsrc/security/libgpg-error/patches/patch-src_mkstrtable.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->closed
State-Changed-By: triaxx@NetBSD.org
State-Changed-When: Tue, 08 Oct 2019 06:41:53 +0000
State-Changed-Why:
The fix builds fine on (Net|Free)BSD.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.