date:20230102

[ptxdist] [PATCH] ncurses: Version bump. 6.3 -> 6.4

2023-01-02 Thread Christian Melki

Mostly a bugfix release.
https://lists.gnu.org/archive/html/info-gnu/2022-12/msg00010.html
Fixes CVE-2022-29458.

A side note. The .make could use a cleanup of the options.
Maybe try to revisit this at a later date.

* License file copyright timestamp changed.
* Make colors dependent on wide chars (configure warning).

Signed-off-by: Christian Melki 
---
 ...01-teach-ncurses-config-about-sysroot.patch | 18 +++---
 patches/{ncurses-6.3 => ncurses-6.4}/series|  0
 rules/ncurses.make |  8 
 3 files changed, 15 insertions(+), 11 deletions(-)
 rename patches/{ncurses-6.3 => 
ncurses-6.4}/0001-teach-ncurses-config-about-sysroot.patch (65%)
 rename patches/{ncurses-6.3 => ncurses-6.4}/series (100%)

diff --git a/patches/ncurses-6.3/0001-teach-ncurses-config-about-sysroot.patch 
b/patches/ncurses-6.4/0001-teach-ncurses-config-about-sysroot.patch
similarity index 65%
rename from patches/ncurses-6.3/0001-teach-ncurses-config-about-sysroot.patch
rename to patches/ncurses-6.4/0001-teach-ncurses-config-about-sysroot.patch
index 707b5a49c..4a8ee40a9 100644
--- a/patches/ncurses-6.3/0001-teach-ncurses-config-about-sysroot.patch
+++ b/patches/ncurses-6.4/0001-teach-ncurses-config-about-sysroot.patch
@@ -7,13 +7,17 @@ This patch teaches ncurses-config about sysroot
 Signed-off-by: Marc Kleine-Budde 
 [ported from ncurses 6.1 to 6.2]
 Signed-off-by: Robert Schwebel 
+[ported from ncurses 6.3 to 6.4]
+Signed-off-by: Christian Melki 
 ---
- misc/ncurses-config.in |   12 ++--
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ misc/ncurses-config.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 ncurses-6.2/misc/ncurses-config.in 2020-02-03 00:34:34.0 +0100
-+++ ncurses-6.2-ptx/misc/ncurses-config.in 2020-07-25 23:28:48.123350040 
+0200
-@@ -149,10 +149,10 @@
+diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
+index c9f1cf809843..af37d68c022c 100644
+--- a/misc/ncurses-config.in
 b/misc/ncurses-config.in
+@@ -188,10 +188,10 @@ while [ $# -gt 0 ]; do
--cflags)
INCS="@PKG_CFLAGS@"
if [ "x@WITH_OVERWRITE@" = xno ]; then
@@ -26,8 +30,8 @@ Signed-off-by: Robert Schwebel 
fi
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
$INCS
-@@ -235,7 +235,7 @@
-   echo $INCS
+@@ -274,7 +274,7 @@ ENDECHO
+   echo "$INCS"
;;
--libdir)
 -  echo "${libdir}"
diff --git a/patches/ncurses-6.3/series b/patches/ncurses-6.4/series
similarity index 100%
rename from patches/ncurses-6.3/series
rename to patches/ncurses-6.4/series
diff --git a/rules/ncurses.make b/rules/ncurses.make
index 688160325..8d29ff936 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -13,16 +13,16 @@ PACKAGES-$(PTXCONF_NCURSES) += ncurses
 #
 # Paths and names
 #
-NCURSES_VERSION:= 6.3
+NCURSES_VERSION:= 6.4
 NCURSES_MAJOR  := $(word 1,$(subst ., ,$(NCURSES_VERSION)))
-NCURSES_MD5:= a2736befde5fee7d2b7eb45eb281cdbe
+NCURSES_MD5:= 5a62487b5d4ac6b132fe2bf9f8fad29b
 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=f852913c5d988a5f5a2f1df7ba7ee893
+NCURSES_LICENSE_FILES := file://COPYING;md5=afd8d0a6ec9c24941eb06bc5e4017918
 
 # 
 # Prepare
@@ -70,12 +70,12 @@ NCURSES_AUTOCONF_SHARED = \
--$(call ptx/endis,PTXCONF_NCURSES_BIG_CORE)-big-core \
--disable-big-strings \
--$(call ptx/endis,PTXCONF_NCURSES_WIDE_CHAR)-widec \
+   --$(call ptx/endis,PTXCONF_NCURSES_WIDE_CHAR)-ext-colors \
$(GLOBAL_LARGE_FILE_OPTION) \
--enable-ext-funcs \
--enable-sp-funcs \
--disable-term-driver \
--enable-const \
-   --enable-ext-colors \
--disable-ext-mouse \
--disable-ext-putwin \
--disable-no-padding \
-- 
2.34.1

[ptxdist] [PATCH v2] dropbear: version bump 2022.82 -> 2022.83

