[packages/gpgme] - updated to 1.9.0 - updated python patch - added format patch (fixes build with -Werror=format-secu

qboosh qboosh at pld-linux.org
Wed Mar 29 21:06:07 CEST 2017


commit 6ae778abf783c06765a3955f451a81caceca9046
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Mar 29 21:06:01 2017 +0200

    - updated to 1.9.0
    - updated python patch
    - added format patch (fixes build with -Werror=format-security)

 gpgme-format.patch | 11 +++++++++++
 gpgme-python.patch | 15 ++++++++-------
 gpgme.spec         |  8 +++++---
 3 files changed, 24 insertions(+), 10 deletions(-)
---
diff --git a/gpgme.spec b/gpgme.spec
index 8293b1b..91e39a1 100644
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -19,17 +19,18 @@
 Summary:	Library for accessing GnuPG
 Summary(pl.UTF-8):	Biblioteka dająca dostęp do funkcji GnuPG
 Name:		gpgme
-Version:	1.8.0
-Release:	2
+Version:	1.9.0
+Release:	1
 Epoch:		1
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2
-# Source0-md5:	722a4153904b9b5dc15485a22d29263b
+# Source0-md5:	1e00bb8ef04d1d05d5a0f19e143854c3
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-kill-tests.patch
 Patch2:		%{name}-largefile.patch
 Patch3:		%{name}-python.patch
+Patch4:		%{name}-format.patch
 URL:		http://www.gnupg.org/gpgme.html
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.14
@@ -224,6 +225,7 @@ PyME to interfejs Pythona do biblioteki GPGME.
 %{!?with_tests:%patch1 -p1}
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
diff --git a/gpgme-format.patch b/gpgme-format.patch
new file mode 100644
index 0000000..be7030f
--- /dev/null
+++ b/gpgme-format.patch
@@ -0,0 +1,11 @@
+--- gpgme-1.9.0/lang/qt/src/dn.cpp.orig	2017-03-20 20:10:15.000000000 +0100
++++ gpgme-1.9.0/lang/qt/src/dn.cpp	2017-03-29 20:58:29.893277570 +0200
+@@ -167,7 +167,7 @@
+     for (unsigned int i = 0; i < numOidMaps; ++i)
+         if (!strcasecmp((char *)p, oidmap[i].oid)) {
+             free(p);
+-            gpgrt_asprintf(&p, oidmap[i].name);
++            gpgrt_asprintf(&p, "%s", oidmap[i].name);
+             break;
+         }
+     array->key = p;
diff --git a/gpgme-python.patch b/gpgme-python.patch
index 23e6de0..7d87ef7 100644
--- a/gpgme-python.patch
+++ b/gpgme-python.patch
@@ -1,8 +1,8 @@
---- gpgme-1.8.0/lang/python/Makefile.am.orig	2016-11-27 12:56:09.390089844 +0100
-+++ gpgme-1.8.0/lang/python/Makefile.am	2016-11-27 17:00:38.506589016 +0100
-@@ -101,14 +101,15 @@
- 	rm -f install_files.txt
- 	for PYTHON in $(PYTHONS); do \
+--- gpgme-1.9.0/lang/python/Makefile.am.orig	2017-03-29 20:00:06.723317571 +0200
++++ gpgme-1.9.0/lang/python/Makefile.am	2017-03-29 20:50:36.333282979 +0200
+@@ -105,7 +105,9 @@
+ 	  PYTHON="$$1" ; shift ; \
+ 	  cd python$${VERSION}-gpg ; \
  	  $$PYTHON setup.py install \
 -	  --prefix $(DESTDIR)$(prefix) \
 +	  --prefix $(prefix) \
@@ -10,8 +10,9 @@
 +	  --optimize=2 \
  	  --record files.txt \
  	  --verbose ; \
- 	  cat files.txt >> install_files.txt ; \
- 	  rm files.txt ; \
+ 	  cat files.txt >> ../install_files.txt ; \
+@@ -113,7 +115,6 @@
+ 	  cd .. ; \
  	done
  	$(MKDIR_P) $(DESTDIR)$(pythondir)/gpg
 -	mv install_files.txt $(DESTDIR)$(pythondir)/gpg
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gpgme.git/commitdiff/6ae778abf783c06765a3955f451a81caceca9046



More information about the pld-cvs-commit mailing list