Attachment #181414 for bug #218316

Lines 2-9 Link Here

(-)gpgme/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gpgme	4	PORTNAME= gpgme
5	PORTVERSION= 1.8.0	5	PORTVERSION= 1.9.0
6	PORTREVISION?= 1	6	PORTREVISION?= 0
7	CATEGORIES?= security	7	CATEGORIES?= security
8	MASTER_SITES= GNUPG/gpgme	8	MASTER_SITES= GNUPG/gpgme
9		9

Lines 1-3 Link Here

(-)gpgme/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1480065717	1	TIMESTAMP = 1491207510
2	SHA256 (gpgme-1.8.0.tar.bz2) = 596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33	2	SHA256 (gpgme-1.9.0.tar.bz2) = 1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
3	SIZE (gpgme-1.8.0.tar.bz2) = 1298407	3	SIZE (gpgme-1.9.0.tar.bz2) = 1344222




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";




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"
 )
 

Lines 5-11 Link Here

(-)gpgme/files/patch-lang_cpp_src_engineinfo.h (-1 / +1 lines)
5	^	5	^
6		6
7		7
8	--- lang/cpp/src/engineinfo.h.orig 2016-11-20 11:59:52 UTC	8	--- lang/cpp/src/engineinfo.h.orig 2016-11-09 07:34:15 UTC
9	+++ lang/cpp/src/engineinfo.h	9	+++ lang/cpp/src/engineinfo.h
10	@@ -30,6 +30,7 @@	10	@@ -30,6 +30,7 @@
11	#include <algorithm>	11	#include <algorithm>




--- lang/python/Makefile.in.orig	2017-03-28 14:25:45 UTC
+++ lang/python/Makefile.in
@@ -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); \
 	  cd .. ; \
 	done
 
@@ -795,7 +795,8 @@ install-exec-local:
 	  PYTHON="$$1" ; shift ; \
 	  cd python$${VERSION}-gpg ; \
 	for PYTHON in $(PYTHONS); do \
 	  $$PYTHON setup.py install \
-	  --prefix $(DESTDIR)$(prefix) \
+	  -c -O1 --prefix=$(prefix) \

+	  --root=$(DESTDIR) \
 	  --record files.txt \
 	  --verbose ; \
 	  cat files.txt >> ../install_files.txt ; \




--- 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 */

Lines 6-10 Link Here

(-)gpgme/pkg-plist (-1 / +1 lines)
6	lib/common-lisp/gpgme/gpgme.lisp	6	lib/common-lisp/gpgme/gpgme.lisp
7	lib/libgpgme.so	7	lib/libgpgme.so
8	lib/libgpgme.so.11	8	lib/libgpgme.so.11
9	lib/libgpgme.so.11.17.0	9	lib/libgpgme.so.11.18.0
10	share/aclocal/gpgme.m4	10	share/aclocal/gpgme.m4

Lines 1-3 Link Here

(-)py-gpgme/pkg-plist (+13 lines)
		1	/you/have/to/check/what/makeplist/gives/you
1	%%PYTHON_SITELIBDIR%%/gpg-%%VERSION%%-py%%PYTHON_VER%%.egg-info	2	%%PYTHON_SITELIBDIR%%/gpg-%%VERSION%%-py%%PYTHON_VER%%.egg-info
2	%%PYTHON_SITELIBDIR%%/gpg/__init__.py	3	%%PYTHON_SITELIBDIR%%/gpg/__init__.py
3	%%PYTHON_SITELIBDIR%%/gpg/__init__.pyc	4	%%PYTHON_SITELIBDIR%%/gpg/__init__.pyc
Lines 9-14 Link Here
9	%%PYTHON_SITELIBDIR%%/gpg/constants/__init__.py	10	%%PYTHON_SITELIBDIR%%/gpg/constants/__init__.py
10	%%PYTHON_SITELIBDIR%%/gpg/constants/__init__.pyc	11	%%PYTHON_SITELIBDIR%%/gpg/constants/__init__.pyc
11	%%PYTHON_SITELIBDIR%%/gpg/constants/__init__.pyo	12	%%PYTHON_SITELIBDIR%%/gpg/constants/__init__.pyo
		13	%%PYTHON_SITELIBDIR%%/gpg/constants/create.py
		14	%%PYTHON_SITELIBDIR%%/gpg/constants/create.pyc
		15	%%PYTHON_SITELIBDIR%%/gpg/constants/create.pyo