2023-01-02 Thread Ladislav Michl

From: Ladislav Michl 

Remove local patch which is already merged upstream.
DROPBEAR_SK_KEYS config option now replaces separate
DROPBEAR_SK_ECDSA and DROPBEAR_SK_ED25519 options, so
generate localoptions.h accordingly.

Signed-off-by: Ladislav Michl 
---
 CHANGES:
 -v2: use DROPBEAR_SK_KEYS

 ...d-failure-use-DROPBEAR_PRIO_LOWDELAY.patch | 21 ---
 patches/dropbear-2022.82/series   |  4 
 rules/dropbear.make   |  7 +++
 3 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 
patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
 delete mode 100644 patches/dropbear-2022.82/series

diff --git 
a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
 
b/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
deleted file mode 100644
index 8c46daf9c..0
--- 
a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Matt Johnston 
-Date: Sat, 23 Apr 2022 22:33:31 +0800
-Subject: [PATCH] Fix X11 build failure, use DROPBEAR_PRIO_LOWDELAY
-

- svr-x11fwd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/svr-x11fwd.c b/svr-x11fwd.c
-index 353cb12e8dd1..5d9e6a96f577 100644
 a/svr-x11fwd.c
-+++ b/svr-x11fwd.c
-@@ -206,7 +206,7 @@ void x11cleanup(struct ChanSess *chansess) {
- }
- 
- static int x11_inithandler(struct Channel *channel) {
--  channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE;
-+  channel->prio = DROPBEAR_PRIO_LOWDELAY;
-   return 0;
- }
- 
diff --git a/patches/dropbear-2022.82/series b/patches/dropbear-2022.82/series
deleted file mode 100644
index 87840318b..0
--- a/patches/dropbear-2022.82/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
-# dacc85cb839b0a9eec87bf2d3fc2463f  - git-ptx-patches magic
diff --git a/rules/dropbear.make b/rules/dropbear.make
index e86b8bf43..dfdbe572d 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear
 #
 # Paths and names
 #
-DROPBEAR_VERSION   := 2022.82
-DROPBEAR_MD5   := 7a4a5f2c6d23ff2e6627c97d7c1aeceb
+DROPBEAR_VERSION   := 2022.83
+DROPBEAR_MD5   := a75a34bcc03cacf71a2db9da3b7c94a5
 DROPBEAR   := dropbear-$(DROPBEAR_VERSION)
 DROPBEAR_SUFFIX:= tar.bz2
 DROPBEAR_URL   := 
https://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)
@@ -215,8 +215,7 @@ else
 endif
 
@echo "ptxdist: disabling u2f security key support"
-   @echo "#define DROPBEAR_SK_ECDSA 0" >> $(DROPBEAR_LOCALOPTIONS)
-   @echo "#define DROPBEAR_SK_ED25519 0" >> $(DROPBEAR_LOCALOPTIONS)
+   @echo "#define DROPBEAR_SK_KEYS 0" >> $(DROPBEAR_LOCALOPTIONS)
 
 # key exchange algorithm
 ifdef PTXCONF_DROPBEAR_DH_GROUP14_SHA256
-- 
2.32.0

Re: [ptxdist] [PATCH] dropbear: version bump 2022.82 -> 2022.83

2023-01-02 Thread Ladislav Michl

Hi Alexander,

