[ptxdist] [PATCH 3/3] xkeyboard-config: Add host-system-python3 dependency.

2022-05-13 Thread Christian Melki 
For whatever reason, mesons own python3 dependency
does not seem to cover python usage through meson.

Signed-off-by: Christian Melki 
---
 rules/xkeyboard-config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/xkeyboard-config.in b/rules/xkeyboard-config.in
index 0219ca68b..e8498c7b3 100644
--- a/rules/xkeyboard-config.in
+++ b/rules/xkeyboard-config.in
@@ -4,5 +4,6 @@ config XKEYBOARD_CONFIG
tristate
prompt "xkeyboard-config"
select HOST_MESON
+   select HOST_SYSTEM_PYTHON3
help
  FIXME
-- 
2.34.1

[ptxdist] [PATCH 1/3] glib: Add host-system-python3 dependency.

2022-05-13 Thread Christian Melki 
For whatever reason, mesons own python3 dependency
does not seem to cover python usage through meson.

Signed-off-by: Christian Melki 
---
 rules/glib.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/glib.in b/rules/glib.in
index d4215a0df..14e9cd359 100644
--- a/rules/glib.in
+++ b/rules/glib.in
@@ -4,6 +4,7 @@ menuconfig GLIB
tristate
prompt "glib  "
select HOST_MESON
+   select HOST_SYSTEM_PYTHON3
select LIBC_DL
select LIBC_PTHREAD
select ICONV
-- 
2.34.1

[ptxdist] [PATCH 2/3] host-glib: Add host-system-python3 dependency.

2022-05-13 Thread Christian Melki 
For whatever reason, mesons own python3 dependency
does not seem to cover python usage through meson.

Signed-off-by: Christian Melki 
---
 rules/host-glib.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/host-glib.in b/rules/host-glib.in
index b87c33937..f7d5a479e 100644
--- a/rules/host-glib.in
+++ b/rules/host-glib.in
@@ -6,4 +6,5 @@ config HOST_GLIB
select HOST_LIBFFI
select HOST_LIBPCRE
select HOST_MESON
+   select HOST_SYSTEM_PYTHON3
select HOST_ZLIB
-- 
2.34.1

[ptxdist] [PATCH] cairo: Try to get rid of gtkdoc dependencies.

2022-05-13 Thread Christian Melki 
Since the autoconf update, gtk-doc dependencies seems to
have become hard when running autoreconf.
Several other build environments default to building gtk-doc.
I'd prefer not to so this is an effort to disable doc
building entirely.

* Add patch to remove doc building.
* Remove gtk-doc options from rulefile.

Signed-off-by: Christian Melki 
---
 ...to-get-rid-of-gtkdocize-dependencies.patch | 89 +++
 patches/cairo-1.16.0/series   |  3 +-
 rules/cairo.make  |  3 -
 3 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 
patches/cairo-1.16.0/0004-Try-to-get-rid-of-gtkdocize-dependencies.patch

diff --git 
a/patches/cairo-1.16.0/0004-Try-to-get-rid-of-gtkdocize-dependencies.patch 
b/patches/cairo-1.16.0/0004-Try-to-get-rid-of-gtkdocize-dependencies.patch
new file mode 100644
index 0..d37eaf278
--- /dev/null
+++ b/patches/cairo-1.16.0/0004-Try-to-get-rid-of-gtkdocize-dependencies.patch
@@ -0,0 +1,89 @@
+From: Christian Melki 
+Date: Thu, 12 May 2022 19:40:34 +0200
+Subject: [PATCH] Try to get rid of gtkdocize dependencies.
+
+gtk-doc (gtkdocize) looks like a bugged hard dependency
+under autoconf > 2.69.
+Cut docs out.
+
+Signed-off-by: Christian Melki 
+---
+ Makefile.am  | 8 +++-
+ autogen.sh   | 7 ---
+ configure.ac | 5 -
+ 3 files changed, 3 insertions(+), 17 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 03fa3523649f..1c5a8e8f5b47 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -16,8 +16,8 @@ EXTRA_DIST += \
+ 
+ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
+ 
+-DIST_SUBDIRS = src doc util boilerplate test perf
+-SUBDIRS = src doc util
++DIST_SUBDIRS = src util boilerplate test perf
++SUBDIRS = src util
+ # libpng is required for our test programs
+ if CAIRO_HAS_PNG_FUNCTIONS
+ SUBDIRS += boilerplate test perf
+@@ -25,8 +25,6 @@ endif
+ 
+ configure: cairo-version.h
+ 
+-doc:
+-  cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
+ test retest recheck: all
+   cd test && $(MAKE) $(AM_MAKEFLAGS) $@
+ perf: all
+@@ -34,7 +32,7 @@ perf: all
+ check-valgrind: all
+   cd test && $(MAKE) $(AM_MAKEFLAGS) check-valgrind
+   cd perf && $(MAKE) $(AM_MAKEFLAGS) check-valgrind
+-.PHONY: doc test retest recheck perf check-valgrind
++.PHONY: test retest recheck perf check-valgrind
+ 
+ 
+ EXTRA_DIST += \
+diff --git a/autogen.sh b/autogen.sh
+index 4b10251db941..c80d2b9e5688 100755
+--- a/autogen.sh
 b/autogen.sh
+@@ -13,13 +13,6 @@ if test -z $AUTORECONF; then
+ exit 1
+ fi
+ 
+-GTKDOCIZE=`which gtkdocize`
+-if test -z $GTKDOCIZE; then
+-echo "*** No GTK-Doc found, documentation won't be generated ***"
+-else
+-gtkdocize || exit $?
+-fi
+-
+ # create dummy */Makefile.am.features and ChangeLog to make automake happy
+ > boilerplate/Makefile.am.features
+ > src/Makefile.am.features
+diff --git a/configure.ac b/configure.ac
+index 5e33c96ea8b3..8d4cf0fe1ab1 100644
+--- a/configure.ac
 b/configure.ac
+@@ -22,9 +22,6 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) dnl Workaround for 
Automake 1.12
+ LT_PREREQ([2.2])
+ LT_INIT([win32-dll])
+ 
+-# Api documentation
+-GTK_DOC_CHECK([1.15],[--flavour no-tmpl])
+-
+ AC_SYS_LARGEFILE
+ 
+ dnl 
===
+@@ -890,8 +887,6 @@ util/cairo-script/examples/Makefile
+ util/cairo-sphinx/Makefile
+ util/cairo-trace/Makefile
+ util/cairo-trace/cairo-trace
+-doc/Makefile
+-doc/public/Makefile
+ ])
+ AC_CONFIG_COMMANDS([cairo-trace],
+  [chmod a+x util/cairo-trace/cairo-trace])
diff --git a/patches/cairo-1.16.0/series b/patches/cairo-1.16.0/series
index dc125547f..b08004c0d 100644
--- a/patches/cairo-1.16.0/series
+++ b/patches/cairo-1.16.0/series
@@ -3,4 +3,5 @@
 0001-only-build-GL-surface-tests-if-GLX-is-enabled.patch
 0002-Makefile.sources-move-font-variations.c-a-test-code-.patch
 0003-regrouping-of-test-sources-with-new-fc_font_test_sou.patch
