[ptxdist] [PATCH 1/4] e2fsprogs: version bump 1.44.1 -> 1.44.3

[ptxdist] [PATCH 1/4] e2fsprogs: version bump 1.44.1 -> 1.44.3

[Clemens Gruber]

License file hash changed due to an update to the FSF address in Boston.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/e2fsprogs.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index dcc75079f..882c1b7f2 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -17,16 +17,16 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs
 #
 # Paths and names
 #
-E2FSPROGS_VERSION	:= 1.44.1
-E2FSPROGS_MD5		:= d6079b031682fa947ea0f96013379155
+E2FSPROGS_VERSION	:= 1.44.3
+E2FSPROGS_MD5		:= 6bd765f3cf8f15740cdf81e71e88f2a4
 E2FSPROGS		:= e2fsprogs-$(E2FSPROGS_VERSION)
 E2FSPROGS_SUFFIX	:= tar.gz
-E2FSPROGS_URL		:= $(call ptx/mirror, SF, e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
+E2FSPROGS_URL		:= $(call ptx/mirror, SF, e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
 E2FSPROGS_SOURCE	:= $(SRCDIR)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)
 E2FSPROGS_DIR		:= $(BUILDDIR)/$(E2FSPROGS)
 E2FSPROGS_LICENSE	:= GPL-2.0-or-later AND LGPL-2.0-or-later AND BSD-3-Clause AND MIT
 E2FSPROGS_LICENSE_FILES	:= \
-	file://NOTICE;md5=b48f21d765b875bd10400975d12c1ca2 \
+	file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \
 	file://lib/uuid/gen_uuid.c;startline=4;endline=31;md5=697cf5d1be275fa2588beaaf2bb481bd
 
 # ----------------------------------------------------------------------------
-- 
2.18.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/4] libgcrypt: version bump 1.8.2 -> 1.8.3

[Clemens Gruber]

Fixes CVE-2018-0495. Also switch to official HTTPS URL.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/libgcrypt.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make
index 2f3f8c1b5..5873e19bb 100644
--- a/rules/libgcrypt.make
+++ b/rules/libgcrypt.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_LIBGCRYPT) += libgcrypt
 #
 # Paths and names
 #
-LIBGCRYPT_VERSION	:= 1.8.2
-LIBGCRYPT_MD5		:= cfb0b5c79eab07686b6898160a407139
+LIBGCRYPT_VERSION	:= 1.8.3
+LIBGCRYPT_MD5		:= 3139c2402e844985a67fb288a930534d
 LIBGCRYPT		:= libgcrypt-$(LIBGCRYPT_VERSION)
 LIBGCRYPT_SUFFIX	:= tar.bz2
-LIBGCRYPT_URL		:= http://artfiles.org/gnupg.org/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) ftp://ftp.gnupg.org/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX)
+LIBGCRYPT_URL		:= https://gnupg.org/ftp/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) ftp://ftp.gnupg.org/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX)
 LIBGCRYPT_SOURCE	:= $(SRCDIR)/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX)
 LIBGCRYPT_DIR		:= $(BUILDDIR)/$(LIBGCRYPT)
 LIBGCRYPT_LICENSE	:= GPL-2.0-only AND LGPL-2.0-only
-- 
2.18.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/4] libgpg-error: version bump 1.28 -> 1.32

[Clemens Gruber]

The patch is now upstream and therefore removed.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 ...ion-on-arm64-due-to-invalid-use-of-v.patch | 53 -------------------
 patches/libgpg-error-1.28/series              |  4 --
 rules/libgpg-error.make                       |  4 +-
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100644 patches/libgpg-error-1.28/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch
 delete mode 100644 patches/libgpg-error-1.28/series

