package/libgpg-error: bump version to 1.27

PATCH New Bernd Kuhls 2 participants 6 messages Mar 12, 2017 – Mar 19, 2017

lore

Share & tools

lore

Bernd Kuhls

author

2017-03-12 11:33 UTC #0 lore raw

PATCH 1/5 package/libgpg-error: bump version to 1.27

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/libgpg-error/libgpg-error.hash | 2 +-
 package/libgpg-error/libgpg-error.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/libgpg-error/libgpg-error.hash +1 -1

index dac36db09..0541d2311 100644
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256  3df7432dc17ef66c764c3fc4a1d309a9b4a0485c914ecfdb61b71e9bf45fd930  libgpg-error-1.26.tar.gz
+sha256 04bdc7fd12001c797cc689b007fe24909f55aa0ee1d6d6aef967d9eebf5b2461  libgpg-error-1.27.tar.gz

package/libgpg-error/libgpg-error.mk +1 -1

index 5126c0a81..074ebb733 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBGPG_ERROR_VERSION = 1.26
+LIBGPG_ERROR_VERSION = 1.27
 LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
 LIBGPG_ERROR_LICENSE = GPLv2+, LGPLv2.1+
 LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB

Signature · 1 line

2.11.0

Bernd Kuhls

author

2017-03-12 11:33 UTC #1 lore raw

PATCH 2/5 package/libnpth: new package

Needed for gnupg 2.1.x
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=001352077cdc7e402421c77328bea1a052005673

Signed-off-by Bernd Kuhls <[email protected]>

---
 DEVELOPERS                   |  1 +
 package/Config.in            |  1 +
 package/libnpth/Config.in    | 13 +++++++++++++
 package/libnpth/libnpth.hash |  2 ++
 package/libnpth/libnpth.mk   | 14 ++++++++++++++
 5 files changed, 31 insertions(+)
 create mode 100644 package/libnpth/Config.in
 create mode 100644 package/libnpth/libnpth.hash
 create mode 100644 package/libnpth/libnpth.mk

DEVELOPERS +1 -0

index 8daf6705f..5380a5f81 100644
@@ -194,6 +194,7 @@ F:	package/libldns/
 F:	package/libmicrohttpd/
 F:	package/libminiupnpc/
 F:	package/libnatpmp/
+F:	package/libnpth/
 F:	package/libogg/
 F:	package/libopenh264/
 F:	package/libpciaccess/

package/Config.in +1 -0

index 7721727bb..5cc890fbb 100644
@@ -1360,6 +1360,7 @@ menu "Other"
 	source "package/libical/Config.in"
 	source "package/libite/Config.in"
 	source "package/liblinear/Config.in"
+	source "package/libnpth/Config.in"
 	source "package/libnspr/Config.in"
 	source "package/libpfm4/Config.in"
 	source "package/libplatform/Config.in"

package/libnpth/Config.in new file +13 -0

new file mode 100644
index 000000000..71f9fcb35
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBNPTH
+	bool "libnpth"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
+	help
+	  nPth is a library to provide the GNU Pth API and thus a
+	  non-preemptive threads implementation.
+
+	  https://www.gnupg.org/related_software/npth/index.html
+
+comment "libnpth needs a toolchain w/ threads support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU

package/libnpth/libnpth.hash new file +2 -0

new file mode 100644
index 000000000..d8d0fbd51
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 bca81940436aed0734eb8d0ff8b179e04cc8c087f5625204419f5f45d736a82a  npth-1.3.tar.bz2

package/libnpth/libnpth.mk new file +14 -0

new file mode 100644
index 000000000..c97099b02
@@ -0,0 +1,14 @@
+################################################################################
+#
+# libnpth
+#
+################################################################################
+
+LIBNPTH_VERSION = 1.3
+LIBNPTH_SOURCE = npth-$(LIBNPTH_VERSION).tar.bz2
+LIBNPTH_SITE = ftp://ftp.gnupg.org/gcrypt/npth
+LIBNPTH_LICENSE = LGPLv3+ or GPLv2+
+LIBNPTH_LICENSE_FILES = COPYING COPYING.LESSER
+LIBNPTH_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))

Signature · 1 line

2.11.0

Bernd Kuhls

author

2017-03-12 11:33 UTC #2 lore raw

PATCH 3/5 package/gnupg2: bump version to 2.1.19

In reply to Bernd Kuhls

Support for GnuPG 2.0 will end 2017-12-31:
https://lists.gnupg.org/pipermail/gnupg-announce/2017q1/000402.html