On Mon, Jan 02, 2023 at 09:34:15AM +0100, Alexander Dahl wrote:
> Hello Ladislav,
> 
> Am Mittwoch, 28. Dezember 2022, 12:53:13 CET schrieb Ladislav Michl:
> > From: Ladislav Michl 
> > 
> > Remove local patch which is already merged upstream.
> > 
> > Signed-off-by: Ladislav Michl 
> > ---
> >  ...d-failure-use-DROPBEAR_PRIO_LOWDELAY.patch | 21 ---
> >  patches/dropbear-2022.82/series   |  4 
> >  rules/dropbear.make   |  4 ++--
> >  3 files changed, 2 insertions(+), 27 deletions(-)
> >  delete mode 100644
> > patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDE
> > LAY.patch delete mode 100644 patches/dropbear-2022.82/series
> > 
> > diff --git
> > a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW
> > DELAY.patch
> > b/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW
> > DELAY.patch deleted file mode 100644
> > index 8c46daf9c..0
> > ---
> > a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW
> > DELAY.patch +++ /dev/null
> > @@ -1,21 +0,0 @@
> > -From: Matt Johnston 
> > -Date: Sat, 23 Apr 2022 22:33:31 +0800
> > -Subject: [PATCH] Fix X11 build failure, use DROPBEAR_PRIO_LOWDELAY
> > -
> > 
> > - svr-x11fwd.c | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/svr-x11fwd.c b/svr-x11fwd.c
> > -index 353cb12e8dd1..5d9e6a96f577 100644
> >  a/svr-x11fwd.c
> > -+++ b/svr-x11fwd.c
> > -@@ -206,7 +206,7 @@ void x11cleanup(struct ChanSess *chansess) {
> > - }
> > -
> > - static int x11_inithandler(struct Channel *channel) {
> > --  channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE;
> > -+  channel->prio = DROPBEAR_PRIO_LOWDELAY;
> > -   return 0;
> > - }
> > -
> > diff --git a/patches/dropbear-2022.82/series
> > b/patches/dropbear-2022.82/series deleted file mode 100644
> > index 87840318b..0
> > --- a/patches/dropbear-2022.82/series
> > +++ /dev/null
> > @@ -1,4 +0,0 @@
> > -# generated by git-ptx-patches
> > -#tag:base --start-number 1
> > -0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
> > -# dacc85cb839b0a9eec87bf2d3fc2463f  - git-ptx-patches magic
> > diff --git a/rules/dropbear.make b/rules/dropbear.make
> > index e86b8bf43..fcfe8bce4 100644
> > --- a/rules/dropbear.make
> > +++ b/rules/dropbear.make
> > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear
> >  #
> >  # Paths and names
> >  #
> > -DROPBEAR_VERSION   := 2022.82
> > -DROPBEAR_MD5   := 7a4a5f2c6d23ff2e6627c97d7c1aeceb
> > +DROPBEAR_VERSION   := 2022.83
> > +DROPBEAR_MD5   := a75a34bcc03cacf71a2db9da3b7c94a5
> >  DROPBEAR   := dropbear-$(DROPBEAR_VERSION)
> >  DROPBEAR_SUFFIX:= tar.bz2
> >  DROPBEAR_URL   :=
> > https://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)
> 
> The announcement contains this:
> 
> „- >> DROPBEAR_SK_KEYS config option now replaces separate DROPBEAR_SK_ECDSA
>   and DROPBEAR_SK_ED25519 options.“
> 
> These options are explicitly disabled in rules/dropbear.make and I think that 
> line(s) should be changed to the new config option.

I've left that unchanged as sysoptions.h contains:
#ifndef DROPBEAR_SK_ECDSA
#define DROPBEAR_SK_ECDSA DROPBEAR_SK_KEYS
#endif
#ifndef DROPBEAR_SK_ED25519
#define DROPBEAR_SK_ED25519 DROPBEAR_SK_KEYS
#endif
anyway, I will send v2 as it seems to be right to do the change now. Thanks
for pointing that out.

ladis

[ptxdist] [PATCH v2 1/2] paho-mqtt-c.make: add missing libraries

2023-01-02 Thread Robert Schwebel

The build system creates a client library (c) and an async library (a),
both in a non-SSL and SSL variant. Let's install all of them, as we
don't know which ones are needed.

Signed-off-by: Robert Schwebel 
---
 rules/paho-mqtt-c.make | 7 +++
 1 file changed, 7 insertions(+)

Changes since implicit v1 (thanks to mol):
- use make comments, not shell comments

diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
index 8e229cfe2..fdd81ebb1 100644
--- a/rules/paho-mqtt-c.make
+++ b/rules/paho-mqtt-c.make
@@ -51,7 +51,14 @@ $(STATEDIR)/paho-mqtt-c.targetinstall:
@$(call install_fixup, paho-mqtt-c,AUTHOR,"Marc Kleine-Budde 
")
@$(call install_fixup, paho-mqtt-c,DESCRIPTION,missing)
 
+#  # async library without ssh
+   @$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3a)
+#  # async library with ssh
@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3as)
+#  # client library without ssl
+   @$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3c)
+#  # client library with ssl
+   @$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3cs)
 
@$(call install_finish, paho-mqtt-c)
 
-- 
2.30.2

