rpms/libgpg-error
7
0
Fork 0
Code Issues Pull Requests Releases Activity

new upstream release 1.29

Browse Source
This commit is contained in:
Tomas Mraz 2018-04-11 14:53:55 +02:00
parent 04720e89d7
commit 7bf0b8635e
5 changed files with 33 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -24,3 +24,5 @@ libgpg-error-1.9.tar.bz2.sig
/libgpg-error-1.25.tar.bz2.sig /libgpg-error-1.25.tar.bz2.sig
/libgpg-error-1.27.tar.bz2 /libgpg-error-1.27.tar.bz2
/libgpg-error-1.27.tar.bz2.sig /libgpg-error-1.27.tar.bz2.sig
/libgpg-error-1.29.tar.bz2
/libgpg-error-1.29.tar.bz2.sig

40
libgpg-error-1.25-multilib.patch → libgpg-error-1.29-multilib.patch
View File

@ -1,8 +1,8 @@
diff -up libgpg-error-1.25/configure.ac.multilib libgpg-error-1.25/configure.ac diff -up libgpg-error-1.29/configure.ac.multilib libgpg-error-1.29/configure.ac
--- libgpg-error-1.25/configure.ac.multilib 2016-11-15 16:37:13.070082441 +0100 --- libgpg-error-1.29/configure.ac.multilib 2018-04-11 14:41:10.479019981 +0200
+++ libgpg-error-1.25/configure.ac 2016-11-15 16:39:17.132910290 +0100 +++ libgpg-error-1.29/configure.ac 2018-04-11 14:43:31.288394113 +0200
@@ -200,13 +200,13 @@ AC_CHECK_SIZEOF(time_t,,[[ @@ -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 # 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. -# the standard integer types over int64_t and finally try long long.
@ -19,10 +19,10 @@ diff -up libgpg-error-1.25/configure.ac.multilib libgpg-error-1.25/configure.ac
elif test "$ac_cv_sizeof_long_long" = "8"; then elif test "$ac_cv_sizeof_long_long" = "8"; then
replacement_for_off_t="long long" replacement_for_off_t="long long"
else else
diff -up libgpg-error-1.25/configure.multilib libgpg-error-1.25/configure diff -up libgpg-error-1.29/configure.multilib libgpg-error-1.29/configure
--- libgpg-error-1.25/configure.multilib 2016-11-14 17:21:50.000000000 +0100 --- libgpg-error-1.29/configure.multilib 2018-04-11 09:34:30.000000000 +0200
+++ libgpg-error-1.25/configure 2016-11-15 16:37:13.072082487 +0100 +++ libgpg-error-1.29/configure 2018-04-11 14:41:10.481020028 +0200
@@ -11280,7 +11280,7 @@ shlibpath_var= @@ -11301,7 +11301,7 @@ shlibpath_var=
shlibpath_overrides_runpath=unknown shlibpath_overrides_runpath=unknown
version_type=none version_type=none
dynamic_linker="$host_os ld.so" dynamic_linker="$host_os ld.so"
@ -31,7 +31,7 @@ diff -up libgpg-error-1.25/configure.multilib libgpg-error-1.25/configure
need_lib_prefix=unknown need_lib_prefix=unknown
hardcode_into_libs=no hardcode_into_libs=no
@@ -11754,7 +11754,7 @@ fi @@ -11775,7 +11775,7 @@ fi
# Append ld.so.conf contents to the search path # Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then 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' ' '` 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' ' '`
@ -40,7 +40,7 @@ diff -up libgpg-error-1.25/configure.multilib libgpg-error-1.25/configure
fi fi
# We used to test for /lib/ld.so.1 and disable shared libraries on # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15526,12 +15526,12 @@ _ACEOF @@ -15879,12 +15879,12 @@ fi
# Find a 64 bit integer type to be used instead of off_t. We prefer # 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. # the standard integer types over int64_t and finally try long long.
@ -56,9 +56,9 @@ diff -up libgpg-error-1.25/configure.multilib libgpg-error-1.25/configure
elif test "$ac_cv_sizeof_long_long" = "8"; then elif test "$ac_cv_sizeof_long_long" = "8"; then
replacement_for_off_t="long long" replacement_for_off_t="long long"
else else
diff -up libgpg-error-1.25/src/gen-posix-lock-obj.c.multilib libgpg-error-1.25/src/gen-posix-lock-obj.c 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.25/src/gen-posix-lock-obj.c.multilib 2016-11-12 20:02:56.000000000 +0100 --- libgpg-error-1.29/src/gen-posix-lock-obj.c.multilib 2016-11-16 13:22:03.000000000 +0100
+++ libgpg-error-1.25/src/gen-posix-lock-obj.c 2016-11-15 16:37:13.072082487 +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) @@ -72,6 +72,7 @@ main (void)
#ifdef USE_POSIX_THREADS #ifdef USE_POSIX_THREADS
unsigned char *p; unsigned char *p;
@ -108,15 +108,15 @@ diff -up libgpg-error-1.25/src/gen-posix-lock-obj.c.multilib libgpg-error-1.25/s
putchar (','); putchar (',');
} }
fputs ("}}}\n", stdout); fputs ("}}}\n", stdout);
diff -up libgpg-error-1.25/src/gpg-error.h.in.multilib libgpg-error-1.25/src/gpg-error.h.in diff -up libgpg-error-1.29/src/gpg-error.h.in.multilib libgpg-error-1.29/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.29/src/gpg-error.h.in.multilib 2018-04-11 14:41:10.481020028 +0200
+++ libgpg-error-1.25/src/gpg-error.h.in 2016-11-15 16:37:13.073082510 +0100 +++ libgpg-error-1.29/src/gpg-error.h.in 2018-04-11 14:45:28.184203566 +0200
@@ -16,7 +16,7 @@ @@ -17,7 +17,7 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see <https://www.gnu.org/licenses/>. * License along with this program; if not, see <https://www.gnu.org/licenses/>.
* SPDX-License-Identifier: LGPL-2.1+
* *
- * @configure_input@ - * @configure_input@
+ * Do not edit. Generated from gpg-error.h.in. + * Do not edit. Generated from gpg-error.h.in.
*/ */
#ifndef GPG_ERROR_H /* The GnuPG project consists of many components. Error codes are

