[ptxdist] [PATCH] busybox: Version bump. 1.35.0 -> 1.36.0
After a year of low activity and questionmarks, we finally have a new release of busybox. Release changelog @ https://busybox.net/ Not that many new features, mostly fixes. One notable addition is seedrng. But it marks a new release that includes security fixes. Plugs CVEs: CVE-2022-28391, CVE-2022-30065 * Forward the ptxdist specific patches. * Remove one security patch to awk that has been fixed. * Update busybox imported kconfig tree. Not that many changes, since it has been a slow year. New utilites: tsort, seedrng and tree. Signed-off-by: Christian Melki --- config/busybox/Config.in | 4 +- config/busybox/coreutils/Config.in| 7 ++- config/busybox/libbb/Config.in| 62 --- config/busybox/miscutils/Config.in| 12 config/busybox/networking/Config.in | 2 +- config/busybox/networking/udhcp/Config.in | 7 ++- config/busybox/shell/Config.in| 5 ++ ...wk-fix-use-after-free-CVE-2022-30065.patch | 29 - .../0200-reactivate-check-for-tty.patch | 0 ...-only-pass-real-libs-to-SELINUX_LIBS.patch | 2 +- ...honour-SKIP_STRIP-and-don-t-strip-if.patch | 0 .../{busybox-1.35.0 => busybox-1.36.0}/series | 3 +- 12 files changed, 89 insertions(+), 44 deletions(-) delete mode 100644 patches/busybox-1.35.0/0203-awk-fix-use-after-free-CVE-2022-30065.patch rename patches/{busybox-1.35.0 => busybox-1.36.0}/0200-reactivate-check-for-tty.patch (100%) rename patches/{busybox-1.35.0 => busybox-1.36.0}/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch (94%) rename patches/{busybox-1.35.0 => busybox-1.36.0}/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch (100%) rename patches/{busybox-1.35.0 => busybox-1.36.0}/series (74%) diff --git a/config/busybox/Config.in b/config/busybox/Config.in index 329e2f8e8..199cc6ab2 100644 --- a/config/busybox/Config.in +++ b/config/busybox/Config.in @@ -267,10 +267,10 @@ config BUSYBOX_FEATURE_SUID_CONFIG The file has to be owned by user root, group root and has to be writeable only by root: - (chown 0:0 /etc/busybox.conf; chmod 600 /etc/busybox.conf) + (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf) The busybox executable has to be owned by user root, group root and has to be setuid root for this to work: - (chown 0:0 /bin/busybox; chmod 4755 /bin/busybox) + (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox) Robert 'sandman' Griebl has more information here: http://www.softforge.de/bb/suid.html >. diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in index 8c9e66e17..1a95a6785 100644 --- a/config/busybox/coreutils/Config.in +++ b/config/busybox/coreutils/Config.in @@ -653,7 +653,7 @@ config BUSYBOX_SORT sort is used to sort lines of text in specified files. config BUSYBOX_FEATURE_SORT_BIG - bool "Full SuSv3 compliant sort (support -ktcbdfiogM)" + bool "Full SuSv3 compliant sort (support -ktcbdfioghM)" default y depends on BUSYBOX_SORT help @@ -851,6 +851,11 @@ config BUSYBOX_TRUNCATE help truncate truncates files to a given size. If a file does not exist, it is created unless told otherwise. +config BUSYBOX_TSORT + bool "tsort (0.7 kb)" + default y + help + tsort performs a topological sort. config BUSYBOX_TTY bool "tty (3.6 kb)" default y diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in index 8e4fe855e..66c135ec6 100644 --- a/config/busybox/libbb/Config.in +++ b/config/busybox/libbb/Config.in @@ -98,21 +98,47 @@ config BUSYBOX_MD5_SMALL default 1 # all "fast or small" options default to small range 0 3 help - Trade binary size versus speed for the md5sum algorithm. + Trade binary size versus speed for the md5 algorithm. Approximate values running uClibc and hashing linux-2.4.4.tar.bz2 were: - value user times (sec) text size (386) - 0 (fastest) 1.16144 - 1 1.45392 - 2 3.05088 - 3 (smallest)5.14912 + value user times (sec) text size (386) + 0 (fastest) 1.1 6144 + 1 1.4 5392 + 2 3.0 5088 + 3 (smallest)5.1 4912 + +config BUSYBOX_SHA1_SMALL + int "SHA1: Trade bytes for speed (0:fast, 3:slow)" + default 3 # all "fast or small" options default to small + range 0 3 + help + Trade binary size versus speed for the sha1 algorithm. + With FEATURE_COPYBUF_KB=64: + throughput MB/s size of sha1_process_block64 + value 486 x86-64
[ptxdist] [PATCH v2] ethtool: Version bump. 6.0 -> 6.1
Minor fixes and UAPI update. * Force enable netlink interface. Since ethtool is already dependent on libmnl per .in-file, might aswell be explicit with the netlink interface. Signed-off-by: Christian Melki --- rules/ethtool.make | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/ethtool.make b/rules/ethtool.make index 9150fdaea..dd0680e76 100644 --- a/rules/ethtool.make +++ b/rules/ethtool.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ETHTOOL) += ethtool # # Paths and names # -ETHTOOL_VERSION:= 6.0 -ETHTOOL_MD5:= 1284306e608fad9c79fa80edc288e071 +ETHTOOL_VERSION:= 6.1 +ETHTOOL_MD5:= 99fe4294ed0e3ebeb7c949ca459e2ffd ETHTOOL_SUFFIX := tar.xz ETHTOOL:= ethtool-$(ETHTOOL_VERSION) ETHTOOL_URL:= $(call ptx/mirror, KERNEL, ../software/network/ethtool/$(ETHTOOL).$(ETHTOOL_SUFFIX)) @@ -33,7 +33,8 @@ ETHTOOL_LICENSE_FILES := \ ETHTOOL_CONF_TOOL := autoconf ETHTOOL_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --enable-pretty-dump + --enable-pretty-dump \ + --enable-netlink # # Target-Install -- 2.34.1
Re: [ptxdist] [APPLIED] treewide: Consistently use ':' instead to separate user and group for chown
Thanks, applied as f51d04cbcf2c0f5a014b319d554700ead28e5d84. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:34 +0100, Uwe Kleine-König wrote: > Since coreutils 9.1 chown warns when a '.' is used as separator. Fix this > consistently also for documentation and scripts that are expected to use > busybox's chown which (up to now) has no problem with '.'. > > Signed-off-by: Uwe Kleine-König > Message-Id: <20221216104522.116336-1-u.kleine-koe...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/config/busybox/Config.in b/config/busybox/Config.in > index 199cc6ab272f..329e2f8e8a1b 100644 > --- a/config/busybox/Config.in > +++ b/config/busybox/Config.in > @@ -267,10 +267,10 @@ config BUSYBOX_FEATURE_SUID_CONFIG > > The file has to be owned by user root, group root and has to be > writeable only by root: > - (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf) > + (chown 0:0 /etc/busybox.conf; chmod 600 /etc/busybox.conf) > The busybox executable has to be owned by user root, group > root and has to be setuid root for this to work: > - (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox) > + (chown 0:0 /bin/busybox; chmod 4755 /bin/busybox) > > Robert 'sandman' Griebl has more information here: > http://www.softforge.de/bb/suid.html >. > diff --git a/config/busybox/networking/Config.in > b/config/busybox/networking/Config.in > index 3a3ad56d93f7..27e0f44ba811 100644 > --- a/config/busybox/networking/Config.in > +++ b/config/busybox/networking/Config.in > @@ -959,7 +959,7 @@ config BUSYBOX_TELNETD > FEATURE_SUID enabled. And finally, you should make > certain that busybox has been installed setuid root: > > - chown root.root /bin/busybox > + chown root:root /bin/busybox > chmod 4755 /bin/busybox > > with all that done, telnetd _should_ work > diff --git a/projectroot/usr/sbin/mysqlinit b/projectroot/usr/sbin/mysqlinit > index 72b6d1f10cf5..c98946025264 100644 > --- a/projectroot/usr/sbin/mysqlinit > +++ b/projectroot/usr/sbin/mysqlinit > @@ -5,7 +5,7 @@ MYSQLD_OPTS= > # since mySQL runs as a regular user, we need to give its working directory > # to it. > > -chown mysql.mysql "$1" > +chown mysql:mysql "$1" > chmod 0755 "$1" > > # now let mySQL do its initializing job > diff --git a/scripts/lib/ptxd_lib_dopermissions.awk > b/scripts/lib/ptxd_lib_dopermissions.awk > index 56e951b45b75..9ab45d4979dd 100755 > --- a/scripts/lib/ptxd_lib_dopermissions.awk > +++ b/scripts/lib/ptxd_lib_dopermissions.awk > @@ -7,14 +7,14 @@ BEGIN { > > $1 ~ "[df]" { > printf("chmod %s'.%s'\n" \ > -"chown %s.%s '.%s'\n", \ > +"chown %s:%s '.%s'\n", \ > $5, $2, $3, $4, $2); > } > > $1 ~ "n" { > printf("if [ ! \\( -b '.%s' -o -c '.%s' -o -p '.%s' \\) ]; then " \ > " mknod -m %s '.%s' %s %s %s\n" \ > -" chown %s.%s '.%s'\n" \ > +" chown %s:%s '.%s'\n" \ > "fi\n", \ > $2, $2, $2, $5, $2, $6, $7, $8, $3, $4, $2); > }
Re: [ptxdist] [APPLIED] host-qemu: Follow the changes in target qemu.
Thanks, applied as a130823e32b9fd6675af49e2e4475a3276e9b0e9. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:32 +0100, Christian Melki wrote: > * Be more explicit about libvduse configuration. > > Signed-off-by: Christian Melki > Message-Id: <20221215141131.3689507-2-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/host-qemu.make b/rules/host-qemu.make > index 0c3a89a6e261..31e94f54b076 100644 > --- a/rules/host-qemu.make > +++ b/rules/host-qemu.make > @@ -129,6 +129,7 @@ HOST_QEMU_CONF_OPT:= \ > --disable-u2f \ > --disable-usb-redir \ > --disable-vhost-user-blk-server \ > + --disable-libvduse \ > --disable-virglrenderer \ > --$(call ptx/endis, PTXCONF_HOST_QEMU_SYS)-virtfs \ > --disable-virtiofsd \
Re: [ptxdist] [APPLIED] strongswan: version bump 5.9.6 -> 5.9.8
Thanks, applied as 596d5a957df41125c71b32201184e5f81754548f. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:27 +0100, Lars Pedersen wrote: > Configure options: > > * Disabled pki (--disable-pki) > * Removed install tree /usr/bin since it was only used by pki > * scepclient deprecated and removed > * Disabled AddressSanitizer (--disable-asan) > * New --with-python-sys-prefix unspecified for GNU default values > * New --with-python_prefix unspecified for GNU default values > * New --with-python_exec_prefix unspecified for GNU default values > * Disabled extended compiler warnings (--disable-warnings) because of > compile error: (OSELAS.Toolchain-2021.07.0) > > cmac.c: In function 'derive_key': > cmac.c:236:36: error: writing 1 byte into a region of size 0 > [-Werror=stringop-overflow=] > 236 | rb.ptr[rb.len - 1] = 0x87; > | ~~~^~ > cc1: all warnings being treated as errors > > Plugins: > > * Fixed missing plugin targetinstall of libstrongswan-acert.so > * Enabled mgf1 since swanctl and starting strongswan gave following > error: > > plugin 'mgf1': failed to load - mgf1_plugin_create not found and no > plugin file available > > Signed-off-by: Lars Pedersen > Message-Id: <20221215091123.31935-1-lape...@gmail.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/strongswan.make b/rules/strongswan.make > index 07a7ade73748..5f4e840dc6d7 100644 > --- a/rules/strongswan.make > +++ b/rules/strongswan.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_STRONGSWAN) += strongswan > # > # Paths and names > # > -STRONGSWAN_VERSION := 5.9.6 > -STRONGSWAN_MD5 := 0eeb13eda09fb34e9ab5e2bfcfab1211 > +STRONGSWAN_VERSION := 5.9.8 > +STRONGSWAN_MD5 := f46b0d3e7aed88824650d0721c887443 > STRONGSWAN := strongswan-$(STRONGSWAN_VERSION) > STRONGSWAN_SUFFIX:= tar.bz2 > STRONGSWAN_URL := > https://download.strongswan.org/$(STRONGSWAN).$(STRONGSWAN_SUFFIX) > @@ -54,7 +54,7 @@ STRONGSWAN_CONF_OPT := \ > --enable-hmac \ > --disable-md4 \ > --disable-md5 \ > - --disable-mgf1 \ > + --enable-mgf1 \ > --disable-newhope \ > --enable-nonce \ > --disable-ntru \ > @@ -193,8 +193,7 @@ STRONGSWAN_CONF_OPT := \ > --disable-medcli \ > --disable-medsrv \ > --disable-nm \ > - --enable-pki \ > - --$(call ptx/disen, PTXCONF_STRONGSWAN_SWANCTL)-scepclient \ > + --disable-pki \ > --enable-scripts \ > --disable-svc \ > --$(call ptx/endis, PTXCONF_STRONGSWAN_SYSTEMD_UNIT)-systemd \ > @@ -224,6 +223,8 @@ STRONGSWAN_CONF_OPT := \ > --enable-kdf \ > --enable-dependency-tracking \ > --enable-shared \ > + --disable-warnings \ > + --disable-asan \ > --$(call ptx/endis, PTXCONF_GLOBAL_SELINUX)-selinux \ > --$(call ptx/endis, PTXCONF_STRONGSWAN_SWANCTL)-swanctl \ > --with-ipseclibdir=/usr/lib \ > @@ -236,6 +237,7 @@ STRONGSWAN_LDFLAGS:= -Wl,-rpath,/usr/lib/plugins > # > > > STRONGSWAN_PLUGINS := \ > + libstrongswan-acert.so \ > libstrongswan-aes.so \ > libstrongswan-attr.so \ > libstrongswan-cmac.so \ > @@ -247,6 +249,7 @@ STRONGSWAN_PLUGINS := \ > libstrongswan-hmac.so \ > libstrongswan-kdf.so \ > libstrongswan-kernel-netlink.so \ > + libstrongswan-mgf1.so \ > libstrongswan-nonce.so \ > libstrongswan-pem.so \ > libstrongswan-pgp.so \ > @@ -292,7 +295,6 @@ $(STATEDIR)/strongswan.targetinstall: > > @$(call install_alternative, strongswan, 0, 0, 0644, > /etc/strongswan.conf) > > - @$(call install_tree, strongswan, 0, 0, -, /usr/bin) > @$(call install_tree, strongswan, 0, 0, -, /usr/libexec) > @$(call install_tree, strongswan, 0, 0, -, /usr/sbin) >
Re: [ptxdist] [APPLIED] mesalib: version bump 22.3.0 -> 22.3.1
Thanks, applied as ffca426189b055e57f02664bf371711dcb1c34f7. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:29 +0100, Philipp Zabel wrote: > https://lists.freedesktop.org/archives/mesa-dev/2022-December/225902.html > > Signed-off-by: Philipp Zabel > Message-Id: <20221215091758.3025636-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/mesalib.make b/rules/mesalib.make > index 19bb39433872..2349e1a107d3 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib > # > # Paths and names > # > -MESALIB_VERSION := 22.3.0 > -MESALIB_MD5 := f44da76e397e35a5dd9b35caa0a09dea > +MESALIB_VERSION := 22.3.1 > +MESALIB_MD5 := 5644bca27c9be0092c98f1ec0e1bedd5 > MESALIB := mesa-$(MESALIB_VERSION) > MESALIB_SUFFIX := tar.xz > MESALIB_URL := \
Re: [ptxdist] [APPLIED] qemu: Version bump. 7.1.0 -> 7.2.0
Thanks, applied as e3060a69c0190dfa7131e5955ab1a444f628c501. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:31 +0100, Christian Melki wrote: > A bunch of traffic in QEMU, as usual. > Notable is the RISC-V work and x86 TCG gains support for AVX, AVX2, F16C, > FMA3 and VAES instructions. > Changelog: https://wiki.qemu.org/ChangeLog/7.2 > This release plugs CVEs: CVE-2022-3872, CVE-2022-2962, CVE-2022-3165 and > CVE-2022-4144. > > * Forward patches, with a minor correction, seems to apply cleanly. > * Be more explicit about libvduse, disable it. > > Signed-off-by: Christian Melki > Message-Id: <20221215141131.3689507-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git > a/patches/qemu-7.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > > b/patches/qemu-7.2.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > similarity index 100% > rename from > patches/qemu-7.1.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > rename to > patches/qemu-7.2.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch > diff --git a/patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch > b/patches/qemu-7.2.0/0101-let-ninja-use-the-jobserver.patch > similarity index 89% > rename from patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch > rename to patches/qemu-7.2.0/0101-let-ninja-use-the-jobserver.patch > index d54558a93dba..a039bfef9389 100644 > --- a/patches/qemu-7.1.0/0101-let-ninja-use-the-jobserver.patch > +++ b/patches/qemu-7.2.0/0101-let-ninja-use-the-jobserver.patch > @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > -index e5fd1ebdf619..23128172d02a 100644 > +index a48103cc8a1a..9fbd7b095ca9 100644 > --- a/Makefile > +++ b/Makefile > -@@ -142,7 +142,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out > --%,$(MAKEFLAGS > +@@ -145,7 +145,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out > --%,$(MAKEFLAGS > MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS > MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq) > NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \ > @@ -22,4 +22,4 @@ index e5fd1ebdf619..23128172d02a 100644 > +$(filter-out -j, $(lastword $(filter -l% -j%, $(MAKEFLAGS \ > -d keepdepfile > ninja-cmd-goals = $(or $(MAKECMDGOALS), all) > - ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g > + ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g)) > diff --git a/patches/qemu-7.1.0/series b/patches/qemu-7.2.0/series > similarity index 100% > rename from patches/qemu-7.1.0/series > rename to patches/qemu-7.2.0/series > diff --git a/rules/qemu.make b/rules/qemu.make > index 579715684ed8..79be513c666d 100644 > --- a/rules/qemu.make > +++ b/rules/qemu.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu > # > # Paths and names > # > -QEMU_VERSION := 7.1.0 > -QEMU_MD5 := 3be5458a9171b4ec5220c65d5d52bdcf > +QEMU_VERSION := 7.2.0 > +QEMU_MD5 := 7630d6a9eba7ab2bcb9979d6d24c2697 > QEMU := qemu-$(QEMU_VERSION) > QEMU_SUFFIX := tar.xz > QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX) > @@ -128,6 +128,7 @@ QEMU_CONF_OPT := \ > --disable-usb-redir \ > --disable-vde \ > --disable-vhost-user-blk-server \ > + --disable-libvduse \ > --disable-virglrenderer \ > --$(call ptx/endis, PTXCONF_QEMU_SYS)-virtfs \ > --disable-virtiofsd \
Re: [ptxdist] [APPLIED] doc: include instructions for layered documentation
Thanks, applied as 0b95c2def4f5a600d634a158b54b5364f880b06b. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:30 +0100, Roland Hieber wrote: > Signed-off-by: Roland Hieber > Message-Id: <20221213132349.3082538-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/doc/including_bsp_doc.inc b/doc/including_bsp_doc.inc > index 775ad33975ae..ca6f7519e407 100644 > --- a/doc/including_bsp_doc.inc > +++ b/doc/including_bsp_doc.inc > @@ -103,3 +103,37 @@ external dependencies. > > Refer the PTXdist file ``doc/conf.py`` for more information on variable > substitution. This PTXdist global file can be superseded by a local copy as > well. > + > +Documentation structure for layered BSPs > + > + > +When you call ``ptxdist docs-html`` in a layer, PTXdist will assemble the > +``doc/`` directory from all lower layers in the usual layering fashion, > +and flatten it into a single directory. > +In the highest-level table of contents, PTXdist uses a wildcard match for > +``index-layer*`` files, which is the entry point to integrate documentation > for > +your own layers by creating files with that pattern. > +It is advisable to number the index files accordingly so their ordering in > the > +documentation reflects the layer order. > +PTXdist itself uses the file ``index-layer-0-ptxdist.rst`` to include the > title > +page of the PTXdist manual first, and includes the rest of the PTXdist > +documentation after the layer-specific files. > + > +For example, see the following directory structure:: > + > + my-bsp/ > + ├── common/ > + │ └── doc/ > + │ └── index-layer-1-common.rst > + └── product-layer > + . ├── base/ -> ../common > + . └── doc > + . └── index-layer-2-product.rst > + > +In this example, the contents of ``index-layer-1-common.rst`` and > +``index-layer-2-product.rst`` would describe some layer-specific content, or > +even have their own table of contents in the usual reStructuredTest fashion > to > +include more sub-sections in separate files. > +The documentation built for the *product-layer* will therefore include a > +section each for the *common* layer documentation, then for the > *product-layer* > +documentation, and finally the rest of the PTXdist documentation. > diff --git a/doc/index-layer-0-ptxdist.rst b/doc/index-layer-0-ptxdist.rst > new file mode 100644 > index ..4576503a3661 > --- /dev/null > +++ b/doc/index-layer-0-ptxdist.rst > @@ -0,0 +1 @@ > +.. include:: welcome.rst > diff --git a/doc/index.rst b/doc/index.rst > index 6a01d6dd7bb8..29c0dc9dea9a 100644 > --- a/doc/index.rst > +++ b/doc/index.rst > @@ -11,7 +11,7 @@ Welcome to the PTXdist Universe > :numbered: 2 > :maxdepth: 3 > > - welcome > + index-layer* > environment > user_manual_section > dev_manual
Re: [ptxdist] [APPLIED] iproute2: Version bump. 6.0.0 -> 6.1.0
Thanks, applied as fbb16318beaee6b4ada1240e932d3dfd2d24d00b. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:22 +0100, Christian Melki wrote: > Minor bugfix release. > > Signed-off-by: Christian Melki > Message-Id: <20221215081402.2157223-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/iproute2.make b/rules/iproute2.make > index f811d0fb0078..7e64f91fb560 100644 > --- a/rules/iproute2.make > +++ b/rules/iproute2.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2 > # > # Paths and names > # > -IPROUTE2_VERSION := 6.0.0 > -IPROUTE2_MD5 := 5da6cb3154ee09b9a8b4004d1c2df4cd > +IPROUTE2_VERSION := 6.1.0 > +IPROUTE2_MD5 := f3ff4461e25dbc5ef1fb7a9167a9523d > IPROUTE2 := iproute2-$(IPROUTE2_VERSION) > IPROUTE2_SUFFIX := tar.xz > IPROUTE2_URL := $(call ptx/mirror, KERNEL, > utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
Re: [ptxdist] [APPLIED] linux-firmware: Version bump. 20221109 -> 20221214
Thanks, applied as f310b0419ef86800220e2ff86eeaf2d435cdd282. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:28 +0100, Christian Melki wrote: > A slew of baseline AMDGPU firmware updates. > Otherwise mostly the usual radio firmwares. > > * Add nxp license. Added by the NXP SR150 UWB hw. > > Signed-off-by: Christian Melki > Message-Id: <20221215091402.2188099-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/linux-firmware.make b/rules/linux-firmware.make > index 29882aaf4583..1a1cdaa16f71 100644 > --- a/rules/linux-firmware.make > +++ b/rules/linux-firmware.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LINUX_FIRMWARE) += linux-firmware > # > # Paths and names > # > -LINUX_FIRMWARE_VERSION := 20221109 > -LINUX_FIRMWARE_MD5 := 6c9f675c49d36eae1012c5d23370817f > +LINUX_FIRMWARE_VERSION := 20221214 > +LINUX_FIRMWARE_MD5 := 93ba47547b9c2e538d11de95405939b2 > LINUX_FIRMWARE := linux-firmware-$(LINUX_FIRMWARE_VERSION) > LINUX_FIRMWARE_SUFFIX:= tar.gz > LINUX_FIRMWARE_URL := $(call ptx/mirror, KERNEL, > kernel/firmware/$(LINUX_FIRMWARE).$(LINUX_FIRMWARE_SUFFIX)) > @@ -63,6 +63,7 @@ LINUX_FIRMWARE_LICENSE_FILES := \ > file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \ > file://LICENSE.amd-sev;md5=e750538791a8be0b7249c579edefb035 \ > file://LICENSE.amdgpu;md5=44c1166d052226cb2d6c8d7400090203 \ > + file://LICENSE.nxp;md5=cca321ca1524d6a1e4fed87486cd82dc \ > file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ > file://LICENCE.siano;md5=4556c1bf830067f12ca151ad953ec2a5 \ > file://LICENCE.broadcom_bcm43xx;md5=3160c14df7228891b868060e1951dfbc \
Re: [ptxdist] [APPLIED] tpm2-tss: Version bump. 3.2.0 -> 3.2.1
Thanks, applied as 37d21332773f6486d6564dda00c2772f6f40966f. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:17 +0100, Christian Melki wrote: > Bugfix release. > https://github.com/tpm2-software/tpm2-tss/releases/tag/3.2.1 > > Signed-off-by: Christian Melki > Message-Id: <20221213213349.2847183-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make > index 310ec8014e9e..979dd4eca2ea 100644 > --- a/rules/tpm2-tss.make > +++ b/rules/tpm2-tss.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss > # > # Paths and names > # > -TPM2_TSS_VERSION := 3.2.0 > -TPM2_TSS_MD5 := 0d60d0df3fd0daae66881a3022281323 > +TPM2_TSS_VERSION := 3.2.1 > +TPM2_TSS_MD5 := 92963c8985fe7ff21dc550c3fff1e783 > TPM2_TSS := tpm2-tss-$(TPM2_TSS_VERSION) > TPM2_TSS_SUFFIX := tar.gz > TPM2_TSS_URL := > https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
Re: [ptxdist] [APPLIED] strace: Version bump. 6.0 -> 6.1, plus configure fix.
Thanks, applied as 37f12243147ae2056b55a156ca5d89c91bd6ed22. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:21 +0100, Christian Melki wrote: > Minor bugfixes and enhancements. > > * Be explicit and disable libselinux support. > > Signed-off-by: Christian Melki > Message-Id: <20221214192856.3625933-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/strace.make b/rules/strace.make > index 17a01b2b016d..4a99e4b939ff 100644 > --- a/rules/strace.make > +++ b/rules/strace.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_STRACE) += strace > # > # Paths and names > # > -STRACE_VERSION := 6.0 > -STRACE_MD5 := b201345539233c5b48ccd3a6cd21a0ee > +STRACE_VERSION := 6.1 > +STRACE_MD5 := cbd758b0545b678cd7ac09c683ade002 > STRACE := strace-$(STRACE_VERSION) > STRACE_SUFFIX:= tar.xz > STRACE_URL := > https://strace.io/files/$(STRACE_VERSION)/$(STRACE).$(STRACE_SUFFIX) > @@ -50,7 +50,8 @@ STRACE_CONF_OPT := \ > --without-gcov \ > --without-libdw \ > --without-libunwind \ > - --without-libiberty > + --without-libiberty \ > + --without-libselinux > > > # >
Re: [ptxdist] [APPLIED] bash: Version bump. 5.2.9 -> 5.2.15
Thanks, applied as 1c07c7702999bab69155bf9cd5c7b4b065c49beb. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:23 +0100, Christian Melki wrote: > Minor bugfixes. > This changelog is easiest to read from the gitlog @ 5.2 patch 15. > https://git.savannah.gnu.org/cgit/bash.git/log/?id=ec8113b9861375e4e17b3307372569d429dec814 > > Signed-off-by: Christian Melki > Message-Id: <20221215082320.2172057-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/bash.make b/rules/bash.make > index 2dac36ba804d..7acc67560cb3 100644 > --- a/rules/bash.make > +++ b/rules/bash.make > @@ -13,8 +13,8 @@ PACKAGES-$(PTXCONF_BASH) += bash > # > # Paths and names > # > -BASH_VERSION := 5.2.9 > -BASH_MD5 := 0d8a4e4fe2d31ed5c304316bd9fcb337 > +BASH_VERSION := 5.2.15 > +BASH_MD5 := 4281bb43497f3905a308430a8d6a30a5 > BASH := bash-$(BASH_VERSION) > BASH_SUFFIX := tar.gz > BASH_URL := $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX))
Re: [ptxdist] [APPLIED] util-linux: add an option to enable rfkill
Thanks, applied as d106e99c3673d6a5a75e864012c89d8280059041. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:20 +0100, Philipp Zabel wrote: > Add a configuration option UTIL_LINUX_RFKILL to enable the rfkill tool. > > Signed-off-by: Philipp Zabel > Message-Id: <20221214113320.792585-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/util-linux.in b/rules/util-linux.in > index 429473404a14..7b89ced68eb7 100644 > --- a/rules/util-linux.in > +++ b/rules/util-linux.in > @@ -468,6 +468,19 @@ config UTIL_LINUX_READPROFILE > comment "BusyBox' readprofile is selected!" > depends on BUSYBOX_READPROFILE > > +config UTIL_LINUX_RFKILL > + bool > + prompt "rfkill" > + select UTIL_LINUX_LIBSMARTCOLS > + depends on !BUSYBOX_RFKILL || ALLYES > + help > + rfkill is a simple tool for accessing the Linux rfkill device > + interface, which is used to enable and disable wireless networking > + devices, typically WLAN, Bluetooth and mobile broadband. > + > +comment "BusyBox' rfkill is selected!" > + depends on BUSYBOX_RFKILL > + > config UTIL_LINUX_SWAPON > bool > prompt "swapon" > diff --git a/rules/util-linux.make b/rules/util-linux.make > index 0afa9ecdd938..c0f2dab369e4 100644 > --- a/rules/util-linux.make > +++ b/rules/util-linux.make > @@ -116,7 +116,7 @@ UTIL_LINUX_CONF_OPT := \ > --$(call ptx/endis, PTXCONF_UTIL_LINUX_IPCS)-ipcs \ > --$(call ptx/endis, PTXCONF_UTIL_LINUX_IRQTOP)-irqtop \ > --$(call ptx/endis, PTXCONF_UTIL_LINUX_LSIRQ)-lsirq \ > - --disable-rfkill \ > + --$(call ptx/endis, PTXCONF_UTIL_LINUX_RFKILL)-rfkill \ > --disable-scriptutils \ > --disable-tunelp \ > --disable-kill \ > @@ -238,6 +238,7 @@ UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_MOUNTPOINT) > += bin/mountpoint > UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NSENTER) += bin/nsenter > UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_PIVOT_ROOT) += > sbin/pivot_root > UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_READPROFILE) += sbin/readprofile > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_RFKILL) += sbin/rfkill > UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_SWAPON) += sbin/swapoff > sbin/swapon > UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_SWITCH_ROOT) += sbin/switch_root > UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_UMOUNT) += bin/umount
Re: [ptxdist] [APPLIED] libarchive: Version bump. 3.61 -> 3.62 plus config changes.
Thanks, applied as 3b79f344d7473c841d026635e1555a34bbd8b7c4. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:15 +0100, Christian Melki wrote: > Minor bugfixes. > https://github.com/libarchive/libarchive/releases/tag/v3.6.2 > > * Wire up zstd in case anyone needs it. > * Same for openssl. In case anyone needs it. > > Signed-off-by: Christian Melki > Message-Id: <20221212194519.1589655-2-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libarchive.in b/rules/libarchive.in > index a631a6eef56b..b80c2147b866 100644 > --- a/rules/libarchive.in > +++ b/rules/libarchive.in > @@ -4,15 +4,21 @@ menuconfig LIBARCHIVE > tristate > select GCCLIBS_GCC_S > select ZLIB > + select OPENSSL if LIBARCHIVE_OPENSSL > select BZIP2if LIBARCHIVE_BZIP2 > select BZIP2_LIBBZ2 if LIBARCHIVE_BZIP2 > select XZ if LIBARCHIVE_LZMA > + select ZSTD if LIBARCHIVE_ZSTD > prompt "libarchive" > help > Multi-format archive and compression library. > > if LIBARCHIVE > > +config LIBARCHIVE_OPENSSL > + bool > + prompt "openssl support" > + > config LIBARCHIVE_BZIP2 > bool > prompt "bzip2 support" > @@ -21,6 +27,10 @@ config LIBARCHIVE_LZMA > bool > prompt "xz support" > > +config LIBARCHIVE_ZSTD > + bool > + prompt "zstd support" > + > config LIBARCHIVE_BSDTAR > bool > prompt "install bsdtar" > diff --git a/rules/libarchive.make b/rules/libarchive.make > index e75034d74fea..1d505e71f4c1 100644 > --- a/rules/libarchive.make > +++ b/rules/libarchive.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBARCHIVE) += libarchive > # > # Paths and names > # > -LIBARCHIVE_VERSION := 3.6.1 > -LIBARCHIVE_MD5 := 802a56ef9eaa0b8776296ba78a6d0c2c > +LIBARCHIVE_VERSION := 3.6.2 > +LIBARCHIVE_MD5 := b5b8efa8cba29396816d0dd5f61f3de3 > LIBARCHIVE := libarchive-$(LIBARCHIVE_VERSION) > LIBARCHIVE_SUFFIX:= tar.gz > LIBARCHIVE_URL := > https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX) > @@ -54,13 +54,13 @@ LIBARCHIVE_CONF_OPT := \ > --without-libb2 \ > --without-iconv \ > --without-lz4 \ > - --without-zstd \ > + --$(call ptx/wwo, PTXCONF_LIBARCHIVE_ZSTD)-zstd \ > --$(call ptx/wwo, PTXCONF_LIBARCHIVE_LZMA)-lzma \ > --without-lzo2 \ > --without-cng \ > --without-mbedtls \ > --without-nettle \ > - --without-openssl \ > + --$(call ptx/wwo, PTXCONF_LIBARCHIVE_OPENSSL)-openssl \ > --without-xml2 \ > --without-expat >
Re: [ptxdist] [APPLIED] xwayland: version bump 22.1.3 -> 22.1.6
Thanks, applied as a610c4beb55e6f98905837bfcefc27a5fc31dc35. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:18 +0100, Philipp Zabel wrote: > https://lists.x.org/archives/xorg-announce/2022-December/003304.html > > Fixes CVE-2022-46340, CVE-2022-46341, CVE-2022-46342, CVE-2022-46343, > CVE-2022-46344, and CVE-2022-4283. For details see: > > https://lists.x.org/archives/xorg-announce/2022-December/003302.html > > Signed-off-by: Philipp Zabel > Message-Id: <20221214113057.764697-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/xwayland.make b/rules/xwayland.make > index 2cb82fd4b9b2..e75270ea416f 100644 > --- a/rules/xwayland.make > +++ b/rules/xwayland.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_XWAYLAND) += xwayland > # > # Paths and names > # > -XWAYLAND_VERSION := 22.1.3 > -XWAYLAND_MD5 := 83849961283e8cea32be6740914822e5 > +XWAYLAND_VERSION := 22.1.6 > +XWAYLAND_MD5 := 9894362969bcf86f3c0943138f9552cd > XWAYLAND := xwayland-$(XWAYLAND_VERSION) > XWAYLAND_SUFFIX := tar.xz > XWAYLAND_URL := $(call ptx/mirror, XORG, > individual/xserver/$(XWAYLAND).$(XWAYLAND_SUFFIX)) > @@ -38,8 +38,12 @@ XWAYLAND_CONF_OPT := \ > -Dbuilder_addr=ptxdist@pengutronix.de \ > -Dbuilder_string=PTXdist \ > -Ddefault_font_path=$(subst $(space),$(comma),$(addprefix > $(XORG_FONTDIR)/,$(XORG_FONT_DIRS))) \ > + -Ddevel-docs=false \ > + -Ddocs=false \ > + -Ddocs-pdf=false \ > -Ddpms=false \ > -Ddri3=true \ > + -Ddrm=true \ > -Ddtrace=false \ > -Dglamor=$(call ptx/truefalse, PTXCONF_XWAYLAND_GLAMOR) \ > -Dglx=$(call ptx/truefalse, PTXCONF_XWAYLAND_EXT_GLX) \
Re: [ptxdist] [APPLIED] binutils: build with system zlib
Thanks, applied as ebf89fd91ae7a27f52761f994b494fbdfeecb826. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:16 +0100, Roland Hieber wrote: > We already depend on zlib in binutils.in, but currently the version > bundled with binutils is used unnecessarily. > > Signed-off-by: Roland Hieber > Message-Id: <20221212221726.3643397-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/binutils.make b/rules/binutils.make > index bec8436d62fb..20bb5d60f700 100644 > --- a/rules/binutils.make > +++ b/rules/binutils.make > @@ -43,6 +43,7 @@ BINUTILS_CONF_TOOL := autoconf > BINUTILS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --target=$(PTXCONF_GNU_TARGET) \ > + --with-system-zlib \ > --disable-werror > > BINUTILS_CFLAGS := \
Re: [ptxdist] [APPLIED] cog: version bump 0.16.0 -> 0.16.1
Thanks, applied as e3db6192ec66dab8c9c8e9f8616cfa77c4f5c064. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:11 +0100, Bastian Krause wrote: > Signed-off-by: Bastian Krause > Message-Id: <20221209135949.155153-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/cog.make b/rules/cog.make > index 2c0514a221ac..88f1097eb467 100644 > --- a/rules/cog.make > +++ b/rules/cog.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COG) += cog > # > # Paths and names > # > -COG_VERSION := 0.16.0 > -COG_MD5 := 2705472ea4f333290973722c0862b21d > +COG_VERSION := 0.16.1 > +COG_MD5 := 1489740db6b4ea568578035c30b8b2f4 > COG := cog-$(COG_VERSION) > COG_SUFFIX := tar.xz > COG_URL := > https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX)
Re: [ptxdist] [APPLIED] host-libarchive: Disable zstd.
Thanks, applied as 15a2035a259b9ef7f69f26b48bdf311e66f07914. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:14 +0100, Christian Melki wrote: > Only host-opkg uses host-libarchive. > And we don't use zstd there yet. > > Signed-off-by: Christian Melki > Message-Id: <20221212194519.1589655-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/host-libarchive.make b/rules/host-libarchive.make > index 6d22d6846677..0b57f587d36a 100644 > --- a/rules/host-libarchive.make > +++ b/rules/host-libarchive.make > @@ -38,6 +38,7 @@ HOST_LIBARCHIVE_CONF_OPT:= \ > --without-bz2lib \ > --without-iconv \ > --without-lz4 \ > + --without-zstd \ > --without-lzma \ > --without-lzo2 \ > --without-cng \
Re: [ptxdist] [APPLIED] ca-certificates: Version bump. 3.85 -> 3.86.
Thanks, applied as 47101369b66a7324a5033738d9c049cf3af8b454. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:13 +0100, Christian Melki wrote: > Bugfixes release. > https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_86.html > > Signed-off-by: Christian Melki > Message-Id: <20221212075802.3345580-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/ca-certificates.make b/rules/ca-certificates.make > index c00b66c50275..00014d60c5c4 100644 > --- a/rules/ca-certificates.make > +++ b/rules/ca-certificates.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_CA_CERTIFICATES) += ca-certificates > # > # Paths and names > # > -CA_CERTIFICATES_VERSION := NSS_3_85_RTM > -CA_CERTIFICATES_MD5 := 2fb80db1057c6ac4fbc2b3b805579d1a > +CA_CERTIFICATES_VERSION := NSS_3_86_RTM > +CA_CERTIFICATES_MD5 := a31809eb057bf80b67118f54a77b1856 > CA_CERTIFICATES := > ca-certificates-$(CA_CERTIFICATES_VERSION) > CA_CERTIFICATES_SUFFIX := txt > CA_CERTIFICATES_URL := > https://hg.mozilla.org/projects/nss/raw-file/$(CA_CERTIFICATES_VERSION)/lib/ckfw/builtins/certdata.$(CA_CERTIFICATES_SUFFIX)
Re: [ptxdist] [APPLIED] pcre2: Version bump. 10.40 - > 10.41.
Thanks, applied as ebe502a6ad61cac67c6aa475a9dacd2351f9dc37. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:12 +0100, Christian Melki wrote: > Minor bugfixes and enhancements. > https://github.com/PCRE2Project/pcre2/blob/master/ChangeLog > > Signed-off-by: Christian Melki > Message-Id: <20221212075056.3343117-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/pcre2.make b/rules/pcre2.make > index cf8f11efb5a3..f3fe01a9a884 100644 > --- a/rules/pcre2.make > +++ b/rules/pcre2.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PCRE2) += pcre2 > # > # Paths and names > # > -PCRE2_VERSION:= 10.40 > -PCRE2_MD5:= a5cc4e276129c177d4fffb40601019a4 > +PCRE2_VERSION:= 10.41 > +PCRE2_MD5:= 5ee8e1d11557b677e1b159657e2aaf3c > PCRE2:= pcre2-$(PCRE2_VERSION) > PCRE2_SUFFIX := tar.bz2 > PCRE2_URL:= > https://github.com/PCRE2Project/pcre2/releases/download/$(PCRE2)/$(PCRE2).$(PCRE2_SUFFIX)
Re: [ptxdist] [APPLIED] wpewebkit: version bump 2.38.0 -> 2.38.2
Thanks, applied as 0e02df19d1f44910922be9a3a1ae002a5cad183d. Michael [sent from post-receive hook] On Tue, 03 Jan 2023 12:08:10 +0100, Bastian Krause wrote: > Signed-off-by: Bastian Krause > Message-Id: <20221209135938.155059-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make > index 4421f33fb1ee..c7363c591cdb 100644 > --- a/rules/wpewebkit.make > +++ b/rules/wpewebkit.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit > # > # Paths and names > # > -WPEWEBKIT_VERSION:= 2.38.0 > -WPEWEBKIT_MD5:= e0e6b98c86351c39e41da475afc50780 > +WPEWEBKIT_VERSION:= 2.38.2 > +WPEWEBKIT_MD5:= 451a450d64a45f2965d3c09792c63466 > WPEWEBKIT:= wpewebkit-$(WPEWEBKIT_VERSION) > WPEWEBKIT_SUFFIX := tar.xz > WPEWEBKIT_URL:= > https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX)
Re: [ptxdist] [PATCH v2] dropbear: version bump 2022.82 -> 2022.83
Hello, Am Montag, 2. Januar 2023, 18:25:23 CET schrieb Ladislav Michl: > From: Ladislav Michl > > Remove local patch which is already merged upstream. > DROPBEAR_SK_KEYS config option now replaces separate > DROPBEAR_SK_ECDSA and DROPBEAR_SK_ED25519 options, so > generate localoptions.h accordingly. > > Signed-off-by: Ladislav Michl > --- > CHANGES: > -v2: use DROPBEAR_SK_KEYS > > ...d-failure-use-DROPBEAR_PRIO_LOWDELAY.patch | 21 --- > patches/dropbear-2022.82/series | 4 > rules/dropbear.make | 7 +++ > 3 files changed, 3 insertions(+), 29 deletions(-) > delete mode 100644 > patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDE > LAY.patch delete mode 100644 patches/dropbear-2022.82/series > > diff --git > a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW > DELAY.patch > b/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW > DELAY.patch deleted file mode 100644 > index 8c46daf9c..0 > --- > a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW > DELAY.patch +++ /dev/null > @@ -1,21 +0,0 @@ > -From: Matt Johnston > -Date: Sat, 23 Apr 2022 22:33:31 +0800 > -Subject: [PATCH] Fix X11 build failure, use DROPBEAR_PRIO_LOWDELAY > - > > - svr-x11fwd.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/svr-x11fwd.c b/svr-x11fwd.c > -index 353cb12e8dd1..5d9e6a96f577 100644 > a/svr-x11fwd.c > -+++ b/svr-x11fwd.c > -@@ -206,7 +206,7 @@ void x11cleanup(struct ChanSess *chansess) { > - } > - > - static int x11_inithandler(struct Channel *channel) { > --channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE; > -+channel->prio = DROPBEAR_PRIO_LOWDELAY; > - return 0; > - } > - > diff --git a/patches/dropbear-2022.82/series > b/patches/dropbear-2022.82/series deleted file mode 100644 > index 87840318b..0 > --- a/patches/dropbear-2022.82/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch > -# dacc85cb839b0a9eec87bf2d3fc2463f - git-ptx-patches magic > diff --git a/rules/dropbear.make b/rules/dropbear.make > index e86b8bf43..dfdbe572d 100644 > --- a/rules/dropbear.make > +++ b/rules/dropbear.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear > # > # Paths and names > # > -DROPBEAR_VERSION := 2022.82 > -DROPBEAR_MD5 := 7a4a5f2c6d23ff2e6627c97d7c1aeceb > +DROPBEAR_VERSION := 2022.83 > +DROPBEAR_MD5 := a75a34bcc03cacf71a2db9da3b7c94a5 > DROPBEAR := dropbear-$(DROPBEAR_VERSION) > DROPBEAR_SUFFIX := tar.bz2 > DROPBEAR_URL := > https://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX) @@ > -215,8 +215,7 @@ else > endif > > @echo "ptxdist: disabling u2f security key support" > - @echo "#define DROPBEAR_SK_ECDSA 0" >> $(DROPBEAR_LOCALOPTIONS) > - @echo "#define DROPBEAR_SK_ED25519 0" >> $(DROPBEAR_LOCALOPTIONS) > + @echo "#define DROPBEAR_SK_KEYS 0" >> $(DROPBEAR_LOCALOPTIONS) > > # key exchange algorithm > ifdef PTXCONF_DROPBEAR_DH_GROUP14_SHA256 Tested-by: Alexander Dahl Greets