* [ptxdist] [PATCH v2] dump1090fa: Version bump 6.1 -> 7.1
@ 2022-01-27 18:07 Christian Melki
2022-01-27 18:07 ` [ptxdist] [PATCH v2] tpm2-tools: Version bump. 4.1 -> 5.2 Christian Melki
2022-01-30 15:49 ` [ptxdist] [APPLIED] dump1090fa: Version bump 6.1 -> 7.1 Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Christian Melki @ 2022-01-27 18:07 UTC (permalink / raw)
To: ptxdist
Mostly bugfixes. Including the build fix previously included.
Remove patches.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
.../dump1090fa-6.1/fix_cpufeatures_arch.patch | 61 -------------------
patches/dump1090fa-6.1/series | 2 -
rules/dump1090fa.make | 4 +-
3 files changed, 2 insertions(+), 65 deletions(-)
delete mode 100644 patches/dump1090fa-6.1/fix_cpufeatures_arch.patch
delete mode 100644 patches/dump1090fa-6.1/series
diff --git a/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch b/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch
deleted file mode 100644
index 270a35846..000000000
--- a/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 059e48b82beb4fb920cca977b02db1ceb48facb9 Mon Sep 17 00:00:00 2001
-From: Oliver Jowett <oliver.jowett@flightaware.com>
-Date: Thu, 23 Sep 2021 13:23:17 +0800
-Subject: [PATCH] Allow env vars (not only command line overrides) to set
- CPUFEATURES_{ARCH,UNAME}. Change CPUFEATURES_{ARCH,UNAME} defaults to use
- {ARCH,UNAME} values.
-
-Fixes #158
----
- Makefile | 8 ++++++--
- Makefile.cpufeatures | 4 ++--
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a85d154c5..9d81ed157 100644
---- a/Makefile
-+++ b/Makefile
-@@ -39,7 +39,11 @@ else
- LIMESDR ?= no
- endif
-
--UNAME := $(shell uname)
-+HOST_UNAME := $(shell uname)
-+HOST_ARCH := $(shell uname -m)
-+
-+UNAME ?= $(HOST_UNAME)
-+ARCH ?= $(HOST_ARCH)
-
- ifeq ($(UNAME), Linux)
- CPPFLAGS += -D_DEFAULT_SOURCE
-@@ -150,7 +154,6 @@ endif
- ## starch (runtime DSP code selection) mix, architecture-specific
- ##
-
--ARCH ?= $(shell uname -m)
- ifneq ($(CPUFEATURES),yes)
- # need to be able to detect CPU features at runtime to enable any non-standard compiler flags
- STARCH_MIX := generic
-@@ -180,6 +183,7 @@ include dsp/generated/makefile.$(STARCH_MIX)
- showconfig:
- @echo "Building with:" >&2
- @echo " Version string: $(DUMP1090_VERSION)" >&2
-+ @echo " Architecture: $(ARCH)" >&2
- @echo " DSP mix: $(STARCH_MIX)" >&2
- @echo " RTLSDR support: $(RTLSDR)" >&2
- @echo " BladeRF support: $(BLADERF)" >&2
-diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures
-index 8c3b8418d..6b4289978 100644
---- a/Makefile.cpufeatures
-+++ b/Makefile.cpufeatures
-@@ -2,8 +2,8 @@
-
- # cmake integration is a little tricky, so let's do this by hand for now
-
--CPUFEATURES_UNAME := $(shell uname)
--CPUFEATURES_ARCH := $(shell uname -m)
-+CPUFEATURES_UNAME ?= $(UNAME)
-+CPUFEATURES_ARCH ?= $(ARCH)
-
- CPUFEATURES_OBJS := cpu_features/src/filesystem.o cpu_features/src/stack_line_reader.o cpu_features/src/string_view.o
- CPUFEATURES_CFLAGS := -std=c99 -O -g -DSTACK_LINE_READER_BUFFER_SIZE=1024 -DNDEBUG
diff --git a/patches/dump1090fa-6.1/series b/patches/dump1090fa-6.1/series
deleted file mode 100644
index cc3b46e66..000000000
--- a/patches/dump1090fa-6.1/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix_cpufeatures_arch.patch
-
diff --git a/rules/dump1090fa.make b/rules/dump1090fa.make
index c22e11c40..366209805 100644
--- a/rules/dump1090fa.make
+++ b/rules/dump1090fa.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_DUMP1090FA) += dump1090fa
#
# Paths and names
#
-DUMP1090FA_VERSION := 6.1
-DUMP1090FA_MD5 := a7cb661bc23974f8bf7650ce26b6e0be
+DUMP1090FA_VERSION := 7.1
+DUMP1090FA_MD5 := e50b888f2d9ec86a15cd39f997eb099b
DUMP1090FA := dump1090fa-$(DUMP1090FA_VERSION)
DUMP1090FA_SUFFIX := tar.gz
DUMP1090FA_URL := https://github.com/flightaware/dump1090/archive/refs/tags/v$(DUMP1090FA_VERSION).$(DUMP1090FA_SUFFIX)
--
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 v2] tpm2-tools: Version bump. 4.1 -> 5.2
2022-01-27 18:07 [ptxdist] [PATCH v2] dump1090fa: Version bump 6.1 -> 7.1 Christian Melki
@ 2022-01-27 18:07 ` Christian Melki
2022-01-28 9:39 ` Michael Olbrich
2022-01-30 15:49 ` [ptxdist] [APPLIED] dump1090fa: Version bump 6.1 -> 7.1 Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Christian Melki @ 2022-01-27 18:07 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.
tpm2-tools now depend on EFIVAR.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/tpm2-tools.in | 1 +
rules/tpm2-tools.make | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/rules/tpm2-tools.in b/rules/tpm2-tools.in
index 4c9cbaa92..99482845b 100644
--- a/rules/tpm2-tools.in
+++ b/rules/tpm2-tools.in
@@ -5,6 +5,7 @@ config TPM2_TOOLS
select TPM2_TSS
select OPENSSL
select LIBCURL
+ select EFIVAR
prompt "tpm2-tools"
help
This package contains a set of tools to use with TPM 2.0
diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make
index ead881ffb..1c0fc190c 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
--
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] [PATCH v2] tpm2-tools: Version bump. 4.1 -> 5.2
2022-01-27 18:07 ` [ptxdist] [PATCH v2] tpm2-tools: Version bump. 4.1 -> 5.2 Christian Melki
@ 2022-01-28 9:39 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2022-01-28 9:39 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
On Thu, Jan 27, 2022 at 07:07:41PM +0100, Christian Melki wrote:
> Approx 2 years worth of fixes.
> https://github.com/tpm2-software/tpm2-tools/releases
>
> Fixes CVE-2021-3565.
> Update license file hash.
> tpm2-tools now depend on EFIVAR.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> rules/tpm2-tools.in | 1 +
> rules/tpm2-tools.make | 6 +++---
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/rules/tpm2-tools.in b/rules/tpm2-tools.in
> index 4c9cbaa92..99482845b 100644
> --- a/rules/tpm2-tools.in
> +++ b/rules/tpm2-tools.in
> @@ -5,6 +5,7 @@ config TPM2_TOOLS
> select TPM2_TSS
> select OPENSSL
> select LIBCURL
> + select EFIVAR
See my other mail about this.
Michael
> prompt "tpm2-tools"
> help
> This package contains a set of tools to use with TPM 2.0
> diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make
> index ead881ffb..1c0fc190c 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
> --
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] dump1090fa: Version bump 6.1 -> 7.1
2022-01-27 18:07 [ptxdist] [PATCH v2] dump1090fa: Version bump 6.1 -> 7.1 Christian Melki
2022-01-27 18:07 ` [ptxdist] [PATCH v2] tpm2-tools: Version bump. 4.1 -> 5.2 Christian Melki
@ 2022-01-30 15:49 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2022-01-30 15:49 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 752f24d63726100c02246c669056267b23be7117.
Michael
[sent from post-receive hook]
On Sun, 30 Jan 2022 16:49:45 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Mostly bugfixes. Including the build fix previously included.
> Remove patches.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220127180741.3470680-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch b/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch
> deleted file mode 100644
> index 270a358463fb..000000000000
> --- a/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -From 059e48b82beb4fb920cca977b02db1ceb48facb9 Mon Sep 17 00:00:00 2001
> -From: Oliver Jowett <oliver.jowett@flightaware.com>
> -Date: Thu, 23 Sep 2021 13:23:17 +0800
> -Subject: [PATCH] Allow env vars (not only command line overrides) to set
> - CPUFEATURES_{ARCH,UNAME}. Change CPUFEATURES_{ARCH,UNAME} defaults to use
> - {ARCH,UNAME} values.
> -
> -Fixes #158
> ----
> - Makefile | 8 ++++++--
> - Makefile.cpufeatures | 4 ++--
> - 2 files changed, 8 insertions(+), 4 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index a85d154c5..9d81ed157 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -39,7 +39,11 @@ else
> - LIMESDR ?= no
> - endif
> -
> --UNAME := $(shell uname)
> -+HOST_UNAME := $(shell uname)
> -+HOST_ARCH := $(shell uname -m)
> -+
> -+UNAME ?= $(HOST_UNAME)
> -+ARCH ?= $(HOST_ARCH)
> -
> - ifeq ($(UNAME), Linux)
> - CPPFLAGS += -D_DEFAULT_SOURCE
> -@@ -150,7 +154,6 @@ endif
> - ## starch (runtime DSP code selection) mix, architecture-specific
> - ##
> -
> --ARCH ?= $(shell uname -m)
> - ifneq ($(CPUFEATURES),yes)
> - # need to be able to detect CPU features at runtime to enable any non-standard compiler flags
> - STARCH_MIX := generic
> -@@ -180,6 +183,7 @@ include dsp/generated/makefile.$(STARCH_MIX)
> - showconfig:
> - @echo "Building with:" >&2
> - @echo " Version string: $(DUMP1090_VERSION)" >&2
> -+ @echo " Architecture: $(ARCH)" >&2
> - @echo " DSP mix: $(STARCH_MIX)" >&2
> - @echo " RTLSDR support: $(RTLSDR)" >&2
> - @echo " BladeRF support: $(BLADERF)" >&2
> -diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures
> -index 8c3b8418d..6b4289978 100644
> ---- a/Makefile.cpufeatures
> -+++ b/Makefile.cpufeatures
> -@@ -2,8 +2,8 @@
> -
> - # cmake integration is a little tricky, so let's do this by hand for now
> -
> --CPUFEATURES_UNAME := $(shell uname)
> --CPUFEATURES_ARCH := $(shell uname -m)
> -+CPUFEATURES_UNAME ?= $(UNAME)
> -+CPUFEATURES_ARCH ?= $(ARCH)
> -
> - CPUFEATURES_OBJS := cpu_features/src/filesystem.o cpu_features/src/stack_line_reader.o cpu_features/src/string_view.o
> - CPUFEATURES_CFLAGS := -std=c99 -O -g -DSTACK_LINE_READER_BUFFER_SIZE=1024 -DNDEBUG
> diff --git a/patches/dump1090fa-6.1/series b/patches/dump1090fa-6.1/series
> deleted file mode 100644
> index cc3b46e66811..000000000000
> --- a/patches/dump1090fa-6.1/series
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -fix_cpufeatures_arch.patch
> -
> diff --git a/rules/dump1090fa.make b/rules/dump1090fa.make
> index c22e11c40f95..366209805727 100644
> --- a/rules/dump1090fa.make
> +++ b/rules/dump1090fa.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_DUMP1090FA) += dump1090fa
> #
> # Paths and names
> #
> -DUMP1090FA_VERSION := 6.1
> -DUMP1090FA_MD5 := a7cb661bc23974f8bf7650ce26b6e0be
> +DUMP1090FA_VERSION := 7.1
> +DUMP1090FA_MD5 := e50b888f2d9ec86a15cd39f997eb099b
> DUMP1090FA := dump1090fa-$(DUMP1090FA_VERSION)
> DUMP1090FA_SUFFIX := tar.gz
> DUMP1090FA_URL := https://github.com/flightaware/dump1090/archive/refs/tags/v$(DUMP1090FA_VERSION).$(DUMP1090FA_SUFFIX)
_______________________________________________
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-01-30 15:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-27 18:07 [ptxdist] [PATCH v2] dump1090fa: Version bump 6.1 -> 7.1 Christian Melki
2022-01-27 18:07 ` [ptxdist] [PATCH v2] tpm2-tools: Version bump. 4.1 -> 5.2 Christian Melki
2022-01-28 9:39 ` Michael Olbrich
2022-01-30 15:49 ` [ptxdist] [APPLIED] dump1090fa: Version bump 6.1 -> 7.1 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox