From b8eaee73bf4f30e3bf05549d6cf3435915dc226c Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Mon, 27 Aug 2018 17:34:02 +0200 Subject: [PATCH] Update to libgpg-error 1.31 This syncs the package with the native version currently used in rawhide --- libgpg-error-1.29-multilib.patch | 122 +++++++++++++++++++++++++++++++ mingw-libgpg-error.spec | 20 ++++- sources | 3 +- 3 files changed, 141 insertions(+), 4 deletions(-) create mode 100644 libgpg-error-1.29-multilib.patch 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/mingw-libgpg-error.spec b/mingw-libgpg-error.spec index f9e850e..c47ee5f 100644 --- a/mingw-libgpg-error.spec +++ b/mingw-libgpg-error.spec @@ -1,8 +1,8 @@ %?mingw_package_header Name: mingw-libgpg-error -Version: 1.22 -Release: 5%{?dist} +Version: 1.31 +Release: 1%{?dist} Summary: MinGW Windows GnuPGP error library License: LGPLv2+ @@ -10,7 +10,7 @@ Group: Development/Libraries URL: ftp://ftp.gnupg.org/gcrypt/libgpg-error/ Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-%{version}.tar.bz2 Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-%{version}.tar.bz2.sig -Source2: wk@g10code.com +Patch1: libgpg-error-1.29-multilib.patch BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 @@ -67,6 +67,7 @@ Static library for mingw64-libgpg-error development. %prep %setup -q -n libgpg-error-%{version} +%patch1 -p1 -b .multilib # Upstream has applied a libtool hack in libgpg-error 1.12 # which automatically gives the libgpg-error library a @@ -100,30 +101,43 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_infodir} $RPM_BUILD_ROOT%{mingw64_mandir} %files -n mingw32-libgpg-error -f mingw32-libgpg-error.lang %{mingw32_bindir}/gpg-error-config +%{mingw32_bindir}/gpgrt-config %{mingw32_bindir}/gpg-error.exe +%{mingw32_bindir}/yat2m.exe %{mingw32_bindir}/libgpg-error-0.dll %{mingw32_libdir}/libgpg-error.dll.a %{mingw32_includedir}/gpg-error.h +%{mingw32_includedir}/gpgrt.h %{mingw32_datadir}/aclocal/gpg-error.m4 +%{mingw32_datadir}/aclocal/gpgrt.m4 %{mingw32_datadir}/common-lisp/source/gpg-error/* +%{mingw32_datadir}/libgpg-error %files -n mingw32-libgpg-error-static %{mingw32_libdir}/libgpg-error.a %files -n mingw64-libgpg-error -f mingw64-libgpg-error.lang %{mingw64_bindir}/gpg-error-config +%{mingw64_bindir}/gpgrt-config %{mingw64_bindir}/gpg-error.exe +%{mingw64_bindir}/yat2m.exe %{mingw64_bindir}/libgpg-error-0.dll %{mingw64_libdir}/libgpg-error.dll.a %{mingw64_includedir}/gpg-error.h +%{mingw64_includedir}/gpgrt.h %{mingw64_datadir}/aclocal/gpg-error.m4 +%{mingw64_datadir}/aclocal/gpgrt.m4 %{mingw64_datadir}/common-lisp/source/gpg-error/* +%{mingw64_datadir}/libgpg-error %files -n mingw64-libgpg-error-static %{mingw64_libdir}/libgpg-error.a %changelog +* Mon Aug 27 2018 Christophe Fergeau - 1.31-1 +- Update to 1.31 + * Fri Jul 13 2018 Fedora Release Engineering - 1.22-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index debc8c3..2b019c1 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -83c686abe3fa223ec89f3b51da830770 libgpg-error-1.22.tar.bz2 +SHA512 (libgpg-error-1.31.tar.bz2) = 23983470be51035b2bc0cdbfa20f0915aec92c53c964c645eac51ba4e992b8436bd3a21f0b48d77d7c4ef178d2aacaf57ab33c7fad24b4f96f4ffb1d7116e67f +SHA512 (libgpg-error-1.31.tar.bz2.sig) = cb6ddf30650fc100ed4ec191b80aa94ef063a520d4e4bb3f5415e46d8ec1f648108cf6209b487e8cff51b763f547cbf5330f57e3920df453487c97e425d690d9