[ptxdist] [PATCH] qemu: Version bump. 8.1.1 -> 8.1.2

2023-10-18 Thread Christian Melki
Minor bugfix release:
https://github.com/qemu/qemu/compare/v8.1.1...v8.1.2

Plugs CVE:
CVE-2023-42467 division by zero in scsi_disk_reset

* Forward patchset, applies cleanly.

Signed-off-by: Christian Melki 
---
 ...9pfs-allow-real-symlinks-for-security_model-mapped-f.patch | 0
 .../0101-let-ninja-use-the-jobserver.patch| 0
 .../0102-HACK-use-existing-meson-without-venv.patch   | 0
 patches/{qemu-8.1.1 => qemu-8.1.2}/series | 0
 rules/qemu.make   | 4 ++--
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename patches/{qemu-8.1.1 => 
qemu-8.1.2}/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch 
(100%)
 rename patches/{qemu-8.1.1 => 
qemu-8.1.2}/0101-let-ninja-use-the-jobserver.patch (100%)
 rename patches/{qemu-8.1.1 => 
qemu-8.1.2}/0102-HACK-use-existing-meson-without-venv.patch (100%)
 rename patches/{qemu-8.1.1 => qemu-8.1.2}/series (100%)

diff --git 
a/patches/qemu-8.1.1/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
 
b/patches/qemu-8.1.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
similarity index 100%
rename from 
patches/qemu-8.1.1/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
rename to 
patches/qemu-8.1.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
diff --git a/patches/qemu-8.1.1/0101-let-ninja-use-the-jobserver.patch 
b/patches/qemu-8.1.2/0101-let-ninja-use-the-jobserver.patch
similarity index 100%
rename from patches/qemu-8.1.1/0101-let-ninja-use-the-jobserver.patch
rename to patches/qemu-8.1.2/0101-let-ninja-use-the-jobserver.patch
diff --git a/patches/qemu-8.1.1/0102-HACK-use-existing-meson-without-venv.patch 
b/patches/qemu-8.1.2/0102-HACK-use-existing-meson-without-venv.patch
similarity index 100%
rename from patches/qemu-8.1.1/0102-HACK-use-existing-meson-without-venv.patch
rename to patches/qemu-8.1.2/0102-HACK-use-existing-meson-without-venv.patch
diff --git a/patches/qemu-8.1.1/series b/patches/qemu-8.1.2/series
similarity index 100%
rename from patches/qemu-8.1.1/series
rename to patches/qemu-8.1.2/series
diff --git a/rules/qemu.make b/rules/qemu.make
index e053a71e8..0bc700044 100644
--- a/rules/qemu.make
+++ b/rules/qemu.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu
 #
 # Paths and names
 #
-QEMU_VERSION   := 8.1.1
-QEMU_MD5   := eb4a27bb9ca5806dc17307a5391a21e6
+QEMU_VERSION   := 8.1.2
+QEMU_MD5   := f7e3443d5b62afa0c10771ad42c5e17a
 QEMU   := qemu-$(QEMU_VERSION)
 QEMU_SUFFIX:= tar.xz
 QEMU_URL   := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX)
-- 
2.34.1




[ptxdist] [PATCH] libjpeg: Version bump. 3.0.0 -> 3.0.1

2023-10-18 Thread Christian Melki
Minor bugfix release.
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/3.0.1

* license hash on jsimdext.inc changed. Contributor copyright added.

Signed-off-by: Christian Melki 
---
 rules/libjpeg.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/libjpeg.make b/rules/libjpeg.make
index 0c7a41291..76c475068 100644
--- a/rules/libjpeg.make
+++ b/rules/libjpeg.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBJPEG) += libjpeg
 #
 # Paths and names
 #
-LIBJPEG_VERSION:= 3.0.0
-LIBJPEG_MD5:= aa1f0a1c72cb6772e34d9d5136267f56
+LIBJPEG_VERSION:= 3.0.1
+LIBJPEG_MD5:= 1fdc6494521a8724f5f7cf39b0f6aff3
 LIBJPEG_SUFFIX := tar.gz
 LIBJPEG:= libjpeg-turbo-$(LIBJPEG_VERSION)
 LIBJPEG_TARBALL:= $(LIBJPEG).$(LIBJPEG_SUFFIX)
@@ -28,7 +28,7 @@ LIBJPEG_LICENSE   := IJG, BSD-3-Clause, Zlib
 LIBJPEG_LICENSE_FILES := \
file://LICENSE.md;md5=2a8e0d8226a102f07ab63ed7fd6ce155 \

file://README.ijg;startline=112;endline=174;md5=9fcb5339d9de46b31309aeef52d7deb1
 \
-   
file://simd/nasm/jsimdext.inc;startline=13;endline=28;md5=839b9ed7df5168976efc071bee29a76e
+   
file://simd/nasm/jsimdext.inc;startline=13;endline=28;md5=100ad877b6a14ec137afd49a6e109624
 
 # 
 # Prepare
-- 
2.34.1




[ptxdist] [PATCH v3] lighttpd: Version bump, 1.4.67 -> 1.4.72

2023-10-18 Thread Andreas Helmcke
Bugfixes and several changes. e.g.
- Stronger TLS defaults
- HTTP/2 Support now as optional module
- Some former modules are now build in

Link: https://www.lighttpd.net/2023/1/3/1.4.68/
Link: https://www.lighttpd.net/2023/2/10/1.4.69/
Link: https://www.lighttpd.net/2023/5/10/1.4.70/
Link: https://www.lighttpd.net/2023/5/27/1.4.71/
Link: https://www.lighttpd.net/2023/10/6/1.4.72/
Signed-off-by: Andreas Helmcke 
---
 rules/lighttpd.in   | 35 +++
 rules/lighttpd.make | 15 +--
 2 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index 910271087..670a00d15 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -69,13 +69,6 @@ endmenu
 
 menu "modules "
 
-config LIGHTTPD_MOD_ACCESS
-   bool
-   prompt "mod_access"
-   default y
-   help
- Deny access to some files.
-
 config LIGHTTPD_MOD_ACCESSLOG
bool
prompt "mod_accesslog"
@@ -83,12 +76,6 @@ config LIGHTTPD_MOD_ACCESSLOG
help
  flexible logging of requests served
 
-config LIGHTTPD_MOD_ALIAS
-   bool
-   prompt "mod_alias"
-   help
- Specify a special document-root for a given url-subset.
-
 config LIGHTTPD_MOD_AUTH
bool
prompt "mod_auth"
@@ -123,11 +110,12 @@ config LIGHTTPD_BZ2LIB
  Enable bzip2 support for mod_deflate.
 endif
 
-config LIGHTTPD_MOD_FASTCGI
+config LIGHTTPD_MOD_DIRLISTING
bool
-   prompt "mod_fastcgi"
-
-if LIGHTTPD_MOD_FASTCGI
+   prompt "mod_dirlisting"
+   default y
+   help
+ Creates an HTML page listing the contents of the target directory.
 
 config LIGHTTPD_MOD_FASTCGI_PHP
bool
@@ -140,7 +128,12 @@ config LIGHTTPD_MOD_FASTCGI_PHP
 comment "PHP CGI SAPI must be enabled"
depends on !PHP8_SAPI_CGI
 
-endif
+config LIGHTTPD_MOD_H2
+   bool
+   prompt "mod_h2"
+   default y
+   help
+ HTTP/2 support
 
 config LIGHTTPD_MOD_MAGNET
bool
@@ -149,12 +142,6 @@ config LIGHTTPD_MOD_MAGNET
help
  A module to control the request handling
 
-config LIGHTTPD_MOD_REWRITE
-   bool
-   prompt "mod_rewrite"
-   help
- Module for URL rewriting
-
 config LIGHTTPD_MOD_WEBDAV
bool
prompt "mod_webdav"
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index 3aa54a1fb..a7e4b05c1 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
 #
 # Paths and names
 #
-LIGHTTPD_VERSION   := 1.4.67
-LIGHTTPD_MD5   := 64822c5061001673162cf9775d91a80b
+LIGHTTPD_VERSION   := 1.4.72
+LIGHTTPD_MD5   := 466f9fe131cd7d38d0fe47d2e6a2939d
 LIGHTTPD   := lighttpd-$(LIGHTTPD_VERSION)
 LIGHTTPD_SUFFIX:= tar.xz
 LIGHTTPD_URL   := 
