[ptxdist] [PATCH 4/4] gnupg: version bump 2.2.5 -> 2.2.9
Signed-off-by: Clemens Gruber --- 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
[ptxdist] [PATCH 3/4] libgpg-error: version bump 1.28 -> 1.32
The patch is now upstream and therefore removed.
Signed-off-by: Clemens Gruber
---
...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..0
---
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
-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
-
-Signed-off-by: Werner Koch
-Signed-off-by: Baruch Siach
- 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..0
--- 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 2/4] libgcrypt: version bump 1.8.2 -> 1.8.3
Fixes CVE-2018-0495. Also switch to official HTTPS URL. Signed-off-by: Clemens Gruber --- 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 1/4] e2fsprogs: version bump 1.44.1 -> 1.44.3
License file hash changed due to an update to the FSF address in Boston. Signed-off-by: Clemens Gruber --- 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
Re: [ptxdist] [PATCH v4 5/6] sdl2-ttf: add new package
On Tue, Jul 17, 2018 at 03:37:31PM +0200, Michael Grzeschik wrote:
> Signed-off-by: Michael Grzeschik
> ---
> v1 -> v2: - removed extra padding spaces from prompt
> - removed extra space on _LDFLAGS
> - added missing license to zlib
> - added a patch to select opengl dependency
> v2 -> v3: - nothing changed
> v3 -> v4: - nothing changed
>
> ...igure-make-opengl-support-switchable.patch | 38
> patches/SDL2_ttf-2.0.14/series| 4 ++
> rules/sdl2-test.in| 1 +
This should be in the sdl2-test patch and the patch order changed
accordingly. I've fixed it in my test branch, but please fix this if you
need to send a new version of sdl2-test.
Michael
> rules/sdl2-ttf.in | 12
> rules/sdl2-ttf.make | 61 +++
> 5 files changed, 116 insertions(+)
> create mode 100644
> patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch
> create mode 100644 patches/SDL2_ttf-2.0.14/series
> create mode 100644 rules/sdl2-ttf.in
> create mode 100644 rules/sdl2-ttf.make
>
> diff --git
> a/patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch
> b/patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch
> new file mode 100644
> index 0..8295b31f0
> --- /dev/null
> +++
> b/patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch
> @@ -0,0 +1,38 @@
> +From: Michael Grzeschik
> +Date: Fri, 13 Jul 2018 12:24:59 +0200
> +Subject: [PATCH] configure: make opengl support switchable
> +
> +Signed-off-by: Michael Grzeschik
> +---
> + configure | 4
> + 1 file changed, 4 insertions(+)
> +
> +diff --git a/configure b/configure
> +index 28b828e5b346..e2b73424659d 100755
> +--- a/configure
> b/configure
> +@@ -925,6 +925,7 @@ with_freetype_prefix
> + with_freetype_exec_prefix
> + with_sdl_prefix
> + with_sdl_exec_prefix
> ++enable_opengl
> + enable_sdltest
> + with_x
> + '
> +@@ -12953,6 +12954,7 @@ fi
> + esac
> + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL support" >&5
> + $as_echo_n "checking for OpenGL support... " >&6; }
> ++if test x$enable_opengl = x; then
> + have_opengl=no
> + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> + /* end confdefs.h. */
> +@@ -12975,6 +12977,8 @@ have_opengl=yes
> +
> + fi
> + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
> ++fi
> ++
> + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_opengl" >&5
> + $as_echo "$have_opengl" >&6; }
> + if test x$have_opengl = xyes; then
> diff --git a/patches/SDL2_ttf-2.0.14/series b/patches/SDL2_ttf-2.0.14/series
> new file mode 100644
> index 0..89c7959a2
> --- /dev/null
> +++ b/patches/SDL2_ttf-2.0.14/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-configure-make-opengl-support-switchable.patch
> +# 61c28fd8bd7358c69acd4d51c712869b - git-ptx-patches magic
> diff --git a/rules/sdl2-test.in b/rules/sdl2-test.in
> index f822c965c..ba1e84a44 100644
> --- a/rules/sdl2-test.in
> +++ b/rules/sdl2-test.in
> @@ -4,6 +4,7 @@ config SDL2_TEST
> tristate
> prompt "SDL2 test"
> select SDL2
> + select SDL2_TTF
> help
> Simple DirectMedia Layer is a cross-platform multimedia
> library designed to provide low level access to audio,
> diff --git a/rules/sdl2-ttf.in b/rules/sdl2-ttf.in
> new file mode 100644
> index 0..a14676933
> --- /dev/null
> +++ b/rules/sdl2-ttf.in
> @@ -0,0 +1,12 @@
> +## SECTION=multimedia_sdl
> +
> +config SDL2_TTF
> + tristate
> + select SDL2
> + select FREETYPE
> + prompt "SDL2 ttf"
> + help
> + This is a sample library which allows you to use TrueType
> + fonts in your SDL applications. It comes with an example
> + program "showfont" which displays an example string for a
> + given TrueType font file.
> diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make
> new file mode 100644
> index 0..6224fbde4
> --- /dev/null
> +++ b/rules/sdl2-ttf.make
> @@ -0,0 +1,61 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2018 by Michael Grzeschik
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_SDL2_TTF) += sdl2-ttf
> +
> +#
> +# Paths and names
> +#
> +SDL2_TTF_VERSION := 2.0.14
> +SDL2_TTF_MD5 := e53c05e1e7f1382c316afd6c763388b1
> +SDL2_TTF := SDL2_ttf-$(SDL2_TTF_VERSION)
> +SDL2_TTF_SUFFIX := tar.gz
> +SDL2_TTF_URL :=
> https://www.libsdl.org/projects/SDL_ttf/release/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
> +SDL2_TTF_SOURCE := $(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
> +SDL2_TTF_DIR := $(BUILDDIR)/$(SDL2_TTF)
> +SDL2_TTF_LICENSE := unknown
> +
> +#
>
Re: [ptxdist] [PATCH v4 1/6] sdl2: add new package
On Tue, Jul 17, 2018 at 03:37:27PM +0200, Michael Grzeschik wrote:
> Signed-off-by: Michael Grzeschik
> ---
> v1 -> v2: - added select to MESALIB_GL* on SDL2_OPENGL*
> - padded prompt entry with extra spaces
> v2 -> v3: - added patch to add egl cflags on configure.in and enabled
> autogen.sh
> v3 -> v4: - improved egl check with PKG_CHECK_MODULES
> - removed extract stage and added custom autogen.sh
>
> ...001-sdl-2.0.8-add-egl-cflags-to-test.patch | 55 +
> patches/SDL2-2.0.8/autogen.sh | 3 +
> patches/SDL2-2.0.8/series | 4 +
> rules/sdl2.in | 206 ++
> rules/sdl2.make | 153 +
> 5 files changed, 421 insertions(+)
> create mode 100644
> patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> create mode 100755 patches/SDL2-2.0.8/autogen.sh
> create mode 100644 patches/SDL2-2.0.8/series
> create mode 100644 rules/sdl2.in
> create mode 100644 rules/sdl2.make
>
> diff --git a/patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> b/patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> new file mode 100644
> index 0..c86d48e5a
> --- /dev/null
> +++ b/patches/SDL2-2.0.8/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> @@ -0,0 +1,55 @@
> +From: Sergey Zhuravlevich
> +Date: Mon, 16 Jul 2018 12:03:42 +0200
> +Subject: [PATCH] sdl-2.0.8: add egl-cflags to test
> +
> +- also call aclocal to expand PKG_CHECK_MODULES
> +
> +Signed-off-by: Sergey Zhuravlevich
> +Signed-off-by: Michael Grzeschik
> +---
> + autogen.sh | 2 +-
> + configure.in | 11 +++
> + 2 files changed, 12 insertions(+), 1 deletion(-)
> +
> +diff --git a/autogen.sh b/autogen.sh
> +index 9edfb8a7d913..2f1e2ef3d419 100755
> +--- a/autogen.sh
> b/autogen.sh
> +@@ -8,7 +8,7 @@ test -z "$srcdir" && srcdir=.
> + cd "$srcdir"
> +
> + # Regenerate configuration files
> +-cat acinclude/* >aclocal.m4
> ++aclocal
> + found=false
> + for autoconf in autoconf autoconf259 autoconf-2.59
> + do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break;
> fi
> +diff --git a/configure.in b/configure.in
> +index 1c7e79338a88..06e37a1b7f98 100644
> +--- a/configure.in
> b/configure.in
> +@@ -2335,6 +2335,14 @@ dnl Find OpenGL ES
> + CheckOpenGLESX11()
> + {
> + if test x$enable_video = xyes -a x$enable_video_opengles = xyes; then
> ++PKG_CHECK_MODULES(EGL, [egl], [have_egl="yes"], [have_egl="no"])
> ++
> ++save_CFLAGS="$CFLAGS"
> ++if test x$have_egl = xyes; then
> ++ CFLAGS="$save_CFLAGS $EGL_CFLAGS"
> ++ EXTRA_CFLAGS="$EXTRA_CFLAGS $EGL_CFLAGS"
> ++fi
> ++
> + AC_MSG_CHECKING(for EGL support)
> + video_opengl_egl=no
> + AC_TRY_COMPILE([
> +@@ -2347,6 +2355,9 @@ CheckOpenGLESX11()
> + video_opengl_egl=yes
> + ])
> + AC_MSG_RESULT($video_opengl_egl)
> ++
> ++CFLAGS="$save_CFLAGS"
> ++
> + if test x$video_opengl_egl = xyes; then
> + AC_DEFINE(SDL_VIDEO_OPENGL_EGL, 1, [ ])
> + fi
> diff --git a/patches/SDL2-2.0.8/autogen.sh b/patches/SDL2-2.0.8/autogen.sh
> new file mode 100755
> index 0..a430a4eb7
> --- /dev/null
> +++ b/patches/SDL2-2.0.8/autogen.sh
> @@ -0,0 +1,3 @@
> +#!/bin/sh
> +
> +./autogen.sh
> diff --git a/patches/SDL2-2.0.8/series b/patches/SDL2-2.0.8/series
> new file mode 100644
> index 0..3693c2785
> --- /dev/null
> +++ b/patches/SDL2-2.0.8/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-sdl-2.0.8-add-egl-cflags-to-test.patch
> +# 57d72a951bd7f961008ad5274d82876a - git-ptx-patches magic
> diff --git a/rules/sdl2.in b/rules/sdl2.in
> new file mode 100644
> index 0..54edea6ab
> --- /dev/null
> +++ b/rules/sdl2.in
> @@ -0,0 +1,206 @@
> +## SECTION=multimedia_sdl
> +
> +menuconfig SDL2
> + tristate
> + prompt "SDL2 "
> + select LIBC_M
> + select LIBC_DL
> + select LIBC_PTHREAD
> + select GCCLIBS_GCC_S
> + select LIBUNWIND
> + select CROSS_NASM if SDL2_VIDEO
> + select ALSA_LIB if SDL2_ALSA
> + select XORG_LIB_X11 if SDL2_XORG
> + select XORG_LIB_XT if SDL2_XORG
> + select XORG_LIB_XVMCif SDL2_XORG && SDL2_VIDEO
> + select DIRECTFB if SDL2_DIRECTFB
> + select TSLIBif SDL2_TSLIB
> + select DBUS if SDL2_DBUS
> + select LIBDRM if SDL2_WAYLAND
> + select MESALIB_GLX if SDL2_OPENGL
> + select MESALIB_GLES1if SDL2_OPENGLES1
> + select MESALIB_GLES2if SDL2_OPENGLES2
> + select MESALIB if SDL2_WAYLAND
> + select MESALIB_GBM if SDL2_WAYLAND
> + select MESALIB_EGL if SDL2_WAYLAND
> + select
