[ptxdist] [PATCH v2 2/2] autossh: Version bump 1.4c -> 1.4g
https://www.harding.motd.ca/autossh/CHANGES.txt Patch removed as change has been upstreamed. Add license file (autossh.c) and hash. Changed SPDX indentifier to custom as I have been unable to determine license with SPDX Check License[1] or by manual review. It looks like a blend of MIT and BSD. [1] https://tools.spdx.org/app/check_license/ Signed-off-by: Bruno Thomsen --- v2: squash patch 2 and 3 Add license and version bump in one patch. Update license from unknown to custom. ...e-friendly-towards-packaging-with-DE.patch | 47 --- patches/autossh-1.4c/series | 4 -- rules/autossh.make| 18 +++ 3 files changed, 10 insertions(+), 59 deletions(-) delete mode 100644 patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch delete mode 100644 patches/autossh-1.4c/series diff --git a/patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch b/patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch deleted file mode 100644 index 96fca563aa50.. --- a/patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Jon Ringle -Date: Fri, 27 Jun 2014 16:39:41 -0400 -Subject: [PATCH] Make install rule friendly towards packaging with $DESTDIR - -Signed-off-by: Jon Ringle - Makefile.in | 30 +++--- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index fb7cc1d..a8e7a7e 100644 a/Makefile.in -+++ b/Makefile.in -@@ -45,18 +45,18 @@ distclean: allclean - - /bin/rm -f Makefile - - install: $(TARGET) -- mkdir -p -m 755 $(bindir) -- mkdir -p -m 755 $(prefix)/share/doc/autossh -- mkdir -p -m 755 $(datadir)/examples/autossh -- mkdir -p -m 755 $(mandir)/man1 -- cp $(TARGET) $(bindir) -- cp CHANGES README $(datadir)/doc/autossh -- cp autossh.host $(datadir)/examples/autossh -- cp rscreen $(datadir)/examples/autossh -- cp autossh.1 $(mandir)/man1 -- chmod 755 $(bindir)/$(TARGET) -- chmod 644 $(datadir)/doc/autossh/CHANGES -- chmod 644 $(datadir)/doc/autossh/README -- chmod 644 $(datadir)/examples/autossh/autossh.host -- chmod 644 $(datadir)/examples/autossh/rscreen -- chmod 644 $(mandir)/man1/autossh.1 -+ mkdir -p -m 755 $(DESTDIR)$(bindir) -+ mkdir -p -m 755 $(DESTDIR)$(prefix)/share/doc/autossh -+ mkdir -p -m 755 $(DESTDIR)$(datadir)/examples/autossh -+ mkdir -p -m 755 $(DESTDIR)$(mandir)/man1 -+ cp $(TARGET) $(DESTDIR)$(bindir) -+ cp CHANGES README $(DESTDIR)$(datadir)/doc/autossh -+ cp autossh.host $(DESTDIR)$(datadir)/examples/autossh -+ cp rscreen $(DESTDIR)$(datadir)/examples/autossh -+ cp autossh.1 $(DESTDIR)$(mandir)/man1 -+ chmod 755 $(DESTDIR)$(bindir)/$(TARGET) -+ chmod 644 $(DESTDIR)$(datadir)/doc/autossh/CHANGES -+ chmod 644 $(DESTDIR)$(datadir)/doc/autossh/README -+ chmod 644 $(DESTDIR)$(datadir)/examples/autossh/autossh.host -+ chmod 644 $(DESTDIR)$(datadir)/examples/autossh/rscreen -+ chmod 644 $(DESTDIR)$(mandir)/man1/autossh.1 diff --git a/patches/autossh-1.4c/series b/patches/autossh-1.4c/series deleted file mode 100644 index 29f971c73214.. --- a/patches/autossh-1.4c/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Make-install-rule-friendly-towards-packaging-with-DE.patch -# ecdd87ec5c25c56d421024daf8acf722 - git-ptx-patches magic diff --git a/rules/autossh.make b/rules/autossh.make index 879cd1c99ce0..86dae4db7762 100644 --- a/rules/autossh.make +++ b/rules/autossh.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_AUTOSSH) += autossh # # Paths and names # -AUTOSSH_VERSION:= 1.4c -AUTOSSH_MD5:= 26520eea934f296be0783dabe7fcfd28 -AUTOSSH:= autossh-$(AUTOSSH_VERSION) -AUTOSSH_SUFFIX := tgz -AUTOSSH_URL:= https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX) -AUTOSSH_SOURCE := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX) -AUTOSSH_DIR:= $(BUILDDIR)/$(AUTOSSH) -AUTOSSH_LICENSE:= unknown +AUTOSSH_VERSION:= 1.4g +AUTOSSH_MD5:= 2b804bc1bf6d2f2afaa526d02df7c0a2 +AUTOSSH:= autossh-$(AUTOSSH_VERSION) +AUTOSSH_SUFFIX := tgz +AUTOSSH_URL:= https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX) +AUTOSSH_SOURCE := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX) +AUTOSSH_DIR:= $(BUILDDIR)/$(AUTOSSH) +AUTOSSH_LICENSE:= custom +AUTOSSH_LICENSE_FILES := \ + file://autossh.c;startline
[ptxdist] [PATCH v2 1/2] autossh: update URL
Update URL from http to https as it returns 301 Moved Permanently. Download log: --2024-03-08 13:14:10-- http://www.harding.motd.ca/autossh/autossh-1.4c.tgz Resolving www.harding.motd.ca (www.harding.motd.ca)... 70.73.86.42 Connecting to www.harding.motd.ca (www.harding.motd.ca)|70.73.86.42|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://www.harding.motd.ca/autossh/autossh-1.4c.tgz [following] --2024-03-08 13:14:11-- https://www.harding.motd.ca/autossh/autossh-1.4c.tgz Connecting to www.harding.motd.ca (www.harding.motd.ca)|70.73.86.42|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 65191 (64K) [application/octet-stream] Signed-off-by: Bruno Thomsen --- v2: No change rules/autossh.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/autossh.make b/rules/autossh.make index ef8240bcb19a..879cd1c99ce0 100644 --- a/rules/autossh.make +++ b/rules/autossh.make @@ -18,7 +18,7 @@ AUTOSSH_VERSION := 1.4c AUTOSSH_MD5:= 26520eea934f296be0783dabe7fcfd28 AUTOSSH:= autossh-$(AUTOSSH_VERSION) AUTOSSH_SUFFIX := tgz -AUTOSSH_URL:= http://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX) +AUTOSSH_URL:= https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX) AUTOSSH_SOURCE := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX) AUTOSSH_DIR:= $(BUILDDIR)/$(AUTOSSH) AUTOSSH_LICENSE:= unknown base-commit: 19fb5785f39403e214704cb866ddce530ffa9582 -- 2.44.0
Re: [ptxdist] [PATCH 2/3] autossh: add license file and hash
Den fre. 15. mar. 2024 kl. 07.30 skrev Michael Olbrich : > > On Fri, Mar 08, 2024 at 06:16:17PM +0100, Bruno Thomsen wrote: > > Signed-off-by: Bruno Thomsen > > --- > > rules/autossh.make | 18 ++ > > 1 file changed, 10 insertions(+), 8 deletions(-) > > > > diff --git a/rules/autossh.make b/rules/autossh.make > > index 879cd1c99..19512070e 100644 > > --- a/rules/autossh.make > > +++ b/rules/autossh.make > > @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_AUTOSSH) += autossh > > # > > # Paths and names > > # > > -AUTOSSH_VERSION := 1.4c > > -AUTOSSH_MD5 := 26520eea934f296be0783dabe7fcfd28 > > -AUTOSSH := autossh-$(AUTOSSH_VERSION) > > -AUTOSSH_SUFFIX := tgz > > -AUTOSSH_URL := > > https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX) > > -AUTOSSH_SOURCE := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX) > > -AUTOSSH_DIR := $(BUILDDIR)/$(AUTOSSH) > > -AUTOSSH_LICENSE := unknown > > +AUTOSSH_VERSION := 1.4c > > +AUTOSSH_MD5 := 26520eea934f296be0783dabe7fcfd28 > > +AUTOSSH := autossh-$(AUTOSSH_VERSION) > > +AUTOSSH_SUFFIX := tgz > > +AUTOSSH_URL := > > https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX) > > +AUTOSSH_SOURCE := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX) > > +AUTOSSH_DIR := $(BUILDDIR)/$(AUTOSSH) > > +AUTOSSH_LICENSE := unknown > > If there is no patching spdx identifier, then use 'custom' for the license. > 'unknown' means, nobody looked at it. Thanks for the review. I overlooked that difference but can see that it's in the documentation. > > > +AUTOSSH_LICENSE_FILES:= \ > > + file://LICENSE;md5=799b1a7511fc918ee7de7122e1a538b5 > > I'm not seeing a LICENSE file in the source package. Let's just squash patch 2 and 3 with removal of the unknown license tag. /Bruno > > Michael > > > > > # > > > > # Prepare > > -- > > 2.44.0 > > > > > > > > -- > 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 3/3] autossh: Version bump 1.4c -> 1.4g
https://www.harding.motd.ca/autossh/CHANGES.txt Patch removed as change has been upstreamed. Separate LICENSE file has been removed but the same text is in autossh.c but year info updated from "2002-2008" to "2002-2018". Signed-off-by: Bruno Thomsen --- ...e-friendly-towards-packaging-with-DE.patch | 47 --- patches/autossh-1.4c/series | 4 -- rules/autossh.make| 6 +-- 3 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch delete mode 100644 patches/autossh-1.4c/series diff --git a/patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch b/patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch deleted file mode 100644 index 96fca563a..0 --- a/patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Jon Ringle -Date: Fri, 27 Jun 2014 16:39:41 -0400 -Subject: [PATCH] Make install rule friendly towards packaging with $DESTDIR - -Signed-off-by: Jon Ringle - Makefile.in | 30 +++--- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index fb7cc1d..a8e7a7e 100644 a/Makefile.in -+++ b/Makefile.in -@@ -45,18 +45,18 @@ distclean: allclean - - /bin/rm -f Makefile - - install: $(TARGET) -- mkdir -p -m 755 $(bindir) -- mkdir -p -m 755 $(prefix)/share/doc/autossh -- mkdir -p -m 755 $(datadir)/examples/autossh -- mkdir -p -m 755 $(mandir)/man1 -- cp $(TARGET) $(bindir) -- cp CHANGES README $(datadir)/doc/autossh -- cp autossh.host $(datadir)/examples/autossh -- cp rscreen $(datadir)/examples/autossh -- cp autossh.1 $(mandir)/man1 -- chmod 755 $(bindir)/$(TARGET) -- chmod 644 $(datadir)/doc/autossh/CHANGES -- chmod 644 $(datadir)/doc/autossh/README -- chmod 644 $(datadir)/examples/autossh/autossh.host -- chmod 644 $(datadir)/examples/autossh/rscreen -- chmod 644 $(mandir)/man1/autossh.1 -+ mkdir -p -m 755 $(DESTDIR)$(bindir) -+ mkdir -p -m 755 $(DESTDIR)$(prefix)/share/doc/autossh -+ mkdir -p -m 755 $(DESTDIR)$(datadir)/examples/autossh -+ mkdir -p -m 755 $(DESTDIR)$(mandir)/man1 -+ cp $(TARGET) $(DESTDIR)$(bindir) -+ cp CHANGES README $(DESTDIR)$(datadir)/doc/autossh -+ cp autossh.host $(DESTDIR)$(datadir)/examples/autossh -+ cp rscreen $(DESTDIR)$(datadir)/examples/autossh -+ cp autossh.1 $(DESTDIR)$(mandir)/man1 -+ chmod 755 $(DESTDIR)$(bindir)/$(TARGET) -+ chmod 644 $(DESTDIR)$(datadir)/doc/autossh/CHANGES -+ chmod 644 $(DESTDIR)$(datadir)/doc/autossh/README -+ chmod 644 $(DESTDIR)$(datadir)/examples/autossh/autossh.host -+ chmod 644 $(DESTDIR)$(datadir)/examples/autossh/rscreen -+ chmod 644 $(DESTDIR)$(mandir)/man1/autossh.1 diff --git a/patches/autossh-1.4c/series b/patches/autossh-1.4c/series deleted file mode 100644 index 29f971c73..0 --- a/patches/autossh-1.4c/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Make-install-rule-friendly-towards-packaging-with-DE.patch -# ecdd87ec5c25c56d421024daf8acf722 - git-ptx-patches magic diff --git a/rules/autossh.make b/rules/autossh.make index 19512070e..f7feaa261 100644 --- a/rules/autossh.make +++ b/rules/autossh.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_AUTOSSH) += autossh # # Paths and names # -AUTOSSH_VERSION:= 1.4c -AUTOSSH_MD5:= 26520eea934f296be0783dabe7fcfd28 +AUTOSSH_VERSION:= 1.4g +AUTOSSH_MD5:= 2b804bc1bf6d2f2afaa526d02df7c0a2 AUTOSSH:= autossh-$(AUTOSSH_VERSION) AUTOSSH_SUFFIX := tgz AUTOSSH_URL:= https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX) @@ -23,7 +23,7 @@ AUTOSSH_SOURCE:= $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX) AUTOSSH_DIR:= $(BUILDDIR)/$(AUTOSSH) AUTOSSH_LICENSE:= unknown AUTOSSH_LICENSE_FILES := \ - file://LICENSE;md5=799b1a7511fc918ee7de7122e1a538b5 + file://autossh.c;startline=7;endline=22;md5=9ae0c9b04856148d77984ef58536732b # # Prepare -- 2.44.0
[ptxdist] [PATCH 2/3] autossh: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/autossh.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/autossh.make b/rules/autossh.make index 879cd1c99..19512070e 100644 --- a/rules/autossh.make +++ b/rules/autossh.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_AUTOSSH) += autossh # # Paths and names # -AUTOSSH_VERSION:= 1.4c -AUTOSSH_MD5:= 26520eea934f296be0783dabe7fcfd28 -AUTOSSH:= autossh-$(AUTOSSH_VERSION) -AUTOSSH_SUFFIX := tgz -AUTOSSH_URL:= https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX) -AUTOSSH_SOURCE := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX) -AUTOSSH_DIR:= $(BUILDDIR)/$(AUTOSSH) -AUTOSSH_LICENSE:= unknown +AUTOSSH_VERSION:= 1.4c +AUTOSSH_MD5:= 26520eea934f296be0783dabe7fcfd28 +AUTOSSH:= autossh-$(AUTOSSH_VERSION) +AUTOSSH_SUFFIX := tgz +AUTOSSH_URL:= https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX) +AUTOSSH_SOURCE := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX) +AUTOSSH_DIR:= $(BUILDDIR)/$(AUTOSSH) +AUTOSSH_LICENSE:= unknown +AUTOSSH_LICENSE_FILES := \ + file://LICENSE;md5=799b1a7511fc918ee7de7122e1a538b5 # # Prepare -- 2.44.0
[ptxdist] [PATCH 1/3] autossh: update URL
Update URL from http to https as it returns 301 Moved Permanently. Download log: --2024-03-08 13:14:10-- http://www.harding.motd.ca/autossh/autossh-1.4c.tgz Resolving www.harding.motd.ca (www.harding.motd.ca)... 70.73.86.42 Connecting to www.harding.motd.ca (www.harding.motd.ca)|70.73.86.42|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://www.harding.motd.ca/autossh/autossh-1.4c.tgz [following] --2024-03-08 13:14:11-- https://www.harding.motd.ca/autossh/autossh-1.4c.tgz Connecting to www.harding.motd.ca (www.harding.motd.ca)|70.73.86.42|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 65191 (64K) [application/octet-stream] Signed-off-by: Bruno Thomsen --- rules/autossh.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/autossh.make b/rules/autossh.make index ef8240bcb..879cd1c99 100644 --- a/rules/autossh.make +++ b/rules/autossh.make @@ -18,7 +18,7 @@ AUTOSSH_VERSION := 1.4c AUTOSSH_MD5:= 26520eea934f296be0783dabe7fcfd28 AUTOSSH:= autossh-$(AUTOSSH_VERSION) AUTOSSH_SUFFIX := tgz -AUTOSSH_URL:= http://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX) +AUTOSSH_URL:= https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX) AUTOSSH_SOURCE := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX) AUTOSSH_DIR:= $(BUILDDIR)/$(AUTOSSH) AUTOSSH_LICENSE:= unknown base-commit: 6d4773f25c3b1fa958bc1c41b1219e79c813bd8b -- 2.44.0
Re: [ptxdist] [PATCH] xz: add extra URL
Den tirs. 5. mar. 2024 kl. 06.58 skrev Christian Melki : > > Hi Bruno. > > I bumped xz last week. I think it's hosted on github from now on. > > https://lore.ptxdist.org/ptxdist/20240225143514.2406777-1-christian.me...@t2data.com/T/#m2a3fe2fdc489cf841e388f18b5f9e38c7ccfa408 > Hi Christian, I missed that patch :( In my download log I don't see that they have moved permanently to github, as bouncer still returns 302 Found and not 301 Moved Permanently. --2024-03-06 07:07:49-- https://tukaani.org/xz/xz-5.4.4.tar.bz2 Resolving tukaani.org (tukaani.org)... 5.44.245.25 Connecting to tukaani.org (tukaani.org)|5.44.245.25|:443... connected. HTTP request sent, awaiting response... 302 Found Location: https://github.com/tukaani-project/xz/releases/download/v5.4.4/xz-5.4.4.tar.bz2 [following] --2024-03-06 07:07:49-- https://github.com/tukaani-project/xz/releases/download/v5.4.4/xz-5.4.4.tar.bz2 Resolving github.com (github.com)... 140.82.121.4 Connecting to github.com (github.com)|140.82.121.4|:443... connected. HTTP request sent, awaiting response... 302 Found Location: https://objects.githubusercontent.com/github-production-release-asset-2e65be/553665726/bb2ac96f-c9ec-462e-b4ce-e8c62b3d65d2?X-Amz-Algorithm=AWS4-HMAC-SHA256=AKIAVCODYLSA53PQK4ZA%2F20240306%2Fus-east-1%2Fs3%2Faws4_request=20240306T070749Z=300=73c9dac5b9feb6997241c4988d511e712ac2b0346c18dfa6492ae18413d920b6=host_id=0_id=0_id=553665726=attachment%3B%20filename%3Dxz-5.4.4.tar.bz2=application%2Foctet-stream [following] --2024-03-06 07:07:49-- https://objects.githubusercontent.com/github-production-release-asset-2e65be/553665726/bb2ac96f-c9ec-462e-b4ce-e8c62b3d65d2?X-Amz-Algorithm=AWS4-HMAC-SHA256=AKIAVCODYLSA53PQK4ZA%2F20240306%2Fus-east-1%2Fs3%2Faws4_request=20240306T070749Z=300=73c9dac5b9feb6997241c4988d511e712ac2b0346c18dfa6492ae18413d920b6=host_id=0_id=0_id=553665726=attachment%3B%20filename%3Dxz-5.4.4.tar.bz2=application%2Foctet-stream Resolving objects.githubusercontent.com (objects.githubusercontent.com)... 185.199.108.133, 185.199.109.133, 185.199.110.133, ... Connecting to objects.githubusercontent.com (objects.githubusercontent.com)|185.199.108.133|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2166261 (2.1M) [application/octet-stream] /Bruno > On 3/4/24 20:40, Bruno Thomsen wrote: > > Add an additional github URL that is currently used. > > It will then act as fallback so we don't rely on 302 Found Location > > from primary URL. > > > > Suggested-by: Roland Hieber > > Signed-off-by: Bruno Thomsen > > --- > > rules/xz.make | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/rules/xz.make b/rules/xz.make > > index f24a2ac03..969eed4bd 100644 > > --- a/rules/xz.make > > +++ b/rules/xz.make > > @@ -18,7 +18,9 @@ XZ_VERSION := 5.4.4 > > XZ_MD5 := fbb849a27e266964aefe26bad508144f > > XZ := xz-$(XZ_VERSION) > > XZ_SUFFIX:= tar.bz2 > > -XZ_URL := https://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) > > +XZ_URL := \ > > + https://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) \ > > + > > https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)/$(XZ).$(XZ_SUFFIX) > > XZ_SOURCE:= $(SRCDIR)/$(XZ).$(XZ_SUFFIX) > > XZ_DIR := $(BUILDDIR)/$(XZ) > > XZ_LICENSE := public_domain AND LGPL-2.1-or-later AND GPL-2.0-or-later > > AND GPL-3.0-or-later > > > > base-commit: 6bf08f784b8d41b63ba1d322e79145ad670b09e2 >
[ptxdist] [PATCH] xz: add extra URL
Add an additional github URL that is currently used. It will then act as fallback so we don't rely on 302 Found Location from primary URL. Suggested-by: Roland Hieber Signed-off-by: Bruno Thomsen --- rules/xz.make | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rules/xz.make b/rules/xz.make index f24a2ac03..969eed4bd 100644 --- a/rules/xz.make +++ b/rules/xz.make @@ -18,7 +18,9 @@ XZ_VERSION:= 5.4.4 XZ_MD5 := fbb849a27e266964aefe26bad508144f XZ := xz-$(XZ_VERSION) XZ_SUFFIX := tar.bz2 -XZ_URL := https://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) +XZ_URL := \ + https://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) \ + https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)/$(XZ).$(XZ_SUFFIX) XZ_SOURCE := $(SRCDIR)/$(XZ).$(XZ_SUFFIX) XZ_DIR := $(BUILDDIR)/$(XZ) XZ_LICENSE := public_domain AND LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later base-commit: 6bf08f784b8d41b63ba1d322e79145ad670b09e2 -- 2.43.2
[ptxdist] [PATCH] openssl: update license and add license file with hash
OpenSSL is covered by one of two licenses, depending on which release is involved. For the 3.0 release, and later releases derived from that, the Apache License v2 applies. This also applies to the git “master” branch. https://www.openssl.org/source/license.html Signed-off-by: Bruno Thomsen --- rules/openssl.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/openssl.make b/rules/openssl.make index 7080bd50ba55..fbc6424e0c56 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -16,16 +16,18 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl # # Paths and names # -OPENSSL_VERSION:= 3.2.1 -OPENSSL_MD5:= c239213887804ba00654884918b37441 -OPENSSL:= openssl-$(OPENSSL_VERSION) -OPENSSL_SUFFIX := tar.gz -OPENSSL_URL:= \ +OPENSSL_VERSION:= 3.2.1 +OPENSSL_MD5:= c239213887804ba00654884918b37441 +OPENSSL:= openssl-$(OPENSSL_VERSION) +OPENSSL_SUFFIX := tar.gz +OPENSSL_URL:= \ https://www.openssl.org/source/$(OPENSSL).$(OPENSSL_SUFFIX) \ https://www.openssl.org/source/old/$(basename $(OPENSSL_VERSION))/$(OPENSSL).$(OPENSSL_SUFFIX) -OPENSSL_SOURCE := $(SRCDIR)/$(OPENSSL).$(OPENSSL_SUFFIX) -OPENSSL_DIR:= $(BUILDDIR)/$(OPENSSL) -OPENSSL_LICENSE:= OpenSSL +OPENSSL_SOURCE := $(SRCDIR)/$(OPENSSL).$(OPENSSL_SUFFIX) +OPENSSL_DIR:= $(BUILDDIR)/$(OPENSSL) +OPENSSL_LICENSE:= Apache-2.0 +OPENSSL_LICENSE_FILES := \ + file://LICENSE.txt;md5=c75985e733726beaba57bc5253e96d04 # # Prepare base-commit: 6bf08f784b8d41b63ba1d322e79145ad670b09e2 -- 2.44.0
Re: [ptxdist] git fetch/clone error
Den tors. 29. feb. 2024 kl. 20.06 skrev Michael Olbrich : > > Hi, > > On Thu, Feb 29, 2024 at 05:19:19PM +0100, Bruno Thomsen wrote: > > Git read URL[1] returns error when trying to fetch or clone, but cgit > > web view is working fine. > > > > fatal: remote error: FATAL: R any ptxdist webserver DENIED by fallthru > > (or you mis-spelled the reponame) > > Thanks for the heads up. Are you still having problems? The git server was > down for maintenance this afternoon. It works for me now, so I'm guessing > you hit it just at the wrong time. > Hi Great! It just started working again. It returned the same error message this morning from a different ISP. /Bruno > Regards, > 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- |
[ptxdist] git fetch/clone error
Hi, Git read URL[1] returns error when trying to fetch or clone, but cgit web view is working fine. fatal: remote error: FATAL: R any ptxdist webserver DENIED by fallthru (or you mis-spelled the reponame) /Bruno [1] https://git.pengutronix.de/git/ptxdist
[ptxdist] [PATCH 5/5] mobile-broadband-provider-info: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/mobile-broadband-provider-info.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/mobile-broadband-provider-info.make b/rules/mobile-broadband-provider-info.make index 04ff96c79..57f992073 100644 --- a/rules/mobile-broadband-provider-info.make +++ b/rules/mobile-broadband-provider-info.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_MOBILE_BROADBAND_PROVIDER_INFO) += mobile-broadband-provider- # # Paths and names # -MOBILE_BROADBAND_PROVIDER_INFO_VERSION := 20220725 -MOBILE_BROADBAND_PROVIDER_INFO_MD5 := f283369e5b1d46a77bded8f7754ad3c3 -MOBILE_BROADBAND_PROVIDER_INFO := mobile-broadband-provider-info-$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION) -MOBILE_BROADBAND_PROVIDER_INFO_SUFFIX := tar.xz -MOBILE_BROADBAND_PROVIDER_INFO_URL := $(call ptx/mirror, GNOME, mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION)/$(MOBILE_BROADBAND_PROVIDER_INFO).$(MOBILE_BROADBAND_PROVIDER_INFO_SUFFIX)) -MOBILE_BROADBAND_PROVIDER_INFO_SOURCE := $(SRCDIR)/$(MOBILE_BROADBAND_PROVIDER_INFO).$(MOBILE_BROADBAND_PROVIDER_INFO_SUFFIX) -MOBILE_BROADBAND_PROVIDER_INFO_DIR := $(BUILDDIR)/$(MOBILE_BROADBAND_PROVIDER_INFO) -MOBILE_BROADBAND_PROVIDER_INFO_LICENSE := public_domain +MOBILE_BROADBAND_PROVIDER_INFO_VERSION := 20220725 +MOBILE_BROADBAND_PROVIDER_INFO_MD5 := f283369e5b1d46a77bded8f7754ad3c3 +MOBILE_BROADBAND_PROVIDER_INFO := mobile-broadband-provider-info-$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION) +MOBILE_BROADBAND_PROVIDER_INFO_SUFFIX := tar.xz +MOBILE_BROADBAND_PROVIDER_INFO_URL := $(call ptx/mirror, GNOME, mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION)/$(MOBILE_BROADBAND_PROVIDER_INFO).$(MOBILE_BROADBAND_PROVIDER_INFO_SUFFIX)) +MOBILE_BROADBAND_PROVIDER_INFO_SOURCE := $(SRCDIR)/$(MOBILE_BROADBAND_PROVIDER_INFO).$(MOBILE_BROADBAND_PROVIDER_INFO_SUFFIX) +MOBILE_BROADBAND_PROVIDER_INFO_DIR := $(BUILDDIR)/$(MOBILE_BROADBAND_PROVIDER_INFO) +MOBILE_BROADBAND_PROVIDER_INFO_LICENSE := public_domain +MOBILE_BROADBAND_PROVIDER_INFO_LICENSE_FILES := \ + file://COPYING;md5=87964579b2a8ece4bc6744d2dc9a8b04 # # Prepare -- 2.43.0
[ptxdist] [PATCH 3/5] libaio: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/libaio.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/libaio.make b/rules/libaio.make index d9e54e1ce..8abbcae45 100644 --- a/rules/libaio.make +++ b/rules/libaio.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_LIBAIO) += libaio # # Paths and names # -LIBAIO_VERSION := 0.3.113 -LIBAIO_MD5 := 4422d9f1655f358d74ff48af2a3b9f49 -LIBAIO := libaio-$(LIBAIO_VERSION) -LIBAIO_SUFFIX := tar.gz -LIBAIO_URL := https://pagure.io/libaio/archive/$(LIBAIO)/libaio-$(LIBAIO).$(LIBAIO_SUFFIX) -LIBAIO_SOURCE := $(SRCDIR)/$(LIBAIO).$(LIBAIO_SUFFIX) -LIBAIO_DIR := $(BUILDDIR)/$(LIBAIO) -LIBAIO_LICENSE := LGPL-2.1-only +LIBAIO_VERSION := 0.3.113 +LIBAIO_MD5 := 4422d9f1655f358d74ff48af2a3b9f49 +LIBAIO := libaio-$(LIBAIO_VERSION) +LIBAIO_SUFFIX := tar.gz +LIBAIO_URL := https://pagure.io/libaio/archive/$(LIBAIO)/libaio-$(LIBAIO).$(LIBAIO_SUFFIX) +LIBAIO_SOURCE := $(SRCDIR)/$(LIBAIO).$(LIBAIO_SUFFIX) +LIBAIO_DIR := $(BUILDDIR)/$(LIBAIO) +LIBAIO_LICENSE := LGPL-2.1-only +LIBAIO_LICENSE_FILES := \ + file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 # # Prepare + Compile -- 2.43.0
[ptxdist] [PATCH 2/5] pyserial3: add license file and hash
Use SPDX-License-Identifier as listed in LICENSE.txt. Signed-off-by: Bruno Thomsen --- rules/pyserial3.make | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rules/pyserial3.make b/rules/pyserial3.make index f5abf971f..4770e7e1d 100644 --- a/rules/pyserial3.make +++ b/rules/pyserial3.make @@ -22,7 +22,9 @@ PYSERIAL3_SUFFIX := tar.gz PYSERIAL3_URL := https://github.com/pyserial/pyserial/archive/v$(PYSERIAL3_VERSION).$(PYSERIAL3_SUFFIX) PYSERIAL3_SOURCE := $(SRCDIR)/$(PYSERIAL3).$(PYSERIAL3_SUFFIX) PYSERIAL3_DIR := $(BUILDDIR)/$(PYSERIAL3) -PYSERIAL3_LICENSE := BSD +PYSERIAL3_LICENSE := BSD-3-Clause +PYSERIAL3_LICENSE_FILES:= \ + file://LICENSE.txt;md5=d476d94926db6e0008a5b3860d1f5c0d # # Extract -- 2.43.0
[ptxdist] [PATCH 4/5] termcap: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/termcap.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/termcap.make b/rules/termcap.make index 84c938a3e..bf23a7ea3 100644 --- a/rules/termcap.make +++ b/rules/termcap.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_TERMCAP) += termcap # # Paths and names # -TERMCAP_VERSION:= 1.3.1 -TERMCAP_MD5:= ffe6f86e63a3a29fa53ac645faaabdfa -TERMCAP:= termcap-$(TERMCAP_VERSION) -TERMCAP_SUFFIX := tar.gz -TERMCAP_URL:= $(call ptx/mirror, GNU, termcap/$(TERMCAP).$(TERMCAP_SUFFIX)) -TERMCAP_SOURCE := $(SRCDIR)/$(TERMCAP).$(TERMCAP_SUFFIX) -TERMCAP_DIR:= $(BUILDDIR)/$(TERMCAP) -TERMCAP_LICENSE:= GPL-2.0-only +TERMCAP_VERSION:= 1.3.1 +TERMCAP_MD5:= ffe6f86e63a3a29fa53ac645faaabdfa +TERMCAP:= termcap-$(TERMCAP_VERSION) +TERMCAP_SUFFIX := tar.gz +TERMCAP_URL:= $(call ptx/mirror, GNU, termcap/$(TERMCAP).$(TERMCAP_SUFFIX)) +TERMCAP_SOURCE := $(SRCDIR)/$(TERMCAP).$(TERMCAP_SUFFIX) +TERMCAP_DIR:= $(BUILDDIR)/$(TERMCAP) +TERMCAP_LICENSE:= GPL-2.0-only +TERMCAP_LICENSE_FILES := \ + file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f # # Prepare -- 2.43.0
[ptxdist] [PATCH 1/5] screen: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/screen.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/screen.make b/rules/screen.make index d446b794a..766bf79d3 100644 --- a/rules/screen.make +++ b/rules/screen.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_SCREEN) += screen # # Paths and names # -SCREEN_VERSION := 4.9.1 -SCREEN_MD5 := 9a9bdc956bd93e4f0cb9e48678889e26 -SCREEN := screen-$(SCREEN_VERSION) -SCREEN_SUFFIX := tar.gz -SCREEN_URL := $(call ptx/mirror, GNU, screen/$(SCREEN).$(SCREEN_SUFFIX)) -SCREEN_SOURCE := $(SRCDIR)/$(SCREEN).$(SCREEN_SUFFIX) -SCREEN_DIR := $(BUILDDIR)/$(SCREEN) -SCREEN_LICENSE := GPL-2.0-or-later +SCREEN_VERSION := 4.9.1 +SCREEN_MD5 := 9a9bdc956bd93e4f0cb9e48678889e26 +SCREEN := screen-$(SCREEN_VERSION) +SCREEN_SUFFIX := tar.gz +SCREEN_URL := $(call ptx/mirror, GNU, screen/$(SCREEN).$(SCREEN_SUFFIX)) +SCREEN_SOURCE := $(SRCDIR)/$(SCREEN).$(SCREEN_SUFFIX) +SCREEN_DIR := $(BUILDDIR)/$(SCREEN) +SCREEN_LICENSE := GPL-2.0-or-later +SCREEN_LICENSE_FILES := \ + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 # # Prepare base-commit: 2270af1f0ad1ca6118667e35dae57d4b468be510 -- 2.43.0
[ptxdist] [PATCH 3/3] libestr: update URL
Update URL from http to https as it returns 301 Moved Permanently. Download log: --2024-02-07 15:24:13-- http://libestr.adiscon.com/files/download/libestr-0.1.10.tar.gz Resolving libestr.adiscon.com (libestr.adiscon.com)... 95.217.26.43, 2a01:4f9:c01f:8033::1 Connecting to libestr.adiscon.com (libestr.adiscon.com)|95.217.26.43|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://libestr.adiscon.com/files/download/libestr-0.1.10.tar.gz [following] --2024-02-07 15:24:13-- https://libestr.adiscon.com/files/download/libestr-0.1.10.tar.gz Connecting to libestr.adiscon.com (libestr.adiscon.com)|95.217.26.43|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 336122 (328K) [application/x-gzip] Signed-off-by: Bruno Thomsen --- rules/libestr.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/libestr.make b/rules/libestr.make index 10e32f19b..b9789f4b7 100644 --- a/rules/libestr.make +++ b/rules/libestr.make @@ -18,7 +18,7 @@ LIBESTR_VERSION := 0.1.10 LIBESTR_MD5:= f4c9165a23587e77f7efe65d676d5e8e LIBESTR:= libestr-$(LIBESTR_VERSION) LIBESTR_SUFFIX := tar.gz -LIBESTR_URL:= http://libestr.adiscon.com/files/download/$(LIBESTR).$(LIBESTR_SUFFIX) +LIBESTR_URL:= https://libestr.adiscon.com/files/download/$(LIBESTR).$(LIBESTR_SUFFIX) LIBESTR_SOURCE := $(SRCDIR)/$(LIBESTR).$(LIBESTR_SUFFIX) LIBESTR_DIR:= $(BUILDDIR)/$(LIBESTR) LIBESTR_LICENSE:= LGPL-2.1-or-later -- 2.43.0
[ptxdist] [PATCH 2/3] host-intltool: update URL
Update URL from http to https as it returns 301 Moved Permanently. Download log: --2024-02-07 15:25:41-- http://launchpad.net/intltool/trunk/0.50.0/+download/intltool-0.50.0.tar.gz Resolving launchpad.net (launchpad.net)... 185.125.189.223, 185.125.189.222, 2620:2d:4000:1009::f3, ... Connecting to launchpad.net (launchpad.net)|185.125.189.223|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://launchpad.net/intltool/trunk/0.50.0/+download/intltool-0.50.0.tar.gz [following] --2024-02-07 15:25:41-- https://launchpad.net/intltool/trunk/0.50.0/+download/intltool-0.50.0.tar.gz Connecting to launchpad.net (launchpad.net)|185.125.189.223|:443... connected. HTTP request sent, awaiting response... 303 See Other Location: https://launchpadlibrarian.net/82359793/intltool-0.50.0.tar.gz [following] --2024-02-07 15:25:42-- https://launchpadlibrarian.net/82359793/intltool-0.50.0.tar.gz Resolving launchpadlibrarian.net (launchpadlibrarian.net)... 185.125.189.228, 185.125.189.229, 2620:2d:4000:1009::3b8, ... Connecting to launchpadlibrarian.net (launchpadlibrarian.net)|185.125.189.228|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 142837 (139K) [application/x-tar] Signed-off-by: Bruno Thomsen --- rules/host-intltool.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/host-intltool.make b/rules/host-intltool.make index 825e25705..86e6fb53e 100644 --- a/rules/host-intltool.make +++ b/rules/host-intltool.make @@ -18,7 +18,7 @@ HOST_INTLTOOL_VERSION := 0.50.0 HOST_INTLTOOL_MD5 := 0da9847a60391ca653df35123b1f7cc0 HOST_INTLTOOL := intltool-$(HOST_INTLTOOL_VERSION) HOST_INTLTOOL_SUFFIX := tar.gz -HOST_INTLTOOL_URL := http://launchpad.net/intltool/trunk/0.50.0/+download/$(HOST_INTLTOOL).$(HOST_INTLTOOL_SUFFIX) +HOST_INTLTOOL_URL := https://launchpad.net/intltool/trunk/0.50.0/+download/$(HOST_INTLTOOL).$(HOST_INTLTOOL_SUFFIX) HOST_INTLTOOL_SOURCE := $(SRCDIR)/$(HOST_INTLTOOL).$(HOST_INTLTOOL_SUFFIX) HOST_INTLTOOL_DIR := $(HOST_BUILDDIR)/$(HOST_INTLTOOL) HOST_INTLTOOL_LICENSE := GPL-2.0-only -- 2.43.0
[ptxdist] [PATCH 1/3] rsyslog: update URL
Update URL from http to https as it returns 301 Moved Permanently. Download log: --2024-02-07 15:22:03-- http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2012.0.tar.gz Resolving www.rsyslog.com (www.rsyslog.com)... 95.217.26.43, 2a01:4f9:c01f:8033::1 Connecting to www.rsyslog.com (www.rsyslog.com)|95.217.26.43|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2012.0.tar.gz [following] --2024-02-07 15:22:03-- https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.2012.0.tar.gz Connecting to www.rsyslog.com (www.rsyslog.com)|95.217.26.43|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 3118101 (3.0M) [application/x-gzip] Signed-off-by: Bruno Thomsen --- rules/rsyslog.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/rsyslog.make b/rules/rsyslog.make index 46fe7046a..25c09f549 100644 --- a/rules/rsyslog.make +++ b/rules/rsyslog.make @@ -18,7 +18,7 @@ RSYSLOG_VERSION := 8.2012.0 RSYSLOG_MD5:= 2a64947e3d157c0198609aabd37be42f RSYSLOG:= rsyslog-$(RSYSLOG_VERSION) RSYSLOG_SUFFIX := tar.gz -RSYSLOG_URL:= http://www.rsyslog.com/files/download/rsyslog/$(RSYSLOG).$(RSYSLOG_SUFFIX) +RSYSLOG_URL:= https://www.rsyslog.com/files/download/rsyslog/$(RSYSLOG).$(RSYSLOG_SUFFIX) RSYSLOG_SOURCE := $(SRCDIR)/$(RSYSLOG).$(RSYSLOG_SUFFIX) RSYSLOG_DIR:= $(BUILDDIR)/$(RSYSLOG) RSYSLOG_LICENSE:= GPL-3.0-or-later AND LGPL-3.0-or-later AND Apache-2.0 base-commit: aee961622a704f9085db9cb60e581553cd5b88a9 -- 2.43.0
[ptxdist] [PATCH 2/2] jq: update URL
Update GitHub URL as it returns 301 Moved Permanently. Download log: --2024-01-27 11:10:59-- https://github.com/stedolan/jq/releases/download/jq-1.7/jq-1.7.tar.gz Resolving github.com (github.com)... 140.82.121.3 Connecting to github.com (github.com)|140.82.121.3|:443... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://github.com/jqlang/jq/releases/download/jq-1.7/jq-1.7.tar.gz [following] --2024-01-27 11:11:00-- https://github.com/jqlang/jq/releases/download/jq-1.7/jq-1.7.tar.gz Reusing existing connection to github.com:443. HTTP request sent, awaiting response... 302 Found Location: https://objects.githubusercontent.com/github-production-release-asset-2e65be/5101141/5acf0133-ab1d-4128-bc20-8f1ae22752ef?X-Amz-Algorithm=AWS4-HMAC-SHA256=AKIAVCODYLSA53PQK4ZA%2F20240127%2Fus-east-1%2Fs3%2Faws4_request=20240127T01Z=300=1284f76969ab40a55f81727ea28a40d77c42d157029192e5566f6938dcbe12ce=host_id=0_id=0_id=5101141=attachment%3B%20filename%3Djq-1.7.tar.gz=application%2Foctet-stream [following] --2024-01-27 11:11:01-- https://objects.githubusercontent.com/github-production-release-asset-2e65be/5101141/5acf0133-ab1d-4128-bc20-8f1ae22752ef?X-Amz-Algorithm=AWS4-HMAC-SHA256=AKIAVCODYLSA53PQK4ZA%2F20240127%2Fus-east-1%2Fs3%2Faws4_request=20240127T01Z=300=1284f76969ab40a55f81727ea28a40d77c42d157029192e5566f6938dcbe12ce=host_id=0_id=0_id=5101141=attachment%3B%20filename%3Djq-1.7.tar.gz=application%2Foctet-stream Resolving objects.githubusercontent.com (objects.githubusercontent.com)... 185.199.108.133, 185.199.109.133, 185.199.110.133, ... Connecting to objects.githubusercontent.com (objects.githubusercontent.com)|185.199.108.133|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1905863 (1.8M) [application/octet-stream] Signed-off-by: Bruno Thomsen --- rules/jq.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/jq.make b/rules/jq.make index d873663c9..e670920c6 100644 --- a/rules/jq.make +++ b/rules/jq.make @@ -18,7 +18,7 @@ JQ_VERSION:= 1.7 JQ_MD5 := 4662fd45f0b5622382fc85c1249739d5 JQ := jq-$(JQ_VERSION) JQ_SUFFIX := tar.gz -JQ_URL := https://github.com/stedolan/jq/releases/download/$(JQ)/$(JQ).$(JQ_SUFFIX) +JQ_URL := https://github.com/jqlang/jq/releases/download/$(JQ)/$(JQ).$(JQ_SUFFIX) JQ_SOURCE := $(SRCDIR)/$(JQ).$(JQ_SUFFIX) JQ_DIR := $(BUILDDIR)/$(JQ) JQ_LICENSE := MIT AND CC-BY-3.0 AND ICU -- 2.43.0
[ptxdist] [PATCH 1/2] dnsmasq: update URL
Update URL from http to https as it returns 301 Moved Permanently. Download log: --2024-01-24 09:09:56-- http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz Resolving www.thekelleys.org.uk (www.thekelleys.org.uk)... 85.119.82.65, 2001:ba8:1f1:f049::2 Connecting to www.thekelleys.org.uk (www.thekelleys.org.uk)|85.119.82.65|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz [following] --2024-01-24 09:09:57-- https://thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz Resolving thekelleys.org.uk (thekelleys.org.uk)... 85.119.82.65, 2001:ba8:1f1:f049::2 Connecting to thekelleys.org.uk (thekelleys.org.uk)|85.119.82.65|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 562700 (550K) [application/x-xz] Signed-off-by: Bruno Thomsen --- rules/dnsmasq.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make index debbc8d0f..2c6262308 100644 --- a/rules/dnsmasq.make +++ b/rules/dnsmasq.make @@ -19,7 +19,7 @@ DNSMASQ_VERSION := 2.89 DNSMASQ_MD5:= a227ce79d772c8a49f94335cdb041e77 DNSMASQ:= dnsmasq-$(DNSMASQ_VERSION) DNSMASQ_SUFFIX := tar.xz -DNSMASQ_URL:= http://www.thekelleys.org.uk/dnsmasq/$(DNSMASQ).$(DNSMASQ_SUFFIX) +DNSMASQ_URL:= https://thekelleys.org.uk/dnsmasq/$(DNSMASQ).$(DNSMASQ_SUFFIX) DNSMASQ_SOURCE := $(SRCDIR)/$(DNSMASQ).$(DNSMASQ_SUFFIX) DNSMASQ_DIR:= $(BUILDDIR)/$(DNSMASQ) DNSMASQ_LICENSE:= GPL-2.0-only OR GPL-3.0-only base-commit: 172982887b5044fb73a15e2871c3e76b405def52 -- 2.43.0
[ptxdist] [PATCH 2/2] tcpdump: update URL
Update URL from http to https as required by HSTS policy. Download log: URL transformed to HTTPS due to an HSTS policy --2024-01-16 09:18:43-- https://www.tcpdump.org/release/tcpdump-4.99.4.tar.gz Resolving www.tcpdump.org (www.tcpdump.org)... 5.101.150.118, 2a01:a500:3205:5142::f2 Connecting to www.tcpdump.org (www.tcpdump.org)|5.101.150.118|:443... connected. HTTP request sent, awaiting response... 200 OK Signed-off-by: Bruno Thomsen --- rules/tcpdump.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/tcpdump.make b/rules/tcpdump.make index 2b7460ff3..5792beac9 100644 --- a/rules/tcpdump.make +++ b/rules/tcpdump.make @@ -19,7 +19,7 @@ TCPDUMP_VERSION := 4.99.4 TCPDUMP_MD5:= d90471c90f780901e591807927ef0f07 TCPDUMP:= tcpdump-$(TCPDUMP_VERSION) TCPDUMP_SUFFIX := tar.gz -TCPDUMP_URL:= http://www.tcpdump.org/release/$(TCPDUMP).$(TCPDUMP_SUFFIX) +TCPDUMP_URL:= https://www.tcpdump.org/release/$(TCPDUMP).$(TCPDUMP_SUFFIX) TCPDUMP_SOURCE := $(SRCDIR)/$(TCPDUMP).$(TCPDUMP_SUFFIX) TCPDUMP_DIR:= $(BUILDDIR)/$(TCPDUMP) TCPDUMP_LICENSE:= BSD-3-Clause -- 2.43.0
[ptxdist] [PATCH 1/2] libpcap: update URL
Update URL from http to https as it returns 301 Moved Permanently. Download log: --2024-01-16 09:18:42-- http://www.tcpdump.org/release/libpcap-1.10.4.tar.gz Resolving www.tcpdump.org (www.tcpdump.org)... 5.101.150.118, 2a01:a500:3205:5142::f2 Connecting to www.tcpdump.org (www.tcpdump.org)|5.101.150.118|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://tcpdump.org/release/libpcap-1.10.4.tar.gz [following] --2024-01-16 09:18:42-- https://tcpdump.org/release/libpcap-1.10.4.tar.gz Resolving tcpdump.org (tcpdump.org)... 5.101.150.118, 2a01:a500:3205:5142::f2 Connecting to tcpdump.org (tcpdump.org)|5.101.150.118|:443... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://www.tcpdump.org/release/libpcap-1.10.4.tar.gz [following] --2024-01-16 09:18:43-- https://www.tcpdump.org/release/libpcap-1.10.4.tar.gz Connecting to www.tcpdump.org (www.tcpdump.org)|5.101.150.118|:443... connected. HTTP request sent, awaiting response... 200 OK Signed-off-by: Bruno Thomsen --- rules/libpcap.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/libpcap.make b/rules/libpcap.make index 2f8329106..23ab67563 100644 --- a/rules/libpcap.make +++ b/rules/libpcap.make @@ -18,7 +18,7 @@ LIBPCAP_VERSION := 1.10.4 LIBPCAP_MD5:= 0322e28dd76cda8066bb6d00fee5969b LIBPCAP:= libpcap-$(LIBPCAP_VERSION) LIBPCAP_SUFFIX := tar.gz -LIBPCAP_URL:= http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX) +LIBPCAP_URL:= https://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX) LIBPCAP_SOURCE := $(SRCDIR)/$(LIBPCAP).$(LIBPCAP_SUFFIX) LIBPCAP_DIR:= $(BUILDDIR)/$(LIBPCAP) LIBPCAP_LICENSE:= BSD-3-Clause base-commit: b84217969a5ea136907cd153930ab07a3c5a0398 -- 2.43.0
Re: [ptxdist] [PATCH v2] libgpg-error: version bump 1.45 -> 1.47
Den ons. 10. jan. 2024 kl. 18.11 skrev Michael Olbrich
:
>
> On Tue, Jan 02, 2024 at 06:56:50PM +0100, Bruno Thomsen wrote:
> > New option --enable-install-gpg-error-config to install deprecated
> > gpg-error-config.
> >
> > Signed-off-by: Bruno Thomsen
> > ---
> > v2:
> > - Move existing patches forward, applies clean.
>
> I somehow misst the new version and applied the old version with a fixup
> to move keep the patch. Just in case you're wondering why I added the
> comment in the commit message... Sorry about that.
No problem, I should also have replied to the v1 patch with a
"please drop, use v2." when I discovered the issue.
/Bruno
>
> Michael
>
> > .../0001-gpgrt-config-improve-pkg-config-file-parsing.patch | 0
> > patches/{libgpg-error-1.45 => libgpg-error-1.47}/series | 0
> > rules/libgpg-error.make | 4 ++--
> > 3 files changed, 2 insertions(+), 2 deletions(-)
> > rename patches/{libgpg-error-1.45 =>
> > libgpg-error-1.47}/0001-gpgrt-config-improve-pkg-config-file-parsing.patch
> > (100%)
> > rename patches/{libgpg-error-1.45 => libgpg-error-1.47}/series (100%)
> >
> > diff --git
> > a/patches/libgpg-error-1.45/0001-gpgrt-config-improve-pkg-config-file-parsing.patch
> >
> > b/patches/libgpg-error-1.47/0001-gpgrt-config-improve-pkg-config-file-parsing.patch
> > similarity index 100%
> > rename from
> > patches/libgpg-error-1.45/0001-gpgrt-config-improve-pkg-config-file-parsing.patch
> > rename to
> > patches/libgpg-error-1.47/0001-gpgrt-config-improve-pkg-config-file-parsing.patch
> > diff --git a/patches/libgpg-error-1.45/series
> > b/patches/libgpg-error-1.47/series
> > similarity index 100%
> > rename from patches/libgpg-error-1.45/series
> > rename to patches/libgpg-error-1.47/series
> > diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
> > index 61e7e0a11990..32f1390d1774 100644
> > --- a/rules/libgpg-error.make
> > +++ b/rules/libgpg-error.make
> > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBGPG_ERROR) += libgpg-error
> > #
> > # Paths and names
> > #
> > -LIBGPG_ERROR_VERSION := 1.45
> > -LIBGPG_ERROR_MD5 := 3bb15e0c29d3a680db7cef15143615e1
> > +LIBGPG_ERROR_VERSION := 1.47
> > +LIBGPG_ERROR_MD5 := 58e054ca192a77226c4822bbee1b7fdb
> > LIBGPG_ERROR := libgpg-error-$(LIBGPG_ERROR_VERSION)
> > LIBGPG_ERROR_SUFFIX := tar.bz2
> > LIBGPG_ERROR_URL := \
> >
> > base-commit: 6c8952685f05b011c21dec645d990bad4776e6a4
> > --
> > 2.43.0
> >
> >
> >
>
> --
> 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 v2] libgpg-error: version bump 1.45 -> 1.47
New option --enable-install-gpg-error-config to install deprecated
gpg-error-config.
Signed-off-by: Bruno Thomsen
---
v2:
- Move existing patches forward, applies clean.
.../0001-gpgrt-config-improve-pkg-config-file-parsing.patch | 0
patches/{libgpg-error-1.45 => libgpg-error-1.47}/series | 0
rules/libgpg-error.make | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename patches/{libgpg-error-1.45 =>
libgpg-error-1.47}/0001-gpgrt-config-improve-pkg-config-file-parsing.patch
(100%)
rename patches/{libgpg-error-1.45 => libgpg-error-1.47}/series (100%)
diff --git
a/patches/libgpg-error-1.45/0001-gpgrt-config-improve-pkg-config-file-parsing.patch
b/patches/libgpg-error-1.47/0001-gpgrt-config-improve-pkg-config-file-parsing.patch
similarity index 100%
rename from
patches/libgpg-error-1.45/0001-gpgrt-config-improve-pkg-config-file-parsing.patch
rename to
patches/libgpg-error-1.47/0001-gpgrt-config-improve-pkg-config-file-parsing.patch
diff --git a/patches/libgpg-error-1.45/series b/patches/libgpg-error-1.47/series
similarity index 100%
rename from patches/libgpg-error-1.45/series
rename to patches/libgpg-error-1.47/series
diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make
index 61e7e0a11990..32f1390d1774 100644
--- a/rules/libgpg-error.make
+++ b/rules/libgpg-error.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBGPG_ERROR) += libgpg-error
#
# Paths and names
#
-LIBGPG_ERROR_VERSION := 1.45
-LIBGPG_ERROR_MD5 := 3bb15e0c29d3a680db7cef15143615e1
+LIBGPG_ERROR_VERSION := 1.47
+LIBGPG_ERROR_MD5 := 58e054ca192a77226c4822bbee1b7fdb
LIBGPG_ERROR := libgpg-error-$(LIBGPG_ERROR_VERSION)
LIBGPG_ERROR_SUFFIX:= tar.bz2
LIBGPG_ERROR_URL := \
base-commit: 6c8952685f05b011c21dec645d990bad4776e6a4
--
2.43.0
[ptxdist] [PATCH 3/5] libgcrypt: version bump 1.10.1 -> 1.10.3
New option --with-libtool-modification control how local modification of libtool for Windows are handled. Signed-off-by: Bruno Thomsen --- rules/libgcrypt.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make index 1e415fd2c451..c1101d7a43ae 100644 --- a/rules/libgcrypt.make +++ b/rules/libgcrypt.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBGCRYPT) += libgcrypt # # Paths and names # -LIBGCRYPT_VERSION := 1.10.1 -LIBGCRYPT_MD5 := 8fadbe1fddafa341dce5ef3869f70e25 +LIBGCRYPT_VERSION := 1.10.3 +LIBGCRYPT_MD5 := a8cada0b343e10dbee51c9e92d856a94 LIBGCRYPT := libgcrypt-$(LIBGCRYPT_VERSION) LIBGCRYPT_SUFFIX := tar.bz2 LIBGCRYPT_URL := https://www.gnupg.org/ftp/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) -- 2.43.0
[ptxdist] [PATCH 5/5] libassuan: version bump 2.5.5 -> 2.5.6
Signed-off-by: Bruno Thomsen --- rules/libassuan.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libassuan.make b/rules/libassuan.make index f7cbd9b8674f..225cdc4997cf 100644 --- a/rules/libassuan.make +++ b/rules/libassuan.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBASSUAN) += libassuan # # Paths and names # -LIBASSUAN_VERSION := 2.5.5 -LIBASSUAN_MD5 := 7194453152bb67e3d45da698762b5d6f +LIBASSUAN_VERSION := 2.5.6 +LIBASSUAN_MD5 := 9c22e76168675ec996b9d620ffbb7b27 LIBASSUAN := libassuan-$(LIBASSUAN_VERSION) LIBASSUAN_SUFFIX := tar.bz2 LIBASSUAN_URL := https://www.gnupg.org/ftp/gcrypt/libassuan/$(LIBASSUAN).$(LIBASSUAN_SUFFIX) -- 2.43.0
[ptxdist] [PATCH 1/5] gnupg: version bump 2.3.7 -> 2.4.3
[Announce] GnuPG 2.3.8 released https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000476.html [Announce] GnuPG 2.4.0 released (silver anniversary) https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html [Announce] GnuPG 2.4.1 released https://lists.gnupg.org/pipermail/gnupg-announce/2023q2/000478.html [Announce] GnuPG 2.4.2 released https://lists.gnupg.org/pipermail/gnupg-announce/2023q2/000479.html [Announce] GnuPG 2.4.3 released https://lists.gnupg.org/pipermail/gnupg-announce/2023q3/000480.html Signed-off-by: Bruno Thomsen --- rules/gnupg.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/gnupg.make b/rules/gnupg.make index c5ec8e844d18..1a90f472f9bf 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GNUPG) += gnupg # # Paths and names # -GNUPG_VERSION := 2.3.7 -GNUPG_MD5 := 1c6a6722b9cececcf10ca4e24106e34b +GNUPG_VERSION := 2.4.3 +GNUPG_MD5 := e21ab42c629af80f19f813eeb61aa939 GNUPG := gnupg-$(GNUPG_VERSION) GNUPG_SUFFIX := tar.bz2 GNUPG_URL := \ base-commit: 6c8952685f05b011c21dec645d990bad4776e6a4 -- 2.43.0
[ptxdist] [PATCH 4/5] libksba: version bump 1.6.0 -> 1.6.5
New option --with-libtool-modification control how local modification of libtool for Windows are handled. [Announce] [CVE-2022-3515] GnuPG / Libksba Security Advisory https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000475.html Signed-off-by: Bruno Thomsen --- rules/libksba.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libksba.make b/rules/libksba.make index 631cb826f80a..853fe90abc07 100644 --- a/rules/libksba.make +++ b/rules/libksba.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBKSBA) += libksba # # Paths and names # -LIBKSBA_VERSION:= 1.6.0 -LIBKSBA_MD5:= d333b2e1381068d4f9a328240f062f0f +LIBKSBA_VERSION:= 1.6.5 +LIBKSBA_MD5:= 57b88e5d24c8705d9a3ba3832140d188 LIBKSBA:= libksba-$(LIBKSBA_VERSION) LIBKSBA_SUFFIX := tar.bz2 LIBKSBA_URL:= \ -- 2.43.0
[ptxdist] [PATCH 2/5] libgpg-error: version bump 1.45 -> 1.47
New option --enable-install-gpg-error-config to install deprecated gpg-error-config. Signed-off-by: Bruno Thomsen --- rules/libgpg-error.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make index 61e7e0a11990..32f1390d1774 100644 --- a/rules/libgpg-error.make +++ b/rules/libgpg-error.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBGPG_ERROR) += libgpg-error # # Paths and names # -LIBGPG_ERROR_VERSION := 1.45 -LIBGPG_ERROR_MD5 := 3bb15e0c29d3a680db7cef15143615e1 +LIBGPG_ERROR_VERSION := 1.47 +LIBGPG_ERROR_MD5 := 58e054ca192a77226c4822bbee1b7fdb LIBGPG_ERROR := libgpg-error-$(LIBGPG_ERROR_VERSION) LIBGPG_ERROR_SUFFIX:= tar.bz2 LIBGPG_ERROR_URL := \ -- 2.43.0
Re: [ptxdist] [PATCH] gnutls: add LGPL license text, add GPL-3.0 if built with openssl compat
Den fre. 24. nov. 2023 kl. 12.43 skrev Roland Hieber : > > ./LICENSE mentions that the openssl compat code is licensed under > GPL-3.0, and references the full license texts in doc/. > > Cc: Bruno Thomsen > Signed-off-by: Roland Hieber Reviewed-by: Bruno Thomsen Very nice way of handling the multiple licenses based on the kconfig option. /Bruno > --- > rules/gnutls.make | 8 > 1 file changed, 8 insertions(+) > > diff --git a/rules/gnutls.make b/rules/gnutls.make > index d49fbd1b17d6..35df7f76c688 100644 > --- a/rules/gnutls.make > +++ b/rules/gnutls.make > @@ -23,8 +23,16 @@ GNUTLS_SOURCE:= > $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX) > GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS) > GNUTLS_LICENSE := LGPL-3.0-or-later > GNUTLS_LICENSE_FILES := \ > + file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343 \ > file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 > > +ifdef PTXCONF_GNUTLS_OPENSSL > +GNUTLS_LICENSE += AND GPL-3.0-or-later > +GNUTLS_LICENSE_FILES += \ > + > file://extra/gnutls_openssl.c;startline=1;endline=19;md5=b8b99cb92b0fbb522912f20e3359913c > \ > + file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e > +endif > + > # > > # Prepare > # > > -- > 2.39.2 >
Re: [ptxdist] [PATCH 1/6] gnutls: add license file and hash
Den fre. 24. nov. 2023 kl. 12.31 skrev Roland Hieber : > > On Tue, Nov 14, 2023 at 12:48:02PM +0100, Bruno Thomsen wrote: > > Signed-off-by: Bruno Thomsen > > --- > > rules/gnutls.make | 18 ++ > > 1 file changed, 10 insertions(+), 8 deletions(-) > > > > diff --git a/rules/gnutls.make b/rules/gnutls.make > > index 5420fd4c2cc9..d49fbd1b17d6 100644 > > --- a/rules/gnutls.make > > +++ b/rules/gnutls.make > > @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_GNUTLS) += gnutls > > # > > # Paths and names > > # > > -GNUTLS_VERSION := 3.7.7 > > -GNUTLS_MD5 := 39e5c71af7f444bdf175094a787843a2 > > -GNUTLS := gnutls-$(GNUTLS_VERSION) > > -GNUTLS_SUFFIX:= tar.xz > > -GNUTLS_URL := > > https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/$(GNUTLS).$(GNUTLS_SUFFIX) > > -GNUTLS_SOURCE:= $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX) > > -GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS) > > -GNUTLS_LICENSE := LGPL-3.0-or-later > > +GNUTLS_VERSION := 3.7.7 > > +GNUTLS_MD5 := 39e5c71af7f444bdf175094a787843a2 > > +GNUTLS := gnutls-$(GNUTLS_VERSION) > > +GNUTLS_SUFFIX:= tar.xz > > +GNUTLS_URL := > > https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/$(GNUTLS).$(GNUTLS_SUFFIX) > > +GNUTLS_SOURCE:= $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX) > > +GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS) > > +GNUTLS_LICENSE := LGPL-3.0-or-later > > +GNUTLS_LICENSE_FILES := \ > > + file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 > > The LICENSE only references the LGPL, which is included at > doc/COPYING.LESSER. Please also always include the actual license text > in the md5sum. I'll send a separate patch for this. Hi Roland, Thanks for spotting the missing license files. Yes, I am trying to add the actual license text and hash in the patches I have been sending lately. /Bruno > > - Roland > > > > > # > > > > # Prepare > > > > base-commit: 1b6013c068b10a19c116be915cc4fe910ee29b13 > > -- > > 2.41.0 > > > > > > > > -- > Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | > Steuerwalder Str. 21 | https://www.pengutronix.de/ | > 31137 Hildesheim, Germany| Phone: +49-5121-206917-0| > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH 8/8] python3-ply: update license
Hi, Please drop patch 8 as I mixed up python3-ply and ply. /Bruno On Sun, 19 Nov 2023, 21.09 Bruno Thomsen, wrote: > License was incorrectly marked as GPL but it was BSD. > Add license from README.md file and hash. > > Signed-off-by: Bruno Thomsen > --- > rules/ply.make | 18 ++ > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/rules/ply.make b/rules/ply.make > index 336f1a98e137..ba0ee14c277c 100644 > --- a/rules/ply.make > +++ b/rules/ply.make > @@ -16,14 +16,16 @@ endif > # > # Paths and names > # > -PLY_VERSION:= 2.1.0 > -PLY_MD5:= cd7b5258d636db5d330f45ec858f9a5c > -PLY:= ply-$(PLY_VERSION) > -PLY_SUFFIX := tar.gz > -PLY_URL:= > https://github.com/wkz/ply/releases/download/$(PLY_VERSION)/$(PLY).$(PLY_SUFFIX) > -PLY_SOURCE > <https://github.com/wkz/ply/releases/download/$(PLY_VERSION)/$(PLY).$(PLY_SUFFIX)-PLY_SOURCE> >:= $(SRCDIR)/$(PLY).$(PLY_SUFFIX) > -PLY_DIR:= $(BUILDDIR)/$(PLY) > -PLY_LICENSE:= GPL-2.0-only > +PLY_VERSION:= 2.1.0 > +PLY_MD5:= cd7b5258d636db5d330f45ec858f9a5c > +PLY:= ply-$(PLY_VERSION) > +PLY_SUFFIX := tar.gz > +PLY_URL:= > https://github.com/wkz/ply/releases/download/$(PLY_VERSION)/$(PLY).$(PLY_SUFFIX) > +PLY_SOURCE := $(SRCDIR)/$(PLY).$(PLY_SUFFIX) > +PLY_DIR:= $(BUILDDIR)/$(PLY) > +PLY_LICENSE:= BSD-3-Clause > +PLY_LICENSE_FILES := \ > + > file://README.md;startline=5;endline=32;md5=f5ee5c355c0e6719c787a71b8f0fa96c > > # > > # Prepare > -- > 2.41.0 > >
[ptxdist] [PATCH 8/8] python3-ply: update license
License was incorrectly marked as GPL but it was BSD. Add license from README.md file and hash. Signed-off-by: Bruno Thomsen --- rules/ply.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/ply.make b/rules/ply.make index 336f1a98e137..ba0ee14c277c 100644 --- a/rules/ply.make +++ b/rules/ply.make @@ -16,14 +16,16 @@ endif # # Paths and names # -PLY_VERSION:= 2.1.0 -PLY_MD5:= cd7b5258d636db5d330f45ec858f9a5c -PLY:= ply-$(PLY_VERSION) -PLY_SUFFIX := tar.gz -PLY_URL:= https://github.com/wkz/ply/releases/download/$(PLY_VERSION)/$(PLY).$(PLY_SUFFIX) -PLY_SOURCE := $(SRCDIR)/$(PLY).$(PLY_SUFFIX) -PLY_DIR:= $(BUILDDIR)/$(PLY) -PLY_LICENSE:= GPL-2.0-only +PLY_VERSION:= 2.1.0 +PLY_MD5:= cd7b5258d636db5d330f45ec858f9a5c +PLY:= ply-$(PLY_VERSION) +PLY_SUFFIX := tar.gz +PLY_URL:= https://github.com/wkz/ply/releases/download/$(PLY_VERSION)/$(PLY).$(PLY_SUFFIX) +PLY_SOURCE := $(SRCDIR)/$(PLY).$(PLY_SUFFIX) +PLY_DIR:= $(BUILDDIR)/$(PLY) +PLY_LICENSE:= BSD-3-Clause +PLY_LICENSE_FILES := \ + file://README.md;startline=5;endline=32;md5=f5ee5c355c0e6719c787a71b8f0fa96c # # Prepare -- 2.41.0
[ptxdist] [PATCH 7/8] p11-kit: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/p11-kit.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/p11-kit.make b/rules/p11-kit.make index 9e877ee51ef5..bae849ad145a 100644 --- a/rules/p11-kit.make +++ b/rules/p11-kit.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_P11_KIT) += p11-kit # # Paths and names # -P11_KIT_VERSION:= 0.23.15 -P11_KIT_MD5:= c4c3eecfe6bd6e62e436f62b51980749 -P11_KIT:= p11-kit-$(P11_KIT_VERSION) -P11_KIT_SUFFIX := tar.gz -P11_KIT_URL:= https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION)/$(P11_KIT).$(P11_KIT_SUFFIX) -P11_KIT_SOURCE := $(SRCDIR)/$(P11_KIT).$(P11_KIT_SUFFIX) -P11_KIT_DIR:= $(BUILDDIR)/$(P11_KIT) -P11_KIT_LICENSE:= BSD-3-Clause +P11_KIT_VERSION:= 0.23.15 +P11_KIT_MD5:= c4c3eecfe6bd6e62e436f62b51980749 +P11_KIT:= p11-kit-$(P11_KIT_VERSION) +P11_KIT_SUFFIX := tar.gz +P11_KIT_URL:= https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION)/$(P11_KIT).$(P11_KIT_SUFFIX) +P11_KIT_SOURCE := $(SRCDIR)/$(P11_KIT).$(P11_KIT_SUFFIX) +P11_KIT_DIR:= $(BUILDDIR)/$(P11_KIT) +P11_KIT_LICENSE:= BSD-3-Clause +P11_KIT_LICENSE_FILES := \ + file://COPYING;md5=02933887f609807fbb57aa4237d14a50 # # autoconf -- 2.41.0
[ptxdist] [PATCH 6/8] libseccomp: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/libseccomp.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/libseccomp.make b/rules/libseccomp.make index b3b99c189627..b7ad65dfa5cb 100644 --- a/rules/libseccomp.make +++ b/rules/libseccomp.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_LIBSECCOMP) += libseccomp # # Paths and names # -LIBSECCOMP_VERSION := 2.5.4 -LIBSECCOMP_MD5 := 74008bb33234e0c2a0d998e7bee5c625 -LIBSECCOMP := libseccomp-$(LIBSECCOMP_VERSION) -LIBSECCOMP_SUFFIX := tar.gz -LIBSECCOMP_URL := https://github.com/seccomp/libseccomp/releases/download/v$(LIBSECCOMP_VERSION)/$(LIBSECCOMP).$(LIBSECCOMP_SUFFIX) -LIBSECCOMP_SOURCE := $(SRCDIR)/$(LIBSECCOMP).$(LIBSECCOMP_SUFFIX) -LIBSECCOMP_DIR := $(BUILDDIR)/$(LIBSECCOMP) -LIBSECCOMP_LICENSE := LGPL-2.1-only +LIBSECCOMP_VERSION := 2.5.4 +LIBSECCOMP_MD5 := 74008bb33234e0c2a0d998e7bee5c625 +LIBSECCOMP := libseccomp-$(LIBSECCOMP_VERSION) +LIBSECCOMP_SUFFIX := tar.gz +LIBSECCOMP_URL := https://github.com/seccomp/libseccomp/releases/download/v$(LIBSECCOMP_VERSION)/$(LIBSECCOMP).$(LIBSECCOMP_SUFFIX) +LIBSECCOMP_SOURCE := $(SRCDIR)/$(LIBSECCOMP).$(LIBSECCOMP_SUFFIX) +LIBSECCOMP_DIR := $(BUILDDIR)/$(LIBSECCOMP) +LIBSECCOMP_LICENSE := LGPL-2.1-only +LIBSECCOMP_LICENSE_FILES := \ + file://LICENSE;md5=7c13b3376cea0ce68d2d2da0a1b3a72c # # Prepare -- 2.41.0
[ptxdist] [PATCH 5/8] libp11: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/libp11.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/libp11.make b/rules/libp11.make index 1cc0cef9c628..7c041f352ef2 100644 --- a/rules/libp11.make +++ b/rules/libp11.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_LIBP11) += libp11 # # Paths and names # -LIBP11_VERSION := 0.4.11 -LIBP11_MD5 := 8b907abd572b0eb8e63413549f68dbe1 -LIBP11 := libp11-$(LIBP11_VERSION) -LIBP11_SUFFIX := tar.gz -LIBP11_URL := https://github.com/OpenSC/libp11/releases/download/$(LIBP11)/$(LIBP11).$(LIBP11_SUFFIX) -LIBP11_SOURCE := $(SRCDIR)/$(LIBP11).$(LIBP11_SUFFIX) -LIBP11_DIR := $(BUILDDIR)/$(LIBP11) -LIBP11_LICENSE := LGPL-2.1-only +LIBP11_VERSION := 0.4.11 +LIBP11_MD5 := 8b907abd572b0eb8e63413549f68dbe1 +LIBP11 := libp11-$(LIBP11_VERSION) +LIBP11_SUFFIX := tar.gz +LIBP11_URL := https://github.com/OpenSC/libp11/releases/download/$(LIBP11)/$(LIBP11).$(LIBP11_SUFFIX) +LIBP11_SOURCE := $(SRCDIR)/$(LIBP11).$(LIBP11_SUFFIX) +LIBP11_DIR := $(BUILDDIR)/$(LIBP11) +LIBP11_LICENSE := LGPL-2.1-only +LIBP11_LICENSE_FILES := \ + file://COPYING;md5=fad9b3332be894bab9bc501572864b29 # # autoconf -- 2.41.0
[ptxdist] [PATCH 4/8] libndp: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/libndp.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/libndp.make b/rules/libndp.make index 1711c508c1ab..47cb268f121b 100644 --- a/rules/libndp.make +++ b/rules/libndp.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_LIBNDP) += libndp # # Paths and names # -LIBNDP_VERSION := 1.7 -LIBNDP_MD5 := ea4a2a3351991c1d561623772364ae14 -LIBNDP := libndp-$(LIBNDP_VERSION) -LIBNDP_SUFFIX := tar.gz -LIBNDP_URL := http://libndp.org/files/$(LIBNDP).$(LIBNDP_SUFFIX) -LIBNDP_SOURCE := $(SRCDIR)/$(LIBNDP).$(LIBNDP_SUFFIX) -LIBNDP_DIR := $(BUILDDIR)/$(LIBNDP) -LIBNDP_LICENSE := LGPL-2.1-only +LIBNDP_VERSION := 1.7 +LIBNDP_MD5 := ea4a2a3351991c1d561623772364ae14 +LIBNDP := libndp-$(LIBNDP_VERSION) +LIBNDP_SUFFIX := tar.gz +LIBNDP_URL := http://libndp.org/files/$(LIBNDP).$(LIBNDP_SUFFIX) +LIBNDP_SOURCE := $(SRCDIR)/$(LIBNDP).$(LIBNDP_SUFFIX) +LIBNDP_DIR := $(BUILDDIR)/$(LIBNDP) +LIBNDP_LICENSE := LGPL-2.1-only +LIBNDP_LICENSE_FILES := \ + file://COPYING;md5=4fbd65380cdd255951079008b364516c # # Prepare -- 2.41.0
[ptxdist] [PATCH 3/8] libmbim: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/libmbim.make | 19 +++ 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/rules/libmbim.make b/rules/libmbim.make index 60bc05a37501..4ac026dcd004 100644 --- a/rules/libmbim.make +++ b/rules/libmbim.make @@ -14,14 +14,17 @@ PACKAGES-$(PTXCONF_LIBMBIM) += libmbim # # Paths and names # -LIBMBIM_VERSION:= 1.30.0 -LIBMBIM_MD5:= dcfb85bd4338f0aa8a851d5d80d123f7 -LIBMBIM:= libmbim-$(LIBMBIM_VERSION) -LIBMBIM_SUFFIX := tar.bz2 -LIBMBIM_URL:= https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION)/$(LIBMBIM).$(LIBMBIM_SUFFIX) -LIBMBIM_SOURCE := $(SRCDIR)/$(LIBMBIM).$(LIBMBIM_SUFFIX) -LIBMBIM_DIR:= $(BUILDDIR)/$(LIBMBIM) -LIBMBIM_LICENSE:= GPL-2.0-or-later AND LGPL-2.1-or-later +LIBMBIM_VERSION:= 1.30.0 +LIBMBIM_MD5:= dcfb85bd4338f0aa8a851d5d80d123f7 +LIBMBIM:= libmbim-$(LIBMBIM_VERSION) +LIBMBIM_SUFFIX := tar.bz2 +LIBMBIM_URL:= https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION)/$(LIBMBIM).$(LIBMBIM_SUFFIX) +LIBMBIM_SOURCE := $(SRCDIR)/$(LIBMBIM).$(LIBMBIM_SUFFIX) +LIBMBIM_DIR:= $(BUILDDIR)/$(LIBMBIM) +LIBMBIM_LICENSE:= GPL-2.0-or-later AND LGPL-2.1-or-later +LIBMBIM_LICENSE_FILES := \ + file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSES/LGPL-2.1-or-later.txt;md5=4fbd65380cdd255951079008b364516c # # Prepare -- 2.41.0
[ptxdist] [PATCH 2/8] libffi: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/libffi.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/libffi.make b/rules/libffi.make index af8d6226131e..064f89f0e970 100644 --- a/rules/libffi.make +++ b/rules/libffi.make @@ -15,16 +15,18 @@ PACKAGES-$(PTXCONF_LIBFFI) += libffi # # Paths and names # -LIBFFI_VERSION := 3.4.4 -LIBFFI_MD5 := 0da1a5ed7786ac12dcbaf0d499d8a049 -LIBFFI := libffi-$(LIBFFI_VERSION) -LIBFFI_SUFFIX := tar.gz -LIBFFI_SOURCE := $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX) -LIBFFI_DIR := $(BUILDDIR)/$(LIBFFI) -LIBFFI_URL := \ +LIBFFI_VERSION := 3.4.4 +LIBFFI_MD5 := 0da1a5ed7786ac12dcbaf0d499d8a049 +LIBFFI := libffi-$(LIBFFI_VERSION) +LIBFFI_SUFFIX := tar.gz +LIBFFI_SOURCE := $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX) +LIBFFI_DIR := $(BUILDDIR)/$(LIBFFI) +LIBFFI_URL := \ https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION)/$(LIBFFI).$(LIBFFI_SUFFIX) \ ftp://sourceware.org/pub/libffi/$(LIBFFI).$(LIBFFI_SUFFIX) -LIBFFI_LICENSE := MIT +LIBFFI_LICENSE := MIT +LIBFFI_LICENSE_FILES := \ + file://LICENSE;md5=32c0d09a0641daf4903e5d61cc8f23a8 # # Prepare -- 2.41.0
[ptxdist] [PATCH 1/8] libestr: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/libestr.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/libestr.make b/rules/libestr.make index ea2c572d1670..10e32f19bd83 100644 --- a/rules/libestr.make +++ b/rules/libestr.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_LIBESTR) += libestr # # Paths and names # -LIBESTR_VERSION:= 0.1.10 -LIBESTR_MD5:= f4c9165a23587e77f7efe65d676d5e8e -LIBESTR:= libestr-$(LIBESTR_VERSION) -LIBESTR_SUFFIX := tar.gz -LIBESTR_URL:= http://libestr.adiscon.com/files/download/$(LIBESTR).$(LIBESTR_SUFFIX) -LIBESTR_SOURCE := $(SRCDIR)/$(LIBESTR).$(LIBESTR_SUFFIX) -LIBESTR_DIR:= $(BUILDDIR)/$(LIBESTR) -LIBESTR_LICENSE:= LGPL-2.1-or-later +LIBESTR_VERSION:= 0.1.10 +LIBESTR_MD5:= f4c9165a23587e77f7efe65d676d5e8e +LIBESTR:= libestr-$(LIBESTR_VERSION) +LIBESTR_SUFFIX := tar.gz +LIBESTR_URL:= http://libestr.adiscon.com/files/download/$(LIBESTR).$(LIBESTR_SUFFIX) +LIBESTR_SOURCE := $(SRCDIR)/$(LIBESTR).$(LIBESTR_SUFFIX) +LIBESTR_DIR:= $(BUILDDIR)/$(LIBESTR) +LIBESTR_LICENSE:= LGPL-2.1-or-later +LIBESTR_LICENSE_FILES := \ + file://COPYING;md5=9d6c993486c18262afba4ca5bcb894d0 # # Prepare base-commit: e7f5f3ccdf200fc715c1cb7e8cbed17e7cf3bbca -- 2.41.0
[ptxdist] [PATCH 6/6] json-glib: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/json-glib.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/json-glib.make b/rules/json-glib.make index d36edc7d2cf6..0a3c7e6bb105 100644 --- a/rules/json-glib.make +++ b/rules/json-glib.make @@ -22,6 +22,8 @@ JSON_GLIB_URL := $(call ptx/mirror, GNOME, json-glib/$(basename $(JSON_GLIB_VER JSON_GLIB_SOURCE := $(SRCDIR)/$(JSON_GLIB).$(JSON_GLIB_SUFFIX) JSON_GLIB_DIR := $(BUILDDIR)/$(JSON_GLIB) JSON_GLIB_LICENSE := LGPL-2.1-only +JSON_GLIB_LICENSE_FILES:= \ + file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 # # Prepare -- 2.41.0
[ptxdist] [PATCH 5/6] libfastjson: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/libfastjson.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/libfastjson.make b/rules/libfastjson.make index 0d1ec5a1c7be..34a918c16217 100644 --- a/rules/libfastjson.make +++ b/rules/libfastjson.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_LIBFASTJSON) += libfastjson # # Paths and names # -LIBFASTJSON_VERSION:= 0.99.8 -LIBFASTJSON_MD5:= 730713ad1d851def7ac8898f751bbfdd -LIBFASTJSON:= libfastjson-$(LIBFASTJSON_VERSION) -LIBFASTJSON_SUFFIX := tar.gz -LIBFASTJSON_URL:= https://codeload.github.com/rsyslog/libfastjson/$(LIBFASTJSON_SUFFIX)/v$(LIBFASTJSON_VERSION) -LIBFASTJSON_SOURCE := $(SRCDIR)/$(LIBFASTJSON).$(LIBFASTJSON_SUFFIX) -LIBFASTJSON_DIR:= $(BUILDDIR)/$(LIBFASTJSON) -LIBFASTJSON_LICENSE:= MIT +LIBFASTJSON_VERSION:= 0.99.8 +LIBFASTJSON_MD5:= 730713ad1d851def7ac8898f751bbfdd +LIBFASTJSON:= libfastjson-$(LIBFASTJSON_VERSION) +LIBFASTJSON_SUFFIX := tar.gz +LIBFASTJSON_URL:= https://codeload.github.com/rsyslog/libfastjson/$(LIBFASTJSON_SUFFIX)/v$(LIBFASTJSON_VERSION) +LIBFASTJSON_SOURCE := $(SRCDIR)/$(LIBFASTJSON).$(LIBFASTJSON_SUFFIX) +LIBFASTJSON_DIR:= $(BUILDDIR)/$(LIBFASTJSON) +LIBFASTJSON_LICENSE:= MIT +LIBFASTJSON_LICENSE_FILES := \ + file://COPYING;md5=a958bb07122368f3e1d9b2efe07d231f # # Prepare -- 2.41.0
[ptxdist] [PATCH 4/6] iptables: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/iptables.make | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rules/iptables.make b/rules/iptables.make index 1444d6d10f2c..580edc3046ce 100644 --- a/rules/iptables.make +++ b/rules/iptables.make @@ -27,6 +27,8 @@ IPTABLES_URL := http://ftp.netfilter.org/pub/iptables/$(IPTABLES).$(IPTABLES_SU IPTABLES_SOURCE:= $(SRCDIR)/$(IPTABLES).$(IPTABLES_SUFFIX) IPTABLES_DIR := $(BUILDDIR)/$(IPTABLES) IPTABLES_LICENSE := GPL-2.0-only +IPTABLES_LICENSE_FILES := \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 # # Prepare -- 2.41.0
[ptxdist] [PATCH 3/6] htop: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/htop.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/htop.make b/rules/htop.make index 06c64718fa9a..98d6bbfdf39c 100644 --- a/rules/htop.make +++ b/rules/htop.make @@ -15,14 +15,16 @@ PACKAGES-$(PTXCONF_HTOP) += htop # # Paths and names # -HTOP_VERSION := 3.0.1 -HTOP_MD5 := c09908bacb5e22454715547aed88c3af -HTOP := htop-$(HTOP_VERSION) -HTOP_SUFFIX:= tar.gz -HTOP_URL := https://github.com/htop-dev/htop/archive/$(HTOP_VERSION).$(HTOP_SUFFIX) -HTOP_SOURCE:= $(SRCDIR)/$(HTOP).$(HTOP_SUFFIX) -HTOP_DIR := $(BUILDDIR)/$(HTOP) -HTOP_LICENSE := GPL-2.0-only +HTOP_VERSION := 3.0.1 +HTOP_MD5 := c09908bacb5e22454715547aed88c3af +HTOP := htop-$(HTOP_VERSION) +HTOP_SUFFIX:= tar.gz +HTOP_URL := https://github.com/htop-dev/htop/archive/$(HTOP_VERSION).$(HTOP_SUFFIX) +HTOP_SOURCE:= $(SRCDIR)/$(HTOP).$(HTOP_SUFFIX) +HTOP_DIR := $(BUILDDIR)/$(HTOP) +HTOP_LICENSE := GPL-2.0-only +HTOP_LICENSE_FILES := \ + file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891 # # Prepare -- 2.41.0
[ptxdist] [PATCH 2/6] grep: add license information
Add license information based on COPYING and web page, including license file and hash. Licensing from web page[1]: Grep is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. [1] https://www.gnu.org/software/grep/ Signed-off-by: Bruno Thomsen --- rules/grep.make | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/rules/grep.make b/rules/grep.make index 7c6280a33368..a1dc4eb716a2 100644 --- a/rules/grep.make +++ b/rules/grep.make @@ -15,13 +15,16 @@ PACKAGES-$(PTXCONF_GREP) += grep # # Paths and names # -GREP_VERSION := 3.8 -GREP_MD5 := dc6e4d18d4659e6e7552fc4a183c8ac9 -GREP := grep-$(GREP_VERSION) -GREP_SUFFIX:= tar.xz -GREP_URL := $(call ptx/mirror, GNU, grep/$(GREP).$(GREP_SUFFIX)) -GREP_SOURCE:= $(SRCDIR)/$(GREP).$(GREP_SUFFIX) -GREP_DIR := $(BUILDDIR)/$(GREP) +GREP_VERSION := 3.8 +GREP_MD5 := dc6e4d18d4659e6e7552fc4a183c8ac9 +GREP := grep-$(GREP_VERSION) +GREP_SUFFIX:= tar.xz +GREP_URL := $(call ptx/mirror, GNU, grep/$(GREP).$(GREP_SUFFIX)) +GREP_SOURCE:= $(SRCDIR)/$(GREP).$(GREP_SUFFIX) +GREP_DIR := $(BUILDDIR)/$(GREP) +GREP_LICENSE := GPL-3.0-or-later +GREP_LICENSE_FILES := \ + file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 # # Prepare -- 2.41.0
[ptxdist] [PATCH 1/6] gnutls: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/gnutls.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/gnutls.make b/rules/gnutls.make index 5420fd4c2cc9..d49fbd1b17d6 100644 --- a/rules/gnutls.make +++ b/rules/gnutls.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_GNUTLS) += gnutls # # Paths and names # -GNUTLS_VERSION := 3.7.7 -GNUTLS_MD5 := 39e5c71af7f444bdf175094a787843a2 -GNUTLS := gnutls-$(GNUTLS_VERSION) -GNUTLS_SUFFIX := tar.xz -GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/$(GNUTLS).$(GNUTLS_SUFFIX) -GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX) -GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS) -GNUTLS_LICENSE := LGPL-3.0-or-later +GNUTLS_VERSION := 3.7.7 +GNUTLS_MD5 := 39e5c71af7f444bdf175094a787843a2 +GNUTLS := gnutls-$(GNUTLS_VERSION) +GNUTLS_SUFFIX := tar.xz +GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/$(GNUTLS).$(GNUTLS_SUFFIX) +GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX) +GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS) +GNUTLS_LICENSE := LGPL-3.0-or-later +GNUTLS_LICENSE_FILES := \ + file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 # # Prepare base-commit: 1b6013c068b10a19c116be915cc4fe910ee29b13 -- 2.41.0
[ptxdist] [PATCH] rauc: add license file and hash
Signed-off-by: Bruno Thomsen --- rules/rauc.make | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rules/rauc.make b/rules/rauc.make index 0f71f12edef0..f8ee618923d5 100644 --- a/rules/rauc.make +++ b/rules/rauc.make @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_RAUC) += rauc # # Paths and names # -RAUC_VERSION := 1.10.1 -RAUC_MD5 := 610621cc062d2fba41754335c7faee35 -RAUC := rauc-$(RAUC_VERSION) -RAUC_SUFFIX:= tar.xz -RAUC_URL := https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX) -RAUC_SOURCE:= $(SRCDIR)/$(RAUC)-meson.$(RAUC_SUFFIX) -RAUC_DIR := $(BUILDDIR)/$(RAUC) -RAUC_LICENSE := LGPL-2.1-only +RAUC_VERSION := 1.10.1 +RAUC_MD5 := 610621cc062d2fba41754335c7faee35 +RAUC := rauc-$(RAUC_VERSION) +RAUC_SUFFIX:= tar.xz +RAUC_URL := https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX) +RAUC_SOURCE:= $(SRCDIR)/$(RAUC)-meson.$(RAUC_SUFFIX) +RAUC_DIR := $(BUILDDIR)/$(RAUC) +RAUC_LICENSE := LGPL-2.1-only +RAUC_LICENSE_FILES := \ + file://COPYING;md5=4fbd65380cdd255951079008b364516c # # Prepare base-commit: a7d876d7f095a2ba80a7ccc24eb7ce9690ed0792 -- 2.41.0
[ptxdist] [PATCH] dbus: update license info
Update license based on information in the COPYING file. Add hashes of license files. Signed-off-by: Bruno Thomsen --- rules/dbus.make | 21 + 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/rules/dbus.make b/rules/dbus.make index a1b68a5a3afb..fca1f57faa2f 100644 --- a/rules/dbus.make +++ b/rules/dbus.make @@ -16,14 +16,19 @@ PACKAGES-$(PTXCONF_DBUS) += dbus # # Paths and names # -DBUS_VERSION := 1.15.8 -DBUS_MD5 := 66a38f65320762e0734340fb6facdcce -DBUS := dbus-$(DBUS_VERSION) -DBUS_SUFFIX:= tar.xz -DBUS_URL := https://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX) -DBUS_SOURCE:= $(SRCDIR)/$(DBUS).$(DBUS_SUFFIX) -DBUS_DIR := $(BUILDDIR)/$(DBUS) -DBUS_LICENSE := AFL-2.1 AND GPL-2.0-or-later +DBUS_VERSION := 1.15.8 +DBUS_MD5 := 66a38f65320762e0734340fb6facdcce +DBUS := dbus-$(DBUS_VERSION) +DBUS_SUFFIX:= tar.xz +DBUS_URL := https://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX) +DBUS_SOURCE:= $(SRCDIR)/$(DBUS).$(DBUS_SUFFIX) +DBUS_DIR := $(BUILDDIR)/$(DBUS) +DBUS_LICENSE := (AFL-2.1 OR GPL-2.0-or-later) AND MIT +DBUS_LICENSE_FILES := \ + file://COPYING;md5=eb0ffc69a965797a3d6686baa153ef05 \ + file://LICENSES/AFL-2.1.txt;md5=f3ad2f482ec639b440413665cfb9e714 \ + file://LICENSES/GPL-2.0-or-later.txt;md5=3d26203303a722dedc6bf909d95ba815 \ + file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 # # Prepare base-commit: cae7daaa8850c4d952427fac5bcf4d8ffc553226 -- 2.41.0
[ptxdist] [PATCH] cryptsetup: update license info
Add hash of license files and include "AND LGPL-2.0-or-later". License was clarified back in v1.5.1 release note: * Cryptsetup and libcryptsetup is now released under GPLv2+ (GPL version 2 or any later). Some internal code handling files (loopaes, verity, tcrypt and crypto backend wrapper) are LGPLv2+. Previously code was GPL version 2 only. Signed-off-by: Bruno Thomsen --- rules/cryptsetup.make | 19 +++ 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make index aacf7e138259..6e14cab8a67d 100644 --- a/rules/cryptsetup.make +++ b/rules/cryptsetup.make @@ -14,14 +14,17 @@ PACKAGES-$(PTXCONF_CRYPTSETUP) += cryptsetup # # Paths and names # -CRYPTSETUP_VERSION := 2.6.0 -CRYPTSETUP_MD5 := 8b67da403a2515dc75d40c42e8196e4e -CRYPTSETUP := cryptsetup-$(CRYPTSETUP_VERSION) -CRYPTSETUP_SUFFIX := tar.xz -CRYPTSETUP_URL := https://www.kernel.org/pub/linux/utils/cryptsetup/v$(basename $(CRYPTSETUP_VERSION))/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX) -CRYPTSETUP_SOURCE := $(SRCDIR)/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX) -CRYPTSETUP_DIR := $(BUILDDIR)/$(CRYPTSETUP) -CRYPTSETUP_LICENSE := GPL-2.0-or-later +CRYPTSETUP_VERSION := 2.6.0 +CRYPTSETUP_MD5 := 8b67da403a2515dc75d40c42e8196e4e +CRYPTSETUP := cryptsetup-$(CRYPTSETUP_VERSION) +CRYPTSETUP_SUFFIX := tar.xz +CRYPTSETUP_URL := https://www.kernel.org/pub/linux/utils/cryptsetup/v$(basename $(CRYPTSETUP_VERSION))/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX) +CRYPTSETUP_SOURCE := $(SRCDIR)/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX) +CRYPTSETUP_DIR := $(BUILDDIR)/$(CRYPTSETUP) +CRYPTSETUP_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later +CRYPTSETUP_LICENSE_FILES := \ + file://COPYING;md5=32107dd283b1dfeb66c9b3e6be312326 \ + file://COPYING.LGPL;md5=1960515788100ce5f9c98ea78a65dc52 # # Prepare base-commit: cae7daaa8850c4d952427fac5bcf4d8ffc553226 -- 2.41.0
[ptxdist] [PATCH] zstd: update license info
Add hash of license files and include "OR GPL-2.0-only". README.md states that zstd is dual licensed: This repository represents the reference implementation, provided as an open-source dual BSD OR GPLv2 licensed C library, and a command line utility producing and decoding .zst, .gz, .xz and .lz4 files. Signed-off-by: Bruno Thomsen --- rules/zstd.make | 21 - 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/rules/zstd.make b/rules/zstd.make index 88747d984df3..6310cc4fc9ef 100644 --- a/rules/zstd.make +++ b/rules/zstd.make @@ -14,15 +14,18 @@ PACKAGES-$(PTXCONF_ZSTD) += zstd # # Paths and names # -ZSTD_VERSION := 1.5.5 -ZSTD_MD5 := 4ff0ee1965ab161bc55be7c9dcd1f7f9 -ZSTD := zstd-$(ZSTD_VERSION) -ZSTD_SUFFIX:= tar.gz -ZSTD_URL := https://github.com/facebook/zstd/archive/v$(ZSTD_VERSION).$(ZSTD_SUFFIX) -ZSTD_SOURCE:= $(SRCDIR)/$(ZSTD).$(ZSTD_SUFFIX) -ZSTD_DIR := $(BUILDDIR)/$(ZSTD) -ZSTD_SUBDIR:= build/cmake -ZSTD_LICENSE := BSD-3-clause +ZSTD_VERSION := 1.5.5 +ZSTD_MD5 := 4ff0ee1965ab161bc55be7c9dcd1f7f9 +ZSTD := zstd-$(ZSTD_VERSION) +ZSTD_SUFFIX:= tar.gz +ZSTD_URL := https://github.com/facebook/zstd/archive/v$(ZSTD_VERSION).$(ZSTD_SUFFIX) +ZSTD_SOURCE:= $(SRCDIR)/$(ZSTD).$(ZSTD_SUFFIX) +ZSTD_DIR := $(BUILDDIR)/$(ZSTD) +ZSTD_SUBDIR:= build/cmake +ZSTD_LICENSE := BSD-3-clause OR GPL-2.0-only +ZSTD_LICENSE_FILES := \ + file://LICENSE;md5=0822a32f7acdbe013606746641746ee8 \ + file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0 # # Prepare base-commit: cae7daaa8850c4d952427fac5bcf4d8ffc553226 -- 2.41.0
[ptxdist] [PATCH 3/3] expat: add license file and md5 hash
Update indentation in section with paths and names. Signed-off-by: Bruno Thomsen --- Use "git show --ignore-space-change" to see real change and ignore indentation change. rules/expat.make | 20 +++- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/rules/expat.make b/rules/expat.make index c7388085f..d12144458 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -16,15 +16,17 @@ PACKAGES-$(PTXCONF_EXPAT) += expat # # Paths and names # -EXPAT_VERSION := 2.5.0 -EXPAT_MD5 := 5e9974d422dc4b157f300568ad28ebf6 -EXPAT := expat-$(EXPAT_VERSION) -EXPAT_SUFFIX := tar.bz2 -EXPAT_RELEASE := R_$(subst .,_,$(EXPAT_VERSION)) -EXPAT_URL := https://github.com/libexpat/libexpat/releases/download/$(EXPAT_RELEASE)/$(EXPAT).$(EXPAT_SUFFIX) -EXPAT_SOURCE := $(SRCDIR)/$(EXPAT).$(EXPAT_SUFFIX) -EXPAT_DIR := $(BUILDDIR)/$(EXPAT) -EXPAT_LICENSE := MIT +EXPAT_VERSION := 2.5.0 +EXPAT_MD5 := 5e9974d422dc4b157f300568ad28ebf6 +EXPAT := expat-$(EXPAT_VERSION) +EXPAT_SUFFIX := tar.bz2 +EXPAT_RELEASE := R_$(subst .,_,$(EXPAT_VERSION)) +EXPAT_URL := https://github.com/libexpat/libexpat/releases/download/$(EXPAT_RELEASE)/$(EXPAT).$(EXPAT_SUFFIX) +EXPAT_SOURCE := $(SRCDIR)/$(EXPAT).$(EXPAT_SUFFIX) +EXPAT_DIR := $(BUILDDIR)/$(EXPAT) +EXPAT_LICENSE := MIT +EXPAT_LICENSE_FILES:= \ + file://COPYING;md5=7b3b078238d0901d3b339289117cb7fb # # Prepare -- 2.41.0
[ptxdist] [PATCH 2/3] expat: update URL
According to the sourceforge project page[1] the upstream URL has been moved to github[2]. EXPAT_RELEASE contains release name ex. 2.5.0 = R_2_5_0 [1] https://sourceforge.net/projects/expat/ [2] https://github.com/libexpat/libexpat Signed-off-by: Bruno Thomsen --- rules/expat.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/expat.make b/rules/expat.make index ad873a260..c7388085f 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -20,7 +20,8 @@ EXPAT_VERSION := 2.5.0 EXPAT_MD5 := 5e9974d422dc4b157f300568ad28ebf6 EXPAT := expat-$(EXPAT_VERSION) EXPAT_SUFFIX := tar.bz2 -EXPAT_URL := $(call ptx/mirror, SF, expat/$(EXPAT).$(EXPAT_SUFFIX)) +EXPAT_RELEASE := R_$(subst .,_,$(EXPAT_VERSION)) +EXPAT_URL := https://github.com/libexpat/libexpat/releases/download/$(EXPAT_RELEASE)/$(EXPAT).$(EXPAT_SUFFIX) EXPAT_SOURCE := $(SRCDIR)/$(EXPAT).$(EXPAT_SUFFIX) EXPAT_DIR := $(BUILDDIR)/$(EXPAT) EXPAT_LICENSE := MIT -- 2.41.0
[ptxdist] [PATCH 1/3] sudo: update URL
Update URL from http to https as it returns 301 Moved Permanently. Download log: --2023-07-22 14:34:38-- http://www.sudo.ws/sudo/dist/sudo-1.9.12p2.tar.gz Resolving www.sudo.ws (www.sudo.ws)... 104.26.12.121, 172.67.72.152, 104.26.13.121, ... Connecting to www.sudo.ws (www.sudo.ws)|104.26.12.121|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://www.sudo.ws/sudo/dist/sudo-1.9.12p2.tar.gz [following] --2023-07-22 14:34:38-- https://www.sudo.ws/sudo/dist/sudo-1.9.12p2.tar.gz Connecting to www.sudo.ws (www.sudo.ws)|104.26.12.121|:443... connected. HTTP request sent, awaiting response... 200 OK Signed-off-by: Bruno Thomsen --- rules/sudo.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/sudo.make b/rules/sudo.make index 03281394c..8a655d942 100644 --- a/rules/sudo.make +++ b/rules/sudo.make @@ -20,8 +20,8 @@ SUDO_MD5 := 4cc21cf7c9a89290b230954aed0d1e11 SUDO := sudo-$(SUDO_VERSION) SUDO_SUFFIX:= tar.gz SUDO_URL := \ - http://www.sudo.ws/sudo/dist/$(SUDO).$(SUDO_SUFFIX) \ - http://www.sudo.ws/sudo/dist/OLD/$(SUDO).$(SUDO_SUFFIX) + https://www.sudo.ws/sudo/dist/$(SUDO).$(SUDO_SUFFIX) \ + https://www.sudo.ws/sudo/dist/OLD/$(SUDO).$(SUDO_SUFFIX) SUDO_SOURCE:= $(SRCDIR)/$(SUDO).$(SUDO_SUFFIX) SUDO_DIR := $(BUILDDIR)/$(SUDO) SUDO_LICENSE := ISC AND BSD-3-Clause AND BSD-2-Clause-NetBSD AND Zlib base-commit: cae7daaa8850c4d952427fac5bcf4d8ffc553226 -- 2.41.0
[ptxdist] [PATCH] figlet: update license info
In figlet version 2.2.3 the license was changed from "Academic Free License" to "New BSD License" (3-cause). Updated license to 3-clause BSD: https://github.com/cmatsuoka/figlet/commit/5b020c22720d4aa62836a3356b11bb89620e11da Signed-off-by: Bruno Thomsen --- rules/figlet.make | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rules/figlet.make b/rules/figlet.make index 04e2fa074..3dad77154 100644 --- a/rules/figlet.make +++ b/rules/figlet.make @@ -23,7 +23,9 @@ FIGLET_SUFFIX := tar.gz FIGLET_URL := ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX) FIGLET_SOURCE := $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX) FIGLET_DIR := $(BUILDDIR)/$(FIGLET) -FIGLET_LICENSE := figlet +FIGLET_LICENSE := BSD-3-clause +FIGLET_LICENSE_FILES := \ + file://LICENSE;md5=1688bcd97b27704f1afcac7336409857 # # Compile base-commit: cae7daaa8850c4d952427fac5bcf4d8ffc553226 -- 2.41.0
Re: [ptxdist] [PATCH] RFC: sbom_report: Add support
Den man. 18. sep. 2023 kl. 16.34 skrev Simon Falsig :
>
> From: Simon Falsig
>
> This provides support for building SBOMs in CycloneDX format.
>
> A target is added alongside the other reports, that (based on the
> fast-bsp-report) extracts name, version, cpe and license of each target
> package, and puts these into a final sbom-report in CycloneDX/JSON
> format.
>
> This requires a working Python3 setup with the cyclonedx-bom package
> installed.
Hi Simon,
I have tested this together with GitLab Dependency Scanning in Ultimate SaaS,
and it seems to be working well.
Tested-by: Bruno Thomsen
.gitlab-ci.yml example snippet:
-8<-
ptxdist sbom:
stage: build
script:
- cd ptxdist
- ./p sbom-report
artifacts:
reports:
dependency_scanning: /release/sbom-report.json
-8<-
Thanks for working on this.
/Bruno
> ---
> bin/ptxdist | 3 +-
> rules/post/ptxd_make_report.make | 15 ++--
> scripts/lib/ptxd_make_report.sh | 16 +
> scripts/lib/ptxd_make_sbom_report.py | 54
> 4 files changed, 85 insertions(+), 3 deletions(-)
> create mode 100644 scripts/lib/ptxd_make_sbom_report.py
>
> diff --git a/bin/ptxdist b/bin/ptxdist
> index dfb619cbd..15be851f5 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -780,6 +780,7 @@ Misc:
>full-bsp-report generate a yaml file that describes the BSP
> and
> all packages. More data but will build all
> packages if necessary.
> + sbom-report generate a CycloneDX json SBOM
>print print the contents of a variable, in the way
> it is known by "make"
>printnext assumes that the contents of is another
> @@ -1807,7 +1808,7 @@ EOF
> ptxd_make_log export_src EXPORTDIR="${1}"
> exit
> ;;
> - fast-bsp-report|full-bsp-report)
> + fast-bsp-report|full-bsp-report|sbom-report)
> check_premake_compiler &&
> ptxd_make_log "${cmd}"
> exit
> diff --git a/rules/post/ptxd_make_report.make
> b/rules/post/ptxd_make_report.make
> index eecd2a577..ffa398c95 100644
> --- a/rules/post/ptxd_make_report.make
> +++ b/rules/post/ptxd_make_report.make
> @@ -10,7 +10,9 @@ ptx/report-env = \
> $(image/env) \
> ptx_report_target="$(strip $(1))" \
> ptx_packages_selected="$(filter-out
> $(IMAGE_PACKAGES),$(PTX_PACKAGES_SELECTED))" \
> - ptx_image_packages="$(IMAGE_PACKAGES)"
> + ptx_image_packages="$(IMAGE_PACKAGES)" \
> + ptx_target_packages="$(PACKAGES)"
> +
>
> PHONY += full-bsp-report
> full-bsp-report: $(RELEASEDIR)/full-bsp-report.yaml
> @@ -26,13 +28,22 @@ $(RELEASEDIR)/full-bsp-report.yaml: \
> @$(call ptx/report-env, $@) ptxd_make_full_bsp_report
> @$(call finish)
>
> +
> PHONY += fast-bsp-report
> fast-bsp-report: $(RELEASEDIR)/fast-bsp-report.yaml
>
> -
> $(RELEASEDIR)/fast-bsp-report.yaml: $(addprefix $(STATEDIR)/,$(addsuffix
> .fast-report,$(PTX_PACKAGES_SELECTED)))
> @$(call targetinfo)
> @$(call ptx/report-env, $@) ptxd_make_fast_bsp_report
> @$(call finish)
>
> +
> +PHONY += sbom-report
> +sbom-report: $(RELEASEDIR)/sbom-report.json
> +
> +$(RELEASEDIR)/sbom-report.json: $(addprefix $(STATEDIR)/,$(addsuffix
> .fast-report,$(PACKAGES)))
> + @$(call targetinfo)
> + @$(call ptx/report-env, $@) ptxd_make_sbom_report
> + @$(call finish)
> +
> # vim: syntax=make
> diff --git a/scripts/lib/ptxd_make_report.sh b/scripts/lib/ptxd_make_report.sh
> index a363ca5b3..e2da4c05f 100644
> --- a/scripts/lib/ptxd_make_report.sh
> +++ b/scripts/lib/ptxd_make_report.sh
> @@ -144,3 +144,19 @@ ptxd_make_fast_bsp_report() {
> }
> export -f ptxd_make_fast_bsp_report
>
> +ptxd_make_sbom_report() {
> +local -a ptxd_reply
> +local pkg_lic pkg
> +
> +ptxd_make_layer_init || return
> +
> +echo "Generating $(ptxd_print_path "${ptx_report_target}") ..."
> +echo
> +
> +mkdir -p "$(dirname "${ptx_report_target}")" &&
> +python3 ${PTXDIST_LIB_DIR}/ptxd_make_sbom_report.py
> "${ptx_report_dir}/fast/" ${ptx_target_packages} >
> ${PTXDIST_TEMPDIR}/sbom-report &&
> +mv "${PTXDIST_TEMPDIR}/sbom-report" "${ptx_repor
[ptxdist] [PATCH] python3-paho-mqtt: new package
The MQTT protocol is a machine-to-machine (M2M)/”Internet of Things” connectivity protocol. A MQTT client publish messages to a MQTT broker. Python package is dual licensed. Eclipse Distribution License 1.0 is identical to BSD-3-Clause and SPDX[1] has not created a separate entry for it. [1] https://github.com/spdx/license-list-XML/issues/1149 Signed-off-by: Bruno Thomsen --- rules/python3-paho-mqtt.in | 9 ++ rules/python3-paho-mqtt.make | 55 2 files changed, 64 insertions(+) create mode 100644 rules/python3-paho-mqtt.in create mode 100644 rules/python3-paho-mqtt.make diff --git a/rules/python3-paho-mqtt.in b/rules/python3-paho-mqtt.in new file mode 100644 index ..8f8ece378a2c --- /dev/null +++ b/rules/python3-paho-mqtt.in @@ -0,0 +1,9 @@ +## SECTION=python3 + +config PYTHON3_PAHO_MQTT + tristate + select PYTHON3 + prompt "paho-mqtt" + help + Eclipse Paho MQTT Python client library, which implements + versions 5.0, 3.1.1, and 3.1 of the MQTT protocol. diff --git a/rules/python3-paho-mqtt.make b/rules/python3-paho-mqtt.make new file mode 100644 index ..2e82b1fbf425 --- /dev/null +++ b/rules/python3-paho-mqtt.make @@ -0,0 +1,55 @@ +# -*-makefile-*- +# +# Copyright (C) 2023 by Bruno Thomsen +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_PAHO_MQTT) += python3-paho-mqtt + +# +# Paths and names +# +PYTHON3_PAHO_MQTT_VERSION := 1.6.1 +PYTHON3_PAHO_MQTT_MD5 := bdb20f88db291fdb4a0fe804c0f29316 +PYTHON3_PAHO_MQTT := paho-mqtt-$(PYTHON3_PAHO_MQTT_VERSION) +PYTHON3_PAHO_MQTT_SUFFIX := tar.gz +PYTHON3_PAHO_MQTT_URL := $(call ptx/mirror-pypi, paho-mqtt, $(PYTHON3_PAHO_MQTT).$(PYTHON3_PAHO_MQTT_SUFFIX)) +PYTHON3_PAHO_MQTT_SOURCE := $(SRCDIR)/$(PYTHON3_PAHO_MQTT).$(PYTHON3_PAHO_MQTT_SUFFIX) +PYTHON3_PAHO_MQTT_DIR := $(BUILDDIR)/$(PYTHON3_PAHO_MQTT) +PYTHON3_PAHO_MQTT_LICENSE := EPL-2.0 OR BSD-3-Clause +PYTHON3_PAHO_MQTT_LICENSE_FILES:= \ + file://LICENSE.txt;md5=8e5f264c6988aec56808a3a11e77b913 \ + file://edl-v10;md5=c09f121939f063aeb5235972be8c722c + +# +# Prepare +# + +PYTHON3_PAHO_MQTT_CONF_TOOL:= python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-paho-mqtt.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-paho-mqtt) + @$(call install_fixup, python3-paho-mqtt,PRIORITY,optional) + @$(call install_fixup, python3-paho-mqtt,SECTION,base) + @$(call install_fixup, python3-paho-mqtt,AUTHOR,"Bruno Thomsen ") + @$(call install_fixup, python3-paho-mqtt,DESCRIPTION,missing) + + @$(call install_glob, python3-paho-mqtt, 0, 0, -, \ + $(PYTHON3_SITEPACKAGES),, *.py) + + @$(call install_finish, python3-paho-mqtt) + + @$(call touch) + +# vim: syntax=make base-commit: 35503db5dbcacbbf769b6c87fe827df3667c21a0 -- 2.41.0
Re: [ptxdist] [PATCH v2] xz: update URL
Den søn. 6. aug. 2023 kl. 13.15 skrev Bruno Thomsen : > > Update URL from http to https as it returns 301 Moved Permanently. > Add an additional github URL that is currently used. > > Download log: > > --2023-07-22 14:34:32-- http://tukaani.org/xz/xz-5.4.3.tar.bz2 > Resolving tukaani.org (tukaani.org)... 5.44.245.25 > Connecting to tukaani.org (tukaani.org)|5.44.245.25|:80... connected. > HTTP request sent, awaiting response... 301 Moved Permanently > Location: https://tukaani.org/xz/xz-5.4.3.tar.bz2 [following] > --2023-07-22 14:34:32-- https://tukaani.org/xz/xz-5.4.3.tar.bz2 > Connecting to tukaani.org (tukaani.org)|5.44.245.25|:443... connected. > HTTP request sent, awaiting response... 302 Found > Location: > https://github.com/tukaani-project/xz/releases/download/v5.4.3/xz-5.4.3.tar.bz2 > [following] > --2023-07-22 14:34:33-- > https://github.com/tukaani-project/xz/releases/download/v5.4.3/xz-5.4.3.tar.bz2 > Resolving github.com (github.com)... 140.82.121.4 > Connecting to github.com (github.com)|140.82.121.4|:443... connected. > HTTP request sent, awaiting response... 302 Found > > Signed-off-by: Bruno Thomsen > --- > v2: add github download URL as backup Just drop, did not see that version 1 was already applied. > --- > rules/xz.make | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/rules/xz.make b/rules/xz.make > index a5f16d81929d..c3ca8f662b15 100644 > --- a/rules/xz.make > +++ b/rules/xz.make > @@ -18,7 +18,9 @@ XZ_VERSION:= 5.4.3 > XZ_MD5 := 34d2f33c2ac51390fc5d0a9c179e8345 > XZ := xz-$(XZ_VERSION) > XZ_SUFFIX := tar.bz2 > -XZ_URL := http://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) > +XZ_URL := \ > + https://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) \ > + > https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)/$(XZ).$(XZ_SUFFIX) > XZ_SOURCE := $(SRCDIR)/$(XZ).$(XZ_SUFFIX) > XZ_DIR := $(BUILDDIR)/$(XZ) > XZ_LICENSE := public_domain AND LGPL-2.1-or-later AND GPL-2.0-or-later > AND GPL-3.0-or-later > > base-commit: dbf616b650552733786ff6b96f7b98a42128c398 > -- > 2.41.0 >
[ptxdist] [PATCH v2] xz: update URL
Update URL from http to https as it returns 301 Moved Permanently. Add an additional github URL that is currently used. Download log: --2023-07-22 14:34:32-- http://tukaani.org/xz/xz-5.4.3.tar.bz2 Resolving tukaani.org (tukaani.org)... 5.44.245.25 Connecting to tukaani.org (tukaani.org)|5.44.245.25|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://tukaani.org/xz/xz-5.4.3.tar.bz2 [following] --2023-07-22 14:34:32-- https://tukaani.org/xz/xz-5.4.3.tar.bz2 Connecting to tukaani.org (tukaani.org)|5.44.245.25|:443... connected. HTTP request sent, awaiting response... 302 Found Location: https://github.com/tukaani-project/xz/releases/download/v5.4.3/xz-5.4.3.tar.bz2 [following] --2023-07-22 14:34:33-- https://github.com/tukaani-project/xz/releases/download/v5.4.3/xz-5.4.3.tar.bz2 Resolving github.com (github.com)... 140.82.121.4 Connecting to github.com (github.com)|140.82.121.4|:443... connected. HTTP request sent, awaiting response... 302 Found Signed-off-by: Bruno Thomsen --- v2: add github download URL as backup --- rules/xz.make | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rules/xz.make b/rules/xz.make index a5f16d81929d..c3ca8f662b15 100644 --- a/rules/xz.make +++ b/rules/xz.make @@ -18,7 +18,9 @@ XZ_VERSION:= 5.4.3 XZ_MD5 := 34d2f33c2ac51390fc5d0a9c179e8345 XZ := xz-$(XZ_VERSION) XZ_SUFFIX := tar.bz2 -XZ_URL := http://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) +XZ_URL := \ + https://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) \ + https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)/$(XZ).$(XZ_SUFFIX) XZ_SOURCE := $(SRCDIR)/$(XZ).$(XZ_SUFFIX) XZ_DIR := $(BUILDDIR)/$(XZ) XZ_LICENSE := public_domain AND LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later base-commit: dbf616b650552733786ff6b96f7b98a42128c398 -- 2.41.0
Re: [ptxdist] [PATCH] uhubctl: add missing GCCLIBS_ATOMIC select
Den fre. 28. jul. 2023 kl. 08.54 skrev Michael Olbrich : > > On Thu, Jul 27, 2023 at 06:42:43PM +0200, Bruno Thomsen wrote: > > Den man. 17. jul. 2023 kl. 15.52 skrev Bruno Thomsen > > : > > > > > > Without this dependency the following runtime error can be observed: > > > > > > uhubctl: error while loading shared libraries: libatomic.so.1: cannot > > > open shared object file: No such file or directory > > > > Please drop this patch. > > I cannot recreate the issue in an ARM v7a project, only in a ARM v5te > > project, > > so it must be a local issue. > > It's an architecture issue. libatomic implements primitives that are not > available in hardware. For ARM v5 it's probably related to atomics. > So I won't apply this, because it does not effect the 'major' > architectures. Unfortunately we don't have a way to specify architecture > specific dependencies. > Hi, thanks for the info. We have solved this architecture (hardware generation) issue in a component called octopus with a Kconfig generation choice, ex. 2GEN or 3GEN. The component contains many small systemd services that execute Bash scripts, so it already has many Kconfig selects on various command line tools. As not all services run on all hardware generations, ex. Only 3GEN[1][2] has a TPM chip: select TPM2_TOOLS if RUNTIME && OCTOPUS_3GEN It's one of these services that require uhubctl so now we do: select UHUBCTL if RUNTIME select GCCLIBS_ATOMIC if RUNTIME && OCTOPUS_2GEN /Bruno [1] https://elixir.bootlin.com/linux/latest/source/arch/arm/boot/dts/imx7d-flex-concentrator.dts [2] https://elixir.bootlin.com/barebox/latest/source/arch/arm/dts/imx7d-flex-concentrator-mfg.dts
Re: [ptxdist] [PATCH] uhubctl: add missing GCCLIBS_ATOMIC select
Den man. 17. jul. 2023 kl. 15.52 skrev Bruno Thomsen : > > Without this dependency the following runtime error can be observed: > > uhubctl: error while loading shared libraries: libatomic.so.1: cannot > open shared object file: No such file or directory Please drop this patch. I cannot recreate the issue in an ARM v7a project, only in a ARM v5te project, so it must be a local issue. /Bruno > > Signed-off-by: Bruno Thomsen > --- > rules/uhubctl.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/rules/uhubctl.in b/rules/uhubctl.in > index ec30f6637..e638cf859 100644 > --- a/rules/uhubctl.in > +++ b/rules/uhubctl.in > @@ -2,6 +2,7 @@ > > config UHUBCTL > bool > + select GCCLIBS_ATOMIC > select LIBUSB > prompt "uhubctl" > help > > base-commit: fb8eb0719152fe1f4bc7f31d3c40087fcb721a8c > -- > 2.41.0 >
[ptxdist] [PATCH] xz: update URL
Update URL from http to https as it returns 301 Moved Permanently. Download log: --2023-07-22 14:34:32-- http://tukaani.org/xz/xz-5.4.3.tar.bz2 Resolving tukaani.org (tukaani.org)... 5.44.245.25 Connecting to tukaani.org (tukaani.org)|5.44.245.25|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://tukaani.org/xz/xz-5.4.3.tar.bz2 [following] --2023-07-22 14:34:32-- https://tukaani.org/xz/xz-5.4.3.tar.bz2 Connecting to tukaani.org (tukaani.org)|5.44.245.25|:443... connected. HTTP request sent, awaiting response... 302 Found Location: https://github.com/tukaani-project/xz/releases/download/v5.4.3/xz-5.4.3.tar.bz2 [following] --2023-07-22 14:34:33-- https://github.com/tukaani-project/xz/releases/download/v5.4.3/xz-5.4.3.tar.bz2 Resolving github.com (github.com)... 140.82.121.4 Connecting to github.com (github.com)|140.82.121.4|:443... connected. HTTP request sent, awaiting response... 302 Found Signed-off-by: Bruno Thomsen --- rules/xz.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/xz.make b/rules/xz.make index a5f16d819..2825f6629 100644 --- a/rules/xz.make +++ b/rules/xz.make @@ -18,7 +18,7 @@ XZ_VERSION:= 5.4.3 XZ_MD5 := 34d2f33c2ac51390fc5d0a9c179e8345 XZ := xz-$(XZ_VERSION) XZ_SUFFIX := tar.bz2 -XZ_URL := http://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) +XZ_URL := https://tukaani.org/xz/$(XZ).$(XZ_SUFFIX) XZ_SOURCE := $(SRCDIR)/$(XZ).$(XZ_SUFFIX) XZ_DIR := $(BUILDDIR)/$(XZ) XZ_LICENSE := public_domain AND LGPL-2.1-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later base-commit: fb8eb0719152fe1f4bc7f31d3c40087fcb721a8c -- 2.41.0
[ptxdist] [PATCH] uhubctl: add missing GCCLIBS_ATOMIC select
Without this dependency the following runtime error can be observed: uhubctl: error while loading shared libraries: libatomic.so.1: cannot open shared object file: No such file or directory Signed-off-by: Bruno Thomsen --- rules/uhubctl.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/uhubctl.in b/rules/uhubctl.in index ec30f6637..e638cf859 100644 --- a/rules/uhubctl.in +++ b/rules/uhubctl.in @@ -2,6 +2,7 @@ config UHUBCTL bool + select GCCLIBS_ATOMIC select LIBUSB prompt "uhubctl" help base-commit: fb8eb0719152fe1f4bc7f31d3c40087fcb721a8c -- 2.41.0
Re: [ptxdist] [PATCH] chrony: Version bump. 4.2 -> 4.3.
Hi Ralf,
1. Good point. I don't have any ptxdist projects that uses the default
installed chrony config. With read-only rootfs and needing to adjust
configuration based on device configuration it's generated from a template
file and envsubst.
New configuration file is chosen with OPTION variable in
/etc/sysconfig/chronyd with -f.
2. chrony user and group are in default files in ptxdist projectroot, but
they are commonly overridden in your local ptxdist project. So diff your
local files with upstream and realign group and passwd files.
/Bruno
On Wed, 15 Mar 2023, 17.41 Ralf Glaser, wrote:
> Some minor issues with the chrony rule file in ptxdist 2022.04:
>
> 1.
> --sysconfigdir=/etc but config files installed at /etc/chrony/ leads to
> chrony not finding the configuration
>
> 2.
> When started by systemd chrony runs as chrony:chrony but user and group
> are missing.
>
> Best regards,
> Ralf
>
>
> --
> *Von:* ptxdist im Auftrag von Christian
> Melki
> *Gesendet:* Donnerstag, 8. September 2022 14:48
> *An:* ptxdist@pengutronix.de
> *Betreff:* [ptxdist] [PATCH] chrony: Version bump. 4.2 -> 4.3.
>
> https://chrony.tuxfamily.org/news.html
> Minor release with some enhancements.
>
> * Forward patch from version 4.2, applies with offset.
>
> Signed-off-by: Christian Melki
> ---
> ...001-configure-make-unrecognized-option-a-fatal-error.patch | 0
> patches/{chrony-4.2 => chrony-4.3}/series | 0
> rules/chrony.make | 4 ++--
> 3 files changed, 2 insertions(+), 2 deletions(-)
> rename patches/{chrony-4.2 =>
> chrony-4.3}/0001-configure-make-unrecognized-option-a-fatal-error.patch
> (100%)
> rename patches/{chrony-4.2 => chrony-4.3}/series (100%)
>
> diff --git
> a/patches/chrony-4.2/0001-configure-make-unrecognized-option-a-fatal-error.patch
> b/patches/chrony-4.3/0001-configure-make-unrecognized-option-a-fatal-error.patch
> similarity index 100%
> rename from
> patches/chrony-4.2/0001-configure-make-unrecognized-option-a-fatal-error.patch
> rename to
> patches/chrony-4.3/0001-configure-make-unrecognized-option-a-fatal-error.patch
> diff --git a/patches/chrony-4.2/series b/patches/chrony-4.3/series
> similarity index 100%
> rename from patches/chrony-4.2/series
> rename to patches/chrony-4.3/series
> diff --git a/rules/chrony.make b/rules/chrony.make
> index eb700134d..200454058 100644
> --- a/rules/chrony.make
> +++ b/rules/chrony.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_CHRONY) += chrony
> #
> # Paths and names
> #
> -CHRONY_VERSION := 4.2
> -CHRONY_MD5 := 07282f8e76a4399d6c17009bb6345614
> +CHRONY_VERSION := 4.3
> +CHRONY_MD5 := 765dd8c085a0be2a52f9e9135665f0b7
> CHRONY := chrony-$(CHRONY_VERSION)
> CHRONY_SUFFIX := tar.gz
> CHRONY_URL :=
> http://download.tuxfamily.org/chrony/$(CHRONY).$(CHRONY_SUFFIX)
> --
> 2.34.1
>
>
>
Re: [ptxdist] ncurses 6.3 compile error
Hi Christian, Den man. 21. nov. 2022 kl. 17.09 skrev Christian Melki : > > Hi Bruno, > > Did you solve your issue? I got the configure step working by adding autogen.sh symbolic link to patch directory. But then I hit a compile error. I saw that Fedora[1] carried some patches but did not yet test them in ptxdist context. At the moment I just use the old 6.2 version. /Bruno [1] https://src.fedoraproject.org/rpms/ncurses/tree/rawhide > > For whatever reason, I tripped on the same error. > Now, I can't follow the reasoning, the behavior, the patches or actually > anything in the ncurses development. To me it's just a black box of > strangeness. > > Either way. I concluded that for unidentified reasons I needed: > https://invisible-mirror.net/archives/ncurses/6.3/ncurses-6.3-20211026.patch.gz > added to the patchset. > > Literally the first in the series for 6.3. > > Maybe someone more versed can make sense of the discussion here: > https://lists.gnu.org/archive/html/bug-ncurses/2021-10/msg00040.html > > Regards, > Christian > > On 10/30/22 20:47, Christian Melki wrote: > > On 10/30/22 15:19, Christian Melki wrote: > >> On 10/30/22 12:08, Bruno Thomsen wrote: > >>> error: expected a pathname, not "" > >> > >> Hmm. That home made horror show of configuration expects > >> --enable-pc-files if I'm not mistaken. Can that be a clue to something? > >> But it makes me wonder how on earth this worked in the first place? > >> > >> /C > >> > > > > > > My bad. Ignore that. Somehow missed that the configure line already > > contained it. > > > > /C > > >
Re: [ptxdist] ncurses 6.3 compile error
Den fre. 28. okt. 2022 kl. 17.23 skrev Michael Olbrich
:
>
> On Thu, Oct 27, 2022 at 09:36:21PM +0200, Christian Melki wrote:
> > On 10/27/22 20:50, Bruno Thomsen wrote:
> > > Has anyone experienced issues with ncurses 6.3?
> > > Project is using OSELAS.Toolchain 2021.07 and ptxdist 2022.10.0.
> > >
> > > /Bruno
> > >
> > > ---8<---
> > >
> > > ---
> > > target: ncurses.prepare
> > > ---
> > >
> > > Removing files from sysroot...
> > >
> > > configure: loading site script /usr/share/config.site
> > > checking for ggrep... no
> > > checking for grep... grep
> > > checking for egrep... grep -E
> > > Configuring NCURSES 6.3 ABI 6 (Thu Oct 27 11:56:05 UTC 2022)
> > > checking for package version... 6.3
> > > checking for package patch date... 20211021
> > > checking build system type... x86_64-host-linux-gnu
> > > checking host system type... arm-v7a-linux-gnueabihf
> > > checking target system type... arm-v7a-linux-gnueabihf
> > > Configuring for linux-gnueabihf
> > > checking for fgrep... grep -F
> > > checking for prefix... /usr
> > > checking for arm-v7a-linux-gnueabihf-gcc... arm-v7a-linux-gnueabihf-gcc
> > > checking for C compiler default output... a.out
> > > checking whether the C compiler works... yes
> > > checking whether we are cross compiling... yes
> > > checking for executable suffix...
> > > checking for object suffix... o
> > > checking whether we are using the GNU C compiler... yes
> > > checking whether arm-v7a-linux-gnueabihf-gcc accepts -g... yes
> > > checking version of arm-v7a-linux-gnueabihf-gcc... 7
> > > checking if this is really Intel C compiler... no
> > > checking if this is really Clang C compiler... no
> > > checking for arm-v7a-linux-gnueabihf-gcc option to accept ANSI C... none
> > > needed
> > > checking $CFLAGS variable... ok
> > > checking $CC variable... ok
> > > checking how to run the C preprocessor... arm-v7a-linux-gnueabihf-gcc -E
> > > checking whether arm-v7a-linux-gnueabihf-gcc needs -traditional... no
> > > checking whether arm-v7a-linux-gnueabihf-gcc understands -c and -o
> > > together... yes
> > > checking if you want to ensure bool is consistent with C++... no
> > > checking if you want to build C++ binding and demo... no
> > > checking if you want to build with Ada... no
> > > checking if you want to install terminal database... yes
> > > checking if you want to install manpages... no
> > > checking if you want to build programs such as tic... no
> > > checking if you want to build test-programs... no
> > > checking if you wish to install curses.h... yes
> > > checking for mawk... no
> > > checking for gawk... gawk
> > > checking for a BSD compatible install...
> > > /usr/local/lib/ptxdist-2022.10.0/bin/install -c
> > > checking for lint... no
> > > checking for cppcheck... no
> > > checking for splint... no
> > > checking whether ln -s works... yes
> > > checking if ln -s -f options work... yes
> > > checking for long file names... yes
> > > checking if you want to use pkg-config... yes
> > > checking for arm-v7a-linux-gnueabihf-pkg-config...
> > > /home/bth/gitlab/rockhopper/ptxdist/platform-tqma7/sysroot-cross/bin/arm-v7a-linux-gnueabihf-pkg-config
> > > checking for
> > > /home/bth/gitlab/rockhopper/ptxdist/platform-tqma7/sysroot-cross/bin/arm-v7a-linux-gnueabihf-pkg-config
> > > library directory... checking for first directory... none
> > > checking if we should install .pc files for
> > > /home/bth/gitlab/rockhopper/ptxdist/platform-tqma7/sysroot-cross/bin/arm-v7a-linux-gnueabihf-pkg-config...
> > > yes
> > > configure: error: expected a pathname, not ""
> >
> > Does your config.log contain more information?
>
> Indeed, and do you have a local ncurses.make? The upstream rule explicitly
> specifies this path with
> --with-pkg-config-libdir=/usr/$(CROSS_LIB_DIR)/pkgconfig
> if I read the configure script correctly.
I am using the upstream rule as the project is migrated to 2022.10.0
and as far as I can see in git it's the same rule on master branch.
There are no rules/{host-,}ncurses.{in,make} in the project.
config.log is attached below.
configure:4300: error: expected a pathname, not ""
Looking in the configure script around line 4300,
the $PKG_CONFIG_LIBDIR variable is indeed empty
[ptxdist] ncurses 6.3 compile error
Hi Has anyone experienced issues with ncurses 6.3? Project is using OSELAS.Toolchain 2021.07 and ptxdist 2022.10.0. /Bruno ---8<--- --- target: ncurses.prepare --- Removing files from sysroot... configure: loading site script /usr/share/config.site checking for ggrep... no checking for grep... grep checking for egrep... grep -E Configuring NCURSES 6.3 ABI 6 (Thu Oct 27 11:56:05 UTC 2022) checking for package version... 6.3 checking for package patch date... 20211021 checking build system type... x86_64-host-linux-gnu checking host system type... arm-v7a-linux-gnueabihf checking target system type... arm-v7a-linux-gnueabihf Configuring for linux-gnueabihf checking for fgrep... grep -F checking for prefix... /usr checking for arm-v7a-linux-gnueabihf-gcc... arm-v7a-linux-gnueabihf-gcc checking for C compiler default output... a.out checking whether the C compiler works... yes checking whether we are cross compiling... yes checking for executable suffix... checking for object suffix... o checking whether we are using the GNU C compiler... yes checking whether arm-v7a-linux-gnueabihf-gcc accepts -g... yes checking version of arm-v7a-linux-gnueabihf-gcc... 7 checking if this is really Intel C compiler... no checking if this is really Clang C compiler... no checking for arm-v7a-linux-gnueabihf-gcc option to accept ANSI C... none needed checking $CFLAGS variable... ok checking $CC variable... ok checking how to run the C preprocessor... arm-v7a-linux-gnueabihf-gcc -E checking whether arm-v7a-linux-gnueabihf-gcc needs -traditional... no checking whether arm-v7a-linux-gnueabihf-gcc understands -c and -o together... yes checking if you want to ensure bool is consistent with C++... no checking if you want to build C++ binding and demo... no checking if you want to build with Ada... no checking if you want to install terminal database... yes checking if you want to install manpages... no checking if you want to build programs such as tic... no checking if you want to build test-programs... no checking if you wish to install curses.h... yes checking for mawk... no checking for gawk... gawk checking for a BSD compatible install... /usr/local/lib/ptxdist-2022.10.0/bin/install -c checking for lint... no checking for cppcheck... no checking for splint... no checking whether ln -s works... yes checking if ln -s -f options work... yes checking for long file names... yes checking if you want to use pkg-config... yes checking for arm-v7a-linux-gnueabihf-pkg-config... /home/bth/gitlab/rockhopper/ptxdist/platform-tqma7/sysroot-cross/bin/arm-v7a-linux-gnueabihf-pkg-config checking for /home/bth/gitlab/rockhopper/ptxdist/platform-tqma7/sysroot-cross/bin/arm-v7a-linux-gnueabihf-pkg-config library directory... checking for first directory... none checking if we should install .pc files for /home/bth/gitlab/rockhopper/ptxdist/platform-tqma7/sysroot-cross/bin/arm-v7a-linux-gnueabihf-pkg-config... yes configure: error: expected a pathname, not "" make: *** [/usr/local/lib/ptxdist-2022.10.0/rules/post/ptxd_make_world_prepare.make:24: /home/bth/gitlab/rockhopper/ptxdist/platform-tqma7/state/ncurses.prepare] Error 1
Re: [ptxdist] OPKG Dependent Package
Hi Your build host is too new as stime function has been removed from glibc 2.31. Upgrade DistroKit to 2021.02.0 or use older version of build host/container. /Bruno On Fri, 21 Oct 2022, 07.55 Joshi, Pranay, wrote: > Hi Bruno, > > > > During building of DistroKit-2019.12.0 for RPi platform using > ptxdist-2019.12.0, we are getting below error- > > > > pranay@pranay-Latitude-5400:~/Project/oselas_bsp/DistroKit-2019.12.0$ > ptxdist-2019.12.0 go > > > > - > target: host-qemu.compile > - > > > > make: Entering directory > '/home/pranay/Project/oselas_bsp/DistroKit-2019.12.0/platform-rpi/build-host/qemu-4.1.0-build' > make[1]: Entering directory > '/home/pranay/Project/oselas_bsp/DistroKit-2019.12.0/platform-rpi/build-host/qemu-4.1.0/slirp' > make[1]: Nothing to be done for 'all'. > make[1]: Leaving directory > '/home/pranay/Project/oselas_bsp/DistroKit-2019.12.0/platform-rpi/build-host/qemu-4.1.0/slirp' > LINKarm-linux-user/qemu-arm > /usr/bin/ld: linux-user/syscall.o: in function `do_syscall1': > syscall.c:(.text+0xf171): undefined reference to `stime' > collect2: error: ld returned 1 exit status > make[1]: *** [Makefile:209: qemu-arm] Error 1 > make: *** [Makefile:472: arm-linux-user/all] Error 2 > make: *** Waiting for unfinished jobs > make: Leaving directory > '/home/pranay/Project/oselas_bsp/DistroKit-2019.12.0/platform-rpi/build-host/qemu-4.1.0-build' > make: *** > [/usr/local/lib/ptxdist-2019.12.0/rules/post/ptxd_make_world_compile.make:20: > /home/pranay/Project/oselas_bsp/DistroKit-2019.12.0/platform-rpi/state/host-qemu.compile] > Error 2 > > > > > > Please Suggest the solution for this issue. > > > > *Pranay Joshi* > > Lead Engineer-Firmware Engineering > > Drilling Services > > Baker Hughes > > > > T +91 7208026212 > > > > > > > > *From:* Joshi, Pranay > *Sent:* Thursday, October 20, 2022 3:00 PM > *To:* ptxdist@pengutronix.de; Michael Olbrich ; > ose...@community.pengutronix.de > *Subject:* RE: OPKG Dependent Package > > > > Thank you Bruno for your quick response. > > > > *From:* ptxdist *On Behalf Of *Bruno > Thomsen > *Sent:* Thursday, October 20, 2022 12:30 PM > *To:* Michael Olbrich ; ptxdist@pengutronix.de; > ose...@community.pengutronix.de > *Subject:* Re: [ptxdist] OPKG Dependent Package > > > > You don't often get email from b...@kamstrup.com. Learn why this is > important <https://aka.ms/LearnAboutSenderIdentification> > > * EXTERNAL EMAIL:* This email originated outside of our organization. Do > not click on any links or open attachments from unexpected or unknown > senders unless you can verify the content is safe. > > > > Hi Pranay > > Christian has fixed it upstream in this commit: > > https://git.pengutronix.de/cgit/ptxdist/commit/rules/host-opkg-utils.make?id=6dc8fedeee27ce2abd1b85ec047012c8bdc455a9 > <https://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.pengutronix.de%2Fcgit%2Fptxdist%2Fcommit%2Frules%2Fhost-opkg-utils.make%3Fid%3D6dc8fedeee27ce2abd1b85ec047012c8bdc455a9=05%7C01%7Cpranay.joshi%40bakerhughes.com%7Cb4c59c331dd441ce770408dab268c949%7Cd584a4b7b1f24714a578fd4d43c146a6%7C0%7C0%7C638018460488117447%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C2000%7C%7C%7C=ZPWyJdmDqY2hC0d1XK5Pjdd4Glu1lPfWbBcGJKaLjSQ%3D=0> > > So you need modify the .make file in your project and change suffix > variable from tar.bz2 to tar.gz. > > /Bruno > > > From: ptxdist on behalf of Joshi, Pranay > > Sent: Thursday, October 20, 2022 08:29 > To: Michael Olbrich ; ptxdist@pengutronix.de < > ptxdist@pengutronix.de>; ose...@community.pengutronix.de < > ose...@community.pengutronix.de> > Subject: [ptxdist] OPKG Dependent Package > > Hi Michael, > > We are trying to build DistroKit-2019.12.0 BSP using PTXDist-2019.12.0, > one of the dependent library is not available over web, please share the > opkg-utils-0.4.1.tar.bz2 > Library in the .tar.bz2 format. > > Thanks > > Pranay Joshi > Lead Engineer-Firmware Engineering > Drilling Services > Baker Hughes > > T +91 7208026212 > > > Venlig hilsen / Best regards > > <https://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fkamstrup.com%2F=05%7C01%7Cpranay.joshi%40bakerhughes.com%7Cb4c59c331dd441ce770408dab268c949%7Cd584a4b7b1f24714a578fd4d43c146a6%7C0%7C0%7C638018460488117447%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C2000%7C%7C%7C=NdCtrTGF7MRohOCRExvfhWNXjLYpL56wB2GMtN5idKI%3D=0> > *Bruno Tho
[ptxdist] [PATCH 5/5] python3: update download URL
Downloading package result in double http code 301 Moved Permanently from servers. Update used URL to match redirect URL. --2022-10-20 11:25:21-- http://python.org/ftp/python/3.10.4/Python-3.10.4.tar.xz Resolving python.org (python.org)... 138.197.63.241 Connecting to python.org (python.org)|138.197.63.241|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://python.org/ftp/python/3.10.4/Python-3.10.4.tar.xz [following] --2022-10-20 11:25:22-- https://python.org/ftp/python/3.10.4/Python-3.10.4.tar.xz Connecting to python.org (python.org)|138.197.63.241|:443... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://www.python.org/ftp/python/3.10.4/Python-3.10.4.tar.xz [following] --2022-10-20 11:25:22-- https://www.python.org/ftp/python/3.10.4/Python-3.10.4.tar.xz Resolving www.python.org (www.python.org)... 199.232.40.223, 2a04:4e42:47::223 Connecting to www.python.org (www.python.org)|199.232.40.223|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 19342692 (18M) [application/octet-stream] Signed-off-by: Bruno Thomsen --- rules/python3.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/python3.make b/rules/python3.make index 59c46ca0f..b18582563 100644 --- a/rules/python3.make +++ b/rules/python3.make @@ -26,7 +26,7 @@ PYTHON3_DIR := $(BUILDDIR)/$(PYTHON3) PYTHON3_DEVPKG := NO PYTHON3_URL:= \ - http://python.org/ftp/python/$(PYTHON3_VERSION)/$(PYTHON3).$(PYTHON3_SUFFIX) \ + https://www.python.org/ftp/python/$(PYTHON3_VERSION)/$(PYTHON3).$(PYTHON3_SUFFIX) \ http://python.org/ftp/python/$(PYTHON3_MAJORMINOR)/$(PYTHON3).$(PYTHON3_SUFFIX) CROSS_PYTHON3 := $(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR) -- 2.37.3
[ptxdist] [PATCH 4/5] host-opkg-utils: update download URL
Downloading package result in double http code 301 Moved Permanently from servers. Update used URL to match redirect URL. --2022-10-20 11:27:03-- http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/snapshot/opkg-utils-0.5.0.tar.gz Resolving git.yoctoproject.org (git.yoctoproject.org)... 198.145.29.90 Connecting to git.yoctoproject.org (git.yoctoproject.org)|198.145.29.90|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/snapshot/opkg-utils-0.5.0.tar.gz [following] --2022-10-20 11:27:03-- https://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/snapshot/opkg-utils-0.5.0.tar.gz Connecting to git.yoctoproject.org (git.yoctoproject.org)|198.145.29.90|:443... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://git.yoctoproject.org/opkg-utils/snapshot/opkg-utils-0.5.0.tar.gz [following] --2022-10-20 11:27:04-- https://git.yoctoproject.org/opkg-utils/snapshot/opkg-utils-0.5.0.tar.gz Reusing existing connection to git.yoctoproject.org:443. HTTP request sent, awaiting response... 200 OK Length: unspecified [application/x-gzip] Signed-off-by: Bruno Thomsen --- rules/host-opkg-utils.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/host-opkg-utils.make b/rules/host-opkg-utils.make index 159eac64b..0e6e28e9f 100644 --- a/rules/host-opkg-utils.make +++ b/rules/host-opkg-utils.make @@ -18,7 +18,7 @@ HOST_OPKG_UTILS_VERSION := 0.5.0 HOST_OPKG_UTILS_MD5:= c71939ee02c69462bd3ba1fe0d6de5e2 HOST_OPKG_UTILS:= opkg-utils-$(HOST_OPKG_UTILS_VERSION) HOST_OPKG_UTILS_SUFFIX := tar.gz -HOST_OPKG_UTILS_URL:= http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/snapshot/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX) +HOST_OPKG_UTILS_URL:= https://git.yoctoproject.org/opkg-utils/snapshot/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX) HOST_OPKG_UTILS_SOURCE := $(SRCDIR)/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX) HOST_OPKG_UTILS_DIR:= $(HOST_BUILDDIR)/$(HOST_OPKG_UTILS) HOST_OPKG_UTILS_LICENSE:= GPL-2.0-only -- 2.37.3
[ptxdist] [PATCH 3/5] libmbim: change URL from http to https
Downloading package result in a redirect from http to https. Use URL we have been told to follow. --2022-10-20 11:25:17-- http://www.freedesktop.org/software/libmbim/libmbim-1.26.4.tar.xz Resolving www.freedesktop.org (www.freedesktop.org)... 131.252.210.176, 2610:10:20:722:a800:ff:feda:470f Connecting to www.freedesktop.org (www.freedesktop.org)|131.252.210.176|:80... connected. HTTP request sent, awaiting response... 302 Found Location: https://www.freedesktop.org/software/libmbim/libmbim-1.26.4.tar.xz [following] --2022-10-20 11:25:18-- https://www.freedesktop.org/software/libmbim/libmbim-1.26.4.tar.xz Connecting to www.freedesktop.org (www.freedesktop.org)|131.252.210.176|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 566188 (553K) [application/x-xz] Signed-off-by: Bruno Thomsen --- rules/libmbim.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/libmbim.make b/rules/libmbim.make index 781f9c0ce..f2f8e5801 100644 --- a/rules/libmbim.make +++ b/rules/libmbim.make @@ -18,7 +18,7 @@ LIBMBIM_VERSION := 1.26.4 LIBMBIM_MD5:= 58dea20cad346f31d2873b68385a9973 LIBMBIM:= libmbim-$(LIBMBIM_VERSION) LIBMBIM_SUFFIX := tar.xz -LIBMBIM_URL:= http://www.freedesktop.org/software/libmbim/$(LIBMBIM).$(LIBMBIM_SUFFIX) +LIBMBIM_URL:= https://www.freedesktop.org/software/libmbim/$(LIBMBIM).$(LIBMBIM_SUFFIX) LIBMBIM_SOURCE := $(SRCDIR)/$(LIBMBIM).$(LIBMBIM_SUFFIX) LIBMBIM_DIR:= $(BUILDDIR)/$(LIBMBIM) LIBMBIM_LICENSE:= GPL-2.0-or-later AND LGPL-2.1-or-later -- 2.37.3
[ptxdist] [PATCH 2/5] dbus: update download URL
Downloading package result in http code 301 Moved Permanently from server. Update used URL to match redirect URL. --2022-10-20 11:24:55-- http://dbus.freedesktop.org/releases/dbus/dbus-1.14.0.tar.xz Resolving dbus.freedesktop.org (dbus.freedesktop.org)... 131.252.210.176, 2610:10:20:722:a800:ff:feda:470f Connecting to dbus.freedesktop.org (dbus.freedesktop.org)|131.252.210.176|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://dbus.freedesktop.org/releases/dbus/dbus-1.14.0.tar.xz [following] --2022-10-20 11:24:56-- https://dbus.freedesktop.org/releases/dbus/dbus-1.14.0.tar.xz Connecting to dbus.freedesktop.org (dbus.freedesktop.org)|131.252.210.176|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 1360228 (1.3M) [application/x-xz] Signed-off-by: Bruno Thomsen --- rules/dbus.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/dbus.make b/rules/dbus.make index 6ceae4c21..b4b1aa82e 100644 --- a/rules/dbus.make +++ b/rules/dbus.make @@ -20,7 +20,7 @@ DBUS_VERSION := 1.15.2 DBUS_MD5 := c56de960ea9031b92ee71aaa0e8e72c2 DBUS := dbus-$(DBUS_VERSION) DBUS_SUFFIX:= tar.xz -DBUS_URL := http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX) +DBUS_URL := https://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX) DBUS_SOURCE:= $(SRCDIR)/$(DBUS).$(DBUS_SUFFIX) DBUS_DIR := $(BUILDDIR)/$(DBUS) DBUS_LICENSE := AFL-2.1 AND GPL-2.0-or-later -- 2.37.3
[ptxdist] [PATCH 1/5] libcurl: update download URL
Downloading package result in http code 301 Moved Permanently from server. Update used URL to match redirect URL. --2022-10-20 11:25:26-- https://curl.haxx.se/download/curl-7.85.0.tar.xz Resolving curl.haxx.se (curl.haxx.se)... 151.101.66.49, 151.101.130.49, 151.101.194.49, ... Connecting to curl.haxx.se (curl.haxx.se)|151.101.66.49|:443... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://curl.se/download/curl-7.85.0.tar.xz [following] --2022-10-20 11:25:27-- https://curl.se/download/curl-7.85.0.tar.xz Resolving curl.se (curl.se)... 151.101.65.91, 151.101.129.91, 151.101.193.91, ... Connecting to curl.se (curl.se)|151.101.65.91|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2480648 (2.4M) [application/x-xz] Signed-off-by: Bruno Thomsen --- rules/libcurl.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/libcurl.make b/rules/libcurl.make index e5daf5395..4097462c5 100644 --- a/rules/libcurl.make +++ b/rules/libcurl.make @@ -19,7 +19,7 @@ LIBCURL_VERSION := 7.85.0 LIBCURL_MD5:= 131f76c84016c45806b902330a74164f LIBCURL:= curl-$(LIBCURL_VERSION) LIBCURL_SUFFIX := tar.xz -LIBCURL_URL:= https://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX) +LIBCURL_URL:= https://curl.se/download/$(LIBCURL).$(LIBCURL_SUFFIX) LIBCURL_SOURCE := $(SRCDIR)/$(LIBCURL).$(LIBCURL_SUFFIX) LIBCURL_DIR:= $(BUILDDIR)/$(LIBCURL) LIBCURL_LICENSE:= curl base-commit: 8b46f8923ebfeb2bd1ead374035255df1df26f85 -- 2.37.3
Re: [ptxdist] OPKG Dependent Package
Hi PranayChristian has fixed it upstream in this commit:https://git.pengutronix.de/cgit/ptxdist/commit/rules/host-opkg-utils.make?id=6dc8fedeee27ce2abd1b85ec047012c8bdc455a9So you need modify the .make file in your project and change suffix variable from tar.bz2 to tar.gz./BrunoFrom: ptxdist on behalf of Joshi, Pranay Sent: Thursday, October 20, 2022 08:29To: Michael Olbrich ; ptxdist@pengutronix.de ; ose...@community.pengutronix.de Subject: [ptxdist] OPKG Dependent Package Hi Michael, We are trying to build DistroKit-2019.12.0 BSP using PTXDist-2019.12.0, one of the dependent library is not available over web, please share the opkg-utils-0.4.1.tar.bz2Library in the .tar.bz2 format. Thanks Pranay JoshiLead Engineer-Firmware EngineeringDrilling ServicesBaker Hughes T +91 7208026212 Venlig hilsen / Best regards Bruno Thomsen Senior Software Developer R Electricity Meters & Concentrators Kamstrup A/S Industrivej 28 DK-8660 Skanderborg T: +45 89 93 10 00D: +45 89 93 13 94 b...@kamstrup.com kamstrup.com
[ptxdist] [PATCH v2] mmc-utils: add license files
Newly added README file clearly states that license is GPL-2.0-only. 3rdparty hmac_sha2 has a dual BSD and GPLv2 license when distributed with mmc-utils. Add README, mmc.c and 3rdparty/hmac_sha/sha2.h license header as license files. Signed-off-by: Bruno Thomsen --- rules/mmc-utils.make | 4 1 file changed, 4 insertions(+) diff --git a/rules/mmc-utils.make b/rules/mmc-utils.make index a5045b079..9a43c148b 100644 --- a/rules/mmc-utils.make +++ b/rules/mmc-utils.make @@ -23,6 +23,10 @@ MMC_UTILS_URL:= https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git;tag=$(M MMC_UTILS_SOURCE := $(SRCDIR)/$(MMC_UTILS).$(MMC_UTILS_SUFFIX) MMC_UTILS_DIR := $(BUILDDIR)/$(MMC_UTILS) MMC_UTILS_LICENSE := GPL-2.0-only AND BSD-3-Clause +MMC_UTILS_LICENSE_FILES := \ + file://README;startline=28;endline=31;md5=73e5e3ce638b21eca6e204e260201d4a \ + file://mmc.c;startline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d \ + file://3rdparty/hmac_sha/sha2.h;startline=1;endline=36;md5=6ce341e87c5fcac36e417f4a0e283afd # # Prepare base-commit: 8b46f8923ebfeb2bd1ead374035255df1df26f85 -- 2.37.3
[ptxdist] [PATCH 3/3] mmc-utils: update license
Newly added README file clearly states that license is GPL-2.0-only. Add README and mmc.c license header as license files. Signed-off-by: Bruno Thomsen --- rules/mmc-utils.make | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rules/mmc-utils.make b/rules/mmc-utils.make index a5045b079..4cbc4dc34 100644 --- a/rules/mmc-utils.make +++ b/rules/mmc-utils.make @@ -22,7 +22,10 @@ MMC_UTILS_SUFFIX := tar.gz MMC_UTILS_URL := https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git;tag=$(MMC_UTILS_VERSION) MMC_UTILS_SOURCE := $(SRCDIR)/$(MMC_UTILS).$(MMC_UTILS_SUFFIX) MMC_UTILS_DIR := $(BUILDDIR)/$(MMC_UTILS) -MMC_UTILS_LICENSE := GPL-2.0-only AND BSD-3-Clause +MMC_UTILS_LICENSE := GPL-2.0-only +MMC_UTILS_LICENSE_FILES := \ + file://README;startline=28;endline=31;md5=73e5e3ce638b21eca6e204e260201d4a \ + file://mmc.c;startline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d # # Prepare -- 2.37.3
[ptxdist] [PATCH 2/3] mmc-utils: version bump 2019-10-04-g73d6c59af8d1 -> 2022-09-27-gdfc3b6ecda84
Signed-off-by: Bruno Thomsen --- rules/mmc-utils.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/mmc-utils.make b/rules/mmc-utils.make index 4d9447dd2..a5045b079 100644 --- a/rules/mmc-utils.make +++ b/rules/mmc-utils.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_MMC_UTILS) += mmc-utils # Paths and names # # No tags: use a fake descriptive commit-ish to include the date -MMC_UTILS_VERSION := 2019-10-04-g73d6c59af8d1 -MMC_UTILS_MD5 := 5d7c8db4f1735111d42773799e1a84bc +MMC_UTILS_VERSION := 2022-09-27-gdfc3b6ecda84 +MMC_UTILS_MD5 := 791e4c512cb044045ae34d7f4b781ac1 MMC_UTILS := mmc-utils-$(MMC_UTILS_VERSION) MMC_UTILS_SUFFIX := tar.gz MMC_UTILS_URL := https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git;tag=$(MMC_UTILS_VERSION) -- 2.37.3
[ptxdist] [PATCH 1/3] mmc-utils: new upstream git location
The existing URL has been renamed with -old: https://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils-old.git New URL found in kernel documentation: https://www.kernel.org/doc/html/latest/driver-api/mmc/mmc-tools.html Signed-off-by: Bruno Thomsen --- rules/mmc-utils.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/mmc-utils.make b/rules/mmc-utils.make index 5929d0788..4d9447dd2 100644 --- a/rules/mmc-utils.make +++ b/rules/mmc-utils.make @@ -19,7 +19,7 @@ MMC_UTILS_VERSION := 2019-10-04-g73d6c59af8d1 MMC_UTILS_MD5 := 5d7c8db4f1735111d42773799e1a84bc MMC_UTILS := mmc-utils-$(MMC_UTILS_VERSION) MMC_UTILS_SUFFIX := tar.gz -MMC_UTILS_URL := https://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;tag=$(MMC_UTILS_VERSION) +MMC_UTILS_URL := https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git;tag=$(MMC_UTILS_VERSION) MMC_UTILS_SOURCE := $(SRCDIR)/$(MMC_UTILS).$(MMC_UTILS_SUFFIX) MMC_UTILS_DIR := $(BUILDDIR)/$(MMC_UTILS) MMC_UTILS_LICENSE := GPL-2.0-only AND BSD-3-Clause base-commit: 2904240113270c90686515a6b06af48d2d5332cf -- 2.37.3
[ptxdist] [PATCH] modemmanager: version bump 1.18.10 -> 1.18.12
NEWS ModemManager 1.18.12 https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/180c171e8d10340b2bb618f4e2bf2fc6eb13b0e6 This release fixes a bearer issue that is caused by longer network registration time after 2G and 3G network shutdown in Europe. https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/572 Signed-off-by: Bruno Thomsen --- rules/modemmanager.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/modemmanager.make b/rules/modemmanager.make index 9dd58dac0..f942b5a65 100644 --- a/rules/modemmanager.make +++ b/rules/modemmanager.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager # # Paths and names # -MODEMMANAGER_VERSION := 1.18.10 -MODEMMANAGER_MD5 := e3ed043771fdee6f2078b9e51ca5e56a +MODEMMANAGER_VERSION := 1.18.12 +MODEMMANAGER_MD5 := 9f014dfc59f1bd8bc230bb2c2974d104 MODEMMANAGER := ModemManager-$(MODEMMANAGER_VERSION) MODEMMANAGER_SUFFIX:= tar.xz MODEMMANAGER_URL := https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX) base-commit: 4390464ca6d1c03a01f38cc175fcfbaaf12a6465 -- 2.37.3
[ptxdist] [PATCH v2] kernel mirror url update
Downloading packages from kernel.org mirror result in http code 301
Moved Permanently from server. Update used URL to match redirect URL,
but still keep old as it's still linked to from https://www.kernel.org/.
Removed http://mirror.linux.org.au/linux as it is gone.
Removed http://www.linux-mips.org/pub/linux/mips as the certificate is
expired on the redirected site.
--2022-08-24 08:58:18--
https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.65.tar.xz
Resolving www.kernel.org (www.kernel.org)... 145.40.68.75, 2604:1380:4601:e00::1
Connecting to www.kernel.org (www.kernel.org)|145.40.68.75|:443... connected.
HTTP request sent, awaiting response... 301 Moved Permanently
Location:
https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.65.tar.xz
[following]
--2022-08-24 08:58:18--
https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.65.tar.xz
Resolving mirrors.edge.kernel.org (mirrors.edge.kernel.org)... 147.75.80.249,
2604:1380:4601:e00::3
Connecting to mirrors.edge.kernel.org
(mirrors.edge.kernel.org)|147.75.80.249|:443... connected.
HTTP request sent, awaiting response... 200 OK
Signed-off-by: Bruno Thomsen
---
Applying patch gives trailing whitespaces warnings as I have
included the raw updated version of ptxdistrc.
config/setup/Kconfig | 2 +-
config/setup/ptxdistrc.default | 11 +--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/config/setup/Kconfig b/config/setup/Kconfig
index 8f6a60eac..0a7db1678 100644
--- a/config/setup/Kconfig
+++ b/config/setup/Kconfig
@@ -160,7 +160,7 @@ config SETUP_GNUMIRROR
config SETUP_KERNELMIRROR
string
- default "https://www.kernel.org/pub/linux
http://www.linux-mips.org/pub/linux/mips http://mirror.linux.org.au/linux;
+ default "https://mirrors.edge.kernel.org/pub/linux
https://www.kernel.org/pub/linux;
prompt "kernel.org Mirror"
help
For all kernel.org related packages enter an available mirror here.
diff --git a/config/setup/ptxdistrc.default b/config/setup/ptxdistrc.default
index 6b66dcdd2..f50f23bec 100644
--- a/config/setup/ptxdistrc.default
+++ b/config/setup/ptxdistrc.default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# PTXdist 2020.10.0
+# PTXdist 2022.09.0
#
#
@@ -12,6 +12,7 @@
#
PTXCONF_SETUP_USER_NAME=""
PTXCONF_SETUP_USER_EMAIL=""
+# end of User
#
# Proxies
@@ -20,11 +21,13 @@ PTXCONF_SETUP_FTP_PROXY=""
PTXCONF_SETUP_HTTP_PROXY=""
PTXCONF_SETUP_HTTPS_PROXY=""
PTXCONF_SETUP_NO_PROXY=""
+# end of Proxies
#
# Source Directories
#
PTXCONF_SETUP_SRCDIR="${PTXDIST_WORKSPACE}/src"
+# end of Source Directories
#
# Source Download
@@ -35,7 +38,7 @@
PTXCONF_SETUP_PTXMIRROR="https://www.pengutronix.de/software/ptxdist/temporary-s
PTXCONF_SETUP_DEBMIRROR="http://ftp.uni-kl.de/debian
http://archive.debian.org/debian;
PTXCONF_SETUP_GNOMEMIRROR="https://download.gnome.org/sources
https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.gnome.org/sources;
PTXCONF_SETUP_GNUMIRROR="https://ftp.gnu.org/gnu https://ftpmirror.gnu.org;
-PTXCONF_SETUP_KERNELMIRROR="https://www.kernel.org/pub/linux
http://www.linux-mips.org/pub/linux/mips http://mirror.linux.org.au/linux;
+PTXCONF_SETUP_KERNELMIRROR="https://mirrors.edge.kernel.org/pub/linux
https://www.kernel.org/pub/linux;
PTXCONF_SETUP_PYPIMIRROR="https://files.pythonhosted.org/packages/source;
PTXCONF_SETUP_SFMIRROR="http://downloads.sourceforge.net/sourceforge;
PTXCONF_SETUP_XORGMIRROR="https://ftp.x.org/archive
https://xorg.freedesktop.org/releases;
@@ -43,16 +46,19 @@ PTXCONF_SETUP_CHECK_ALWAYS=y
# PTXCONF_SETUP_CHECK_NOTEMPTY is not set
# PTXCONF_SETUP_CHECK_NEVER is not set
PTXCONF_SETUP_CHECK="always"
+# end of Source Download
#
# IPKG Repository
#
PTXCONF_SETUP_IPKG_REPOSITORY="/var/www/ipkg-repository"
+# end of IPKG Repository
#
# Java SDK
#
PTXCONF_SETUP_JAVA_SDK="/usr/lib/jvm/default-java"
+# end of Java SDK
#
# Developer Options
@@ -74,3 +80,4 @@ PTXCONF_SETUP_HOST_CPP="cpp"
PTXCONF_SETUP_HOST_CC="gcc"
PTXCONF_SETUP_HOST_CXX="g++"
PTXCONF_SETUP_HOST_MAKE="make"
+# end of Developer Options
base-commit: 72884b2179f4aa10c4757e675ca57dc922f49c9d
--
2.37.3
[ptxdist] [PATCH] kernel mirror url updated
Downloading packages from kernel.org mirror result in http code 301 Moved Permanently from server. Update used URL to match redirect URL. --2022-08-24 08:58:18-- https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.65.tar.xz Resolving www.kernel.org (www.kernel.org)... 145.40.68.75, 2604:1380:4601:e00::1 Connecting to www.kernel.org (www.kernel.org)|145.40.68.75|:443... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.65.tar.xz [following] --2022-08-24 08:58:18-- https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.65.tar.xz Resolving mirrors.edge.kernel.org (mirrors.edge.kernel.org)... 147.75.80.249, 2604:1380:4601:e00::3 Connecting to mirrors.edge.kernel.org (mirrors.edge.kernel.org)|147.75.80.249|:443... connected. HTTP request sent, awaiting response... 200 OK Signed-off-by: Bruno Thomsen --- Not sure how to regenerate config/setup/ptxdistrc.default config/setup/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/setup/Kconfig b/config/setup/Kconfig index 8f6a60eac..77a231d29 100644 --- a/config/setup/Kconfig +++ b/config/setup/Kconfig @@ -160,7 +160,7 @@ config SETUP_GNUMIRROR config SETUP_KERNELMIRROR string - default "https://www.kernel.org/pub/linux http://www.linux-mips.org/pub/linux/mips http://mirror.linux.org.au/linux; + default "https://mirrors.edge.kernel.org/pub/linux http://www.linux-mips.org/pub/linux/mips http://mirror.linux.org.au/linux; prompt "kernel.org Mirror" help For all kernel.org related packages enter an available mirror here. base-commit: bdb6f5f98505a13dbeffda3dfdea4a4f3bf586c6 -- 2.37.2
[ptxdist] [PATCH] openssl: change URL from http to https
Downloading package result in http code 301 Moved Permanently from server. Update used URL to match redirect URL. --2022-08-24 07:00:29-- http://www.openssl.org/source/openssl-1.1.1q.tar.gz Resolving www.openssl.org (www.openssl.org)... 23.32.109.10, 2a02:26f0:a00:3ba::c1e, 2a02:26f0:a00:3a4::c1e Connecting to www.openssl.org (www.openssl.org)|23.32.109.10|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://www.openssl.org/source/openssl-1.1.1q.tar.gz [following] --2022-08-24 07:00:29-- https://www.openssl.org/source/openssl-1.1.1q.tar.gz Connecting to www.openssl.org (www.openssl.org)|23.32.109.10|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 9864061 (9.4M) [application/x-gzip] Signed-off-by: Bruno Thomsen --- rules/openssl.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/openssl.make b/rules/openssl.make index 7be6f1b6c..d6ba6b7e5 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -23,8 +23,8 @@ OPENSSL_MD5 := c685d239b6a6e1bd78be45624c092f51 OPENSSL:= openssl-$(OPENSSL_VERSION) OPENSSL_SUFFIX := tar.gz OPENSSL_URL:= \ - http://www.openssl.org/source/$(OPENSSL).$(OPENSSL_SUFFIX) \ - http://www.openssl.org/source/old/$(OPENSSL_BASE)/$(OPENSSL).$(OPENSSL_SUFFIX) + https://www.openssl.org/source/$(OPENSSL).$(OPENSSL_SUFFIX) \ + https://www.openssl.org/source/old/$(OPENSSL_BASE)/$(OPENSSL).$(OPENSSL_SUFFIX) OPENSSL_SOURCE := $(SRCDIR)/$(OPENSSL).$(OPENSSL_SUFFIX) OPENSSL_DIR:= $(BUILDDIR)/$(OPENSSL) OPENSSL_LICENSE:= OpenSSL base-commit: bdb6f5f98505a13dbeffda3dfdea4a4f3bf586c6 -- 2.37.2
[ptxdist] [PATCH] ca-certificates: version bump NSS_3_68_RTM -> NSS_3_82_RTM
MD5 fingerprints has been replaced with SHA256 fingerprints.
The following changes in list of trusted certificates.
Removed certificates:
$ diff certdata-NSS_3_{68,82}_RTM.txt -u | grep "# Certificate " | grep -- "-#
" | cut -c16-
"GlobalSign Root CA - R2"
"DST Root CA X3"
"Cybertrust Global Root"
"Explicitly Distrusted DigiNotar PKIoverheid G2"
"Hellenic Academic and Research Institutions RootCA 2011"
"GlobalSign ECC Root CA - R4"
"GTS Root R1"
"GTS Root R2"
"GTS Root R3"
"GTS Root R4"
Added certificates:
$ diff certdata-NSS_3_{68,82}_RTM.txt -u | grep "# Certificate " | grep -- "+#
" | cut -c16-
"TunTrust Root CA"
"HARICA TLS RSA Root CA 2021"
"HARICA TLS ECC Root CA 2021"
"HARICA Client RSA Root CA 2021"
"HARICA Client ECC Root CA 2021"
"Autoridad de Certificacion Firmaprofesional CIF A62634068"
"vTrus ECC Root CA"
"vTrus Root CA"
"ISRG Root X2"
"HiPKI Root CA - G1"
"GlobalSign ECC Root CA - R4"
"GTS Root R1"
"GTS Root R2"
"GTS Root R3"
"GTS Root R4"
"Telia Root CA v2"
"D-TRUST BR Root CA 1 2020"
"D-TRUST EV Root CA 1 2020"
"DigiCert TLS ECC P384 Root G5"
"DigiCert TLS RSA4096 Root G5"
"DigiCert SMIME ECC P384 Root G5"
"DigiCert SMIME RSA4096 Root G5"
"Certainly Root R1"
"Certainly Root E1"
"E-Tugra Global Root CA RSA v3"
"E-Tugra Global Root CA ECC v3"
There seems to be a new sorting of some certificates, so that is way
the following are on both lists.
"GlobalSign ECC Root CA - R4
"GTS Root R1"
"GTS Root R2"
"GTS Root R3"
"GTS Root R4"
Signed-off-by: Bruno Thomsen
---
rules/ca-certificates.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/ca-certificates.make b/rules/ca-certificates.make
index 1a1bec5e7..a9b6454f1 100644
--- a/rules/ca-certificates.make
+++ b/rules/ca-certificates.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_CA_CERTIFICATES) += ca-certificates
#
# Paths and names
#
-CA_CERTIFICATES_VERSION:= NSS_3_68_RTM
-CA_CERTIFICATES_MD5:= dd24833986a20d246a791be29f99acd9
+CA_CERTIFICATES_VERSION:= NSS_3_82_RTM
+CA_CERTIFICATES_MD5:= 1f52e5ce5b8a9c45f9098feb317b4e2d
CA_CERTIFICATES:=
ca-certificates-$(CA_CERTIFICATES_VERSION)
CA_CERTIFICATES_SUFFIX := txt
CA_CERTIFICATES_URL:=
https://hg.mozilla.org/projects/nss/raw-file/$(CA_CERTIFICATES_VERSION)/lib/ckfw/builtins/certdata.$(CA_CERTIFICATES_SUFFIX)
base-commit: bdb6f5f98505a13dbeffda3dfdea4a4f3bf586c6
--
2.37.2
[ptxdist] [PATCH v2] tpm2-abrmd: remove unused dbus-glib host dependency
Avoid including dbus-glib in build pipeline as it is a deprecated D-Bus binding for GLib. https://gitlab.freedesktop.org/dbus/dbus-glib/-/blob/master/README Signed-off-by: Bruno Thomsen --- rules/tpm2-abrmd.in | 1 - 1 file changed, 1 deletion(-) diff --git a/rules/tpm2-abrmd.in b/rules/tpm2-abrmd.in index 1ab0a6a7f..de76f60a6 100644 --- a/rules/tpm2-abrmd.in +++ b/rules/tpm2-abrmd.in @@ -6,7 +6,6 @@ config TPM2_ABRMD select DBUS select GLIB select TPM2_TSS - select HOST_DBUS_GLIB prompt "tpm2-abrmd" help TPM2 Access Broker & Resource Management Daemon implementing base-commit: 4081bfcc3cc8b5f62e31befef7ed9565a2bd186d -- 2.37.1
Re: [ptxdist] [PATCH] tpm2-abrmd: change host dependencies based on INITMETHOD
Den tor. 4. aug. 2022 kl. 17.23 skrev Michael Olbrich : > > On Wed, Aug 03, 2022 at 06:56:55AM +0200, Bruno Thomsen wrote: > > dbus-glib is a deprecated D-Bus binding for GLib. > > https://gitlab.freedesktop.org/dbus/dbus-glib/-/blob/master/README > > > > Only use HOST_DBUS_GLIB with BBINIT to avoid pulling in a deprecated > > component in systemd based image. > > Doing a total clean and prepare/compile of this package in a systemd > > based image provides all needed dependencies. And tpm2-abrmd.service > > is running just fine. > > > > Signed-off-by: Bruno Thomsen > > --- > > rules/tpm2-abrmd.in | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/rules/tpm2-abrmd.in b/rules/tpm2-abrmd.in > > index 1ab0a6a7fe0e..fda6e746432b 100644 > > --- a/rules/tpm2-abrmd.in > > +++ b/rules/tpm2-abrmd.in > > @@ -6,7 +6,7 @@ config TPM2_ABRMD > > select DBUS > > select GLIB > > select TPM2_TSS > > - select HOST_DBUS_GLIB > > + select HOST_DBUS_GLIB if INITMETHOD_BBINIT > > Hmm, did you see anything where this is needed for INITMETHOD_BBINIT? From > what I can tell, nothing refers to dbus-glib any more in the current > version. No, I was just unable to compile/runtime test it on a BBINIT based system as the one I have was failing due to some other issue with DBUS (ptxdist 2017.10.0 with lots of rules backporting). So I just wanted to make sure I did not break this package for other BBINIT users, but I can send a v2 where we just unconditionally drop this compile dependency. /Bruno
[ptxdist] [PATCH] tpm2-abrmd: change host dependencies based on INITMETHOD
dbus-glib is a deprecated D-Bus binding for GLib. https://gitlab.freedesktop.org/dbus/dbus-glib/-/blob/master/README Only use HOST_DBUS_GLIB with BBINIT to avoid pulling in a deprecated component in systemd based image. Doing a total clean and prepare/compile of this package in a systemd based image provides all needed dependencies. And tpm2-abrmd.service is running just fine. Signed-off-by: Bruno Thomsen --- rules/tpm2-abrmd.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/tpm2-abrmd.in b/rules/tpm2-abrmd.in index 1ab0a6a7fe0e..fda6e746432b 100644 --- a/rules/tpm2-abrmd.in +++ b/rules/tpm2-abrmd.in @@ -6,7 +6,7 @@ config TPM2_ABRMD select DBUS select GLIB select TPM2_TSS - select HOST_DBUS_GLIB + select HOST_DBUS_GLIB if INITMETHOD_BBINIT prompt "tpm2-abrmd" help TPM2 Access Broker & Resource Management Daemon implementing base-commit: faf247a8448d4d9caae487beb54d285ac3a6a1b8 -- 2.37.1
[ptxdist] [PATCH v2] gnupg: add license files and update spdx identifiers
Add license files with md5 hash.
Add more complete SPDX identifiers based on package COPYING* files.
COPYING.CC0 is not included as it's only used for tests.
COPYING.other contain the following licenses that are not test files:
- MIT
- Spencer-86
- BSD-2-Clause-Views
- Unicode-DFS-2016
Signed-off-by: Bruno Thomsen
---
v2:
Include licenses from COPYING.other file.
*GPL*-{only,or-later}
I have not resend the other 5 patches in the series to avoid spamming.
rules/gnupg.make | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/rules/gnupg.make b/rules/gnupg.make
index 25d267769443..d6c53c7cafcd 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -24,7 +24,13 @@ GNUPG_URL:= \
ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX)
GNUPG_SOURCE := $(SRCDIR)/$(GNUPG).$(GNUPG_SUFFIX)
GNUPG_DIR := $(BUILDDIR)/$(GNUPG)
-GNUPG_LICENSE := GPL-3.0-or-later
+GNUPG_LICENSE := GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later
AND LGPL-3.0-or-later AND MIT AND Spencer-86 AND BSD-2-Clause-Views AND
Unicode-DFS-2016
+GNUPG_LICENSE_FILES := \
+ file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \
+ file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://COPYING.LGPL21;md5=3c9636424f4ef15d6cb24f934190cfb0 \
+ file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257 \
+ file://COPYING.other;md5=a231ccb4bb5b0651e08464e4e6f846d3
#
# Prepare
--
2.37.1
[ptxdist] [PATCH 5/6] gnupg: version bump 2.2.23 -> 2.3.7
3 options has been remove: --enable-gpg --disable-symcryptrun --with-tar=PATH 6 options has been added: --disable-keyboxd --disable-tpm2d --enable-log-clock --with-tpm2daemon-pgm=PATH --with-keyboxd-pgm=PATH --with-tss=TSS Signed-off-by: Bruno Thomsen --- rules/gnupg.make | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rules/gnupg.make b/rules/gnupg.make index 25d267769443..acb4d2082050 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GNUPG) += gnupg # # Paths and names # -GNUPG_VERSION := 2.2.23 -GNUPG_MD5 := a094ff856a53a9a9fd5465657d998079 +GNUPG_VERSION := 2.3.7 +GNUPG_MD5 := 1c6a6722b9cececcf10ca4e24106e34b GNUPG := gnupg-$(GNUPG_VERSION) GNUPG_SUFFIX := tar.bz2 GNUPG_URL := \ @@ -32,13 +32,13 @@ GNUPG_LICENSE := GPL-3.0-or-later GNUPG_CONF_TOOL := autoconf GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \ - --enable-gpg \ --disable-gpgsm \ --disable-scdaemon \ --disable-g13 \ --disable-dirmngr \ + --disable-keyboxd \ + --disable-tpm2d \ --disable-doc \ - --disable-symcryptrun \ --disable-gpgtar \ --disable-wks-tools \ --disable-gpg-is-gpg2 \ @@ -83,6 +83,7 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \ --disable-nls \ --enable-endian-check \ --enable-optimization \ + --disable-log-clock \ --disable-werror \ --disable-all-tests \ --disable-run-gnupg-user-socket \ -- 2.37.1
[ptxdist] [PATCH 4/6] libksba: version bump 1.3.5 -> 1.6.0
2 new configure options: --enable-gcov --disable-doc Signed-off-by: Bruno Thomsen --- rules/libksba.make | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/libksba.make b/rules/libksba.make index 0604beb1fa53..8503fa6cad2d 100644 --- a/rules/libksba.make +++ b/rules/libksba.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBKSBA) += libksba # # Paths and names # -LIBKSBA_VERSION:= 1.3.5 -LIBKSBA_MD5:= 8302a3e263a7c630aa7dea7d341f07a2 +LIBKSBA_VERSION:= 1.6.0 +LIBKSBA_MD5:= d333b2e1381068d4f9a328240f062f0f LIBKSBA:= libksba-$(LIBKSBA_VERSION) LIBKSBA_SUFFIX := tar.bz2 LIBKSBA_URL:= \ @@ -38,7 +38,9 @@ LIBKSBA_LICENSE_FILES := \ # LIBKSBA_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ + --disable-gcov \ --enable-build-timestamp="$(PTXDIST_BUILD_TIMESTAMP)" \ + --disable-doc \ --enable-optimization # -- 2.37.1
[ptxdist] [PATCH 3/6] libgcrypt: version bump 1.8.8 -> 1.10.1
5 new configure options: --enable-force-soft-hwfeatures --disable-shaext-support --disable-ppc-crypto-support --disable-instrumentation-munging --with-fips-module-version=VERSION Signed-off-by: Bruno Thomsen --- rules/libgcrypt.make | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rules/libgcrypt.make b/rules/libgcrypt.make index 8b0b39d0965a..3da2f434ce5e 100644 --- a/rules/libgcrypt.make +++ b/rules/libgcrypt.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBGCRYPT) += libgcrypt # # Paths and names # -LIBGCRYPT_VERSION := 1.8.8 -LIBGCRYPT_MD5 := 252045343c586e5261134c91330f5b90 +LIBGCRYPT_VERSION := 1.10.1 +LIBGCRYPT_MD5 := 8fadbe1fddafa341dce5ef3869f70e25 LIBGCRYPT := libgcrypt-$(LIBGCRYPT_VERSION) LIBGCRYPT_SUFFIX := tar.bz2 LIBGCRYPT_URL := https://www.gnupg.org/ftp/gcrypt/libgcrypt/$(LIBGCRYPT).$(LIBGCRYPT_SUFFIX) @@ -57,10 +57,12 @@ LIBGCRYPT_AUTOCONF := \ --$(call ptx/endis,LIBGCRYPT_ASM)-asm \ --disable-m-guard \ --disable-large-data-tests \ + --disable-force-soft-hwfeatures \ --disable-hmac-binary-check \ --enable-jent-support \ --enable-padlock-support \ --enable-aesni-support \ + --disable-shaext-support \ --enable-pclmul-support \ --enable-sse41-support \ --enable-drng-support \ @@ -68,7 +70,9 @@ LIBGCRYPT_AUTOCONF := \ --enable-avx2-support \ --$(call ptx/endis,PTXCONF_ARCH_ARM_NEON)-neon-support \ --enable-arm-crypto-support \ + --disable-ppc-crypto-support \ --enable-O-flag-munging \ + --disable-instrumentation-munging \ --disable-amd64-as-feature-detection \ --enable-optimization \ --enable-noexecstack \ -- 2.37.1
[ptxdist] [PATCH 6/6] gnupg: add license files and update spdx identifiers
Add license files with md5 hash. Add more complete SPDX identifiers based on package COPYING* files. Signed-off-by: Bruno Thomsen --- rules/gnupg.make | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rules/gnupg.make b/rules/gnupg.make index acb4d2082050..09132832791b 100644 --- a/rules/gnupg.make +++ b/rules/gnupg.make @@ -24,7 +24,14 @@ GNUPG_URL:= \ ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX) GNUPG_SOURCE := $(SRCDIR)/$(GNUPG).$(GNUPG_SUFFIX) GNUPG_DIR := $(BUILDDIR)/$(GNUPG) -GNUPG_LICENSE := GPL-3.0-or-later +GNUPG_LICENSE := GPL-2.0-only AND GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only +GNUPG_LICENSE_FILES := \ + file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \ + file://COPYING.CC0;md5=5364f88a4fb7a4d2d24c350fa08ddbad \ + file://COPYING.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LGPL21;md5=3c9636424f4ef15d6cb24f934190cfb0 \ + file://COPYING.LGPL3;md5=a2b6bf2cb38ee52619e60f30a1fc7257 \ + file://COPYING.other;md5=a231ccb4bb5b0651e08464e4e6f846d3 # # Prepare -- 2.37.1
[ptxdist] [PATCH 2/6] libgpg-error: version bump 1.42 -> 1.45
Drop Fedora cross compilation patch as issue has been fixed upstream. Signed-off-by: Bruno Thomsen --- ...1-fix-the-last-cross-compilation-fix.patch | 55 --- patches/libgpg-error-1.42/series | 4 -- rules/libgpg-error.make | 4 +- 3 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 patches/libgpg-error-1.42/0001-fix-the-last-cross-compilation-fix.patch delete mode 100644 patches/libgpg-error-1.42/series diff --git a/patches/libgpg-error-1.42/0001-fix-the-last-cross-compilation-fix.patch b/patches/libgpg-error-1.42/0001-fix-the-last-cross-compilation-fix.patch deleted file mode 100644 index 6776ff10fc7b.. --- a/patches/libgpg-error-1.42/0001-fix-the-last-cross-compilation-fix.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Lucas Stach -Date: Sat, 11 Sep 2021 01:52:35 +0200 -Subject: [PATCH] fix the last cross-compilation fix - -Instead of trying to figure out which way to call echo in order to supress -the newline and apparently getting it wrong on some platforms (on a Fedora -build host compilation fails due to stray \c characters in the generated -files) use the POSIX recommended portable way of calling printf. - -Signed-off-by: Lucas Stach - src/gen-lock-obj.sh | 16 - 1 file changed, 4 insertions(+), 12 deletions(-) - -diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh -index a710f0ccee5a..aea9edb6095a 100755 a/src/gen-lock-obj.sh -+++ b/src/gen-lock-obj.sh -@@ -38,14 +38,6 @@ - # AWK=gawk ./gen-lock-obj.sh - # - --if test -n `echo -n`; then --ECHO_C='\c' --ECHO_N='' --else --ECHO_C='' --ECHO_N='-n' --fi -- - if test "$1" = --disable-threads; then - cat <
[ptxdist] [PATCH 1/6] npth: version bump 1.5 -> 1.6
Ensure GnuPG has up-to-date dependencies. Signed-off-by: Bruno Thomsen --- rules/npth.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/npth.make b/rules/npth.make index 665668fd524f..baa9ab3aabab 100644 --- a/rules/npth.make +++ b/rules/npth.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NPTH) += npth # # Paths and names # -NPTH_VERSION := 1.5 -NPTH_MD5 := 9ba2dc4302d2f32c66737c43ed191b1b +NPTH_VERSION := 1.6 +NPTH_MD5 := 375d1a15ad969f32d25f1a7630929854 NPTH := npth-$(NPTH_VERSION) NPTH_SUFFIX:= tar.bz2 NPTH_URL := \ base-commit: 02f8e5e7cb2ae088b69bfd2d75ba9e702eeaac5f -- 2.37.1
[ptxdist] [PATCH 2/2] modemmanager: version bump 1.16.6 -> 1.18.10
Disable new QRTR option as it requires Qualcomm IPC Router support (CONFIG_QRTR) in the kernel. Signed-off-by: Bruno Thomsen --- rules/modemmanager.make | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rules/modemmanager.make b/rules/modemmanager.make index 43d8e607e910..9dd58dac0998 100644 --- a/rules/modemmanager.make +++ b/rules/modemmanager.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager # # Paths and names # -MODEMMANAGER_VERSION := 1.16.6 -MODEMMANAGER_MD5 := bde995400758db3a98c886608c2d5d9d +MODEMMANAGER_VERSION := 1.18.10 +MODEMMANAGER_MD5 := e3ed043771fdee6f2078b9e51ca5e56a MODEMMANAGER := ModemManager-$(MODEMMANAGER_VERSION) MODEMMANAGER_SUFFIX:= tar.xz MODEMMANAGER_URL := https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX) @@ -51,6 +51,7 @@ MODEMMANAGER_CONF_OPT := \ --enable-all-plugins \ --with-gnu-ld \ --without-gcov \ + --without-qrtr \ --with-dbus-sys-dir=/usr/share/dbus-1/system.d \ --with-udev-base-dir=/usr/lib/udev \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ -- 2.37.1
[ptxdist] [PATCH 1/2] libqmi: version bump 1.30.6 -> 1.30.8
modemmanager version 1.18.10 requires libqmi 1.30.8. Signed-off-by: Bruno Thomsen --- rules/libqmi.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/libqmi.make b/rules/libqmi.make index 2c4a61b5a085..4607cf7785a9 100644 --- a/rules/libqmi.make +++ b/rules/libqmi.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBQMI) += libqmi # # Paths and names # -LIBQMI_VERSION := 1.30.6 -LIBQMI_MD5 := ddfe075d83c091a69f9e5e1c1c624af5 +LIBQMI_VERSION := 1.30.8 +LIBQMI_MD5 := 5ec8838914f80e1dfa4d2fa8cc2f186d LIBQMI := libqmi-$(LIBQMI_VERSION) LIBQMI_SUFFIX := tar.xz LIBQMI_URL := http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFFIX) base-commit: 02f8e5e7cb2ae088b69bfd2d75ba9e702eeaac5f -- 2.37.1
[ptxdist] [PATCH] mobile-broadband-provider-info: ver bump 20190618 -> 20220725
3 years of improvements.
Signed-off-by: Bruno Thomsen
---
.../autogen.sh| 0
rules/mobile-broadband-provider-info.make | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename patches/{mobile-broadband-provider-info-20190618 =>
mobile-broadband-provider-info-20220725}/autogen.sh (100%)
diff --git a/patches/mobile-broadband-provider-info-20190618/autogen.sh
b/patches/mobile-broadband-provider-info-20220725/autogen.sh
similarity index 100%
rename from patches/mobile-broadband-provider-info-20190618/autogen.sh
rename to patches/mobile-broadband-provider-info-20220725/autogen.sh
diff --git a/rules/mobile-broadband-provider-info.make
b/rules/mobile-broadband-provider-info.make
index f5adb6a5cfcd..04ff96c79cfa 100644
--- a/rules/mobile-broadband-provider-info.make
+++ b/rules/mobile-broadband-provider-info.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MOBILE_BROADBAND_PROVIDER_INFO) +=
mobile-broadband-provider-
#
# Paths and names
#
-MOBILE_BROADBAND_PROVIDER_INFO_VERSION := 20190618
-MOBILE_BROADBAND_PROVIDER_INFO_MD5 := ffd3ade88953ce3cac9e548949745609
+MOBILE_BROADBAND_PROVIDER_INFO_VERSION := 20220725
+MOBILE_BROADBAND_PROVIDER_INFO_MD5 := f283369e5b1d46a77bded8f7754ad3c3
MOBILE_BROADBAND_PROVIDER_INFO :=
mobile-broadband-provider-info-$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION)
MOBILE_BROADBAND_PROVIDER_INFO_SUFFIX := tar.xz
MOBILE_BROADBAND_PROVIDER_INFO_URL := $(call ptx/mirror, GNOME,
mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION)/$(MOBILE_BROADBAND_PROVIDER_INFO).$(MOBILE_BROADBAND_PROVIDER_INFO_SUFFIX))
base-commit: 02f8e5e7cb2ae088b69bfd2d75ba9e702eeaac5f
--
2.37.1
[ptxdist] [PATCH] dropbear: change URL from http to https
Downloading package result in http code 301 Moved Permanently from server. Update used URL to match redirect URL. --2022-06-27 06:54:09-- http://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 Resolving matt.ucc.asn.au (matt.ucc.asn.au)... 104.26.9.126, 172.67.72.143, 104.26.8.126, ... Connecting to matt.ucc.asn.au (matt.ucc.asn.au)|104.26.9.126|:80... connected. HTTP request sent, awaiting response... 301 Moved Permanently Location: https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 [following] --2022-06-27 06:54:10-- https://matt.ucc.asn.au/dropbear/releases/dropbear-2020.81.tar.bz2 Connecting to matt.ucc.asn.au (matt.ucc.asn.au)|104.26.9.126|:443... connected. HTTP request sent, awaiting response... 200 OK Length: 2289644 (2.2M) [application/x-bzip2] Signed-off-by: Bruno Thomsen --- rules/dropbear.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/dropbear.make b/rules/dropbear.make index 066453259..cb949d761 100644 --- a/rules/dropbear.make +++ b/rules/dropbear.make @@ -20,7 +20,7 @@ DROPBEAR_VERSION := 2020.81 DROPBEAR_MD5 := a07438a6159a24c61f98f1bce2d479c0 DROPBEAR := dropbear-$(DROPBEAR_VERSION) DROPBEAR_SUFFIX:= tar.bz2 -DROPBEAR_URL := http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX) +DROPBEAR_URL := https://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX) DROPBEAR_SOURCE:= $(SRCDIR)/$(DROPBEAR).$(DROPBEAR_SUFFIX) DROPBEAR_DIR := $(BUILDDIR)/$(DROPBEAR) DROPBEAR_LICENSE := \ base-commit: 85010b0d7eb9d209cdc2dc61e955289556ecac43 -- 2.36.1
[ptxdist] [PATCH v3 2/2] python3-falcon: new package
The Falcon Web Framework. Signed-off-by: Bruno Thomsen --- v3 changes: Upstream release was changed without version bump to fix egg packaging, and some documentation / CI changes. Hash change was spotted by mol. v2 changes: None. rules/python3-falcon.in | 12 + rules/python3-falcon.make | 54 +++ 2 files changed, 66 insertions(+) create mode 100644 rules/python3-falcon.in create mode 100644 rules/python3-falcon.make diff --git a/rules/python3-falcon.in b/rules/python3-falcon.in new file mode 100644 index ..eac42244edab --- /dev/null +++ b/rules/python3-falcon.in @@ -0,0 +1,12 @@ +## SECTION=python3 + +config PYTHON3_FALCON + bool + select PYTHON3 + select PYTHON3_GUNICORN + prompt "falcon" + help + The Falcon Web Framework. + Falcon is a minimalist ASGI/WSGI framework for building + mission-critical REST APIs and microservices, with a focus + on reliability, correctness, and performance at scale. diff --git a/rules/python3-falcon.make b/rules/python3-falcon.make new file mode 100644 index ..ee81c6c02f6a --- /dev/null +++ b/rules/python3-falcon.make @@ -0,0 +1,54 @@ +# -*-makefile-*- +# +# Copyright (C) 2022 by Bruno Thomsen +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_FALCON) += python3-falcon + +# +# Paths and names +# +PYTHON3_FALCON_VERSION := 3.1.0 +PYTHON3_FALCON_MD5 := 0172450908573a4449a5937810d512b9 +PYTHON3_FALCON := falcon-$(PYTHON3_FALCON_VERSION) +PYTHON3_FALCON_SUFFIX := tar.gz +PYTHON3_FALCON_URL := $(call ptx/mirror-pypi, falcon, $(PYTHON3_FALCON).$(PYTHON3_FALCON_SUFFIX)) +PYTHON3_FALCON_SOURCE := $(SRCDIR)/$(PYTHON3_FALCON).$(PYTHON3_FALCON_SUFFIX) +PYTHON3_FALCON_DIR := $(BUILDDIR)/$(PYTHON3_FALCON) +PYTHON3_FALCON_LICENSE := Apache-2.0 +PYTHON3_FALCON_LICENSE_FILES := \ + file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 + +# +# Prepare +# + +PYTHON3_FALCON_CONF_TOOL := python3 + +# +# Target-Install +# + +$(STATEDIR)/python3-falcon.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-falcon) + @$(call install_fixup, python3-falcon,PRIORITY,optional) + @$(call install_fixup, python3-falcon,SECTION,base) + @$(call install_fixup, python3-falcon,AUTHOR,"Bruno Thomsen ") + @$(call install_fixup, python3-falcon,DESCRIPTION,missing) + + @$(call install_glob, python3-falcon, 0, 0, -, \ + $(PYTHON3_SITEPACKAGES),, *.py) + + @$(call install_finish, python3-falcon) + + @$(call touch) + +# vim: syntax=make -- 2.35.3
[ptxdist] [PATCH v3 1/2] python3-gunicorn: new package
Gunicorn 'Green Unicorn' is a Python WSGI HTTP Server for UNIX. Requirement for python3-falcon package. Signed-off-by: Bruno Thomsen --- v3 changes: None. v2 changes: Upstream release was changed without version bump to fix egg packaging. Hash change was spotted by mol. rules/python3-gunicorn.in | 11 +++ rules/python3-gunicorn.make | 57 + 2 files changed, 68 insertions(+) create mode 100644 rules/python3-gunicorn.in create mode 100644 rules/python3-gunicorn.make diff --git a/rules/python3-gunicorn.in b/rules/python3-gunicorn.in new file mode 100644 index ..d010ea9002bd --- /dev/null +++ b/rules/python3-gunicorn.in @@ -0,0 +1,11 @@ +## SECTION=python3 + +config PYTHON3_GUNICORN + bool + select PYTHON3 + prompt "gunicorn" + help + Gunicorn 'Green Unicorn' is a Python WSGI HTTP Server for UNIX. + It's a pre-fork worker model. The Gunicorn server is broadly + compatible with various web frameworks, simply implemented, + light on server resources, and fairly speedy. diff --git a/rules/python3-gunicorn.make b/rules/python3-gunicorn.make new file mode 100644 index ..e6959d557a0f --- /dev/null +++ b/rules/python3-gunicorn.make @@ -0,0 +1,57 @@ +# -*-makefile-*- +# +# Copyright (C) 2022 by Bruno Thomsen +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_PYTHON3_GUNICORN) += python3-gunicorn + +# +# Paths and names +# +PYTHON3_GUNICORN_VERSION := 20.1.0 +PYTHON3_GUNICORN_MD5 := db8a7c5c2064000af70286534803bf1d +PYTHON3_GUNICORN := gunicorn-$(PYTHON3_GUNICORN_VERSION) +PYTHON3_GUNICORN_SUFFIX:= tar.gz +PYTHON3_GUNICORN_URL := $(call ptx/mirror-pypi, gunicorn, $(PYTHON3_GUNICORN).$(PYTHON3_GUNICORN_SUFFIX)) +PYTHON3_GUNICORN_SOURCE:= $(SRCDIR)/$(PYTHON3_GUNICORN).$(PYTHON3_GUNICORN_SUFFIX) +PYTHON3_GUNICORN_DIR := $(BUILDDIR)/$(PYTHON3_GUNICORN) +PYTHON3_GUNICORN_LICENSE := MIT +PYTHON3_GUNICORN_LICENSE_FILES := \ + file://LICENSE;md5=f75f3fb94cdeab1d607e2adaa6077752 + +# +# Prepare +# + +PYTHON3_GUNICORN_CONF_TOOL := python3 +PYTHON3_GUNICORN_MAKE_OPT := install_scripts + +# +# Target-Install +# + +$(STATEDIR)/python3-gunicorn.targetinstall: + @$(call targetinfo) + + @$(call install_init, python3-gunicorn) + @$(call install_fixup, python3-gunicorn,PRIORITY,optional) + @$(call install_fixup, python3-gunicorn,SECTION,base) + @$(call install_fixup, python3-gunicorn,AUTHOR,"Bruno Thomsen ") + @$(call install_fixup, python3-gunicorn,DESCRIPTION,missing) + + @$(call install_glob, python3-gunicorn, 0, 0, -, \ + $(PYTHON3_SITEPACKAGES),, *.py) + + @$(call install_copy, python3-gunicorn, 0, 0, 0775, -, /usr/bin/gunicorn) + + @$(call install_finish, python3-gunicorn) + + @$(call touch) + +# vim: syntax=make base-commit: e66dc8546cc32f828c290fea029cffce5b1157d9 -- 2.35.3
Re: [ptxdist] [PATCH 1/2] python3-gunicorn: new package
Den ons. 18. maj 2022 kl. 15.47 skrev Michael Olbrich : > > On Sat, May 14, 2022 at 12:50:33PM +0200, Bruno Thomsen wrote: > > Den fre. 13. maj 2022 kl. 09.15 skrev Michael Olbrich > > : > > > On Mon, May 09, 2022 at 02:05:47PM +0200, Bruno Thomsen wrote: > > > > Gunicorn 'Green Unicorn' is a Python WSGI HTTP Server for UNIX. > > > > I will send a version 2 of the patch. > > Thanks for digging into this. Unfortunately python3-falcon seems to have > the same issue now :-/. > Looks like the same type of changes where egg packaging has been added, and some documentation/examples/CI has been removed. Full package diff below. Maybe using the latest version of python packages isn't a great idea for the future as they seem pretty happy about silent fixing archives after release :-/ /Bruno ---8<- --- c9a1081d1af6df4c5d11843238dbb27b.log 2022-05-19 18:03:32.273676277 +0200 +++ 0172450908573a4449a5937810d512b9.log 2022-05-19 18:03:32.290676321 +0200 @@ -1,14 +1,4 @@ -./falcon-3.1.0/AUTHORS e138ab040abb925116819a9992b16c325f1780a8ca5893bde7e782ce1b7778f0 -./falcon-3.1.0/BACKERS.md 29a764784d04bf0c7323300f89511e425b4a9cd8c0a6610cad0a16c14aaf6004 -./falcon-3.1.0/CHANGES.rst d4c21f6ba9bc69bf4640ac1a6bb32b4eb5cc3555b746f0b33d26fc0abc7e21f8 -./falcon-3.1.0/CODEOFCONDUCT.md 6111a78ee608beac41dc28eaa3e74083c14861878fed6b37577ca859b0f410d1 -./falcon-3.1.0/CONTRIBUTING.md 43cd117f20a097f273a35e430dbe57bd253688ffe948388da62e03e9b6a01f3c ./falcon-3.1.0/.coveragerc ce2407b0767ab9ceba1a17b1f57714dfa9c73296184910a49f5ba0d9f873744e -./falcon-3.1.0/docker/benchmark.sh ff56ced4941671d4cc0e12340d74464995eac3133fcd5e3f04641a8ab288 -./falcon-3.1.0/docker/bench_py3_cython.Dockerfile 69fd3225856ee2a3c9d4c29bd28aeec6b2aea9f0faad2e5a8a3ed5f21048bbf2 -./falcon-3.1.0/docker/bench_py3.Dockerfile a5dfb5ee3381434986a7043b109c894ae6d86168f553cdefb803ecbf419c70b9 -./falcon-3.1.0/docker/bench_pypy3.Dockerfile 84ff3cf5f7408861baeabe9df688c3422cc990599ca5e82264711d79d434fb3f -./falcon-3.1.0/docker/Makefile 5f4c00c4feadac6437be4ce7f1e7cdebe8cf6ed42602bf5ac3610535411c4b37 ./falcon-3.1.0/docs/api/api.rst 7786475c4d6f57a6e53d175323a400e158df36b554d70faaa796769b167572ad ./falcon-3.1.0/docs/api/app.rst 8a5a703bc98004a8a90cf69e09ff1e35acfac61745d01093c5e8a4926ea39294 ./falcon-3.1.0/docs/api/cookies.rst 52af736d52549a811a8cc08cdea98e04677746ae396f09fd5a751bf2bf2aef67 @@ -46,21 +36,11 @@ ./falcon-3.1.0/docs/community/help.rst 166a838e673f459427e5bb54d5a1fc0aed4e98269811c61efa71cc92dcd04b9c ./falcon-3.1.0/docs/community/index.rst 9539d70483191acb052f0e67451f5c57765ad7970ae4e858ba45cfb0f6210f0d ./falcon-3.1.0/docs/conf.py 8eb9d22afdb8ca50b362246111e72b667a0e4c458c6252a22b5b2d0b37d35955 -./falcon-3.1.0/docs/_content/corinne-kutz-211251.jpg 86011fd4564027c0859cb6e9a23382d6e8678b3d5e27f9bf85e48bc9ddee3253 -./falcon-3.1.0/docs/_content/govcert.png 914f0aa221efbd4026253175f6b1eb798c6ec8dd53b89340685c1c523d0d5104 -./falcon-3.1.0/docs/_content/likalo.svg 378a6ba27c20ec390970e30123d80798566ac3fe1eb000a2a6ad644887c47a8e -./falcon-3.1.0/docs/_content/luhnar.svg 2d0e06c4e6746999166913871ab6adc4203fff5e075cec0122b7a1595132605c -./falcon-3.1.0/docs/_content/sidebar-sponsors.html 58fd62371f1012c00a03858469229b81d7d3ba81fe584b951da7a213f9bcf88a ./falcon-3.1.0/docs/deploy/index.rst ec1845bf567f8c1f73405a866da20fa595c4e7749f7c30903566afc31c373e8f ./falcon-3.1.0/docs/deploy/intro.rst f53ae833979c5853011edbca29d0536d5b2236603002807aa072921faa76bcb3 ./falcon-3.1.0/docs/deploy/nginx-uwsgi.rst 260185d71bb96fad540f565bee86466417dac36068f5b83fc635c32878a30453 -./falcon-3.1.0/docs/ext/doorway.py 3b37da02893a1f22823142a1a31b7f2181548640eb622bbbccd19681b9f4b989 -./falcon-3.1.0/docs/ext/__init__.py e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 -./falcon-3.1.0/docs/ext/private_args.py a2eb546fc928b78d9a2f37ffd3d2ca5cafd8ca9cd6be6b2f359ab6012c22a184 -./falcon-3.1.0/docs/ext/rfc.py ad84b67bb2f88649788b37bae48621691864ae673b98858726a92124ba761af6 ./falcon-3.1.0/docs/index.rst 5b929e4708f1cc88b4069d941c5529367927cca1885010f043c9ff9ec26c985a ./falcon-3.1.0/docs/Makefile c3a877c7077af2071c80f016c57a43e24a7b0c89bfdb000b328113fb06240ca4 -./falcon-3.1.0/docs/_newsfragments/.gitignore 902a513dd9774bf8ea61865a3ab734fb16bafa5dcaa958cd45773a8c291dffe4 ./falcon-3.1.0/docs/_static/custom.css aa560968e311e6bb8c68dd4e0565ead0036d10130049d8f4429b2cfa21101a30 ./falcon-3.1.0/docs/_static/img/favicon.ico 86402570c1850f971b60ae0e6c0870abe33a9582afe454eac7e024080e7418a8 ./falcon-3.1.0/docs/_static/img/logo.svg 69ecee3193ecacabdbd3edc6aa508beb765cd1c7b72d5bc31ebb20c46ccaa5c0 @@ -82,46 +62,6 @@ ./falcon-3.1.0/docs/user/recipes/request-id.rst 3bcbfc91f25661c19bf0384c221e802223aa6c57ce5d67d89f53b703b9f0cea4 ./falcon-3.1.0/docs/user/tutorial-asgi.rst 3c61f539ffd542493107b0180834ce36776fc1ea6c96dc696b420f931ab9475a ./falcon-3.1.0/docs/user/tutorial.rst 7a10cb54ee364569cfb4b48f99eac7a25167