http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
@@ -93,24 +93,19 @@ $(STATEDIR)/lighttpd.install:
 # 
 
 LIGHTTPD_MODULES-y :=
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESS)+= mod_access
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESSLOG) += mod_accesslog
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ALIAS) += mod_alias
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH)  += mod_auth
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH)  += mod_authn_file
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DEFLATE)   += mod_deflate
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_FASTCGI)   += mod_fastcgi
+LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DIRLISTING)+= mod_dirlisting
+LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_H2)+= mod_h2
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_MAGNET)+= mod_magnet
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_OPENSSL)   += mod_openssl
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_REWRITE)   += mod_rewrite
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_WEBDAV)+= mod_webdav
 LIGHTTPD_MODULES-y += $(call remove_quotes,$(PTXCONF_LIGHTTPD_MOD_EXTRA))
 
 LIGHTTPD_MODULE_STRING := $(subst $(space),$(comma),$(addsuffix \",$(addprefix 
\",$(LIGHTTPD_MODULES-y
 
-# add modules that are always loaded
-LIGHTTPD_MODULES_INSTALL := mod_indexfile mod_dirlisting mod_staticfile 
$(LIGHTTPD_MODULES-y)
-
 $(STATEDIR)/lighttpd.targetinstall:
@$(call targetinfo)
 
@@ -127,7 +122,7 @@ $(STATEDIR)/lighttpd.targetinstall:
/usr/sbin/lighttpd-angel)
 
 ifdef PTXCONF_LIGHTTPD_INSTALL_SELECTED_MODULES
-   @$(foreach mod,$(LIGHTTPD_MODULES_INSTALL), \
+   @$(foreach mod,$(LIGHTTPD_MODULES-y), \
$(call install_lib, lighttpd, 0, 0, 0644, 
lighttpd/$(mod))$(ptx/nl))
 else
 #  # modules
-- 
2.39.2




[ptxdist] [PATCH] jq: Version bump, 1.6 -> 1.7

2023-10-18 Thread Andreas Helmcke
* massive speed improvement (1.6 was extremely slow compared to 1.5)
* a lot more bugfixes
* many enhancements

* Change in license: ICU license used by C library "decNumber" added

Link: https://github.com/jqlang/jq/releases/tag/jq-1.7
Signed-off-by: Andreas Helmcke 
---
 rules/jq.make | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/rules/jq.make b/rules/jq.make
index 6db0cc9cb..d873663c9 100644
--- a/rules/jq.make
+++ b/rules/jq.make
@@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_JQ) += jq
 #
 # Paths and names
 #
-JQ_VERSION := 1.6
-JQ_MD5 := e68fbd6a992e36f1ac48c99bbf825d6b
+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_SOURCE  := $(SRCDIR)/$(JQ).$(JQ_SUFFIX)
 JQ_DIR := $(BUILDDIR)/$(JQ)
-JQ_LICENSE := MIT AND CC-BY-3.0
-JQ_LICENSE_FILES := file://COPYING;md5=15d03e360fa7399f76d5a4359fc72cbf
+JQ_LICENSE := MIT AND CC-BY-3.0 AND ICU
+JQ_LICENSE_FILES := file://COPYING;md5=488f4e0b04c0456337fb70d1ac1758ba
 
 # 
 # Prepare
@@ -34,14 +34,15 @@ JQ_LICENSE_FILES := 
file://COPYING;md5=15d03e360fa7399f76d5a4359fc72cbf
 JQ_CONF_TOOL   := autoconf
 JQ_CONF_OPT:= \
$(CROSS_AUTOCONF_USR) \
-   --disable-maintainer-mode \
+   --disable-largefile \
--disable-valgrind \
+   --disable-asan \
+   --disable-ubsan \
--disable-gcov \
--disable-docs \
--disable-error-injection \
--disable-all-static \
-   --enable-pthread-tls \
-   --without-oniguruma
+   --disable-decnum
 
 # 
 # Target-Install
@@ -57,6 +58,7 @@ $(STATEDIR)/jq.targetinstall:
@$(call install_fixup, jq,DESCRIPTION,missing)
 
@$(call install_lib, jq, 0, 0, 0644, libjq)
+   @$(call install_lib, jq, 0, 0, 0644, libonig)
@$(call install_copy, jq, 0, 0, 0755, -, /usr/bin/jq)
 
@$(call install_finish, jq)
-- 
2.39.2




Re: [ptxdist] [PATCH] lighttpd: Version bump, 1.4.67 -> 1.4.72

2023-10-18 Thread Alexander Dahl
Hello Andreas,

Am Wed, Oct 18, 2023 at 02:25:03PM +0200 schrieb Andreas Helmcke:
> Hello Alexander,
> 
> Am 18.10.23 um 13:38 schrieb Alexander Dahl:
> > Hello Andreas,
> > 
> > Am Wed, Oct 18, 2023 at 12:53:58PM +0200 schrieb Andreas Helmcke:
> >> Hello Alexander, hello Michael,
> >>
> >> Am 18.10.23 um 07:54 schrieb Michael Olbrich:
> >>> On Tue, Oct 17, 2023 at 08:05:11AM +0200, Alexander Dahl wrote:
>  Hello Andreas,
> 
>  first of all, thanks for taking care of this, my remarks below.
> 
>  Am Mon, Oct 16, 2023 at 07:07:34PM +0200 schrieb Andreas Helmcke:
> > Bugfixes and several changes. e.g.
> > - Stronger TLS defaults
> > - HTTP/2 Support now as optional module
> >
> > see: https://www.lighttpd.net/releases/
> 
>  Link: https://www.lighttpd.net/2023/1/3/1.4.68/
>  Link: https://www.lighttpd.net/2023/2/10/1.4.69/
>  Link: https://www.lighttpd.net/2023/5/10/1.4.70/
>  Link: https://www.lighttpd.net/2023/5/27/1.4.71/
>  Link: https://www.lighttpd.net/2023/10/6/1.4.72/
> >>
> >> thanks, changed that
> >>
> > Signed-off-by: Andreas Helmcke 
> > ---
> >  rules/lighttpd.make | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/rules/lighttpd.make b/rules/lighttpd.make
> > index 3aa54a1fb..7b7abf7d2 100644
> > --- a/rules/lighttpd.make
> > +++ b/rules/lighttpd.make
> > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
> >  #
> >  # Paths and names
> >  #
> > -LIGHTTPD_VERSION   := 1.4.67
> > -LIGHTTPD_MD5   := 64822c5061001673162cf9775d91a80b
> > +LIGHTTPD_VERSION   := 1.4.72
> > +LIGHTTPD_MD5   := 466f9fe131cd7d38d0fe47d2e6a2939d
> 
>  Builds fine, but …
> 
>  That 1.4.70 in particular needs a little more work on the ptxdist
>  package, because several modules are not built separate anymore, but
>  built-in now.  This makes some of the LIGHTTPD_MOD_* options in menu
>  not necessary anymore, and breaks targetinstall if those should have
>  been installed before, e.g. like this:
> 
>  Error: ptxd_lib_install: cannot find library 
>  'lighttpd/mod_indexfile'!
> >>
> >> I can not (re)produce your error, but ...
> > 
> > Interesting.  It's one of the modules always installed.  Maybe we have
> > different options set?  Comes from these lines:
> > 
> > 111 # add modules that are always loaded
> > 112 LIGHTTPD_MODULES_INSTALL := mod_indexfile mod_dirlisting 
> > mod_staticfile $(LIGHTTPD_MODULES-y)
> > 
> > Please test with PTXCONF_LIGHTTPD_INSTALL_SELECTED_MODULES set and
> > not set, and compare.  I guess you will also find 'mod_staticfile'?
> 
> Yes, you are right. I didn't use the option "Only install selected modules".
> If I fix this by removing mod_indexfile and mod_staticfile (which works) only 
> mod_dirlisting remains in the list of always loaded modules.

Yes.

> So it might be a good idea to completely do without a static list of always 
> loaded 
> modules and also make mod_dirlist configurable.
> Any objections?

Fine with me, if the module is installed by default as before.

Michael added this with c37f05122341 ("lighttpd: rework options and
configuration") back in 2013 for ptxdist-2013.03.0 when reworking the
lighttpd package.  Maybe he has an opinion?

Greets
Alex

> 
> > 
>  The list of affected modules is in the 1.4.70 announcement.
> >>
> >> i have cleaned up the list of modules and removed the now obsolete ones.
> >>
>  With 1.4.71 HTTP/2 support is moved to a separate module however and
>  no longer built-in anymore.  Should we introduce a new menu option for
>  that or let the ptxdist user configure it with
>  PTXCONF_LIGHTTPD_MOD_EXTRA instead?
> >>>
> >>> If it requires additional dependencies then a new option is mandatory.
> >>> If not, then I don't really care either way. Just leave it as is I guess.
> >>>
> >>
> >> I have decided to create a new menu option because i do think, that
> >> this is a central/fundamental part and not some exotic stuff so it
> >> deserves one.
> > 
> > Thanks.  It's good if you can turn it off.  Might save some space for
> > folks who don't want HTTP/2 for whatever reason.
> > 
> > Greets
> > Alex
> > 
> >>
> >>
> >  LIGHTTPD   := lighttpd-$(LIGHTTPD_VERSION)
> >  LIGHTTPD_SUFFIX:= tar.xz
> >  LIGHTTPD_URL   := 
> > http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
> > -- 
> > 2.39.2
> >
> >>
> >> Andreas
> >>
> 
> -- 
> Mit freundlichen Grüßen / Best regards
> 
> i. A. Andreas Helmcke
> Hard- und Softwareentwickler / Hard- and Software Developer
> 
> ela-soft GmbH
> Entwicklung|GEMOS access / Development|GEMOS access
> 
> Breitenbachstraße 10
> 13509 Berlin
> Germany
> Phone  +49 30 891003-0
> Fax  +49 30 891003-22
> ahelm...@ela-soft.com 
> 

Re: [ptxdist] [PATCH] lighttpd: Version bump, 1.4.67 -> 1.4.72

2023-10-18 Thread Andreas Helmcke
Hello Alexander,

Am 18.10.23 um 13:38 schrieb Alexander Dahl:
> Hello Andreas,
> 
> Am Wed, Oct 18, 2023 at 12:53:58PM +0200 schrieb Andreas Helmcke:
>> Hello Alexander, hello Michael,
>>
>> Am 18.10.23 um 07:54 schrieb Michael Olbrich:
>>> On Tue, Oct 17, 2023 at 08:05:11AM +0200, Alexander Dahl wrote:
 Hello Andreas,

 first of all, thanks for taking care of this, my remarks below.

 Am Mon, Oct 16, 2023 at 07:07:34PM +0200 schrieb Andreas Helmcke:
> Bugfixes and several changes. e.g.
> - Stronger TLS defaults
> - HTTP/2 Support now as optional module
>
> see: https://www.lighttpd.net/releases/

 Link: https://www.lighttpd.net/2023/1/3/1.4.68/
 Link: https://www.lighttpd.net/2023/2/10/1.4.69/
 Link: https://www.lighttpd.net/2023/5/10/1.4.70/
 Link: https://www.lighttpd.net/2023/5/27/1.4.71/
 Link: https://www.lighttpd.net/2023/10/6/1.4.72/
>>
>> thanks, changed that
>>
> Signed-off-by: Andreas Helmcke 
> ---
>  rules/lighttpd.make | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
> index 3aa54a1fb..7b7abf7d2 100644
> --- a/rules/lighttpd.make
> +++ b/rules/lighttpd.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
>  #
>  # Paths and names
>  #
> -LIGHTTPD_VERSION := 1.4.67
> -LIGHTTPD_MD5 := 64822c5061001673162cf9775d91a80b
> +LIGHTTPD_VERSION := 1.4.72
> +LIGHTTPD_MD5 := 466f9fe131cd7d38d0fe47d2e6a2939d

 Builds fine, but …

 That 1.4.70 in particular needs a little more work on the ptxdist
 package, because several modules are not built separate anymore, but
 built-in now.  This makes some of the LIGHTTPD_MOD_* options in menu
 not necessary anymore, and breaks targetinstall if those should have
 been installed before, e.g. like this:

 Error: ptxd_lib_install: cannot find library 'lighttpd/mod_indexfile'!
>>
>> I can not (re)produce your error, but ...
> 
> Interesting.  It's one of the modules always installed.  Maybe we have
> different options set?  Comes from these lines:
> 
> 111 # add modules that are always loaded
> 112 LIGHTTPD_MODULES_INSTALL := mod_indexfile mod_dirlisting 
> mod_staticfile $(LIGHTTPD_MODULES-y)
> 
> Please test with PTXCONF_LIGHTTPD_INSTALL_SELECTED_MODULES set and
> not set, and compare.  I guess you will also find 'mod_staticfile'?

Yes, you are right. I didn't use the option "Only install selected modules".
If I fix this by removing mod_indexfile and mod_staticfile (which works) only 
mod_dirlisting remains in the list of always loaded modules.

So it might be a good idea to completely do without a static list of always 
loaded 
modules and also make mod_dirlist configurable.
Any objections?

> 
 The list of affected modules is in the 1.4.70 announcement.
>>
>> i have cleaned up the list of modules and removed the now obsolete ones.
>>
 With 1.4.71 HTTP/2 support is moved to a separate module however and
 no longer built-in anymore.  Should we introduce a new menu option for
 that or let the ptxdist user configure it with
 PTXCONF_LIGHTTPD_MOD_EXTRA instead?
>>>
>>> If it requires additional dependencies then a new option is mandatory.
>>> If not, then I don't really care either way. Just leave it as is I guess.
>>>
>>
>> I have decided to create a new menu option because i do think, that
>> this is a central/fundamental part and not some exotic stuff so it
>> deserves one.
> 
> Thanks.  It's good if you can turn it off.  Might save some space for
> folks who don't want HTTP/2 for whatever reason.
> 
> Greets
> Alex
> 
>>
>>
>  LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
>  LIGHTTPD_SUFFIX  := tar.xz
>  LIGHTTPD_URL := 
> http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
> -- 
> 2.39.2
>
>>
>> Andreas
>>

-- 
Mit freundlichen Grüßen / Best regards

i. A. Andreas Helmcke
Hard- und Softwareentwickler / Hard- and Software Developer

ela-soft GmbH
Entwicklung|GEMOS access / Development|GEMOS access

Breitenbachstraße 10
13509 Berlin
Germany
Phone  +49 30 891003-0
Fax  +49 30 891003-22
ahelm...@ela-soft.com 
http://www.ela-soft.com 

ela-soft GmbH / Company of limited liability
Sitz der Gesellschaft: Berlin / Place of residence: Berlin
Handelsregistereintrag / Commercial Register entry:
Amtsgericht Bln Charlottenburg, HRB 114128 B
GF: Julius von Resch / Board of directors: Julius von Resch




Re: [ptxdist] [PATCH v2] lighttpd: Version bump, 1.4.67 -> 1.4.72

2023-10-18 Thread Alexander Dahl
Hello Andreas,

before you send v3, I have some nitpicking here.  Maybe you want to
consider that, too.

Am Wed, Oct 18, 2023 at 12:55:44PM +0200 schrieb Andreas Helmcke:
> Bugfixes and several changes. e.g.
> - Stronger TLS defaults
> - HTTP/2 Support now as optional module
> - Some former modules are now build in
> 
> Link: https://www.lighttpd.net/2023/1/3/1.4.68/
> Link: https://www.lighttpd.net/2023/2/10/1.4.69/
> Link: https://www.lighttpd.net/2023/5/10/1.4.70/
> Link: https://www.lighttpd.net/2023/5/27/1.4.71/
> Link: https://www.lighttpd.net/2023/10/6/1.4.72/
> 
> Signed-off-by: Andreas Helmcke 

You can remove the empty line between Link: and Signed-off-by: – Link
is one of the tags documented in the Linux kernel submitting patches
guide.

> ---
>  rules/lighttpd.in   | 26 +++---
>  rules/lighttpd.make |  9 +++--
>  2 files changed, 6 insertions(+), 29 deletions(-)
> 
> diff --git a/rules/lighttpd.in b/rules/lighttpd.in
> index 910271087..9e2b4c97a 100644
> --- a/rules/lighttpd.in
> +++ b/rules/lighttpd.in
> @@ -69,12 +69,12 @@ endmenu
>  
>  menu "modules "
>  
> -config LIGHTTPD_MOD_ACCESS
> +config LIGHTTPD_MOD_H2
>   bool
> - prompt "mod_access"
> + prompt "mod_h2"
>   default y
>   help
> -   Deny access to some files.
> +   HTTP/2 support

Please keep the alphabetic ordering when adding new entries.

>  
>  config LIGHTTPD_MOD_ACCESSLOG
>   bool
> @@ -83,12 +83,6 @@ config LIGHTTPD_MOD_ACCESSLOG
>   help
> flexible logging of requests served
>  
> -config LIGHTTPD_MOD_ALIAS
> - bool
> - prompt "mod_alias"
> - help
> -   Specify a special document-root for a given url-subset.
> -
>  config LIGHTTPD_MOD_AUTH
>   bool
>   prompt "mod_auth"
> @@ -123,12 +117,6 @@ config LIGHTTPD_BZ2LIB
> Enable bzip2 support for mod_deflate.
>  endif
>  
> -config LIGHTTPD_MOD_FASTCGI
> - bool
> - prompt "mod_fastcgi"
> -
> -if LIGHTTPD_MOD_FASTCGI
> -
>  config LIGHTTPD_MOD_FASTCGI_PHP
>   bool
>   depends on PHP8_SAPI_CGI
> @@ -140,8 +128,6 @@ config LIGHTTPD_MOD_FASTCGI_PHP
>  comment "PHP CGI SAPI must be enabled"
>   depends on !PHP8_SAPI_CGI
>  
> -endif
> -
>  config LIGHTTPD_MOD_MAGNET
>   bool
>   select LIGHTTPD_LUA
> @@ -149,12 +135,6 @@ config LIGHTTPD_MOD_MAGNET
>   help
> A module to control the request handling
>  
> -config LIGHTTPD_MOD_REWRITE
> - bool
> - prompt "mod_rewrite"
> - help
> -   Module for URL rewriting
> -
>  config LIGHTTPD_MOD_WEBDAV
>   bool
>   prompt "mod_webdav"
> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
> index 3aa54a1fb..9ff8b3ea7 100644
> --- a/rules/lighttpd.make
> +++ b/rules/lighttpd.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
>  #
>  # Paths and names
>  #
> -LIGHTTPD_VERSION := 1.4.67
> -LIGHTTPD_MD5 := 64822c5061001673162cf9775d91a80b
> +LIGHTTPD_VERSION := 1.4.72
> +LIGHTTPD_MD5 := 466f9fe131cd7d38d0fe47d2e6a2939d
>  LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
>  LIGHTTPD_SUFFIX  := tar.xz
>  LIGHTTPD_URL := 
> http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
> @@ -93,16 +93,13 @@ $(STATEDIR)/lighttpd.install:
>  # 
> 
>  
>  LIGHTTPD_MODULES-y :=
> -LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESS)  += mod_access
> +LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_H2)  += mod_h2

