diff --git a/.gitignore b/.gitignore index 9720d9d..d053e9f 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ libgpg-error-1.9.tar.bz2.sig /libgpg-error-1.25.tar.bz2.sig /libgpg-error-1.27.tar.bz2 /libgpg-error-1.27.tar.bz2.sig +/libgpg-error-1.29.tar.bz2 +/libgpg-error-1.29.tar.bz2.sig diff --git a/libgpg-error-1.25-multilib.patch b/libgpg-error-1.25-multilib.patch deleted file mode 100644 index d512a1e..0000000 --- a/libgpg-error-1.25-multilib.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff -up libgpg-error-1.25/configure.ac.multilib libgpg-error-1.25/configure.ac ---- libgpg-error-1.25/configure.ac.multilib 2016-11-15 16:37:13.070082441 +0100 -+++ libgpg-error-1.25/configure.ac 2016-11-15 16:39:17.132910290 +0100 -@@ -200,13 +200,13 @@ AC_CHECK_SIZEOF(time_t,,[[ - ]]) - - # 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.25/configure.multilib libgpg-error-1.25/configure ---- libgpg-error-1.25/configure.multilib 2016-11-14 17:21:50.000000000 +0100 -+++ libgpg-error-1.25/configure 2016-11-15 16:37:13.072082487 +0100 -@@ -11280,7 +11280,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 - -@@ -11754,7 +11754,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 -@@ -15526,12 +15526,12 @@ _ACEOF - - # 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.25/src/gen-posix-lock-obj.c.multilib libgpg-error-1.25/src/gen-posix-lock-obj.c ---- libgpg-error-1.25/src/gen-posix-lock-obj.c.multilib 2016-11-12 20:02:56.000000000 +0100 -+++ libgpg-error-1.25/src/gen-posix-lock-obj.c 2016-11-15 16:37:13.072082487 +0100 -@@ -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.25/src/gpg-error.h.in.multilib libgpg-error-1.25/src/gpg-error.h.in ---- libgpg-error-1.25/src/gpg-error.h.in.multilib 2016-11-14 16:08:37.000000000 +0100 -+++ libgpg-error-1.25/src/gpg-error.h.in 2016-11-15 16:37:13.073082510 +0100 -@@ -16,7 +16,7 @@ - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see . - * -- * @configure_input@ -+ * Do not edit. Generated from gpg-error.h.in. - */ - - #ifndef GPG_ERROR_H diff --git a/libgpg-error-1.29-multilib.patch b/libgpg-error-1.29-multilib.patch new file mode 100644 index 0000000..b59178d --- /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.git-596c0d701edeb45e0069bb74b9343e3d5b708ef0.patch b/libgpg-error.git-596c0d701edeb45e0069bb74b9343e3d5b708ef0.patch deleted file mode 100644 index 180745b..0000000 --- a/libgpg-error.git-596c0d701edeb45e0069bb74b9343e3d5b708ef0.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: NIIBE Yutaka -Date: Wed, 28 Feb 2018 01:47:51 +0000 (+0900) -Subject: syscfg: Add a riscv64 architecture. -X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff_plain;h=596c0d701edeb45e0069bb74b9343e3d5b708ef0 - -syscfg: Add a riscv64 architecture. - -* src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h: New. -* src/Makefile.am (lock_obj_pub): Add it. --- - -Debian-bug-id: 891663 -Co-authored-by: Karsten Merker -Signed-off-by: NIIBE Yutaka ---- - -diff --git a/src/Makefile.am b/src/Makefile.am -index 4446612..268c2ab 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -65,6 +65,7 @@ lock_obj_pub = \ - syscfg/lock-obj-pub.powerpc64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \ -+ syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \ - syscfg/lock-obj-pub.sh3-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \ -diff --git a/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h -new file mode 100644 -index 0000000..8aab9d6 ---- /dev/null -+++ b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h -@@ -0,0 +1,25 @@ -+## lock-obj-pub.riscv64-unknown-linux-gnu.h -+## File created by gen-posix-lock-obj - DO NOT EDIT -+## To be included by mkheader into gpg-error.h -+ -+typedef struct -+{ -+ long _vers; -+ union { -+ volatile char _priv[40]; -+ long _x_align; -+ long *_xp_align; -+ } u; -+} gpgrt_lock_t; -+ -+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0}}} -+## -+## Local Variables: -+## mode: c -+## buffer-read-only: t -+## End: -+## diff --git a/libgpg-error.spec b/libgpg-error.spec index 5575552..1c381e6 100644 --- a/libgpg-error.spec +++ b/libgpg-error.spec @@ -1,13 +1,11 @@ Summary: Library for error values used by GnuPG components Name: libgpg-error -Version: 1.27 -Release: 6%{?dist} +Version: 1.29 +Release: 1%{?dist} URL: https://www.gnupg.org/related_software/libgpg-error/ Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2 Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig -Patch1: libgpg-error-1.25-multilib.patch -# Upstream commit 596c0d701, required by riscv64. -Patch2: libgpg-error.git-596c0d701edeb45e0069bb74b9343e3d5b708ef0.patch +Patch1: libgpg-error-1.29-multilib.patch Group: System Environment/Libraries License: LGPLv2+ @@ -38,7 +36,6 @@ contains files necessary to develop applications using libgpg-error. %prep %setup -q %patch1 -p1 -b .multilib -%patch2 -p1 -b .riscv64 # The config script already suppresses the -L if it's /usr/lib, so cheat and # set it to a value which we know will be suppressed. sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g;s|@GPG_ERROR_CONFIG_HOST@|none|g' src/gpg-error-config.in @@ -86,14 +83,20 @@ exit 0 %files devel %defattr(-,root,root) %{_bindir}/gpg-error-config +%{_bindir}/gpgrt-config +%{_bindir}/yat2m %{_libdir}/libgpg-error.so %{_includedir}/gpg-error.h %{_includedir}/gpgrt.h %{_datadir}/aclocal/gpg-error.m4 +%{_datadir}/aclocal/gpgrt.m4 %{_infodir}/gpgrt.info* %{_mandir}/man1/gpg-error-config.* %changelog +* Wed Apr 11 2018 Tomáš Mráz 1.29-1 +- new upstream release 1.29 + * Wed Feb 28 2018 Richard W.M. Jones - 1.27-6 - Backport patch which adds riscv64 support. diff --git a/sources b/sources index 35128ec..8dbaf5b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libgpg-error-1.27.tar.bz2) = 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f -SHA512 (libgpg-error-1.27.tar.bz2.sig) = ca9a8daf97b6f0da1560c77412dd2847962b19ac889d6ac55af9c70a9cbafabd84c36357b55345cd0da7738cd8e07c037634f3812a4770437d54ca5fa519a8f6 +SHA512 (libgpg-error-1.29.tar.bz2) = 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b +SHA512 (libgpg-error-1.29.tar.bz2.sig) = 712b8990387634ba968c263c93f988ee33fdc565effa18cfea150e8dd1a07f4ca564b5cee462e5f1617c1d4493a98c3a2c8b258c6027343a563dfe82a90a1def