Removed all patches:

- 0001-fix-pth-config-usage.patch
Not needed anymore, gnupg2 now depends on libnpth:
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=001352077cdc7e402421c77328bea1a052005673

- 0002-missing-include.patch
Not needed anymore after upstream commit
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=0367a4b8cfbf1f197e093ca2b83b27e0a409c3c7

- 0003-dont-run-tests.patch
Not needed anymore after upstream commit
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=4a232d23a8f51bebf9ee382e480248b4bde30f28

- 0004-silence-git-when-not-in-git-tree.patch
Not needed anymore after upstream commit restricting the usage of git commands to the case where the directory .git exists
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=b67e4e523e6d19d384e23c5bb03010caebd150e7

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/gnupg2/0001-fix-pth-config-usage.patch     | 24 -------------
 package/gnupg2/0002-missing-include.patch          | 15 ---------
 package/gnupg2/0003-dont-run-tests.patch           | 39 ----------------------
 .../0004-silence-git-when-not-in-git-tree.patch    | 26 ---------------
 package/gnupg2/Config.in                           | 10 +++---
 package/gnupg2/gnupg2.hash                         |  6 ++--
 package/gnupg2/gnupg2.mk                           |  9 ++---
 7 files changed, 11 insertions(+), 118 deletions(-)
 delete mode 100644 package/gnupg2/0001-fix-pth-config-usage.patch
 delete mode 100644 package/gnupg2/0002-missing-include.patch
 delete mode 100644 package/gnupg2/0003-dont-run-tests.patch
 delete mode 100644 package/gnupg2/0004-silence-git-when-not-in-git-tree.patch

package/gnupg2/0001-fix-pth-config-usage.patch deleted +0 ~~-24~~

deleted file mode 100644
index 756d35139..000000000
@@ -1,24 +0,0 @@
-Fix usage of PTH_CONFIG to work with pthsem
-
-The pthsem re-implement of pth provides a compatibility layer for pth,
-but its pth-config script behaves slightly differently than the
-original one when reporting the version number. This patch to gnupg2's
-configure script adjusts the version checking to support this
-difference, since Buildroot uses pth-config from pthsem.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-[yann.morin.1998 at free.fr: adapt to patch m4 macro for autoreconfiguring]
-Signed-off-by: "Yann E. MORIN" <[email protected]>
-
-diff -durN gnupg2-2.0.29.orig/m4/gnupg-pth.m4 gnupg2-2.0.29/m4/gnupg-pth.m4
---- gnupg2-2.0.29.orig/m4/gnupg-pth.m4	2015-09-08 14:39:24.000000000 +0200
-+++ gnupg2-2.0.29/m4/gnupg-pth.m4	2015-12-16 18:30:54.336513493 +0100
-@@ -17,7 +17,7 @@
- # Taken and modified from the m4 macros which come with Pth.
- AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
-   [
--    _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'`
-+    _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]2}'`
-     _req_version="ifelse([$1],,1.2.0,$1)"
- 
-     AC_MSG_CHECKING(for PTH - version >= $_req_version)

package/gnupg2/0002-missing-include.patch deleted +0 ~~-15~~

deleted file mode 100644
index f20994ced..000000000
@@ -1,15 +0,0 @@
-tools/watchgnupg: select() is from sys/select.h
-
-Signed-off-by: "Yann E. MORIN" <[email protected]>
-
-diff -durN gnupg2-2.0.29.orig/tools/watchgnupg.c gnupg2-2.0.29/tools/watchgnupg.c
---- gnupg2-2.0.29.orig/tools/watchgnupg.c	2015-09-08 14:39:24.000000000 +0200
-+++ gnupg2-2.0.29/tools/watchgnupg.c	2015-12-16 18:17:17.758057787 +0100
-@@ -32,6 +32,7 @@
- #include <sys/un.h>
- #include <fcntl.h>
- #include <time.h>
-+#include <sys/select.h>
- 
- #define PGM "watchgnupg"
-

package/gnupg2/0003-dont-run-tests.patch deleted +0 ~~-39~~

