From 415d51e4feef933e34fbd8d70b15ead4c12ed5aa5feee20d329d288a93abb2b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 11 Apr 2018 09:42:08 +0000 Subject: [PATCH] Accepting request 595546 from home:kbabioch:branches:Base:System - Cleaned up spec file with spec-cleaner - Update to 1.29: * The yat2m tool is during cross-compile now also installed on the host platform. * New option parser and associated functions similar to the one used by GnuPG. * New Base-64 encoder. * Fixes regression in 1.28 for arm64 and w64 builds. - Dropped fix_aarch64.patch (included upstream now) OBS-URL: https://build.opensuse.org/request/show/595546 OBS-URL: https://build.opensuse.org/package/show/Base:System/libgpg-error?expand=0&rev=63 --- fix_aarch64.patch | 53 ---------------------------------- libgpg-error-1.28.tar.bz2 | 3 -- libgpg-error-1.28.tar.bz2.sig | Bin 310 -> 0 bytes libgpg-error-1.29.tar.bz2 | 3 ++ libgpg-error-1.29.tar.bz2.sig | Bin 0 -> 310 bytes libgpg-error.changes | 17 +++++++++++ libgpg-error.spec | 10 ++----- 7 files changed, 22 insertions(+), 64 deletions(-) delete mode 100644 fix_aarch64.patch delete mode 100644 libgpg-error-1.28.tar.bz2 delete mode 100644 libgpg-error-1.28.tar.bz2.sig create mode 100644 libgpg-error-1.29.tar.bz2 create mode 100644 libgpg-error-1.29.tar.bz2.sig diff --git a/fix_aarch64.patch b/fix_aarch64.patch deleted file mode 100644 index f8ed2a8..0000000 --- a/fix_aarch64.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 791177de023574223eddf7288eb7c5a0721ac623 Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Sun, 18 Mar 2018 17:39:43 +0100 -Subject: [PATCH] core: Fix regression on arm64 due to invalid use of va_list. - -* src/logging.c (_gpgrt_log_printhex): Provide a dummy arg instead of -NULL. --- - -Fix -Suggested-by: Jakub Wilk - -Signed-off-by: Werner Koch ---- - src/logging.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/src/logging.c b/src/logging.c -index 1a4f620..d01f974 100644 ---- a/src/logging.c -+++ b/src/logging.c -@@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void) - - - /* Print a hexdump of (BUFFER,LENGTH). With FMT passed as NULL print -- * just the raw dump, with FMT being an empty string, print a trailing -- * linefeed, otherwise print an entire debug line with the expanded -- * FMT followed by a possible wrapped hexdump and a final LF. */ -+ * just the raw dump (in this case ARG_PTR is not used), with FMT -+ * being an empty string, print a trailing linefeed, otherwise print -+ * an entire debug line with the expanded FMT followed by a possible -+ * wrapped hexdump and a final LF. */ - void - _gpgrt_logv_printhex (const void *buffer, size_t length, - const char *fmt, va_list arg_ptr) -@@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length, - va_end (arg_ptr); - } - else -- _gpgrt_logv_printhex (buffer, length, NULL, NULL); -+ { -+ /* va_list is not necessary a pointer and thus we can't use NULL -+ * because that would conflict with platforms using a straight -+ * struct for it (e.g. arm64). We use a dummy variable instead; -+ * the static is a simple way zero it out so to not get -+ * complains about uninitialized use. */ -+ static va_list dummy_argptr; -+ -+ _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr); -+ } - } - - diff --git a/libgpg-error-1.28.tar.bz2 b/libgpg-error-1.28.tar.bz2 deleted file mode 100644 index d1d87f2..0000000 --- a/libgpg-error-1.28.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3edb957744905412f30de3e25da18682cbe509541e18cd3b8f9df695a075da49 -size 862569 diff --git a/libgpg-error-1.28.tar.bz2.sig b/libgpg-error-1.28.tar.bz2.sig deleted file mode 100644 index 49fd196d6fe5985c3c401a3574c26278d1d0bbbcce53e7c18e333c5d09e58f80..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j-KX(1!T23_i24?49Zn>o@?CF8aQ0$QiP695Vc5G0#9 z(oZGhwwB5W0E^zjj4{b$4>Fsku!l z?#oZ(`~bOxyJu%=nK5rSG#>8_RsaBOWGt=HMl$7Rb8dT-V({9MnLNm7BIO&PA2p=( z23$PD47b|^rZHx=Rd`+|UDbUAtTcH8fRp+<#04I=A2P6OUMmtUT?}VgVdvIJF6nx5 zjE2VRjL9Ud6^|1Fo3I_(E%D#|o-2Vdm^qrqA65`gDUbQR>Wq$zQpsrbu>RyW7tSc} znjsS{{wG%OYe%MxNFk<9pfHau%<~@rIAN@g2P%#r6(%_lGw|d=G1!dWIzxcG*v_*R Io@?CF8aQ0$RK^GM%0 zAD{UbB!%(Vt}G3sWOKgyz0hlX`?O?I@RlK=;Ot#bwDszfhvOdD<%FoZdLKPd`Gz+w zX7|nR%~-F?s0Zx}zD$yY&`;D;TL(U>@|X&6Y@(pS{-P=|joH0CmwSW9`gv(%hNro4 z-9oLcOeDuhlmq~i>=rZGriDG1mRMGpd=SLvb?5t4!A8(BN8)Y%{(i4%vq?Tk{_rE{ z`-)`6EFz=Fp}?l98q)&F=LJ|Ut&wnePTOo62!eX&`FiCR$^wP$k0809%O!^nKJ`_4 IPWBy&>zp*1w*UYD literal 0 HcmV?d00001 diff --git a/libgpg-error.changes b/libgpg-error.changes index 46f369a..7fbc153 100644 --- a/libgpg-error.changes +++ b/libgpg-error.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Apr 11 08:51:39 UTC 2018 - kbabioch@suse.com + +- Cleaned up spec file with spec-cleaner + +------------------------------------------------------------------- +Wed Apr 11 08:48:50 UTC 2018 - kbabioch@suse.com + +- Update to 1.29: + * The yat2m tool is during cross-compile now also installed on the + host platform. + * New option parser and associated functions similar to the one used + by GnuPG. + * New Base-64 encoder. + * Fixes regression in 1.28 for arm64 and w64 builds. +- Dropped fix_aarch64.patch (included upstream now) + ------------------------------------------------------------------- Thu Mar 22 10:15:51 UTC 2018 - guillaume.gardet@opensuse.org diff --git a/libgpg-error.spec b/libgpg-error.spec index 94e2c69..07710b4 100644 --- a/libgpg-error.spec +++ b/libgpg-error.spec @@ -17,7 +17,7 @@ Name: libgpg-error -Version: 1.28 +Version: 1.29 Release: 0 Summary: Library That Defines Common Error Values for All GnuPG Components License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -28,9 +28,6 @@ Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.b # http://www.gnupg.org/signature_key.en.html Source2: %{name}.keyring Source3: baselibs.conf -# FIX-UPSTREAM: https://github.com/gpg/libgpg-error/commit/791177de023574223eddf7288eb7c5a0721ac623 -Patch0: fix_aarch64.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This is a library that defines common error values for all GnuPG @@ -65,7 +62,6 @@ Files needed for software development using libgpg-error. %prep %setup -q -n libgpg-error-%{version} -%patch0 -p1 %build %configure \ @@ -74,7 +70,7 @@ Files needed for software development using libgpg-error. make %{?_smp_mflags} %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install rm %{buildroot}%{_libdir}/libgpg-error.la # Drop the lisp stuff, it depends on ASDF and CFFI # which needs to be packaged first @@ -95,11 +91,9 @@ make check %{?_smp_mflags} %install_info_delete --info-dir=%{_infodir} %{_infodir}/gpgrt.info.gz %files -n libgpg-error0 -f %{name}.lang -%defattr(-,root,root) %{_libdir}/libgpg-error*.so.* %files devel -%defattr(-,root,root) %doc README NEWS ChangeLog COPYING.LIB COPYING AUTHORS ABOUT-NLS %{_datadir}/aclocal/gpg-error.m4 %{_datadir}/aclocal/gpgrt.m4