commit c7ccda44939de157e0ba1e4b12c871bc77a20c59 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Apr 20 13:25:06 2019 +1000 libgpg-error-32: 1.31 -> 1.36 diff --git a/libgpg-error-32/.footprint b/libgpg-error-32/.footprint index 11ce3d8..4dd1c7b 100644 --- a/libgpg-error-32/.footprint +++ b/libgpg-error-32/.footprint @@ -2,6 +2,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libgpg-error.a -rwxr-xr-x root/root usr/lib32/libgpg-error.la -lrwxrwxrwx root/root usr/lib32/libgpg-error.so -> libgpg-error.so.0.24.2 -lrwxrwxrwx root/root usr/lib32/libgpg-error.so.0 -> libgpg-error.so.0.24.2 --rwxr-xr-x root/root usr/lib32/libgpg-error.so.0.24.2 +lrwxrwxrwx root/root usr/lib32/libgpg-error.so -> libgpg-error.so.0.27.0 +lrwxrwxrwx root/root usr/lib32/libgpg-error.so.0 -> libgpg-error.so.0.27.0 +-rwxr-xr-x root/root usr/lib32/libgpg-error.so.0.27.0 +drwxr-xr-x root/root usr/lib32/pkgconfig/ +-rw-r--r-- root/root usr/lib32/pkgconfig/gpg-error.pc diff --git a/libgpg-error-32/.md5sum b/libgpg-error-32/.md5sum deleted file mode 100644 index de4d851..0000000 --- a/libgpg-error-32/.md5sum +++ /dev/null @@ -1 +0,0 @@ -5cc6df0fea27832e9cdbafc60f51561b libgpg-error-1.31.tar.bz2 diff --git a/libgpg-error-32/.signature b/libgpg-error-32/.signature index d84fe8a..8a305c2 100644 --- a/libgpg-error-32/.signature +++ b/libgpg-error-32/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXQ6ws8bHzsBPGY6dSEdnpSQT3nZo2jyjYdaLO9ucJgWIyvJFRYYgM2nOVJw+7Qxf49lTvP+c8lAZVEadRqUYrg8= -SHA256 (Pkgfile) = 7f3e5fc67f0ccdd26dd76de69d37ef4b86f28f42cf134d533960d8837b7ac093 -SHA256 (.footprint) = a639f60bf5ea07d3a9d2ab85bbd0ee9275f60c9abf2b75856860ce03a1b2ba7e -SHA256 (libgpg-error-1.31.tar.bz2) = 40d0a823c9329478063903192a1f82496083b277265904878f4bc09e0db7a4ef +RWSwxGo/zH7eXUx3qyGT+Rl0855il+db0KBnl3glgSsIxdZpt+c5f85h3iJXOOU1zj5ikjvGGF9eyXspY78+s7dIq6XLIzjySwM= +SHA256 (Pkgfile) = c5fbe8bb6dbe8c88cdaa718c016d9f851814b31a2839c2107a48195afeec6f24 +SHA256 (.footprint) = 72e3c8fde4aef4c57b1adddc1ffe5d05a9d595329a750469c267a3631a51134e +SHA256 (libgpg-error-1.36.tar.bz2) = babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c +SHA256 (gawk.patch) = f6030ebc1b14723b36adb4e5de80693c3875932b444bbb7baaa5e81779f05797 diff --git a/libgpg-error-32/Pkgfile b/libgpg-error-32/Pkgfile index e04e0a0..17f71c8 100644 --- a/libgpg-error-32/Pkgfile +++ b/libgpg-error-32/Pkgfile @@ -4,13 +4,18 @@ # Depends on: libgpg-error name=libgpg-error-32 -version=1.31 +version=1.36 release=1 -source=(https://www.gnupg.org/ftp/gcrypt/${name%-*}/${name%-*}-$version.tar.bz2) +source=(https://www.gnupg.org/ftp/gcrypt/${name%-*}/${name%-*}-$version.tar.bz2 + gawk.patch) build() { cd ${name%-*}-$version + patch -p1 -i $SRC/gawk.patch + + autoreconf + ./configure \ --prefix=/usr \ --libdir=/usr/lib32 \ diff --git a/libgpg-error-32/gawk.patch b/libgpg-error-32/gawk.patch new file mode 100644 index 0000000..715bffb --- /dev/null +++ b/libgpg-error-32/gawk.patch @@ -0,0 +1,158 @@ +From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka <gniibe@fsij.org> +Date: Mon, 15 Apr 2019 15:10:44 +0900 +Subject: [PATCH] awk: Prepare for Gawk 5.0. + +* src/Makefile.am: Use pkg_namespace (instead of namespace). +* src/mkerrnos.awk: Likewise. +* lang/cl/mkerrcodes.awk: Don't escape # in regexp. +* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto. + +-- + +In Gawk 5.0, regexp routines are replaced by Gnulib implementation, +which only allows escaping specific characters. + +GnuPG-bug-id: 4459 +Reported-by: Marius Schamschula +Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> +--- + lang/cl/mkerrcodes.awk | 2 +- + src/Makefile.am | 2 +- + src/mkerrcodes.awk | 2 +- + src/mkerrcodes1.awk | 2 +- + src/mkerrcodes2.awk | 2 +- + src/mkerrnos.awk | 2 +- + src/mkstrtable.awk | 10 +++++----- + 7 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk +index ae29043..9a1fc18 100644 +--- a/lang/cl/mkerrcodes.awk ++++ b/lang/cl/mkerrcodes.awk +@@ -122,7 +122,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/Makefile.am b/src/Makefile.am +index ce1b882..f2590cb 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile + + 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 --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk +index 46d436c..e9c857c 100644 +--- a/src/mkerrcodes.awk ++++ b/src/mkerrcodes.awk +@@ -85,7 +85,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk +index a771a73..4578e29 100644 +--- a/src/mkerrcodes1.awk ++++ b/src/mkerrcodes1.awk +@@ -81,7 +81,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk +index ea58503..188f7a4 100644 +--- a/src/mkerrcodes2.awk ++++ b/src/mkerrcodes2.awk +@@ -91,7 +91,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk +index f79df66..15b1aad 100644 +--- a/src/mkerrnos.awk ++++ b/src/mkerrnos.awk +@@ -83,7 +83,7 @@ header { + } + + !header { +- sub (/\#.+/, ""); ++ sub (/#.+/, ""); + sub (/[ ]+$/, ""); # Strip trailing space and tab characters. + + if (/^$/) +diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk +index c9de9c1..285e45f 100644 +--- a/src/mkstrtable.awk ++++ b/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"; + +-- +2.11.0 +