[ptxdist] [PATCH v2 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12

2023-01-02 Thread Robert Schwebel

The license has changed from EPL-1.0 to EPL-2.0.

Signed-off-by: Robert Schwebel 
---
 rules/paho-mqtt-c.make | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Changes since implicit v1 (thanks to mol):
* specify EPL-2.0

diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
index fdd81ebb1..fae94307d 100644
--- a/rules/paho-mqtt-c.make
+++ b/rules/paho-mqtt-c.make
@@ -14,18 +14,18 @@ PACKAGES-$(PTXCONF_PAHO_MQTT_C) += paho-mqtt-c
 #
 # Paths and names
 #
-PAHO_MQTT_C_VERSION:= 1.3.0
-PAHO_MQTT_C_MD5:= 8fac1bff9b0d5a74fa1caf8db0501fca
+PAHO_MQTT_C_VERSION:= 1.3.12
+PAHO_MQTT_C_MD5:= ca0c3666cf91dcb8e7e65de9e502bf0a
 PAHO_MQTT_C:= paho.mqtt.c-$(PAHO_MQTT_C_VERSION)
 PAHO_MQTT_C_SUFFIX := tar.gz
 PAHO_MQTT_C_URL:= 
https://github.com/eclipse/paho.mqtt.c/archive/v$(PAHO_MQTT_C_VERSION).$(PAHO_MQTT_C_SUFFIX)
 PAHO_MQTT_C_SOURCE := $(SRCDIR)/$(PAHO_MQTT_C).$(PAHO_MQTT_C_SUFFIX)
 PAHO_MQTT_C_DIR:= $(BUILDDIR)/$(PAHO_MQTT_C)
 # "Eclipse Distribution License - v 1.0" is in fact BSD-3-Clause
-PAHO_MQTT_C_LICENSE:= EPL-1.0 AND BSD-3-Clause
+PAHO_MQTT_C_LICENSE:= EPL-2.0 AND BSD-3-Clause
 PAHO_MQTT_C_LICENSE_FILES := \
-   file://LICENSE;md5=f2001efbb1450daa099206651f80d39c \
-   file://epl-v10;md5=659c8e92a40b6df1d9e3dccf5ae45a08 \
+   file://LICENSE;md5=fd3b896dadaeec3410d753ffaeadcfac \
+   file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3
 
 # 
-- 
2.30.2

[ptxdist] [PATCH] tf-a: use ptx/image-install

2023-01-02 Thread Michael Olbrich

TF_A_ARTIFACTS_SRC is not defined, so the custom clean stage does not work
as expected.

Instead of fixing this, use ptx/image-install so that the generic image
removal mechanism works correctly.

Signed-off-by: Michael Olbrich 
---

I've created this instead. ptx/image-install should be used here, so that
ptxdist knows about the files and can remove them automatically.

Michael

 rules/tf-a.make | 19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/rules/tf-a.make b/rules/tf-a.make
index ac1bff0322b4..54fe7d1e37d8 100644
--- a/rules/tf-a.make
+++ b/rules/tf-a.make
@@ -89,16 +89,18 @@ $(STATEDIR)/tf-a.compile:
 # Install
 # 
 
+tf-a/inst_pkgdir = \
+   install -v -D -m 644 $(2) $(TF_A_PKGDIR)/usr/lib/firmware/$(3)
+
 tf-a/inst_plat = $(foreach artifact, \
$(wildcard $(addprefix $(TF_A_BINDIR)/, $(TF_A_ARTIFACTS))), \
-   install -v -D -m 644 $(artifact) \
-   $(2)/$(1)-$(notdir $(artifact))$(ptx/nl))
+   $(call $(2),TF_A,$(artifact),$(1)-$(notdir $(artifact)))$(ptx/nl))
 
 tf-a/inst_bins = $(foreach plat, $(TF_A_PLATFORMS), $(call 
tf-a/inst_plat,$(plat),$(1)))
 
 $(STATEDIR)/tf-a.install:
@$(call targetinfo)
-   @$(call tf-a/inst_bins,$(TF_A_PKGDIR)/usr/lib/firmware)
+   @$(call tf-a/inst_bins,tf-a/inst_pkgdir)
@$(call touch)
 
 # 
@@ -107,16 +109,7 @@ $(STATEDIR)/tf-a.install:
 
 $(STATEDIR)/tf-a.targetinstall:
@$(call targetinfo)
-   @$(call tf-a/inst_bins,$(IMAGEDIR))
+   @$(call tf-a/inst_bins,ptx/image-install)
@$(call touch)
 
-# 
-# Clean
-# 
-
-$(STATEDIR)/tf-a.clean:
-   @$(call targetinfo)
-   @rm -vf $(addprefix $(IMAGEDIR)/, $(notdir $(TF_A_ARTIFACTS_SRC)))
-   @$(call clean_pkg, TF_A)
-
 # vim: syntax=make
-- 
2.30.2

Re: [ptxdist] [PATCH 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12

2023-01-02 Thread Robert Schwebel

On Mon, Jan 02, 2023 at 11:50:26AM +0100, Michael Olbrich wrote:
> On Tue, Dec 27, 2022 at 08:03:16AM +0100, Robert Schwebel wrote:
> > The license has changed from EPL-1.0 to EPL-2.0.
> 
> A different License means...
> 
> > Signed-off-by: Robert Schwebel 
> > ---
> >  rules/paho-mqtt-c.make | 8 
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
> > index 143433128..3fbcd7d57 100644
> > --- a/rules/paho-mqtt-c.make
> > +++ b/rules/paho-mqtt-c.make
> > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PAHO_MQTT_C) += paho-mqtt-c
> >  #
> >  # Paths and names
> >  #
> > -PAHO_MQTT_C_VERSION:= 1.3.0
> > -PAHO_MQTT_C_MD5:= 8fac1bff9b0d5a74fa1caf8db0501fca
> > +PAHO_MQTT_C_VERSION:= 1.3.12
> > +PAHO_MQTT_C_MD5:= ca0c3666cf91dcb8e7e65de9e502bf0a
> >  PAHO_MQTT_C:= paho.mqtt.c-$(PAHO_MQTT_C_VERSION)
> >  PAHO_MQTT_C_SUFFIX := tar.gz
> >  PAHO_MQTT_C_URL:= 
> > https://github.com/eclipse/paho.mqtt.c/archive/v$(PAHO_MQTT_C_VERSION).$(PAHO_MQTT_C_SUFFIX)
> > @@ -24,8 +24,8 @@ PAHO_MQTT_C_DIR   := $(BUILDDIR)/$(PAHO_MQTT_C)
> >  # "Eclipse Distribution License - v 1.0" is in fact BSD-3-Clause
> >  PAHO_MQTT_C_LICENSE:= EPL-1.0 AND BSD-3-Clause
> 
> ... that this should be changed as well, right?

