* [ptxdist] [PATCH v3] libsndfile: Version bump 1.0.25 -> 1.0.31. @ 2022-02-04 21:51 Christian Melki 2022-02-04 21:51 ` [ptxdist] [PATCH v5] tpm2-tools: Version bump. 4.1 -> 5.2 Christian Melki 2022-02-14 12:43 ` [ptxdist] [APPLIED] libsndfile: Version bump 1.0.25 -> 1.0.31 Michael Olbrich 0 siblings, 2 replies; 4+ messages in thread From: Christian Melki @ 2022-02-04 21:51 UTC (permalink / raw) To: ptxdist 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> --- ...igure.ac-use-default-largefile-macro.patch | 22 ------------------- patches/libsndfile-1.0.25/autogen.sh | 19 ---------------- patches/libsndfile-1.0.25/series | 4 ---- rules/libsndfile.in | 1 + rules/libsndfile.make | 10 ++++----- 5 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 patches/libsndfile-1.0.25/0001-configure.ac-use-default-largefile-macro.patch delete mode 100755 patches/libsndfile-1.0.25/autogen.sh delete mode 100644 patches/libsndfile-1.0.25/series 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: -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH v5] tpm2-tools: Version bump. 4.1 -> 5.2 2022-02-04 21:51 [ptxdist] [PATCH v3] libsndfile: Version bump 1.0.25 -> 1.0.31 Christian Melki @ 2022-02-04 21:51 ` Christian Melki 2022-02-14 12:43 ` [ptxdist] [APPLIED] " Michael Olbrich 2022-02-14 12:43 ` [ptxdist] [APPLIED] libsndfile: Version bump 1.0.25 -> 1.0.31 Michael Olbrich 1 sibling, 1 reply; 4+ messages in thread From: Christian Melki @ 2022-02-04 21:51 UTC (permalink / raw) To: ptxdist Approx 2 years worth of fixes. https://github.com/tpm2-software/tpm2-tools/releases * Fixes CVE-2021-3565. * Update license file hash. File moved to a new directory. * tpm2-tools now optionally depends on EFIVAR for prettyprinting device paths. * Update tpm2 binaries. Change them to softlinks. Binary wants to be called busybox-style. Signed-off-by: Christian Melki <christian.melki@t2data.com> --- rules/tpm2-tools.in | 14 +++++++++++++- rules/tpm2-tools.make | 34 +++++++++++++++++++++++++++------- 2 files changed, 40 insertions(+), 8 deletions(-) diff --git a/rules/tpm2-tools.in b/rules/tpm2-tools.in index 4c9cbaa92..20a3a7b7e 100644 --- a/rules/tpm2-tools.in +++ b/rules/tpm2-tools.in @@ -1,13 +1,25 @@ ## SECTION=tpm -config TPM2_TOOLS +menuconfig TPM2_TOOLS tristate select TPM2_TSS select OPENSSL select LIBCURL + select EFIVAR if TPM2_TOOLS_USE_EFIVAR prompt "tpm2-tools" help This package contains a set of tools to use with TPM 2.0 chips, for common tasks and features provided by the hardware; such as for doing basic key management, attestation, encryption and signing. + +if TPM2_TOOLS + +config TPM2_TOOLS_USE_EFIVAR + bool + prompt "Use efivar" + help + Building with efivar enables pretty-printing of + the device path. + +endif diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make index ead881ffb..357bb245e 100644 --- a/rules/tpm2-tools.make +++ b/rules/tpm2-tools.make @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_TPM2_TOOLS) += tpm2-tools # # Paths and names # -TPM2_TOOLS_VERSION := 4.1 -TPM2_TOOLS_MD5 := aecec22668233776922909f2ebf55e65 +TPM2_TOOLS_VERSION := 5.2 +TPM2_TOOLS_MD5 := 0057615ef43b9322d4577fc3bde0e8d6 TPM2_TOOLS := tpm2-tools-$(TPM2_TOOLS_VERSION) TPM2_TOOLS_SUFFIX := tar.gz TPM2_TOOLS_URL := https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX) TPM2_TOOLS_SOURCE := $(SRCDIR)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX) TPM2_TOOLS_DIR := $(BUILDDIR)/$(TPM2_TOOLS) TPM2_TOOLS_LICENSE := BSD-3-Clause -TPM2_TOOLS_LICENSE_FILES := file://LICENSE;md5=0eb1216e46938bd723098d93a23c3bcc +TPM2_TOOLS_LICENSE_FILES := file://doc/LICENSE;md5=a846608d090aa64494c45fc147cc12e3 # ---------------------------------------------------------------------------- # Prepare @@ -32,6 +32,10 @@ TPM2_TOOLS_LICENSE_FILES := file://LICENSE;md5=0eb1216e46938bd723098d93a23c3bcc # autoconf # TPM2_TOOLS_CONF_TOOL := autoconf +TPM2_TOOLS_CONF_ENV := \ + $(CROSS_ENV) \ + $(call ptx/ifdef, PTXCONF_TPM2_TOOLS_USE_EFIVAR,,ac_cv_header_efivar_efivar_h=no) + TPM2_TOOLS_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --enable-debug=info \ @@ -48,10 +52,11 @@ TPM2_TOOLS_CFLAGS := \ # Target-Install # ---------------------------------------------------------------------------- -TPM2_TOOLS_PROGS := \ +TPM2_TOOLS_TPM2_PROGS := \ tpm2_activatecredential \ tpm2_certify \ tpm2_certifycreation \ + tpm2_certifyX509certutil \ tpm2_changeauth \ tpm2_changeeps \ tpm2_changepps \ @@ -59,6 +64,7 @@ TPM2_TOOLS_PROGS := \ tpm2_clear \ tpm2_clearcontrol \ tpm2_clockrateadjust \ + tpm2_commit \ tpm2_create \ tpm2_createak \ tpm2_createek \ @@ -66,12 +72,20 @@ TPM2_TOOLS_PROGS := \ tpm2_createprimary \ tpm2_dictionarylockout \ tpm2_duplicate \ + tpm2_ecdhkeygen \ + tpm2_ecdhzgen \ + tpm2_ecephemeral \ tpm2_encryptdecrypt \ + tpm2_eventlog \ tpm2_evictcontrol \ tpm2_flushcontext \ tpm2_getcap \ + tpm2_getcommandauditdigest \ + tpm2_geteccparameters \ tpm2_getekcertificate \ + tpm2_getpolicydigest \ tpm2_getrandom \ + tpm2_getsessionauditdigest \ tpm2_gettestresult \ tpm2_gettime \ tpm2_hash \ @@ -103,6 +117,7 @@ TPM2_TOOLS_PROGS := \ tpm2_policyauthvalue \ tpm2_policycommandcode \ tpm2_policycountertimer \ + tpm2_policycphash \ tpm2_policyduplicationselect \ tpm2_policylocality \ tpm2_policynamehash \ @@ -125,7 +140,9 @@ TPM2_TOOLS_PROGS := \ tpm2_rsaencrypt \ tpm2_selftest \ tpm2_send \ + tpm2_sessionconfig \ tpm2_setclock \ + tpm2_setcommandauditstatus \ tpm2_setprimarypolicy \ tpm2_shutdown \ tpm2_sign \ @@ -134,7 +151,8 @@ TPM2_TOOLS_PROGS := \ tpm2_stirrandom \ tpm2_testparms \ tpm2_unseal \ - tpm2_verifysignature + tpm2_verifysignature \ + tpm2_zgen2phase $(STATEDIR)/tpm2-tools.targetinstall: @$(call targetinfo) @@ -145,8 +163,10 @@ $(STATEDIR)/tpm2-tools.targetinstall: @$(call install_fixup, tpm2-tools,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>") @$(call install_fixup, tpm2-tools,DESCRIPTION,missing) - @$(foreach prog, $(TPM2_TOOLS_PROGS), \ - $(call install_copy, tpm2-tools, 0, 0, 0755, -, /usr/bin/$(prog))$(ptx/nl)) + @$(call install_copy, tpm2-tools, 0, 0, 0755, -, /usr/bin/tpm2) + + @$(foreach prog, $(TPM2_TOOLS_TPM2_PROGS), \ + @$(call install_link, tpm2-tools, tpm2, /usr/bin/$(prog))$(ptx/nl)) @$(call install_finish, tpm2-tools) -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] tpm2-tools: Version bump. 4.1 -> 5.2 2022-02-04 21:51 ` [ptxdist] [PATCH v5] tpm2-tools: Version bump. 4.1 -> 5.2 Christian Melki @ 2022-02-14 12:43 ` Michael Olbrich 0 siblings, 0 replies; 4+ messages in thread From: Michael Olbrich @ 2022-02-14 12:43 UTC (permalink / raw) To: ptxdist; +Cc: Christian Melki Thanks, applied as 87db4f13e1ff9769b8aad9020f7ce523e332dcae. Michael [sent from post-receive hook] On Mon, 14 Feb 2022 13:43:24 +0100, Christian Melki <christian.melki@t2data.com> wrote: > Approx 2 years worth of fixes. > https://github.com/tpm2-software/tpm2-tools/releases > > * Fixes CVE-2021-3565. > * Update license file hash. File moved to a new directory. > * tpm2-tools now optionally depends on EFIVAR for prettyprinting > device paths. > * Update tpm2 binaries. Change them to softlinks. Binary wants > to be called busybox-style. > > Signed-off-by: Christian Melki <christian.melki@t2data.com> > Message-Id: <20220204215102.1833387-2-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > > diff --git a/rules/tpm2-tools.in b/rules/tpm2-tools.in > index 4c9cbaa92352..20a3a7b7eded 100644 > --- a/rules/tpm2-tools.in > +++ b/rules/tpm2-tools.in > @@ -1,13 +1,25 @@ > ## SECTION=tpm > > -config TPM2_TOOLS > +menuconfig TPM2_TOOLS > tristate > select TPM2_TSS > select OPENSSL > select LIBCURL > + select EFIVAR if TPM2_TOOLS_USE_EFIVAR > prompt "tpm2-tools" > help > This package contains a set of tools to use with TPM 2.0 > chips, for common tasks and features provided by the > hardware; such as for doing basic key management, > attestation, encryption and signing. > + > +if TPM2_TOOLS > + > +config TPM2_TOOLS_USE_EFIVAR > + bool > + prompt "Use efivar" > + help > + Building with efivar enables pretty-printing of > + the device path. > + > +endif > diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make > index ead881ffb3bb..357bb245e0a3 100644 > --- a/rules/tpm2-tools.make > +++ b/rules/tpm2-tools.make > @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_TPM2_TOOLS) += tpm2-tools > # > # Paths and names > # > -TPM2_TOOLS_VERSION := 4.1 > -TPM2_TOOLS_MD5 := aecec22668233776922909f2ebf55e65 > +TPM2_TOOLS_VERSION := 5.2 > +TPM2_TOOLS_MD5 := 0057615ef43b9322d4577fc3bde0e8d6 > TPM2_TOOLS := tpm2-tools-$(TPM2_TOOLS_VERSION) > TPM2_TOOLS_SUFFIX := tar.gz > TPM2_TOOLS_URL := https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX) > TPM2_TOOLS_SOURCE := $(SRCDIR)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX) > TPM2_TOOLS_DIR := $(BUILDDIR)/$(TPM2_TOOLS) > TPM2_TOOLS_LICENSE := BSD-3-Clause > -TPM2_TOOLS_LICENSE_FILES := file://LICENSE;md5=0eb1216e46938bd723098d93a23c3bcc > +TPM2_TOOLS_LICENSE_FILES := file://doc/LICENSE;md5=a846608d090aa64494c45fc147cc12e3 > > # ---------------------------------------------------------------------------- > # Prepare > @@ -32,6 +32,10 @@ TPM2_TOOLS_LICENSE_FILES := file://LICENSE;md5=0eb1216e46938bd723098d93a23c3bcc > # autoconf > # > TPM2_TOOLS_CONF_TOOL := autoconf > +TPM2_TOOLS_CONF_ENV := \ > + $(CROSS_ENV) \ > + $(call ptx/ifdef, PTXCONF_TPM2_TOOLS_USE_EFIVAR,,ac_cv_header_efivar_efivar_h=no) > + > TPM2_TOOLS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-debug=info \ > @@ -48,10 +52,11 @@ TPM2_TOOLS_CFLAGS := \ > # Target-Install > # ---------------------------------------------------------------------------- > > -TPM2_TOOLS_PROGS := \ > +TPM2_TOOLS_TPM2_PROGS := \ > tpm2_activatecredential \ > tpm2_certify \ > tpm2_certifycreation \ > + tpm2_certifyX509certutil \ > tpm2_changeauth \ > tpm2_changeeps \ > tpm2_changepps \ > @@ -59,6 +64,7 @@ TPM2_TOOLS_PROGS := \ > tpm2_clear \ > tpm2_clearcontrol \ > tpm2_clockrateadjust \ > + tpm2_commit \ > tpm2_create \ > tpm2_createak \ > tpm2_createek \ > @@ -66,12 +72,20 @@ TPM2_TOOLS_PROGS := \ > tpm2_createprimary \ > tpm2_dictionarylockout \ > tpm2_duplicate \ > + tpm2_ecdhkeygen \ > + tpm2_ecdhzgen \ > + tpm2_ecephemeral \ > tpm2_encryptdecrypt \ > + tpm2_eventlog \ > tpm2_evictcontrol \ > tpm2_flushcontext \ > tpm2_getcap \ > + tpm2_getcommandauditdigest \ > + tpm2_geteccparameters \ > tpm2_getekcertificate \ > + tpm2_getpolicydigest \ > tpm2_getrandom \ > + tpm2_getsessionauditdigest \ > tpm2_gettestresult \ > tpm2_gettime \ > tpm2_hash \ > @@ -103,6 +117,7 @@ TPM2_TOOLS_PROGS := \ > tpm2_policyauthvalue \ > tpm2_policycommandcode \ > tpm2_policycountertimer \ > + tpm2_policycphash \ > tpm2_policyduplicationselect \ > tpm2_policylocality \ > tpm2_policynamehash \ > @@ -125,7 +140,9 @@ TPM2_TOOLS_PROGS := \ > tpm2_rsaencrypt \ > tpm2_selftest \ > tpm2_send \ > + tpm2_sessionconfig \ > tpm2_setclock \ > + tpm2_setcommandauditstatus \ > tpm2_setprimarypolicy \ > tpm2_shutdown \ > tpm2_sign \ > @@ -134,7 +151,8 @@ TPM2_TOOLS_PROGS := \ > tpm2_stirrandom \ > tpm2_testparms \ > tpm2_unseal \ > - tpm2_verifysignature > + tpm2_verifysignature \ > + tpm2_zgen2phase > > $(STATEDIR)/tpm2-tools.targetinstall: > @$(call targetinfo) > @@ -145,8 +163,10 @@ $(STATEDIR)/tpm2-tools.targetinstall: > @$(call install_fixup, tpm2-tools,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>") > @$(call install_fixup, tpm2-tools,DESCRIPTION,missing) > > - @$(foreach prog, $(TPM2_TOOLS_PROGS), \ > - $(call install_copy, tpm2-tools, 0, 0, 0755, -, /usr/bin/$(prog))$(ptx/nl)) > + @$(call install_copy, tpm2-tools, 0, 0, 0755, -, /usr/bin/tpm2) > + > + @$(foreach prog, $(TPM2_TOOLS_TPM2_PROGS), \ > + @$(call install_link, tpm2-tools, tpm2, /usr/bin/$(prog))$(ptx/nl)) > > @$(call install_finish, tpm2-tools) > _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] libsndfile: Version bump 1.0.25 -> 1.0.31. 2022-02-04 21:51 [ptxdist] [PATCH v3] libsndfile: Version bump 1.0.25 -> 1.0.31 Christian Melki 2022-02-04 21:51 ` [ptxdist] [PATCH v5] tpm2-tools: Version bump. 4.1 -> 5.2 Christian Melki @ 2022-02-14 12:43 ` Michael Olbrich 1 sibling, 0 replies; 4+ messages in thread From: Michael Olbrich @ 2022-02-14 12:43 UTC (permalink / raw) To: ptxdist; +Cc: Christian Melki Thanks, applied as 297a79be4ce76540d365aad4ee72dc33a9d4f4df. Michael [sent from post-receive hook] On Mon, 14 Feb 2022 13:43:22 +0100, Christian Melki <christian.melki@t2data.com> 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 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> > > 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 7dbc92bc330e..000000000000 > --- 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 cf66cf33c7c8..000000000000 > --- 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 2c7bf05def16..000000000000 > --- 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 26cd8cb77cc3..98f8874fd131 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 b8b46e3abeca..3dbcede9265a 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: _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-14 12:44 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-02-04 21:51 [ptxdist] [PATCH v3] libsndfile: Version bump 1.0.25 -> 1.0.31 Christian Melki 2022-02-04 21:51 ` [ptxdist] [PATCH v5] tpm2-tools: Version bump. 4.1 -> 5.2 Christian Melki 2022-02-14 12:43 ` [ptxdist] [APPLIED] " Michael Olbrich 2022-02-14 12:43 ` [ptxdist] [APPLIED] libsndfile: Version bump 1.0.25 -> 1.0.31 Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox