pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/libgpg-error libgpg-error: fix PR pkg/54609
details: https://anonhg.NetBSD.org/pkgsrc/rev/bcd4b4a2eddf
branches: trunk
changeset: 415488:bcd4b4a2eddf
user: triaxx <triaxx%pkgsrc.org@localhost>
date: Tue Oct 08 06:36:13 2019 +0000
description:
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
diffstat:
security/libgpg-error/Makefile | 3 +-
security/libgpg-error/distinfo | 10 ++-
security/libgpg-error/patches/patch-lang_cl_mkerrcodes.awk | 17 ++++
security/libgpg-error/patches/patch-src_Makefile.am | 17 ++++
security/libgpg-error/patches/patch-src_Makefile.in | 17 ++++
security/libgpg-error/patches/patch-src_mkerrcodes.awk | 17 ++++
security/libgpg-error/patches/patch-src_mkerrcodes1.awk | 17 ++++
security/libgpg-error/patches/patch-src_mkerrcodes2.awk | 17 ++++
security/libgpg-error/patches/patch-src_mkerrnos.awk | 17 ++++
security/libgpg-error/patches/patch-src_mkstrtable.awk | 54 ++++++++++++++
10 files changed, 184 insertions(+), 2 deletions(-)
diffs (237 lines):
diff -r fe41e73d6adf -r bcd4b4a2eddf security/libgpg-error/Makefile
--- a/security/libgpg-error/Makefile Tue Oct 08 03:06:27 2019 +0000
+++ b/security/libgpg-error/Makefile Tue Oct 08 06:36:13 2019 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2019/07/03 17:17:58 sevan Exp $
+# $NetBSD: Makefile,v 1.73 2019/10/08 06:36:13 triaxx 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/
diff -r fe41e73d6adf -r bcd4b4a2eddf security/libgpg-error/distinfo
--- a/security/libgpg-error/distinfo Tue Oct 08 03:06:27 2019 +0000
+++ b/security/libgpg-error/distinfo Tue Oct 08 06:36:13 2019 +0000
@@ -1,7 +1,15 @@
-$NetBSD: distinfo,v 1.45 2019/03/20 05:43:20 adam Exp $
+$NetBSD: distinfo,v 1.46 2019/10/08 06:36:13 triaxx Exp $
SHA1 (libgpg-error-1.36.tar.bz2) = 5245ce38b198cecd57775fb3c7b7328ec1a2a615
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) = a033048eafec0a2d4bf29a580fcffb7298b56751
+SHA1 (patch-src_mkstrtable.awk) = 3b7c8d5406594ba24d934f1c7c5ef495df6c6fbe
diff -r fe41e73d6adf -r bcd4b4a2eddf security/libgpg-error/patches/patch-lang_cl_mkerrcodes.awk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libgpg-error/patches/patch-lang_cl_mkerrcodes.awk Tue Oct 08 06:36:13 2019 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-lang_cl_mkerrcodes.awk,v 1.1 2019/10/08 06:36:13 triaxx Exp $
+
+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 (/^$/)
diff -r fe41e73d6adf -r bcd4b4a2eddf security/libgpg-error/patches/patch-src_Makefile.am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libgpg-error/patches/patch-src_Makefile.am Tue Oct 08 06:36:13 2019 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_Makefile.am,v 1.1 2019/10/08 06:36:13 triaxx Exp $
+
+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 >$@
+
+
diff -r fe41e73d6adf -r bcd4b4a2eddf security/libgpg-error/patches/patch-src_Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libgpg-error/patches/patch-src_Makefile.in Tue Oct 08 06:36:13 2019 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2019/10/08 06:36:13 triaxx Exp $
+
+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
diff -r fe41e73d6adf -r bcd4b4a2eddf security/libgpg-error/patches/patch-src_mkerrcodes.awk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libgpg-error/patches/patch-src_mkerrcodes.awk Tue Oct 08 06:36:13 2019 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_mkerrcodes.awk,v 1.1 2019/10/08 06:36:13 triaxx Exp $
+
+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 (/^$/)
diff -r fe41e73d6adf -r bcd4b4a2eddf security/libgpg-error/patches/patch-src_mkerrcodes1.awk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libgpg-error/patches/patch-src_mkerrcodes1.awk Tue Oct 08 06:36:13 2019 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_mkerrcodes1.awk,v 1.1 2019/10/08 06:36:13 triaxx Exp $
+
+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 (/^$/)
diff -r fe41e73d6adf -r bcd4b4a2eddf security/libgpg-error/patches/patch-src_mkerrcodes2.awk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libgpg-error/patches/patch-src_mkerrcodes2.awk Tue Oct 08 06:36:13 2019 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_mkerrcodes2.awk,v 1.1 2019/10/08 06:36:13 triaxx Exp $
+
+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 (/^$/)
diff -r fe41e73d6adf -r bcd4b4a2eddf security/libgpg-error/patches/patch-src_mkerrnos.awk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libgpg-error/patches/patch-src_mkerrnos.awk Tue Oct 08 06:36:13 2019 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_mkerrnos.awk,v 1.1 2019/10/08 06:36:13 triaxx Exp $
+
+Prepare for Gawk 5.0.
+Don't escape # in regexp.
+https://github.com/gpg/libgpg-error/commit/7865041
+
+--- 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 (/^$/)
diff -r fe41e73d6adf -r bcd4b4a2eddf security/libgpg-error/patches/patch-src_mkstrtable.awk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/libgpg-error/patches/patch-src_mkstrtable.awk Tue Oct 08 06:36:13 2019 +0000
@@ -0,0 +1,54 @@
+$NetBSD: patch-src_mkstrtable.awk,v 1.1 2019/10/08 06:36:13 triaxx Exp $
+
+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";
+
Home |
Main Index |
Thread Index |
Old Index