-# dfb78163a7d65338b42965982e516176  - git-ptx-patches magic
+0004-Try-to-get-rid-of-gtkdocize-dependencies.patch
+# bc9e55960c5fbeb015e3a298371e311f  - git-ptx-patches magic
diff --git a/rules/cairo.make b/rules/cairo.make
index e9e395b26..594f31ad8 100644
--- a/rules/cairo.make
+++ b/rules/cairo.make
@@ -39,9 +39,6 @@ CAIRO_CONF_OPT:= \
$(CROSS_AUTOCONF_USR) \
--enable-shared \
--disable-static \
-   --disable-gtk-doc \
-   --disable-gtk-doc-html \
-   --disable-gtk-doc-pdf \
$(GLOBAL_LARGE_FILE_OPTION) \
--enable-atomic \
--disable-gcov \
-- 
2.34.1

[ptxdist] [PATCH] host-meson: Version bump. 0.60.3 -> 0.62.1

2022-05-13 Thread Christian Melki 
Approx. half a year between the releases.
Release notes, somewhat summarized:
https://mesonbuild.com/Release-notes-for-0-61-0.html
https://mesonbuild.com/Release-notes-for-0-62-0.html

* Forward all patches. Ptxdist specific.

Signed-off-by: Christian Melki 
---
 ...n-t-add-rpaths-for-build-directories-when-cross-co.patch | 6 +++---
 .../0002-HACK-enable-NEON-only-for-ARMv7.patch  | 2 +-
 patches/{meson-0.60.3 => meson-0.62.1}/series   | 2 +-
 rules/host-meson.make   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename patches/{meson-0.60.3 => 
meson-0.62.1}/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch 
(91%)
 rename patches/{meson-0.60.3 => 
meson-0.62.1}/0002-HACK-enable-NEON-only-for-ARMv7.patch (96%)
 rename patches/{meson-0.60.3 => meson-0.62.1}/series (86%)

diff --git 
a/patches/meson-0.60.3/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
 
b/patches/meson-0.62.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
similarity index 91%
rename from 
patches/meson-0.60.3/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
rename to 
patches/meson-0.62.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
index b0319b365..5e034784c 100644
--- 
a/patches/meson-0.60.3/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
+++ 
b/patches/meson-0.62.1/0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
@@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich 
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py
-index 334fc4f24e13..9545744b9bca 100644
+index 88b66be290c6..b5add5efa30a 100644
 --- a/mesonbuild/linkers/linkers.py
 +++ b/mesonbuild/linkers/linkers.py
-@@ -640,7 +640,10 @@ class GnuLikeDynamicLinkerMixin:
+@@ -645,7 +645,10 @@ class GnuLikeDynamicLinkerMixin:
  # Need to deduplicate rpaths, as macOS's install_name_tool
  # is *very* allergic to duplicate -delete_rpath arguments
  # when calling depfixer on installation.
@@ -26,7 +26,7 @@ index 334fc4f24e13..9545744b9bca 100644
  rpath_dirs_to_remove = set()
  for p in all_paths:
  rpath_dirs_to_remove.add(p.encode('utf8'))
-@@ -668,7 +671,8 @@ class GnuLikeDynamicLinkerMixin:
+@@ -673,7 +676,8 @@ class GnuLikeDynamicLinkerMixin:
  paths = padding
  else:
  paths = paths + ':' + padding
diff --git a/patches/meson-0.60.3/0002-HACK-enable-NEON-only-for-ARMv7.patch 
b/patches/meson-0.62.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
similarity index 96%
rename from patches/meson-0.60.3/0002-HACK-enable-NEON-only-for-ARMv7.patch
rename to patches/meson-0.62.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
index f6c355728..268a9fc5f 100644
--- a/patches/meson-0.60.3/0002-HACK-enable-NEON-only-for-ARMv7.patch
+++ b/patches/meson-0.62.1/0002-HACK-enable-NEON-only-for-ARMv7.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich 
  1 file changed, 3 insertions(+)
 
 diff --git a/mesonbuild/modules/unstable_simd.py 
b/mesonbuild/modules/unstable_simd.py
-index 3339cea5a03f..da2e740d4cd3 100644
+index 8715a149b79e..72c0d6b5beb0 100644
 --- a/mesonbuild/modules/unstable_simd.py
 +++ b/mesonbuild/modules/unstable_simd.py
 @@ -64,6 +64,9 @@ class SimdModule(ExtensionModule):
diff --git a/patches/meson-0.60.3/series b/patches/meson-0.62.1/series
similarity index 86%
rename from patches/meson-0.60.3/series
rename to patches/meson-0.62.1/series
index 7c887e1b3..3c8852cde 100644
--- a/patches/meson-0.60.3/series
+++ b/patches/meson-0.62.1/series
@@ -1,5 +1,5 @@
 # generated by git-ptx-patches
-#tag:ptxdist --start-number 1
+#tag:base --start-number 1
 0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
 0002-HACK-enable-NEON-only-for-ARMv7.patch
 # 0a496d0bc50051baaa87da126e867c5c  - git-ptx-patches magic
diff --git a/rules/host-meson.make b/rules/host-meson.make
index cb9a07a3d..e4facb666 100644
--- a/rules/host-meson.make
+++ b/rules/host-meson.make
@@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_MESON) += host-meson
 #
 # Paths and names
 #
-HOST_MESON_VERSION := 0.60.3
-HOST_MESON_MD5 := 03ddd7272d8cbb9f33269cb37a200d24
+HOST_MESON_VERSION := 0.62.1
+HOST_MESON_MD5 := 2f5301d0e7fd5544ab0004393ba44cbe
 HOST_MESON := meson-$(HOST_MESON_VERSION)
 HOST_MESON_SUFFIX  := tar.gz
 HOST_MESON_URL := 
https://github.com/mesonbuild/meson/releases/download/$(HOST_MESON_VERSION)/$(HOST_MESON).$(HOST_MESON_SUFFIX)
-- 
2.34.1

[ptxdist] [PATCH] host-cmake: Version bump 3.20.5 -> 3.23.1

2022-05-13 Thread Christian Melki 
~1 year release time difference.

Release notes, somewhat readable:
https://cmake.org/cmake/help/v3.21/release/3.21.html
https://cmake.org/cmake/help/v3.22/release/3.22.html
https://cmake.org/cmake/help/v3.23/release/3.23.html

* License file changes are composed of year changes,
spelling errors, contributors, whitespace, file references
and a removal of a bsd-3-clause in cmlibuv.

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

diff --git a/rules/host-cmake.make b/rules/host-cmake.make
index d93573fdb..44d43fbe5 100644
--- a/rules/host-cmake.make
+++ b/rules/host-cmake.make
@@ -15,8 +15,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_CMAKE) += host-cmake
 #
 # Paths and names
 #
-HOST_CMAKE_VERSION := 3.20.5
-HOST_CMAKE_MD5 := 137311bbe83d9a32469f99ac2792a2bc
+HOST_CMAKE_VERSION := 3.23.1
+HOST_CMAKE_MD5 := b0d46fdcca030372f0a464146243e193
 HOST_CMAKE := cmake-$(HOST_CMAKE_VERSION)
 HOST_CMAKE_SUFFIX  := tar.gz
 HOST_CMAKE_URL := https://cmake.org/files/v$(basename 