Same here, this list is sorted alphabetically, keep that.

Greets
Alex

>  LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESSLOG)   += mod_accesslog
> -LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ALIAS)   += mod_alias
>  LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH)+= mod_auth
>  LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH)+= 
> mod_authn_file
>  LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DEFLATE) += mod_deflate
> -LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_FASTCGI) += mod_fastcgi
>  LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_MAGNET)  += mod_magnet
>  LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_OPENSSL) += mod_openssl
> -LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_REWRITE) += mod_rewrite
>  LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_WEBDAV)  += mod_webdav
>  LIGHTTPD_MODULES-y += $(call remove_quotes,$(PTXCONF_LIGHTTPD_MOD_EXTRA))
>  
> -- 
> 2.39.2
> 
> 



Re: [ptxdist] [PATCH] lighttpd: Version bump, 1.4.67 -> 1.4.72

2023-10-18 Thread Alexander Dahl
Hello Andreas,

Am Wed, Oct 18, 2023 at 12:53:58PM +0200 schrieb Andreas Helmcke:
> Hello Alexander, hello Michael,
> 
> Am 18.10.23 um 07:54 schrieb Michael Olbrich:
> > On Tue, Oct 17, 2023 at 08:05:11AM +0200, Alexander Dahl wrote:
> >> Hello Andreas,
> >>
> >> first of all, thanks for taking care of this, my remarks below.
> >>
> >> Am Mon, Oct 16, 2023 at 07:07:34PM +0200 schrieb Andreas Helmcke:
> >>> Bugfixes and several changes. e.g.
> >>> - Stronger TLS defaults
> >>> - HTTP/2 Support now as optional module
> >>>
> >>> see: https://www.lighttpd.net/releases/
> >>
> >> Link: https://www.lighttpd.net/2023/1/3/1.4.68/
> >> Link: https://www.lighttpd.net/2023/2/10/1.4.69/
> >> Link: https://www.lighttpd.net/2023/5/10/1.4.70/
> >> Link: https://www.lighttpd.net/2023/5/27/1.4.71/
> >> Link: https://www.lighttpd.net/2023/10/6/1.4.72/
> 
> thanks, changed that
> 
> >>> Signed-off-by: Andreas Helmcke 
> >>> ---
> >>>  rules/lighttpd.make | 4 ++--
> >>>  1 file changed, 2 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
> >>> index 3aa54a1fb..7b7abf7d2 100644
> >>> --- a/rules/lighttpd.make
> >>> +++ b/rules/lighttpd.make
> >>> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
> >>>  #
> >>>  # Paths and names
> >>>  #
> >>> -LIGHTTPD_VERSION := 1.4.67
> >>> -LIGHTTPD_MD5 := 64822c5061001673162cf9775d91a80b
> >>> +LIGHTTPD_VERSION := 1.4.72
> >>> +LIGHTTPD_MD5 := 466f9fe131cd7d38d0fe47d2e6a2939d
> >>
> >> Builds fine, but …
> >>
> >> That 1.4.70 in particular needs a little more work on the ptxdist
> >> package, because several modules are not built separate anymore, but
> >> built-in now.  This makes some of the LIGHTTPD_MOD_* options in menu
> >> not necessary anymore, and breaks targetinstall if those should have
> >> been installed before, e.g. like this:
> >>
> >> Error: ptxd_lib_install: cannot find library 'lighttpd/mod_indexfile'!
> 
> I can not (re)produce your error, but ...

Interesting.  It's one of the modules always installed.  Maybe we have
different options set?  Comes from these lines:

111 # add modules that are always loaded
112 LIGHTTPD_MODULES_INSTALL := mod_indexfile mod_dirlisting mod_staticfile 
$(LIGHTTPD_MODULES-y)

Please test with PTXCONF_LIGHTTPD_INSTALL_SELECTED_MODULES set and
not set, and compare.  I guess you will also find 'mod_staticfile'?

> >> The list of affected modules is in the 1.4.70 announcement.
> 
> i have cleaned up the list of modules and removed the now obsolete ones.
> 
> >> With 1.4.71 HTTP/2 support is moved to a separate module however and
> >> no longer built-in anymore.  Should we introduce a new menu option for
> >> that or let the ptxdist user configure it with
> >> PTXCONF_LIGHTTPD_MOD_EXTRA instead?
> > 
> > If it requires additional dependencies then a new option is mandatory.
> > If not, then I don't really care either way. Just leave it as is I guess.
> > 
> 
> I have decided to create a new menu option because i do think, that
> this is a central/fundamental part and not some exotic stuff so it
> deserves one.

Thanks.  It's good if you can turn it off.  Might save some space for
folks who don't want HTTP/2 for whatever reason.

Greets
Alex

> 
> 
> >>>  LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
> >>>  LIGHTTPD_SUFFIX  := tar.xz
> >>>  LIGHTTPD_URL := 
> >>> http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
> >>> -- 
> >>> 2.39.2
> >>>
> 
> Andreas
> 



[ptxdist] [PATCH v2] lighttpd: Version bump, 1.4.67 -> 1.4.72

2023-10-18 Thread Andreas Helmcke
Bugfixes and several changes. e.g.
- Stronger TLS defaults
- HTTP/2 Support now as optional module
- Some former modules are now build in

Link: https://www.lighttpd.net/2023/1/3/1.4.68/
Link: https://www.lighttpd.net/2023/2/10/1.4.69/
Link: https://www.lighttpd.net/2023/5/10/1.4.70/
Link: https://www.lighttpd.net/2023/5/27/1.4.71/
Link: https://www.lighttpd.net/2023/10/6/1.4.72/

Signed-off-by: Andreas Helmcke 
---
 rules/lighttpd.in   | 26 +++---
 rules/lighttpd.make |  9 +++--
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index 910271087..9e2b4c97a 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -69,12 +69,12 @@ endmenu
 
 menu "modules "
 
-config LIGHTTPD_MOD_ACCESS
+config LIGHTTPD_MOD_H2
bool
-   prompt "mod_access"
+   prompt "mod_h2"
default y
help
- Deny access to some files.
+ HTTP/2 support
 
 config LIGHTTPD_MOD_ACCESSLOG
bool
@@ -83,12 +83,6 @@ config LIGHTTPD_MOD_ACCESSLOG
help
  flexible logging of requests served
 
-config LIGHTTPD_MOD_ALIAS
-   bool
-   prompt "mod_alias"
-   help
- Specify a special document-root for a given url-subset.
-
 config LIGHTTPD_MOD_AUTH
bool
prompt "mod_auth"
@@ -123,12 +117,6 @@ config LIGHTTPD_BZ2LIB
  Enable bzip2 support for mod_deflate.
 endif
 
-config LIGHTTPD_MOD_FASTCGI
-   bool
-   prompt "mod_fastcgi"
-
-if LIGHTTPD_MOD_FASTCGI
-
 config LIGHTTPD_MOD_FASTCGI_PHP
bool
depends on PHP8_SAPI_CGI
@@ -140,8 +128,6 @@ config LIGHTTPD_MOD_FASTCGI_PHP
 comment "PHP CGI SAPI must be enabled"
depends on !PHP8_SAPI_CGI
 
-endif
-
 config LIGHTTPD_MOD_MAGNET
bool
select LIGHTTPD_LUA
@@ -149,12 +135,6 @@ config LIGHTTPD_MOD_MAGNET
help
  A module to control the request handling
 
-config LIGHTTPD_MOD_REWRITE
-   bool
-   prompt "mod_rewrite"
-   help
- Module for URL rewriting
-
 config LIGHTTPD_MOD_WEBDAV
bool
prompt "mod_webdav"
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index 3aa54a1fb..9ff8b3ea7 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
 #
 # Paths and names
 #
-LIGHTTPD_VERSION   := 1.4.67
-LIGHTTPD_MD5   := 64822c5061001673162cf9775d91a80b
+LIGHTTPD_VERSION   := 1.4.72
+LIGHTTPD_MD5   := 466f9fe131cd7d38d0fe47d2e6a2939d
 LIGHTTPD   := lighttpd-$(LIGHTTPD_VERSION)
 LIGHTTPD_SUFFIX:= tar.xz
 LIGHTTPD_URL   := 
http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
@@ -93,16 +93,13 @@ $(STATEDIR)/lighttpd.install:
 # 
 
 LIGHTTPD_MODULES-y :=
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESS)+= mod_access
+LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_H2)+= mod_h2
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ACCESSLOG) += mod_accesslog
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_ALIAS) += mod_alias
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH)  += mod_auth
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_AUTH)  += mod_authn_file
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_DEFLATE)   += mod_deflate
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_FASTCGI)   += mod_fastcgi
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_MAGNET)+= mod_magnet
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_OPENSSL)   += mod_openssl
-LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_REWRITE)   += mod_rewrite
 LIGHTTPD_MODULES-$(PTXCONF_LIGHTTPD_MOD_WEBDAV)+= mod_webdav
 LIGHTTPD_MODULES-y += $(call remove_quotes,$(PTXCONF_LIGHTTPD_MOD_EXTRA))
 
