* [ptxdist] [PATCH] efivar: Version bump 37 -> 38.
2022-01-27 14:35 [ptxdist] [PATCH] wpa_supplicant: Version bump 2.9 -> 2.10 Christian Melki
@ 2022-01-27 14:35 ` Christian Melki
2022-01-28 10:17 ` Michael Olbrich
2022-01-27 14:35 ` [ptxdist] [PATCH] sysklogd: Version bump. 2.2.3 -> 2.3.0 Christian Melki
` (11 subsequent siblings)
12 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-27 14:35 UTC (permalink / raw)
To: ptxdist
Contains approx 2 years worth of fixes, including a lot
of compile error fixes. So drop old patchset.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
..._guid-handle-misaligned-guid-pointer.patch | 55 ------
...es-Werror-address-of-packed-member-c.patch | 167 ------------------
patches/efivar-37/series | 5 -
rules/efivar.make | 4 +-
4 files changed, 2 insertions(+), 229 deletions(-)
delete mode 100644 patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
delete mode 100644 patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch
delete mode 100644 patches/efivar-37/series
diff --git a/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch b/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
deleted file mode 100644
index 89e913a74..000000000
--- a/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Peter Jones <pjones@redhat.com>
-Date: Mon, 7 Jan 2019 10:30:59 -0500
-Subject: [PATCH] dp.h: make format_guid() handle misaligned guid pointers
- safely.
-
-GCC 9 adds -Werror=address-of-packed-member, which causes us to see the
-build error reported at
- https://bugzilla.opensuse.org/show_bug.cgi?id=1120862 .
-
-That bug report shows us the following:
-
-In file included from dp.c:26:
-dp.h: In function 'format_vendor_helper':
-dp.h:120:37: error: taking address of packed member of 'struct <anonymous>' may result in an unaligned pointer value [-Werror=address-of-packed-member]
- 120 | format_guid(buf, size, off, label, &dp->hw_vendor.vendor_guid);
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~
-dp.h:74:25: note: in definition of macro 'format_guid'
- 74 | _rc = efi_guid_to_str(guid, &_guidstr); \
- | ^~~~
-cc1: all warnings being treated as errors
-
-This patch makes format_guid() use a local variable as a bounce buffer
-in the case that the guid we're passed is aligned as chaotic neutral.
-
-Note that this only fixes this instance and there may be others that bz
-didn't show because it exited too soon, and I don't have a gcc 9 build
-in front of me right now.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/dp.h | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/src/dp.h b/src/dp.h
-index aa4e3902992d..20cb608d05f7 100644
---- a/src/dp.h
-+++ b/src/dp.h
-@@ -70,8 +70,15 @@
- #define format_guid(buf, size, off, dp_type, guid) ({ \
- int _rc; \
- char *_guidstr = NULL; \
-- \
-- _rc = efi_guid_to_str(guid, &_guidstr); \
-+ efi_guid_t _guid; \
-+ const efi_guid_t * const _guid_p = \
-+ likely(__alignof__(guid) == sizeof(guid)) \
-+ ? guid \
-+ : &_guid; \
-+ \
-+ if (unlikely(__alignof__(guid) == sizeof(guid))) \
-+ memmove(&_guid, guid, sizeof(_guid)); \
-+ _rc = efi_guid_to_str(_guid_p, &_guidstr); \
- if (_rc < 0) { \
- efi_error("could not build %s GUID DP string", \
- dp_type); \
diff --git a/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch b/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch
deleted file mode 100644
index 7653bd80a..000000000
--- a/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From: Peter Jones <pjones@redhat.com>
-Date: Thu, 21 Feb 2019 15:20:12 -0500
-Subject: [PATCH] Fix all the places -Werror=address-of-packed-member catches.
-
-This gets rid of all the places GCC 9's -Werror=address-of-packed-member
-flags as problematic.
-
-Fixes github issue #123
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/dp-message.c | 6 ++++--
- src/dp.h | 12 ++++--------
- src/guid.c | 2 +-
- src/include/efivar/efivar.h | 2 +-
- src/ucs2.h | 27 +++++++++++++++++++--------
- 5 files changed, 29 insertions(+), 20 deletions(-)
-
-diff --git a/src/dp-message.c b/src/dp-message.c
-index 3724e5f57bdb..9f964663de86 100644
---- a/src/dp-message.c
-+++ b/src/dp-message.c
-@@ -620,11 +620,13 @@ _format_message_dn(char *buf, size_t size, const_efidp dp)
- ) / sizeof(efi_ip_addr_t);
- format(buf, size, off, "Dns", "Dns(");
- for (int i=0; i < end; i++) {
-- const efi_ip_addr_t *addr = &dp->dns.addrs[i];
-+ efi_ip_addr_t addr;
-+
-+ memcpy(&addr, &dp->dns.addrs[i], sizeof(addr));
- if (i != 0)
- format(buf, size, off, "Dns", ",");
- format_ip_addr(buf, size, off, "Dns",
-- dp->dns.is_ipv6, addr);
-+ dp->dns.is_ipv6, &addr);
- }
- format(buf, size, off, "Dns", ")");
- break;
-diff --git a/src/dp.h b/src/dp.h
-index 20cb608d05f7..1f921d524aaf 100644
---- a/src/dp.h
-+++ b/src/dp.h
-@@ -71,13 +71,9 @@
- int _rc; \
- char *_guidstr = NULL; \
- efi_guid_t _guid; \
-- const efi_guid_t * const _guid_p = \
-- likely(__alignof__(guid) == sizeof(guid)) \
-- ? guid \
-- : &_guid; \
-- \
-- if (unlikely(__alignof__(guid) == sizeof(guid))) \
-- memmove(&_guid, guid, sizeof(_guid)); \
-+ const efi_guid_t * const _guid_p = &_guid; \
-+ \
-+ memmove(&_guid, guid, sizeof(_guid)); \
- _rc = efi_guid_to_str(_guid_p, &_guidstr); \
- if (_rc < 0) { \
- efi_error("could not build %s GUID DP string", \
-@@ -86,7 +82,7 @@
- _guidstr = onstack(_guidstr, \
- strlen(_guidstr)+1); \
- _rc = format(buf, size, off, dp_type, "%s", \
-- _guidstr); \
-+ _guidstr); \
- } \
- _rc; \
- })
-diff --git a/src/guid.c b/src/guid.c
-index 306c9ff8287c..3156b3b7c60a 100644
---- a/src/guid.c
-+++ b/src/guid.c
-@@ -31,7 +31,7 @@
- extern const efi_guid_t efi_guid_zero;
-
- int NONNULL(1, 2) PUBLIC
--efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b)
-+efi_guid_cmp(const void * const a, const void * const b)
- {
- return memcmp(a, b, sizeof (efi_guid_t));
- }
-diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h
-index 316891ccae9c..ad6449d9d938 100644
---- a/src/include/efivar/efivar.h
-+++ b/src/include/efivar/efivar.h
-@@ -128,7 +128,7 @@ extern int efi_symbol_to_guid(const char *symbol, efi_guid_t *guid)
-
- extern int efi_guid_is_zero(const efi_guid_t *guid);
- extern int efi_guid_is_empty(const efi_guid_t *guid);
--extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b);
-+extern int efi_guid_cmp(const void * const a, const void * const b);
-
- /* import / export functions */
- typedef struct efi_variable efi_variable_t;
-diff --git a/src/ucs2.h b/src/ucs2.h
-index dbb59004b7c0..edd8367b4bcc 100644
---- a/src/ucs2.h
-+++ b/src/ucs2.h
-@@ -23,16 +23,21 @@
- (((val) & ((mask) << (shift))) >> (shift))
-
- static inline size_t UNUSED
--ucs2len(const uint16_t * const s, ssize_t limit)
-+ucs2len(const void *vs, ssize_t limit)
- {
- ssize_t i;
-- for (i = 0; i < (limit >= 0 ? limit : i+1) && s[i] != (uint16_t)0; i++)
-+ const uint16_t *s = vs;
-+ const uint8_t *s8 = vs;
-+
-+ for (i = 0;
-+ i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0;
-+ i++, s8 += 2, s++)
- ;
- return i;
- }
-
- static inline size_t UNUSED
--ucs2size(const uint16_t * const s, ssize_t limit)
-+ucs2size(const void *s, ssize_t limit)
- {
- size_t rc = ucs2len(s, limit);
- rc *= sizeof (uint16_t);
-@@ -69,10 +74,11 @@ utf8size(uint8_t *s, ssize_t limit)
- }
-
- static inline unsigned char * UNUSED
--ucs2_to_utf8(const uint16_t * const chars, ssize_t limit)
-+ucs2_to_utf8(const void * const voidchars, ssize_t limit)
- {
- ssize_t i, j;
- unsigned char *ret;
-+ const uint16_t * const chars = voidchars;
-
- if (limit < 0)
- limit = ucs2len(chars, -1);
-@@ -124,10 +130,12 @@ ucs2_to_utf8(const uint16_t * const chars, ssize_t limit)
- }
-
- static inline ssize_t UNUSED NONNULL(4)
--utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8)
-+utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8)
- {
- ssize_t req;
- ssize_t i, j;
-+ uint16_t *ucs2 = ucs2void;
-+ uint16_t val16;
-
- if (!ucs2 && size > 0) {
- errno = EINVAL;
-@@ -162,10 +170,13 @@ utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8)
- val = utf8[i] & 0x7f;
- i += 1;
- }
-- ucs2[j] = val;
-+ val16 = val;
-+ ucs2[j] = val16;
-+ }
-+ if (terminate) {
-+ val16 = 0;
-+ ucs2[j++] = val16;
- }
-- if (terminate)
-- ucs2[j++] = (uint16_t)0;
- return j;
- };
-
diff --git a/patches/efivar-37/series b/patches/efivar-37/series
deleted file mode 100644
index e6f14fec2..000000000
--- a/patches/efivar-37/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
-0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch
-# cbb8f240dc2a442323107d34454fa178 - git-ptx-patches magic
diff --git a/rules/efivar.make b/rules/efivar.make
index db0ed001f..3d088b01c 100644
--- a/rules/efivar.make
+++ b/rules/efivar.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_EFIVAR) += efivar
#
# Paths and names
#
-EFIVAR_VERSION := 37
-EFIVAR_MD5 := 9f067275c5f7aafdd75bfb364280ac9c
+EFIVAR_VERSION := 38
+EFIVAR_MD5 := 243fdbc48440212695cb9c6e6fd0f44f
EFIVAR := efivar-$(EFIVAR_VERSION)
EFIVAR_SUFFIX := tar.bz2
EFIVAR_URL := https://github.com/rhboot/efivar/releases/download/$(EFIVAR_VERSION)/$(EFIVAR).$(EFIVAR_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] 37+ messages in thread* Re: [ptxdist] [PATCH] efivar: Version bump 37 -> 38.
2022-01-27 14:35 ` [ptxdist] [PATCH] efivar: Version bump 37 -> 38 Christian Melki
@ 2022-01-28 10:17 ` Michael Olbrich
0 siblings, 0 replies; 37+ messages in thread
From: Michael Olbrich @ 2022-01-28 10:17 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
On Thu, Jan 27, 2022 at 03:35:21PM +0100, Christian Melki wrote:
> Contains approx 2 years worth of fixes, including a lot
> of compile error fixes. So drop old patchset.
Fails to build on ARM:
esl-iter.c:316:3: note: in expansion of macro 'efi_error'
esl-iter.c:338:45: error: format '%zd' expects argument of type 'signed size_t', but argument 3 has type 'long unsigned int' [-Werror=format=]
esl-iter.c:363:45: error: format '%zd' expects argument of type 'signed size_t', but argument 3 has type 'long unsigned int' [-Werror=format=]
esl-iter.c:414:44: error: format '%zd' expects argument of type 'signed size_t', but argument 3 has type 'long unsigned int' [-Werror=format=]
.. and others.
I think adding ERRORS="-Wno-error" to EFIVAR_MAKE_ENV should help. That
should disable the -Werror and the warning are not a problem.
Michael
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> ..._guid-handle-misaligned-guid-pointer.patch | 55 ------
> ...es-Werror-address-of-packed-member-c.patch | 167 ------------------
> patches/efivar-37/series | 5 -
> rules/efivar.make | 4 +-
> 4 files changed, 2 insertions(+), 229 deletions(-)
> delete mode 100644 patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
> delete mode 100644 patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch
> delete mode 100644 patches/efivar-37/series
>
> diff --git a/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch b/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
> deleted file mode 100644
> index 89e913a74..000000000
> --- a/patches/efivar-37/0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
> +++ /dev/null
> @@ -1,55 +0,0 @@
> -From: Peter Jones <pjones@redhat.com>
> -Date: Mon, 7 Jan 2019 10:30:59 -0500
> -Subject: [PATCH] dp.h: make format_guid() handle misaligned guid pointers
> - safely.
> -
> -GCC 9 adds -Werror=address-of-packed-member, which causes us to see the
> -build error reported at
> - https://bugzilla.opensuse.org/show_bug.cgi?id=1120862 .
> -
> -That bug report shows us the following:
> -
> -In file included from dp.c:26:
> -dp.h: In function 'format_vendor_helper':
> -dp.h:120:37: error: taking address of packed member of 'struct <anonymous>' may result in an unaligned pointer value [-Werror=address-of-packed-member]
> - 120 | format_guid(buf, size, off, label, &dp->hw_vendor.vendor_guid);
> - | ^~~~~~~~~~~~~~~~~~~~~~~~~~
> -dp.h:74:25: note: in definition of macro 'format_guid'
> - 74 | _rc = efi_guid_to_str(guid, &_guidstr); \
> - | ^~~~
> -cc1: all warnings being treated as errors
> -
> -This patch makes format_guid() use a local variable as a bounce buffer
> -in the case that the guid we're passed is aligned as chaotic neutral.
> -
> -Note that this only fixes this instance and there may be others that bz
> -didn't show because it exited too soon, and I don't have a gcc 9 build
> -in front of me right now.
> -
> -Signed-off-by: Peter Jones <pjones@redhat.com>
> ----
> - src/dp.h | 11 +++++++++--
> - 1 file changed, 9 insertions(+), 2 deletions(-)
> -
> -diff --git a/src/dp.h b/src/dp.h
> -index aa4e3902992d..20cb608d05f7 100644
> ---- a/src/dp.h
> -+++ b/src/dp.h
> -@@ -70,8 +70,15 @@
> - #define format_guid(buf, size, off, dp_type, guid) ({ \
> - int _rc; \
> - char *_guidstr = NULL; \
> -- \
> -- _rc = efi_guid_to_str(guid, &_guidstr); \
> -+ efi_guid_t _guid; \
> -+ const efi_guid_t * const _guid_p = \
> -+ likely(__alignof__(guid) == sizeof(guid)) \
> -+ ? guid \
> -+ : &_guid; \
> -+ \
> -+ if (unlikely(__alignof__(guid) == sizeof(guid))) \
> -+ memmove(&_guid, guid, sizeof(_guid)); \
> -+ _rc = efi_guid_to_str(_guid_p, &_guidstr); \
> - if (_rc < 0) { \
> - efi_error("could not build %s GUID DP string", \
> - dp_type); \
> diff --git a/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch b/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch
> deleted file mode 100644
> index 7653bd80a..000000000
> --- a/patches/efivar-37/0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch
> +++ /dev/null
> @@ -1,167 +0,0 @@
> -From: Peter Jones <pjones@redhat.com>
> -Date: Thu, 21 Feb 2019 15:20:12 -0500
> -Subject: [PATCH] Fix all the places -Werror=address-of-packed-member catches.
> -
> -This gets rid of all the places GCC 9's -Werror=address-of-packed-member
> -flags as problematic.
> -
> -Fixes github issue #123
> -
> -Signed-off-by: Peter Jones <pjones@redhat.com>
> ----
> - src/dp-message.c | 6 ++++--
> - src/dp.h | 12 ++++--------
> - src/guid.c | 2 +-
> - src/include/efivar/efivar.h | 2 +-
> - src/ucs2.h | 27 +++++++++++++++++++--------
> - 5 files changed, 29 insertions(+), 20 deletions(-)
> -
> -diff --git a/src/dp-message.c b/src/dp-message.c
> -index 3724e5f57bdb..9f964663de86 100644
> ---- a/src/dp-message.c
> -+++ b/src/dp-message.c
> -@@ -620,11 +620,13 @@ _format_message_dn(char *buf, size_t size, const_efidp dp)
> - ) / sizeof(efi_ip_addr_t);
> - format(buf, size, off, "Dns", "Dns(");
> - for (int i=0; i < end; i++) {
> -- const efi_ip_addr_t *addr = &dp->dns.addrs[i];
> -+ efi_ip_addr_t addr;
> -+
> -+ memcpy(&addr, &dp->dns.addrs[i], sizeof(addr));
> - if (i != 0)
> - format(buf, size, off, "Dns", ",");
> - format_ip_addr(buf, size, off, "Dns",
> -- dp->dns.is_ipv6, addr);
> -+ dp->dns.is_ipv6, &addr);
> - }
> - format(buf, size, off, "Dns", ")");
> - break;
> -diff --git a/src/dp.h b/src/dp.h
> -index 20cb608d05f7..1f921d524aaf 100644
> ---- a/src/dp.h
> -+++ b/src/dp.h
> -@@ -71,13 +71,9 @@
> - int _rc; \
> - char *_guidstr = NULL; \
> - efi_guid_t _guid; \
> -- const efi_guid_t * const _guid_p = \
> -- likely(__alignof__(guid) == sizeof(guid)) \
> -- ? guid \
> -- : &_guid; \
> -- \
> -- if (unlikely(__alignof__(guid) == sizeof(guid))) \
> -- memmove(&_guid, guid, sizeof(_guid)); \
> -+ const efi_guid_t * const _guid_p = &_guid; \
> -+ \
> -+ memmove(&_guid, guid, sizeof(_guid)); \
> - _rc = efi_guid_to_str(_guid_p, &_guidstr); \
> - if (_rc < 0) { \
> - efi_error("could not build %s GUID DP string", \
> -@@ -86,7 +82,7 @@
> - _guidstr = onstack(_guidstr, \
> - strlen(_guidstr)+1); \
> - _rc = format(buf, size, off, dp_type, "%s", \
> -- _guidstr); \
> -+ _guidstr); \
> - } \
> - _rc; \
> - })
> -diff --git a/src/guid.c b/src/guid.c
> -index 306c9ff8287c..3156b3b7c60a 100644
> ---- a/src/guid.c
> -+++ b/src/guid.c
> -@@ -31,7 +31,7 @@
> - extern const efi_guid_t efi_guid_zero;
> -
> - int NONNULL(1, 2) PUBLIC
> --efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b)
> -+efi_guid_cmp(const void * const a, const void * const b)
> - {
> - return memcmp(a, b, sizeof (efi_guid_t));
> - }
> -diff --git a/src/include/efivar/efivar.h b/src/include/efivar/efivar.h
> -index 316891ccae9c..ad6449d9d938 100644
> ---- a/src/include/efivar/efivar.h
> -+++ b/src/include/efivar/efivar.h
> -@@ -128,7 +128,7 @@ extern int efi_symbol_to_guid(const char *symbol, efi_guid_t *guid)
> -
> - extern int efi_guid_is_zero(const efi_guid_t *guid);
> - extern int efi_guid_is_empty(const efi_guid_t *guid);
> --extern int efi_guid_cmp(const efi_guid_t *a, const efi_guid_t *b);
> -+extern int efi_guid_cmp(const void * const a, const void * const b);
> -
> - /* import / export functions */
> - typedef struct efi_variable efi_variable_t;
> -diff --git a/src/ucs2.h b/src/ucs2.h
> -index dbb59004b7c0..edd8367b4bcc 100644
> ---- a/src/ucs2.h
> -+++ b/src/ucs2.h
> -@@ -23,16 +23,21 @@
> - (((val) & ((mask) << (shift))) >> (shift))
> -
> - static inline size_t UNUSED
> --ucs2len(const uint16_t * const s, ssize_t limit)
> -+ucs2len(const void *vs, ssize_t limit)
> - {
> - ssize_t i;
> -- for (i = 0; i < (limit >= 0 ? limit : i+1) && s[i] != (uint16_t)0; i++)
> -+ const uint16_t *s = vs;
> -+ const uint8_t *s8 = vs;
> -+
> -+ for (i = 0;
> -+ i < (limit >= 0 ? limit : i+1) && s8[0] != 0 && s8[1] != 0;
> -+ i++, s8 += 2, s++)
> - ;
> - return i;
> - }
> -
> - static inline size_t UNUSED
> --ucs2size(const uint16_t * const s, ssize_t limit)
> -+ucs2size(const void *s, ssize_t limit)
> - {
> - size_t rc = ucs2len(s, limit);
> - rc *= sizeof (uint16_t);
> -@@ -69,10 +74,11 @@ utf8size(uint8_t *s, ssize_t limit)
> - }
> -
> - static inline unsigned char * UNUSED
> --ucs2_to_utf8(const uint16_t * const chars, ssize_t limit)
> -+ucs2_to_utf8(const void * const voidchars, ssize_t limit)
> - {
> - ssize_t i, j;
> - unsigned char *ret;
> -+ const uint16_t * const chars = voidchars;
> -
> - if (limit < 0)
> - limit = ucs2len(chars, -1);
> -@@ -124,10 +130,12 @@ ucs2_to_utf8(const uint16_t * const chars, ssize_t limit)
> - }
> -
> - static inline ssize_t UNUSED NONNULL(4)
> --utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8)
> -+utf8_to_ucs2(void *ucs2void, ssize_t size, int terminate, uint8_t *utf8)
> - {
> - ssize_t req;
> - ssize_t i, j;
> -+ uint16_t *ucs2 = ucs2void;
> -+ uint16_t val16;
> -
> - if (!ucs2 && size > 0) {
> - errno = EINVAL;
> -@@ -162,10 +170,13 @@ utf8_to_ucs2(uint16_t *ucs2, ssize_t size, int terminate, uint8_t *utf8)
> - val = utf8[i] & 0x7f;
> - i += 1;
> - }
> -- ucs2[j] = val;
> -+ val16 = val;
> -+ ucs2[j] = val16;
> -+ }
> -+ if (terminate) {
> -+ val16 = 0;
> -+ ucs2[j++] = val16;
> - }
> -- if (terminate)
> -- ucs2[j++] = (uint16_t)0;
> - return j;
> - };
> -
> diff --git a/patches/efivar-37/series b/patches/efivar-37/series
> deleted file mode 100644
> index e6f14fec2..000000000
> --- a/patches/efivar-37/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-dp.h-make-format_guid-handle-misaligned-guid-pointer.patch
> -0002-Fix-all-the-places-Werror-address-of-packed-member-c.patch
> -# cbb8f240dc2a442323107d34454fa178 - git-ptx-patches magic
> diff --git a/rules/efivar.make b/rules/efivar.make
> index db0ed001f..3d088b01c 100644
> --- a/rules/efivar.make
> +++ b/rules/efivar.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_EFIVAR) += efivar
> #
> # Paths and names
> #
> -EFIVAR_VERSION := 37
> -EFIVAR_MD5 := 9f067275c5f7aafdd75bfb364280ac9c
> +EFIVAR_VERSION := 38
> +EFIVAR_MD5 := 243fdbc48440212695cb9c6e6fd0f44f
> EFIVAR := efivar-$(EFIVAR_VERSION)
> EFIVAR_SUFFIX := tar.bz2
> EFIVAR_URL := https://github.com/rhboot/efivar/releases/download/$(EFIVAR_VERSION)/$(EFIVAR).$(EFIVAR_SUFFIX)
> --
> 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] 37+ messages in thread
* [ptxdist] [PATCH] sysklogd: Version bump. 2.2.3 -> 2.3.0
2022-01-27 14:35 [ptxdist] [PATCH] wpa_supplicant: Version bump 2.9 -> 2.10 Christian Melki
2022-01-27 14:35 ` [ptxdist] [PATCH] efivar: Version bump 37 -> 38 Christian Melki
@ 2022-01-27 14:35 ` Christian Melki
2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-01-27 14:35 ` [ptxdist] [PATCH] dump1090fa: Version bump 6.1 -> 7.1 Christian Melki
` (10 subsequent siblings)
12 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-27 14:35 UTC (permalink / raw)
To: ptxdist
Minor version bump, but contains mostly bugfixes.
https://github.com/troglobit/sysklogd/releases
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/sysklogd.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/sysklogd.make b/rules/sysklogd.make
index b3ad40be3..2ba2ca019 100644
--- a/rules/sysklogd.make
+++ b/rules/sysklogd.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SYSKLOGD) += sysklogd
#
# Paths and names
#
-SYSKLOGD_VERSION := 2.2.3
-SYSKLOGD_MD5 := 2c6749c49f52b8c5dad18e9a9315e7dd
+SYSKLOGD_VERSION := 2.3.0
+SYSKLOGD_MD5 := 9bc233a4600da3cca60420f36384570a
SYSKLOGD := sysklogd-$(SYSKLOGD_VERSION)
SYSKLOGD_SUFFIX := tar.gz
SYSKLOGD_URL := https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION)/$(SYSKLOGD).$(SYSKLOGD_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] 37+ messages in thread* Re: [ptxdist] [APPLIED] sysklogd: Version bump. 2.2.3 -> 2.3.0
2022-01-27 14:35 ` [ptxdist] [PATCH] sysklogd: Version bump. 2.2.3 -> 2.3.0 Christian Melki
@ 2022-01-30 15:49 ` Michael Olbrich
0 siblings, 0 replies; 37+ messages in thread
From: Michael Olbrich @ 2022-01-30 15:49 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as c8c03bed31d93bad5d52975ab443dc9c18084c3a.
Michael
[sent from post-receive hook]
On Sun, 30 Jan 2022 16:49:38 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Minor version bump, but contains mostly bugfixes.
> https://github.com/troglobit/sysklogd/releases
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220127143532.2212796-3-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/sysklogd.make b/rules/sysklogd.make
> index b3ad40be32fb..2ba2ca019e8f 100644
> --- a/rules/sysklogd.make
> +++ b/rules/sysklogd.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SYSKLOGD) += sysklogd
> #
> # Paths and names
> #
> -SYSKLOGD_VERSION := 2.2.3
> -SYSKLOGD_MD5 := 2c6749c49f52b8c5dad18e9a9315e7dd
> +SYSKLOGD_VERSION := 2.3.0
> +SYSKLOGD_MD5 := 9bc233a4600da3cca60420f36384570a
> SYSKLOGD := sysklogd-$(SYSKLOGD_VERSION)
> SYSKLOGD_SUFFIX := tar.gz
> SYSKLOGD_URL := https://github.com/troglobit/sysklogd/releases/download/v$(SYSKLOGD_VERSION)/$(SYSKLOGD).$(SYSKLOGD_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] 37+ messages in thread
* [ptxdist] [PATCH] dump1090fa: Version bump 6.1 -> 7.1
2022-01-27 14:35 [ptxdist] [PATCH] wpa_supplicant: Version bump 2.9 -> 2.10 Christian Melki
2022-01-27 14:35 ` [ptxdist] [PATCH] efivar: Version bump 37 -> 38 Christian Melki
2022-01-27 14:35 ` [ptxdist] [PATCH] sysklogd: Version bump. 2.2.3 -> 2.3.0 Christian Melki
@ 2022-01-27 14:35 ` Christian Melki
2022-01-27 15:56 ` Bruno Thomsen
2022-01-27 14:35 ` [ptxdist] [PATCH] chrony: Version bump. 4.1 -> 4.2 Christian Melki
` (9 subsequent siblings)
12 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-27 14:35 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 -
patches/dump1090fa.make | 82 +++++++++++++++++++
3 files changed, 82 insertions(+), 63 deletions(-)
delete mode 100644 patches/dump1090fa-6.1/fix_cpufeatures_arch.patch
delete mode 100644 patches/dump1090fa-6.1/series
create mode 100644 patches/dump1090fa.make
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/patches/dump1090fa.make b/patches/dump1090fa.make
new file mode 100644
index 000000000..366209805
--- /dev/null
+++ b/patches/dump1090fa.make
@@ -0,0 +1,82 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2021 by Christian Melki <christian.melki@t2data.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_DUMP1090FA) += dump1090fa
+
+#
+# Paths and names
+#
+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)
+DUMP1090FA_SOURCE := $(SRCDIR)/$(DUMP1090FA).$(DUMP1090FA_SUFFIX)
+DUMP1090FA_DIR := $(BUILDDIR)/$(DUMP1090FA)
+DUMP1090FA_LICENSE := GPL-2.0-only
+DUMP1090FA_LICENSE_FILES := \
+ file://COPYING;md5=751419260aa954499f7abaabaa882bbe
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+DUMP1090FA_ARCH := $(call remove_quotes,$(PTXCONF_ARCH_STRING))
+ifeq ($(DUMP1090FA_ARCH),arm64)
+DUMP1090FA_ARCH := aarch64
+endif
+
+DUMP1090FA_CONF_TOOL := NO
+DUMP1090FA_MAKE_ENV := \
+ $(CROSS_ENV) \
+ BLADERF=no \
+ LIMESDR=no \
+ HACKRF=no \
+ RTLSDR=yes \
+ ARCH=$(DUMP1090FA_ARCH) \
+ CPUFEATURES_ARCH=$(DUMP1090FA_ARCH) \
+ CPUFEATURES_UNAME="Linux"
+
+ifdef PTXCONF_ARCH_ARM
+ifndef PTXCONF_ARCH_ARM_NEON
+# don't try to use NEON if it's not available
+DUMP1090FA_MAKE_ENV += CPUFEATURES=no
+endif
+endif
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/dump1090fa.install:
+ @$(call targetinfo)
+ @install -vD -m 755 $(DUMP1090FA_DIR)/dump1090 $(DUMP1090FA_PKGDIR)/usr/bin/dump1090-fa
+ $(call touch)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/dump1090fa.targetinstall:
+ @$(call targetinfo)
+ @$(call install_init, dump1090fa)
+ @$(call install_fixup, dump1090fa,PRIORITY,optional)
+ @$(call install_fixup, dump1090fa,SECTION,base)
+ @$(call install_fixup, dump1090fa,AUTHOR,"Christian Melki <christian.melki@t2data.com>")
+ @$(call install_fixup, dump1090fa,DESCRIPTION,missing)
+
+ @$(call install_copy, dump1090fa, 0, 0, 0755, -, /usr/bin/dump1090-fa)
+
+ @$(call install_finish, dump1090fa)
+
+ @$(call touch)
+
+# vim: syntax=make
--
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] 37+ messages in thread* Re: [ptxdist] [PATCH] dump1090fa: Version bump 6.1 -> 7.1
2022-01-27 14:35 ` [ptxdist] [PATCH] dump1090fa: Version bump 6.1 -> 7.1 Christian Melki
@ 2022-01-27 15:56 ` Bruno Thomsen
2022-01-27 16:31 ` Christian Melki
0 siblings, 1 reply; 37+ messages in thread
From: Bruno Thomsen @ 2022-01-27 15:56 UTC (permalink / raw)
To: ptxdist
Den tor. 27. jan. 2022 kl. 15.37 skrev Christian Melki
<christian.melki@t2data.com>:
>
> 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 -
> patches/dump1090fa.make | 82 +++++++++++++++++++
> 3 files changed, 82 insertions(+), 63 deletions(-)
> delete mode 100644 patches/dump1090fa-6.1/fix_cpufeatures_arch.patch
> delete mode 100644 patches/dump1090fa-6.1/series
> create mode 100644 patches/dump1090fa.make
Something went wrong with the location of dump1090fa.make as it's in
patches and not rules.
/Bruno
>
> 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/patches/dump1090fa.make b/patches/dump1090fa.make
> new file mode 100644
> index 000000000..366209805
> --- /dev/null
> +++ b/patches/dump1090fa.make
> @@ -0,0 +1,82 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2021 by Christian Melki <christian.melki@t2data.com>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_DUMP1090FA) += dump1090fa
> +
> +#
> +# Paths and names
> +#
> +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)
> +DUMP1090FA_SOURCE := $(SRCDIR)/$(DUMP1090FA).$(DUMP1090FA_SUFFIX)
> +DUMP1090FA_DIR := $(BUILDDIR)/$(DUMP1090FA)
> +DUMP1090FA_LICENSE := GPL-2.0-only
> +DUMP1090FA_LICENSE_FILES := \
> + file://COPYING;md5=751419260aa954499f7abaabaa882bbe
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +DUMP1090FA_ARCH := $(call remove_quotes,$(PTXCONF_ARCH_STRING))
> +ifeq ($(DUMP1090FA_ARCH),arm64)
> +DUMP1090FA_ARCH := aarch64
> +endif
> +
> +DUMP1090FA_CONF_TOOL := NO
> +DUMP1090FA_MAKE_ENV := \
> + $(CROSS_ENV) \
> + BLADERF=no \
> + LIMESDR=no \
> + HACKRF=no \
> + RTLSDR=yes \
> + ARCH=$(DUMP1090FA_ARCH) \
> + CPUFEATURES_ARCH=$(DUMP1090FA_ARCH) \
> + CPUFEATURES_UNAME="Linux"
> +
> +ifdef PTXCONF_ARCH_ARM
> +ifndef PTXCONF_ARCH_ARM_NEON
> +# don't try to use NEON if it's not available
> +DUMP1090FA_MAKE_ENV += CPUFEATURES=no
> +endif
> +endif
> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/dump1090fa.install:
> + @$(call targetinfo)
> + @install -vD -m 755 $(DUMP1090FA_DIR)/dump1090 $(DUMP1090FA_PKGDIR)/usr/bin/dump1090-fa
> + $(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/dump1090fa.targetinstall:
> + @$(call targetinfo)
> + @$(call install_init, dump1090fa)
> + @$(call install_fixup, dump1090fa,PRIORITY,optional)
> + @$(call install_fixup, dump1090fa,SECTION,base)
> + @$(call install_fixup, dump1090fa,AUTHOR,"Christian Melki <christian.melki@t2data.com>")
> + @$(call install_fixup, dump1090fa,DESCRIPTION,missing)
> +
> + @$(call install_copy, dump1090fa, 0, 0, 0755, -, /usr/bin/dump1090-fa)
> +
> + @$(call install_finish, dump1090fa)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.30.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [ptxdist] [PATCH] dump1090fa: Version bump 6.1 -> 7.1
2022-01-27 15:56 ` Bruno Thomsen
@ 2022-01-27 16:31 ` Christian Melki
2022-01-28 9:37 ` Michael Olbrich
0 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-27 16:31 UTC (permalink / raw)
To: ptxdist; +Cc: bruno.thomsen
Wow. That was bad.
Thanks for paying attention.
I have yet to find a proper way to do testing and sending patches.
So I test in the active environment and then move it to the ptxdist repo
where I prepare for sending.
Obviously a lot of potential for manual mishaps in this process.
If anyone cares to share their work process I'm all ears.
I'm obviously doing far to many manual steps with far to many mishaps.
Regards,
Christian
On 1/27/22 16:56, Bruno Thomsen wrote:
> Den tor. 27. jan. 2022 kl. 15.37 skrev Christian Melki
> <christian.melki@t2data.com>:
>>
>> 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 -
>> patches/dump1090fa.make | 82 +++++++++++++++++++
>> 3 files changed, 82 insertions(+), 63 deletions(-)
>> delete mode 100644 patches/dump1090fa-6.1/fix_cpufeatures_arch.patch
>> delete mode 100644 patches/dump1090fa-6.1/series
>> create mode 100644 patches/dump1090fa.make
>
> Something went wrong with the location of dump1090fa.make as it's in
> patches and not rules.
>
> /Bruno
>
>>
>> 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/patches/dump1090fa.make b/patches/dump1090fa.make
>> new file mode 100644
>> index 000000000..366209805
>> --- /dev/null
>> +++ b/patches/dump1090fa.make
>> @@ -0,0 +1,82 @@
>> +# -*-makefile-*-
>> +#
>> +# Copyright (C) 2021 by Christian Melki <christian.melki@t2data.com>
>> +#
>> +# For further information about the PTXdist project and license conditions
>> +# see the README file.
>> +#
>> +
>> +#
>> +# We provide this package
>> +#
>> +PACKAGES-$(PTXCONF_DUMP1090FA) += dump1090fa
>> +
>> +#
>> +# Paths and names
>> +#
>> +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)
>> +DUMP1090FA_SOURCE := $(SRCDIR)/$(DUMP1090FA).$(DUMP1090FA_SUFFIX)
>> +DUMP1090FA_DIR := $(BUILDDIR)/$(DUMP1090FA)
>> +DUMP1090FA_LICENSE := GPL-2.0-only
>> +DUMP1090FA_LICENSE_FILES := \
>> + file://COPYING;md5=751419260aa954499f7abaabaa882bbe
>> +
>> +# ----------------------------------------------------------------------------
>> +# Prepare
>> +# ----------------------------------------------------------------------------
>> +
>> +DUMP1090FA_ARCH := $(call remove_quotes,$(PTXCONF_ARCH_STRING))
>> +ifeq ($(DUMP1090FA_ARCH),arm64)
>> +DUMP1090FA_ARCH := aarch64
>> +endif
>> +
>> +DUMP1090FA_CONF_TOOL := NO
>> +DUMP1090FA_MAKE_ENV := \
>> + $(CROSS_ENV) \
>> + BLADERF=no \
>> + LIMESDR=no \
>> + HACKRF=no \
>> + RTLSDR=yes \
>> + ARCH=$(DUMP1090FA_ARCH) \
>> + CPUFEATURES_ARCH=$(DUMP1090FA_ARCH) \
>> + CPUFEATURES_UNAME="Linux"
>> +
>> +ifdef PTXCONF_ARCH_ARM
>> +ifndef PTXCONF_ARCH_ARM_NEON
>> +# don't try to use NEON if it's not available
>> +DUMP1090FA_MAKE_ENV += CPUFEATURES=no
>> +endif
>> +endif
>> +
>> +# ----------------------------------------------------------------------------
>> +# Install
>> +# ----------------------------------------------------------------------------
>> +
>> +$(STATEDIR)/dump1090fa.install:
>> + @$(call targetinfo)
>> + @install -vD -m 755 $(DUMP1090FA_DIR)/dump1090 $(DUMP1090FA_PKGDIR)/usr/bin/dump1090-fa
>> + $(call touch)
>> +
>> +# ----------------------------------------------------------------------------
>> +# Target-Install
>> +# ----------------------------------------------------------------------------
>> +
>> +$(STATEDIR)/dump1090fa.targetinstall:
>> + @$(call targetinfo)
>> + @$(call install_init, dump1090fa)
>> + @$(call install_fixup, dump1090fa,PRIORITY,optional)
>> + @$(call install_fixup, dump1090fa,SECTION,base)
>> + @$(call install_fixup, dump1090fa,AUTHOR,"Christian Melki <christian.melki@t2data.com>")
>> + @$(call install_fixup, dump1090fa,DESCRIPTION,missing)
>> +
>> + @$(call install_copy, dump1090fa, 0, 0, 0755, -, /usr/bin/dump1090-fa)
>> +
>> + @$(call install_finish, dump1090fa)
>> +
>> + @$(call touch)
>> +
>> +# vim: syntax=make
>> --
>> 2.30.2
>>
>>
>> _______________________________________________
>> ptxdist mailing list
>> ptxdist@pengutronix.de
>> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [ptxdist] [PATCH] dump1090fa: Version bump 6.1 -> 7.1
2022-01-27 16:31 ` Christian Melki
@ 2022-01-28 9:37 ` Michael Olbrich
0 siblings, 0 replies; 37+ messages in thread
From: Michael Olbrich @ 2022-01-28 9:37 UTC (permalink / raw)
To: Christian Melki; +Cc: bruno.thomsen, ptxdist
On Thu, Jan 27, 2022 at 05:31:01PM +0100, Christian Melki wrote:
> Wow. That was bad.
> Thanks for paying attention.
>
> I have yet to find a proper way to do testing and sending patches.
> So I test in the active environment and then move it to the ptxdist repo
> where I prepare for sending.
> Obviously a lot of potential for manual mishaps in this process.
>
> If anyone cares to share their work process I'm all ears.
> I'm obviously doing far to many manual steps with far to many mishaps.
Use the ptxdist git. Checkout the version your BSP is using and start a
branch there. Now you can do all the changes in PTXdist and test the whole
thing. At the end, you just need to rebase it to the current master.
If there are conflicting changes in master then cherry-pick those first
before adding your own stuff. During rebase, just skip them if that doesn't
happen automatically.
Michael
> On 1/27/22 16:56, Bruno Thomsen wrote:
> > Den tor. 27. jan. 2022 kl. 15.37 skrev Christian Melki
> > <christian.melki@t2data.com>:
> >>
> >> 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 -
> >> patches/dump1090fa.make | 82 +++++++++++++++++++
> >> 3 files changed, 82 insertions(+), 63 deletions(-)
> >> delete mode 100644 patches/dump1090fa-6.1/fix_cpufeatures_arch.patch
> >> delete mode 100644 patches/dump1090fa-6.1/series
> >> create mode 100644 patches/dump1090fa.make
> >
> > Something went wrong with the location of dump1090fa.make as it's in
> > patches and not rules.
> >
> > /Bruno
> >
> >>
> >> 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/patches/dump1090fa.make b/patches/dump1090fa.make
> >> new file mode 100644
> >> index 000000000..366209805
> >> --- /dev/null
> >> +++ b/patches/dump1090fa.make
> >> @@ -0,0 +1,82 @@
> >> +# -*-makefile-*-
> >> +#
> >> +# Copyright (C) 2021 by Christian Melki <christian.melki@t2data.com>
> >> +#
> >> +# For further information about the PTXdist project and license conditions
> >> +# see the README file.
> >> +#
> >> +
> >> +#
> >> +# We provide this package
> >> +#
> >> +PACKAGES-$(PTXCONF_DUMP1090FA) += dump1090fa
> >> +
> >> +#
> >> +# Paths and names
> >> +#
> >> +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)
> >> +DUMP1090FA_SOURCE := $(SRCDIR)/$(DUMP1090FA).$(DUMP1090FA_SUFFIX)
> >> +DUMP1090FA_DIR := $(BUILDDIR)/$(DUMP1090FA)
> >> +DUMP1090FA_LICENSE := GPL-2.0-only
> >> +DUMP1090FA_LICENSE_FILES := \
> >> + file://COPYING;md5=751419260aa954499f7abaabaa882bbe
> >> +
> >> +# ----------------------------------------------------------------------------
> >> +# Prepare
> >> +# ----------------------------------------------------------------------------
> >> +
> >> +DUMP1090FA_ARCH := $(call remove_quotes,$(PTXCONF_ARCH_STRING))
> >> +ifeq ($(DUMP1090FA_ARCH),arm64)
> >> +DUMP1090FA_ARCH := aarch64
> >> +endif
> >> +
> >> +DUMP1090FA_CONF_TOOL := NO
> >> +DUMP1090FA_MAKE_ENV := \
> >> + $(CROSS_ENV) \
> >> + BLADERF=no \
> >> + LIMESDR=no \
> >> + HACKRF=no \
> >> + RTLSDR=yes \
> >> + ARCH=$(DUMP1090FA_ARCH) \
> >> + CPUFEATURES_ARCH=$(DUMP1090FA_ARCH) \
> >> + CPUFEATURES_UNAME="Linux"
> >> +
> >> +ifdef PTXCONF_ARCH_ARM
> >> +ifndef PTXCONF_ARCH_ARM_NEON
> >> +# don't try to use NEON if it's not available
> >> +DUMP1090FA_MAKE_ENV += CPUFEATURES=no
> >> +endif
> >> +endif
> >> +
> >> +# ----------------------------------------------------------------------------
> >> +# Install
> >> +# ----------------------------------------------------------------------------
> >> +
> >> +$(STATEDIR)/dump1090fa.install:
> >> + @$(call targetinfo)
> >> + @install -vD -m 755 $(DUMP1090FA_DIR)/dump1090 $(DUMP1090FA_PKGDIR)/usr/bin/dump1090-fa
> >> + $(call touch)
> >> +
> >> +# ----------------------------------------------------------------------------
> >> +# Target-Install
> >> +# ----------------------------------------------------------------------------
> >> +
> >> +$(STATEDIR)/dump1090fa.targetinstall:
> >> + @$(call targetinfo)
> >> + @$(call install_init, dump1090fa)
> >> + @$(call install_fixup, dump1090fa,PRIORITY,optional)
> >> + @$(call install_fixup, dump1090fa,SECTION,base)
> >> + @$(call install_fixup, dump1090fa,AUTHOR,"Christian Melki <christian.melki@t2data.com>")
> >> + @$(call install_fixup, dump1090fa,DESCRIPTION,missing)
> >> +
> >> + @$(call install_copy, dump1090fa, 0, 0, 0755, -, /usr/bin/dump1090-fa)
> >> +
> >> + @$(call install_finish, dump1090fa)
> >> +
> >> + @$(call touch)
> >> +
> >> +# vim: syntax=make
> >> --
> >> 2.30.2
> >>
> >>
> >> _______________________________________________
> >> ptxdist mailing list
> >> ptxdist@pengutronix.de
> >> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> >
> > _______________________________________________
> > ptxdist mailing list
> > ptxdist@pengutronix.de
> > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
>
> _______________________________________________
> 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] 37+ messages in thread
* [ptxdist] [PATCH] chrony: Version bump. 4.1 -> 4.2
2022-01-27 14:35 [ptxdist] [PATCH] wpa_supplicant: Version bump 2.9 -> 2.10 Christian Melki
` (2 preceding siblings ...)
2022-01-27 14:35 ` [ptxdist] [PATCH] dump1090fa: Version bump 6.1 -> 7.1 Christian Melki
@ 2022-01-27 14:35 ` Christian Melki
2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-01-27 14:35 ` [ptxdist] [PATCH] strace: Version bump. 5.15 -> 5.16 Christian Melki
` (8 subsequent siblings)
12 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-27 14:35 UTC (permalink / raw)
To: ptxdist
Mostly bugfixes. Move patch, applies properly with offset.
https://chrony.tuxfamily.org/news.html
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...001-configure-make-unrecognized-option-a-fatal-error.patch | 0
patches/{chrony-4.1 => chrony-4.2}/series | 0
rules/chrony.make | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename patches/{chrony-4.1 => chrony-4.2}/0001-configure-make-unrecognized-option-a-fatal-error.patch (100%)
rename patches/{chrony-4.1 => chrony-4.2}/series (100%)
diff --git a/patches/chrony-4.1/0001-configure-make-unrecognized-option-a-fatal-error.patch b/patches/chrony-4.2/0001-configure-make-unrecognized-option-a-fatal-error.patch
similarity index 100%
rename from patches/chrony-4.1/0001-configure-make-unrecognized-option-a-fatal-error.patch
rename to patches/chrony-4.2/0001-configure-make-unrecognized-option-a-fatal-error.patch
diff --git a/patches/chrony-4.1/series b/patches/chrony-4.2/series
similarity index 100%
rename from patches/chrony-4.1/series
rename to patches/chrony-4.2/series
diff --git a/rules/chrony.make b/rules/chrony.make
index 7e51714bc..eb700134d 100644
--- a/rules/chrony.make
+++ b/rules/chrony.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_CHRONY) += chrony
#
# Paths and names
#
-CHRONY_VERSION := 4.1
-CHRONY_MD5 := 7133880806887b629678c36a48217806
+CHRONY_VERSION := 4.2
+CHRONY_MD5 := 07282f8e76a4399d6c17009bb6345614
CHRONY := chrony-$(CHRONY_VERSION)
CHRONY_SUFFIX := tar.gz
CHRONY_URL := http://download.tuxfamily.org/chrony/$(CHRONY).$(CHRONY_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] 37+ messages in thread* Re: [ptxdist] [APPLIED] chrony: Version bump. 4.1 -> 4.2
2022-01-27 14:35 ` [ptxdist] [PATCH] chrony: Version bump. 4.1 -> 4.2 Christian Melki
@ 2022-01-30 15:49 ` Michael Olbrich
0 siblings, 0 replies; 37+ messages in thread
From: Michael Olbrich @ 2022-01-30 15:49 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as e3b002c4d51bb8ba05bb7fbf9b13db960c0c6eb6.
Michael
[sent from post-receive hook]
On Sun, 30 Jan 2022 16:49:39 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Mostly bugfixes. Move patch, applies properly with offset.
> https://chrony.tuxfamily.org/news.html
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220127143532.2212796-5-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/chrony-4.1/0001-configure-make-unrecognized-option-a-fatal-error.patch b/patches/chrony-4.2/0001-configure-make-unrecognized-option-a-fatal-error.patch
> similarity index 100%
> rename from patches/chrony-4.1/0001-configure-make-unrecognized-option-a-fatal-error.patch
> rename to patches/chrony-4.2/0001-configure-make-unrecognized-option-a-fatal-error.patch
> diff --git a/patches/chrony-4.1/series b/patches/chrony-4.2/series
> similarity index 100%
> rename from patches/chrony-4.1/series
> rename to patches/chrony-4.2/series
> diff --git a/rules/chrony.make b/rules/chrony.make
> index 7e51714bcb06..eb700134dcc2 100644
> --- a/rules/chrony.make
> +++ b/rules/chrony.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_CHRONY) += chrony
> #
> # Paths and names
> #
> -CHRONY_VERSION := 4.1
> -CHRONY_MD5 := 7133880806887b629678c36a48217806
> +CHRONY_VERSION := 4.2
> +CHRONY_MD5 := 07282f8e76a4399d6c17009bb6345614
> CHRONY := chrony-$(CHRONY_VERSION)
> CHRONY_SUFFIX := tar.gz
> CHRONY_URL := http://download.tuxfamily.org/chrony/$(CHRONY).$(CHRONY_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] 37+ messages in thread
* [ptxdist] [PATCH] strace: Version bump. 5.15 -> 5.16
2022-01-27 14:35 [ptxdist] [PATCH] wpa_supplicant: Version bump 2.9 -> 2.10 Christian Melki
` (3 preceding siblings ...)
2022-01-27 14:35 ` [ptxdist] [PATCH] chrony: Version bump. 4.1 -> 4.2 Christian Melki
@ 2022-01-27 14:35 ` Christian Melki
2022-01-28 9:19 ` Michael Olbrich
2022-01-27 14:35 ` [ptxdist] [PATCH] alsa-lib: Version bump 1.2.5.1 -> 1.2.6.1 Christian Melki
` (7 subsequent siblings)
12 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-27 14:35 UTC (permalink / raw)
To: ptxdist
Mostly bugfixes.
https://strace.io/files/5.16/
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/strace.make | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rules/strace.make b/rules/strace.make
index aa13f3e97..aeec39aa6 100644
--- a/rules/strace.make
+++ b/rules/strace.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_STRACE) += strace
#
# Paths and names
#
-STRACE_VERSION := 5.15
-STRACE_MD5 := a627c23fda3ecd668d6161c288fdcd79
+STRACE_VERSION := 5.16
+STRACE_MD5 := f848d24b2371948c91b57f72c0e75e66
STRACE := strace-$(STRACE_VERSION)
STRACE_SUFFIX := tar.xz
STRACE_URL := https://strace.io/files/$(STRACE_VERSION)/$(STRACE).$(STRACE_SUFFIX)
@@ -25,7 +25,7 @@ STRACE_SOURCE := $(SRCDIR)/$(STRACE).$(STRACE_SUFFIX)
STRACE_DIR := $(BUILDDIR)/$(STRACE)
STRACE_LICENSE := LGPL-2.1-or-later AND GPL-2.0-only WITH Linux-syscall-note
STRACE_LICENSE_FILES := \
- file://COPYING;md5=318cfc887fc8723f4e9d4709b55e065b \
+ file://COPYING;md5=59a33f0a3e6122d67c0b3befccbdaa6b \
file://bundled/linux/COPYING;md5=391c7a5bbfb151ad3dbe0a7fb5791a46 \
file://bundled/linux/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \
file://LGPL-2.1-or-later;md5=9e4c7a7a5be83d7f3da645ac5d466052
--
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] 37+ messages in thread* Re: [ptxdist] [PATCH] strace: Version bump. 5.15 -> 5.16
2022-01-27 14:35 ` [ptxdist] [PATCH] strace: Version bump. 5.15 -> 5.16 Christian Melki
@ 2022-01-28 9:19 ` Michael Olbrich
0 siblings, 0 replies; 37+ messages in thread
From: Michael Olbrich @ 2022-01-28 9:19 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
On Thu, Jan 27, 2022 at 03:35:25PM +0100, Christian Melki wrote:
> Mostly bugfixes.
> https://strace.io/files/5.16/
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> rules/strace.make | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/rules/strace.make b/rules/strace.make
> index aa13f3e97..aeec39aa6 100644
> --- a/rules/strace.make
> +++ b/rules/strace.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_STRACE) += strace
> #
> # Paths and names
> #
> -STRACE_VERSION := 5.15
> -STRACE_MD5 := a627c23fda3ecd668d6161c288fdcd79
> +STRACE_VERSION := 5.16
> +STRACE_MD5 := f848d24b2371948c91b57f72c0e75e66
> STRACE := strace-$(STRACE_VERSION)
> STRACE_SUFFIX := tar.xz
> STRACE_URL := https://strace.io/files/$(STRACE_VERSION)/$(STRACE).$(STRACE_SUFFIX)
> @@ -25,7 +25,7 @@ STRACE_SOURCE := $(SRCDIR)/$(STRACE).$(STRACE_SUFFIX)
> STRACE_DIR := $(BUILDDIR)/$(STRACE)
> STRACE_LICENSE := LGPL-2.1-or-later AND GPL-2.0-only WITH Linux-syscall-note
> STRACE_LICENSE_FILES := \
> - file://COPYING;md5=318cfc887fc8723f4e9d4709b55e065b \
> + file://COPYING;md5=59a33f0a3e6122d67c0b3befccbdaa6b \
What changed here? Please add a comment about it to the commit message.
Michael
> file://bundled/linux/COPYING;md5=391c7a5bbfb151ad3dbe0a7fb5791a46 \
> file://bundled/linux/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \
> file://LGPL-2.1-or-later;md5=9e4c7a7a5be83d7f3da645ac5d466052
> --
> 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] 37+ messages in thread
* [ptxdist] [PATCH] alsa-lib: Version bump 1.2.5.1 -> 1.2.6.1
2022-01-27 14:35 [ptxdist] [PATCH] wpa_supplicant: Version bump 2.9 -> 2.10 Christian Melki
` (4 preceding siblings ...)
2022-01-27 14:35 ` [ptxdist] [PATCH] strace: Version bump. 5.15 -> 5.16 Christian Melki
@ 2022-01-27 14:35 ` Christian Melki
2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-01-27 14:35 ` [ptxdist] [PATCH] alsa-utils: Version bump 1.2.5.1 -> 1.2.6 Christian Melki
` (6 subsequent siblings)
12 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-27 14:35 UTC (permalink / raw)
To: ptxdist
Mostly bugfixes.
Remove disable-ucm fix and move patches.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
.../0002-fix-build-with-disable-ucm.patch | 37 -------------------
.../0001-add-largefile-support.patch | 0
.../autogen.sh | 0
.../series | 1 -
rules/alsa-lib.make | 4 +-
5 files changed, 2 insertions(+), 40 deletions(-)
delete mode 100644 patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch
rename patches/{alsa-lib-1.2.5.1 => alsa-lib-1.2.6.1}/0001-add-largefile-support.patch (100%)
rename patches/{alsa-lib-1.2.5.1 => alsa-lib-1.2.6.1}/autogen.sh (100%)
rename patches/{alsa-lib-1.2.5.1 => alsa-lib-1.2.6.1}/series (79%)
diff --git a/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch b/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch
deleted file mode 100644
index 886374795..000000000
--- a/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Mon, 28 Jun 2021 12:08:53 +0200
-Subject: [PATCH] fix build with --disable-ucm
-
-Link: https://mailman.alsa-project.org/pipermail/alsa-devel/2021-June/186729.html
-Reported-by: Michael Forney <mforney@mforney.org>
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- include/local.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/include/local.h b/include/local.h
-index 4e7d88a0ecac..7cfcec53dd5d 100644
---- a/include/local.h
-+++ b/include/local.h
-@@ -374,6 +374,8 @@ int _snd_config_load_with_include(snd_config_t *config, snd_input_t *in,
- void *INTERNAL(snd_dlopen)(const char *name, int mode, char *errbuf, size_t errbuflen);
- #endif
-
-+#ifdef BUILD_UCM
-+
- const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name);
-
- static inline int _snd_is_ucm_device(const char *name)
-@@ -381,4 +383,12 @@ static inline int _snd_is_ucm_device(const char *name)
- return name && name[0] == '_' && name[1] == 'u' && name[2] == 'c' && name[3] == 'm';
- }
-
-+#else
-+
-+static inline const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name) { return NULL; }
-+static inline int _snd_is_ucm_device(const char *name) { return 0; }
-+
-+
-+#endif
-+
- #endif
diff --git a/patches/alsa-lib-1.2.5.1/0001-add-largefile-support.patch b/patches/alsa-lib-1.2.6.1/0001-add-largefile-support.patch
similarity index 100%
rename from patches/alsa-lib-1.2.5.1/0001-add-largefile-support.patch
rename to patches/alsa-lib-1.2.6.1/0001-add-largefile-support.patch
diff --git a/patches/alsa-lib-1.2.5.1/autogen.sh b/patches/alsa-lib-1.2.6.1/autogen.sh
similarity index 100%
rename from patches/alsa-lib-1.2.5.1/autogen.sh
rename to patches/alsa-lib-1.2.6.1/autogen.sh
diff --git a/patches/alsa-lib-1.2.5.1/series b/patches/alsa-lib-1.2.6.1/series
similarity index 79%
rename from patches/alsa-lib-1.2.5.1/series
rename to patches/alsa-lib-1.2.6.1/series
index 1ede62264..cab3f9ae2 100644
--- a/patches/alsa-lib-1.2.5.1/series
+++ b/patches/alsa-lib-1.2.6.1/series
@@ -1,5 +1,4 @@
# generated by git-ptx-patches
#tag:base --start-number 1
0001-add-largefile-support.patch
-0002-fix-build-with-disable-ucm.patch
# e32eb79bf9ae6a22f1a3a5336617e2d3 - git-ptx-patches magic
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index 7fb6a1287..c503315c7 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib
#
# Paths and names
#
-ALSA_LIB_VERSION := 1.2.5.1
-ALSA_LIB_MD5 := c8335793e7828803311edc48fb71662e
+ALSA_LIB_VERSION := 1.2.6.1
+ALSA_LIB_MD5 := 039aae4a55e4a33f4c39b274fcc1dc5e
ALSA_LIB := alsa-lib-$(ALSA_LIB_VERSION)
ALSA_LIB_SUFFIX := tar.bz2
ALSA_LIB_URL := \
--
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] 37+ messages in thread* Re: [ptxdist] [APPLIED] alsa-lib: Version bump 1.2.5.1 -> 1.2.6.1
2022-01-27 14:35 ` [ptxdist] [PATCH] alsa-lib: Version bump 1.2.5.1 -> 1.2.6.1 Christian Melki
@ 2022-01-30 15:49 ` Michael Olbrich
0 siblings, 0 replies; 37+ messages in thread
From: Michael Olbrich @ 2022-01-30 15:49 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as ddebdb00d342a4b2428e8e2f5f0ad9f5c51f4d81.
Michael
[sent from post-receive hook]
On Sun, 30 Jan 2022 16:49:41 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Mostly bugfixes.
> Remove disable-ucm fix and move patches.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220127143532.2212796-7-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch b/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch
> deleted file mode 100644
> index 88637479545f..000000000000
> --- a/patches/alsa-lib-1.2.5.1/0002-fix-build-with-disable-ucm.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -From: Jaroslav Kysela <perex@perex.cz>
> -Date: Mon, 28 Jun 2021 12:08:53 +0200
> -Subject: [PATCH] fix build with --disable-ucm
> -
> -Link: https://mailman.alsa-project.org/pipermail/alsa-devel/2021-June/186729.html
> -Reported-by: Michael Forney <mforney@mforney.org>
> -Signed-off-by: Jaroslav Kysela <perex@perex.cz>
> ----
> - include/local.h | 10 ++++++++++
> - 1 file changed, 10 insertions(+)
> -
> -diff --git a/include/local.h b/include/local.h
> -index 4e7d88a0ecac..7cfcec53dd5d 100644
> ---- a/include/local.h
> -+++ b/include/local.h
> -@@ -374,6 +374,8 @@ int _snd_config_load_with_include(snd_config_t *config, snd_input_t *in,
> - void *INTERNAL(snd_dlopen)(const char *name, int mode, char *errbuf, size_t errbuflen);
> - #endif
> -
> -+#ifdef BUILD_UCM
> -+
> - const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name);
> -
> - static inline int _snd_is_ucm_device(const char *name)
> -@@ -381,4 +383,12 @@ static inline int _snd_is_ucm_device(const char *name)
> - return name && name[0] == '_' && name[1] == 'u' && name[2] == 'c' && name[3] == 'm';
> - }
> -
> -+#else
> -+
> -+static inline const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name) { return NULL; }
> -+static inline int _snd_is_ucm_device(const char *name) { return 0; }
> -+
> -+
> -+#endif
> -+
> - #endif
> diff --git a/patches/alsa-lib-1.2.5.1/0001-add-largefile-support.patch b/patches/alsa-lib-1.2.6.1/0001-add-largefile-support.patch
> similarity index 100%
> rename from patches/alsa-lib-1.2.5.1/0001-add-largefile-support.patch
> rename to patches/alsa-lib-1.2.6.1/0001-add-largefile-support.patch
> diff --git a/patches/alsa-lib-1.2.5.1/autogen.sh b/patches/alsa-lib-1.2.6.1/autogen.sh
> similarity index 100%
> rename from patches/alsa-lib-1.2.5.1/autogen.sh
> rename to patches/alsa-lib-1.2.6.1/autogen.sh
> diff --git a/patches/alsa-lib-1.2.5.1/series b/patches/alsa-lib-1.2.6.1/series
> similarity index 79%
> rename from patches/alsa-lib-1.2.5.1/series
> rename to patches/alsa-lib-1.2.6.1/series
> index 1ede62264790..cab3f9ae21e5 100644
> --- a/patches/alsa-lib-1.2.5.1/series
> +++ b/patches/alsa-lib-1.2.6.1/series
> @@ -1,5 +1,4 @@
> # generated by git-ptx-patches
> #tag:base --start-number 1
> 0001-add-largefile-support.patch
> -0002-fix-build-with-disable-ucm.patch
> # e32eb79bf9ae6a22f1a3a5336617e2d3 - git-ptx-patches magic
> diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
> index 7fb6a1287a65..c503315c7980 100644
> --- a/rules/alsa-lib.make
> +++ b/rules/alsa-lib.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ALSA_LIB) += alsa-lib
> #
> # Paths and names
> #
> -ALSA_LIB_VERSION := 1.2.5.1
> -ALSA_LIB_MD5 := c8335793e7828803311edc48fb71662e
> +ALSA_LIB_VERSION := 1.2.6.1
> +ALSA_LIB_MD5 := 039aae4a55e4a33f4c39b274fcc1dc5e
> ALSA_LIB := alsa-lib-$(ALSA_LIB_VERSION)
> ALSA_LIB_SUFFIX := tar.bz2
> ALSA_LIB_URL := \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 37+ messages in thread
* [ptxdist] [PATCH] alsa-utils: Version bump 1.2.5.1 -> 1.2.6
2022-01-27 14:35 [ptxdist] [PATCH] wpa_supplicant: Version bump 2.9 -> 2.10 Christian Melki
` (5 preceding siblings ...)
2022-01-27 14:35 ` [ptxdist] [PATCH] alsa-lib: Version bump 1.2.5.1 -> 1.2.6.1 Christian Melki
@ 2022-01-27 14:35 ` Christian Melki
2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-01-27 14:35 ` [ptxdist] [PATCH] libsndfile: Version bump 1.0.25 -> 1.0.31 Christian Melki
` (5 subsequent siblings)
12 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-27 14:35 UTC (permalink / raw)
To: ptxdist
Maintenance release, mostly bugfixes.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/alsa-utils.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
index 2693336a1..a71744d7e 100644
--- a/rules/alsa-utils.make
+++ b/rules/alsa-utils.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ALSA_UTILS) += alsa-utils
#
# Paths and names
#
-ALSA_UTILS_VERSION := 1.2.5.1
-ALSA_UTILS_MD5 := 8f142bebff84ff05438b46a0e896f53a
+ALSA_UTILS_VERSION := 1.2.6
+ALSA_UTILS_MD5 := fc109b2fa4517caeae1697d936ca78ff
ALSA_UTILS := alsa-utils-$(ALSA_UTILS_VERSION)
ALSA_UTILS_SUFFIX := tar.bz2
ALSA_UTILS_URL := \
--
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] 37+ messages in thread* Re: [ptxdist] [APPLIED] alsa-utils: Version bump 1.2.5.1 -> 1.2.6
2022-01-27 14:35 ` [ptxdist] [PATCH] alsa-utils: Version bump 1.2.5.1 -> 1.2.6 Christian Melki
@ 2022-01-30 15:49 ` Michael Olbrich
0 siblings, 0 replies; 37+ messages in thread
From: Michael Olbrich @ 2022-01-30 15:49 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 3a372bd2a645911509a13309499a785f299ab863.
Michael
[sent from post-receive hook]
On Sun, 30 Jan 2022 16:49:42 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Maintenance release, mostly bugfixes.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220127143532.2212796-8-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
> index 2693336a1f47..a71744d7ea3b 100644
> --- a/rules/alsa-utils.make
> +++ b/rules/alsa-utils.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ALSA_UTILS) += alsa-utils
> #
> # Paths and names
> #
> -ALSA_UTILS_VERSION := 1.2.5.1
> -ALSA_UTILS_MD5 := 8f142bebff84ff05438b46a0e896f53a
> +ALSA_UTILS_VERSION := 1.2.6
> +ALSA_UTILS_MD5 := fc109b2fa4517caeae1697d936ca78ff
> ALSA_UTILS := alsa-utils-$(ALSA_UTILS_VERSION)
> ALSA_UTILS_SUFFIX := tar.bz2
> ALSA_UTILS_URL := \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 37+ messages in thread
* [ptxdist] [PATCH] libsndfile: Version bump 1.0.25 -> 1.0.31.
2022-01-27 14:35 [ptxdist] [PATCH] wpa_supplicant: Version bump 2.9 -> 2.10 Christian Melki
` (6 preceding siblings ...)
2022-01-27 14:35 ` [ptxdist] [PATCH] alsa-utils: Version bump 1.2.5.1 -> 1.2.6 Christian Melki
@ 2022-01-27 14:35 ` Christian Melki
2022-01-28 12:46 ` Michael Olbrich
2022-01-27 14:35 ` [ptxdist] [WIP: PATCH] pps-tools: Version bump. 1.0.2 -> 1.0.3 Christian Melki
` (4 subsequent siblings)
12 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-27 14:35 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 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)
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
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [ptxdist] [PATCH] libsndfile: Version bump 1.0.25 -> 1.0.31.
2022-01-27 14:35 ` [ptxdist] [PATCH] libsndfile: Version bump 1.0.25 -> 1.0.31 Christian Melki
@ 2022-01-28 12:46 ` Michael Olbrich
0 siblings, 0 replies; 37+ messages in thread
From: Michael Olbrich @ 2022-01-28 12:46 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
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
^ permalink raw reply [flat|nested] 37+ messages in thread
* [ptxdist] [WIP: PATCH] pps-tools: Version bump. 1.0.2 -> 1.0.3
2022-01-27 14:35 [ptxdist] [PATCH] wpa_supplicant: Version bump 2.9 -> 2.10 Christian Melki
` (7 preceding siblings ...)
2022-01-27 14:35 ` [ptxdist] [PATCH] libsndfile: Version bump 1.0.25 -> 1.0.31 Christian Melki
@ 2022-01-27 14:35 ` Christian Melki
2022-01-28 9:26 ` Michael Olbrich
2022-01-27 14:35 ` [ptxdist] [PATCH] tpm2-tss: Version bump. 2.3.1 -> 3.1.0 Christian Melki
` (3 subsequent siblings)
12 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-27 14:35 UTC (permalink / raw)
To: ptxdist
Update pps-tools. Very minor bugfix release.
Remove old patch as that one got fixed upstream.
Add a patch to remove inclusion of SYSROOT.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...le-fix-installation-to-empty-DESTDIR.patch | 40 -------------------
patches/pps-tools-1.0.2/series | 4 --
.../0001-Makefile-fix-remove-SYSROOT.patch | 14 +++++++
patches/pps-tools-1.0.3/series | 1 +
rules/pps-tools.make | 4 +-
5 files changed, 17 insertions(+), 46 deletions(-)
delete mode 100644 patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
delete mode 100644 patches/pps-tools-1.0.2/series
create mode 100644 patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
create mode 100644 patches/pps-tools-1.0.3/series
diff --git a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch b/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
deleted file mode 100644
index 97498dc22..000000000
--- a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Mon, 3 Dec 2018 13:55:02 +0100
-Subject: [PATCH] Makefile: fix installation to empty DESTDIR
-
-When DESTDIR is empty, or at least does not contain usr/bin or
-usr/include, the installation fails, because install does not create
-those intermediate directories:
-
-$ make DESTDIR=/tmp/koin install
-install -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc
-install: failed to access '/tmp/koin/usr/bin': No such file or directory
-
-Using the -D option of install fixes this:
-
-$ make DESTDIR=/tmp/koin install
-install -D -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc
-install -D -m 644 -t /tmp/koin/usr/include/sys timepps.h
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Origin: upstream; https://github.com/redlab-i/pps-tools/commit/b3eae485a8c759d1ce1727076b2c287deb5f24e1
-Signed-off-by: Roland Hieber <rhi@pengutronix.de>
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 939466885e9f..30672f79585c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -19,8 +19,8 @@ include .depend
- endif
-
- install : all
-- install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
-- install -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
-+ install -D -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
-+ install -D -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
-
- uninstall :
- for f in $(TARGETS); do rm $(DESTDIR)/usr/bin/$$f; done
diff --git a/patches/pps-tools-1.0.2/series b/patches/pps-tools-1.0.2/series
deleted file mode 100644
index 7b3c77623..000000000
--- a/patches/pps-tools-1.0.2/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Makefile-fix-installation-to-empty-DESTDIR.patch
-# eb24c32ce10c0f011f2d37488c8de58c - git-ptx-patches magic
diff --git a/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch b/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
new file mode 100644
index 000000000..7b160ef9a
--- /dev/null
+++ b/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
@@ -0,0 +1,14 @@
+diff -urN pps-tools-1.0.3.orig/Makefile pps-tools-1.0.3/Makefile
+--- pps-tools-1.0.3.orig/Makefile 2022-01-27 11:20:18.590907158 +0100
++++ pps-tools-1.0.3/Makefile 2022-01-27 11:20:35.771295930 +0100
+@@ -3,10 +3,6 @@
+ CFLAGS += -Wall -O2 -D_GNU_SOURCE
+ CFLAGS += -ggdb
+ CFLAGS += -fPIC
+-ifdef SYSROOT
+-CFLAGS += --sysroot $(SYSROOT)
+-endif
+-
+ LDLIBS += -lm
+
+ # -- Actions section --
diff --git a/patches/pps-tools-1.0.3/series b/patches/pps-tools-1.0.3/series
new file mode 100644
index 000000000..23495d2ef
--- /dev/null
+++ b/patches/pps-tools-1.0.3/series
@@ -0,0 +1 @@
+0001-Makefile-fix-remove-SYSROOT.patch
diff --git a/rules/pps-tools.make b/rules/pps-tools.make
index 65a06c7d1..789659154 100644
--- a/rules/pps-tools.make
+++ b/rules/pps-tools.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PPS_TOOLS) += pps-tools
#
# Paths and names
#
-PPS_TOOLS_VERSION := 1.0.2
-PPS_TOOLS_MD5 := 6eddfeb151cffe8751f4766e428b8eb7
+PPS_TOOLS_VERSION := 1.0.3
+PPS_TOOLS_MD5 := 9b18c55efe020d02c26cd8c759ac258d
PPS_TOOLS := pps-tools-$(PPS_TOOLS_VERSION)
PPS_TOOLS_SUFFIX := tar.gz
PPS_TOOLS_URL := https://github.com/redlab-i/pps-tools/archive/v$(PPS_TOOLS_VERSION).$(PPS_TOOLS_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] 37+ messages in thread* Re: [ptxdist] [WIP: PATCH] pps-tools: Version bump. 1.0.2 -> 1.0.3
2022-01-27 14:35 ` [ptxdist] [WIP: PATCH] pps-tools: Version bump. 1.0.2 -> 1.0.3 Christian Melki
@ 2022-01-28 9:26 ` Michael Olbrich
2022-01-28 9:39 ` Christian Melki
0 siblings, 1 reply; 37+ messages in thread
From: Michael Olbrich @ 2022-01-28 9:26 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
What's WIP here.
On Thu, Jan 27, 2022 at 03:35:29PM +0100, Christian Melki wrote:
> Update pps-tools. Very minor bugfix release.
> Remove old patch as that one got fixed upstream.
> Add a patch to remove inclusion of SYSROOT.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> ...le-fix-installation-to-empty-DESTDIR.patch | 40 -------------------
> patches/pps-tools-1.0.2/series | 4 --
> .../0001-Makefile-fix-remove-SYSROOT.patch | 14 +++++++
> patches/pps-tools-1.0.3/series | 1 +
> rules/pps-tools.make | 4 +-
> 5 files changed, 17 insertions(+), 46 deletions(-)
> delete mode 100644 patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
> delete mode 100644 patches/pps-tools-1.0.2/series
> create mode 100644 patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
> create mode 100644 patches/pps-tools-1.0.3/series
>
> diff --git a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch b/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
> deleted file mode 100644
> index 97498dc22..000000000
> --- a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> -Date: Mon, 3 Dec 2018 13:55:02 +0100
> -Subject: [PATCH] Makefile: fix installation to empty DESTDIR
> -
> -When DESTDIR is empty, or at least does not contain usr/bin or
> -usr/include, the installation fails, because install does not create
> -those intermediate directories:
> -
> -$ make DESTDIR=/tmp/koin install
> -install -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc
> -install: failed to access '/tmp/koin/usr/bin': No such file or directory
> -
> -Using the -D option of install fixes this:
> -
> -$ make DESTDIR=/tmp/koin install
> -install -D -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc
> -install -D -m 644 -t /tmp/koin/usr/include/sys timepps.h
> -
> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> -Origin: upstream; https://github.com/redlab-i/pps-tools/commit/b3eae485a8c759d1ce1727076b2c287deb5f24e1
> -Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ----
> - Makefile | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index 939466885e9f..30672f79585c 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -19,8 +19,8 @@ include .depend
> - endif
> -
> - install : all
> -- install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
> -- install -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
> -+ install -D -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
> -+ install -D -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
> -
> - uninstall :
> - for f in $(TARGETS); do rm $(DESTDIR)/usr/bin/$$f; done
> diff --git a/patches/pps-tools-1.0.2/series b/patches/pps-tools-1.0.2/series
> deleted file mode 100644
> index 7b3c77623..000000000
> --- a/patches/pps-tools-1.0.2/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Makefile-fix-installation-to-empty-DESTDIR.patch
> -# eb24c32ce10c0f011f2d37488c8de58c - git-ptx-patches magic
> diff --git a/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch b/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
Path header if you keep the patch.
> new file mode 100644
> index 000000000..7b160ef9a
> --- /dev/null
> +++ b/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
> @@ -0,0 +1,14 @@
> +diff -urN pps-tools-1.0.3.orig/Makefile pps-tools-1.0.3/Makefile
> +--- pps-tools-1.0.3.orig/Makefile 2022-01-27 11:20:18.590907158 +0100
> ++++ pps-tools-1.0.3/Makefile 2022-01-27 11:20:35.771295930 +0100
> +@@ -3,10 +3,6 @@
> + CFLAGS += -Wall -O2 -D_GNU_SOURCE
> + CFLAGS += -ggdb
> + CFLAGS += -fPIC
> +-ifdef SYSROOT
> +-CFLAGS += --sysroot $(SYSROOT)
> +-endif
> +-
I think adding 'SYSROOT=' to PPS_TOOLS_MAKE_ENV should work instead of
this.
Michael
> + LDLIBS += -lm
> +
> + # -- Actions section --
> diff --git a/patches/pps-tools-1.0.3/series b/patches/pps-tools-1.0.3/series
> new file mode 100644
> index 000000000..23495d2ef
> --- /dev/null
> +++ b/patches/pps-tools-1.0.3/series
> @@ -0,0 +1 @@
> +0001-Makefile-fix-remove-SYSROOT.patch
> diff --git a/rules/pps-tools.make b/rules/pps-tools.make
> index 65a06c7d1..789659154 100644
> --- a/rules/pps-tools.make
> +++ b/rules/pps-tools.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PPS_TOOLS) += pps-tools
> #
> # Paths and names
> #
> -PPS_TOOLS_VERSION := 1.0.2
> -PPS_TOOLS_MD5 := 6eddfeb151cffe8751f4766e428b8eb7
> +PPS_TOOLS_VERSION := 1.0.3
> +PPS_TOOLS_MD5 := 9b18c55efe020d02c26cd8c759ac258d
> PPS_TOOLS := pps-tools-$(PPS_TOOLS_VERSION)
> PPS_TOOLS_SUFFIX := tar.gz
> PPS_TOOLS_URL := https://github.com/redlab-i/pps-tools/archive/v$(PPS_TOOLS_VERSION).$(PPS_TOOLS_SUFFIX)
> --
> 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] 37+ messages in thread
* Re: [ptxdist] [WIP: PATCH] pps-tools: Version bump. 1.0.2 -> 1.0.3
2022-01-28 9:26 ` Michael Olbrich
@ 2022-01-28 9:39 ` Christian Melki
2022-01-28 10:36 ` Michael Olbrich
0 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-28 9:39 UTC (permalink / raw)
To: ptxdist
Yes. Right.
The question revolves around the authors use of the SYSROOT variable.
Ptxdist declares it and this is taken up as a --sysroot variable to the
toolchain, offsetting all headers etc to the ptxdist sysroot.
Which means standard headers etc are lost.
So the question is really. Is SYSROOT a reserved variable?
I can't really make that out. Or is the authors assumption that SYSROOT
means what it means wrong?
Regards,
Christian
On 1/28/22 10:26 AM, Michael Olbrich wrote:
>
> What's WIP here.
>
> On Thu, Jan 27, 2022 at 03:35:29PM +0100, Christian Melki wrote:
>> Update pps-tools. Very minor bugfix release.
>> Remove old patch as that one got fixed upstream.
>> Add a patch to remove inclusion of SYSROOT.
>>
>> Signed-off-by: Christian Melki <christian.melki@t2data.com>
>> ---
>> ...le-fix-installation-to-empty-DESTDIR.patch | 40 -------------------
>> patches/pps-tools-1.0.2/series | 4 --
>> .../0001-Makefile-fix-remove-SYSROOT.patch | 14 +++++++
>> patches/pps-tools-1.0.3/series | 1 +
>> rules/pps-tools.make | 4 +-
>> 5 files changed, 17 insertions(+), 46 deletions(-)
>> delete mode 100644 patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
>> delete mode 100644 patches/pps-tools-1.0.2/series
>> create mode 100644 patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
>> create mode 100644 patches/pps-tools-1.0.3/series
>>
>> diff --git a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch b/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
>> deleted file mode 100644
>> index 97498dc22..000000000
>> --- a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
>> +++ /dev/null
>> @@ -1,40 +0,0 @@
>> -From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
>> -Date: Mon, 3 Dec 2018 13:55:02 +0100
>> -Subject: [PATCH] Makefile: fix installation to empty DESTDIR
>> -
>> -When DESTDIR is empty, or at least does not contain usr/bin or
>> -usr/include, the installation fails, because install does not create
>> -those intermediate directories:
>> -
>> -$ make DESTDIR=/tmp/koin install
>> -install -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc
>> -install: failed to access '/tmp/koin/usr/bin': No such file or directory
>> -
>> -Using the -D option of install fixes this:
>> -
>> -$ make DESTDIR=/tmp/koin install
>> -install -D -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc
>> -install -D -m 644 -t /tmp/koin/usr/include/sys timepps.h
>> -
>> -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
>> -Origin: upstream; https://github.com/redlab-i/pps-tools/commit/b3eae485a8c759d1ce1727076b2c287deb5f24e1
>> -Signed-off-by: Roland Hieber <rhi@pengutronix.de>
>> ----
>> - Makefile | 4 ++--
>> - 1 file changed, 2 insertions(+), 2 deletions(-)
>> -
>> -diff --git a/Makefile b/Makefile
>> -index 939466885e9f..30672f79585c 100644
>> ---- a/Makefile
>> -+++ b/Makefile
>> -@@ -19,8 +19,8 @@ include .depend
>> - endif
>> -
>> - install : all
>> -- install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
>> -- install -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
>> -+ install -D -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
>> -+ install -D -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
>> -
>> - uninstall :
>> - for f in $(TARGETS); do rm $(DESTDIR)/usr/bin/$$f; done
>> diff --git a/patches/pps-tools-1.0.2/series b/patches/pps-tools-1.0.2/series
>> deleted file mode 100644
>> index 7b3c77623..000000000
>> --- a/patches/pps-tools-1.0.2/series
>> +++ /dev/null
>> @@ -1,4 +0,0 @@
>> -# generated by git-ptx-patches
>> -#tag:base --start-number 1
>> -0001-Makefile-fix-installation-to-empty-DESTDIR.patch
>> -# eb24c32ce10c0f011f2d37488c8de58c - git-ptx-patches magic
>> diff --git a/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch b/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
>
> Path header if you keep the patch.
>
>> new file mode 100644
>> index 000000000..7b160ef9a
>> --- /dev/null
>> +++ b/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
>> @@ -0,0 +1,14 @@
>> +diff -urN pps-tools-1.0.3.orig/Makefile pps-tools-1.0.3/Makefile
>> +--- pps-tools-1.0.3.orig/Makefile 2022-01-27 11:20:18.590907158 +0100
>> ++++ pps-tools-1.0.3/Makefile 2022-01-27 11:20:35.771295930 +0100
>> +@@ -3,10 +3,6 @@
>> + CFLAGS += -Wall -O2 -D_GNU_SOURCE
>> + CFLAGS += -ggdb
>> + CFLAGS += -fPIC
>> +-ifdef SYSROOT
>> +-CFLAGS += --sysroot $(SYSROOT)
>> +-endif
>> +-
>
> I think adding 'SYSROOT=' to PPS_TOOLS_MAKE_ENV should work instead of
> this.
>
> Michael
>
>> + LDLIBS += -lm
>> +
>> + # -- Actions section --
>> diff --git a/patches/pps-tools-1.0.3/series b/patches/pps-tools-1.0.3/series
>> new file mode 100644
>> index 000000000..23495d2ef
>> --- /dev/null
>> +++ b/patches/pps-tools-1.0.3/series
>> @@ -0,0 +1 @@
>> +0001-Makefile-fix-remove-SYSROOT.patch
>> diff --git a/rules/pps-tools.make b/rules/pps-tools.make
>> index 65a06c7d1..789659154 100644
>> --- a/rules/pps-tools.make
>> +++ b/rules/pps-tools.make
>> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PPS_TOOLS) += pps-tools
>> #
>> # Paths and names
>> #
>> -PPS_TOOLS_VERSION := 1.0.2
>> -PPS_TOOLS_MD5 := 6eddfeb151cffe8751f4766e428b8eb7
>> +PPS_TOOLS_VERSION := 1.0.3
>> +PPS_TOOLS_MD5 := 9b18c55efe020d02c26cd8c759ac258d
>> PPS_TOOLS := pps-tools-$(PPS_TOOLS_VERSION)
>> PPS_TOOLS_SUFFIX := tar.gz
>> PPS_TOOLS_URL := https://github.com/redlab-i/pps-tools/archive/v$(PPS_TOOLS_VERSION).$(PPS_TOOLS_SUFFIX)
>> --
>> 2.30.2
>>
>>
>> _______________________________________________
>> ptxdist mailing list
>> ptxdist@pengutronix.de
>> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>>
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [ptxdist] [WIP: PATCH] pps-tools: Version bump. 1.0.2 -> 1.0.3
2022-01-28 9:39 ` Christian Melki
@ 2022-01-28 10:36 ` Michael Olbrich
0 siblings, 0 replies; 37+ messages in thread
From: Michael Olbrich @ 2022-01-28 10:36 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
Hi
On Fri, Jan 28, 2022 at 10:39:25AM +0100, Christian Melki wrote:
> The question revolves around the authors use of the SYSROOT variable.
> Ptxdist declares it and this is taken up as a --sysroot variable to the
> toolchain, offsetting all headers etc to the ptxdist sysroot.
> Which means standard headers etc are lost.
>
> So the question is really. Is SYSROOT a reserved variable?
> I can't really make that out. Or is the authors assumption that SYSROOT
> means what it means wrong?
I don't think SYSROOT has a defined meaning. Some packages use it to look
for stuff relative to this directory. But even that is inconsistent.
And in PTXdist the whole thing is more complex: There is the sysroot in the
toolchain. The toolchain headers and libraries are found there. And there
is the sysroot in the BSP.
So if an upstream Makefile uses SYSROOT in some way, then we just need to
deal with it.
Michael
> On 1/28/22 10:26 AM, Michael Olbrich wrote:
> >
> > What's WIP here.
> >
> > On Thu, Jan 27, 2022 at 03:35:29PM +0100, Christian Melki wrote:
> > > Update pps-tools. Very minor bugfix release.
> > > Remove old patch as that one got fixed upstream.
> > > Add a patch to remove inclusion of SYSROOT.
> > >
> > > Signed-off-by: Christian Melki <christian.melki@t2data.com>
> > > ---
> > > ...le-fix-installation-to-empty-DESTDIR.patch | 40 -------------------
> > > patches/pps-tools-1.0.2/series | 4 --
> > > .../0001-Makefile-fix-remove-SYSROOT.patch | 14 +++++++
> > > patches/pps-tools-1.0.3/series | 1 +
> > > rules/pps-tools.make | 4 +-
> > > 5 files changed, 17 insertions(+), 46 deletions(-)
> > > delete mode 100644 patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
> > > delete mode 100644 patches/pps-tools-1.0.2/series
> > > create mode 100644 patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
> > > create mode 100644 patches/pps-tools-1.0.3/series
> > >
> > > diff --git a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch b/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
> > > deleted file mode 100644
> > > index 97498dc22..000000000
> > > --- a/patches/pps-tools-1.0.2/0001-Makefile-fix-installation-to-empty-DESTDIR.patch
> > > +++ /dev/null
> > > @@ -1,40 +0,0 @@
> > > -From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> > > -Date: Mon, 3 Dec 2018 13:55:02 +0100
> > > -Subject: [PATCH] Makefile: fix installation to empty DESTDIR
> > > -
> > > -When DESTDIR is empty, or at least does not contain usr/bin or
> > > -usr/include, the installation fails, because install does not create
> > > -those intermediate directories:
> > > -
> > > -$ make DESTDIR=/tmp/koin install
> > > -install -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc
> > > -install: failed to access '/tmp/koin/usr/bin': No such file or directory
> > > -
> > > -Using the -D option of install fixes this:
> > > -
> > > -$ make DESTDIR=/tmp/koin install
> > > -install -D -m 755 -t /tmp/koin/usr/bin ppsfind ppstest ppsctl ppswatch ppsldisc
> > > -install -D -m 644 -t /tmp/koin/usr/include/sys timepps.h
> > > -
> > > -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> > > -Origin: upstream; https://github.com/redlab-i/pps-tools/commit/b3eae485a8c759d1ce1727076b2c287deb5f24e1
> > > -Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > > ----
> > > - Makefile | 4 ++--
> > > - 1 file changed, 2 insertions(+), 2 deletions(-)
> > > -
> > > -diff --git a/Makefile b/Makefile
> > > -index 939466885e9f..30672f79585c 100644
> > > ---- a/Makefile
> > > -+++ b/Makefile
> > > -@@ -19,8 +19,8 @@ include .depend
> > > - endif
> > > -
> > > - install : all
> > > -- install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
> > > -- install -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
> > > -+ install -D -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS)
> > > -+ install -D -m 644 -t $(DESTDIR)/usr/include/sys timepps.h
> > > -
> > > - uninstall :
> > > - for f in $(TARGETS); do rm $(DESTDIR)/usr/bin/$$f; done
> > > diff --git a/patches/pps-tools-1.0.2/series b/patches/pps-tools-1.0.2/series
> > > deleted file mode 100644
> > > index 7b3c77623..000000000
> > > --- a/patches/pps-tools-1.0.2/series
> > > +++ /dev/null
> > > @@ -1,4 +0,0 @@
> > > -# generated by git-ptx-patches
> > > -#tag:base --start-number 1
> > > -0001-Makefile-fix-installation-to-empty-DESTDIR.patch
> > > -# eb24c32ce10c0f011f2d37488c8de58c - git-ptx-patches magic
> > > diff --git a/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch b/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
> >
> > Path header if you keep the patch.
> >
> > > new file mode 100644
> > > index 000000000..7b160ef9a
> > > --- /dev/null
> > > +++ b/patches/pps-tools-1.0.3/0001-Makefile-fix-remove-SYSROOT.patch
> > > @@ -0,0 +1,14 @@
> > > +diff -urN pps-tools-1.0.3.orig/Makefile pps-tools-1.0.3/Makefile
> > > +--- pps-tools-1.0.3.orig/Makefile 2022-01-27 11:20:18.590907158 +0100
> > > ++++ pps-tools-1.0.3/Makefile 2022-01-27 11:20:35.771295930 +0100
> > > +@@ -3,10 +3,6 @@
> > > + CFLAGS += -Wall -O2 -D_GNU_SOURCE
> > > + CFLAGS += -ggdb
> > > + CFLAGS += -fPIC
> > > +-ifdef SYSROOT
> > > +-CFLAGS += --sysroot $(SYSROOT)
> > > +-endif
> > > +-
> >
> > I think adding 'SYSROOT=' to PPS_TOOLS_MAKE_ENV should work instead of
> > this.
> >
> > Michael
> >
> > > + LDLIBS += -lm
> > > +
> > > + # -- Actions section --
> > > diff --git a/patches/pps-tools-1.0.3/series b/patches/pps-tools-1.0.3/series
> > > new file mode 100644
> > > index 000000000..23495d2ef
> > > --- /dev/null
> > > +++ b/patches/pps-tools-1.0.3/series
> > > @@ -0,0 +1 @@
> > > +0001-Makefile-fix-remove-SYSROOT.patch
> > > diff --git a/rules/pps-tools.make b/rules/pps-tools.make
> > > index 65a06c7d1..789659154 100644
> > > --- a/rules/pps-tools.make
> > > +++ b/rules/pps-tools.make
> > > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PPS_TOOLS) += pps-tools
> > > #
> > > # Paths and names
> > > #
> > > -PPS_TOOLS_VERSION := 1.0.2
> > > -PPS_TOOLS_MD5 := 6eddfeb151cffe8751f4766e428b8eb7
> > > +PPS_TOOLS_VERSION := 1.0.3
> > > +PPS_TOOLS_MD5 := 9b18c55efe020d02c26cd8c759ac258d
> > > PPS_TOOLS := pps-tools-$(PPS_TOOLS_VERSION)
> > > PPS_TOOLS_SUFFIX := tar.gz
> > > PPS_TOOLS_URL := https://github.com/redlab-i/pps-tools/archive/v$(PPS_TOOLS_VERSION).$(PPS_TOOLS_SUFFIX)
> > > --
> > > 2.30.2
> > >
> > >
> > > _______________________________________________
> > > ptxdist mailing list
> > > ptxdist@pengutronix.de
> > > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> > >
> >
>
> _______________________________________________
> 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] 37+ messages in thread
* [ptxdist] [PATCH] tpm2-tss: Version bump. 2.3.1 -> 3.1.0
2022-01-27 14:35 [ptxdist] [PATCH] wpa_supplicant: Version bump 2.9 -> 2.10 Christian Melki
` (8 preceding siblings ...)
2022-01-27 14:35 ` [ptxdist] [WIP: PATCH] pps-tools: Version bump. 1.0.2 -> 1.0.3 Christian Melki
@ 2022-01-27 14:35 ` Christian Melki
2022-01-28 16:16 ` Michael Olbrich
2022-01-27 14:35 ` [ptxdist] [PATCH] tpm2-tools: Version bump. 4.1 -> 5.2 Christian Melki
` (2 subsequent siblings)
12 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-27 14:35 UTC (permalink / raw)
To: ptxdist
Approx. 2,5 year worth of fixes.
https://github.com/tpm2-software/tpm2-tss/releases
Fixes CVE-2020-24455 (three times over).
tpm2-tss now depends on JSON_C and LIBCURL.
Remove changed configuration options.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/tpm2-tss.in | 2 ++
rules/tpm2-tss.make | 7 ++-----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/rules/tpm2-tss.in b/rules/tpm2-tss.in
index dbb310072..75d32188c 100644
--- a/rules/tpm2-tss.in
+++ b/rules/tpm2-tss.in
@@ -4,6 +4,8 @@ config TPM2_TSS
tristate
select HOST_AUTOTOOLS_AUTOCONF_ARCHIVE
select OPENSSL
+ select JSON_C
+ select LIBCURL
prompt "tpm2-tss"
help
TPM2 Software stack library - TSS and TCTI libraries
diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
index 768c64426..72aff609a 100644
--- a/rules/tpm2-tss.make
+++ b/rules/tpm2-tss.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss
#
# Paths and names
#
-TPM2_TSS_VERSION := 2.3.1
-TPM2_TSS_MD5 := 5744b10e3cef56df5d65b50f51fb3fe9
+TPM2_TSS_VERSION := 3.1.0
+TPM2_TSS_MD5 := 4d04cf52fff4ee061bb3f7b4f4ea03b7
TPM2_TSS := tpm2-tss-$(TPM2_TSS_VERSION)
TPM2_TSS_SUFFIX := tar.gz
TPM2_TSS_URL := https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
@@ -36,9 +36,6 @@ TPM2_TSS_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--enable-debug=info \
--disable-unit \
- --enable-esapi \
- --disable-tcti-device-async \
- --disable-tcti-partial-reads \
--enable-tcti-device \
--enable-tcti-mssim \
--disable-tcti-fuzzing \
--
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] 37+ messages in thread* Re: [ptxdist] [PATCH] tpm2-tss: Version bump. 2.3.1 -> 3.1.0
2022-01-27 14:35 ` [ptxdist] [PATCH] tpm2-tss: Version bump. 2.3.1 -> 3.1.0 Christian Melki
@ 2022-01-28 16:16 ` Michael Olbrich
2022-01-28 17:22 ` Christian Melki
0 siblings, 1 reply; 37+ messages in thread
From: Michael Olbrich @ 2022-01-28 16:16 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
On Thu, Jan 27, 2022 at 03:35:30PM +0100, Christian Melki wrote:
> Approx. 2,5 year worth of fixes.
> https://github.com/tpm2-software/tpm2-tss/releases
> Fixes CVE-2020-24455 (three times over).
> tpm2-tss now depends on JSON_C and LIBCURL.
> Remove changed configuration options.
Fails to build here:
checking for groupadd... no
configure: error: Missing required program 'groupadd': ensure it is installed and on PATH.
Adding a group should not be done during install anyways and it would fail,
so I think this should work:
TPM2_TSS_CONF_ENV := \
$(CROSS_ENV) \
GROUPADD=: \
USERADD=:
Michael
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> rules/tpm2-tss.in | 2 ++
> rules/tpm2-tss.make | 7 ++-----
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/rules/tpm2-tss.in b/rules/tpm2-tss.in
> index dbb310072..75d32188c 100644
> --- a/rules/tpm2-tss.in
> +++ b/rules/tpm2-tss.in
> @@ -4,6 +4,8 @@ config TPM2_TSS
> tristate
> select HOST_AUTOTOOLS_AUTOCONF_ARCHIVE
> select OPENSSL
> + select JSON_C
> + select LIBCURL
> prompt "tpm2-tss"
> help
> TPM2 Software stack library - TSS and TCTI libraries
> diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
> index 768c64426..72aff609a 100644
> --- a/rules/tpm2-tss.make
> +++ b/rules/tpm2-tss.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss
> #
> # Paths and names
> #
> -TPM2_TSS_VERSION := 2.3.1
> -TPM2_TSS_MD5 := 5744b10e3cef56df5d65b50f51fb3fe9
> +TPM2_TSS_VERSION := 3.1.0
> +TPM2_TSS_MD5 := 4d04cf52fff4ee061bb3f7b4f4ea03b7
> TPM2_TSS := tpm2-tss-$(TPM2_TSS_VERSION)
> TPM2_TSS_SUFFIX := tar.gz
> TPM2_TSS_URL := https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
> @@ -36,9 +36,6 @@ TPM2_TSS_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> --enable-debug=info \
> --disable-unit \
> - --enable-esapi \
> - --disable-tcti-device-async \
> - --disable-tcti-partial-reads \
> --enable-tcti-device \
> --enable-tcti-mssim \
> --disable-tcti-fuzzing \
> --
> 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] 37+ messages in thread
* Re: [ptxdist] [PATCH] tpm2-tss: Version bump. 2.3.1 -> 3.1.0
2022-01-28 16:16 ` Michael Olbrich
@ 2022-01-28 17:22 ` Christian Melki
2022-01-28 18:32 ` Michael Olbrich
0 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-28 17:22 UTC (permalink / raw)
To: Michael Olbrich; +Cc: ptxdist
On 1/28/22 17:16, Michael Olbrich wrote:
> On Thu, Jan 27, 2022 at 03:35:30PM +0100, Christian Melki wrote:
>> Approx. 2,5 year worth of fixes.
>> https://github.com/tpm2-software/tpm2-tss/releases
>> Fixes CVE-2020-24455 (three times over).
>> tpm2-tss now depends on JSON_C and LIBCURL.
>> Remove changed configuration options.
>
> Fails to build here:
>
> checking for groupadd... no
> configure: error: Missing required program 'groupadd': ensure it is installed and on PATH.
>
> Adding a group should not be done during install anyways and it would fail,
> so I think this should work:
>
> TPM2_TSS_CONF_ENV := \
> $(CROSS_ENV) \
> GROUPADD=: \
> USERADD=:
>
> Michael
>
Didn't see that one coming. How abusive!
>From a makefile none the less.
I have the required binaries on my development machine so I didn't notice.
Now, I've tried your suggestion, but I can't see that it helps?
Looks like the entire thing goes about the binaries in a very static
fashion.
..
define make_tss_user_and_group
(id -g tss 2>/dev/null || groupadd -r tss) && \
(id -u tss 2>/dev/null || useradd -r -g tss tss)
endef
..and..
define set_tss_permissions
(chown -R tss:tss "$1") && \
(chmod -R 2775 "$1") && \
(setfacl -m default:group:tss:rwx "$1")
endef
..
>> Signed-off-by: Christian Melki <christian.melki@t2data.com>
>> ---
>> rules/tpm2-tss.in | 2 ++
>> rules/tpm2-tss.make | 7 ++-----
>> 2 files changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/rules/tpm2-tss.in b/rules/tpm2-tss.in
>> index dbb310072..75d32188c 100644
>> --- a/rules/tpm2-tss.in
>> +++ b/rules/tpm2-tss.in
>> @@ -4,6 +4,8 @@ config TPM2_TSS
>> tristate
>> select HOST_AUTOTOOLS_AUTOCONF_ARCHIVE
>> select OPENSSL
>> + select JSON_C
>> + select LIBCURL
>> prompt "tpm2-tss"
>> help
>> TPM2 Software stack library - TSS and TCTI libraries
>> diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
>> index 768c64426..72aff609a 100644
>> --- a/rules/tpm2-tss.make
>> +++ b/rules/tpm2-tss.make
>> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss
>> #
>> # Paths and names
>> #
>> -TPM2_TSS_VERSION := 2.3.1
>> -TPM2_TSS_MD5 := 5744b10e3cef56df5d65b50f51fb3fe9
>> +TPM2_TSS_VERSION := 3.1.0
>> +TPM2_TSS_MD5 := 4d04cf52fff4ee061bb3f7b4f4ea03b7
>> TPM2_TSS := tpm2-tss-$(TPM2_TSS_VERSION)
>> TPM2_TSS_SUFFIX := tar.gz
>> TPM2_TSS_URL := https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
>> @@ -36,9 +36,6 @@ TPM2_TSS_CONF_OPT := \
>> $(CROSS_AUTOCONF_USR) \
>> --enable-debug=info \
>> --disable-unit \
>> - --enable-esapi \
>> - --disable-tcti-device-async \
>> - --disable-tcti-partial-reads \
>> --enable-tcti-device \
>> --enable-tcti-mssim \
>> --disable-tcti-fuzzing \
>> --
>> 2.30.2
>>
>>
>> _______________________________________________
>> ptxdist mailing list
>> ptxdist@pengutronix.de
>> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>>
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [ptxdist] [PATCH] tpm2-tss: Version bump. 2.3.1 -> 3.1.0
2022-01-28 17:22 ` Christian Melki
@ 2022-01-28 18:32 ` Michael Olbrich
2022-01-29 8:29 ` Christian Melki
0 siblings, 1 reply; 37+ messages in thread
From: Michael Olbrich @ 2022-01-28 18:32 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
On Fri, Jan 28, 2022 at 06:22:19PM +0100, Christian Melki wrote:
> On 1/28/22 17:16, Michael Olbrich wrote:
> > On Thu, Jan 27, 2022 at 03:35:30PM +0100, Christian Melki wrote:
> >> Approx. 2,5 year worth of fixes.
> >> https://github.com/tpm2-software/tpm2-tss/releases
> >> Fixes CVE-2020-24455 (three times over).
> >> tpm2-tss now depends on JSON_C and LIBCURL.
> >> Remove changed configuration options.
> >
> > Fails to build here:
> >
> > checking for groupadd... no
> > configure: error: Missing required program 'groupadd': ensure it is installed and on PATH.
> >
> > Adding a group should not be done during install anyways and it would fail,
> > so I think this should work:
> >
> > TPM2_TSS_CONF_ENV := \
> > $(CROSS_ENV) \
> > GROUPADD=: \
> > USERADD=:
> >
> > Michael
> >
>
> Didn't see that one coming. How abusive!
> From a makefile none the less.
> I have the required binaries on my development machine so I didn't notice.
> Now, I've tried your suggestion, but I can't see that it helps?
>
> Looks like the entire thing goes about the binaries in a very static
> fashion.
>
> ..
> define make_tss_user_and_group
> (id -g tss 2>/dev/null || groupadd -r tss) && \
> (id -u tss 2>/dev/null || useradd -r -g tss tss)
> endef
@$(call make_tss_user_and_group) || echo "WARNING Failed to create the tss user and group"
so any error here is ignored. We just need to get through the configure
check.
> ..and..
>
> define set_tss_permissions
> (chown -R tss:tss "$1") && \
> (chmod -R 2775 "$1") && \
> (setfacl -m default:group:tss:rwx "$1")
> endef
> ..
And 'make install' is called with fakeroot, so this will just be ignored as
well.
Michael
>
> >> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> >> ---
> >> rules/tpm2-tss.in | 2 ++
> >> rules/tpm2-tss.make | 7 ++-----
> >> 2 files changed, 4 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/rules/tpm2-tss.in b/rules/tpm2-tss.in
> >> index dbb310072..75d32188c 100644
> >> --- a/rules/tpm2-tss.in
> >> +++ b/rules/tpm2-tss.in
> >> @@ -4,6 +4,8 @@ config TPM2_TSS
> >> tristate
> >> select HOST_AUTOTOOLS_AUTOCONF_ARCHIVE
> >> select OPENSSL
> >> + select JSON_C
> >> + select LIBCURL
> >> prompt "tpm2-tss"
> >> help
> >> TPM2 Software stack library - TSS and TCTI libraries
> >> diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
> >> index 768c64426..72aff609a 100644
> >> --- a/rules/tpm2-tss.make
> >> +++ b/rules/tpm2-tss.make
> >> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss
> >> #
> >> # Paths and names
> >> #
> >> -TPM2_TSS_VERSION := 2.3.1
> >> -TPM2_TSS_MD5 := 5744b10e3cef56df5d65b50f51fb3fe9
> >> +TPM2_TSS_VERSION := 3.1.0
> >> +TPM2_TSS_MD5 := 4d04cf52fff4ee061bb3f7b4f4ea03b7
> >> TPM2_TSS := tpm2-tss-$(TPM2_TSS_VERSION)
> >> TPM2_TSS_SUFFIX := tar.gz
> >> TPM2_TSS_URL := https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
> >> @@ -36,9 +36,6 @@ TPM2_TSS_CONF_OPT := \
> >> $(CROSS_AUTOCONF_USR) \
> >> --enable-debug=info \
> >> --disable-unit \
> >> - --enable-esapi \
> >> - --disable-tcti-device-async \
> >> - --disable-tcti-partial-reads \
> >> --enable-tcti-device \
> >> --enable-tcti-mssim \
> >> --disable-tcti-fuzzing \
> >> --
> >> 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] 37+ messages in thread
* Re: [ptxdist] [PATCH] tpm2-tss: Version bump. 2.3.1 -> 3.1.0
2022-01-28 18:32 ` Michael Olbrich
@ 2022-01-29 8:29 ` Christian Melki
2022-01-29 15:36 ` Michael Olbrich
0 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-29 8:29 UTC (permalink / raw)
To: Michael Olbrich; +Cc: ptxdist
On 1/28/22 19:32, Michael Olbrich wrote:
> On Fri, Jan 28, 2022 at 06:22:19PM +0100, Christian Melki wrote:
>> On 1/28/22 17:16, Michael Olbrich wrote:
>>> On Thu, Jan 27, 2022 at 03:35:30PM +0100, Christian Melki wrote:
>>>> Approx. 2,5 year worth of fixes.
>>>> https://github.com/tpm2-software/tpm2-tss/releases
>>>> Fixes CVE-2020-24455 (three times over).
>>>> tpm2-tss now depends on JSON_C and LIBCURL.
>>>> Remove changed configuration options.
>>>
>>> Fails to build here:
>>>
>>> checking for groupadd... no
>>> configure: error: Missing required program 'groupadd': ensure it is installed and on PATH.
>>>
>>> Adding a group should not be done during install anyways and it would fail,
>>> so I think this should work:
>>>
>>> TPM2_TSS_CONF_ENV := \
>>> $(CROSS_ENV) \
>>> GROUPADD=: \
>>> USERADD=:
>>>
>>> Michael
>>>
>>
>> Didn't see that one coming. How abusive!
>> From a makefile none the less.
>> I have the required binaries on my development machine so I didn't notice.
>> Now, I've tried your suggestion, but I can't see that it helps?
>>
>> Looks like the entire thing goes about the binaries in a very static
>> fashion.
>>
>> ..
>> define make_tss_user_and_group
>> (id -g tss 2>/dev/null || groupadd -r tss) && \
>> (id -u tss 2>/dev/null || useradd -r -g tss tss)
>> endef
>
> @$(call make_tss_user_and_group) || echo "WARNING Failed to create the tss user and group"
>
> so any error here is ignored. We just need to get through the configure
> check.
>
ack.
TPM2_TSS_CONF_ENV := \
$(CROSS_ENV) \
ac_cv_prog_result_groupadd=yes \
ac_cv_prog_result_useradd=yes
should work for getting through configure?
>> ..and..
>>
>> define set_tss_permissions
>> (chown -R tss:tss "$1") && \
>> (chmod -R 2775 "$1") && \
>> (setfacl -m default:group:tss:rwx "$1")
>> endef
>> ..
>
> And 'make install' is called with fakeroot, so this will just be ignored as
> well.
>
> Michael
>
>>
>>>> Signed-off-by: Christian Melki <christian.melki@t2data.com>
>>>> ---
>>>> rules/tpm2-tss.in | 2 ++
>>>> rules/tpm2-tss.make | 7 ++-----
>>>> 2 files changed, 4 insertions(+), 5 deletions(-)
>>>>
>>>> diff --git a/rules/tpm2-tss.in b/rules/tpm2-tss.in
>>>> index dbb310072..75d32188c 100644
>>>> --- a/rules/tpm2-tss.in
>>>> +++ b/rules/tpm2-tss.in
>>>> @@ -4,6 +4,8 @@ config TPM2_TSS
>>>> tristate
>>>> select HOST_AUTOTOOLS_AUTOCONF_ARCHIVE
>>>> select OPENSSL
>>>> + select JSON_C
>>>> + select LIBCURL
>>>> prompt "tpm2-tss"
>>>> help
>>>> TPM2 Software stack library - TSS and TCTI libraries
>>>> diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
>>>> index 768c64426..72aff609a 100644
>>>> --- a/rules/tpm2-tss.make
>>>> +++ b/rules/tpm2-tss.make
>>>> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss
>>>> #
>>>> # Paths and names
>>>> #
>>>> -TPM2_TSS_VERSION := 2.3.1
>>>> -TPM2_TSS_MD5 := 5744b10e3cef56df5d65b50f51fb3fe9
>>>> +TPM2_TSS_VERSION := 3.1.0
>>>> +TPM2_TSS_MD5 := 4d04cf52fff4ee061bb3f7b4f4ea03b7
>>>> TPM2_TSS := tpm2-tss-$(TPM2_TSS_VERSION)
>>>> TPM2_TSS_SUFFIX := tar.gz
>>>> TPM2_TSS_URL := https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
>>>> @@ -36,9 +36,6 @@ TPM2_TSS_CONF_OPT := \
>>>> $(CROSS_AUTOCONF_USR) \
>>>> --enable-debug=info \
>>>> --disable-unit \
>>>> - --enable-esapi \
>>>> - --disable-tcti-device-async \
>>>> - --disable-tcti-partial-reads \
>>>> --enable-tcti-device \
>>>> --enable-tcti-mssim \
>>>> --disable-tcti-fuzzing \
>>>> --
>>>> 2.30.2
>>>>
>>>>
>>>> _______________________________________________
>>>> ptxdist mailing list
>>>> ptxdist@pengutronix.de
>>>> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>>>>
>>>
>>
>>
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 37+ messages in thread* Re: [ptxdist] [PATCH] tpm2-tss: Version bump. 2.3.1 -> 3.1.0
2022-01-29 8:29 ` Christian Melki
@ 2022-01-29 15:36 ` Michael Olbrich
0 siblings, 0 replies; 37+ messages in thread
From: Michael Olbrich @ 2022-01-29 15:36 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
On Sat, Jan 29, 2022 at 09:29:43AM +0100, Christian Melki wrote:
> On 1/28/22 19:32, Michael Olbrich wrote:
> > On Fri, Jan 28, 2022 at 06:22:19PM +0100, Christian Melki wrote:
> >> On 1/28/22 17:16, Michael Olbrich wrote:
> >>> On Thu, Jan 27, 2022 at 03:35:30PM +0100, Christian Melki wrote:
> >>>> Approx. 2,5 year worth of fixes.
> >>>> https://github.com/tpm2-software/tpm2-tss/releases
> >>>> Fixes CVE-2020-24455 (three times over).
> >>>> tpm2-tss now depends on JSON_C and LIBCURL.
> >>>> Remove changed configuration options.
> >>>
> >>> Fails to build here:
> >>>
> >>> checking for groupadd... no
> >>> configure: error: Missing required program 'groupadd': ensure it is installed and on PATH.
> >>>
> >>> Adding a group should not be done during install anyways and it would fail,
> >>> so I think this should work:
> >>>
> >>> TPM2_TSS_CONF_ENV := \
> >>> $(CROSS_ENV) \
> >>> GROUPADD=: \
> >>> USERADD=:
> >>>
> >>> Michael
> >>>
> >>
> >> Didn't see that one coming. How abusive!
> >> From a makefile none the less.
> >> I have the required binaries on my development machine so I didn't notice.
> >> Now, I've tried your suggestion, but I can't see that it helps?
> >>
> >> Looks like the entire thing goes about the binaries in a very static
> >> fashion.
> >>
> >> ..
> >> define make_tss_user_and_group
> >> (id -g tss 2>/dev/null || groupadd -r tss) && \
> >> (id -u tss 2>/dev/null || useradd -r -g tss tss)
> >> endef
> >
> > @$(call make_tss_user_and_group) || echo "WARNING Failed to create the tss user and group"
> >
> > so any error here is ignored. We just need to get through the configure
> > check.
> >
>
> ack.
>
> TPM2_TSS_CONF_ENV := \
> $(CROSS_ENV) \
> ac_cv_prog_result_groupadd=yes \
> ac_cv_prog_result_useradd=yes
>
> should work for getting through configure?
I think so. You should see a "(cached)" in the configure output for those
checks.
Michael
--
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] 37+ messages in thread
* [ptxdist] [PATCH] tpm2-tools: Version bump. 4.1 -> 5.2
2022-01-27 14:35 [ptxdist] [PATCH] wpa_supplicant: Version bump 2.9 -> 2.10 Christian Melki
` (9 preceding siblings ...)
2022-01-27 14:35 ` [ptxdist] [PATCH] tpm2-tss: Version bump. 2.3.1 -> 3.1.0 Christian Melki
@ 2022-01-27 14:35 ` Christian Melki
2022-01-27 15:54 ` Bruno Thomsen
2022-01-27 14:35 ` [ptxdist] [PATCH] ncurses: Version bump. 6.2 -> 6.3 Christian Melki
2022-01-30 15:49 ` [ptxdist] [APPLIED] wpa_supplicant: Version bump 2.9 -> 2.10 Michael Olbrich
12 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-27 14:35 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 | 5 ++---
2 files changed, 3 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..16cedff74 100644
--- a/rules/tpm2-tools.make
+++ b/rules/tpm2-tools.make
@@ -14,15 +14,14 @@ 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
# ----------------------------------------------------------------------------
# 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] 37+ messages in thread* Re: [ptxdist] [PATCH] tpm2-tools: Version bump. 4.1 -> 5.2
2022-01-27 14:35 ` [ptxdist] [PATCH] tpm2-tools: Version bump. 4.1 -> 5.2 Christian Melki
@ 2022-01-27 15:54 ` Bruno Thomsen
2022-01-28 9:31 ` Michael Olbrich
0 siblings, 1 reply; 37+ messages in thread
From: Bruno Thomsen @ 2022-01-27 15:54 UTC (permalink / raw)
To: ptxdist
Hi
Den tor. 27. jan. 2022 kl. 15.36 skrev Christian Melki
<christian.melki@t2data.com>:
>
> 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 | 5 ++---
> 2 files changed, 3 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..16cedff74 100644
> --- a/rules/tpm2-tools.make
> +++ b/rules/tpm2-tools.make
> @@ -14,15 +14,14 @@ 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
You forgot to add the new license file hash as stated in the commit message.
/Bruno
>
> # ----------------------------------------------------------------------------
> # Prepare
> --
> 2.30.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [ptxdist] [PATCH] tpm2-tools: Version bump. 4.1 -> 5.2
2022-01-27 15:54 ` Bruno Thomsen
@ 2022-01-28 9:31 ` Michael Olbrich
2022-01-28 13:33 ` Christian Melki
0 siblings, 1 reply; 37+ messages in thread
From: Michael Olbrich @ 2022-01-28 9:31 UTC (permalink / raw)
To: Bruno Thomsen; +Cc: ptxdist
On Thu, Jan 27, 2022 at 04:54:31PM +0100, Bruno Thomsen wrote:
> Hi
>
> Den tor. 27. jan. 2022 kl. 15.36 skrev Christian Melki
> <christian.melki@t2data.com>:
> >
> > 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 | 5 ++---
> > 2 files changed, 3 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
It's optional and TPMs are used on !EFI platforms, so please add an option
for this.
> > 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..16cedff74 100644
> > --- a/rules/tpm2-tools.make
> > +++ b/rules/tpm2-tools.make
> > @@ -14,15 +14,14 @@ 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
>
> You forgot to add the new license file hash as stated in the commit message.
Indeed. Please add it again.
Michael
--
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] 37+ messages in thread
* Re: [ptxdist] [PATCH] tpm2-tools: Version bump. 4.1 -> 5.2
2022-01-28 9:31 ` Michael Olbrich
@ 2022-01-28 13:33 ` Christian Melki
2022-01-28 14:56 ` Michael Olbrich
0 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-28 13:33 UTC (permalink / raw)
To: ptxdist; +Cc: m.olbrich, Bruno Thomsen
On 1/28/22 10:31 AM, Michael Olbrich wrote:
> On Thu, Jan 27, 2022 at 04:54:31PM +0100, Bruno Thomsen wrote:
>> Hi
>>
>> Den tor. 27. jan. 2022 kl. 15.36 skrev Christian Melki
>> <christian.melki@t2data.com>:
>>>
>>> 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 | 5 ++---
>>> 2 files changed, 3 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
>
> It's optional and TPMs are used on !EFI platforms, so please add an option
> for this.
>
Hmm. There is a bit of a pitfall here.
tpm2-tools seems to detect the efivar header and library a bit separately.
So if someone installs efivar on dependency and does not select adding
efivar it will find the headers but ptxdist will block the pkgconfig.
Which will result in a failed build.
There is no "add this if someone else selected the dependency already" ? :)
>>> 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..16cedff74 100644
>>> --- a/rules/tpm2-tools.make
>>> +++ b/rules/tpm2-tools.make
>>> @@ -14,15 +14,14 @@ 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
>>
>> You forgot to add the new license file hash as stated in the commit message.
>
> Indeed. Please add it again.
>
> Michael
>
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [ptxdist] [PATCH] tpm2-tools: Version bump. 4.1 -> 5.2
2022-01-28 13:33 ` Christian Melki
@ 2022-01-28 14:56 ` Michael Olbrich
0 siblings, 0 replies; 37+ messages in thread
From: Michael Olbrich @ 2022-01-28 14:56 UTC (permalink / raw)
To: Christian Melki; +Cc: Bruno Thomsen, ptxdist
On Fri, Jan 28, 2022 at 02:33:29PM +0100, Christian Melki wrote:
>
>
> On 1/28/22 10:31 AM, Michael Olbrich wrote:
> > On Thu, Jan 27, 2022 at 04:54:31PM +0100, Bruno Thomsen wrote:
> > > Hi
> > >
> > > Den tor. 27. jan. 2022 kl. 15.36 skrev Christian Melki
> > > <christian.melki@t2data.com>:
> > > >
> > > > 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 | 5 ++---
> > > > 2 files changed, 3 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
> >
> > It's optional and TPMs are used on !EFI platforms, so please add an option
> > for this.
> >
>
> Hmm. There is a bit of a pitfall here.
> tpm2-tools seems to detect the efivar header and library a bit separately.
> So if someone installs efivar on dependency and does not select adding
> efivar it will find the headers but ptxdist will block the pkgconfig.
> Which will result in a failed build.
>
> There is no "add this if someone else selected the dependency already" ? :)
No, need. You just need an autoconf expert :-)
TPM2_TOOLS_CONF_ENV := \
$(CROSS_ENV) \
$(call ptx/ifdef, PTXCONF_TPM2_TOOLS_EFI,,ac_cv_header_efivar_efivar_h=no)
or something like that. If that variable is set to 'no' then the check will
be skipped.
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..16cedff74 100644
> > > > --- a/rules/tpm2-tools.make
> > > > +++ b/rules/tpm2-tools.make
> > > > @@ -14,15 +14,14 @@ 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
> > >
> > > You forgot to add the new license file hash as stated in the commit message.
> >
> > Indeed. Please add it again.
> >
> > Michael
> >
> >
>
--
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] 37+ messages in thread
* [ptxdist] [PATCH] ncurses: Version bump. 6.2 -> 6.3
2022-01-27 14:35 [ptxdist] [PATCH] wpa_supplicant: Version bump 2.9 -> 2.10 Christian Melki
` (10 preceding siblings ...)
2022-01-27 14:35 ` [ptxdist] [PATCH] tpm2-tools: Version bump. 4.1 -> 5.2 Christian Melki
@ 2022-01-27 14:35 ` Christian Melki
2022-01-30 15:49 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-01-30 15:49 ` [ptxdist] [APPLIED] wpa_supplicant: Version bump 2.9 -> 2.10 Michael Olbrich
12 siblings, 1 reply; 37+ messages in thread
From: Christian Melki @ 2022-01-27 14:35 UTC (permalink / raw)
To: ptxdist
Mostly a bugfix release.
Fixes CVE-2021-39537.
https://invisible-island.net/ncurses/NEWS.html
Move patchset, applies with offset.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
.../0001-teach-ncurses-config-about-sysroot.patch | 0
patches/{ncurses-6.2 => ncurses-6.3}/series | 0
rules/ncurses.make | 6 +++---
3 files changed, 3 insertions(+), 3 deletions(-)
rename patches/{ncurses-6.2 => ncurses-6.3}/0001-teach-ncurses-config-about-sysroot.patch (100%)
rename patches/{ncurses-6.2 => ncurses-6.3}/series (100%)
diff --git a/patches/ncurses-6.2/0001-teach-ncurses-config-about-sysroot.patch b/patches/ncurses-6.3/0001-teach-ncurses-config-about-sysroot.patch
similarity index 100%
rename from patches/ncurses-6.2/0001-teach-ncurses-config-about-sysroot.patch
rename to patches/ncurses-6.3/0001-teach-ncurses-config-about-sysroot.patch
diff --git a/patches/ncurses-6.2/series b/patches/ncurses-6.3/series
similarity index 100%
rename from patches/ncurses-6.2/series
rename to patches/ncurses-6.3/series
diff --git a/rules/ncurses.make b/rules/ncurses.make
index 38f9c01ff..688160325 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -13,16 +13,16 @@ PACKAGES-$(PTXCONF_NCURSES) += ncurses
#
# Paths and names
#
-NCURSES_VERSION := 6.2
+NCURSES_VERSION := 6.3
NCURSES_MAJOR := $(word 1,$(subst ., ,$(NCURSES_VERSION)))
-NCURSES_MD5 := e812da327b1c2214ac1aed440ea3ae8d
+NCURSES_MD5 := a2736befde5fee7d2b7eb45eb281cdbe
NCURSES := ncurses-$(NCURSES_VERSION)
NCURSES_SUFFIX := tar.gz
NCURSES_URL := $(call ptx/mirror, GNU, ncurses/$(NCURSES).$(NCURSES_SUFFIX))
NCURSES_SOURCE := $(SRCDIR)/$(NCURSES).$(NCURSES_SUFFIX)
NCURSES_DIR := $(BUILDDIR)/$(NCURSES)
NCURSES_LICENSE := MIT
-NCURSES_LICENSE_FILES := file://COPYING;md5=910e05334f7e0b7631da6b4ebb1e1aab
+NCURSES_LICENSE_FILES := file://COPYING;md5=f852913c5d988a5f5a2f1df7ba7ee893
# ----------------------------------------------------------------------------
# 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] 37+ messages in thread* Re: [ptxdist] [APPLIED] ncurses: Version bump. 6.2 -> 6.3
2022-01-27 14:35 ` [ptxdist] [PATCH] ncurses: Version bump. 6.2 -> 6.3 Christian Melki
@ 2022-01-30 15:49 ` Michael Olbrich
0 siblings, 0 replies; 37+ messages in thread
From: Michael Olbrich @ 2022-01-30 15:49 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 6f443fc556f7e1240b7f2c0f01ef149fd4f8212e.
Michael
[sent from post-receive hook]
On Sun, 30 Jan 2022 16:49:43 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Mostly a bugfix release.
> Fixes CVE-2021-39537.
> https://invisible-island.net/ncurses/NEWS.html
>
> Move patchset, applies with offset.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220127143532.2212796-13-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/ncurses-6.2/0001-teach-ncurses-config-about-sysroot.patch b/patches/ncurses-6.3/0001-teach-ncurses-config-about-sysroot.patch
> similarity index 100%
> rename from patches/ncurses-6.2/0001-teach-ncurses-config-about-sysroot.patch
> rename to patches/ncurses-6.3/0001-teach-ncurses-config-about-sysroot.patch
> diff --git a/patches/ncurses-6.2/series b/patches/ncurses-6.3/series
> similarity index 100%
> rename from patches/ncurses-6.2/series
> rename to patches/ncurses-6.3/series
> diff --git a/rules/ncurses.make b/rules/ncurses.make
> index 38f9c01fffb2..6881603256ee 100644
> --- a/rules/ncurses.make
> +++ b/rules/ncurses.make
> @@ -13,16 +13,16 @@ PACKAGES-$(PTXCONF_NCURSES) += ncurses
> #
> # Paths and names
> #
> -NCURSES_VERSION := 6.2
> +NCURSES_VERSION := 6.3
> NCURSES_MAJOR := $(word 1,$(subst ., ,$(NCURSES_VERSION)))
> -NCURSES_MD5 := e812da327b1c2214ac1aed440ea3ae8d
> +NCURSES_MD5 := a2736befde5fee7d2b7eb45eb281cdbe
> NCURSES := ncurses-$(NCURSES_VERSION)
> NCURSES_SUFFIX := tar.gz
> NCURSES_URL := $(call ptx/mirror, GNU, ncurses/$(NCURSES).$(NCURSES_SUFFIX))
> NCURSES_SOURCE := $(SRCDIR)/$(NCURSES).$(NCURSES_SUFFIX)
> NCURSES_DIR := $(BUILDDIR)/$(NCURSES)
> NCURSES_LICENSE := MIT
> -NCURSES_LICENSE_FILES := file://COPYING;md5=910e05334f7e0b7631da6b4ebb1e1aab
> +NCURSES_LICENSE_FILES := file://COPYING;md5=f852913c5d988a5f5a2f1df7ba7ee893
>
> # ----------------------------------------------------------------------------
> # Prepare
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [ptxdist] [APPLIED] wpa_supplicant: Version bump 2.9 -> 2.10
2022-01-27 14:35 [ptxdist] [PATCH] wpa_supplicant: Version bump 2.9 -> 2.10 Christian Melki
` (11 preceding siblings ...)
2022-01-27 14:35 ` [ptxdist] [PATCH] ncurses: Version bump. 6.2 -> 6.3 Christian Melki
@ 2022-01-30 15:49 ` Michael Olbrich
12 siblings, 0 replies; 37+ messages in thread
From: Michael Olbrich @ 2022-01-30 15:49 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as fe05f68c6af021813dca91c2ab1f447a92cfff25.
Michael
[sent from post-receive hook]
On Sun, 30 Jan 2022 16:49:36 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Update wpa_supplicant.
> Includes approx. 1,5 year worth of fixes.
> https://w1.fi/cgit/hostap/plain/wpa_supplicant/ChangeLog
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220127143532.2212796-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/wpa_supplicant.make b/rules/wpa_supplicant.make
> index 79c9ccb7689d..569d52414dad 100644
> --- a/rules/wpa_supplicant.make
> +++ b/rules/wpa_supplicant.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_WPA_SUPPLICANT) += wpa_supplicant
> # Paths and names
> #
> WPA_SUPPLICANT_NAME := wpa_supplicant
> -WPA_SUPPLICANT_VERSION := 2.9
> -WPA_SUPPLICANT_MD5 := 2d2958c782576dc9901092fbfecb4190
> +WPA_SUPPLICANT_VERSION := 2.10
> +WPA_SUPPLICANT_MD5 := d26797fcb002898d4ee989179346e1cc
> WPA_SUPPLICANT := $(WPA_SUPPLICANT_NAME)-$(WPA_SUPPLICANT_VERSION)
> WPA_SUPPLICANT_SUFFIX := tar.gz
> WPA_SUPPLICANT_URL := https://w1.fi/releases/$(WPA_SUPPLICANT).$(WPA_SUPPLICANT_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] 37+ messages in thread