$(HOST_CMAKE_VERSION))/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
@@ -24,16 +24,16 @@ HOST_CMAKE_SOURCE   := 
$(SRCDIR)/$(HOST_CMAKE).$(HOST_CMAKE_SUFFIX)
 HOST_CMAKE_DIR := $(HOST_BUILDDIR)/$(HOST_CMAKE)
 HOST_CMAKE_LICENSE := 0BSD AND BSD-2-clause AND BSD-3-Clause AND 
Apache-2.0 AND bzip2-1.0.6 AND (MIT OR public_domain) AND MIT AND curl
 HOST_CMAKE_LICENSE_FILES := \
-   file://Copyright.txt;md5=31023e1d3f51ca90a58f55bcee8e2339 \
+   file://Copyright.txt;md5=f2102a52df7aa592cf072180e7ebc8c7 \
file://Source/kwsys/Copyright.txt;md5=64ed5ec90b0f9868cf0b08ea5b954dfe \

file://Utilities/KWIML/Copyright.txt;md5=bdc657917a0eec5751b3d5eafd4b413c \
file://Utilities/cmbzip2/LICENSE;md5=1e5cffe65fc786f83a11a4b225495c0b \
file://Utilities/cmcurl/COPYING;md5=425f6fdc767cc067518eef9bbdf4ab7b \
file://Utilities/cmexpat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \
-   file://Utilities/cmjsoncpp/LICENSE;md5=fa2a23dd1dc6c139f35105379d76df2b 
\
-   
file://Utilities/cmlibarchive/COPYING;md5=fe01f5e02b1f0cc934d593a7b0ddceb6 \
+   file://Utilities/cmjsoncpp/LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926 
\
+   
file://Utilities/cmlibarchive/COPYING;md5=d499814247adaee08d88080841cb5665 \

file://Utilities/cmlibrhash/COPYING;md5=a8c2a557a5c53b1c12cddbee98c099af \
-   file://Utilities/cmlibuv/LICENSE;md5=a68902a430e32200263d182d44924d47 \
+   file://Utilities/cmlibuv/LICENSE;md5=ad93ca1fffe931537fcf64f6fcce084d \
file://Utilities/cmnghttp2/COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec 
\

file://Utilities/cmzlib/Copyright.txt;md5=20549c31f1fec4df39b48732d8802c2a \
file://Utilities/cmzstd/LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32
-- 
2.34.1

[ptxdist] [PATCH] host-ninja: Version bump and fork change. 0.8.2 -> 1.10.2.g51db2.kitware.jobserver-1

2022-05-13 Thread Christian Melki 
Almost 5 years in the making. Lots of bugs and behavior has changed.

Upstream release notes from v1.8.2 (mostly referrals to git changes).
v1.9.0: https://groups.google.com/forum/#!topic/ninja-build/nY5Kb7zUvcg
v1.10.0: https://groups.google.com/d/msg/ninja-build/piOltAhywFA/zPfkrTtRCwAJ
v1.10.1: https://groups.google.com/d/msg/ninja-build/QQM54eAhrjU/q5zn_zTlAQAJ
v1.10.2: https://groups.google.com/d/msg/ninja-build/oobwq_F0PpA/FeJC5LoRBgAJ

Now follow in the path of others.
Due to the popular but stalled jobserver feature addition (6 years),
people has started forking ninja just for this feature.

https://github.com/buildroot/buildroot/commit/227d7e0cbaaf093f509f5728f06fad5f53caed7b

Do the same for ptxdist.

* Point ninja URL to the kitware fork.
* Upstream ninja now uses CMAKE. Drop python configuration.
* Reflect the CMAKE / PYTHON changes in the in file.
* Ninja is now default OOT. But lets keep it as it was for now. Disable OOT.
* Drop the old patchset which was the jobserver beside the fix for ptxdist
file descriptor handling.
* Forward file descriptor handling to a new patchset.

Signed-off-by: Christian Melki 
---
 .../0001-don-t-close-open-fds.patch}  |   6 +-
 .../series|   4 +
 ...dd-GNU-make-jobserver-client-support.patch | 478 ---
 ...l-monitoring-to-SubprocessSet-DoWork.patch | 554 --
 ...er-when-jN-is-forced-on-command-line.patch | 192 --
 .../0004-Honor-lN-from-MAKEFLAGS.patch| 128 
 ...e-LinePrinter-for-TokenPool-messages.patch | 122 
 .../0006-Prepare-PR-for-merging.patch | 151 -
 patches/ninja-1.8.2/series|  10 -
 rules/host-ninja.in   |   2 +-
 rules/host-ninja.make |  22 +-
 11 files changed, 19 insertions(+), 1650 deletions(-)
 rename patches/{ninja-1.8.2/0007-don-t-close-open-fds.patch => 
ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch} (88%)
 create mode 100644 patches/ninja-1.10.2.g51db2.kitware.jobserver-1/series
 delete mode 100644 
patches/ninja-1.8.2/0001-Add-GNU-make-jobserver-client-support.patch
 delete mode 100644 
patches/ninja-1.8.2/0002-Add-TokenPool-monitoring-to-SubprocessSet-DoWork.patch
 delete mode 100644 
patches/ninja-1.8.2/0003-Ignore-jobserver-when-jN-is-forced-on-command-line.patch
 delete mode 100644 patches/ninja-1.8.2/0004-Honor-lN-from-MAKEFLAGS.patch
 delete mode 100644 
patches/ninja-1.8.2/0005-Use-LinePrinter-for-TokenPool-messages.patch
 delete mode 100644 patches/ninja-1.8.2/0006-Prepare-PR-for-merging.patch
 delete mode 100644 patches/ninja-1.8.2/series

diff --git a/patches/ninja-1.8.2/0007-don-t-close-open-fds.patch 
b/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch
similarity index 88%
rename from patches/ninja-1.8.2/0007-don-t-close-open-fds.patch
rename to 
patches/ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch
index 8da54d4bd..a2dfc5b8e 100644
--- a/patches/ninja-1.8.2/0007-don-t-close-open-fds.patch
+++ 
b/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/0001-don-t-close-open-fds.patch
@@ -10,10 +10,10 @@ Signed-off-by: Michael Olbrich 
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure.py b/configure.py
-index 41d95469c00d..d5e34a0eeb3a 100755
+index 57e1ca3ab369..e49802f4c75b 100755
 --- a/configure.py
 +++ b/configure.py
-@@ -186,7 +186,7 @@ class Bootstrap:
+@@ -191,7 +191,7 @@ class Bootstrap:
  try:
  if self.verbose:
  print(cmdline)
@@ -22,7 +22,7 @@ index 41d95469c00d..d5e34a0eeb3a 100755
  except subprocess.CalledProcessError:
  print('when running: ', cmdline)
  raise
-@@ -683,4 +683,4 @@ if options.bootstrap:
+@@ -716,4 +716,4 @@ if options.bootstrap:
  if options.verbose:
  rebuild_args.append('-v')
  