-- 
2.39.2




Re: [ptxdist] [PATCH] lighttpd: Version bump, 1.4.67 -> 1.4.72

2023-10-18 Thread Andreas Helmcke
Hello Alexander, hello Michael,

Am 18.10.23 um 07:54 schrieb Michael Olbrich:
> On Tue, Oct 17, 2023 at 08:05:11AM +0200, Alexander Dahl wrote:
>> Hello Andreas,
>>
>> first of all, thanks for taking care of this, my remarks below.
>>
>> Am Mon, Oct 16, 2023 at 07:07:34PM +0200 schrieb Andreas Helmcke:
>>> Bugfixes and several changes. e.g.
>>> - Stronger TLS defaults
>>> - HTTP/2 Support now as optional module
>>>
>>> see: https://www.lighttpd.net/releases/
>>
>> Link: https://www.lighttpd.net/2023/1/3/1.4.68/
>> Link: https://www.lighttpd.net/2023/2/10/1.4.69/
>> Link: https://www.lighttpd.net/2023/5/10/1.4.70/
>> Link: https://www.lighttpd.net/2023/5/27/1.4.71/
>> Link: https://www.lighttpd.net/2023/10/6/1.4.72/

thanks, changed that

>>> Signed-off-by: Andreas Helmcke 
>>> ---
>>>  rules/lighttpd.make | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
>>> index 3aa54a1fb..7b7abf7d2 100644
>>> --- a/rules/lighttpd.make
>>> +++ b/rules/lighttpd.make
>>> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
>>>  #
>>>  # Paths and names
>>>  #
>>> -LIGHTTPD_VERSION   := 1.4.67
>>> -LIGHTTPD_MD5   := 64822c5061001673162cf9775d91a80b
>>> +LIGHTTPD_VERSION   := 1.4.72
>>> +LIGHTTPD_MD5   := 466f9fe131cd7d38d0fe47d2e6a2939d
>>
>> Builds fine, but …
>>
>> That 1.4.70 in particular needs a little more work on the ptxdist
>> package, because several modules are not built separate anymore, but
>> built-in now.  This makes some of the LIGHTTPD_MOD_* options in menu
>> not necessary anymore, and breaks targetinstall if those should have
>> been installed before, e.g. like this:
>>
>> Error: ptxd_lib_install: cannot find library 'lighttpd/mod_indexfile'!

I can not (re)produce your error, but ...

>> The list of affected modules is in the 1.4.70 announcement.

i have cleaned up the list of modules and removed the now obsolete ones.

>> With 1.4.71 HTTP/2 support is moved to a separate module however and
>> no longer built-in anymore.  Should we introduce a new menu option for
>> that or let the ptxdist user configure it with
>> PTXCONF_LIGHTTPD_MOD_EXTRA instead?
> 
> If it requires additional dependencies then a new option is mandatory.
> If not, then I don't really care either way. Just leave it as is I guess.
> 

I have decided to create a new menu option because i do think, that this is a 
central/fundamental part and not some exotic stuff so it deserves one.


>>>  LIGHTTPD   := lighttpd-$(LIGHTTPD_VERSION)
>>>  LIGHTTPD_SUFFIX:= tar.xz
>>>  LIGHTTPD_URL   := 
>>> http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
>>> -- 
>>> 2.39.2
>>>

Andreas



Re: [ptxdist] OSELAS Toolchain 2023.07.0 fails to build clang

2023-10-18 Thread Mircea Ciocan
- Ursprüngliche Mail -
Hi,

On Tue, Oct 17, 2023 at 11:45:22AM +0200, Mircea Ciocan wrote:
> I was trying to compile the OSELAS-2023.07.0 from the original sources on a 
> Ubuntu 22.04 and got the following error: 
> 
> --- 
> target: cross-clang.extract 
> --- 
> 
> extract: pkg_src=OSELAS.Toolchain-2023.07.0x/src/clang-16.0.6.src.tar.xz 
> extract: 
> pkg_extract_dir=OSELAS.Toolchain-2023.07.0x/platform-arm-v7a-linux-gnueabihf-gcc-13.1.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/build-cross/clang-16.0.6
>  
> patchin: no patches found 
> finished target cross-clang.extract 
> make: *** No rule to make target 
> '/home/dev/Software/Toolchain/OSELAS.Toolchain-2023.07.0x/platform-arm-v7a-linux-gnueabihf-gcc-13.1.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/sysroot-cross/bin/llvm-config',
>  needed by 
> '/home/dev/Software/Toolchain/OSELAS.Toolchain-2023.07.0x/platform-arm-v7a-linux-gnueabihf-gcc-13.1.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/state/cross-llvm.prepare'.
>  Stop. 
> make: *** [build_all_v2.mk:44: 
> gstate/arm-v7a-linux-gnueabihf-gcc-13.1.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized.build]
>  Error 2 
> 
> It seems that the build directory is not even created. 
> Do you have any idea what can I do ? 

Just a wild guess: You're using ptxdist-2023.10.0 to build the toolchain.
Don't do that. Use ptxdist-2023.07.0 as specified in the config files.

Regards,
Michael

Hello Michael and thanks for the answer,
should I stay then 2023.07.0 or should  go to 2023.07.1, I remember it was a 
regression, is that relevant for the toolchain project ?

Best regards,
Mircea




[ptxdist] [PATCH 1/3] host-rust-bindgen: new package

2023-10-18 Thread Philipp Zabel
Rust bindgen generates Rust FFI bindings to C (and some C++) libraries.

Signed-off-by: Philipp Zabel 
---
 rules/host-rust-bindgen.cargo.make | 581 +
 rules/host-rust-bindgen.in |   7 +
 rules/host-rust-bindgen.make   |  50 +++
 3 files changed, 638 insertions(+)
 create mode 100644 rules/host-rust-bindgen.cargo.make
 create mode 100644 rules/host-rust-bindgen.in
 create mode 100644 rules/host-rust-bindgen.make

diff --git a/rules/host-rust-bindgen.cargo.make 
b/rules/host-rust-bindgen.cargo.make
new file mode 100644
index ..b33d55342208
--- /dev/null
+++ b/rules/host-rust-bindgen.cargo.make
@@ -0,0 +1,581 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Philipp Zabel 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# WARNING: This file is generated with 'ptxdist cargosync host-rust-bindgen' 
and
+# should not be modified manually!
+#
+
+HOST_RUST_BINDGEN_CARGO_LOCK_MD5 := 10de3d703b0f679146e145268b6573f6
+
+HOST_RUST_BINDGEN_AHO_CORASICK_0_7_20_MD5  := 
96f06331c915195bce97c8542c0eb728
+HOST_RUST_BINDGEN_AHO_CORASICK_0_7_20_URL  := 
https://crates.io/api/v1/crates/aho-corasick/0.7.20/download
+HOST_RUST_BINDGEN_AHO_CORASICK_0_7_20_SOURCE   := 
$(SRCDIR)/aho-corasick-0.7.20.crate
+$(HOST_RUST_BINDGEN_AHO_CORASICK_0_7_20_SOURCE):= 
HOST_RUST_BINDGEN_AHO_CORASICK_0_7_20
+HOST_RUST_BINDGEN_SOURCES  += 
$(HOST_RUST_BINDGEN_AHO_CORASICK_0_7_20_SOURCE)
+
+HOST_RUST_BINDGEN_ANNOTATE_SNIPPETS_0_9_1_MD5  := 
8394c7150144eb738530ffbb24d96806
+HOST_RUST_BINDGEN_ANNOTATE_SNIPPETS_0_9_1_URL  := 
https://crates.io/api/v1/crates/annotate-snippets/0.9.1/download
+HOST_RUST_BINDGEN_ANNOTATE_SNIPPETS_0_9_1_SOURCE   := 
$(SRCDIR)/annotate-snippets-0.9.1.crate
+$(HOST_RUST_BINDGEN_ANNOTATE_SNIPPETS_0_9_1_SOURCE):= 
HOST_RUST_BINDGEN_ANNOTATE_SNIPPETS_0_9_1
+HOST_RUST_BINDGEN_SOURCES  += 
$(HOST_RUST_BINDGEN_ANNOTATE_SNIPPETS_0_9_1_SOURCE)
+
+HOST_RUST_BINDGEN_BITFLAGS_1_3_2_MD5   := 
a295edb6953237ebbdfa8e731229f9a3
+HOST_RUST_BINDGEN_BITFLAGS_1_3_2_URL   := 
https://crates.io/api/v1/crates/bitflags/1.3.2/download
+HOST_RUST_BINDGEN_BITFLAGS_1_3_2_SOURCE:= 
$(SRCDIR)/bitflags-1.3.2.crate
+$(HOST_RUST_BINDGEN_BITFLAGS_1_3_2_SOURCE) := 
HOST_RUST_BINDGEN_BITFLAGS_1_3_2
+HOST_RUST_BINDGEN_SOURCES  += 
$(HOST_RUST_BINDGEN_BITFLAGS_1_3_2_SOURCE)
+
+HOST_RUST_BINDGEN_BITFLAGS_2_2_1_MD5   := 
a97e549267b9efa1b495b437b3fc9d89
+HOST_RUST_BINDGEN_BITFLAGS_2_2_1_URL   := 
https://crates.io/api/v1/crates/bitflags/2.2.1/download
+HOST_RUST_BINDGEN_BITFLAGS_2_2_1_SOURCE:= 
$(SRCDIR)/bitflags-2.2.1.crate
+$(HOST_RUST_BINDGEN_BITFLAGS_2_2_1_SOURCE) := 
HOST_RUST_BINDGEN_BITFLAGS_2_2_1
+HOST_RUST_BINDGEN_SOURCES  += 
$(HOST_RUST_BINDGEN_BITFLAGS_2_2_1_SOURCE)
+
+HOST_RUST_BINDGEN_BLOCK_0_1_6_MD5  := 
ea2d23ceb9f98853a7dffc6c02884464
+HOST_RUST_BINDGEN_BLOCK_0_1_6_URL  := 
https://crates.io/api/v1/crates/block/0.1.6/download
+HOST_RUST_BINDGEN_BLOCK_0_1_6_SOURCE   := $(SRCDIR)/block-0.1.6.crate
+$(HOST_RUST_BINDGEN_BLOCK_0_1_6_SOURCE):= HOST_RUST_BINDGEN_BLOCK_0_1_6
+HOST_RUST_BINDGEN_SOURCES  += 
$(HOST_RUST_BINDGEN_BLOCK_0_1_6_SOURCE)
+
+HOST_RUST_BINDGEN_CC_1_0_78_MD5:= 
e188d0bf5bd7010d3c6c3981d23d0b51
+HOST_RUST_BINDGEN_CC_1_0_78_URL:= 
https://crates.io/api/v1/crates/cc/1.0.78/download
+HOST_RUST_BINDGEN_CC_1_0_78_SOURCE := $(SRCDIR)/cc-1.0.78.crate
+$(HOST_RUST_BINDGEN_CC_1_0_78_SOURCE)  := HOST_RUST_BINDGEN_CC_1_0_78
+HOST_RUST_BINDGEN_SOURCES  += 
$(HOST_RUST_BINDGEN_CC_1_0_78_SOURCE)
+
+HOST_RUST_BINDGEN_CEXPR_0_6_0_MD5  := 
10b68ba1e7093d889e9198dcd0ea2a3e
+HOST_RUST_BINDGEN_CEXPR_0_6_0_URL  := 
https://crates.io/api/v1/crates/cexpr/0.6.0/download
+HOST_RUST_BINDGEN_CEXPR_0_6_0_SOURCE   := $(SRCDIR)/cexpr-0.6.0.crate
+$(HOST_RUST_BINDGEN_CEXPR_0_6_0_SOURCE):= HOST_RUST_BINDGEN_CEXPR_0_6_0
+HOST_RUST_BINDGEN_SOURCES  += 
$(HOST_RUST_BINDGEN_CEXPR_0_6_0_SOURCE)
+
+HOST_RUST_BINDGEN_CFG_IF_1_0_0_MD5 := 
74634128440dbc3766bda76fdf0aaa05
+HOST_RUST_BINDGEN_CFG_IF_1_0_0_URL := 
https://crates.io/api/v1/crates/cfg-if/1.0.0/download
+HOST_RUST_BINDGEN_CFG_IF_1_0_0_SOURCE  := $(SRCDIR)/cfg-if-1.0.0.crate
+$(HOST_RUST_BINDGEN_CFG_IF_1_0_0_SOURCE)   := 
HOST_RUST_BINDGEN_CFG_IF_1_0_0
+HOST_RUST_BINDGEN_SOURCES  += 
$(HOST_RUST_BINDGEN_CFG_IF_1_0_0_SOURCE)
+
+HOST_RUST_BINDGEN_CLANG_SYS_1_4_0_MD5  := 
7c28deaed5c3327645cffe40430aecf0
+HOST_RUST_BINDGEN_CLANG_SYS_1_4_0_URL  := 
https://crates.io/api/v1/crates/clang-sys/1.4.0/download
+HOST_RUST_BINDGEN_CLANG_SYS_1_4_0_SOURCE   := 
$(SRCDIR)/clang-sys-1.4.0.crate