59
libgpg-error.git-596c0d701edeb45e0069bb74b9343e3d5b708ef0.patch
View File

@ -1,59 +0,0 @@
From: NIIBE Yutaka <gniibe@fsij.org>
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 <merker@debian.org>
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
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:
+##

15
libgpg-error.spec
View File

@ -1,13 +1,11 @@
Summary: Library for error values used by GnuPG components Summary: Library for error values used by GnuPG components
Name: libgpg-error Name: libgpg-error
Version: 1.27 Version: 1.29
Release: 6%{?dist} Release: 1%{?dist}
URL: https://www.gnupg.org/related_software/libgpg-error/ URL: https://www.gnupg.org/related_software/libgpg-error/
Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2 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 Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig
Patch1: libgpg-error-1.25-multilib.patch Patch1: libgpg-error-1.29-multilib.patch
# Upstream commit 596c0d701, required by riscv64.
Patch2: libgpg-error.git-596c0d701edeb45e0069bb74b9343e3d5b708ef0.patch
Group: System Environment/Libraries Group: System Environment/Libraries
License: LGPLv2+ License: LGPLv2+
@ -38,7 +36,6 @@ contains files necessary to develop applications using libgpg-error.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .multilib %patch1 -p1 -b .multilib
%patch2 -p1 -b .riscv64
# The config script already suppresses the -L if it's /usr/lib, so cheat and # 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. # 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 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 %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/gpg-error-config %{_bindir}/gpg-error-config
%{_bindir}/gpgrt-config
%{_bindir}/yat2m
%{_libdir}/libgpg-error.so %{_libdir}/libgpg-error.so
%{_includedir}/gpg-error.h %{_includedir}/gpg-error.h
%{_includedir}/gpgrt.h %{_includedir}/gpgrt.h
%{_datadir}/aclocal/gpg-error.m4 %{_datadir}/aclocal/gpg-error.m4
%{_datadir}/aclocal/gpgrt.m4
%{_infodir}/gpgrt.info* %{_infodir}/gpgrt.info*
%{_mandir}/man1/gpg-error-config.* %{_mandir}/man1/gpg-error-config.*
%changelog %changelog
* Wed Apr 11 2018 Tomáš Mráz <tmraz@redhat.com> 1.29-1
- new upstream release 1.29
* Wed Feb 28 2018 Richard W.M. Jones <rjones@redhat.com> - 1.27-6 * Wed Feb 28 2018 Richard W.M. Jones <rjones@redhat.com> - 1.27-6
- Backport patch which adds riscv64 support. - Backport patch which adds riscv64 support.

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (libgpg-error-1.27.tar.bz2) = 51b313c1159074fdbbce84f63bd8afd84b3b58cd608714865b25bed84c1862d050708aa06ac3dab92f1906593df5121161e594c2809653b0fb2c236cae5dcc2f SHA512 (libgpg-error-1.29.tar.bz2) = 57b95a7ed0ed808f05a75d7ee700ed0317da06fde1f8c59f5a4f049d784c4598f3c693068ddd47cd8bb0efdb43b9b628b876d34211f8a3e67d5088110a15323b
SHA512 (libgpg-error-1.27.tar.bz2.sig) = ca9a8daf97b6f0da1560c77412dd2847962b19ac889d6ac55af9c70a9cbafabd84c36357b55345cd0da7738cd8e07c037634f3812a4770437d54ca5fa519a8f6 SHA512 (libgpg-error-1.29.tar.bz2.sig) = 712b8990387634ba968c263c93f988ee33fdc565effa18cfea150e8dd1a07f4ca564b5cee462e5f1617c1d4493a98c3a2c8b258c6027343a563dfe82a90a1def