diff options
author | Christian Melki <christian.melki@t2data.com> | 2022-02-04 22:51:01 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2022-02-11 08:31:44 +0100 |
commit | 297a79be4ce76540d365aad4ee72dc33a9d4f4df (patch) | |
tree | c1eced028865c16a0895c706a15c0c133b3cb49b | |
parent | eb4331e7d82a871d5c5e519bb4c5ae4e123c52e1 (diff) | |
download | ptxdist-297a79be4ce76540d365aad4ee72dc33a9d4f4df.tar.gz ptxdist-297a79be4ce76540d365aad4ee72dc33a9d4f4df.tar.xz |
libsndfile: Version bump 1.0.25 -> 1.0.31.
4+ years worth of fixes. Lot of leaks fixed.
CVE-2017-12562, CVE-2017-17456, CVE-2017-17457, CVE-2018-19661,
CVE-2018-19662, CVE-2018-19758, CVE-2019-3832, CVE-2014-9496,
CVE-2014-9756, CVE-2015-7805 fixed.
* Remove old patch.
* Source now contains a generated configure, drop autogen.sh.
* libsndfile now depends on host-python.
* Drop test coverage binary.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
Message-Id: <20220204215102.1833387-1-christian.melki@t2data.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/libsndfile-1.0.25/0001-configure.ac-use-default-largefile-macro.patch | 22 | ||||
-rwxr-xr-x | patches/libsndfile-1.0.25/autogen.sh | 19 | ||||
-rw-r--r-- | patches/libsndfile-1.0.25/series | 4 | ||||
-rw-r--r-- | rules/libsndfile.in | 1 | ||||
-rw-r--r-- | rules/libsndfile.make | 10 |
5 files changed, 6 insertions, 50 deletions
diff --git a/patches/libsndfile-1.0.25/0001-configure.ac-use-default-largefile-macro.patch b/patches/libsndfile-1.0.25/0001-configure.ac-use-default-largefile-macro.patch deleted file mode 100644 index 7dbc92bc3..000000000 --- a/patches/libsndfile-1.0.25/0001-configure.ac-use-default-largefile-macro.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Sun, 12 Jan 2014 18:36:22 +0100 -Subject: [PATCH] configure.ac: use default largefile macro - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 20ba55a..72dccac 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -200,7 +200,7 @@ case "$host_os" in - pre_largefile_sizeof_off_t=$ac_cv_sizeof_off_t - unset ac_cv_sizeof_off_t - -- AC_SYS_EXTRA_LARGEFILE -+ AC_SYS_LARGEFILE - - if test "x$ac_cv_sys_largefile_CFLAGS" = "xno" ; then - ac_cv_sys_largefile_CFLAGS="" diff --git a/patches/libsndfile-1.0.25/autogen.sh b/patches/libsndfile-1.0.25/autogen.sh deleted file mode 100755 index cf66cf33c..000000000 --- a/patches/libsndfile-1.0.25/autogen.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -set -e - -aclocal $ACLOCAL_FLAGS - -libtoolize \ - --force \ - --copy - -autoreconf \ - --include=M4 \ - --force \ - --install \ - --warnings=cross \ - --warnings=syntax \ - --warnings=obsolete \ - --warnings=unsupported - diff --git a/patches/libsndfile-1.0.25/series b/patches/libsndfile-1.0.25/series deleted file mode 100644 index 2c7bf05de..000000000 --- a/patches/libsndfile-1.0.25/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-configure.ac-use-default-largefile-macro.patch -# b26d82dddc9376bd2a2696502b2b4dd2 - git-ptx-patches magic diff --git a/rules/libsndfile.in b/rules/libsndfile.in index 26cd8cb77..98f8874fd 100644 --- a/rules/libsndfile.in +++ b/rules/libsndfile.in @@ -3,6 +3,7 @@ menuconfig LIBSNDFILE tristate prompt "libsndfile " + select HOST_SYSTEM_PYTHON3 select LIBOGG if LIBSNDFILE_EXT_LIBS select LIBVORBIS if LIBSNDFILE_EXT_LIBS select FLAC if LIBSNDFILE_EXT_LIBS diff --git a/rules/libsndfile.make b/rules/libsndfile.make index b8b46e3ab..3dbcede92 100644 --- a/rules/libsndfile.make +++ b/rules/libsndfile.make @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBSNDFILE) += libsndfile # # Paths and names # -LIBSNDFILE_VERSION := 1.0.25 -LIBSNDFILE_MD5 := e2b7bb637e01022c7d20f95f9c3990a2 +LIBSNDFILE_VERSION := 1.0.31 +LIBSNDFILE_MD5 := 3f3b2a86a032f064ef922a2c8c191f7b LIBSNDFILE := libsndfile-$(LIBSNDFILE_VERSION) -LIBSNDFILE_SUFFIX := tar.gz -LIBSNDFILE_URL := http://www.mega-nerd.com/libsndfile/files/$(LIBSNDFILE).$(LIBSNDFILE_SUFFIX) +LIBSNDFILE_SUFFIX := tar.bz2 +LIBSNDFILE_URL := https://github.com/libsndfile/libsndfile/releases/download/$(LIBSNDFILE_VERSION)/$(LIBSNDFILE).$(LIBSNDFILE_SUFFIX) LIBSNDFILE_SOURCE := $(SRCDIR)/$(LIBSNDFILE).$(LIBSNDFILE_SUFFIX) LIBSNDFILE_DIR := $(BUILDDIR)/$(LIBSNDFILE) LIBSNDFILE_LICENSE := LGPL-2.1-only @@ -36,6 +36,7 @@ LIBSNDFILE_CONF_OPT := \ $(GLOBAL_LARGE_FILE_OPTION) \ --disable-octave \ --disable-alsa \ + --disable-test-coverage \ --$(call ptx/endis,PTXCONF_LIBSNDFILE_EXT_LIBS)-external-libs # ---------------------------------------------------------------------------- @@ -52,7 +53,6 @@ LIBSNDFILE_PROGS := \ sndfile-metadata-get \ sndfile-metadata-set \ sndfile-play \ - sndfile-regtest \ sndfile-salvage $(STATEDIR)/libsndfile.targetinstall: |