[ptxdist] [PATCH 3/3] piglit: version bump 2021-11-17-g2f80c7cc9c02 -> 2023-10-02-g24207f5bed81

2023-10-18 Thread Philipp Zabel
* Enable Vulkan tests.
* Disable find_package(Git) to stop tests/llvmpipe/CMakeLists.gl.txt
  from trying (and failing) to determine the git hash from an extracted
  source tarball.

Signed-off-by: Philipp Zabel 
---
 rules/piglit.in   | 6 ++
 rules/piglit.make | 6 --
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/rules/piglit.in b/rules/piglit.in
index 397585c5d26b..72cd20e8983a 100644
--- a/rules/piglit.in
+++ b/rules/piglit.in
@@ -24,6 +24,8 @@ menuconfig PIGLIT
select XORG if PIGLIT_TESTS_OPENGL
select MESALIB_GLES1 if PIGLIT_TESTS_OPENGLES1
select MESALIB_GLES2 if PIGLIT_TESTS_OPENGLES2 || PIGLIT_TESTS_OPENGLES3
+   select VULKAN_LOADER if PIGLIT_TESTS_VULKAN
+   select VKRUNNER if PIGLIT_TESTS_VULKAN && RUNTIME
help
  Piglit is the opensource OpenGL/OpenCL test suite.
 
@@ -51,4 +53,8 @@ config PIGLIT_TESTS_OPENGLES3
bool
prompt "build OpenGL ES3 tests"
 
+config PIGLIT_TESTS_VULKAN
+   bool
+   prompt "build Vulkan tests"
+
 endif
diff --git a/rules/piglit.make b/rules/piglit.make
index 626522d6ac9c..9c59d783 100644
--- a/rules/piglit.make
+++ b/rules/piglit.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIGLIT) += piglit
 #
 # Paths and names
 #
-PIGLIT_VERSION := 2021-11-17-g2f80c7cc9c02
-PIGLIT_MD5 := c1975f4f0ff2eb2c37e30af1da87d8a9
+PIGLIT_VERSION := 2023-10-02-g24207f5bed81
+PIGLIT_MD5 := 829588e53b7e49f65047b4ff99c43911
 PIGLIT := piglit-$(PIGLIT_VERSION)
 PIGLIT_SUFFIX  := tar.gz
 PIGLIT_URL := 
https://gitlab.freedesktop.org/mesa/piglit/-/archive/$(PIGLIT_VERSION)/$(PIGLIT).$(PIGLIT_SUFFIX)
@@ -32,6 +32,7 @@ PIGLIT_CONF_TOOL  := cmake
 
 PIGLIT_CONF_OPT:= $(CROSS_CMAKE_USR) \
-G Ninja \
+   -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE \
-DPYTHON_EXECUTABLE:FILEPATH=$(SYSTEMPYTHON3) \
-DPIGLIT_USE_WAFFLE=1 \
-DPIGLIT_BUILD_GL_TESTS=$(call ptx/ifdef, 
PTXCONF_PIGLIT_TESTS_OPENGL,1,0) \
@@ -39,6 +40,7 @@ PIGLIT_CONF_OPT   := $(CROSS_CMAKE_USR) \
-DPIGLIT_BUILD_GLES2_TESTS=$(call ptx/ifdef, 
PTXCONF_PIGLIT_TESTS_OPENGLES2,1,0) \
-DPIGLIT_BUILD_GLES3_TESTS=$(call ptx/ifdef, 
PTXCONF_PIGLIT_TESTS_OPENGLES3,1,0) \
-DPIGLIT_BUILD_CL_TESTS=0 \
+   -DPIGLIT_BUILD_VK_TESTS=$(call ptx/ifdef, 
PTXCONF_PIGLIT_TESTS_VULKAN,1,0) \
-DHAVE_LIBCACA:BOOL=NO
 
 PIGLIT_MAKE_ENV:= \
-- 
2.39.2




[ptxdist] [PATCH 2/3] vkrunner: new package

2023-10-18 Thread Philipp Zabel
VkRunner is a Vulkan shader tester based on shader_runner in Piglit.

Signed-off-by: Philipp Zabel 
---
 rules/vkrunner.in   | 12 +++
 rules/vkrunner.make | 52 +
 2 files changed, 64 insertions(+)
 create mode 100644 rules/vkrunner.in
 create mode 100644 rules/vkrunner.make

diff --git a/rules/vkrunner.in b/rules/vkrunner.in
new file mode 100644
index ..1494b915da8b
--- /dev/null
+++ b/rules/vkrunner.in
@@ -0,0 +1,12 @@
+## SECTION=project_specific
+
+config VKRUNNER
+   bool
+   prompt "vkrunner"
+   select HOST_MESON
+   select HOST_RUST_BINDGEN
+   select VULKAN_LOADER
+   select GLSLANG  if RUNTIME
+   select GLSLANG_TOOLSif RUNTIME
+   help
+ VkRunner is a Vulkan shader tester based on shader_runner in Piglit.
diff --git a/rules/vkrunner.make b/rules/vkrunner.make
new file mode 100644
index ..7f696b77a555
--- /dev/null
+++ b/rules/vkrunner.make
@@ -0,0 +1,52 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Philipp Zabel 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_VKRUNNER) += vkrunner
+
+#
+# Paths and names
+#
+VKRUNNER_VERSION   := 2023-10-06-gf12eb8bad978
+VKRUNNER_MD5   := 2eac13948551bcdab2b3625d79529911
+VKRUNNER   := vkrunner-$(VKRUNNER_VERSION)
+VKRUNNER_SUFFIX:= tar.gz
+VKRUNNER_URL   := 
https://gitlab.freedesktop.org/mesa/vkrunner/-/archive/$(VKRUNNER_VERSION)/$(VKRUNNER).$(VKRUNNER_SUFFIX)
+VKRUNNER_SOURCE:= $(SRCDIR)/$(VKRUNNER).$(VKRUNNER_SUFFIX)
+VKRUNNER_DIR   := $(BUILDDIR)/$(VKRUNNER)
+VKRUNNER_LICENSE   := MIT
+VKRUNNER_LICENSE_FILES := file://COPYING;md5=b3be11f69c265dc66ef04f27993480f0
+
+# 
+# Prepare
+# 
+
+VKRUNNER_CONF_TOOL := meson
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/vkrunner.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, vkrunner)
+   @$(call install_fixup, vkrunner, PRIORITY, optional)
+   @$(call install_fixup, vkrunner, SECTION, base)
+   @$(call install_fixup, vkrunner, AUTHOR, "Philipp Zabel 
")
+   @$(call install_fixup, vkrunner, DESCRIPTION, missing)
+
+   $(call install_copy, vkrunner, 0, 0, 0755, -, /usr/bin/vkrunner)
+
+   @$(call install_finish, vkrunner)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.39.2




[ptxdist] [PATCH] waffle: version bump 1.7.2 -> 1.8.0

2023-10-18 Thread Philipp Zabel
NaCl support has been removed, only the build option remains.
It throws an error when enabled.

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

diff --git a/rules/waffle.make b/rules/waffle.make
index 4c53b9116351..bb800ff4a5e2 100644
--- a/rules/waffle.make
+++ b/rules/waffle.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAFFLE) += waffle
 #
 # Paths and names
 #
-WAFFLE_VERSION := 1.7.2
-WAFFLE_MD5 := e5e9772fe2c1e6267794f7aba08637c8
+WAFFLE_VERSION := 1.8.0
+WAFFLE_MD5 := e4b3a5f28e4db517349631ef54e5f2a0
 WAFFLE := waffle-$(WAFFLE_VERSION)
 WAFFLE_SUFFIX  := tar.xz
 WAFFLE_URL := 
https://mesa.pages.freedesktop.org/waffle/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX)
@@ -39,8 +39,6 @@ WAFFLE_CONF_OPT   := \
-Dgbm=$(call ptx/endis,PTXCONF_WAFFLE_GBM)d \
-Dglx=$(call ptx/endis,PTXCONF_WAFFLE_GLX)d \
-Dnacl=false \
-   -Dnacl_sdk_path= \
-   -Dnacl_version= \
-Dsurfaceless_egl=disabled \
-Dwayland=$(call ptx/endis,PTXCONF_WAFFLE_WAYLAND)d \
-Dx11_egl=$(call ptx/endis,PTXCONF_WAFFLE_X11_EGL)d
-- 
2.39.2




[ptxdist] [PATCH] glslang: fix targetinstall

2023-10-18 Thread Philipp Zabel
Fix variable names to actually install tools and shared libraries when
selected. Make tools select shared libraries. Remove libHLSL, which is not
built, and libglslang-default-resource-limits, which was made static.

Signed-off-by: Philipp Zabel 
---
 rules/glslang.in   | 1 +
 rules/glslang.make | 6 ++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/rules/glslang.in b/rules/glslang.in
index 5cdfb9a68268..367ae0cf7d65 100644
--- a/rules/glslang.in
+++ b/rules/glslang.in
@@ -13,6 +13,7 @@ if GLSLANG
 config GLSLANG_TOOLS
bool
prompt "install tools"
+   select GLSLANG_LIBS
help
  Install glslangValidator and spirv-remap tools.
 