Uhm, definitely :)

rsc
-- 
Pengutronix e.K.   | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21   | https://www.pengutronix.de/ |
31137 Hildesheim, Germany  | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917-9|

Re: [ptxdist] [PATCH 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12

2023-01-02 Thread Michael Olbrich

On Tue, Dec 27, 2022 at 08:03:16AM +0100, Robert Schwebel wrote:
> The license has changed from EPL-1.0 to EPL-2.0.

A different License means...

> Signed-off-by: Robert Schwebel 
> ---
>  rules/paho-mqtt-c.make | 8 
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
> index 143433128..3fbcd7d57 100644
> --- a/rules/paho-mqtt-c.make
> +++ b/rules/paho-mqtt-c.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PAHO_MQTT_C) += paho-mqtt-c
>  #
>  # Paths and names
>  #
> -PAHO_MQTT_C_VERSION  := 1.3.0
> -PAHO_MQTT_C_MD5  := 8fac1bff9b0d5a74fa1caf8db0501fca
> +PAHO_MQTT_C_VERSION  := 1.3.12
> +PAHO_MQTT_C_MD5  := ca0c3666cf91dcb8e7e65de9e502bf0a
>  PAHO_MQTT_C  := paho.mqtt.c-$(PAHO_MQTT_C_VERSION)
>  PAHO_MQTT_C_SUFFIX   := tar.gz
>  PAHO_MQTT_C_URL  := 
> https://github.com/eclipse/paho.mqtt.c/archive/v$(PAHO_MQTT_C_VERSION).$(PAHO_MQTT_C_SUFFIX)
> @@ -24,8 +24,8 @@ PAHO_MQTT_C_DIR := $(BUILDDIR)/$(PAHO_MQTT_C)
>  # "Eclipse Distribution License - v 1.0" is in fact BSD-3-Clause
>  PAHO_MQTT_C_LICENSE  := EPL-1.0 AND BSD-3-Clause

... that this should be changed as well, right?

Michael

>  PAHO_MQTT_C_LICENSE_FILES := \
> - file://LICENSE;md5=f2001efbb1450daa099206651f80d39c \
> - file://epl-v10;md5=659c8e92a40b6df1d9e3dccf5ae45a08 \
> + file://LICENSE;md5=fd3b896dadaeec3410d753ffaeadcfac \
> + file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
>   file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3
>  
>  # 
> 
> -- 
> 2.30.2
> 
> 
> 

-- 
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- |

Re: [ptxdist] [PATCH 1/2] paho-mqtt-c.make: add missing libraries

2023-01-02 Thread Michael Olbrich

On Tue, Dec 27, 2022 at 08:03:15AM +0100, Robert Schwebel wrote:
> The build system creates a client library (c) and an async library (a),
> both in a non-SSL and SSL variant. Let's install all of them, as we
> don't know which ones are needed.
> 
> Signed-off-by: Robert Schwebel 
> ---
>  rules/paho-mqtt-c.make | 7 +++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
> index 8e229cfe2..143433128 100644
> --- a/rules/paho-mqtt-c.make
> +++ b/rules/paho-mqtt-c.make
> @@ -51,7 +51,14 @@ $(STATEDIR)/paho-mqtt-c.targetinstall:
>   @$(call install_fixup, paho-mqtt-c,AUTHOR,"Marc Kleine-Budde 
> ")
>   @$(call install_fixup, paho-mqtt-c,DESCRIPTION,missing)
>  
> + # async library without ssh

This is a shell comment and not a make comment and it shows up in the log
at an unexpected time because install_lib just collects the command that is
executed in install_finish.

Make it a make comment with:

#   # async library without ssh

Same for the others.

Michael

> + @$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3a)
> + # async library with ssh
>   @$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3as)
> + # client library without ssl
> + @$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3c)
> + # client library with ssl
> + @$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3cs)
>  
>   @$(call install_finish, paho-mqtt-c)
>  
> -- 
> 2.30.2
> 
> 
> 

-- 
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- |

[ptxdist] [PATCH] tcpdump: Version bump. 4.99.1 -> 4.99.2

