From 02765e5e9995cfe4cbe4ad19df06f5142c2daafbe49bcc55b7e81e6175e1823d Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 13 Apr 2015 09:58:49 +0000
Subject: [PATCH] Accepting request 295345 from security:privacy

libgpg-error 1.19

OBS-URL: https://build.opensuse.org/request/show/295345
OBS-URL: https://build.opensuse.org/package/show/Base:System/libgpg-error?expand=0&rev=42
---
 libgpg-error-1.18-gcc5.patch  |  59 ----------------------------------
 libgpg-error-1.18.tar.bz2     |   3 --
 libgpg-error-1.18.tar.bz2.sig | Bin 287 -> 0 bytes
 libgpg-error-1.19.tar.bz2     |   3 ++
 libgpg-error-1.19.tar.bz2.sig | Bin 0 -> 287 bytes
 libgpg-error.changes          |  11 +++++++
 libgpg-error.spec             |   4 +--
 7 files changed, 15 insertions(+), 65 deletions(-)
 delete mode 100644 libgpg-error-1.18-gcc5.patch
 delete mode 100644 libgpg-error-1.18.tar.bz2
 delete mode 100644 libgpg-error-1.18.tar.bz2.sig
 create mode 100644 libgpg-error-1.19.tar.bz2
 create mode 100644 libgpg-error-1.19.tar.bz2.sig