diff --git a/rules/glslang.make b/rules/glslang.make
index 95811086a3f7..f5b5e53b2a4c 100644
--- a/rules/glslang.make
+++ b/rules/glslang.make
@@ -58,15 +58,13 @@ $(STATEDIR)/glslang.targetinstall:
@$(call install_fixup, glslang, AUTHOR, "Philipp Zabel 
")
@$(call install_fixup, glslang, DESCRIPTION, Khronos-reference SPIR-V 
generator)
 
-ifdef GLSLANG_TOOLS
+ifdef PTXCONF_GLSLANG_TOOLS
@$(call install_copy, glslang, 0, 0, 0755, -, /usr/bin/glslangValidator)
@$(call install_copy, glslang, 0, 0, 0755, -, /usr/bin/spirv-remap)
 endif
 
-ifdef GLSLANG_LIBS
-   @$(call install_lib, glslang, 0, 0, 0644, 
libglslang-default-resource-limits)
+ifdef PTXCONF_GLSLANG_LIBS
@$(call install_lib, glslang, 0, 0, 0644, libglslang)
-   @$(call install_lib, glslang, 0, 0, 0644, libHLSL)
@$(call install_lib, glslang, 0, 0, 0644, libSPIRV)
@$(call install_lib, glslang, 0, 0, 0644, libSPVRemapper)
 endif
-- 
2.39.2




Re: [ptxdist] Classpath -- move out from staging?

2023-10-18 Thread Guillermo Rodriguez Garcia
Hi Michael,

El mié, 18 oct 2023 a las 8:00, Michael Olbrich
() escribió:
>
> Hi,
>
> On Sat, Oct 14, 2023 at 04:49:12PM +0200, Guillermo Rodriguez Garcia wrote:
> > I see that the classpath package was moved to staging in commit
> > f2afdd541d3dc1cbac965ddaf899009780de2aae, with a note stating that it
> > could not be built with any current (Java) distribution.
> >
> > My team and I are still using this actively, and it can be built with
> > OpenJDK 8 which is still supported and is expected to be be supported
> > for a while (for example Adoptium states it will be supported "At
> > least until Nov 2026").
> >
> > Can we move this out of staging? If so I will prepare a patch.
>
> No. In fakt, I should have removed it entirely some time ago. I just missed
> it. And I will remove it soon. The problem is, that I cannot even
> build-test it any more and that's the minimum requirement for having it
> upstream.


It should build fine with OpenJDK 8 which is still fully supported and
widely available.
Are you having problems with this?
Can you share the details?

Thanks,

Guillermo Rodriguez Garcia
guille.rodrig...@gmail.com



Re: [ptxdist] [APPLIED] host-qemu: map target architecture for mipsel

2023-10-18 Thread Michael Olbrich
Thanks, applied as 572e3440d6f8206e949c1a949a774f935b9cc448.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:54 +0200, Roland Hieber  wrote:
> Originally from DistroKit, see discussion there.
> 
> Suggested-by: Oleksij Rempel 
> Link: 
> https://lore.distrokit.org/distrokit/20210715144711.p36hgbrm74spx...@pengutronix.de/
> Signed-off-by: Roland Hieber 
> Message-Id: <20231009180547.2326444-1-...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/host-qemu.make b/rules/host-qemu.make
> index eb60635b040b..8d377ffa55f8 100644
> --- a/rules/host-qemu.make
> +++ b/rules/host-qemu.make
> @@ -38,6 +38,11 @@ endif
>  ifdef PTXCONF_ARCH_ARM64
>  HOST_QEMU_TARGETS:= aarch64
>  endif
> +ifdef PTXCONF_ARCH_MIPS
> +ifdef PTXCONF_ENDIAN_LITTLE
> +HOST_QEMU_TARGETS:= mipsel
> +endif
> +endif
>  HOST_QEMU_SYS_TARGETS:= $(patsubst %,%-softmmu,$(HOST_QEMU_TARGETS))
>  HOST_QEMU_USR_TARGETS:= $(patsubst 
> %,%-linux-user,$(HOST_QEMU_TARGETS))
>  



Re: [ptxdist] [APPLIED] libnl3: Version bump. 3.7.0 -> 3.8.0

2023-10-18 Thread Michael Olbrich
Thanks, applied as 90875f8af4f6f1dd9f8eda71df8e8a90866f9839.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:58 +0200, Christian Melki 
 wrote:
> Couldn't find a comprehensive summary.
> https://github.com/thom311/libnl/compare/libnl3_7_0...libnl3_8_0
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20230831185938.963682-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/libnl3.make b/rules/libnl3.make
> index 2af062ac2d6e..4c0f1a25629e 100644
> --- a/rules/libnl3.make
> +++ b/rules/libnl3.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBNL3) += libnl3
>  #
>  # Paths and names
>  #
> -LIBNL3_VERSION   := 3.7.0
> -LIBNL3_MD5   := b381405afd14e466e35d29a112480333
> +LIBNL3_VERSION   := 3.8.0
> +LIBNL3_MD5   := 86a4245274aae0a1cfdbd85ce88eede9
>  LIBNL3   := libnl-$(LIBNL3_VERSION)
>  LIBNL3_RELEASE   := libnl$(subst .,_,$(LIBNL3_VERSION))
>  LIBNL3_SUFFIX:= tar.gz



Re: [ptxdist] [APPLIED] libcurl: Version bump. 8.3.0 -> 8.4.0

2023-10-18 Thread Michael Olbrich
Thanks, applied as aefa748d67eb44b63889ab3d5360845cb0f9de0b.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:57 +0200, Christian Melki 
 wrote:
> Mostly smaller fixes.
> https://curl.se/changes.html#8_4_0
> 
> Plugs two CVEs:
> CVE-2023-38546 cookie injection with none file
> CVE-2023-38545 SOCKS5 heap buffer overflow
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20231011180236.1768772-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/libcurl.make b/rules/libcurl.make
> index ad615bd87f1c..61797e9ae52a 100644
> --- a/rules/libcurl.make
> +++ b/rules/libcurl.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl
>  #
>  # Paths and names
>  #
> -LIBCURL_VERSION  := 8.3.0
> -LIBCURL_MD5  := 2fc6cf5cefa8b73e3826aa24befdccff
> +LIBCURL_VERSION  := 8.4.0
> +LIBCURL_MD5  := 8424597f247da68b6041dd7f9ca367fe
>  LIBCURL  := curl-$(LIBCURL_VERSION)
>  LIBCURL_SUFFIX   := tar.xz
>  LIBCURL_URL  := https://curl.se/download/$(LIBCURL).$(LIBCURL_SUFFIX)



Re: [ptxdist] [APPLIED] poke: Add new package

2023-10-18 Thread Michael Olbrich
Thanks, applied as e6ec9f74f041658f3453f3b7ec4ba4b90e854f26.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:57 +0200, Alexander Dahl  wrote:
> Link: https://jemarch.net/poke
> Signed-off-by: Alexander Dahl 
> Message-Id: <20231010065219.43001-4-...@thorsis.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/poke.in b/rules/poke.in
> new file mode 100644
> index ..6b1637716d48
> --- /dev/null
> +++ b/rules/poke.in
> @@ -0,0 +1,17 @@
> +## SECTION=editors
> +
> +config POKE
> + tristate
> + prompt "poke"
> + select BDWGC
> + select NCURSES
> + select READLINE
> + help
> +   GNU poke is an interactive, extensible editor for binary data.
> +   Not limited to editing basic entities such as bits and bytes,
> +   it provides a full-fledged procedural, interactive programming
> +   language designed to describe data structures and to operate
> +   on them.
> +   https://jemarch.net/poke
> +
> +# vim: ft=kconfig noet tw=72 ts=8 sw=8
> diff --git a/rules/poke.make b/rules/poke.make
> new file mode 100644
> index ..bfd67396ccad
> --- /dev/null
> +++ b/rules/poke.make
> @@ -0,0 +1,71 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2023 by Alexander Dahl 
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_POKE) += poke
> +
> +#
> +# Paths and names
> +#
> +POKE_VERSION := 3.3
> +POKE_MD5 := 25461e6e9032fa4d3ed089576990c159
> +POKE := poke-$(POKE_VERSION)
> +POKE_SUFFIX  := tar.gz
> +POKE_URL := $(call ptx/mirror, GNU, poke/$(POKE).$(POKE_SUFFIX))
> +POKE_SOURCE  := $(SRCDIR)/$(POKE).$(POKE_SUFFIX)
> +POKE_DIR := $(BUILDDIR)/$(POKE)
> +POKE_LICENSE := GPL-3.0-or-later
> +POKE_LICENSE_FILES := \
> + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
> + file://jitter/COPYING;md5=d32239bcb673463ab874e80d47fae504
> +
> +# 
> 
> +# Prepare
> +# 
> 
> +
> +POKE_CONF_TOOL   := autoconf
> +POKE_CONF_OPT:=  \
> + $(CROSS_AUTOCONF_USR) \
> + --enable-threads=posix \
> + --disable-rpath \
> + --enable-curses \
> + --disable-nls \
> + --disable-pvm-profiling \
> + --disable-libnbd \
> + --enable-hserver \
> + --$(call ptx/endis, PTXDIST_Y2038)-year2038 \
> + --$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-largefile \
> + --with-libreadline-prefix="$(PTXDIST_SYSROOT_TARGET)/usr" \
> + --with-jitter-dispatch=best \
> + --without-vimdir \
> + --without-lispdir
> +
> +# 
> 
> +# Target-Install
> +# 
> 
> +
> +$(STATEDIR)/poke.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, poke)
> + @$(call install_fixup, poke,PRIORITY,optional)
> + @$(call install_fixup, poke,SECTION,base)
> + @$(call install_fixup, poke,AUTHOR,"Alexander Dahl ")
> + @$(call install_fixup, poke,DESCRIPTION,missing)
> +
> + @$(call install_lib, poke, 0, 0, 0644, libpoke)
> + @$(call install_copy, poke, 0, 0, 0755, -, /usr/bin/poke)
> + @$(call install_tree, poke, 0, 0, -,  /usr/share/poke)
> +
> + @$(call install_finish, poke)
> +
> + @$(call touch)
> +
> +# vim: ft=make noet tw=72 ts=8 sw=8



Re: [ptxdist] [APPLIED] libatomic_ops: Add new package