2023-01-02 Thread Christian Melki

Mostly bugfixes.
https://github.com/the-tcpdump-group/tcpdump/blob/e6d119663fd850eca250e7b999015b0d3b856f28/CHANGES#L54
Reworked .in file for various errors.

* Correct various (double-) whitespace errors.
* libcap-ng is not "as well" in relation to libpcap as in wording.
It's a completely different library related to POSIX
capabilities. It's needed for tcpdump to run in non-root mode.
Don't make them sound like they're similar.
* Some other minor text fixes.

Signed-off-by: Christian Melki 
---
 rules/tcpdump.in   | 23 +--
 rules/tcpdump.make |  4 ++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/rules/tcpdump.in b/rules/tcpdump.in
index 74d607252..bc5ffdecc 100644
--- a/rules/tcpdump.in
+++ b/rules/tcpdump.in
@@ -6,35 +6,38 @@ menuconfig TCPDUMP
select LIBCAP_NG if TCPDUMP_ENABLE_LIBCAP_NG
select OPENSSL if TCPDUMP_ENABLE_CRYPTO
help
- Tcpdump  prints out the headers of packets on a network interface
- that match the boolean expression.  It can also be run with
+ Tcpdump prints out the headers of packets on a network interface
+ that match the boolean expression. It can also be run with
  the -w flag, which causes it to save the packet data to a file
  for later analysis, and/or with the -r flag, which causes it to
  read from a saved packet file rather than to read  packets from
- a network interface.  In all cases, only packets that match
+ a network interface. In all cases, only packets that match
  expression will be processed by tcpdump.
 
 if TCPDUMP
 
 config TCPDUMP_ENABLE_LIBCAP_NG
bool
-   prompt "use libcap-ng as well"
+   prompt "enable libcap-ng support"
help
- Use libpcap and libcap-ng
+ Use libcap-ng (POSIX capabilities) in tcpdump.
+ It allows tcpdump to shift uid/gid and chroot to
+ operate in a non-privileged mode instead of using root.
 
 config TCPDUMP_ENABLE_CRYPTO
bool
prompt "enable crypto support"
help
- Select this, if you don't need support for
- encryption (e.g. IPsec ESP packets)
+ Select this if you need support for decoding various
+ protocols in relation to encryption (f.ex. IPsec packets)
 
 config TCPDUMP_SMB
bool
-   prompt "enable possibly-buggy SMB printer"
+   prompt "enable SMB-printer decoding support"
default y
help
- Notes from configure, when this entry is checked:
-  The SMB printer may have exploitable buffer overflows!!!
+ Select this if need support for decoding packets
+ in relation to SMB/CIFS (printers).
+ Still considered buggy.
 
 endif
diff --git a/rules/tcpdump.make b/rules/tcpdump.make
index b618c8749..4a040e017 100644
--- a/rules/tcpdump.make
+++ b/rules/tcpdump.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_TCPDUMP) += tcpdump
 #
 # Paths and names
 #
-TCPDUMP_VERSION:= 4.99.1
-TCPDUMP_MD5:= 929a255c71a9933608bd7c31927760f7
+TCPDUMP_VERSION:= 4.99.2
+TCPDUMP_MD5:= 69f8cc8e44606ba49482fa98c2f7f937
 TCPDUMP:= tcpdump-$(TCPDUMP_VERSION)
 TCPDUMP_SUFFIX := tar.gz
 TCPDUMP_URL:= http://www.tcpdump.org/release/$(TCPDUMP).$(TCPDUMP_SUFFIX)
-- 
2.34.1

[ptxdist] [PATCH] mesalib: version bump 22.3.1 -> 22.3.2

2023-01-02 Thread Philipp Zabel

Signed-off-by: Philipp Zabel 
---
 rules/mesalib.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/mesalib.make b/rules/mesalib.make
index 2349e1a107d3..0f0f514ee20a 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
 #
 # Paths and names
 #
-MESALIB_VERSION:= 22.3.1
-MESALIB_MD5:= 5644bca27c9be0092c98f1ec0e1bedd5
+MESALIB_VERSION:= 22.3.2
+MESALIB_MD5:= f299f32fc3f48db392b12cdfd83fa4fd
 MESALIB:= mesa-$(MESALIB_VERSION)
 MESALIB_SUFFIX := tar.xz
 MESALIB_URL:= \
-- 
2.30.2

[ptxdist] [PATCH] libpcap: Version bump. 1.10.1 -> 1.10.2

2023-01-02 Thread Christian Melki

A bunch of fixes.
https://github.com/the-tcpdump-group/libpcap/blob/0ec30c896aceed38db0dfc0144ffc09669769855/CHANGES#L42

* Reworked patch for just installing the shared library file.
* Reworked $SYSROOT for pcap-config patch.
I don't think pcap-config is needed though. libpcap got .pc back in 2018 
something.
So this is mostly for builds that don't use that (or before 2018).
I'll leave this up to the maintainer to remove.