deleted file mode 100644
index 1858a0de0..000000000
@@ -1,39 +0,0 @@
-tests: really don't run tests in cross-compilation
-
-Signed-off-by: "Yann E. MORIN" <[email protected]>
-
-diff -durN gnupg2-2.0.29.orig/tests/Makefile.am gnupg2-2.0.29/tests/Makefile.am
---- gnupg2-2.0.29.orig/tests/Makefile.am	2015-09-08 14:39:24.000000000 +0200
-+++ gnupg2-2.0.29/tests/Makefile.am	2015-12-16 18:27:55.778227183 +0100
-@@ -64,6 +64,7 @@
- asschk_SOURCES = asschk.c
- 
- 
-+if RUN_GPG_TESTS
- all-local: inittests.stamp
- 
- clean-local:
-@@ -72,4 +73,5 @@
- inittests.stamp: inittests
- 	srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests
- 	echo timestamp >./inittests.stamp
-+endif # RUN_GPG_TESTS
- 
-diff -durN gnupg2-2.0.29.orig/tests/pkits/Makefile.am gnupg2-2.0.29/tests/pkits/Makefile.am
---- gnupg2-2.0.29.orig/tests/pkits/Makefile.am	2015-09-01 08:52:21.000000000 +0200
-+++ gnupg2-2.0.29/tests/pkits/Makefile.am	2015-12-16 18:44:06.422655594 +0100
-@@ -52,6 +52,7 @@
- 
- DISTCLEANFILES = pubring.kbx~ random_seed
- 
-+if RUN_GPG_TESTS
- all-local: inittests.stamp
- 
- clean-local:
-@@ -71,5 +72,5 @@
-            elif test $$? -eq 77; then echo "- SKIP $$tst"; \
- 	   fi; \
-          done
--
-+endif # RUN_GPG_TESTS
-

package/gnupg2/0004-silence-git-when-not-in-git-tree.patch deleted +0 ~~-26~~