2023-10-18 Thread Michael Olbrich
Thanks, applied as 2b43a2aadd6252bdd5a14531f19e86d0db09fb68.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:55 +0200, Alexander Dahl  wrote:
> Dependency for the upcoming bdwgc.
> 
> Signed-off-by: Alexander Dahl 
> Message-Id: <20231010065219.43001-2-...@thorsis.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/libatomic_ops.in b/rules/libatomic_ops.in
> new file mode 100644
> index ..23e79c4fd50a
> --- /dev/null
> +++ b/rules/libatomic_ops.in
> @@ -0,0 +1,11 @@
> +## SECTION=system_libraries
> +
> +config LIBATOMIC_OPS
> + tristate
> + prompt "libatomic_ops"
> + help
> +   Semi-portable access to hardware-provided atomic memory update
> +   operations on a number of architectures.
> +   IN NEW CODE, PLEASE USE C11 OR C++14 STANDARD ATOMICS INSTEAD!
> +
> +# vim: ft=kconfig noet tw=72 ts=8 sw=8
> diff --git a/rules/libatomic_ops.make b/rules/libatomic_ops.make
> new file mode 100644
> index ..746ab9343431
> --- /dev/null
> +++ b/rules/libatomic_ops.make
> @@ -0,0 +1,75 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2023 by Alexander Dahl 
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_LIBATOMIC_OPS) += libatomic_ops
> +
> +#
> +# Paths and names
> +#
> +LIBATOMIC_OPS_VERSION:= 7.8.0
> +LIBATOMIC_OPS_MD5:= a7e51e8041c3e60c298c037b2789c3fa
> +LIBATOMIC_OPS:= libatomic_ops-$(LIBATOMIC_OPS_VERSION)
> +LIBATOMIC_OPS_SUFFIX := tar.gz
> +LIBATOMIC_OPS_URL:= 
> https://github.com/ivmai/libatomic_ops/releases/download/v$(LIBATOMIC_OPS_VERSION)/$(LIBATOMIC_OPS).$(LIBATOMIC_OPS_SUFFIX)
> +LIBATOMIC_OPS_SOURCE := $(SRCDIR)/$(LIBATOMIC_OPS).$(LIBATOMIC_OPS_SUFFIX)
> +LIBATOMIC_OPS_DIR:= $(BUILDDIR)/$(LIBATOMIC_OPS)
> +# quote from LICENSE:
> +#
> +# > Our intent is to make it easy to use libatomic_ops, in both free and
> +# > proprietary software.  Hence most of code (core library) that we
> +# > expect to be linked into a client application is covered by a MIT or
> +# > MIT-style license.
> +#
> +# > However, a few library routines (the gpl extension library) are
> +# > covered by the GNU General Public License.  These are put into a
> +# > separate library, libatomic_ops_gpl.a file.
> +LIBATOMIC_OPS_LICENSE:= MIT AND Boehm-GC AND GPL-2.0-or-later
> +LIBATOMIC_OPS_LICENSE_FILES := \
> + file://LICENSE;md5=5700d28353dfa2f191ca9b1bd707865e \
> + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
> +
> +# 
> 
> +# Prepare
> +# 
> 
> +
> +LIBATOMIC_OPS_CONF_TOOL  := autoconf
> +LIBATOMIC_OPS_CONF_OPT   :=  \
> + $(CROSS_AUTOCONF_USR) \
> + --enable-shared \
> + --disable-static \
> + --disable-werror \
> + --disable-assertions \
> + --disable-atomic-intrinsics \
> + --disable-gcov \
> + --enable-gpl \
> + --disable-docs
> +
> +# 
> 
> +# Target-Install
> +# 
> 
> +
> +$(STATEDIR)/libatomic_ops.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, libatomic_ops)
> + @$(call install_fixup, libatomic_ops,PRIORITY,optional)
> + @$(call install_fixup, libatomic_ops,SECTION,base)
> + @$(call install_fixup, libatomic_ops,AUTHOR,"Alexander Dahl 
> ")
> + @$(call install_fixup, libatomic_ops,DESCRIPTION,missing)
> +
> + @$(call install_lib, libatomic_ops, 0, 0, 0644, libatomic_ops)
> + @$(call install_lib, libatomic_ops, 0, 0, 0644, libatomic_ops_gpl)
> +
> + @$(call install_finish, libatomic_ops)
> +
> + @$(call touch)
> +
> +# vim: ft=make noet tw=72 ts=8 sw=8



Re: [ptxdist] [APPLIED] bdwgc: Add new package

2023-10-18 Thread Michael Olbrich
Thanks, applied as 966e139cd2b09c144591f7a7d0472938a8d1bd83.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:56 +0200, Alexander Dahl  wrote:
> Dependency for the upcoming GNU poke.  Pinning down the configure
> options was rather guesswork than informed decision, basically trying to
> pin the defaults which would have been set anyways.
> 
> Signed-off-by: Alexander Dahl 
> Message-Id: <20231010065219.43001-3-...@thorsis.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/bdwgc.in b/rules/bdwgc.in
> new file mode 100644
> index ..b0fee1c49566
> --- /dev/null
> +++ b/rules/bdwgc.in
> @@ -0,0 +1,11 @@
> +## SECTION=system_libraries
> +
> +config BDWGC
> + tristate
> + prompt "bdwgc"
> + select LIBATOMIC_OPS
> + help
> +   A garbage collector for C and C++.
> +   https://www.hboehm.info/gc/
> +
> +# vim: ft=kconfig noet tw=72 ts=8 sw=8
> diff --git a/rules/bdwgc.make b/rules/bdwgc.make
> new file mode 100644
> index ..021e4b5cc62d
> --- /dev/null
> +++ b/rules/bdwgc.make
> @@ -0,0 +1,85 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2023 by Alexander Dahl 
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_BDWGC) += bdwgc
> +
> +#
> +# Paths and names
> +#
> +BDWGC_VERSION:= 8.2.4
> +BDWGC_MD5:= 8901a6ed29ac35842420054772ea3441
> +BDWGC:= gc-$(BDWGC_VERSION)
> +BDWGC_SUFFIX := tar.gz
> +BDWGC_URL:= 
> https://github.com/ivmai/bdwgc/releases/download/v$(BDWGC_VERSION)/$(BDWGC).$(BDWGC_SUFFIX)
> +BDWGC_SOURCE := $(SRCDIR)/$(BDWGC).$(BDWGC_SUFFIX)
> +BDWGC_DIR:= $(BUILDDIR)/$(BDWGC)
> +BDWGC_LICENSE:= Boehm-GC
> +BDWGC_LICENSE_FILES := \
> + 
> file://README.QUICK;startline=1;endline=24;md5=798a33a333c0e8636ddeab552ac6090b
>  \
> + 
> file://README.md;startline=526;endline=575;md5=71aaf0a0f29b504d185ff4e9fc1d5858
> +
> +# 
> 
> +# Prepare
> +# 
> 
> +
> +BDWGC_CONF_TOOL  := autoconf
> +BDWGC_CONF_OPT   :=  \
> + $(CROSS_AUTOCONF_USR) \
> + --disable-emscripten-asyncify \
> + --enable-threads=posix \
> + --enable-parallel-mark \
> + --enable-thread-local-alloc \
> + --enable-threads-discovery \
> + --disable-cplusplus \
> + --enable-throw-bad-alloc-library \
> + --enable-gcj-support \
> + --disable-sigrt-signals \
> + --disable-gc-debug \
> + --enable-java-finalization \
> + --enable-atomic-uncollectable \
> + --disable-redirect-malloc \
> + --enable-disclaim \
> + --disable-large-config \
> + --disable-gc-assertions \
> + --disable-mmap \
> + --disable-munmap \
> + --enable-dynamic-loading \
> + --enable-register-main-static-data \
> + --disable-checksums \
> + --disable-werror \
> + --disable-single-obj-compilation \
> + --disable-gcov \
> + --disable-docs \
> + --enable-handle-fork \
> + --without-ecos \
> + --with-libatomic-ops=yes
> +
> +# 
> 
> +# Target-Install
> +# 
> 
> +
> +$(STATEDIR)/bdwgc.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, bdwgc)
> + @$(call install_fixup, bdwgc,PRIORITY,optional)
> + @$(call install_fixup, bdwgc,SECTION,base)
> + @$(call install_fixup, bdwgc,AUTHOR,"Alexander Dahl ")
> + @$(call install_fixup, bdwgc,DESCRIPTION,missing)
> +
> + @$(call install_lib, bdwgc, 0, 0, 0644, libcord)
> + @$(call install_lib, bdwgc, 0, 0, 0644, libgc)
> +
> + @$(call install_finish, bdwgc)
> +
> + @$(call touch)
> +
> +# vim: ft=make noet tw=72 ts=8 sw=8



Re: [ptxdist] [APPLIED] image-hdimg: fix building image without bootloader

2023-10-18 Thread Michael Olbrich
Thanks, applied as 0bf8bc3cecbdf085e427374dcea4d760951e7822.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:51 +0200, Roland Hieber  wrote:
> genimage complains that '@GPT_LOCATION@' is an invalid size suffix
> because we replace that template variable in the config file only if
> IMAGE_HDIMG_BAREBOX, IMAGE_HDIMG_GRUB, or IMAGE_HDIMG_VFAT are selected.
> Fix the use case for IMAGE_HDIMG_NONE too.
> 
> Fixes: 40a39c7a94d1f8821fab (2023-03-16, "image-hdimg: support using barebox 
> with GPT")
> Signed-off-by: Roland Hieber 
> Message-Id: <20231009113710.493504-1-...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/image-hdimg.make b/rules/image-hdimg.make
> index 2aa8aeddaf78..06712ca6d956 100644
> --- a/rules/image-hdimg.make
> +++ b/rules/image-hdimg.make
> @@ -25,6 +25,7 @@ IMAGE_HDIMG_CONFIG  := hd.config
>  
>  ifdef PTXCONF_IMAGE_HDIMG
>  IMAGE_HDIMG_BOOTLOADER_ENV := \
> + GPT_LOCATION='0' \
>   BOOTLOADER_IMAGES='' \
>   BOOTLOADER_PARTITIONS=''
>  



Re: [ptxdist] [APPLIED] util-linux: select missing ncurses dependency for fdisk and sfdisk

2023-10-18 Thread Michael Olbrich
Thanks, applied as 9ee115c14b41e5c484ee6f5fe60783aee36ace03.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:53 +0200, Philipp Zabel  
wrote:
> These tools depend on ncurses via the internal tcolors library.
> Since all fdisks now share the same selected dependencies, consolidate
> selections under the shared UTIL_LINUX_FDISKS option.
> 
> Signed-off-by: Philipp Zabel 
> Message-Id: <20231009153937.915402-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/util-linux.in b/rules/util-linux.in
> index 357aa7e4660a..3cdcad57d65e 100644
> --- a/rules/util-linux.in
> +++ b/rules/util-linux.in
> @@ -29,6 +29,9 @@ config UTIL_LINUX_LIBFDISK
>   bool
>  
>  config UTIL_LINUX_FDISKS
> + select UTIL_LINUX_LIBFDISK
> + select UTIL_LINUX_LIBSMARTCOLS
> + select UTIL_LINUX_USES_NCURSES
>   bool
>  
>  config UTIL_LINUX_USES_NCURSES
> @@ -61,10 +64,7 @@ config UTIL_LINUX_ADDPART
>  
>  config UTIL_LINUX_CFDISK
>   bool
> - select UTIL_LINUX_LIBFDISK
> - select UTIL_LINUX_LIBSMARTCOLS
>   select UTIL_LINUX_FDISKS
> - select UTIL_LINUX_USES_NCURSES
>   prompt "cfdisk"
>   help
> cfdisk is a curses based program for partitioning any hard disk drive.
> @@ -79,8 +79,6 @@ config UTIL_LINUX_DELPART
>  config UTIL_LINUX_FDISK
>   bool
>   prompt "fdisk"
> - select UTIL_LINUX_LIBFDISK
> - select UTIL_LINUX_LIBSMARTCOLS
>   select UTIL_LINUX_FDISKS
>   depends on !BUSYBOX_FDISK || ALLYES
>   help
> @@ -137,8 +135,6 @@ config UTIL_LINUX_PARTX
>  config UTIL_LINUX_SFDISK
>   bool
>   prompt "sfdisk"
> - select UTIL_LINUX_LIBFDISK
> - select UTIL_LINUX_LIBSMARTCOLS
>   select UTIL_LINUX_FDISKS
>   help
> sfdisk - Partition table manipulator for Linux,



Re: [ptxdist] [APPLIED] alsa-utils: fix build with(out) aplaymidi

2023-10-18 Thread Michael Olbrich
Thanks, applied as 12c625e7d54d51a886c57e88466fec8e6fbb34cc.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:53 +0200, Philipp Zabel  
wrote:
> If alsa-lib is built with ALSA_LIB_SEQ enabled, alsa-utils will always
> build aplaymidi, and it will try to use a header alsa/ump_msg.h that is
> only installed with ALSA_LIB_RAWMIDI enabled. Select ALSA_LIB_RAWMIDI
> to install the missing header when aplaymidi is going to be installed
> via ALSA_UTILS_MIDI, and set an override to stop it from including the
> missing header otherwise.
> 
> Signed-off-by: Philipp Zabel 
> Message-Id: <20231009124657.2869152-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/alsa-utils.in b/rules/alsa-utils.in
> index 78c60f0c2b40..95c27c5baa07 100644
> --- a/rules/alsa-utils.in
> +++ b/rules/alsa-utils.in
> @@ -5,7 +5,7 @@ menuconfig ALSA_UTILS
>   prompt "alsa utils"
>   select ALSA_LIB
>   select ALSA_LIB_UCM if ALSA_UTILS_USE_CASE_MANAGER
> - select ALSA_LIB_RAWMIDI if ALSA_UTILS_RAW_MIDI
> + select ALSA_LIB_RAWMIDI if ALSA_UTILS_RAW_MIDI || ALSA_UTILS_MIDI
>   select ALSA_LIB_MIXER   if ALSA_UTILS_AMIXER || ALSA_UTILS_ALSAMIXER
>   select ALSA_LIB_PCM if ALSA_UTILS_APLAYRECORD || ALSA_UTILS_IECSET 
> || ALSA_UTILS_MIDI || ALSA_UTILS_ALSALOOP
>   select ALSA_LIB_SEQ if ALSA_UTILS_SEQTOOLS || ALSA_UTILS_ACONNECT 
> || ALSA_UTILS_MIDI
> diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
> index f99a4768fb19..588cf7cffa41 100644
> --- a/rules/alsa-utils.make
> +++ b/rules/alsa-utils.make
> @@ -37,7 +37,8 @@ ALSA_UTILS_LICENSE_FILES := \
>  ALSA_UTILS_CONF_ENV  := \
>   $(CROSS_ENV) \
>   ac_cv_header_alsa_mixer_h=$(call ptx/yesno, 
> PTXCONF_ALSA_UTILS_ALSAMIXER) \
> - ac_cv_header_alsa_rawmidi_h=$(call ptx/yesno, 
> PTXCONF_ALSA_UTILS_RAW_MIDI)
> + ac_cv_header_alsa_rawmidi_h=$(call ptx/yesno, 
> PTXCONF_ALSA_UTILS_RAW_MIDI) \
> + ac_cv_lib_asound_snd_seq_client_info_get_midi_version=$(call ptx/yesno, 
> PTXCONF_ALSA_UTILS_MIDI)
>  
>  #
>  # autoconf



Re: [ptxdist] [APPLIED] util-linux: let mount select libsmartcols

2023-10-18 Thread Michael Olbrich
Thanks, applied as 18b1b95644d879613ffdd54a71de04ccd27842d6.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:52 +0200, Philipp Zabel  
wrote:
> The mount command is linked with the internal smartcols library,
> properly select it.
> 
> Fixes: 18c9c0f89c41 ("util-linux: switch to meson")
> Signed-off-by: Philipp Zabel 
> Message-Id: <20231009114645.1907863-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/util-linux.in b/rules/util-linux.in
> index a530758e199c..357aa7e4660a 100644
> --- a/rules/util-linux.in
> +++ b/rules/util-linux.in
> @@ -447,6 +447,7 @@ config UTIL_LINUX_MOUNT
>   bool
>   prompt "mount"
>   select UTIL_LINUX_LIBMOUNT
> + select UTIL_LINUX_LIBSMARTCOLS
>   depends on !BUSYBOX_MOUNT || ALLYES
>   help
> The mount command serves to attach the file system



Re: [ptxdist] [APPLIED] xkeyboard-config: Version bump. 2.39 -> 2.40.

2023-10-18 Thread Michael Olbrich
Thanks, applied as 6c765f8f76e977de1ff240913df43887bb367b36.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:50 +0200, Christian Melki 
 wrote:
> Translation fixes.
> 
> * License has. File had trailing whitespaces removed.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20231007185008.4082523-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/xkeyboard-config.make b/rules/xkeyboard-config.make
> index 53c017b65a0a..a510657727d1 100644
> --- a/rules/xkeyboard-config.make
> +++ b/rules/xkeyboard-config.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_XKEYBOARD_CONFIG) += xkeyboard-config
>  #
>  # Paths and names
>  #
> -XKEYBOARD_CONFIG_VERSION := 2.39
> -XKEYBOARD_CONFIG_MD5 := a7de43e9d9e8bb9d85d447da2e63bcc8
> +XKEYBOARD_CONFIG_VERSION := 2.40
> +XKEYBOARD_CONFIG_MD5 := 11c8d0ed0f7b604dc5757b7fa1e908d3
>  XKEYBOARD_CONFIG := xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION)
>  XKEYBOARD_CONFIG_SUFFIX  := tar.xz
>  XKEYBOARD_CONFIG_URL := $(call ptx/mirror, XORG, 
> individual/data/xkeyboard-config/$(XKEYBOARD_CONFIG).$(XKEYBOARD_CONFIG_SUFFIX))
> @@ -23,7 +23,7 @@ XKEYBOARD_CONFIG_SOURCE := 
> $(SRCDIR)/$(XKEYBOARD_CONFIG).$(XKEYBOARD_CONFIG_SUF
>  XKEYBOARD_CONFIG_DIR := $(BUILDDIR)/$(XKEYBOARD_CONFIG)
>  XKEYBOARD_CONFIG_LICENSE := MIT
>  XKEYBOARD_CONFIG_LICENSE_FILES   := \
> - file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9
> + file://COPYING;md5=8fc8ae699974c360e2e2e883a63ce264
>  
>  # 
> 
>  # Prepare



Re: [ptxdist] [APPLIED] pipewire: version bump 0.3.80 -> 0.3.81

2023-10-18 Thread Michael Olbrich
Thanks, applied as 73c4d6fadbe9353e9d9e6e2b8c88d6a1c4abe09f.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:50 +0200, Philipp Zabel  
wrote:
> https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/0.3.81
> 
> Signed-off-by: Philipp Zabel 
> Message-Id: <20231006131340.2190074-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/pipewire.make b/rules/pipewire.make
> index b0fba3fa8d4d..ab28a222aa37 100644
> --- a/rules/pipewire.make
> +++ b/rules/pipewire.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire
>  #
>  # Paths and names
>  #
> -PIPEWIRE_VERSION := 0.3.80
> -PIPEWIRE_MD5 := 0b74d8fb146176aa0bd94918bb094bbe
> +PIPEWIRE_VERSION := 0.3.81
> +PIPEWIRE_MD5 := 2cfeee4091cf989c327f5b0be0fe7e8e
>  PIPEWIRE := pipewire-$(PIPEWIRE_VERSION)
>  PIPEWIRE_SUFFIX  := tar.bz2
>  PIPEWIRE_URL := 
> https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX)