Signed-off-by: Christian Melki 
---
 ...100-build-and-install-share-lib-only.patch | 10 +-
 ...0101-pcap-config-add-SYSROOT-support.patch | 19 +--
 .../{libpcap-1.10.1 => libpcap-1.10.2}/series |  0
 rules/libpcap.make|  4 ++--
 4 files changed, 12 insertions(+), 21 deletions(-)
 rename patches/{libpcap-1.10.1 => 
libpcap-1.10.2}/0100-build-and-install-share-lib-only.patch (79%)
 rename patches/{libpcap-1.10.1 => 
libpcap-1.10.2}/0101-pcap-config-add-SYSROOT-support.patch (54%)
 rename patches/{libpcap-1.10.1 => libpcap-1.10.2}/series (100%)

diff --git a/patches/libpcap-1.10.1/0100-build-and-install-share-lib-only.patch 
b/patches/libpcap-1.10.2/0100-build-and-install-share-lib-only.patch
similarity index 79%
rename from patches/libpcap-1.10.1/0100-build-and-install-share-lib-only.patch
rename to patches/libpcap-1.10.2/0100-build-and-install-share-lib-only.patch
index dda3366ae..c909f70b1 100644
--- a/patches/libpcap-1.10.1/0100-build-and-install-share-lib-only.patch
+++ b/patches/libpcap-1.10.2/0100-build-and-install-share-lib-only.patch
@@ -12,19 +12,19 @@ Signed-off-by: Alexander Aring 
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 5d88ea713174..2cbcab1a0907 100644
+index 787b18a06a93..dd7870c0475b 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -415,7 +415,7 @@ EXTRA_DIST = \
-   Win32/Prj/wpcap.vcxproj \
-   Win32/Prj/wpcap.vcxproj.filters
+@@ -429,7 +429,7 @@ RELEASE_FILES = $(COMMON_C_SRC) $(HDR) $(MAN1) 
$(MAN3PCAP_EXPAND) \
+   $(MAN3PCAP_NOEXPAND) $(MANFILE) $(MANMISC) $(EXTRA_DIST) \
+   $(TEST_DIST)
  
 -all: libpcap.a shared $(BUILD_RPCAPD) libpcap.pc pcap-config
 +all: shared $(BUILD_RPCAPD) libpcap.pc pcap-config
  
  libpcap.a: $(OBJ)
@rm -f $@
-@@ -601,7 +601,7 @@ testprogs: FORCE
+@@ -615,7 +615,7 @@ testprogs: FORCE
  
  FORCE:
  
diff --git a/patches/libpcap-1.10.1/0101-pcap-config-add-SYSROOT-support.patch 
b/patches/libpcap-1.10.2/0101-pcap-config-add-SYSROOT-support.patch
similarity index 54%
rename from patches/libpcap-1.10.1/0101-pcap-config-add-SYSROOT-support.patch
rename to patches/libpcap-1.10.2/0101-pcap-config-add-SYSROOT-support.patch
index b51c27faa..9cb27d0af 100644
--- a/patches/libpcap-1.10.1/0101-pcap-config-add-SYSROOT-support.patch
+++ b/patches/libpcap-1.10.2/0101-pcap-config-add-SYSROOT-support.patch
@@ -4,11 +4,11 @@ Subject: [PATCH] pcap-config: add SYSROOT support
 
 Signed-off-by: Alexander Aring 
 ---
- pcap-config.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ pcap-config.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/pcap-config.in b/pcap-config.in
-index 54ca42f07bc5..23b06c300577 100644
+index afa8919d8a50..f9b8b1512892 100644
 --- a/pcap-config.in
 +++ b/pcap-config.in
 @@ -10,8 +10,8 @@
@@ -19,15 +19,6 @@ index 54ca42f07bc5..23b06c300577 100644
 -libdir="@libdir@"
 +includedir="${SYSROOT}@includedir@"
 +libdir="${SYSROOT}@libdir@"
- V_RPATH_OPT="@V_RPATH_OPT@"
  LIBS="@LIBS@"
- PACKAGE_NAME="@PACKAGE_NAME@"
-@@ -46,7 +46,7 @@ then
-   #
-   # If libdir isn't /usr/lib, add it to the run-time linker path.
-   #
--  if [ "$libdir" != "/usr/lib" ]
-+  if [ "$libdir" != "${SYSROOT}/usr/lib" ]
-   then
-   RPATH=$V_RPATH_OPT$libdir
-   fi
+ LIBS_STATIC="@LIBS_STATIC@"
+ 
diff --git a/patches/libpcap-1.10.1/series b/patches/libpcap-1.10.2/series
similarity index 100%
rename from patches/libpcap-1.10.1/series
rename to patches/libpcap-1.10.2/series
diff --git a/rules/libpcap.make b/rules/libpcap.make
index 1d51449ae..9f07d452a 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap
 #
 # Paths and names
 #