12	%%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.py	16	%%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.py
13	%%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.pyc	17	%%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.pyc
14	%%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.pyo	18	%%PYTHON_SITELIBDIR%%/gpg/constants/data/__init__.pyo
Lines 27-32 Link Here
27	%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.py	31	%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.py
28	%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.pyc	32	%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.pyc
29	%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.pyo	33	%%PYTHON_SITELIBDIR%%/gpg/constants/keylist/mode.pyo
		34	%%PYTHON_SITELIBDIR%%/gpg/constants/keysign.py
		35	%%PYTHON_SITELIBDIR%%/gpg/constants/keysign.pyc
		36	%%PYTHON_SITELIBDIR%%/gpg/constants/keysign.pyo
30	%%PYTHON_SITELIBDIR%%/gpg/constants/md.py	37	%%PYTHON_SITELIBDIR%%/gpg/constants/md.py
31	%%PYTHON_SITELIBDIR%%/gpg/constants/md.pyc	38	%%PYTHON_SITELIBDIR%%/gpg/constants/md.pyc
32	%%PYTHON_SITELIBDIR%%/gpg/constants/md.pyo	39	%%PYTHON_SITELIBDIR%%/gpg/constants/md.pyo
Lines 51-56 Link Here
51	%%PYTHON_SITELIBDIR%%/gpg/constants/status.py	58	%%PYTHON_SITELIBDIR%%/gpg/constants/status.py
52	%%PYTHON_SITELIBDIR%%/gpg/constants/status.pyc	59	%%PYTHON_SITELIBDIR%%/gpg/constants/status.pyc
53	%%PYTHON_SITELIBDIR%%/gpg/constants/status.pyo	60	%%PYTHON_SITELIBDIR%%/gpg/constants/status.pyo
		61	%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__init__.py
		62	%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__init__.pyc
		63	%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/__init__.pyo
		64	%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/policy.py
		65	%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/policy.pyc
		66	%%PYTHON_SITELIBDIR%%/gpg/constants/tofu/policy.pyo
54	%%PYTHON_SITELIBDIR%%/gpg/constants/validity.py	67	%%PYTHON_SITELIBDIR%%/gpg/constants/validity.py
55	%%PYTHON_SITELIBDIR%%/gpg/constants/validity.pyc	68	%%PYTHON_SITELIBDIR%%/gpg/constants/validity.pyc
56	%%PYTHON_SITELIBDIR%%/gpg/constants/validity.pyo	69	%%PYTHON_SITELIBDIR%%/gpg/constants/validity.pyo

Return to bug 218316

Lines 1-32 Link Here

(-)gpgme/files/patch-configure (-32 lines)
1	Fix configure for users that have 'WITHOUT_GNU_GREP_COMPAT=yes' set
2	m4/qt.m4 fixed upstream in git 211844f.
3
4	--- configure.orig 2016-12-20 07:27:31 UTC
5	+++ configure
6	@@ -18746,7 +18746,7 @@ fi
7	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking moc version" >&5
8	$as_echo_n "checking moc version... " >&6; }
9	mocversion=`$MOC -v 2>&1`
10	- mocversiongrep=`echo $mocversion \| grep "Qt 5\\|moc 5"`
11	+ mocversiongrep=`echo $mocversion \| grep -E "Qt 5\|moc 5"`
12	if test x"$mocversiongrep" != x"$mocversion"; then
13	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14	$as_echo "no" >&6; }
15	@@ -18844,7 +18844,7 @@ else
16	fi
17
18	mocversion=`$MOC2 -v 2>&1`
19	- mocversiongrep=`echo $mocversion \| grep "Qt 5\\|moc-qt5 5\\|moc 5"`
20	+ mocversiongrep=`echo $mocversion \| grep -E "Qt 5\|moc-qt5 5\|moc 5"`
21	if test x"$mocversiongrep" != x"$mocversion"; then
22	if test -n "$ac_tool_prefix"; then
23	# Extract the first word of "${ac_tool_prefix}qtchooser", so it can be a program name with args.
24	@@ -18940,7 +18940,7 @@ fi
25
26	qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env \| grep QTTOOLDIR \| cut -d '=' -f 2 \| cut -d \" -f 2`
27	mocversion=`$qt5tooldir/moc -v 2>&1`
28	- mocversiongrep=`echo $mocversion \| grep "Qt 5\\|moc 5"`
29	+ mocversiongrep=`echo $mocversion \| grep -E "Qt 5\|moc 5"`
30	if test x"$mocversiongrep" != x"$mocversion"; then
31	# no valid moc found
32	have_qt5_libs="no";