Re: [ptxdist] [APPLIED] openssh: Version bump. 9.4p1 -> 9.5p1

2023-10-18 Thread Michael Olbrich
Thanks, applied as 447730bd138596d46965339583649d3cf789857f.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:48 +0200, Christian Melki 
 wrote:
> Minor changes, but interesting.
> ssh-keygen now generates ed25519 keys as default.
> and ssh tries to obfuscate keystroke timing.
> This latter feature obviously creates (more) idle traffic.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20231005161108.2608205-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/openssh.make b/rules/openssh.make
> index 15ae8b987aa4..c8cdf645e82b 100644
> --- a/rules/openssh.make
> +++ b/rules/openssh.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh
>  #
>  # Paths and names
>  #
> -OPENSSH_VERSION  := 9.4p1
> -OPENSSH_MD5  := 4bbd56a7ba51b0cd61debe8f9e77f8bb
> +OPENSSH_VERSION  := 9.5p1
> +OPENSSH_MD5  := 3d29a7394816deeb57186899d7f7662c
>  OPENSSH  := openssh-$(OPENSSH_VERSION)
>  OPENSSH_SUFFIX   := tar.gz
>  OPENSSH_URL  := \



Re: [ptxdist] [APPLIED] hwdata: Version bump. 0.374 -> 0.375

2023-10-18 Thread Michael Olbrich
Thanks, applied as 8504ba6da648867c444aeb93d0927f94d43ca266.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:47 +0200, Christian Melki 
 wrote:
> Usual bunch of ID bumps.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20231005160436.2590325-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/hwdata.make b/rules/hwdata.make
> index 9e9473e22605..5fb33b9dd505 100644
> --- a/rules/hwdata.make
> +++ b/rules/hwdata.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HWDATA) += hwdata
>  #
>  # Paths and names
>  #
> -HWDATA_VERSION   := 0.374
> -HWDATA_MD5   := 4ce536c5b733ddbca1eaf318068da8d1
> +HWDATA_VERSION   := 0.375
> +HWDATA_MD5   := 9cd8131c0ab2800a0944be64307c5819
>  HWDATA   := hwdata-$(HWDATA_VERSION)
>  HWDATA_SUFFIX:= tar.gz
>  HWDATA_URL   := 
> https://github.com/vcrhonek/hwdata/archive/refs/tags/v$(HWDATA_VERSION).$(HWDATA_SUFFIX)



Re: [ptxdist] [APPLIED] mesalib: Version bump. 23.1.8 -> 23.1.9

2023-10-18 Thread Michael Olbrich
Thanks, applied as 72c0a06181c6078a279cb10299fa00b61b146329.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:49 +0200, Christian Melki 
 wrote:
> Bugfix release.
> https://docs.mesa3d.org/relnotes/23.1.9.html
> 
> * Forward patches, applies cleanly.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20231005163321.2711687-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git 
> a/patches/mesa-23.1.8/0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch
>  
> b/patches/mesa-23.1.9/0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch
> similarity index 100%
> rename from 
> patches/mesa-23.1.8/0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch
> rename to 
> patches/mesa-23.1.9/0001-llvmpipe-only-include-old-Transform-includes-when-ne.patch
> diff --git a/patches/mesa-23.1.8/series b/patches/mesa-23.1.9/series
> similarity index 100%
> rename from patches/mesa-23.1.8/series
> rename to patches/mesa-23.1.9/series
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index db0503f05977..e903e3499e74 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
>  #
>  # Paths and names
>  #
> -MESALIB_VERSION  := 23.1.8
> -MESALIB_MD5  := 6c89b2d1335993d708e1810eacfba9e4
> +MESALIB_VERSION  := 23.1.9
> +MESALIB_MD5  := 85e088185a4b751fcb9d4f1fb1f0028e
>  MESALIB  := mesa-$(MESALIB_VERSION)
>  MESALIB_SUFFIX   := tar.xz
>  MESALIB_URL  := \



Re: [ptxdist] [APPLIED] sdl2: Version bump. 2.28.3 -> 2.28.4

2023-10-18 Thread Michael Olbrich
Thanks, applied as 351455c3de715e86b101a45cdc2a4a776a975ab7.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:46 +0200, Christian Melki 
 wrote:
> Very minor bugfix release.
> https://github.com/libsdl-org/SDL/releases/tag/release-2.28.4
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20231003175642.1174443-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/sdl2.make b/rules/sdl2.make
> index 0d7cce26a625..5d0423c832c5 100644
> --- a/rules/sdl2.make
> +++ b/rules/sdl2.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2
>  #
>  # Paths and names
>  #
> -SDL2_VERSION := 2.28.3
> -SDL2_MD5 := a9cd672b63386d1f57074a4896045d54
> +SDL2_VERSION := 2.28.4
> +SDL2_MD5 := ef91171cf51b286a9e87a1ff1e509abe
>  SDL2 := SDL2-$(SDL2_VERSION)
>  SDL2_SUFFIX  := tar.gz
>  SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX)



Re: [ptxdist] [APPLIED] libkmod: Version bump. 30 -> 31

2023-10-18 Thread Michael Olbrich
Thanks, applied as a6c3af737591199b756818b82ac1f0846774c736.

Michael

[sent from post-receive hook]

On Wed, 18 Oct 2023 09:42:46 +0200, Christian Melki 
 wrote:
> Minor fixes and enhancements.
> Module loading with dependencies should now resolve
> from anywhere, instead of just selected paths.
> https://lwn.net/Articles/946017/
> 
> * Pin down some more options.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20231001161907.633639-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/libkmod.make b/rules/libkmod.make
> index f9076f09f588..e89388615a59 100644
> --- a/rules/libkmod.make
> +++ b/rules/libkmod.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBKMOD) += libkmod
>  #
>  # Paths and names
>  #
> -LIBKMOD_VERSION  := 30
> -LIBKMOD_MD5  := 85202f0740a75eb52f2163c776f9b564
> +LIBKMOD_VERSION  := 31
> +LIBKMOD_MD5  := 6165867e1836d51795a11ea4762ff66a
>  LIBKMOD  := kmod-$(LIBKMOD_VERSION)
>  LIBKMOD_SUFFIX   := tar.xz
>  LIBKMOD_URL  := $(call ptx/mirror, KERNEL, 
> utils/kernel/kmod/$(LIBKMOD).$(LIBKMOD_SUFFIX))
> @@ -43,6 +43,9 @@ LIBKMOD_CONF_OPT:= \
>   --$(call ptx/endis, PTXCONF_LIBKMOD_DEBUG)-debug \
>   --disable-python \
>   --disable-coverage \
> + --disable-gtk-doc \
> + --disable-gtk-doc-html \
> + --disable-gtk-doc-pdf \
>   --$(call ptx/wwo, PTXCONF_LIBKMOD_ZSTD)-zstd \
>   --without-xz \
>   --$(call ptx/wwo, PTXCONF_LIBKMOD_ZLIB)-zlib \



Re: [ptxdist] Classpath -- move out from staging?

2023-10-18 Thread Michael Olbrich
Hi,

On Sat, Oct 14, 2023 at 04:49:12PM +0200, Guillermo Rodriguez Garcia wrote:
> I see that the classpath package was moved to staging in commit
> f2afdd541d3dc1cbac965ddaf899009780de2aae, with a note stating that it
> could not be built with any current (Java) distribution.
> 
> My team and I are still using this actively, and it can be built with
> OpenJDK 8 which is still supported and is expected to be be supported
> for a while (for example Adoptium states it will be supported "At
> least until Nov 2026").
> 
> Can we move this out of staging? If so I will prepare a patch.

No. In fakt, I should have removed it entirely some time ago. I just missed
it. And I will remove it soon. The problem is, that I cannot even
build-test it any more and that's the minimum requirement for having it
upstream.
It's just a regular package. So please just copy it into you're BSP and
maintain it there.

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