diff --git a/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/series 
b/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/series
new file mode 100644
index 0..05bd05b30
--- /dev/null
+++ b/patches/ninja-1.10.2.g51db2.kitware.jobserver-1/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-don-t-close-open-fds.patch
+# 9f9c2c8544d68ab2c7db95cac6cf30bc  - git-ptx-patches magic
diff --git 
a/patches/ninja-1.8.2/0001-Add-GNU-make-jobserver-client-support.patch 
b/patches/ninja-1.8.2/0001-Add-GNU-make-jobserver-client-support.patch
deleted file mode 100644
index 5c23e036e..0
--- a/patches/ninja-1.8.2/0001-Add-GNU-make-jobserver-client-support.patch
+++ /dev/null
@@ -1,478 +0,0 @@
-From: Stefan Becker 
-Date: Tue, 22 Mar 2016 13:48:07 +0200
-Subject: [PATCH] Add GNU make jobserver client support
-
-- add new TokenPool interface
-- GNU make implementation for TokenPool parses and verifies the magic
-  information from the MAKEFLAGS environment variable
-- RealCommandRunner tries to acquire TokenPool
-  * if no token pool is available then

[ptxdist] [PATCH] host-opkg-utils: Version bump. 0.4.2 -> 0.5.0

2022-05-13 Thread Christian Melki 
Follow opkg upgrade.
Minor bugfixes. Notable features is zstd which
follows the inclusion of zstd in opkg.

* Remove old patches. The one in the upstream tag series is now included in the 
release.
Forward the rest.
* Add patch directory with non upstream patches.

Signed-off-by: Christian Melki 
---
 ...reproducibility-issues-in-opkg-build.patch | 35 ---
 ...0100-opkg-build-use-CROSS_COMPILE-ar.patch |  0
 .../0101-Update-Installed-Size-properly.patch |  0
 ...xdist-the-maxium-UID-for-system-user.patch |  0
 ...ld-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch |  0
 ...pkg-build-fix-typo-in-compressorargs.patch |  0
 .../series|  3 +-
 rules/host-opkg-utils.make|  4 +--
 8 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 
patches/opkg-utils-0.4.2/0001-Fix-reproducibility-issues-in-opkg-build.patch
 rename patches/{opkg-utils-0.4.2 => 
opkg-utils-0.5.0}/0100-opkg-build-use-CROSS_COMPILE-ar.patch (100%)
 rename patches/{opkg-utils-0.4.2 => 
opkg-utils-0.5.0}/0101-Update-Installed-Size-properly.patch (100%)
 rename patches/{opkg-utils-0.4.2 => 
opkg-utils-0.5.0}/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
 (100%)
 rename patches/{opkg-utils-0.4.2 => 
opkg-utils-0.5.0}/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch
 (100%)
 rename patches/{opkg-utils-0.4.2 => 
opkg-utils-0.5.0}/0104-opkg-build-fix-typo-in-compressorargs.patch (100%)
 rename patches/{opkg-utils-0.4.2 => opkg-utils-0.5.0}/series (77%)

diff --git 
a/patches/opkg-utils-0.4.2/0001-Fix-reproducibility-issues-in-opkg-build.patch 
b/patches/opkg-utils-0.4.2/0001-Fix-reproducibility-issues-in-opkg-build.patch
deleted file mode 100644
index f1615a392..0
--- 
a/patches/opkg-utils-0.4.2/0001-Fix-reproducibility-issues-in-opkg-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Richard Purdie 
-Date: Wed, 5 Feb 2020 12:08:39 +
-Subject: [PATCH] Fix reproducibility issues in opkg-build
-
-There is a sorting problem with opkg-build where the ipk generated is depending
-upon the order of files on disk. The reason is the --sort option to tar only
-influences the orders of files tar reads, not those passed by the -T option.
-
-Add in a sort call to resolve this issue. To ensure consistent sorting we
-also need to force to a specific locale (C) else the results are still not
-deterministic.
-
-Signed-off-by: Richard Purdie 
-Signed-off-by: Alejandro del Castillo 

- opkg-build | 6 --
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/opkg-build b/opkg-build
-index 8b3d7a9f78de..1b564166a7a4 100755
 a/opkg-build
-+++ b/opkg-build
-@@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH"  ]; then
- mtime_args="--mtime=@$build_date --clamp-mtime"
- fi
- 
--( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list )
--( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print  > 
$tmp_dir/file_list )
-+export LANG=C
-+export LC_ALL=C
-+( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list )
-+( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print  | sort 
> $tmp_dir/file_list )
- ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c 
$tarformat -T $tmp_dir/file_list | $compressor $compressorargs > 
$tmp_dir/data.tar.$cext )
- ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion 
--mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > 
$tmp_dir/control.tar.gz )
- rm $tmp_dir/file_list
diff --git 
a/patches/opkg-utils-0.4.2/0100-opkg-build-use-CROSS_COMPILE-ar.patch 
b/patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch
similarity index 100%
rename from patches/opkg-utils-0.4.2/0100-opkg-build-use-CROSS_COMPILE-ar.patch
rename to patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch
diff --git a/patches/opkg-utils-0.4.2/0101-Update-Installed-Size-properly.patch 
b/patches/opkg-utils-0.5.0/0101-Update-Installed-Size-properly.patch
similarity index 100%
rename from patches/opkg-utils-0.4.2/0101-Update-Installed-Size-properly.patch
rename to patches/opkg-utils-0.5.0/0101-Update-Installed-Size-properly.patch
diff --git 
a/patches/opkg-utils-0.4.2/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
 
b/patches/opkg-utils-0.5.0/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
similarity index 100%
rename from 
patches/opkg-utils-0.4.2/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
rename to 
patches/opkg-utils-0.5.0/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch
diff --git 
a/patches/opkg-utils-0.4.2/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch
 
b/patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch
similarity index 100%
rename from 
patches/opkg-utils-0.4.2/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch
rename to

[ptxdist] [PATCH 2/2] host-opkg: Follow options after upgrade of opkg.

2022-05-13 Thread Christian Melki 
* Add / remove options according to the upgrade of opkg
from 0.4.5 -> 0.5.0

Signed-off-by: Christian Melki 
---
 rules/host-opkg.make | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rules/host-opkg.make b/rules/host-opkg.make
index 68c26e48b..a8cae57ce 100644
--- a/rules/host-opkg.make
+++ b/rules/host-opkg.make
@@ -32,13 +32,12 @@ HOST_OPKG_CONF_OPT  := \
$(HOST_AUTOCONF) \
--disable-libopkg-api \
--disable-static \
-   --disable-pathfinder \
--disable-xz \
--disable-bzip2 \
--disable-lz4 \
+   --disable-zstd \
--disable-curl \
--disable-sha256 \
-   --disable-openssl \
--disable-ssl-curl \
--disable-gpg \
--without-static-libopkg \
-- 
2.34.1

[ptxdist] [PATCH 1/2] opkg: Version bump. 0.4.5 -> 0.5.0.

2022-05-13 Thread Christian Melki 
Various fixes and updates. Notable addition is zstd compression support.
Deprecated functions: Openssl signature validation and pathfinder
validation.
Seems the preferred validation method is using gpg.

https://git.yoctoproject.org/opkg/log/

* Remove openssl, pathfinder support.
* Disable zstd by default.
* Remove signature handling from installation.
* Remove signature handling variables from opkg.conf
* Remove signature handling variables from ptxdist internal
"prepare_work_dir.sh"

Signed-off-by: Christian Melki 
---
 projectroot/etc/opkg/opkg.conf|  4 ---
 rules/opkg.in | 33 ---
 rules/opkg.make   | 26 ++-
 .../lib/ptxd_make_image_prepare_work_dir.sh   |  3 --
 4 files changed, 3 insertions(+), 63 deletions(-)

