tmraz pushed to libgpg-error (master). "new upstream release"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 13 15:22:35 UTC 2015
>From aec7790a2d8641ad2d31828fba3c3226ff352ad4 Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tmraz at fedoraproject.org>
Date: Mon, 13 Apr 2015 17:22:25 +0200
Subject: new upstream release
diff --git a/.gitignore b/.gitignore
index 7986276..6c1cfd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ libgpg-error-1.9.tar.bz2.sig
/libgpg-error-1.16.tar.bz2.sig
/libgpg-error-1.17.tar.bz2
/libgpg-error-1.17.tar.bz2.sig
+/libgpg-error-1.19.tar.bz2
+/libgpg-error-1.19.tar.bz2.sig
diff --git a/libgpg-error-1.17-no-buildhost.patch b/libgpg-error-1.17-no-buildhost.patch
deleted file mode 100644
index 12fd8b7..0000000
--- a/libgpg-error-1.17-no-buildhost.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up libgpg-error-1.17/src/gpg-error.h.in.no-buildhost libgpg-error-1.17/src/gpg-error.h.in
---- libgpg-error-1.17/src/gpg-error.h.in.no-buildhost 2014-10-03 08:14:00.000000000 +0200
-+++ libgpg-error-1.17/src/gpg-error.h.in 2015-01-30 16:30:38.345980993 +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 <http://www.gnu.org/licenses/>.
-
-- @configure_input@
-+ Do not edit. Generated from gpg-error.h.in.
- */
-
-
diff --git a/libgpg-error-1.19-multilib.patch b/libgpg-error-1.19-multilib.patch
new file mode 100644
index 0000000..381629f
--- /dev/null
+++ b/libgpg-error-1.19-multilib.patch
@@ -0,0 +1,121 @@
+diff -up libgpg-error-1.19/configure.ac.multilib libgpg-error-1.19/configure.ac
+--- libgpg-error-1.19/configure.ac.multilib 2015-04-10 18:59:23.000000000 +0200
++++ libgpg-error-1.19/configure.ac 2015-04-13 17:19:13.494395238 +0200
+@@ -186,13 +186,13 @@ AC_CHECK_SIZEOF(long)
+ AC_CHECK_SIZEOF(long long)
+
+ # 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.19/configure.multilib libgpg-error-1.19/configure
+--- libgpg-error-1.19/configure.multilib 2015-04-10 19:02:22.000000000 +0200
++++ libgpg-error-1.19/configure 2015-04-13 17:19:13.534396167 +0200
+@@ -11275,7 +11275,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
+
+@@ -11749,7 +11749,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
+@@ -15440,12 +15440,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.19/src/gen-posix-lock-obj.c.multilib libgpg-error-1.19/src/gen-posix-lock-obj.c
+--- libgpg-error-1.19/src/gen-posix-lock-obj.c.multilib 2014-08-05 19:29:48.000000000 +0200
++++ libgpg-error-1.19/src/gen-posix-lock-obj.c 2015-04-13 17:19:13.496395284 +0200
+@@ -61,6 +61,7 @@ main (void)
+ {
+ unsigned char *p;
+ int i;
++ int initidx = 0;
+ struct {
+ pthread_mutex_t mtx;
+ long vers;
+@@ -84,11 +85,12 @@ main (void)
+ "## File created by " PGM " - DO NOT EDIT\n"
+ "## To be included by mkheader into gpg-error.h\n"
+ "\n"
++ "#include <pthread.h>\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"
+@@ -97,7 +99,6 @@ main (void)
+ "\n"
+ "#define GPGRT_LOCK_INITIALIZER {%d,{{",
+ HOST_TRIPLET_STRING,
+- SIZEOF_PTHREAD_MUTEX_T,
+ #if USE_16BYTE_ALIGNMENT
+ " int _x16_align __attribute__ ((aligned (16)));\n",
+ #else
+@@ -107,10 +108,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"
+diff -up libgpg-error-1.19/src/gpg-error.h.in.multilib libgpg-error-1.19/src/gpg-error.h.in
+--- libgpg-error-1.19/src/gpg-error.h.in.multilib 2015-01-26 09:46:09.000000000 +0100
++++ libgpg-error-1.19/src/gpg-error.h.in 2015-04-13 17:19:13.496395284 +0200
+@@ -16,7 +16,7 @@
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+- @configure_input@
++ Do not edit. Generated from gpg-error.h.in.
+ */
+
+
diff --git a/libgpg-error.spec b/libgpg-error.spec
index e0c6cc6..8a3c9b9 100644
--- a/libgpg-error.spec
+++ b/libgpg-error.spec
@@ -1,11 +1,11 @@
Summary: Library for error values used by GnuPG components
Name: libgpg-error
-Version: 1.17
-Release: 3%{?dist}
+Version: 1.19
+Release: 1%{?dist}
URL: ftp://ftp.gnupg.org/gcrypt/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.17-no-buildhost.patch
+Patch1: libgpg-error-1.19-multilib.patch
Group: System Environment/Libraries
License: LGPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,7 +38,7 @@ contains files necessary to develop applications using libgpg-error.
%prep
%setup -q
-%patch1 -p1 -b .no-buildhost
+%patch1 -p1 -b .multilib
# 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
@@ -97,6 +97,9 @@ exit 0
%{_mandir}/man1/gpg-error-config.*
%changelog
+* Mon Apr 13 2015 Tomáš Mráz <tmraz at redhat.com> 1.19-1
+- new upstream release
+
* Sat Feb 21 2015 Till Maas <opensource at till.name> - 1.17-3
- Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
diff --git a/sources b/sources
index e37af2f..e18bb36 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b4f8d8b9ff14aed41f279aa844563539 libgpg-error-1.17.tar.bz2
-c73dc327cca7d993d268fd13680bce6b libgpg-error-1.17.tar.bz2.sig
+c04c16245b92829281f43b5bef7d16da libgpg-error-1.19.tar.bz2
+b4d45f66222545ca153e3a7eb62830ff libgpg-error-1.19.tar.bz2.sig
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/libgpg-error.git/commit/?h=master&id=aec7790a2d8641ad2d31828fba3c3226ff352ad4
More information about the scm-commits
mailing list