Attachment 181414 Details for Bug 218316 – Patch to security/gpgme and security/py-gpgme

[patch] Patch to security/gpgme and security/py-gpgme

gpgme-1.9.0.diff.txt (text/plain), 10.07 KB, created by Pietro Cerutti on 2017-04-03 08:52:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pietro Cerutti

Created: 2017-04-03 08:52:02 UTC

Size: 10.07 KB

patch

obsolete

>Index: gpgme/Makefile
>===================================================================
>--- gpgme/Makefile	(revision 437601)
>+++ gpgme/Makefile	(working copy)
>@@ -2,8 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	gpgme
>-PORTVERSION=	1.8.0
>-PORTREVISION?=	1
>+PORTVERSION=	1.9.0
>+PORTREVISION?=	0
> CATEGORIES?=	security
> MASTER_SITES=	GNUPG/gpgme
> 
>Index: gpgme/distinfo
>===================================================================
>--- gpgme/distinfo	(revision 437601)
>+++ gpgme/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1480065717
>-SHA256 (gpgme-1.8.0.tar.bz2) = 596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33
>-SIZE (gpgme-1.8.0.tar.bz2) = 1298407
>+TIMESTAMP = 1491207510
>+SHA256 (gpgme-1.9.0.tar.bz2) = 1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
>+SIZE (gpgme-1.9.0.tar.bz2) = 1344222
>Index: gpgme/files/patch-configure
>===================================================================
>--- gpgme/files/patch-configure	(revision 437601)
>+++ gpgme/files/patch-configure	(nonexistent)
>@@ -1,32 +0,0 @@
>-Fix configure for users that have 'WITHOUT_GNU_GREP_COMPAT=yes' set
>-m4/qt.m4 fixed upstream in git 211844f.
>-
>---- configure.orig	2016-12-20 07:27:31 UTC
>-+++ configure
>-@@ -18746,7 +18746,7 @@ fi
>-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking moc version" >&5
>- $as_echo_n "checking moc version... " >&6; }
>-     mocversion=`$MOC -v 2>&1`
>--    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
>-+    mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
>-     if test x"$mocversiongrep" != x"$mocversion"; then
>-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
>- $as_echo "no" >&6; }
>-@@ -18844,7 +18844,7 @@ else
>- fi
>- 
>-       mocversion=`$MOC2 -v 2>&1`
>--      mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
>-+      mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
>-       if test x"$mocversiongrep" != x"$mocversion"; then
>-         if test -n "$ac_tool_prefix"; then
>-   # Extract the first word of "${ac_tool_prefix}qtchooser", so it can be a program name with args.
>-@@ -18940,7 +18940,7 @@ fi
>- 
>-         qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
>-         mocversion=`$qt5tooldir/moc -v 2>&1`
>--        mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
>-+        mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
>-         if test x"$mocversiongrep" != x"$mocversion"; then
>-           # no valid moc found
>-           have_qt5_libs="no";
>
>Property changes on: gpgme/files/patch-configure
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: gpgme/files/patch-git_572c1aa
>===================================================================
>--- gpgme/files/patch-git_572c1aa	(revision 437601)
>+++ gpgme/files/patch-git_572c1aa	(nonexistent)
>@@ -1,26 +0,0 @@
>-From: Heiko Becker <heirecka@exherbo.org>
>-Date: Wed, 16 Nov 2016 22:09:45 +0000 (+0100)
>-Subject: Remove a forgotten instance of @libsuffix@
>-X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=572c1aac107125ce62230251713349348373db5a;hp=af79327021b5b3a5c4accd5d4e9f0124199bfdcc
>-
>-Remove a forgotten instance of @libsuffix@
>-
>-* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten
>-instance of @libsuffix@.
>---
>-
>-b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from
>-cmake config files, but missed one instance.
>-
>-Signed-off-by: Heiko Becker <heirecka@exherbo.org>
>---- lang/cpp/src/GpgmeppConfig.cmake.in.in.orig	2016-11-16 09:17:20 UTC
>-+++ lang/cpp/src/GpgmeppConfig.cmake.in.in
>-@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
>- 
>- set_target_properties(Gpgmepp PROPERTIES
>-   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
>--  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
>-+  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
>-   IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
>- )
>- 
>
>Property changes on: gpgme/files/patch-git_572c1aa
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: gpgme/files/patch-lang_cpp_src_engineinfo.h
>===================================================================
>--- gpgme/files/patch-lang_cpp_src_engineinfo.h	(revision 437601)
>+++ gpgme/files/patch-lang_cpp_src_engineinfo.h	(working copy)
>@@ -5,7 +5,7 @@
>                  ^
> 
> 
>---- lang/cpp/src/engineinfo.h.orig	2016-11-20 11:59:52 UTC
>+--- lang/cpp/src/engineinfo.h.orig	2016-11-09 07:34:15 UTC
> +++ lang/cpp/src/engineinfo.h
> @@ -30,6 +30,7 @@
>  #include <algorithm>
>Index: gpgme/files/patch-lang_python_Makefile.in
>===================================================================
>--- gpgme/files/patch-lang_python_Makefile.in	(revision 437601)
>+++ gpgme/files/patch-lang_python_Makefile.in	(working copy)
>@@ -1,17 +1,17 @@
>---- lang/python/Makefile.in.orig	2016-11-16 12:46:35 UTC
>+--- lang/python/Makefile.in.orig	2017-03-28 14:25:45 UTC
> +++ lang/python/Makefile.in
>-@@ -756,7 +756,7 @@ config.h:
>- all-local: copystamp
>- 	for PYTHON in $(PYTHONS); do \
>+@@ -755,7 +755,7 @@ all-local: copystamp
>+ 	  PYTHON="$$1" ; shift ; \
>+ 	  cd python$${VERSION}-gpg && \
>  	  CFLAGS="$(CFLAGS)" \
> -	    $$PYTHON setup.py build --verbose ; \
>-+	    $$PYTHON setup.py build --verbose build_ext --swig=$(SWIG) ; \
>++	    $$PYTHON setup.py build --verbose build_ext --swig=$(SWIG); \
>+ 	  cd .. ; \
>  	done
>  
>- dist/gpg-$(VERSION).tar.gz dist/gpg-$(VERSION).tar.gz.asc: copystamp
>-@@ -792,7 +792,8 @@ install-exec-local:
>- 	rm -f install_files.txt
>- 	for PYTHON in $(PYTHONS); do \
>+@@ -795,7 +795,8 @@ install-exec-local:
>+ 	  PYTHON="$$1" ; shift ; \
>+ 	  cd python$${VERSION}-gpg ; \
>  	  $$PYTHON setup.py install \
> -	  --prefix $(DESTDIR)$(prefix) \
> +	  -c -O1 --prefix=$(prefix) \
>@@ -18,4 +18,4 @@
> +	  --root=$(DESTDIR) \
>  	  --record files.txt \
>  	  --verbose ; \
>- 	  cat files.txt >> install_files.txt ; \
>+ 	  cat files.txt >> ../install_files.txt ; \
>Index: gpgme/files/patch-src_posix-io.c
>===================================================================
>--- gpgme/files/patch-src_posix-io.c	(nonexistent)
>+++ gpgme/files/patch-src_posix-io.c	(working copy)
>@@ -0,0 +1,20 @@
>+--- src/posix-io.c.orig	2017-03-09 08:01:10 UTC
>++++ src/posix-io.c
>+@@ -473,7 +473,7 @@ _gpgme_io_spawn (const char *path, char 
>+            * have closefrom(2) we first figure out the highest fd we
>+            * do not want to close, then call closefrom, and on success
>+            * use the regular code to close all fds up to the start
>+-           * point of closefrom.  Note that Solaris' closefrom does
>++           * point of closefrom.  Note that Solaris' and FreeBSD's closefrom do
>+            * not return errors.  */
>+ #ifdef HAVE_CLOSEFROM
>+           {
>+@@ -482,7 +482,7 @@ _gpgme_io_spawn (const char *path, char 
>+               if (fd_list[i].fd > fd)
>+                 fd = fd_list[i].fd;
>+             fd++;
>+-#ifdef __sun
>++#if defined(__sun) || defined(__FreeBSD__)
>+             closefrom (fd);
>+             max_fds = fd;
>+ #else /*!__sun */
>
>Property changes on: gpgme/files/patch-src_posix-io.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: gpgme/pkg-plist
>===================================================================
>--- gpgme/pkg-plist	(revision 437601)
>+++ gpgme/pkg-plist	(working copy)
>@@ -6,5 +6,5 @@
> lib/common-lisp/gpgme/gpgme.lisp
> lib/libgpgme.so
> lib/libgpgme.so.11
>-lib/libgpgme.so.11.17.0
>+lib/libgpgme.so.11.18.0
> share/aclocal/gpgme.m4
>Index: py-gpgme/pkg-plist
>===================================================================
>--- py-gpgme/pkg-plist	(revision 437605)
>+++ py-gpgme/pkg-plist	(working copy)
>@@ -1,3 +1,4 @@
>+/you/have/to/check/what/makeplist/gives/you
> %%PYTHON_SITELIBDIR%%/gpg-%%VERSION%%-py%%PYTHON_VER%%.egg-info
> %%PYTHON_SITELIBDIR%%/gpg/__init__.py
> %%PYTHON_SITELIBDIR%%/gpg/__init__.pyc
>@@ -9,6 +10,9 @@
> %%PYTHON_SITELIBDIR%%/gpg/constants/__init__.py
> %%PYTHON_SITELIBDIR%%/gpg/constants/__init__.pyc
> %%PYTHON_SITELIBDIR%%/gpg/constants/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/gpg/constants/create.py
>+%%PYTHON_SITELIBDIR%%/gpg/constants/create.pyc
>+%%PYTHON_SITELIBDIR%%/gpg/constants/create.pyo
> %%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.py
> %%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.pyc
> %%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.pyo
>@@ -27,6 +31,9 @@
> %%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.py
> %%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.pyc
> %%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.pyo
>+%%PYTHON_SITELIBDIR%%/gpg/constants/keysign.py
>+%%PYTHON_SITELIBDIR%%/gpg/constants/keysign.pyc
>+%%PYTHON_SITELIBDIR%%/gpg/constants/keysign.pyo
> %%PYTHON_SITELIBDIR%%/gpg/constants/md.py
> %%PYTHON_SITELIBDIR%%/gpg/constants/md.pyc
> %%PYTHON_SITELIBDIR%%/gpg/constants/md.pyo
>@@ -51,6 +58,12 @@
> %%PYTHON_SITELIBDIR%%/gpg/constants/status.py
> %%PYTHON_SITELIBDIR%%/gpg/constants/status.pyc
> %%PYTHON_SITELIBDIR%%/gpg/constants/status.pyo
>+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__init__.py
>+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/policy.py
>+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/policy.pyc
>+%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/policy.pyo
> %%PYTHON_SITELIBDIR%%/gpg/constants/validity.py
> %%PYTHON_SITELIBDIR%%/gpg/constants/validity.pyc
> %%PYTHON_SITELIBDIR%%/gpg/constants/validity.pyo

Actions: View | Diff

Attachments on bug 218316: 181414 | 181415