diff --git a/projectroot/etc/opkg/opkg.conf b/projectroot/etc/opkg/opkg.conf
index 67a64838f..dd1de5f4e 100644
--- a/projectroot/etc/opkg/opkg.conf
+++ b/projectroot/etc/opkg/opkg.conf
@@ -16,7 +16,3 @@ option info_dir /usr/share/opkg/info
 arch   @ARCH@  10
 arch   all 1
 arch   noarch  1
-
-@CHECKSIG@
-@CAPATH@
-@CAFILE@
diff --git a/rules/opkg.in b/rules/opkg.in
index c9160509c..2ab09503e 100644
--- a/rules/opkg.in
+++ b/rules/opkg.in
@@ -4,7 +4,6 @@ menuconfig OPKG
tristate
select LIBARCHIVE
select LIBCURL if OPKG_CURL
-   select OPENSSL if OPKG_OPENSSL
prompt "opkg  "
help
  Opkg is a lightweight package management system based on Ipkg.
@@ -13,21 +12,6 @@ menuconfig OPKG
 
 if OPKG
 
-config OPKG_PATHFINDER
-   bool
-   prompt "pathfinder support"
-   # needs pathfinder-openssl
-   depends on BROKEN
-   help
- Pathfinder is designed to provide a mechanism for any
- program to perform RFC3280-compliant path validation
- of X.509 certificates, even when some of the intermediate
- certificates are not present on the local machine. It will
- automatically download any such certificates (and their
- CRLs) from the Internet as needed using the AIA and CRL
- distribution point extensions of the certificate it is
- processing.
-
 config OPKG_CURL
bool
prompt "libcurl support"
@@ -42,12 +26,6 @@ config OPKG_SHA256
help
  FIXME
 
-config OPKG_OPENSSL
-   bool
-   prompt "openssl signature checking"
-   help
- FIXME
-
 config OPKG_SSL_CURL
bool
prompt "libcurl certificate authentication"
@@ -97,17 +75,6 @@ config OPKG_OPKG_CONF_URL
 
  If you don't want to use this feature, keep the whole entry empty.
 
-config OPKG_OPKG_CONF_CHECKSIG
-   bool
-   prompt "enable repository signature checking"
-   depends on OPKG_OPENSSL
-   help
- Set the following options in opkg.conf:
-option check_signature 1
-option signature_ca_path /etc/ssl/certs
-option signature_ca_file /etc/ssl/certs/opkg.crt
-   
- Repository will only be used if it's signature can be validated.
 endif
 
 endif
diff --git a/rules/opkg.make b/rules/opkg.make
index 88d25ce29..0ae8b4bce 100644
--- a/rules/opkg.make
+++ b/rules/opkg.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_OPKG) += opkg
 #
 # Paths and names
 #
-OPKG_VERSION   := 0.4.5
-OPKG_MD5   := 5dc41ad37d88803b5e0f456a9c5a0811
+OPKG_VERSION   := 0.5.0
+OPKG_MD5   := b85f4bafd53d0cdffbcef178319901fa
 OPKG   := opkg-$(OPKG_VERSION)
 OPKG_SUFFIX:= tar.gz
 OPKG_URL   := 
http://downloads.yoctoproject.org/releases/opkg/$(OPKG).$(OPKG_SUFFIX)
@@ -38,13 +38,12 @@ OPKG_CONF_OPT   := \
$(GLOBAL_LARGE_FILE_OPTION) \
--disable-libopkg-api \
--disable-static \
-   --$(call ptx/endis, PTXCONF_OPKG_PATHFINDER)-pathfinder \
--disable-xz \
--disable-bzip2 \
--disable-lz4 \
+   --disable-zstd \
--$(call ptx/endis, PTXCONF_OPKG_CURL)-curl \
--$(call ptx/endis, PTXCONF_OPKG_SHA256)-sha256 \
-   --$(call ptx/endis, PTXCONF_OPKG_OPENSSL)-openssl \
--$(call ptx/endis, PTXCONF_OPKG_SSL_CURL)-ssl-curl \
--$(call ptx/endis, PTXCONF_OPKG_GPG)-gpg \
--without-static-libopkg \
@@ -76,31 +75,12 @@ endif
 
@$(call install_lib,  opkg, 0, 0, 0644, libopkg)
 
-ifdef PTXCONF_IMAGE_IPKG_SIGN_OPENSSL
-   @$(call install_copy, opkg, 0, 0, 0644, 
$(PTXCONF_IMAGE_IPKG_SIGN_OPENSSL_SIGNER), /etc/ssl/certs/opkg.crt)
-endif
-
 ifdef PTXCONF_OPKG_OPKG_CONF
@$(call install_alternative, opkg, 0, 0, 0644, /etc/opkg/opkg.conf)
@$(call install_replace, opkg, /etc/opkg/opkg.conf, @SRC@, \
$(PTXCONF_OPKG_OPKG_CONF_URL))
@$(call install_replace, opkg, /etc/opkg/opkg.conf, @ARCH@, \
$(PTXDIST_IPKG_ARCH_STRING))
-ifdef PTXCONF_OPKG_OPKG_CONF_CHECKSIG
-   @$(call install_replace, opkg, /etc/opkg/opkg.conf, @CHECKSIG@, \
-

[ptxdist] [PATCH] host-fakeroot: Version bump. 1.25.3 -> 1.28

2022-05-13 Thread Christian Melki 
fakeroot has a bunch of fixes, esp. for newer glibc.

* Change URL. Now stored in another snapshot.
* Remove old patches, but forward the make-fakeroot-relocateable.
* Add the debian patch series for 1.28.

Signed-off-by: Christian Melki 
---
 ...fine-_STAT_VER-if-not-already-define.patch |  33 
 ...d-wrappers-for-new-glibc-2.33-symbol.patch |  68 
 ...fix-compile-error-with-DEBUG-enabled.patch |  22 ---
 ac-fix-__xmknod-at-pointer-argument.patch |  56 --
 ...root.c-fix-fts_read-and-fts_children.patch |  44 -
 ...ER-defines-for-ppc64le-riscv64-s390x.patch |  26 ---
 .../0007-OS-X-portability.patch   | 161 --
 patches/fakeroot-1.25.3/series|  13 --
 ...0001-Also-wrap-the-stat-library-call.patch |  71 
 ...-Fix-prototype-generation-for-openat.patch |  70 
 .../0003-make-fakeroot-relocatable.patch} |   0
 .../autogen.sh|   0
 patches/fakeroot-1.28/series  |   6 +
 rules/host-fakeroot.make  |   6 +-
 14 files changed, 150 insertions(+), 426 deletions(-)
 delete mode 100644 
patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
 delete mode 100644 
patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
 delete mode 100644 
patches/fakeroot-1.25.3/0003-libfakeroot.c-fix-compile-error-with-DEBUG-enabled.patch
 delete mode 100644 
patches/fakeroot-1.25.3/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch
 delete mode 100644 
patches/fakeroot-1.25.3/0005-libfakeroot.c-fix-fts_read-and-fts_children.patch
 delete mode 100644 