Lines 1-26 Link Here

(-)gpgme/files/patch-git_572c1aa (-26 lines)
1	From: Heiko Becker <heirecka@exherbo.org>
2	Date: Wed, 16 Nov 2016 22:09:45 +0000 (+0100)
3	Subject: Remove a forgotten instance of @libsuffix@
4	X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=572c1aac107125ce62230251713349348373db5a;hp=af79327021b5b3a5c4accd5d4e9f0124199bfdcc
5
6	Remove a forgotten instance of @libsuffix@
7
8	* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten
9	instance of @libsuffix@.
10	--
11
12	b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from
13	cmake config files, but missed one instance.
14
15	Signed-off-by: Heiko Becker <heirecka@exherbo.org>
16	--- lang/cpp/src/GpgmeppConfig.cmake.in.in.orig 2016-11-16 09:17:20 UTC
17	+++ lang/cpp/src/GpgmeppConfig.cmake.in.in
18	@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
19
20	set_target_properties(Gpgmepp PROPERTIES
21	INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
22	- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
23	+ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
24	IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
25	)
26

Lines 1-17 Link Here

(-)gpgme/files/patch-lang_python_Makefile.in (-10 / +10 lines)
1	--- lang/python/Makefile.in.orig 2016-11-16 12:46:35 UTC	1	--- lang/python/Makefile.in.orig 2017-03-28 14:25:45 UTC
2	+++ lang/python/Makefile.in	2	+++ lang/python/Makefile.in
3	@@ -756,7 +756,7 @@ config.h:	3	@@ -755,7 +755,7 @@ all-local: copystamp
4	all-local: copystamp	4	PYTHON="$$1" ; shift ; \
5	for PYTHON in $(PYTHONS); do \	5	cd python$${VERSION}-gpg && \
6	CFLAGS="$(CFLAGS)" \	6	CFLAGS="$(CFLAGS)" \
7	- $$PYTHON setup.py build --verbose ; \	7	- $$PYTHON setup.py build --verbose ; \
8	+ $$PYTHON setup.py build --verbose build_ext --swig=$(SWIG) ; \	8	+ $$PYTHON setup.py build --verbose build_ext --swig=$(SWIG); \
		9	cd .. ; \
9	done	10	done
10		11
11	dist/gpg-$(VERSION).tar.gz dist/gpg-$(VERSION).tar.gz.asc: copystamp	12	@@ -795,7 +795,8 @@ install-exec-local:
12	@@ -792,7 +792,8 @@ install-exec-local:	13	PYTHON="$$1" ; shift ; \
13	rm -f install_files.txt	14	cd python$${VERSION}-gpg ; \
14	for PYTHON in $(PYTHONS); do \
15	$$PYTHON setup.py install \	15	$$PYTHON setup.py install \
16	- --prefix $(DESTDIR)$(prefix) \	16	- --prefix $(DESTDIR)$(prefix) \
17	+ -c -O1 --prefix=$(prefix) \	17	+ -c -O1 --prefix=$(prefix) \
Lines 18-21 Link Here
18	+ --root=$(DESTDIR) \	18	+ --root=$(DESTDIR) \
19	--record files.txt \	19	--record files.txt \
20	--verbose ; \	20	--verbose ; \
21	cat files.txt >> install_files.txt ; \	21	cat files.txt >> ../install_files.txt ; \

Line 0 Link Here

(-)gpgme/files/patch-src_posix-io.c (+20 lines)
	1	--- src/posix-io.c.orig 2017-03-09 08:01:10 UTC
	2	+++ src/posix-io.c
	3	@@ -473,7 +473,7 @@ _gpgme_io_spawn (const char *path, char
	4	* have closefrom(2) we first figure out the highest fd we
	5	* do not want to close, then call closefrom, and on success
	6	* use the regular code to close all fds up to the start
	7	- * point of closefrom. Note that Solaris' closefrom does
	8	+ * point of closefrom. Note that Solaris' and FreeBSD's closefrom do
	9	* not return errors. */
	10	#ifdef HAVE_CLOSEFROM
	11	{
	12	@@ -482,7 +482,7 @@ _gpgme_io_spawn (const char *path, char
	13	if (fd_list[i].fd > fd)
	14	fd = fd_list[i].fd;
	15	fd++;
	16	-#ifdef __sun
	17	+#if defined(__sun) \|\| defined(__FreeBSD__)
	18	closefrom (fd);
	19	max_fds = fd;
	20	#else /!__sun /