-LIBPCAP_VERSION:= 1.10.1
-LIBPCAP_MD5:= 28e17495004036567c2cc884b51eba45
+LIBPCAP_VERSION:= 1.10.2
+LIBPCAP_MD5:= 9f27d8e5595fb14e6bc8151ef6f5610b
 LIBPCAP:= libpcap-$(LIBPCAP_VERSION)
 LIBPCAP_SUFFIX := tar.gz
 LIBPCAP_URL:= http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX)
-- 
2.34.1

Re: [ptxdist] [PATCH] dropbear: version bump 2022.82 -> 2022.83

2023-01-02 Thread Alexander Dahl

Hello Ladislav,

Am Mittwoch, 28. Dezember 2022, 12:53:13 CET schrieb Ladislav Michl:
> From: Ladislav Michl 
> 
> Remove local patch which is already merged upstream.
> 
> Signed-off-by: Ladislav Michl 
> ---
>  ...d-failure-use-DROPBEAR_PRIO_LOWDELAY.patch | 21 ---
>  patches/dropbear-2022.82/series   |  4 
>  rules/dropbear.make   |  4 ++--
>  3 files changed, 2 insertions(+), 27 deletions(-)
>  delete mode 100644
> patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDE
> LAY.patch delete mode 100644 patches/dropbear-2022.82/series
> 
> diff --git
> a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW
> DELAY.patch
> b/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW
> DELAY.patch deleted file mode 100644
> index 8c46daf9c..0
> ---
> a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW
> DELAY.patch +++ /dev/null
> @@ -1,21 +0,0 @@
> -From: Matt Johnston 
> -Date: Sat, 23 Apr 2022 22:33:31 +0800
> -Subject: [PATCH] Fix X11 build failure, use DROPBEAR_PRIO_LOWDELAY
> -
> 
> - svr-x11fwd.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/svr-x11fwd.c b/svr-x11fwd.c
> -index 353cb12e8dd1..5d9e6a96f577 100644
>  a/svr-x11fwd.c
> -+++ b/svr-x11fwd.c
> -@@ -206,7 +206,7 @@ void x11cleanup(struct ChanSess *chansess) {
> - }
> -
> - static int x11_inithandler(struct Channel *channel) {
> --channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE;
> -+channel->prio = DROPBEAR_PRIO_LOWDELAY;
> - return 0;
> - }
> -
> diff --git a/patches/dropbear-2022.82/series
> b/patches/dropbear-2022.82/series deleted file mode 100644
> index 87840318b..0
> --- a/patches/dropbear-2022.82/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
> -# dacc85cb839b0a9eec87bf2d3fc2463f  - git-ptx-patches magic
> diff --git a/rules/dropbear.make b/rules/dropbear.make
> index e86b8bf43..fcfe8bce4 100644
> --- a/rules/dropbear.make
> +++ b/rules/dropbear.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear
>  #
>  # Paths and names
>  #
> -DROPBEAR_VERSION := 2022.82
> -DROPBEAR_MD5 := 7a4a5f2c6d23ff2e6627c97d7c1aeceb
> +DROPBEAR_VERSION := 2022.83
> +DROPBEAR_MD5 := a75a34bcc03cacf71a2db9da3b7c94a5
>  DROPBEAR := dropbear-$(DROPBEAR_VERSION)
>  DROPBEAR_SUFFIX  := tar.bz2
>  DROPBEAR_URL :=
> https://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)

The announcement contains this:

„- >> DROPBEAR_SK_KEYS config option now replaces separate DROPBEAR_SK_ECDSA
  and DROPBEAR_SK_ED25519 options.“

These options are explicitly disabled in rules/dropbear.make and I think that 
line(s) should be changed to the new config option.

Greets
Alex

[ptxdist] [PATCH] ncurses: Version bump. 6.3 -> 6.4

[ptxdist] [PATCH v2] dropbear: version bump 2022.82 -> 2022.83

Re: [ptxdist] [PATCH] dropbear: version bump 2022.82 -> 2022.83

[ptxdist] [PATCH v2 1/2] paho-mqtt-c.make: add missing libraries

[ptxdist] [PATCH v2 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12

[ptxdist] [PATCH] tf-a: use ptx/image-install

Re: [ptxdist] [PATCH 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12

Re: [ptxdist] [PATCH 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12

Re: [ptxdist] [PATCH 1/2] paho-mqtt-c.make: add missing libraries

[ptxdist] [PATCH] tcpdump: Version bump. 4.99.1 -> 4.99.2

[ptxdist] [PATCH] mesalib: version bump 22.3.1 -> 22.3.2

[ptxdist] [PATCH] libpcap: Version bump. 1.10.1 -> 1.10.2

Re: [ptxdist] [PATCH] dropbear: version bump 2022.82 -> 2022.83

13 matches

Site Navigation

Mail list logo

Footer information