patches/fakeroot-1.25.3/0006-Add-_STAT_VER-defines-for-ppc64le-riscv64-s390x.patch
 delete mode 100644 patches/fakeroot-1.25.3/0007-OS-X-portability.patch
 delete mode 100644 patches/fakeroot-1.25.3/series
 create mode 100644 
patches/fakeroot-1.28/0001-Also-wrap-the-stat-library-call.patch
 create mode 100644 
patches/fakeroot-1.28/0002-Fix-prototype-generation-for-openat.patch
 rename patches/{fakeroot-1.25.3/0008-make-fakeroot-relocatable.patch => 
fakeroot-1.28/0003-make-fakeroot-relocatable.patch} (100%)
 rename patches/{fakeroot-1.25.3 => fakeroot-1.28}/autogen.sh (100%)
 create mode 100644 patches/fakeroot-1.28/series

diff --git 
a/patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
 
b/patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
deleted file mode 100644
index 92584801d..0
--- 
a/patches/fakeroot-1.25.3/0001-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Ilya Lipnitskiy 
-Date: Thu, 11 Feb 2021 20:59:25 -0800
-Subject: [PATCH] libfakeroot.c: define _STAT_VER if not already defined
-
-Based on patch from Jan Pazdziora:
-https://lists.fedoraproject.org/archives/list/de...@lists.fedoraproject.org/message/SMQ3RYXEYTVZH6PLQMKNB3NM4XLPMNZO/
-
-Signed-off-by: Ilya Lipnitskiy 

- libfakeroot.c | 10 ++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libfakeroot.c b/libfakeroot.c
-index 3e80e38b16db..14cdbc4dca12 100644
 a/libfakeroot.c
-+++ b/libfakeroot.c
-@@ -90,6 +90,16 @@
- #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b)
- #endif
- 
-+#ifndef _STAT_VER
-+ #if defined (__aarch64__)
-+  #define _STAT_VER 0
-+ #elif defined (__x86_64__)
-+  #define _STAT_VER 1
-+ #else
-+  #define _STAT_VER 3
-+ #endif
-+#endif
-+
- /*
-These INT_* (which stands for internal) macros should always be used when
-the fakeroot library owns the storage of the stat variable.
diff --git 
a/patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
 
b/patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
deleted file mode 100644
index 59bc951d3..0
--- 
a/patches/fakeroot-1.25.3/0002-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Ilya Lipnitskiy 
-Date: Thu, 11 Feb 2021 21:00:04 -0800
-Subject: [PATCH] libfakeroot.c: add wrappers for new glibc 2.33+ symbols
-
-Signed-off-by: Ilya Lipnitskiy 

- libfakeroot.c | 48 
- 1 file changed, 48 insertions(+)
-
-diff --git a/libfakeroot.c b/libfakeroot.c
-index 14cdbc4dca12..d75c51fa990a 100644
 a/libfakeroot.c
-+++ b/libfakeroot.c
-@@ -1352,6 +1352,54 @@ int renameat(int olddir_fd, const char *oldpath,
- #endif /* HAVE_FSTATAT */
- 
- 
-+#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33)
-+/* Glibc 2.33 exports symbols for these functions in the shared lib */
-+  int lstat(const char *file_name, struct stat *statbuf) {
-+ return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf);
-+  }
-+  int stat(const char *file_name, struct stat *st) {
-+ return WRAP_STAT STAT_ARG(_STAT_VER, file_name, st);
-+  }
-+  int fstat(int fd, struct stat *st) {
-+ return WRAP_FSTAT FSTAT_ARG(_STAT_VER, fd, st);
-+  }
-+
-+

[ptxdist] [PATCH] host-autotools-autoconf: Version bump. 2.69 -> 2.71.

2022-05-13 Thread Christian Melki 
Tools are starting to prereq version 2.71.
So might aswell swallow the bitter pill and upgrade autoconf.

* License file changed. Nothing but whitespace, misspelling and URL fixes.
* Add a sed line for a standalone line in the autoconf binary.
It's a full path trailer.m4, which didn't match with the previous rules.
Add a separate one as it might get removed either way in the next version.
Looks like the autoconf team is planning a rewrite in the generation mechanism
using perl instead(?).

Signed-off-by: Christian Melki 
---
 rules/host-autotools-autoconf.make | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/rules/host-autotools-autoconf.make 
b/rules/host-autotools-autoconf.make
index a5e6d6ea9..994ca51fe 100644
--- a/rules/host-autotools-autoconf.make
+++ b/rules/host-autotools-autoconf.make
@@ -14,8 +14,8 @@ LAZY_PACKAGES-$(PTXCONF_HOST_AUTOTOOLS_AUTOCONF) += 
host-autotools-autoconf
 #
 # Paths and names
 #
-HOST_AUTOTOOLS_AUTOCONF_VERSION:= 2.69
-HOST_AUTOTOOLS_AUTOCONF_MD5:= 50f97f4159805e374639a73e2636f22e
+HOST_AUTOTOOLS_AUTOCONF_VERSION:= 2.71
+HOST_AUTOTOOLS_AUTOCONF_MD5:= 12cfa1687ffa2606337efe1a64416106
 HOST_AUTOTOOLS_AUTOCONF:= 