diff --git a/libgpg-error-1.18-gcc5.patch b/libgpg-error-1.18-gcc5.patch
deleted file mode 100644
index cd32f1e..0000000
--- a/libgpg-error-1.18-gcc5.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am.orig	2014-10-25 14:42:43.000000000 +0200
-+++ src/Makefile.am	2015-02-19 10:22:03.273114977 +0100
-@@ -204,14 +204,14 @@ code-to-errno.h: Makefile mkerrnos.awk e
- # It is correct to use $(CPP).  We want the host's idea of the error codes.
- mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers)
- 	$(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
--	$(CPP) $(CPPFLAGS) $(extra_cppflags) _$@ | grep GPG_ERR_ | \
-+	$(CPP) -P $(CPPFLAGS) $(extra_cppflags) _$@ | grep GPG_ERR_ | \
-                $(AWK) -f $(srcdir)/mkerrcodes.awk >$@
- 	-rm _$@
- 
- if HAVE_W32CE_SYSTEM
- # It is correct to use $(CPP).  We want the host's idea of the error codes.
- mkw32errmap.tab.h: Makefile mkw32errmap.c
--	$(CPP) -DRESOLVE_MACROS $(srcdir)/mkw32errmap.c | \
-+	$(CPP) -P -DRESOLVE_MACROS $(srcdir)/mkw32errmap.c | \
- 	      grep '{&mkw32errmap_marker' >$@
- mkw32errmap.map.c: mkw32errmap
- 	./mkw32errmap --map > $@
-@@ -227,7 +227,7 @@ endif
- # the data is really to be preprocessed.
- gpg-error.def: Makefile gpg-error.def.in
- 	cat $(srcdir)/gpg-error.def.in >_$@.h
--	$(CPP) $(DEFAULT_INCLUDES) $(INCLUDES) $(extra_cppflags) _$@.h | \
-+	$(CPP) -P $(DEFAULT_INCLUDES) $(INCLUDES) $(extra_cppflags) _$@.h | \
- 	  grep -v '^#' >$@
- 	-rm _$@.h
- 
-Index: src/Makefile.in
-===================================================================
---- src/Makefile.in.orig	2015-01-26 10:34:10.000000000 +0100
-+++ src/Makefile.in	2015-02-19 10:22:42.318558424 +0100
-@@ -1227,13 +1227,13 @@ code-to-errno.h: Makefile mkerrnos.awk e
- # It is correct to use $(CPP).  We want the host's idea of the error codes.
- mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers)
- 	$(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
--	$(CPP) $(CPPFLAGS) $(extra_cppflags) _$@ | grep GPG_ERR_ | \
-+	$(CPP) -P $(CPPFLAGS) $(extra_cppflags) _$@ | grep GPG_ERR_ | \
-                $(AWK) -f $(srcdir)/mkerrcodes.awk >$@
- 	-rm _$@
- 
- # It is correct to use $(CPP).  We want the host's idea of the error codes.
- @HAVE_W32CE_SYSTEM_TRUE@mkw32errmap.tab.h: Makefile mkw32errmap.c
--@HAVE_W32CE_SYSTEM_TRUE@	$(CPP) -DRESOLVE_MACROS $(srcdir)/mkw32errmap.c | \
-+@HAVE_W32CE_SYSTEM_TRUE@	$(CPP) -P -DRESOLVE_MACROS $(srcdir)/mkw32errmap.c | \
- @HAVE_W32CE_SYSTEM_TRUE@	      grep '{&mkw32errmap_marker' >$@
- @HAVE_W32CE_SYSTEM_TRUE@mkw32errmap.map.c: mkw32errmap
- @HAVE_W32CE_SYSTEM_TRUE@	./mkw32errmap --map > $@
-@@ -1247,7 +1247,7 @@ mkerrcodes.h: Makefile mkerrcodes.awk $(
- # the data is really to be preprocessed.
- gpg-error.def: Makefile gpg-error.def.in
- 	cat $(srcdir)/gpg-error.def.in >_$@.h
--	$(CPP) $(DEFAULT_INCLUDES) $(INCLUDES) $(extra_cppflags) _$@.h | \
-+	$(CPP) -P $(DEFAULT_INCLUDES) $(INCLUDES) $(extra_cppflags) _$@.h | \
- 	  grep -v '^#' >$@
- 	-rm _$@.h
- 
diff --git a/libgpg-error-1.18.tar.bz2 b/libgpg-error-1.18.tar.bz2
deleted file mode 100644
index 1e80f56..0000000
--- a/libgpg-error-1.18.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ff1d6e61d4cef7c1d0607ceef6d40dc33f3da7a3094170c3718c00153d80810
-size 718070
diff --git a/libgpg-error-1.18.tar.bz2.sig b/libgpg-error-1.18.tar.bz2.sig
deleted file mode 100644
index 1f45e92b5b689aa9dc62c354dbcf6a2aa5c1759c03af242b111beccf32568e44..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 287
zcmV+)0pR|L0UQJX0SEvF1p-vY40`|y2@oWkInqxh<F-6*2mU0l$^begBQx;}(dHk5
zF_}1m$?YMA#`65VG#PC3IK!t*V29fSx*M0~xi8Qc-Eawe1&)0@^69W1t)L$wS3WNv
zRe+Lu3ah&0ozBjOjJpMm<Xw1$s<AD0w9CRF|0HVYLz68Fb?}ki(Gg2}89R{&!Kp@$
zbR^Ugf*W_npNCp!Cobag;`S)K1X!)7N;~tJzr{_{SnUAv8c(M8b7EZbP#&hvmE({R
zV_r<w)syXRIk@nn4(wd(eC=A!m-TEJ0drt|3^H@ge^-hSs?dn=GGz8H`=j9GA4xWE
l?xexb8k9auWhM*$z9qo5M(`1(dGRWKJdfcddAiC=uqF1lh{pf`

diff --git a/libgpg-error-1.19.tar.bz2 b/libgpg-error-1.19.tar.bz2
new file mode 100644
index 0000000..778bb7f
--- /dev/null
+++ b/libgpg-error-1.19.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53120e1333d5c5d28d87ff2854e9e98719c8e214152f17ad5291704d25c4978b
+size 761622
diff --git a/libgpg-error-1.19.tar.bz2.sig b/libgpg-error-1.19.tar.bz2.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..a2ed90d55fd28e401bcf66feb66c94ff8f9914d956859acac6ff7a46e12a6f26
GIT binary patch
literal 287
zcmV+)0pR|L0UQJX0SEvF1p-wl0}ucT2@oWkInqxh<F?m%2mT<uMmETTOtI#1e0uC$
zoYElFAD^ufHLf)xzOwgliRaiT{?pDcZ9~qcvgr1Qt#hXRP?UmjQwI8FdGiBHc3?PY
zqZs#B;S=ORGNf?e%p|p>Uo8v;q)u})Sp^4qD>Z+%f&{3zDyq;rj>Vxiz|_a8e#xoC
z7Q6qkup6n%^|)xbn$p^f!~;%RihbYgjcyTX!EmDuHj`1xYp=EwHK!IzVh|JP3R*0|
zocYg~s^X4gfYsPLMdJDglc-y#>mHh1(`5spEgPb~@rVE3>`NV4P}8G)XS@K~MT+sj
l=fB3jIaQu~lz>kJ$lC<#uxL6bSa)Yv?;&S<R|?m6yrogWi?ILz

literal 0
HcmV?d00001

diff --git a/libgpg-error.changes b/libgpg-error.changes
index e2f62e4..889b9ed 100644
--- a/libgpg-error.changes
+++ b/libgpg-error.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Apr 10 20:24:54 UTC 2015 - astieger@suse.com
+
+- update to 1.19:
+ * New set of error codes for use with LDAP.
+ * New options --help and --defines for gpg-error.
+ * Allow building with gcc 5.
+   (replacing patch libgpg-error-1.18-gcc5.patch now removed)
+ * Interface changes relative to the 1.18 release:
+   GPG_ERR_LDAP_*                   NEW.
+
 -------------------------------------------------------------------
 Thu Mar 19 16:12:59 UTC 2015 - astieger@suse.com
 
diff --git a/libgpg-error.spec b/libgpg-error.spec
index fcb7918..b86719d 100644
--- a/libgpg-error.spec
+++ b/libgpg-error.spec
@@ -17,7 +17,7 @@
 
 
 Name:           libgpg-error
-Version:        1.18
+Version:        1.19
 Release:        0
 Summary:        Library That Defines Common Error Values for All GnuPG Components
 License:        GPL-2.0+ and LGPL-2.1+
@@ -28,7 +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
-Patch1:         libgpg-error-1.18-gcc5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -72,7 +71,6 @@ Files needed for software development using libgpg-error.
 
 %prep
 %setup -q -n libgpg-error-%{version}
-%patch1
 
 %build
 %configure \