deleted file mode 100644
index 5eaefe4bd..000000000
@@ -1,26 +0,0 @@
-configure: silence autoreconf when not in a git tree
-
-When autoreconfiguring ourside of a git tree, the output is verbose
-with git errors.
-
-Silence that by consigning stderr to oblivion.
-
-Signed-off-by: "Yann E. MORIN" <[email protected]>
-
-diff -durN gnupg2-2.0.29.orig/configure.ac gnupg2-2.0.29/configure.ac
---- gnupg2-2.0.29.orig/configure.ac	2015-09-08 14:39:24.000000000 +0200
-+++ gnupg2-2.0.29/configure.ac	2015-12-16 18:34:47.099493863 +0100
-@@ -33,11 +33,11 @@
- # flag indicating a development version (mym4_isgit).  Note that the
- # m4 processing is done by autoconf and not during the configure run.
- m4_define([mym4_revision],
--          m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
-+          m4_esyscmd([git rev-parse --short HEAD 2>/dev/null | tr -d '\n\r']))
- m4_define([mym4_revision_dec],
-           m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
- m4_define([mym4_betastring],
--          m4_esyscmd_s([git describe --match 'gnupg-2.[0-9].*[0-9]' --long|\
-+          m4_esyscmd_s([git describe --match 'gnupg-2.[0-9].*[0-9]' --long 2>/dev/null |\
-                         awk -F- '$3!=0{print"-beta"$3}']))
- m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
- m4_define([mym4_full_version],[mym4_version[]mym4_betastring])

package/gnupg2/Config.in +5 -5

index ba2a6bcff..85a98053f 100644
@@ -1,6 +1,6 @@
-comment "gnupg2 needs a toolchain w/ dynamic library"
+comment "gnupg2 needs a toolchain w/ threads and dynamic library support"
 	depends on BR2_USE_MMU
-	depends on BR2_STATIC_LIBS
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GNUPG2
 	bool "gnupg2"

@@ -9,11 +9,11 @@ config BR2_PACKAGE_GNUPG2
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBASSUAN
 	select BR2_PACKAGE_LIBKSBA
-	select BR2_PACKAGE_LIBPTHSEM
-	select BR2_PACKAGE_LIBPTHSEM_COMPAT
+	select BR2_PACKAGE_LIBNPTH
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error
-	depends on BR2_USE_MMU # libassuan
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnpth
+	depends on BR2_USE_MMU # libassuan, libnpth
 	depends on !BR2_STATIC_LIBS
 	help
 	  GnuPG is the GNU project's complete and free implementation

package/gnupg2/gnupg2.hash +3 -3

index 67f7d9da3..c589f6af9 100644
@@ -1,4 +1,4 @@
-# From https://lists.gnupg.org/pipermail/gnupg-announce/2016q1/000385.html
-sha1	a9f024588c356a55e2fd413574bfb55b2e18794a	gnupg-2.0.30.tar.bz2
+# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q1/000402.html
+sha1 10a088a6716789ac5c5cce2776952d8f4a5c57fc  gnupg-2.1.19.tar.bz2
 # Calculated based on the hash above
-sha256	e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71	gnupg-2.0.30.tar.bz2
+sha256 46cced1f5641ce29cc28250f52fadf6e417e649b3bfdec49a5a0d0b22a639bf0  gnupg-2.1.19.tar.bz2

package/gnupg2/gnupg2.mk +3 -6

index 763e9454a..55190cc80 100644
@@ -4,24 +4,21 @@
 #
 ################################################################################
 
-GNUPG2_VERSION = 2.0.30
+GNUPG2_VERSION = 2.1.19
 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
 GNUPG2_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
 GNUPG2_LICENSE = GPLv3+
 GNUPG2_LICENSE_FILES = COPYING
-GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libpthsem \
+GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
-# Patching configure.ac and m4 macros, as well as Makefile.am
-GNUPG2_AUTORECONF = YES
-
 GNUPG2_CONF_OPTS = \
 	--disable-rpath --disable-regex --disable-doc \
 	--with-libgpg-error-prefix=$(STAGING_DIR)/usr \
 	--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
 	--with-libassuan-prefix=$(STAGING_DIR)/usr \
 	--with-ksba-prefix=$(STAGING_DIR)/usr \
-	--with-pth-prefix=$(STAGING_DIR)/usr
+	--with-npth-prefix=$(STAGING_DIR)/usr
 GNUPG2_CONF_ENV = gl_cv_header_working_stdint_h=yes
 
 ifneq ($(BR2_PACKAGE_GNUPG2_GPGV2),y)

Signature · 1 line

2.11.0

Bernd Kuhls

author

2017-03-12 11:33 UTC #3 lore raw

PATCH 4/5 package/gnupg2: add optional support for sqlite

In reply to Bernd Kuhls

Also add host-pkgconf to detect sqlite support, otherwise

checking pkg-config is at least version 0.9.0...
./configure: line 7981: /home/buildroot/br2/output/host/usr/bin/pkg-config: No such file or directory
no
[...]
checking for SQLITE3... no

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/gnupg2/gnupg2.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

package/gnupg2/gnupg2.mk +8 -1

index 55190cc80..d7f277cdf 100644
@@ -10,7 +10,7 @@ GNUPG2_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
 GNUPG2_LICENSE = GPLv3+
 GNUPG2_LICENSE_FILES = COPYING
 GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \
-	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
+	$(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
 
 GNUPG2_CONF_OPTS = \
 	--disable-rpath --disable-regex --disable-doc \

@@ -49,4 +49,11 @@ else
 GNUPG2_CONF_OPTS += --without-readline
 endif
 
+ifeq ($(BR2_PACKAGE_SQLITE),y)
+GNUPG2_CONF_OPTS += --enable-sqlite
+GNUPG2_DEPENDENCIES += sqlite
+else
+GNUPG2_CONF_OPTS += --disable-sqlite
+endif
+
 $(eval $(autotools-package))

Signature · 1 line

2.11.0

Bernd Kuhls

author

2017-03-12 11:33 UTC #4 lore raw

PATCH 5/5 package/gnupg2: add optional support for gnutls

In reply to Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/gnupg2/gnupg2.mk | 7 +++++++
 1 file changed, 7 insertions(+)

package/gnupg2/gnupg2.mk +7 -0

index d7f277cdf..5815e7003 100644
@@ -35,6 +35,13 @@ else
 GNUPG2_CONF_OPTS += --disable-bzip2
 endif
 
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+GNUPG2_CONF_OPTS += --enable-gnutls
+GNUPG2_DEPENDENCIES += gnutls
+else
+GNUPG2_CONF_OPTS += --disable-gnutls
+endif
+
 ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
 GNUPG2_CONF_OPTS += --enable-ccid-driver
 GNUPG2_DEPENDENCIES += libusb-compat

Signature · 1 line

2.11.0

Thomas Petazzoni

2017-03-19 20:53 UTC #5 lore raw

PATCH 1/5 package/libgpg-error: bump version to 1.27

In reply to Bernd Kuhls

Hello,

Quoted 5 lines · Bernd Kuhls

Signed-off-by Bernd Kuhls <[email protected]>

---
 package/libgpg-error/libgpg-error.hash | 2 +-
 package/libgpg-error/libgpg-error.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Entire series applied. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com