autoconf-$(HOST_AUTOTOOLS_AUTOCONF_VERSION)
 HOST_AUTOTOOLS_AUTOCONF_SUFFIX := tar.xz
 HOST_AUTOTOOLS_AUTOCONF_URL:= $(call ptx/mirror, GNU, 
autoconf/$(HOST_AUTOTOOLS_AUTOCONF).$(HOST_AUTOTOOLS_AUTOCONF_SUFFIX))
@@ -23,9 +23,9 @@ HOST_AUTOTOOLS_AUTOCONF_SOURCE:= 
$(SRCDIR)/$(HOST_AUTOTOOLS_AUTOCONF).$(HOST_AU
 HOST_AUTOTOOLS_AUTOCONF_DIR:= $(HOST_BUILDDIR)/$(HOST_AUTOTOOLS_AUTOCONF)
 HOST_AUTOTOOLS_AUTOCONF_LICENSE:= GPL-2.0-only AND GPL-3.0-only AND 
Autoconf-exception-3.0
 HOST_AUTOTOOLS_AUTOCONF_LICENSE_FILES := \
-   file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
-   file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
-   file://COPYING.EXCEPTION;md5=fdef168ebff3bc2f13664c365a5fb515
+   file://COPYING;md5=cc3f3a7596cb558bbd9eb7fbaa3ef16c \
+   file://COPYINGv3;md5=1ebbd3e34237af26da5dc08a4e440464 \
+   file://COPYING.EXCEPTION;md5=eb129370fe0bb2068cc4e48ff8d31260
 
 $(STATEDIR)/autogen-tools: $(STATEDIR)/host-autotools-autoconf.install.post
 
@@ -50,6 +50,9 @@ $(STATEDIR)/host-autotools-autoconf.install.post:
-e 
"s;'/[^']*/sysroot-host\(/bin/m4\)';'$(PTXDIST_SYSROOT_HOST)\1';g" \
$(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/bin/* \
$(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/share/autoconf/autom4te.cfg
+   @sed -i \
+   -e "s;\(/share/autoconf/\);$(PTXDIST_SYSROOT_HOST)\1;g" \
+   $(HOST_AUTOTOOLS_AUTOCONF_PKGDIR)/bin/autoconf
@$(call world/install.post, HOST_AUTOTOOLS_AUTOCONF)
@$(call touch)
 
-- 
2.34.1

Re: [ptxdist] [PATCH] libcurl: Version bump. 7.83.0 -> 7.83.1

2022-05-13 Thread Michael Olbrich 
On Fri, May 13, 2022 at 10:42:51AM +0200, Christian Melki wrote:
> My bad.
> 
> It needs to be removed. Included in the release.
> Daniel added it:
> https://github.com/curl/curl/commit/d7b970e46ba29a7e558e21d19f485977ffed6266

Ok, I'll fix it here.

Michael


> /Christian
> 
> On 5/13/22 10:35 AM, Michael Olbrich wrote:
> > On Wed, May 11, 2022 at 09:20:28AM +0200, Christian Melki wrote:
> > > Usual churn of fixes.
> > > Curl is seeing an accelerated CVE ticketing.
> > > Probably due to a functioning bug bounty program.
> > > https://hackerone.com/curl?type=team
> > > With 30 reports in the last 90 days.
> > > So probably expect more CVEs in the near future.
> > > 
> > > Changelog: https://curl.se/changes.html
> > > Security: https://curl.se/docs/security.html
> > > 
> > > Plugs CVEs: CVE-2022-30115, CVE-2022-27782, CVE-2022-27781,
> > > CVE-2022-27780, CVE-2022-27779, CVE-2022-27778
> > 
> > The old version has a patch. It's from upstream, but I'm not sure if it got
> > applied to the bugfix release.
> > 
> > Michael
> > 
> > > Signed-off-by: Christian Melki 
> > > ---
> > >   rules/libcurl.make | 4 ++--
> > >   1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/rules/libcurl.make b/rules/libcurl.make
> > > index 3840b2abd..8faa948bf 100644
> > > --- a/rules/libcurl.make
> > > +++ b/rules/libcurl.make
> > > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl
> > >   #
> > >   # Paths and names
> > >   #
> > > -LIBCURL_VERSION  := 7.83.0
> > > -LIBCURL_MD5  := b7924acdea33dedc3150a044789ed0bb
> > > +LIBCURL_VERSION  := 7.83.1
> > > +LIBCURL_MD5  := 08c6d9c25d9cf8d17be28363753e42ca
> > >   LIBCURL := curl-$(LIBCURL_VERSION)
> > >   LIBCURL_SUFFIX  := tar.xz
> > >   LIBCURL_URL := 
> > > https://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX)
> > > -- 
> > > 2.34.1
> > > 
> > > 
> > > 
> > 
> 
> 

-- 
Pengutronix e.K.   | |
Steuerwalder Str. 21   | http://www.pengutronix.de/  |
31137 Hildesheim, Germany  | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |

Re: [ptxdist] [PATCH] libcurl: Version bump. 7.83.0 -> 7.83.1

2022-05-13 Thread Christian Melki 

My bad.

It needs to be removed. Included in the release.
Daniel added it:
https://github.com/curl/curl/commit/d7b970e46ba29a7e558e21d19f485977ffed6266

/Christian

On 5/13/22 10:35 AM, Michael Olbrich wrote:

On Wed, May 11, 2022 at 09:20:28AM +0200, Christian Melki wrote:

Usual churn of fixes.
Curl is seeing an accelerated CVE ticketing.
Probably due to a functioning bug bounty program.
https://hackerone.com/curl?type=team
With 30 reports in the last 90 days.
So probably expect more CVEs in the near future.

Changelog: https://curl.se/changes.html
Security: https://curl.se/docs/security.html

Plugs CVEs: CVE-2022-30115, CVE-2022-27782, CVE-2022-27781,
CVE-2022-27780, CVE-2022-27779, CVE-2022-27778


The old version has a patch. It's from upstream, but I'm not sure if it got
applied to the bugfix release.

Michael


Signed-off-by: Christian Melki 
---
  rules/libcurl.make | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/libcurl.make b/rules/libcurl.make
index 3840b2abd..8faa948bf 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl
  #
  # Paths and names
  #
-LIBCURL_VERSION:= 7.83.0
-LIBCURL_MD5:= b7924acdea33dedc3150a044789ed0bb
+LIBCURL_VERSION:= 7.83.1
+LIBCURL_MD5:= 08c6d9c25d9cf8d17be28363753e42ca
  LIBCURL   := curl-$(LIBCURL_VERSION)
  LIBCURL_SUFFIX:= tar.xz
  LIBCURL_URL   := https://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX)
--
2.34.1

Re: [ptxdist] [PATCH] libcurl: Version bump. 7.83.0 -> 7.83.1

2022-05-13 Thread Michael Olbrich 
On Wed, May 11, 2022 at 09:20:28AM +0200, Christian Melki wrote:
> Usual churn of fixes.
> Curl is seeing an accelerated CVE ticketing.
> Probably due to a functioning bug bounty program.
> https://hackerone.com/curl?type=team
> With 30 reports in the last 90 days.
> So probably expect more CVEs in the near future.
> 
> Changelog: https://curl.se/changes.html
> Security: https://curl.se/docs/security.html
> 
> Plugs CVEs: CVE-2022-30115, CVE-2022-27782, CVE-2022-27781,
> CVE-2022-27780, CVE-2022-27779, CVE-2022-27778

The old version has a patch. It's from upstream, but I'm not sure if it got
applied to the bugfix release.

Michael

> Signed-off-by: Christian Melki 
> ---
>  rules/libcurl.make | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/libcurl.make b/rules/libcurl.make
> index 3840b2abd..8faa948bf 100644
> --- a/rules/libcurl.make
> +++ b/rules/libcurl.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl
>  #
>  # Paths and names
>  #
> -LIBCURL_VERSION  := 7.83.0
> -LIBCURL_MD5  := b7924acdea33dedc3150a044789ed0bb
> +LIBCURL_VERSION  := 7.83.1
> +LIBCURL_MD5  := 08c6d9c25d9cf8d17be28363753e42ca
>  LIBCURL  := curl-$(LIBCURL_VERSION)
>  LIBCURL_SUFFIX   := tar.xz
>  LIBCURL_URL  := https://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX)
> -- 
> 2.34.1
> 
> 
> 

-- 
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] git-ptx-patches: Remove useless assignment

2022-05-13 Thread Uwe Kleine-König 
range is overwritten unconditionally after option parsing, so drop the
assignment. Its only effect was irritating a human reader.

Signed-off-by: Uwe Kleine-König 
---
 scripts/git-ptx-patches | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches
index 8bf1731aeb53..fe3d1b619d21 100755
--- a/scripts/git-ptx-patches
+++ b/scripts/git-ptx-patches
@@ -64,7 +64,6 @@ while getopts "aft:n" opt; do
;;
t)
tag="${OPTARG}"
-   range="${tag}"
;;
n)
numbered_patches=false

base-commit: 5b07b31b850e69493e4fd7bd4fa46501ee92684a
prerequisite-patch-id: 0d2b85af86e0b2a7844ba3fcb2d66d84228ab8a1
-- 
2.35.1

[ptxdist] [PATCH] Freetype: version bump 2.11.1 -> 2.12.1

2022-05-13 Thread Linnea Gunnarsson 
- It now handles OT-SVG fonts, can be controlled with the
FT_CONFIG_OPTION_SVG macro.
- Some improvements on font handling and other things.
- Some bug fixes.
- The internal zlib is in sync with zlib v. 1.2.12.
- In version 2.12.1 there are some fixes for bugs introduced
in version 2.12.0.
- New config option for demo.
- New md5sum for license, its a new url and some text changes,
nothing important.

Signed-off-by: Linnea Gunnarsson 
---
 patches/freetype-2.11.1/series|  4 -
 .../autogen.sh|  0
 ...e-config-and-freetype2.pc-correctly.patch} | 98 ---
 patches/freetype-2.12.1/series|  1 +
 rules/freetype.make   |  6 +-
 5 files changed, 46 insertions(+), 63 deletions(-)
 delete mode 100644 patches/freetype-2.11.1/series
 rename patches/{freetype-2.11.1 => freetype-2.12.1}/autogen.sh (100%)
 rename 
patches/{freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
 => freetype-2.12.1/generate-freetype-config-and-freetype2.pc-correctly.patch} 
(54%)
 create mode 100644 patches/freetype-2.12.1/series

diff --git a/patches/freetype-2.11.1/series b/patches/freetype-2.11.1/series
deleted file mode 100644
index ab166a354..0
--- a/patches/freetype-2.11.1/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-generate-freetype-config-and-freetype2.pc-correctly.patch
-# c59ef464a7fe3a60ef114485523f346e  - git-ptx-patches magic
diff --git a/patches/freetype-2.11.1/autogen.sh 
b/patches/freetype-2.12.1/autogen.sh
similarity index 100%
rename from patches/freetype-2.11.1/autogen.sh
rename to patches/freetype-2.12.1/autogen.sh
diff --git 
a/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
 
b/patches/freetype-2.12.1/generate-freetype-config-and-freetype2.pc-correctly.patch
similarity index 54%
rename from 
patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
rename to 
patches/freetype-2.12.1/generate-freetype-config-and-freetype2.pc-correctly.patch
index 9f6d6b5fc..1dc42fafe 100644
--- 
a/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch
+++ 
b/patches/freetype-2.12.1/generate-freetype-config-and-freetype2.pc-correctly.patch
@@ -1,35 +1,48 @@
-From: Michael Olbrich 
-Date: Wed, 20 Nov 2013 14:06:25 +0100
-Subject: [PATCH] generate freetype-config and freetype2.pc correctly
-
-Signed-off-by: Michael Olbrich 

- builds/unix/configure.ac   |  4 +++-
- builds/unix/freetype-config.in | 19 ++-
- builds/unix/freetype2.in   | 14 +++---
- builds/unix/unix-def.in|  3 ---
- 4 files changed, 16 insertions(+), 24 deletions(-)
-
-diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
-index d1b7f1a78c59..11490364fd51 100644
 a/builds/unix/configure.ac
-+++ b/builds/unix/configure.ac
-@@ -1094,7 +1094,9 @@ AC_CONFIG_HEADERS([ftconfig.h])
+diff -ruN a/builds/unix/configure.ac b/builds/unix/configure.ac
+--- a/builds/unix/configure.ac 2022-05-11 13:51:49.525055650 +0200
 b/builds/unix/configure.ac 2022-05-11 13:52:30.389952135 +0200
+@@ -1147,7 +1147,9 @@
  # and `builds/unix/unix-cc.mk' that will be used by the build system
  #
  AC_CONFIG_FILES([unix-cc.mk:unix-cc.in
 - unix-def.mk:unix-def.in])
 + unix-def.mk:unix-def.in
-+ freetype-config:freetype-config.in
-+ freetype2.pc:freetype2.in])
++   freetype-config:freetype-config.in
++   freetype2.pc:freetype2.in])
  
  AC_OUTPUT
  
-diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
-index 4edb092d09c4..f0864cbec48b 100644
 a/builds/unix/freetype-config.in
-+++ b/builds/unix/freetype-config.in
-@@ -16,13 +16,6 @@ export LC_ALL
+diff -ruN a/builds/unix/freetype2.in b/builds/unix/freetype2.in
+--- a/builds/unix/freetype2.in 2022-05-11 13:52:10.165508453 +0200
 b/builds/unix/freetype2.in 2022-05-11 13:52:41.518196259 +0200
+@@ -1,14 +1,14 @@
+-prefix=%prefix%
+-exec_prefix=%exec_prefix%
+-libdir=%libdir%
+-includedir=%includedir%
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+ 
+ Name: FreeType 2
+ URL: https://freetype.org
+ Description: A free, high-quality, and portable font engine.
+-Version: %ft_version%
+-Requires: %PKGCONFIG_REQUIRES%
+-Requires.private: %PKGCONFIG_REQUIRES_PRIVATE%
+-Libs: %PKGCONFIG_LIBS%
+-Libs.private: %PKGCONFIG_LIBS_PRIVATE%
++Version: @ft_version@
++Requires: @PKGCONFIG_REQUIRES@
++Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
++Libs: @PKGCONFIG_LIBS@
++Libs.private: @PKGCONFIG_LIBS_PRIVATE@
+ Cflags: -I${includedir}/freetype2
+diff -ruN a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in
+--- a/builds/unix/freetype-config.in   2022-05-11 13:51:59.341270992 +0200
 b/builds/unix/freetype-config.in   2022-05-11 13:52:36.646089382

[ptxdist] [PATCH] git-ptx-patches: Fix corner case when searching for a tag in series file

2022-05-13 Thread Uwe Kleine-König 
Require a space after the tag name, otherwise searching for tag=foo might
match a line

#tag:foobar ...

Fixes: 957c6c663cdd ("git-ptx-patches: Allow patches before base tag")
Signed-off-by: Uwe Kleine-König 
---
 scripts/git-ptx-patches | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches
index b52817399d45..8bf1731aeb53 100755
--- a/scripts/git-ptx-patches
+++ b/scripts/git-ptx-patches
@@ -73,7 +73,7 @@ while getopts "aft:n" opt; do
 done
 shift $((${OPTIND} - 1))
 
-tag2=$(grep "#tag:" .ptxdist/series | awk "/#tag:${tag}/{if (getline) print 
\$1}" | sed 's,#tag:,,')
+tag2=$(grep "#tag:" .ptxdist/series | awk "/#tag:${tag} /{if (getline) print 
\$1}" | sed 's,#tag:,,')
 range="${tag}..${tag2}"
 
 if "${all_tags}" ; then

base-commit: 5b07b31b850e69493e4fd7bd4fa46501ee92684a
-- 
2.35.1

Re: [ptxdist] [PATCH 1/2] python3-gunicorn: new package

2022-05-13 Thread 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.
> 
> Requirement for python3-falcon package.
> 
> Signed-off-by: Bruno Thomsen 
> ---
>  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 0..d010ea900
> --- /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 0..a37aa8f04
> --- /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 := ac6254576d53c2ede3456561af3f0549

ptxdist: error: Wrong md5sum for 'python3-gunicorn' 
(.../src/gunicorn-20.1.0.tar.gz)

What's going on here?

Michael

> +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: 0b3d1b74a16d1c8d47e1bb5ac2f34f3def01aeac
> -- 
> 2.35.1
> 
> 
> 

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