diff --git a/0001-fix-regexp-and-buildin-namespace-error-in-gawk.patch b/0001-fix-regexp-and-buildin-namespace-error-in-gawk.patch deleted file mode 100644 index c65b906127d43211a34caacb4de16dc92dec45de..0000000000000000000000000000000000000000 --- a/0001-fix-regexp-and-buildin-namespace-error-in-gawk.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 7e06ec1a1c263dd673bccdb3dfd766eac5145e74 Mon Sep 17 00:00:00 2001 -From: h00465007 -Date: Tue, 14 Jan 2020 23:44:16 +0800 -Subject: [PATCH] fix unknown regexp buildin namespace error in gawk - ---- - lang/cl/mkerrcodes.awk | 2 +- - src/Makefile.am | 2 +- - src/Makefile.in | 2 +- - src/mkerrcodes.awk | 2 +- - src/mkerrcodes1.awk | 2 +- - src/mkerrcodes2.awk | 2 +- - src/mkerrnos.awk | 2 +- - src/mkstrtable.awk | 10 +++++----- - 8 files changed, 12 insertions(+), 12 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/Makefile.in b/src/Makefile.in -index e893436..38cc93c 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -1615,7 +1615,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 >$@ - - mkheader$(EXEEXT_FOR_BUILD): mkheader.c Makefile -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"; - --- -1.8.3.1 - diff --git a/libgpg-error-1.29-multilib.patch b/libgpg-error-1.29-multilib.patch new file mode 100644 index 0000000000000000000000000000000000000000..b59178d8af0a227821bf4f852d00dcd200be350b --- /dev/null +++ b/libgpg-error-1.29-multilib.patch @@ -0,0 +1,122 @@ +diff -up libgpg-error-1.29/configure.ac.multilib libgpg-error-1.29/configure.ac +--- libgpg-error-1.29/configure.ac.multilib 2018-04-11 14:41:10.479019981 +0200 ++++ libgpg-error-1.29/configure.ac 2018-04-11 14:43:31.288394113 +0200 +@@ -215,13 +215,13 @@ GNUPG_FUNC_MKDIR_TAKES_ONE_ARG + + + # Find a 64 bit integer type to be used instead of off_t. We prefer +-# the standard integer types over int64_t and finally try long long. +-if test "$ac_cv_sizeof_int" = "8"; then ++# int64_t and finally try long long. ++if test "$ac_cv_header_stdint_h" = yes; then ++ replacement_for_off_t="int64_t" ++elif test "$ac_cv_sizeof_int" = "8"; then + replacement_for_off_t="int" + elif test "$ac_cv_sizeof_long" = "8"; then + replacement_for_off_t="long" +-elif test "$ac_cv_header_stdint_h" = yes; then +- replacement_for_off_t="int64_t" + elif test "$ac_cv_sizeof_long_long" = "8"; then + replacement_for_off_t="long long" + else +diff -up libgpg-error-1.29/configure.multilib libgpg-error-1.29/configure +--- libgpg-error-1.29/configure.multilib 2018-04-11 09:34:30.000000000 +0200 ++++ libgpg-error-1.29/configure 2018-04-11 14:41:10.481020028 +0200 +@@ -11301,7 +11301,7 @@ shlibpath_var= + shlibpath_overrides_runpath=unknown + version_type=none + dynamic_linker="$host_os ld.so" +-sys_lib_dlsearch_path_spec="/lib /usr/lib" ++sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib64 /usr/lib64" + need_lib_prefix=unknown + hardcode_into_libs=no + +@@ -11775,7 +11775,7 @@ fi + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib64 /usr/lib64 $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -15879,12 +15879,12 @@ fi + + # Find a 64 bit integer type to be used instead of off_t. We prefer + # the standard integer types over int64_t and finally try long long. +-if test "$ac_cv_sizeof_int" = "8"; then ++if test "$ac_cv_header_stdint_h" = yes; then ++ replacement_for_off_t="int64_t" ++elif test "$ac_cv_sizeof_int" = "8"; then + replacement_for_off_t="int" + elif test "$ac_cv_sizeof_long" = "8"; then + replacement_for_off_t="long" +-elif test "$ac_cv_header_stdint_h" = yes; then +- replacement_for_off_t="int64_t" + elif test "$ac_cv_sizeof_long_long" = "8"; then + replacement_for_off_t="long long" + else +diff -up libgpg-error-1.29/src/gen-posix-lock-obj.c.multilib libgpg-error-1.29/src/gen-posix-lock-obj.c +--- libgpg-error-1.29/src/gen-posix-lock-obj.c.multilib 2016-11-16 13:22:03.000000000 +0100 ++++ libgpg-error-1.29/src/gen-posix-lock-obj.c 2018-04-11 14:41:10.481020028 +0200 +@@ -72,6 +72,7 @@ main (void) + #ifdef USE_POSIX_THREADS + unsigned char *p; + int i; ++ int initidx = 0; + #endif + struct { + long vers; +@@ -111,11 +112,12 @@ main (void) + + /* To force a probably suitable alignment of the structure we use a + union and include a long and a pointer to a long. */ +- printf ("typedef struct\n" ++ printf ("#include \n" ++ "typedef struct\n" + "{\n" + " long _vers;\n" + " union {\n" +- " volatile char _priv[%d];\n" ++ " volatile char _priv[sizeof(pthread_mutex_t)];\n" + "%s" + " long _x_align;\n" + " long *_xp_align;\n" +@@ -123,7 +125,6 @@ main (void) + "} gpgrt_lock_t;\n" + "\n" + "#define GPGRT_LOCK_INITIALIZER {%d,{{", +- SIZEOF_PTHREAD_MUTEX_T, + # if USE_16BYTE_ALIGNMENT + " int _x16_align __attribute__ ((aligned (16)));\n", + # elif USE_DOUBLE_FOR_ALIGNMENT +@@ -137,10 +138,16 @@ main (void) + p = (unsigned char *)&mtx; + for (i=0; i < sizeof mtx; i++) + { ++ if (p[i] != 0) ++ initidx = i; ++ } ++ ++ for (i=0; i <= initidx; i++) ++ { + if (i && !(i % 8)) + printf (" \\\n%*s", 36, ""); + printf ("%u", p[i]); +- if (i < sizeof mtx - 1) ++ if (i < initidx) + putchar (','); + } + fputs ("}}}\n", stdout); +diff -up libgpg-error-1.29/src/gpg-error.h.in.multilib libgpg-error-1.29/src/gpg-error.h.in +--- libgpg-error-1.29/src/gpg-error.h.in.multilib 2018-04-11 14:41:10.481020028 +0200 ++++ libgpg-error-1.29/src/gpg-error.h.in 2018-04-11 14:45:28.184203566 +0200 +@@ -17,7 +17,7 @@ + * License along with this program; if not, see . + * SPDX-License-Identifier: LGPL-2.1+ + * +- * @configure_input@ ++ * Do not edit. Generated from gpg-error.h.in. + */ + + /* The GnuPG project consists of many components. Error codes are diff --git a/libgpg-error-1.35.tar.gz b/libgpg-error-1.35.tar.gz deleted file mode 100644 index 99a6a0f055ac01874170263e9ddb5d355a1e0f93..0000000000000000000000000000000000000000 Binary files a/libgpg-error-1.35.tar.gz and /dev/null differ diff --git a/libgpg-error-1.35.tar.gz.sig b/libgpg-error-1.35.tar.gz.sig deleted file mode 100644 index ec9933d8b3a31b45f9c7dc2b6a1de29edd0d3dd4..0000000000000000000000000000000000000000 Binary files a/libgpg-error-1.35.tar.gz.sig and /dev/null differ diff --git a/libgpg-error-1.37.tar.gz b/libgpg-error-1.37.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..23a2a1a9e45ef9b72e3f7e463dc7ea5f4fa131c1 Binary files /dev/null and b/libgpg-error-1.37.tar.gz differ diff --git a/libgpg-error-1.37.tar.gz.sig b/libgpg-error-1.37.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000..52de5e51a90e0f9cf48892d1720e73040b3eb1f8 Binary files /dev/null and b/libgpg-error-1.37.tar.gz.sig differ diff --git a/libgpg-error.spec b/libgpg-error.spec index 5b3bf57f58f6aa28c175dadd95c9b32f33e950f5..d6bfa9de635e043ca1ef4ec680234374d1519e60 100644 --- a/libgpg-error.spec +++ b/libgpg-error.spec @@ -1,15 +1,15 @@ Name: libgpg-error -Version: 1.35 -Release: 3 +Version: 1.37 +Release: 1 Summary: Library for common error values and messages in GnuPG components. License: LGPLv2+ URL: https://www.gnupg.org/ftp/gcrypt/libgpg-error Source0: https://www.gnupg.org/ftp/gcrypt/libgpg-error/%{name}-%{version}.tar.gz -Source1: https://www.gnupg.org/ftp/gcrypt/libgpg-error/%{name}-%{version}.tar.gz.sig +Source1: https://www.gnupg.org/ftp/gcrypt/libgpg-error/%{name}-%{version}.tar.gz.sig -Patch0: 0001-fix-regexp-and-buildin-namespace-error-in-gawk.patch +Patch6000: libgpg-error-1.29-multilib.patch -BuildRequires: gawk, gettext, autoconf, automake, gettext-devel, libtool, texinfo, gettext-autopoint +BuildRequires: gcc gawk, gettext, autoconf, automake, gettext-devel, libtool, texinfo, gettext-autopoint hostname %description The libgpg-error package contains a library that originally defines common error values for all GnuPG components. @@ -17,10 +17,8 @@ Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, Libksba, DirMngr, Pinen Because Libgpg-error is a common dependency all GnuPG components, more features will be added to this library. %package devel -Summary:Development files for libgpg-error -Requires:%{name}%{?_isa} = %{version}-%{release} -Requires(pre): /sbin/install-info -Requires(post): /sbin/install-info +Summary: Development files for libgpg-error +Requires: %{name} = %{version}-%{release} pkgconfig %description devel Contains header files and development libraries for libgpg-error. @@ -30,7 +28,10 @@ Contains header files and development libraries for libgpg-error. %prep %autosetup -n %{name}-%{version} -p1 +autoreconf -f + sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g;s|@GPG_ERROR_CONFIG_HOST@|none|g' src/gpg-error-config.in +sed -i -e '/--variable=host/d' src/gpg-error-config-test.sh.in sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/lib /usr/lib %{_libdir}|g' configure %build @@ -39,14 +40,14 @@ sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spe %install %make_install +%delete_la %find_lang %{name} %check make check -%ldconfig_post -%ldconfig_postun +%ldconfig_scriptlets %post devel [ -f %{_infodir}/gpgrt.info.gz ] && /sbin/install-info %{_infodir}/gpgrt.info.gz %{_infodir}/dir @@ -60,7 +61,6 @@ exit 0 %files -f %{name}.lang %defattr(-,root,root) -%{!?_licensedir:%global license %%doc} %license COPYING COPYING.LIB %doc AUTHORS README NEWS ChangeLog %{_bindir}/gpg-error @@ -77,13 +77,18 @@ exit 0 %{_infodir}/gpgrt.info* %exclude %{_bindir}/gpg-error %exclude %{_infodir}/dir -%exclude %{_libdir}/*.la %files help %defattr(-,root,root) %{_mandir}/* %changelog +* Wed Apr 15 2020 songnannan - 1.37-1 +- Type:bugfix +- Id:NA +- SUG:NA +- update to 1.37 + * Tue Jan 14 2020 openEuler Buildteam - 1.35-3 - Type:bugfix - Id:NA