diff --git a/patches/libgpg-error-1.28/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch b/patches/libgpg-error-1.28/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch
deleted file mode 100644
index 8c7265a90..000000000
--- a/patches/libgpg-error-1.28/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Werner Koch <wk@gnupg.org>
-Date: Sun, 18 Mar 2018 17:39:43 +0100
-Subject: [PATCH] core: Fix regression on arm64 due to invalid use of va_list.
-
-* src/logging.c (_gpgrt_log_printhex): Provide a dummy arg instead of
-NULL.
---
-
-Fix
-Suggested-by: Jakub Wilk <jwilk@jwilk.net>
-
-Signed-off-by: Werner Koch <wk@gnupg.org>
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
- src/logging.c | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/src/logging.c b/src/logging.c
-index 1a4f6203d16d..d01f974e4545 100644
---- a/src/logging.c
-+++ b/src/logging.c
-@@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void)
- 
- 
- /* Print a hexdump of (BUFFER,LENGTH).  With FMT passed as NULL print
-- * just the raw dump, with FMT being an empty string, print a trailing
-- * linefeed, otherwise print an entire debug line with the expanded
-- * FMT followed by a possible wrapped hexdump and a final LF.  */
-+ * just the raw dump (in this case ARG_PTR is not used), with FMT
-+ * being an empty string, print a trailing linefeed, otherwise print
-+ * an entire debug line with the expanded FMT followed by a possible
-+ * wrapped hexdump and a final LF.  */
- void
- _gpgrt_logv_printhex (const void *buffer, size_t length,
-                       const char *fmt, va_list arg_ptr)
-@@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length,
-       va_end (arg_ptr);
-     }
-   else
--    _gpgrt_logv_printhex (buffer, length, NULL, NULL);
-+    {
-+      /* va_list is not necessary a pointer and thus we can't use NULL
-+       * because that would conflict with platforms using a straight
-+       * struct for it (e.g. arm64).  We use a dummy variable instead;
-+       * the static is a simple way zero it out so to not get
-+       * complains about uninitialized use.  */
-+      static va_list dummy_argptr;
-+
-+      _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr);
-+    }
- }
- 
- 
diff --git a/patches/libgpg-error-1.28/series b/patches/libgpg-error-1.28/series
deleted file mode 100644
index d627f12d0..000000000
--- a/patches/libgpg-error-1.28/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch
-# da99be1b79ee0b3994f2153e5ad33086  - git-ptx-patches magic
diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
index 525ab0c7a..0086f9047 100644
--- a/rules/libgpg-error.make
+++ b/rules/libgpg-error.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBGPG_ERROR) += libgpg-error
 #
 # Paths and names
 #
-LIBGPG_ERROR_VERSION	:= 1.28
-LIBGPG_ERROR_MD5	:= 2b072f6194eb22d48cd4c7c77e59b5af
+LIBGPG_ERROR_VERSION	:= 1.32
+LIBGPG_ERROR_MD5	:= ef3d928a5a453fa701ecc3bb22be1c64
 LIBGPG_ERROR		:= libgpg-error-$(LIBGPG_ERROR_VERSION)
 LIBGPG_ERROR_SUFFIX	:= tar.bz2
 LIBGPG_ERROR_URL	:= \
-- 
2.18.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 4/4] gnupg: version bump 2.2.5 -> 2.2.9

[Clemens Gruber]

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
 rules/gnupg.make | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules/gnupg.make b/rules/gnupg.make
index dad3ac3d6..dd00c87e2 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_GNUPG) += gnupg
 #
 # Paths and names
 #
-GNUPG_VERSION	:= 2.2.5
-GNUPG_MD5	:= 567cd2d41fa632903066fde73d2005cb
+GNUPG_VERSION	:= 2.2.9
+GNUPG_MD5	:= 52c895a81f514a65e08923736c38654a
 GNUPG		:= gnupg-$(GNUPG_VERSION)
 GNUPG_SUFFIX	:= tar.bz2
 GNUPG_URL	:= ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
@@ -75,6 +75,7 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \
 	--disable-dirmngr-auto-start \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-sqlite \
+	--disable-npth-debug \
 	--disable-ntbtls \
 	--disable-gnutls \
 	--disable-ldap \
-- 
2.18.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de