Re: [ptxdist] [PATCH] libsndfile: Version bump 1.0.25 -> 1.0.31.

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Thu, Jan 27, 2022 at 03:35:28PM +0100, Christian Melki wrote:
> 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 largefile fix but keep autogen.
> libsndfile now depends on host-python.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
>  ...igure.ac-use-default-largefile-macro.patch | 22 -------------------
>  patches/libsndfile-1.0.25/series              |  4 ----
>  .../autogen.sh                                |  0
>  rules/libsndfile.in                           |  1 +
>  rules/libsndfile.make                         |  7 +++---
>  5 files changed, 5 insertions(+), 29 deletions(-)
>  delete mode 100644 patches/libsndfile-1.0.25/0001-configure.ac-use-default-largefile-macro.patch
>  delete mode 100644 patches/libsndfile-1.0.25/series
>  rename patches/{libsndfile-1.0.25 => libsndfile-1.0.31}/autogen.sh (100%)
> 
> 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/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/patches/libsndfile-1.0.25/autogen.sh b/patches/libsndfile-1.0.31/autogen.sh
> similarity index 100%
> rename from patches/libsndfile-1.0.25/autogen.sh
> rename to patches/libsndfile-1.0.31/autogen.sh
> 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..d2614c58b 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		:= b43ae73daf35b7b2dd0edd973a31e8fb
>  LIBSNDFILE		:= libsndfile-$(LIBSNDFILE_VERSION)
>  LIBSNDFILE_SUFFIX	:= tar.gz
> -LIBSNDFILE_URL		:= http://www.mega-nerd.com/libsndfile/files/$(LIBSNDFILE).$(LIBSNDFILE_SUFFIX)
> +LIBSNDFILE_URL		:= https://github.com/libsndfile/libsndfile/archive/refs/tags/$(LIBSNDFILE_VERSION).$(LIBSNDFILE_SUFFIX)

Use:

https://github.com/libsndfile/libsndfile/releases/download/1.0.31/libsndfile-1.0.31.tar.bz2

It contains the generated configure script, so you can drop the autogen.sh
link. But more importantly it also contains the generated
src/test_endswap.c.

Without this building may fail with:

cd ./src && autogen --writable test_endswap.def
/bin/bash: autogen: command not found

if GNU autogen is not installed.

Michael

>  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
>  
>  # ----------------------------------------------------------------------------
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de