Re: [ptxdist] [APPLIED] sdl2-ttf: Version bump. 2.0.18 -> 2.20.1
Thanks, applied as ce36bb22ad61ca1795e4c43c9419d62d605dfd99. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:35 +0200, Christian Melki wrote: > https://github.com/libsdl-org/SDL_ttf/releases > SDL2 community have changed their version numbering scheme. > So this isn't as big of a bump as the version number would indicate. > > * Plugs CVE-2018-25032, CVE-2022-27470 > * License file changed name and contents is reformatted. > The reformatting is to make github recognize the file > as the correct license. > * Forward patch series with some changes to make them apply cleanly. > * Add global largefile option. > * Disable sdltest. > > Signed-off-by: Christian Melki > Message-Id: <20221013111452.3298415-3-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git > a/patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch > b/patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch > similarity index 75% > rename from > patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch > rename to > patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch > index 95d04c40c595..95ab1d2bfcb0 100644 > --- > a/patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch > +++ > b/patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch > @@ -8,12 +8,12 @@ Signed-off-by: Michael Grzeschik > > 1 file changed, 7 insertions(+) > > diff --git a/configure.ac b/configure.ac > -index cb2a65ee83b7..7123a7c564b4 100644 > +index 9b1c36358d41..640a4e228706 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -232,6 +232,12 @@ CheckVisibilityHidden() > - } > - CheckVisibilityHidden > +@@ -304,6 +304,12 @@ AM_CONDITIONAL(USE_BUILTIN_HARFBUZZ, test > x$enable_harfbuzz_builtin = xyes) > + dnl check for LD --no-undefined option > + CheckNoUndef > > +dnl Check to see if OpenGL support is desired > +AC_ARG_ENABLE(opengl, > @@ -24,11 +24,11 @@ index cb2a65ee83b7..7123a7c564b4 100644 > dnl Check for OpenGL > case "$host" in > *-*-cygwin* | *-*-mingw*) > -@@ -282,6 +288,7 @@ else > +@@ -354,6 +360,7 @@ else > GL_LIBS="" > fi > AC_SUBST([GL_LIBS]) > +fi > AC_SUBST([MATHLIB]) > - AC_SUBST([WINDRES]) > AC_SUBST([TTF_CFLAGS]) > + AC_SUBST([TTF_LIBS]) > diff --git a/patches/SDL2_ttf-2.0.18/autogen.sh > b/patches/SDL2_ttf-2.20.1/autogen.sh > similarity index 100% > rename from patches/SDL2_ttf-2.0.18/autogen.sh > rename to patches/SDL2_ttf-2.20.1/autogen.sh > diff --git a/patches/SDL2_ttf-2.0.18/series b/patches/SDL2_ttf-2.20.1/series > similarity index 100% > rename from patches/SDL2_ttf-2.0.18/series > rename to patches/SDL2_ttf-2.20.1/series > diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make > index 1f649e166b3d..beaad399285a 100644 > --- a/rules/sdl2-ttf.make > +++ b/rules/sdl2-ttf.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2_TTF) += sdl2-ttf > # > # Paths and names > # > -SDL2_TTF_VERSION := 2.0.18 > -SDL2_TTF_MD5 := 86d3023ad3fab597203022f856cff103 > +SDL2_TTF_VERSION := 2.20.1 > +SDL2_TTF_MD5 := 746be429bdfb5892066dcfaf593e1644 > SDL2_TTF := SDL2_ttf-$(SDL2_TTF_VERSION) > SDL2_TTF_SUFFIX := tar.gz > SDL2_TTF_URL := > https://www.libsdl.org/projects/SDL_ttf/release/$(SDL2_TTF).$(SDL2_TTF_SUFFIX) > @@ -23,7 +23,7 @@ SDL2_TTF_SOURCE := > $(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX) > SDL2_TTF_DIR := $(BUILDDIR)/$(SDL2_TTF) > SDL2_TTF_LICENSE := zlib > SDL2_TTF_LICENSE_FILES := \ > - file://COPYING.txt;md5=e98cfd01ca78f683e9d035795810ce87 > + file://LICENSE.txt;md5=771dca8728b18d39b130e19b36514371 > > # > > # Prepare > @@ -31,7 +31,9 @@ SDL2_TTF_LICENSE_FILES := \ > > SDL2_TTF_CONF_TOOL := autoconf > SDL2_TTF_CONF_OPT:= \ > - $(CROSS_AUTOCONF_USR) > + $(CROSS_AUTOCONF_USR) \ > + $(GLOBAL_LARGE_FILE_OPTION) \ > + --disable-sdltest > > ifdef PTXCONF_SDL2_PULSEAUDIO > SDL2_TTF_LDFLAGS := \
Re: [ptxdist] [APPLIED] sdl2-image: Version bump. 2.0.5 -> 2.6.2
Thanks, applied as dd1760573234500f35d8884d950230c8e50df759. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:34 +0200, Christian Melki wrote: > https://github.com/libsdl-org/SDL_image/releases > SDL2 community have changed their version numbering scheme. > So this isn't as big of a bump as the version number would indicate. > Still they've added notable changes such as: > > New backend for JPG and PNG (stb-image). > New image formats AVIF, JXL (JPEGXL) and QOI. > > * Disable stb-image. Keep the default libpng and libjpg backends for now. > * Disable JXL images. > * Disable QOI images. > > Signed-off-by: Christian Melki > Message-Id: <20221013111452.3298415-2-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/sdl2-image.make b/rules/sdl2-image.make > index 77468ffad96e..a01f69daff61 100644 > --- a/rules/sdl2-image.make > +++ b/rules/sdl2-image.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2_IMAGE) += sdl2-image > # > # Paths and names > # > -SDL2_IMAGE_VERSION := 2.0.5 > -SDL2_IMAGE_MD5 := f26f3a153360a8f09ed5220ef7b07aea > +SDL2_IMAGE_VERSION := 2.6.2 > +SDL2_IMAGE_MD5 := 35da7c375b1c187b0f684c1c83b3b9c3 > SDL2_IMAGE := SDL2_image-$(SDL2_IMAGE_VERSION) > SDL2_IMAGE_SUFFIX:= tar.gz > SDL2_IMAGE_URL := > https://www.libsdl.org/projects/SDL_image/release/$(SDL2_IMAGE).$(SDL2_IMAGE_SUFFIX) > @@ -34,6 +34,9 @@ SDL2_IMAGE_CONF_OPT := \ > --disable-static \ > --disable-imageio \ > --disable-sdltest \ > + --disable-stb-image \ > + --disable-jxl \ > + --disable-qoi \ > --$(call ptx/endis, PTXCONF_SDL2_IMAGE_BMP)-bmp \ > --$(call ptx/endis, PTXCONF_SDL2_IMAGE_GIF)-gif \ > --$(call ptx/endis, PTXCONF_SDL2_IMAGE_JPG)-jpg \
Re: [ptxdist] [APPLIED] mesalib: version bump 22.2.0 -> 22.2.1
Thanks, applied as f0bed01b38144b457463cd6fc0bc807457c1928a. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:37 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20221014082429.1288570-1-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/mesalib.make b/rules/mesalib.make > index 9be98eee3fd2..e06417b34018 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib > # > # Paths and names > # > -MESALIB_VERSION := 22.2.0 > -MESALIB_MD5 := 731cdd53d5f9dd695aae1b3a37081d5f > +MESALIB_VERSION := 22.2.1 > +MESALIB_MD5 := 5ff97bb6bf82af6f81b41ff9dacbcc0a > MESALIB := mesa-$(MESALIB_VERSION) > MESALIB_SUFFIX := tar.xz > MESALIB_URL := \
Re: [ptxdist] [APPLIED] dbus: Version bump. 1.15.0 -> 1.15.2
Thanks, applied as 1ff66825219fd7d21325cf81f68952c8e7f28d8d. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:32 +0200, Christian Melki wrote: > This bump plugs: > CVE-2022-42010, CVE-2022-42011, CVE-2022-42012 > > Also, this change might cause regressions for various configurations: > https://gitlab.freedesktop.org/dbus/dbus/-/issues/416 > > Signed-off-by: Christian Melki > Message-Id: <20221013081115.3110525-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/dbus.make b/rules/dbus.make > index c1239cde409f..6ceae4c21407 100644 > --- a/rules/dbus.make > +++ b/rules/dbus.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus > # > # Paths and names > # > -DBUS_VERSION := 1.15.0 > -DBUS_MD5 := 80e3f8f1abab68117eedef4df3403e90 > +DBUS_VERSION := 1.15.2 > +DBUS_MD5 := c56de960ea9031b92ee71aaa0e8e72c2 > DBUS := dbus-$(DBUS_VERSION) > DBUS_SUFFIX := tar.xz > DBUS_URL := > http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
Re: [ptxdist] [APPLIED] libcurl: Align help texts
Thanks, applied as fa6ec9c27df65770239d320ba4aa1eb4b90acdf2. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:30 +0200, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > Reviewed-by: Alexander Dahl > Signed-off-by: Michael Olbrich > > diff --git a/rules/libcurl.in b/rules/libcurl.in > index 36800b01281f..d5cf3519d9e7 100644 > --- a/rules/libcurl.in > +++ b/rules/libcurl.in > @@ -11,12 +11,13 @@ menuconfig LIBCURL > select CA_CERTIFICATES if LIBCURL_SSL_CA_CERTIFICATES && RUNTIME > select C_ARES if LIBCURL_C_ARES > help > - curl is a command line tool for transferring files with URL syntax, > supporting > - FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS and > FILE. > - curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, > - HTTP form based upload, proxies, cookies, user+password authentication > - (Basic, Digest, NTLM, Negotiate, kerberos...), file transfer resume, > - proxy tunneling and a busload of other useful tricks. > + curl is a command line tool for transferring files with URL syntax, > + supporting FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, > + LDAP, LDAPS and FILE. > + curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading, > + HTTP form based upload, proxies, cookies, user+password authentication > + (Basic, Digest, NTLM, Negotiate, kerberos...), file transfer resume, > + proxy tunneling and a busload of other useful tricks. > > if LIBCURL > > @@ -47,12 +48,12 @@ config LIBCURL_FILE > config LIBCURL_SMTP > bool "smtp" > help > - enable smtp support for sending emails > + enable smtp support for sending emails > > config LIBCURL_VERBOSE > bool "verbose messages" > help > - enable verbose messages, helpful for error indication > + enable verbose messages, helpful for error indication > > config LIBCURL_SSL > bool "ssl"
Re: [ptxdist] [APPLIED] sdl2: Version bump. 2.0.22 -> 2.24.1
Thanks, applied as 2765df4f631e54ff844a6b3cd2e54ec1482eb64a. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:33 +0200, Christian Melki wrote: > https://github.com/libsdl-org/SDL/releases > SDL2 community have changed their version numbering scheme. > So this isn't as big of a bump as the version number would indicate. > But still, quite a lot of changes. > > * Removed obsoleted options. Threads can't be disabled, > xvidmode support is removed. Only Xrandr is supported. > > Signed-off-by: Christian Melki > Message-Id: <20221013111452.3298415-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/sdl2.make b/rules/sdl2.make > index bdd50daa1a53..599b3b2ae7c3 100644 > --- a/rules/sdl2.make > +++ b/rules/sdl2.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2 > # > # Paths and names > # > -SDL2_VERSION := 2.0.22 > -SDL2_MD5 := 40aedb499cb2b6f106d909d9d97f869a > +SDL2_VERSION := 2.24.1 > +SDL2_MD5 := 10bad2a286f155565edc611f41345de1 > SDL2 := SDL2-$(SDL2_VERSION) > SDL2_SUFFIX := tar.gz > SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX) > @@ -50,7 +50,6 @@ SDL2_CONF_OPT := \ > --enable-sensor \ > --disable-power \ > --disable-filesystem \ > - --enable-threads \ > --enable-timers \ > --enable-file \ > --enable-loadso \ > @@ -100,12 +99,10 @@ SDL2_CONF_OPT:= \ > --disable-x11-shared \ > --$(call ptx/endis,PTXCONF_SDL2_XORG)-video-x11-xcursor \ > --disable-video-x11-xdbe \ > - --disable-video-x11-xinerama \ > --$(call ptx/endis,PTXCONF_SDL2_XORG)-video-x11-xinput \ > --$(call ptx/endis,PTXCONF_SDL2_XORG)-video-x11-xrandr \ > --disable-video-x11-scrnsaver \ > --disable-video-x11-xshape \ > - --$(call ptx/endis,PTXCONF_SDL2_XORG)-video-x11-vm \ > --disable-video-vivante \ > --disable-video-cocoa \ > --disable-video-metal \
Re: [ptxdist] [APPLIED] xkeyboard-config: Version bump. 2.36 -> 2.37.
Thanks, applied as eace9a372946b2568da44e298e8875a30ed9aa22. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:31 +0200, Christian Melki wrote: > Minor bugfixes. > > Signed-off-by: Christian Melki > Message-Id: <20221013075851.3092360-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/xkeyboard-config.make b/rules/xkeyboard-config.make > index 689d02c25928..dc4f6776c59b 100644 > --- a/rules/xkeyboard-config.make > +++ b/rules/xkeyboard-config.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_XKEYBOARD_CONFIG) += xkeyboard-config > # > # Paths and names > # > -XKEYBOARD_CONFIG_VERSION := 2.36 > -XKEYBOARD_CONFIG_MD5 := 5c644c6a7d590c7f45bff7552d9dfdd1 > +XKEYBOARD_CONFIG_VERSION := 2.37 > +XKEYBOARD_CONFIG_MD5 := eb133127bcf9da2df2dd4a0a9c92e387 > XKEYBOARD_CONFIG := xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION) > XKEYBOARD_CONFIG_SUFFIX := tar.xz > XKEYBOARD_CONFIG_URL := $(call ptx/mirror, XORG, > individual/data/xkeyboard-config/$(XKEYBOARD_CONFIG).$(XKEYBOARD_CONFIG_SUFFIX))
Re: [ptxdist] [APPLIED] liblzo: version bump 2.08 -> 2.10
Thanks, applied as d44ea78f36d937eecb2e2b0a9a326e2650245a0a. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:28 +0200, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/liblzo.make b/rules/liblzo.make > index cf1e3c0e4213..ee9cfb571b3a 100644 > --- a/rules/liblzo.make > +++ b/rules/liblzo.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBLZO) += liblzo > # > # Paths and names > # > -LIBLZO_VERSION := 2.08 > -LIBLZO_MD5 := fcec64c26a0f4f4901468f360029678f > +LIBLZO_VERSION := 2.10 > +LIBLZO_MD5 := 39d3f3f9c55c87b1e5d6888e1420f4b5 > LIBLZO := lzo-$(LIBLZO_VERSION) > LIBLZO_SUFFIX:= tar.gz > LIBLZO_URL := > http://www.oberhumer.com/opensource/lzo/download/$(LIBLZO).$(LIBLZO_SUFFIX)
Re: [ptxdist] [APPLIED] mtd-utils: Version bump. 2.1.4 -> 2.1.5.
Thanks, applied as 170650ab881f35cc274a8594c120ba9444d36b74. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:29 +0200, Christian Melki wrote: > https://lists.infradead.org/pipermail/linux-mtd/2022-October/095383.html > Smaller fixes to various utils. > > * Forward patchset to new version. > > Signed-off-by: Christian Melki > Message-Id: <20221012115006.4152737-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git > a/patches/mtd-utils-2.1.4/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch > > b/patches/mtd-utils-2.1.5/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch > similarity index 100% > rename from > patches/mtd-utils-2.1.4/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch > rename to > patches/mtd-utils-2.1.5/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch > diff --git a/patches/mtd-utils-2.1.4/autogen.sh > b/patches/mtd-utils-2.1.5/autogen.sh > similarity index 100% > rename from patches/mtd-utils-2.1.4/autogen.sh > rename to patches/mtd-utils-2.1.5/autogen.sh > diff --git a/patches/mtd-utils-2.1.4/series b/patches/mtd-utils-2.1.5/series > similarity index 100% > rename from patches/mtd-utils-2.1.4/series > rename to patches/mtd-utils-2.1.5/series > diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make > index d14f4356eef1..0a181a879c0e 100644 > --- a/rules/mtd-utils.make > +++ b/rules/mtd-utils.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils > # > # Paths and names > # > -MTD_UTILS_VERSION:= 2.1.4 > -MTD_UTILS_MD5:= f1dc14163903dfecd4fe474e0fdcf606 > +MTD_UTILS_VERSION:= 2.1.5 > +MTD_UTILS_MD5:= 1fc83c1ca90093dd79443a603c35e987 > MTD_UTILS:= mtd-utils-$(MTD_UTILS_VERSION) > MTD_UTILS_SUFFIX := tar.bz2 > MTD_UTILS_URL:= > https://infraroot.at/pub/mtd/$(MTD_UTILS).$(MTD_UTILS_SUFFIX)
Re: [ptxdist] [APPLIED] ptxd_make_get: Support svn custom tunnel schemes and https
Thanks, applied as a3f49aa038778dc51886dce5482e15833b3294d5.
Michael
[sent from post-receive hook]
On Wed, 19 Oct 2022 07:41:25 +0200, Gavin Schenk wrote:
> Signed-off-by: Gavin Schenk
> Message-Id: <20221012055717.3853440-1-g.sch...@eckelmann.de>
> Signed-off-by: Michael Olbrich
>
> diff --git a/doc/ref_make_variables.rst b/doc/ref_make_variables.rst
> index 2ee34856dd02..beca984edccc 100644
> --- a/doc/ref_make_variables.rst
> +++ b/doc/ref_make_variables.rst
> @@ -196,9 +196,14 @@ Package Definition
>Git URLs must either start with 'git://' or end with '.git'. They have a
>mandatory ``tag=`` option.
>
> - Svn URLs must start with 'svn://'. They have a mandatory
> + SVN URLs must start with 'svn://'. They have a mandatory
>``rev=r`` option.
>
> + SVN custom tunnel schemes (e.g. 'svn+ssh') are supported as
> + well. There is a special treatment for 'svn+https'. In this case
> + the URL is fixed and 'svn+' is removed from URL. This is useful to
> + work around firewalls that block 'svn' ports.
> +
> ``_SOURCE``
>The location of the downloaded source archive. There should be no reason
>to set this to anything other than
> diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
> index 77ac98c9e4bc..2b0ad9307476 100644
> --- a/scripts/lib/ptxd_make_get.sh
> +++ b/scripts/lib/ptxd_make_get.sh
> @@ -434,7 +434,14 @@ ptxd_make_get() {
> ptxd_make_get_download_permitted &&
> ptxd_make_get_git && return
> ;;
> - svn://*)
> + svn://*|svn+*://*)
> + url=${url/svn+https/https}
> + if [[ "${url}" =~ ^https ]]; then
> + echo "svn+https is fixed in URL, using https
> directly"
> + fi
> + if [[ "${url}" =~ ^svn\+ ]]; then
> + echo "Custom SVN tunnel scheme detected"
> + fi
> ptxd_make_get_download_permitted &&
> ptxd_make_get_svn && return
> ;;
Re: [ptxdist] [APPLIED] openssh: Version bump. 9.0p0 -> 9.1p1
Thanks, applied as da24828c44959fd8702612351f95ac3df4309b00. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:27 +0200, Christian Melki wrote: > Minor security fixes, bug fixes and minor enhancements. > > * License file had another copyright holder added, > under the same license as was previously used > > Signed-off-by: Christian Melki > Message-Id: <20221012114207.4136149-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/openssh.make b/rules/openssh.make > index 8fa89021874a..b75942456dd1 100644 > --- a/rules/openssh.make > +++ b/rules/openssh.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh > # > # Paths and names > # > -OPENSSH_VERSION := 9.0p1 > -OPENSSH_MD5 := 5ed8252a0ee379c0f7c9e0d25d32424d > +OPENSSH_VERSION := 9.1p1 > +OPENSSH_MD5 := 471912038124285c96918882ee190a22 > OPENSSH := openssh-$(OPENSSH_VERSION) > OPENSSH_SUFFIX := tar.gz > OPENSSH_URL := \ > @@ -26,7 +26,7 @@ OPENSSH_URL := \ > OPENSSH_SOURCE := $(SRCDIR)/$(OPENSSH).$(OPENSSH_SUFFIX) > OPENSSH_DIR := $(BUILDDIR)/$(OPENSSH) > OPENSSH_LICENSE := BSD AND BSD-2-Clause AND BSD-3-Clause AND MIT AND > Beerware AND ISC > -OPENSSH_LICENSE_FILES := file://LICENCE;md5=8baf365614c9bdd63705f298c9afbfb9 > +OPENSSH_LICENSE_FILES := file://LICENCE;md5=072979064e691d342002f43cd89c0394 > > # > > # Prepare
Re: [ptxdist] [APPLIED] pipewire: version bump 0.3.58 -> 0.3.59
Thanks, applied as 6f46c19d911de2ccdf14b9eafb5dbe50afe1fd49. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:22 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221010164757.1277832-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/pipewire.make b/rules/pipewire.make > index 474b68393c5a..838ddc660fc0 100644 > --- a/rules/pipewire.make > +++ b/rules/pipewire.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire > # > # Paths and names > # > -PIPEWIRE_VERSION := 0.3.58 > -PIPEWIRE_MD5 := 4a14fa6db732b00957f835b09d47c406 > +PIPEWIRE_VERSION := 0.3.59 > +PIPEWIRE_MD5 := d310bf1f3cc5b2b446aecfa97c2cde82 > PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) > PIPEWIRE_SUFFIX := tar.bz2 > PIPEWIRE_URL := > https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX) > @@ -52,6 +52,7 @@ PIPEWIRE_CONF_OPT := \ > -Dbluez5-backend-ofono=disabled \ > -Dbluez5-codec-aac=disabled \ > -Dbluez5-codec-aptx=disabled \ > + -Dbluez5-codec-lc3=disabled \ > -Dbluez5-codec-lc3plus=disabled \ > -Dbluez5-codec-ldac=disabled \ > -Dbluez5-codec-opus=disabled \
Re: [ptxdist] [APPLIED] libcurl: Add optional MIME support
Thanks, applied as 42f2f30974584714dc0d80ec33d57c5ddbd8b844. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:26 +0200, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/libcurl.in b/rules/libcurl.in > index f86598747fcb..36800b01281f 100644 > --- a/rules/libcurl.in > +++ b/rules/libcurl.in > @@ -115,4 +115,7 @@ config LIBCURL_CRYPTO_AUTH > config LIBCURL_LIBSSH2 > bool "scp/sftp (via libssh2)" > > +config LIBCURL_MIME > + bool "MIME support" > + > endif > diff --git a/rules/libcurl.make b/rules/libcurl.make > index 5da835d730a8..e5daf5395be6 100644 > --- a/rules/libcurl.make > +++ b/rules/libcurl.make > @@ -82,7 +82,7 @@ LIBCURL_CONF_OPT:= \ > --enable-socketpair \ > --$(call ptx/endis, PTXCONF_LIBCURL_HTTP)-http-auth \ > --disable-doh \ > - --disable-mime \ > + --$(call ptx/endis, PTXCONF_LIBCURL_MIME)-mime \ > --enable-dateparse \ > --enable-netrc \ > --enable-progress-meter \
Re: [ptxdist] [APPLIED] wayland-protocols: version bump 1.26 -> 1.27
Thanks, applied as c8826c2cf83cf1cf353833cae731b17ba0090272. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:24 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221011075004.1542174-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make > index 413c95d4cf05..131187d67e28 100644 > --- a/rules/wayland-protocols.make > +++ b/rules/wayland-protocols.make > @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_WAYLAND_PROTOCOLS) += wayland-protocols > # > # Paths and names > # > -WAYLAND_PROTOCOLS_VERSION:= 1.26 > -WAYLAND_PROTOCOLS_MD5:= 0c6b3e037f3881650d9a53610dd235c7 > +WAYLAND_PROTOCOLS_VERSION:= 1.27 > +WAYLAND_PROTOCOLS_MD5:= 883fa28a6094871421491086ba50f01a > WAYLAND_PROTOCOLS:= > wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION) > WAYLAND_PROTOCOLS_SUFFIX := tar.xz > -WAYLAND_PROTOCOLS_URL:= > https://wayland.freedesktop.org/releases/$(WAYLAND_PROTOCOLS).$(WAYLAND_PROTOCOLS_SUFFIX) > +WAYLAND_PROTOCOLS_URL:= > https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads/$(WAYLAND_PROTOCOLS).$(WAYLAND_PROTOCOLS_SUFFIX) > WAYLAND_PROTOCOLS_SOURCE := > $(SRCDIR)/$(WAYLAND_PROTOCOLS).$(WAYLAND_PROTOCOLS_SUFFIX) > WAYLAND_PROTOCOLS_DIR:= $(BUILDDIR)/$(WAYLAND_PROTOCOLS) > WAYLAND_PROTOCOLS_LICENSE:= MIT
Re: [ptxdist] [APPLIED] mmc-utils: version bump 2019-10-04-g73d6c59af8d1 -> 2022-09-27-gdfc3b6ecda84
Thanks, applied as fba211e12e49b5c8abaff52d7306865d989a3d73. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:19 +0200, Bruno Thomsen wrote: > Signed-off-by: Bruno Thomsen > Message-Id: <20221004164026.6323-2-bruno.thom...@gmail.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/mmc-utils.make b/rules/mmc-utils.make > index 4d9447dd2f0c..a5045b079c1e 100644 > --- a/rules/mmc-utils.make > +++ b/rules/mmc-utils.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_MMC_UTILS) += mmc-utils > # Paths and names > # > # No tags: use a fake descriptive commit-ish to include the date > -MMC_UTILS_VERSION:= 2019-10-04-g73d6c59af8d1 > -MMC_UTILS_MD5:= 5d7c8db4f1735111d42773799e1a84bc > +MMC_UTILS_VERSION:= 2022-09-27-gdfc3b6ecda84 > +MMC_UTILS_MD5:= 791e4c512cb044045ae34d7f4b781ac1 > MMC_UTILS:= mmc-utils-$(MMC_UTILS_VERSION) > MMC_UTILS_SUFFIX := tar.gz > MMC_UTILS_URL:= > https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git;tag=$(MMC_UTILS_VERSION)
Re: [ptxdist] [APPLIED] genimage: Version bump. 15 -> 16.
Thanks, applied as 38c94c5fcce69ee4da2e2446bff3268a5d8967b4. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:22 +0200, Christian Melki wrote: > Various fixes and additions. > Notably, FIP image creation support. > > Signed-off-by: Christian Melki > Message-Id: <20221010135808.456536-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/host-genimage.make b/rules/host-genimage.make > index 08476be51860..ee2aec91b551 100644 > --- a/rules/host-genimage.make > +++ b/rules/host-genimage.make > @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_GENIMAGE) += host-genimage > # > # Paths and names > # > -HOST_GENIMAGE_VERSION:= 15 > -HOST_GENIMAGE_MD5:= 3eb6c4992be7ba9cea1c737ab1c26980 > +HOST_GENIMAGE_VERSION:= 16 > +HOST_GENIMAGE_MD5:= 07ccada4f64079e7b6d161d5279e0c1e > HOST_GENIMAGE:= genimage-$(HOST_GENIMAGE_VERSION) > HOST_GENIMAGE_SUFFIX := tar.xz > HOST_GENIMAGE_URL:= > http://www.pengutronix.de/software/genimage/download/$(HOST_GENIMAGE).$(HOST_GENIMAGE_SUFFIX)
Re: [ptxdist] [APPLIED] libpng: version bump 1.6.37 -> 1.6.38
Thanks, applied as dcd1bd2f752aa4213087020eb0f2816d49f45d8d.
Michael
[sent from post-receive hook]
On Wed, 19 Oct 2022 07:41:20 +0200, Bastian Krause wrote:
> Effectively reverts parts of
> 249544ffd ("libpng: version bump 1.6.29 -> 1.6.34").
>
> "--enable-arm-neon=check" leads to problems on ARM64, such as:
>
> arm/arm_init.c:39:6: error: #error "PNG_ARM_NEON_CHECK_SUPPORTED must not
> be defined on this platform"
>
> The check mechanism is not recommended anyway [1]:
>
> WARNING: it is strongly recommended that you do not build libpng with
> run-time checks for CPU features if at all possible. In the case of the ARM
> NEON instructions there is no processor-specific way of detecting the
> presence of the required support, therefore run-time detection is extremely
> OS specific.
>
> So stick to yes/no for the ARM NEON option by switching to the ptx/yesno
> macro.
>
> [1] https://sourceforge.net/p/libpng/code/ci/v1.6.38/tree/arm/arm_init.c#l21
>
> Signed-off-by: Bastian Krause
> Message-Id: <20221005102705.2346939-1-...@pengutronix.de>
> Signed-off-by: Michael Olbrich
>
> diff --git a/rules/libpng.make b/rules/libpng.make
> index e9b0bf67a942..aff687df640f 100644
> --- a/rules/libpng.make
> +++ b/rules/libpng.make
> @@ -37,7 +37,7 @@ LIBPNG_CONF_OPT := \
> --enable-unversioned-links \
> --enable-unversioned-libpng-pc \
> --enable-unversioned-libpng-config \
> - --enable-arm-neon=$(call ptx/ifdef, PTXCONF_ARCH_ARM_NEON, check, no) \
> + --enable-arm-neon=$(call ptx/yesno, PTXCONF_ARCH_ARM_NEON) \
> --disable-mips-msa \
> --$(call ptx/endis, PTXCONF_ARCH_X86)-intel-sse \
> --disable-powerpc-vsx \
Re: [ptxdist] [APPLIED] libepoxy: version bump 1.5.8 -> 1.5.10
Thanks, applied as 3c3b6b320e1febc60df0ecdf971fc6b9bca4f2dc. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:17 +0200, Bastian Krause wrote: > Signed-off-by: Bastian Krause > Message-Id: <20221004145133.2279213-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libepoxy.make b/rules/libepoxy.make > index 8b770ac2e719..3a5da261575b 100644 > --- a/rules/libepoxy.make > +++ b/rules/libepoxy.make > @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBEPOXY) += libepoxy > # > # Paths and names > # > -LIBEPOXY_VERSION := 1.5.8 > -LIBEPOXY_MD5 := ad6a912bf95e97d6b8b471efc249ed00 > +LIBEPOXY_VERSION := 1.5.10 > +LIBEPOXY_MD5 := f0730aad115c952e77591fcc805b1dc1 > LIBEPOXY := libepoxy-$(LIBEPOXY_VERSION) > -LIBEPOXY_SUFFIX := tar.xz > -LIBEPOXY_URL := > https://github.com/anholt/libepoxy/releases/download/$(LIBEPOXY_VERSION)/$(LIBEPOXY).$(LIBEPOXY_SUFFIX) > +LIBEPOXY_SUFFIX := tar.gz > +LIBEPOXY_URL := > https://github.com/anholt/libepoxy/archive/refs/tags/$(LIBEPOXY_VERSION).$(LIBEPOXY_SUFFIX) > LIBEPOXY_SOURCE := $(SRCDIR)/$(LIBEPOXY).$(LIBEPOXY_SUFFIX) > LIBEPOXY_DIR := $(BUILDDIR)/$(LIBEPOXY) > LIBEPOXY_LICENSE := MIT
Re: [ptxdist] [APPLIED] libtasn1: version bump 4.18.0 -> 4.19.0
Thanks, applied as 324207cdba58b74e601636925fe820fa2f150aa3. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:18 +0200, Bastian Krause wrote: > Signed-off-by: Bastian Krause > Message-Id: <20221004145211.2279528-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libtasn1.make b/rules/libtasn1.make > index 7e54635d2e92..ce06ddfe4687 100644 > --- a/rules/libtasn1.make > +++ b/rules/libtasn1.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBTASN1) += libtasn1 > # > # Paths and names > # > -LIBTASN1_VERSION := 4.18.0 > -LIBTASN1_MD5 := 8203e72a2c0390515410b2ea2c032f04 > +LIBTASN1_VERSION := 4.19.0 > +LIBTASN1_MD5 := f701ab57eb8e7d9c105b2cd5d809b29a > LIBTASN1 := libtasn1-$(LIBTASN1_VERSION) > LIBTASN1_SUFFIX := tar.gz > LIBTASN1_URL := $(call ptx/mirror, GNU, > libtasn1/$(LIBTASN1).$(LIBTASN1_SUFFIX))
Re: [ptxdist] [APPLIED] harfbuzz: version bump 5.1.0 -> 5.2.0
Thanks, applied as b576e38fcb3e5abc5e181b60af83fbd17b206a66. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:16 +0200, Bastian Krause wrote: > Signed-off-by: Bastian Krause > Message-Id: <20221004145055.2278824-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/harfbuzz.make b/rules/harfbuzz.make > index 57101b7bf79c..1d34ac95d4c5 100644 > --- a/rules/harfbuzz.make > +++ b/rules/harfbuzz.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HARFBUZZ) += harfbuzz > # > # Paths and names > # > -HARFBUZZ_VERSION := 5.1.0 > -HARFBUZZ_MD5 := 76faebc692afe666520cc158430f1a14 > +HARFBUZZ_VERSION := 5.2.0 > +HARFBUZZ_MD5 := 9e0bd000f1e620cdbd4abd17b4d4beee > HARFBUZZ := harfbuzz-$(HARFBUZZ_VERSION) > HARFBUZZ_SUFFIX := tar.xz > HARFBUZZ_URL := > https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION)/$(HARFBUZZ).$(HARFBUZZ_SUFFIX)
Re: [ptxdist] [APPLIED] wpewebkit: use libsoup3
Thanks, applied as 2320ed4b07ad4218e4a409f90aa6d274b76c271a. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:12 +0200, Bastian Krause wrote: > libsoup 3.0 is not API-compatible with 2.0, see [1]. When switching to > it, the libWPEWebKit version changes. > > [1] https://libsoup.org/libsoup-3.0/migrating-from-libsoup-2.html > > Signed-off-by: Bastian Krause > Message-Id: <20221004144533.2269637-4-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make > index 3819c5667240..4421f33fb1ee 100644 > --- a/rules/wpewebkit.make > +++ b/rules/wpewebkit.make > @@ -69,7 +69,7 @@ WPEWEBKIT_CONF_OPT := \ > -DUSE_JPEGXL=OFF \ > -DUSE_LCMS=OFF \ > -DUSE_OPENJPEG=OFF \ > - -DUSE_SOUP2=ON \ > + -DUSE_SOUP2=OFF \ > -DUSE_THIN_ARCHIVES=ON \ > -DUSE_WOFF2=OFF > > @@ -105,10 +105,10 @@ $(STATEDIR)/wpewebkit.targetinstall: > @$(call install_fixup, wpewebkit,AUTHOR,"Steffen Trumtrar > ") > @$(call install_fixup, wpewebkit,DESCRIPTION,missing) > > - @$(call install_lib, wpewebkit, 0, 0, 0644, libWPEWebKit-1.0) > + @$(call install_lib, wpewebkit, 0, 0, 0644, libWPEWebKit-1.1) > > - @$(call install_tree, wpewebkit, 0, 0, -, /usr/libexec/wpe-webkit-1.0) > - @$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/wpe-webkit-1.0) > + @$(call install_tree, wpewebkit, 0, 0, -, /usr/libexec/wpe-webkit-1.1) > + @$(call install_tree, wpewebkit, 0, 0, -, /usr/lib/wpe-webkit-1.1) > > ifdef PTXCONF_WPEWEBKIT_QT > @$(call install_tree, wpewebkit, 0, 0, -, > /usr/lib/qt5/qml/org/wpewebkit)
Re: [ptxdist] [APPLIED] icu: version bump 69.1 -> 71.1
Thanks, applied as e1723d4593afa4d889615b279c089bccb0d1dd45. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:15 +0200, Bastian Krause wrote: > The license checksum change contains no relevant changes for the license > specifiers, as far as I can see. > > Signed-off-by: Bastian Krause > Message-Id: <20221004145016.2278609-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/icu.make b/rules/icu.make > index a9bd8af12afa..182c4f32a8a9 100644 > --- a/rules/icu.make > +++ b/rules/icu.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ICU) += icu > # > # Paths and names > # > -ICU_VERSION := 69.1 > -ICU_MD5 := 9403db682507369d0f60a25ea67014c4 > +ICU_VERSION := 71.1 > +ICU_MD5 := e06ffc96f59762bd3c929b217445aaec > ICU := icu4c-$(subst .,_,$(ICU_VERSION))-src > ICU_SUFFIX := tgz > ICU_URL := > https://github.com/unicode-org/icu/releases/download/release-$(subst > .,-,$(ICU_VERSION))/$(ICU).$(ICU_SUFFIX) > @@ -24,7 +24,7 @@ ICU_DIR := $(BUILDDIR)/$(ICU) > ICU_SUBDIR := source > ICU_LICENSE := MIT AND Unicode-TOU AND public_domain AND BSD-3-Clause > ICU_LICENSE_FILES := \ > - file://LICENSE;md5=002d2fdc32d17f0ec06e9a47f2c0c8d0 > + file://LICENSE;md5=a89d03060ff9c46552434dbd1fe3ed1f > > # > > # Prepare
Re: [ptxdist] [APPLIED] libpng: version bump 1.6.37 -> 1.6.38
Thanks, applied as 06e17fc0c9d9efe1ed7009e8231c829fe845b060. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:14 +0200, Bastian Krause wrote: > Signed-off-by: Bastian Krause > Message-Id: <20221004144855.2277737-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libpng.make b/rules/libpng.make > index 0a1fbdee9a7c..e9b0bf67a942 100644 > --- a/rules/libpng.make > +++ b/rules/libpng.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBPNG) += libpng > # > # Paths and names > # > -LIBPNG_VERSION := 1.6.37 > -LIBPNG_MD5 := 015e8e15db1eecde5f2eb9eb5b6e59e9 > +LIBPNG_VERSION := 1.6.38 > +LIBPNG_MD5 := 122e6b7837811698563083b352bc8ca2 > LIBPNG := libpng-$(LIBPNG_VERSION) > LIBPNG_SUFFIX:= tar.xz > LIBPNG_URL := $(call ptx/mirror, SF, libpng/$(LIBPNG).$(LIBPNG_SUFFIX))
Re: [ptxdist] [APPLIED] cog: use libsoup3
Thanks, applied as 91d3bdbce434d01ad9e61e8814062603a077d389. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:13 +0200, Bastian Krause wrote: > Signed-off-by: Bastian Krause > Message-Id: <20221004144533.2269637-5-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/cog.make b/rules/cog.make > index e8be1f7097a4..2c0514a221ac 100644 > --- a/rules/cog.make > +++ b/rules/cog.make > @@ -43,7 +43,7 @@ COG_CONF_OPT:= \ > -Dplatforms=wayland \ > -Dplugin_path=/usr/lib/cog/modules \ > -Dprograms=true \ > - -Dsoup2=enabled \ > + -Dsoup2=disabled \ > -Dwayland_weston_content_protection=false \ > -Dwayland_weston_direct_display=false >
Re: [ptxdist] [APPLIED] dbus: Version bump. 1.14.0 -> 1.15.0
Thanks, applied as c209734f671934f4c96aee34073a9d3534fb8b4f. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:09 +0200, Christian Melki wrote: > https://github.com/freedesktop/dbus/blob/master/NEWS > Mostly fixes. > A meson build system is being prepared to replace > cmake/autotools. > > Signed-off-by: Christian Melki > Message-Id: <20221004105904.1894687-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/dbus.make b/rules/dbus.make > index 90a0347fe0e3..c1239cde409f 100644 > --- a/rules/dbus.make > +++ b/rules/dbus.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus > # > # Paths and names > # > -DBUS_VERSION := 1.14.0 > -DBUS_MD5 := ddd5570aff05191dbee8e42d751f1b7d > +DBUS_VERSION := 1.15.0 > +DBUS_MD5 := 80e3f8f1abab68117eedef4df3403e90 > DBUS := dbus-$(DBUS_VERSION) > DBUS_SUFFIX := tar.xz > DBUS_URL := > http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
Re: [ptxdist] [APPLIED] libnghttp2: new package
Thanks, applied as cde9587536a2520edb12dff6ae5b125cd906ba21. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:10 +0200, Bastian Krause wrote: > Signed-off-by: Bastian Krause > Message-Id: <20221004144533.2269637-2-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libnghttp2.in b/rules/libnghttp2.in > new file mode 100644 > index ..ef5f879f21fd > --- /dev/null > +++ b/rules/libnghttp2.in > @@ -0,0 +1,8 @@ > +## SECTION=networking > + > +config LIBNGHTTP2 > + tristate > + select HOST_CMAKE > + prompt "libnghttp2" > + help > + HTTP/2 C Library and tools > diff --git a/rules/libnghttp2.make b/rules/libnghttp2.make > new file mode 100644 > index ..cde2dc5deadd > --- /dev/null > +++ b/rules/libnghttp2.make > @@ -0,0 +1,77 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2022 by Bastian Krause > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_LIBNGHTTP2) += libnghttp2 > + > +# > +# Paths and names > +# > +LIBNGHTTP2_VERSION := 1.50.0 > +LIBNGHTTP2_MD5 := 4168ccacaa009665b6a7fe455842f95b > +LIBNGHTTP2 := nghttp2-$(LIBNGHTTP2_VERSION) > +LIBNGHTTP2_SUFFIX:= tar.xz > +LIBNGHTTP2_URL := > https://github.com/nghttp2/nghttp2/releases/download/v$(LIBNGHTTP2_VERSION)/$(LIBNGHTTP2).$(LIBNGHTTP2_SUFFIX) > +LIBNGHTTP2_SOURCE:= $(SRCDIR)/$(LIBNGHTTP2).$(LIBNGHTTP2_SUFFIX) > +LIBNGHTTP2_DIR := $(BUILDDIR)/$(LIBNGHTTP2) > +LIBNGHTTP2_LICENSE := MIT > +LIBNGHTTP2_LICENSE_FILES := > file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec > + > +# > > +# Prepare > +# > > + > +# > +# cmake > +# > +LIBNGHTTP2_CONF_TOOL := cmake > +LIBNGHTTP2_CONF_OPT := \ > + $(CROSS_CMAKE_USR) \ > + -DENABLE_APP=OFF \ > + -DENABLE_ASIO_LIB=OFF \ > + -DENABLE_DEBUG=OFF \ > + -DENABLE_DOC=OFF \ > + -DENABLE_EXAMPLES=OFF \ > + -DENABLE_FAILMALLOC=OFF \ > + -DENABLE_HPACK_TOOLS=OFF \ > + -DENABLE_HTTP3=OFF \ > + -DENABLE_LIB_ONLY=ON \ > + -DENABLE_PYTHON_BINDINGS=OFF \ > + -DENABLE_SHARED_LIB=ON \ > + -DENABLE_STATIC_CRT=OFF \ > + -DENABLE_STATIC_LIB=OFF \ > + -DENABLE_THREADS=ON \ > + -DENABLE_WERROR=OFF \ > + -DWITH_JEMALLOC=OFF \ > + -DWITH_LIBBPF=OFF \ > + -DWITH_LIBXML2=OFF \ > + -DWITH_MRUBY=OFF \ > + -DWITH_NEVERBLEED=OFF > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/libnghttp2.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, libnghttp2) > + @$(call install_fixup, libnghttp2,PRIORITY,optional) > + @$(call install_fixup, libnghttp2,SECTION,base) > + @$(call install_fixup, libnghttp2,AUTHOR,"Bastian Krause > ") > + @$(call install_fixup, libnghttp2,DESCRIPTION,missing) > + > + @$(call install_lib, libnghttp2, 0, 0, 0644, libnghttp2) > + > + @$(call install_finish, libnghttp2) > + > + @$(call touch) > + > +# vim: syntax=make
Re: [ptxdist] [APPLIED] bash: Version bump. 5.1.16 -> 5.2
Thanks, applied as 59a62f08d4f060ac610003b3be6a2a4a072f3ef3. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:08 +0200, Christian Melki wrote: > https://git.savannah.gnu.org/cgit/bash.git/tree/NEWS > Bunch of fixes and some new functionality. > > * License file had copyright year changes. > * Re-enable parallelization of build. > > Signed-off-by: Christian Melki > Message-Id: <20221004084827.698180-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/bash.make b/rules/bash.make > index 8213aafade8b..080c8f307370 100644 > --- a/rules/bash.make > +++ b/rules/bash.make > @@ -13,18 +13,17 @@ PACKAGES-$(PTXCONF_BASH) += bash > # > # Paths and names > # > -BASH_VERSION := 5.1.16 > -BASH_MD5 := c17b20a09fc38d67fb303aeb6c130b4e > +BASH_VERSION := 5.2 > +BASH_MD5 := cfb4cf795fc239667f187b3d6b3d396f > BASH := bash-$(BASH_VERSION) > BASH_SUFFIX := tar.gz > BASH_URL := $(call ptx/mirror, GNU, bash/$(BASH).$(BASH_SUFFIX)) > BASH_SOURCE := $(SRCDIR)/$(BASH).$(BASH_SUFFIX) > BASH_DIR := $(BUILDDIR)/$(BASH) > -BASH_MAKE_PAR:= NO > BASH_LICENSE := GPL-3.0-or-later > BASH_LICENSE_FILES := \ > file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ > - > file://general.c;startline=1;endline=19;md5=94a266185749191808da241ccc2af60a > + > file://general.c;startline=1;endline=19;md5=e33b255b2fde7a27805a07a2a59d571e > > # > > # Prepare
Re: [ptxdist] [APPLIED] libsoup: version bump 2.72.0 -> 3.2.0
Thanks, applied as 2416a4ce1557ac70173c52e7894dd53fa01fb199. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:11 +0200, Bastian Krause wrote: > Note that libsoup 3.x breaks previous ABI [1]. > > [1] https://libsoup.org/libsoup-3.0/migrating-from-libsoup-2.html > > Signed-off-by: Bastian Krause > Message-Id: <20221004144533.2269637-3-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libsoup.in b/rules/libsoup.in > index 42ee2b1d8ea8..788d7985d8df 100644 > --- a/rules/libsoup.in > +++ b/rules/libsoup.in > @@ -6,11 +6,8 @@ config LIBSOUP > select HOST_GLIB > select GLIB > select SQLITE > + select LIBNGHTTP2 > select LIBPSL > - select LIBXML2 > - select LIBXML2_OUTPUT > - select LIBXML2_SAX1 > - select HOST_INTLTOOL > select GOBJECT_INTROSPECTIONif LIBSOUP_INTROSPECTION > prompt "libsoup" > help > diff --git a/rules/libsoup.make b/rules/libsoup.make > index 74ae2f030b13..34b80ecee610 100644 > --- a/rules/libsoup.make > +++ b/rules/libsoup.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBSOUP) += libsoup > # > # Paths and names > # > -LIBSOUP_VERSION := 2.72.0 > -LIBSOUP_MD5 := 859380b76b51fb55d720daea3c76c945 > +LIBSOUP_VERSION := 3.2.0 > +LIBSOUP_MD5 := 34f1f15aa43f974dadf256aef2e89587 > LIBSOUP := libsoup-$(LIBSOUP_VERSION) > LIBSOUP_SUFFIX := tar.xz > LIBSOUP_URL := $(call ptx/mirror, GNOME, libsoup/$(basename > $(LIBSOUP_VERSION))/$(LIBSOUP).$(LIBSOUP_SUFFIX)) > @@ -35,15 +35,18 @@ LIBSOUP_LICENSE_FILES := \ > LIBSOUP_CONF_TOOL := meson > LIBSOUP_CONF_OPT := \ > $(CROSS_MESON_USR) \ > + -Dautobahn=disabled \ > -Dbrotli=disabled \ > - -Dgnome=true \ > + -Ddoc_tests=false \ > + -Ddocs=disabled \ > + -Dfuzzing=disabled \ > -Dgssapi=disabled \ > - -Dgtk_doc=false \ > -Dinstalled_tests=false \ > -Dintrospection=$(call ptx/endis, PTXCONF_LIBSOUP_INTROSPECTION)d \ > -Dkrb5_config= \ > -Dntlm=disabled \ > -Dntlm_auth=ntlm_auth \ > + -Dpkcs11_tests=disabled \ > -Dsysprof=disabled \ > -Dtests=false \ > -Dtls_check=false \ > @@ -62,10 +65,10 @@ $(STATEDIR)/libsoup.targetinstall: > @$(call install_fixup, libsoup,AUTHOR,"Marc Kleine-Budde > ") > @$(call install_fixup, libsoup,DESCRIPTION,missing) > > - @$(call install_lib, libsoup, 0, 0, 0644, libsoup-2.4) > + @$(call install_lib, libsoup, 0, 0, 0644, libsoup-3.0) > ifdef PTXCONF_LIBSOUP_INTROSPECTION > @$(call install_copy, libsoup, 0, 0, 0644, -, \ > - /usr/lib/girepository-1.0/Soup-2.4.typelib) > + /usr/lib/girepository-1.0/Soup-3.0.typelib) > endif > > @$(call install_finish, libsoup)
Re: [ptxdist] [APPLIED] libcap: Version bump. 2.65 -> 2.66.
Thanks, applied as 17917363e8f547e5e8f451e466d12c9fbe080053. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:07 +0200, Christian Melki wrote: > Very minor bugfixes. > https://git.kernel.org/pub/scm/libs/libcap/libcap.git/log/?h=v1.2.66 > > Signed-off-by: Christian Melki > Message-Id: <20221004070315.590942-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libcap.make b/rules/libcap.make > index 8d6bc856ace2..8b4cf246bd13 100644 > --- a/rules/libcap.make > +++ b/rules/libcap.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAP) += libcap > # > # Paths and names > # > -LIBCAP_VERSION := 2.65 > -LIBCAP_MD5 := 3543e753dd941255c4def6cc67a462bb > +LIBCAP_VERSION := 2.66 > +LIBCAP_MD5 := 00afd6e13bc94b2543b1a70770bdb41f > LIBCAP := libcap-$(LIBCAP_VERSION) > LIBCAP_SUFFIX:= tar.xz > LIBCAP_URL := \
Re: [ptxdist] [APPLIED] glmark2: backport GCC 12 build fix
Thanks, applied as d0a6370b0425ca607c9f4df28a981541a6ad82ef.
Michael
[sent from post-receive hook]
On Wed, 19 Oct 2022 07:41:03 +0200, Philipp Zabel
wrote:
> Upstream commit d1ca3f53c96d ("libmatrix: Add missing
> include") fixes building with GCC 12.
>
> Signed-off-by: Philipp Zabel
> Message-Id: <20220930093829.3758764-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich
>
> diff --git
> a/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch
> b/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch
> new file mode 100644
> index ..ead4fb5f817c
> --- /dev/null
> +++ b/patches/glmark2-2021.12/0001-libmatrix-Add-missing-utility-include.patch
> @@ -0,0 +1,26 @@
> +From: Alexandros Frantzis
> +Date: Mon, 14 Feb 2022 13:54:09 +0200
> +Subject: [PATCH] libmatrix: Add missing include
> +
> +Fixes compilation with GCC 12.
> +
> +Fixes #169
> +
> +[p.za...@pengutronix.de: Back-ported to 2021.12]
> +Signed-off-by: Philipp Zabel
> +---
> + src/libmatrix/program.h | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/src/libmatrix/program.h b/src/libmatrix/program.h
> +index f95b470cfae0..1c9de08b749a 100644
> +--- a/src/libmatrix/program.h
> b/src/libmatrix/program.h
> +@@ -15,6 +15,7 @@
> + #include
> + #include
> + #include
> ++#include
> + #include "mat.h"
> +
> + // Simple shader container. Abstracts all of the OpenGL bits, but leaves
> diff --git a/patches/glmark2-2021.12/series b/patches/glmark2-2021.12/series
> new file mode 100644
> index ..d9bbb4faacb3
> --- /dev/null
> +++ b/patches/glmark2-2021.12/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-libmatrix-Add-missing-utility-include.patch
> +# ce7ebc58a400e5455959996697f9022b - git-ptx-patches magic
Re: [ptxdist] [APPLIED] ptxdist: Add --silent and -s as aliases for --quiet
Thanks, applied as 120c9ba1be73e425b9de3012ac5e9eec1fd0ea07. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:05 +0200, Uwe Kleine-König wrote: > Many options that ptxdist parses are the same for make(1) (e.g. -j, -k, > -d). However the option to make make silent is -s, add that to reduce > the time I spend on thinking which option is for which command. > > While at it also add --silent in accordance to make (which also knows > about --quiet by the way). > > Signed-off-by: Uwe Kleine-König > Message-Id: <20220930143637.3372940-1-u.kleine-koe...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/bin/ptxdist b/bin/ptxdist > index 5c6df104e5f6..dfb619cbd8d0 100755 > --- a/bin/ptxdist > +++ b/bin/ptxdist > @@ -812,6 +812,7 @@ Options: > >--debug, -dprint out additional info (like make > decisions) >--quiet, -qsuppress output, show only stderr > + --silent, -s alias for --quiet >--verbose, -v be more verbose, print command before > execute them >--output-sync Improve output readability for parallel > building. > Disabled by default except for quiet builds. > @@ -1148,7 +1149,7 @@ parse_first() > --progress) > PTXDIST_PROGRESS=1 > ;; > - -q|--quiet) > + -q|--quiet|-s|--silent) > PTXDIST_QUIET=1 > ;; > --git)
Re: [ptxdist] [APPLIED] rauc: version bump 1.7 -> 1.8
Thanks, applied as a454a78c139a6cae73127b9ce5df7fa18be8a7b2. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:06 +0200, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/rauc.make b/rules/rauc.make > index 6a2d49343105..cac186a64b0c 100644 > --- a/rules/rauc.make > +++ b/rules/rauc.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc > # > # Paths and names > # > -RAUC_VERSION := 1.7 > -RAUC_MD5 := aa31fc2a457ba2e3fca8206d9fb9f126 > +RAUC_VERSION := 1.8 > +RAUC_MD5 := acd0e788d804bda6645a2506c1068789 > RAUC := rauc-$(RAUC_VERSION) > RAUC_SUFFIX := tar.xz > RAUC_URL := > https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
Re: [ptxdist] [APPLIED] casync: version bump a8f6c841ccfe -> 0efa7abffe5f
Thanks, applied as 3094aa9b03503e509caa5c390c3e29a13c6cd5e2. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:04 +0200, Ladislav Michl wrote: > Includes fix for builds against glibc 2.36. > > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/casync.make b/rules/casync.make > index ce4ab93df583..61d7ff361cd0 100644 > --- a/rules/casync.make > +++ b/rules/casync.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_CASYNC) += casync > # > # Paths and names > # > -CASYNC_VERSION := a8f6c841ccfe59ca8c68aad64df170b64042dce8 > -CASYNC_MD5 := 38cf3c9e1be9ac60243031538024aa01 > +CASYNC_VERSION := 0efa7abffe5fffbde8c457d3c8fafbdde0bb6e4f > +CASYNC_MD5 := 9b28d76355acfb56ba6ddfcb95951c13 > CASYNC := casync-$(CASYNC_VERSION) > CASYNC_SUFFIX:= tar.gz > CASYNC_URL := > https://github.com/systemd/casync/archive/$(CASYNC_VERSION).$(CASYNC_SUFFIX)
Re: [ptxdist] [APPLIED] modemmanager: version bump 1.18.10 -> 1.18.12
Thanks, applied as cab5db2ecb0a5d9431bca60860ecf4cfba6a3e68. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:02 +0200, Bruno Thomsen wrote: > NEWS ModemManager 1.18.12 > https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/180c171e8d10340b2bb618f4e2bf2fc6eb13b0e6 > > This release fixes a bearer issue that is caused by longer network > registration time after 2G and 3G network shutdown in Europe. > https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/572 > > Signed-off-by: Bruno Thomsen > Message-Id: <20220930050643.3646-1-bruno.thom...@gmail.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/modemmanager.make b/rules/modemmanager.make > index 9dd58dac0998..f942b5a65b6c 100644 > --- a/rules/modemmanager.make > +++ b/rules/modemmanager.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager > # > # Paths and names > # > -MODEMMANAGER_VERSION := 1.18.10 > -MODEMMANAGER_MD5 := e3ed043771fdee6f2078b9e51ca5e56a > +MODEMMANAGER_VERSION := 1.18.12 > +MODEMMANAGER_MD5 := 9f014dfc59f1bd8bc230bb2c2974d104 > MODEMMANAGER := ModemManager-$(MODEMMANAGER_VERSION) > MODEMMANAGER_SUFFIX := tar.xz > MODEMMANAGER_URL := > https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
Re: [ptxdist] [APPLIED] util-linux-ng: Sort config entries
Thanks, applied as e868126426edc50af31923d97adbd4793a0e0d51. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:00 +0200, Ladislav Michl wrote: > Split menu entries into groups and sort them alphabetically. > > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in > index b317d650592a..772d913ffeed 100644 > --- a/rules/util-linux-ng.in > +++ b/rules/util-linux-ng.in > @@ -44,36 +44,7 @@ config UTIL_LINUX_NG_PARTX_TOOLS > config UTIL_LINUX_NG_SCHEDUTILS > bool > > -config UTIL_LINUX_NG_AGETTY > - bool > - prompt "agetty" > - help > - A small getty. > - > -config UTIL_LINUX_NG_COLUMN > - bool > - select UTIL_LINUX_NG_LIBSMARTCOLS > - prompt "column" > - help > - Columnate lists. > - > -config UTIL_LINUX_NG_LINE > - bool > - prompt "line" > - help > - The line utility. > - > -config UTIL_LINUX_NG_GETOPT > - bool > - prompt "getopt" > - depends on !BUSYBOX_GETOPT || ALLYES > - help > - The getopt is used to break up (parse) options in command > - lines for easy parsing by shell procedures, and to check > - for valid options. > - > -comment "BusyBox' getopt is selected!" > - depends on BUSYBOX_GETOPT > +comment "disk-utils" > > config UTIL_LINUX_NG_ADDPART > bool > @@ -82,46 +53,22 @@ config UTIL_LINUX_NG_ADDPART > help > The addpart utility. > > -config UTIL_LINUX_NG_DELPART > +config UTIL_LINUX_NG_CFDISK > bool > - select UTIL_LINUX_NG_PARTX_TOOLS > - prompt "delpart" > + select UTIL_LINUX_NG_LIBFDISK > + select UTIL_LINUX_NG_LIBSMARTCOLS > + select UTIL_LINUX_NG_FDISKS > + select UTIL_LINUX_NG_USES_NCURSES > + prompt "cfdisk" > help > - The delpart utility. > + cfdisk is a curses based program for partitioning any hard disk drive. > > -config UTIL_LINUX_NG_PARTX > +config UTIL_LINUX_NG_DELPART > bool > select UTIL_LINUX_NG_PARTX_TOOLS > - prompt "partx" > - help > - The partx utility. > - > -config UTIL_LINUX_NG_DMESG > - bool > - depends on !BUSYBOX_DMESG || ALLYES > - prompt "dmesg" > - help > - The dmesg utility. > - > -comment "BusyBox' dmesg is selected!" > - depends on BUSYBOX_DMESG > - > -config UTIL_LINUX_NG_NSENTER > - bool > - prompt "nsenter" > - help > - The nsenter utility > - > -config UTIL_LINUX_NG_MOUNTPOINT > - bool > - select UTIL_LINUX_NG_LIBMOUNT > - depends on !BUSYBOX_MOUNTPOINT || ALLYES > - prompt "mountpoint" > + prompt "delpart" > help > - The mountpoint utility. > - > -comment "BusyBox' mountpoint is selected!" > - depends on BUSYBOX_MOUNTPOINT > + The delpart utility. > > config UTIL_LINUX_NG_FDISK > bool > @@ -136,25 +83,26 @@ config UTIL_LINUX_NG_FDISK > comment "BusyBox' fdisk is selected!" > depends on BUSYBOX_FDISK > > -config UTIL_LINUX_NG_SFDISK > +config UTIL_LINUX_NG_FSCK > bool > - prompt "sfdisk" > - select UTIL_LINUX_NG_LIBFDISK > - select UTIL_LINUX_NG_LIBSMARTCOLS > - select UTIL_LINUX_NG_FDISKS > + prompt "fsck" > + select UTIL_LINUX_NG_LIBMOUNT > + depends on !BUSYBOX_FSCK || ALLYES > help > - sfdisk - Partition table manipulator for Linux, > - scriptable for unattended partitioning > + fsck is used to check and optionally repair one or > + more Linux file systems. fsck is simply a front-end for > + the various file system checkers (fsck.fstype) available > + under Linux. > > -config UTIL_LINUX_NG_CFDISK > +comment "BusyBox' fsck is selected!" > + depends on BUSYBOX_FSCK > + > +config UTIL_LINUX_NG_MKFS > bool > - select UTIL_LINUX_NG_LIBFDISK > - select UTIL_LINUX_NG_LIBSMARTCOLS > - select UTIL_LINUX_NG_FDISKS > - select UTIL_LINUX_NG_USES_NCURSES > - prompt "cfdisk" > + prompt "mkfs" > help > - cfdisk is a curses based program for partitioning any hard disk drive. > + The mkfs command is a generic wrapper for fs specific > + mkfs.* commands. > > config UTIL_LINUX_NG_MKSWAP > bool > @@ -173,164 +121,134 @@ config UTIL_LINUX_NG_MKSWAP_UUID > comment "BusyBox' mkswap is selected!" > depends on BUSYBOX_MKSWAP > > -config UTIL_LINUX_NG_SWAPON > +config UTIL_LINUX_NG_PARTX > bool > - prompt "swapon" > - select UTIL_LINUX_NG_LIBBLKID > - select UTIL_LINUX_NG_LIBMOUNT > - select UTIL_LINUX_NG_LIBSMARTCOLS > - depends on !BUSYBOX_SWAPON || ALLYES > + select UTIL_LINUX_NG_PARTX_TOOLS > + prompt "partx" > help > - Swapon is used to specify devices on which paging and swapping are to > take place. > - > -comment "BusyBox' swapon is selected!" > - depends on BUSYBOX_SWAPON > + The partx utility. > > -config UTIL_LINUX_NG_LOSETUP > +config UTIL_LI
Re: [ptxdist] [APPLIED] util-linux-ng: Use for loop to install libs and tools
Thanks, applied as 2e156c562f6cfe154cbbf4deeb458a780e8dd8c6. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:41:01 +0200, Ladislav Michl wrote: > Options are sorted alphabetically inside each group. Please keep > it that way. > > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make > index 5421ab50a9e1..74ea0c8c 100644 > --- a/rules/util-linux-ng.make > +++ b/rules/util-linux-ng.make > @@ -182,6 +182,74 @@ UTIL_LINUX_NG_CONF_OPT := \ > # Target-Install > # > > > +UTIL_LINUX_LIB-y := > +UTIL_LINUX_BIN-y := > + > +# libraries > +UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBBLKID) += blkid > +UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBUUID) += uuid > +UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBMOUNT) += mount > +UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBSMARTCOLS) += smartcols > +UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBFDISK) += fdisk > + > +# disk-utils > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_ADDPART) += sbin/addpart > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_CFDISK) += sbin/cfdisk > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_DELPART) += sbin/delpart > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FDISK)+= sbin/fdisk > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FSCK) += sbin/fsck > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MKFS) += sbin/mkfs > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MKSWAP) += sbin/mkswap > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_PARTX)+= sbin/partx > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SFDISK) += sbin/sfdisk > +# login-utils > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LOGIN)+= bin/login > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SULOGIN) += sbin/sulogin > +# misc-utils > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_BLKID)+= sbin/blkid > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FINDFS) += sbin/findfs > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_GETOPT) += bin/getopt > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSBLK)+= bin/lsblk > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MCOOKIE) += bin/mcookie > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_UUIDD)+= sbin/uuidd > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_UUIDGEN) += bin/uuidgen > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_WIPEFS) += sbin/wipefs > +# schedutils > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_CHRT) += bin/chrt > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IONICE) += bin/ionice > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_TASKSET) += bin/taskset > +# sys-utils > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_CHMEM)+= bin/chmem > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_DMESG)+= bin/dmesg > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FLOCK)+= bin/flock > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FSFREEZE) += sbin/fsfreeze > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FSTRIM) += sbin/fstrim > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_HWCLOCK) += sbin/hwclock > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IPCRM)+= bin/ipcrm > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IPCS) += bin/ipcs > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IRQTOP) += bin/irqtop > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LDATTACH) += sbin/ldattach > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LOSETUP) += sbin/losetup > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSCPU)+= bin/lscpu > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSIRQ)+= bin/lsirq > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSMEM)+= bin/lsmem > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MOUNT)+= bin/mount > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MOUNTPOINT) += bin/mountpoint > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_NSENTER) += bin/nsenter > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_PIVOT_ROOT) += sbin/pivot_root > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_READPROFILE) += sbin/readprofile > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SWAPON) += sbin/swapoff > sbin/swapon > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT) += sbin/switch_root > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_UMOUNT) += bin/umount > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_WDCTL)+= bin/wdctl > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_ZRAMCTL) += sbin/zramctl > +# term-utils > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_AGETTY) += sbin/agetty > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SETTERM) += bin/setterm > +# text-utils > +UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_COLUMN) += bin/column > +UTIL_LINUX_BIN-$(P
Re: [ptxdist] [APPLIED] nettle: version bump to 3.8.1
Thanks, applied as 495bf5345a935064fa340765c6f96e24f6109288. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:40:58 +0200, Marc Kleine-Budde wrote: > Signed-off-by: Marc Kleine-Budde > Message-Id: <20221017123636.54555-5-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/nettle.make b/rules/nettle.make > index c27f2116be66..43e0b41581e9 100644 > --- a/rules/nettle.make > +++ b/rules/nettle.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NETTLE) += nettle > # > # Paths and names > # > -NETTLE_VERSION := 3.7.3 > -NETTLE_MD5 := a60273d0fab9c808646fcf5e9edc2e8f > +NETTLE_VERSION := 3.8.1 > +NETTLE_MD5 := e15c5fd5cc901f5dde6a271d7f2320d1 > NETTLE := nettle-$(NETTLE_VERSION) > NETTLE_SUFFIX:= tar.gz > NETTLE_SOURCE:= $(SRCDIR)/$(NETTLE).$(NETTLE_SUFFIX)
Re: [ptxdist] [APPLIED] lz4: version bump to 1.9.4 + adjust license files checksum
Thanks, applied as 27e8aa53593ff6d4418277b74d4631dcb9553216. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:40:57 +0200, Marc Kleine-Budde wrote: > - LICENSE: > Paragraph about '`programs`, `tests` or `examples`' was changed from > 'receive more limited attention and support for such scenario.' to > 'are intended to be used "as is", as part of their intended scenarios, >with no intention to support 3rd party integration use cases.' > - lib/LICENSE: > Copyright years changed from "2011-2016" to "2011-2020". > > Signed-off-by: Marc Kleine-Budde > Message-Id: <20221017123636.54555-4-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/lz4.make b/rules/lz4.make > index 79d8600c29db..4b9b2bb33076 100644 > --- a/rules/lz4.make > +++ b/rules/lz4.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LZ4) += lz4 > # > # Paths and names > # > -LZ4_VERSION := 1.9.3 > -LZ4_MD5 := 3a1ab1684e14fc1afc66228ce61b2db3 > +LZ4_VERSION := 1.9.4 > +LZ4_MD5 := e9286adb64040071c5e23498bf753261 > LZ4 := lz4-$(LZ4_VERSION) > LZ4_SUFFIX := tar.gz > LZ4_URL := > https://github.com/Cyan4973/lz4/archive/v$(LZ4_VERSION).$(LZ4_SUFFIX) > @@ -23,8 +23,8 @@ LZ4_SOURCE := $(SRCDIR)/$(LZ4).$(LZ4_SUFFIX) > LZ4_DIR := $(BUILDDIR)/$(LZ4) > LZ4_LICENSE := BSD-2-Clause AND GPL-2.0-or-later > LZ4_LICENSE_FILES := \ > - file://LICENSE;md5=d57c0d21cb917fb4e0af2454aa48b956 \ > - file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc \ > + file://LICENSE;md5=c5cc3cd6f9274b4d32988096df9c3ec3 \ > + file://lib/LICENSE;md5=5cd5f851b52ec832b10eedb3f01f885a \ > file://programs/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 > > # >
Re: [ptxdist] [APPLIED] treewide: use $(ptx/nl) instead of ; in foreach loops
Thanks, applied as 6c8bc2b44a033a4c7705bcda27f9804b76ccfdb7. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:40:59 +0200, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/barebox.make b/rules/barebox.make > index adab3c4fe210..a82879e1965c 100644 > --- a/rules/barebox.make > +++ b/rules/barebox.make > @@ -173,7 +173,7 @@ ifneq ($(strip $(BAREBOX_PROGS_TARGET_y)),) > > @$(foreach prog, $(BAREBOX_PROGS_TARGET_y), \ > $(call install_copy, barebox, 0, 0, 0755, -, \ > - /usr/bin/$(prog));) > + /usr/bin/$(prog))$(ptx/nl)) > > @$(call install_finish, barebox) > endif > diff --git a/rules/connman.make b/rules/connman.make > index 7a694b697e4e..54131c53906a 100644 > --- a/rules/connman.make > +++ b/rules/connman.make > @@ -179,7 +179,7 @@ endif > ifdef PTXCONF_CONNMAN_TESTS > @$(foreach test, $(CONNMAN_TESTS), \ > $(call install_copy, connman, 0, 0, 0755, -, \ > - /usr/sbin/cm-$(test));) > + /usr/sbin/cm-$(test))$(ptx/nl)) > endif > > @$(call install_finish, connman) > diff --git a/rules/easy-rsa.make b/rules/easy-rsa.make > index 6d86e5317cb0..bbf9150767b8 100644 > --- a/rules/easy-rsa.make > +++ b/rules/easy-rsa.make > @@ -47,11 +47,11 @@ $(STATEDIR)/easy-rsa.targetinstall: > > @$(foreach script,$(EASY_RSA_INSTALL_SCRIPTS), \ > $(call install_copy, easy-rsa, 0, 0, 0755, -, \ > - /usr/share/easy-rsa/$(script));) > + /usr/share/easy-rsa/$(script))$(ptx/nl)) > > @$(foreach file,$(EASY_RSA_INSTALL_FILES), \ > $(call install_copy, easy-rsa, 0, 0, 0644, -, \ > - /usr/share/easy-rsa/$(file));) > + /usr/share/easy-rsa/$(file))$(ptx/nl)) > > @$(call install_finish, easy-rsa) > > diff --git a/rules/ecryptfs-utils.make b/rules/ecryptfs-utils.make > index 5c38842d4b79..b7198d16af89 100644 > --- a/rules/ecryptfs-utils.make > +++ b/rules/ecryptfs-utils.make > @@ -94,7 +94,7 @@ ifdef PTXCONF_ECRYPTFS_UTILS_MOUNT_ECRYPTFS > endif > > @$(foreach prog, $(ECRYPTFS_UTILS_PROGS_y), \ > - $(call install_copy, ecryptfs-utils, 0, 0, 0755, -, $(prog));) > + $(call install_copy, ecryptfs-utils, 0, 0, 0755, -, > $(prog))$(ptx/nl)) > > @$(call install_finish, ecryptfs-utils) > > diff --git a/rules/gtk-engines.make b/rules/gtk-engines.make > index 2544c89cb930..bbbe1162da41 100644 > --- a/rules/gtk-engines.make > +++ b/rules/gtk-engines.make > @@ -60,7 +60,7 @@ $(STATEDIR)/gtk-engines.targetinstall: > > @$(foreach engine,$(GTK_ENGINES_ENGINES), \ > $(call install_lib, gtk-engines, 0, 0, 0644, \ > - gtk-3.0/3.0.0/engines/lib$(engine));) > + gtk-3.0/3.0.0/engines/lib$(engine))$(ptx/nl)) > > @$(call install_tree, gtk-engines, 0, 0, -, \ > /usr/share/themes) > diff --git a/rules/kbd.make b/rules/kbd.make > index 67e4ff165c4f..60bba99b2e5c 100644 > --- a/rules/kbd.make > +++ b/rules/kbd.make > @@ -82,7 +82,7 @@ $(STATEDIR)/kbd.targetinstall: > > @$(foreach tool,$(KBD_TOOLS-y), \ > $(call install_copy, kbd, 0, 0, 0755, -, \ > - /usr/bin/$(tool));) > + /usr/bin/$(tool))$(ptx/nl)) > > ifdef PTXCONF_KBD_PSFXTABLE > @$(call install_link, kbd, psfxtable, /usr/bin/psfaddtable) > diff --git a/rules/libdrm.make b/rules/libdrm.make > index 212946e973e9..262cd045dbc2 100644 > --- a/rules/libdrm.make > +++ b/rules/libdrm.make > @@ -83,7 +83,8 @@ $(STATEDIR)/libdrm.targetinstall: > @$(call install_lib, libdrm, 0, 0, 0644, libdrm) > > @$(foreach backend,$(LIBDRM_BACKENDSL-y), \ > - $(call install_lib, libdrm, 0, 0, 0644, libdrm_$(backend));) > + $(call install_lib, libdrm, 0, 0, 0644, \ > + libdrm_$(backend))$(ptx/nl)) > > ifdef PTXCONF_LIBDRM_TESTS > @$(call install_copy, libdrm, 0, 0, 0755, -, /usr/bin/modetest) > diff --git a/rules/libelf.make b/rules/libelf.make > index 5b55a8aa23b0..4f34333a585a 100644 > --- a/rules/libelf.make > +++ b/rules/libelf.make > @@ -96,7 +96,7 @@ ifdef PTXCONF_LIBELF_ELFSUTILS > make-debug-archive nm objdump ranlib readelf size stack strings > \ > strip unstrip, \ > $(call install_copy, libelf, 0, 0, 0755, -, \ > - /usr/bin/eu-$(bin));) > + /usr/bin/eu-$(bin))$(ptx/nl)) > endif > > @$(call install_finish, libelf) > diff --git a/rules/libnl3.make b/rules/libnl3.make > index da203042cce8..2af062ac2d6e 100644 > --- a/rules/libnl3.make > +++ b/rules/libnl3.make > @@ -126,7 +126,8 @@ ifdef PTXCONF_LIBNL3_ENABLE_CLI > endif > > @$(foreach tool,$(LIBNL3_INSTALL_FILES-y), \ > - $(call install_copy, libnl3, 0, 0, 0755, -, /us
Re: [ptxdist] [APPLIED] dhcp: version bump to 4.4.3 + adjust license files checksum
Thanks, applied as 220f432b4848a7ba6379fc55573f31c2ba562226.
Michael
[sent from post-receive hook]
On Wed, 19 Oct 2022 07:40:54 +0200, Marc Kleine-Budde
wrote:
> - LICENSE:
> Copyright years changed from "2004-2020" to "2004-2022".
> Paragraph 'THE SOFTWARE IS PROVIDED "AS IS"' removed.
> Address of "Internet Systems Consortium, Inc." removed.
> - server/ldap.c:
> Copyright years changed from "2010-2019" to "2010-2022".
> - server/ldap_casa.c:
> removed trailing whitespace
> Copyright years changed from "2004-2010" to "2004-2022".
> Address of "Internet Systems Consortium, Inc." adjusted.
>
> Signed-off-by: Marc Kleine-Budde
> Message-Id: <20221017123636.54555-3-...@pengutronix.de>
> Signed-off-by: Michael Olbrich
>
> diff --git a/patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch
> b/patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch
> deleted file mode 100644
> index f0e3cc450bbe..
> --- a/patches/dhcp-4.4.2/0001-Fixed-gcc-10-compilation-issues.patch
> +++ /dev/null
> @@ -1,82 +0,0 @@
> -From: Thomas Markwalder
> -Date: Thu, 30 Jul 2020 10:01:36 -0400
> -Subject: [PATCH] Fixed gcc 10 compilation issues
> -
> -client/dhclient.c
> -relay/dhcrelay.c
> -extern'ed local_port,remote_port
> -
> -common/discover.c
> -init local_port,remote_port to 0
> -
> -server/mdb.c
> -extern'ed dhcp_type_host
> -
> -server/mdb6.c
> -create_prefix6() - eliminated memcpy string overflow error
> -
> -Origin:
> https://sources.debian.org/patches/isc-dhcp/4.4.1-2.2/Fixed_gcc_10_compilation_issues.patch/
>
> - client/dhclient.c | 5 +++--
> - relay/dhcrelay.c | 4 ++--
> - server/mdb.c | 2 +-
> - server/mdb6.c | 2 +-
> - 4 files changed, 7 insertions(+), 6 deletions(-)
> -
> -diff --git a/client/dhclient.c b/client/dhclient.c
> -index 189e527094e8..7a7837cb8152 100644
> a/client/dhclient.c
> -+++ b/client/dhclient.c
> -@@ -83,8 +83,9 @@ static const char message [] = "Internet Systems
> Consortium DHCP Client";
> - static const char url [] = "For info, please visit
> https://www.isc.org/software/dhcp/";;
> - #endif /* UNIT_TEST */
> -
> --u_int16_t local_port = 0;
> --u_int16_t remote_port = 0;
> -+extern u_int16_t local_port;
> -+extern u_int16_t remote_port;
> -+
> - #if defined(DHCPv6) && defined(DHCP4o6)
> - int dhcp4o6_state = -1; /* -1 = stopped, 0 = polling, 1 = started */
> - #endif
> -diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
> -index 883d5058f2ee..7211e3bbbec9 100644
> a/relay/dhcrelay.c
> -+++ b/relay/dhcrelay.c
> -@@ -95,8 +95,8 @@ enum { forward_and_append, /* Forward and append our own
> relay option. */
> -forward_untouched, /* Forward without changes. */
> -discard } agent_relay_mode = forward_and_replace;
> -
> --u_int16_t local_port;
> --u_int16_t remote_port;
> -+extern u_int16_t local_port;
> -+extern u_int16_t remote_port;
> -
> - /* Relay agent server list. */
> - struct server_list {
> -diff --git a/server/mdb.c b/server/mdb.c
> -index ff8a707fac1b..8266d76432b8 100644
> a/server/mdb.c
> -+++ b/server/mdb.c
> -@@ -67,7 +67,7 @@ static host_id_info_t *host_id_info = NULL;
> -
> - int numclasseswritten;
> -
> --omapi_object_type_t *dhcp_type_host;
> -+extern omapi_object_type_t *dhcp_type_host;
> -
> - isc_result_t enter_class(cd, dynamicp, commit)
> - struct class *cd;
> -diff --git a/server/mdb6.c b/server/mdb6.c
> -index da7baf6e50df..ebe01e5607cb 100644
> a/server/mdb6.c
> -+++ b/server/mdb6.c
> -@@ -1945,7 +1945,7 @@ create_prefix6(struct ipv6_pool *pool, struct iasubopt
> **pref,
> - }
> - new_ds.data = new_ds.buffer->data;
> - memcpy(new_ds.buffer->data, ds.data, ds.len);
> --memcpy(new_ds.buffer->data + ds.len, &tmp, sizeof(tmp));
> -+memcpy(&new_ds.buffer->data[0] + ds.len, &tmp, sizeof(tmp));
> - data_string_forget(&ds, MDL);
> - data_string_copy(&ds, &new_ds, MDL);
> - data_string_forget(&new_ds, MDL);
> diff --git a/patches/dhcp-4.4.2/series b/patches/dhcp-4.4.2/series
> deleted file mode 100644
> index de5f31877455..
> --- a/patches/dhcp-4.4.2/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Fixed-gcc-10-compilation-issues.patch
> -# dd19bdbd49b780e973ed9392604d03fe - git-ptx-patches magic
> diff --git a/rules/dhcp.make b/rules/dhcp.make
> index 7feb6ef5b668..f4860507ded0 100644
> --- a/rules/dhcp.make
> +++ b/rules/dhcp.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_DHCP) += dhcp
> #
> # Paths and names
> #
> -DHCP_VERSION := 4.4.2
> -DHCP_MD5 := 2afdaf8498dc1edaf3012efdd589b3e1
> +DHCP_VERSION := 4.4.3
> +DHCP_MD5 := 9076af4cc1293dde5a7c6cae7de6ab45
> DHCP := dhcp-$(DHCP_VERSION)
> DHCP_SUFFIX := tar.gz
> DHCP_URL := \
> @@ -29,9 +29,9 @@ DHCP_SOURCE := $(SRCDIR)/$(DHCP).$(DHCP_SUFFIX)
> DHCP_DIR := $(BUILDDIR)/$(DHCP)
> DHCP_LICENSE := MPL-2.0 AND BS
Re: [ptxdist] [APPLIED] bind: version bump to 9.11.37 + adjust license files checksum
Thanks, applied as 23acd3897378730dbdc07381d6766195b19678dd. Michael [sent from post-receive hook] On Wed, 19 Oct 2022 07:40:53 +0200, Marc Kleine-Budde wrote: > - COPYRIGHT: > Copyright years changed from "1996-2021" to "1996-2022". > > Signed-off-by: Marc Kleine-Budde > Message-Id: <20221017123636.54555-2-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/bind.make b/rules/bind.make > index b547eeff0993..18eac0eaee50 100644 > --- a/rules/bind.make > +++ b/rules/bind.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BIND) += bind > # > # Paths and names > # > -BIND_VERSION := 9.11.31 > -BIND_MD5 := 40732ca6e4fcc9d022ab0f17b3e55b71 > +BIND_VERSION := 9.11.37 > +BIND_MD5 := 0a11e9596c46d6728fa3b0989ee75197 > BIND := bind-$(BIND_VERSION) > BIND_SUFFIX := tar.gz > BIND_URL := > https://ftp.isc.org/isc/bind9/$(BIND_VERSION)/$(BIND).$(BIND_SUFFIX) > @@ -25,7 +25,7 @@ BIND_LICENSE:= MPL-2.0 AND ISC AND > BSD-3-Clause AND BSD-2-Clause \ > AND unknown AND JPNIC AND RSA-MD AND OpenSSL AND Apache-2.0 > BIND_LICENSE_FILES := \ > file://LICENSE;md5=f27a50d2e878867827842f2c60e30bfc \ > - file://COPYRIGHT;md5=b88e7ca5f21908e1b2720169f6807cf6 > + file://COPYRIGHT;md5=89a97ebbf713f7125fe5c02223d3ae95 > > # > > # Prepare
Re: [ptxdist] [PATCH] zlib: Version bump. 1.2.12 -> 1.2.13
On Fri, Oct 14, 2022 at 04:07:23PM +0200, Christian Melki wrote:
> https://zlib.net/
> Minor fixes in this release.
> Version bump plugs CVE-2022-37434.
>
> * Remove all patches for 1.2.12. They're now fixed.
> * Reindent license file line.
The license checksum changed. Please check and add a comment here.
Michael
> Signed-off-by: Christian Melki
> ---
> ...sue-that-discarded-provided-CC-defin.patch | 23 --
> ...etting-a-gzip-header-extra-field-wit.patch | 31 ---
> ...processing-bug-that-dereferences-NUL.patch | 28 -
> patches/zlib-1.2.12/series| 6
> rules/zlib.make | 7 +++--
> 5 files changed, 4 insertions(+), 91 deletions(-)
> delete mode 100644
> patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch
> delete mode 100644
> patches/zlib-1.2.12/0002-Fix-a-bug-when-getting-a-gzip-header-extra-field-wit.patch
> delete mode 100644
> patches/zlib-1.2.12/0003-Fix-extra-field-processing-bug-that-dereferences-NUL.patch
> delete mode 100644 patches/zlib-1.2.12/series
>
> diff --git
> a/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch
>
> b/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch
> deleted file mode 100644
> index 63bdb67c0..0
> ---
> a/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -From: Mark Adler
> -Date: Mon, 28 Mar 2022 18:34:10 -0700
> -Subject: [PATCH] Fix configure issue that discarded provided CC definition.
> -
>
> - configure | 3 +++
> - 1 file changed, 3 insertions(+)
> -
> -diff --git a/configure b/configure
> -index 52ff4a04ea89..3fa3e8618f9c 100755
> a/configure
> -+++ b/configure
> -@@ -174,7 +174,10 @@ if test -z "$CC"; then
> - else
> - cc=${CROSS_PREFIX}cc
> - fi
> -+else
> -+ cc=${CC}
> - fi
> -+
> - cflags=${CFLAGS-"-O3"}
> - # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
> - case "$cc" in
> diff --git
> a/patches/zlib-1.2.12/0002-Fix-a-bug-when-getting-a-gzip-header-extra-field-wit.patch
>
> b/patches/zlib-1.2.12/0002-Fix-a-bug-when-getting-a-gzip-header-extra-field-wit.patch
> deleted file mode 100644
> index e8b36be46..0
> ---
> a/patches/zlib-1.2.12/0002-Fix-a-bug-when-getting-a-gzip-header-extra-field-wit.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From: Mark Adler
> -Date: Sat, 30 Jul 2022 15:51:11 -0700
> -Subject: [PATCH] Fix a bug when getting a gzip header extra field with
> - inflate().
> -
> -If the extra field was larger than the space the user provided with
> -inflateGetHeader(), and if multiple calls of inflate() delivered
> -the extra header data, then there could be a buffer overflow of the
> -provided space. This commit assures that provided space is not
> -exceeded.
>
> - inflate.c | 5 +++--
> - 1 file changed, 3 insertions(+), 2 deletions(-)
> -
> -diff --git a/inflate.c b/inflate.c
> -index 7be8c63662a7..7a728974923a 100644
> a/inflate.c
> -+++ b/inflate.c
> -@@ -763,9 +763,10 @@ int flush;
> - copy = state->length;
> - if (copy > have) copy = have;
> - if (copy) {
> -+len = state->head->extra_len - state->length;
> - if (state->head != Z_NULL &&
> --state->head->extra != Z_NULL) {
> --len = state->head->extra_len - state->length;
> -+state->head->extra != Z_NULL &&
> -+len < state->head->extra_max) {
> - zmemcpy(state->head->extra + len, next,
> - len + copy > state->head->extra_max ?
> - state->head->extra_max - len : copy);
> diff --git
> a/patches/zlib-1.2.12/0003-Fix-extra-field-processing-bug-that-dereferences-NUL.patch
>
> b/patches/zlib-1.2.12/0003-Fix-extra-field-processing-bug-that-dereferences-NUL.patch
> deleted file mode 100644
> index 381c52128..0
> ---
> a/patches/zlib-1.2.12/0003-Fix-extra-field-processing-bug-that-dereferences-NUL.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From: Mark Adler
> -Date: Mon, 8 Aug 2022 10:50:09 -0700
> -Subject: [PATCH] Fix extra field processing bug that dereferences NULL
> - state->head.
> -
> -The recent commit to fix a gzip header extra field processing bug
> -introduced the new bug fixed here.
>
> - inflate.c | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/inflate.c b/inflate.c
> -index 7a728974923a..2a3c4fe98464 100644
> a/inflate.c
> -+++ b/inflate.c
> -@@ -763,10 +763,10 @@ int flush;
> - copy = state->length;
> - if (copy > have) copy = have;
> - if (copy) {
> --len = state->head->extra_len - state->length;
> - if (state->head != Z_NULL &&
>
[ptxdist] [PATCH v3] rules: Replace deprecated _AUTOCONF
From: Ladislav Michl Signed-off-by: Ladislav Michl --- CHANGES: - v2: add a few more previously forgotten rules - v3: add even more rules now result of grep -rPe '_AUTOCONF(?![)_])' looks good and all my configurations build with PTXCONF_SETUP_DEPRECATED_FATAL=y rules/argtable2.make | 3 +- rules/bash.make | 5 +- rules/bc.make| 3 +- rules/binutils.make | 3 +- rules/bridge-utils.make | 2 +- rules/cairomm.make | 3 +- rules/classpath.make | 5 +- rules/daemonize.make | 3 +- rules/dash.make | 3 +- rules/dbench.make| 13 -- rules/diffutils.make | 3 +- rules/eggdbus.make | 3 +- rules/eventlog.make | 3 +- rules/failmalloc.make| 3 +- rules/fcgi.make | 3 +- rules/fftw.make | 3 +- rules/findutils.make | 3 +- rules/frodo.make | 4 +- rules/glibmm.make| 3 +- rules/gnuplot.make | 3 +- rules/grub.make | 21 + rules/gtk-engines.make | 3 +- rules/haserl.make| 3 +- rules/host-eggdbus.make | 3 +- rules/host-genext2fs.make| 5 +- rules/host-gettext.make | 3 +- rules/host-gperf.make| 4 +- rules/host-libgd.make| 3 +- rules/host-libpng.make | 2 +- rules/host-libpthread-stubs.make | 2 +- rules/host-libsigcpp.make| 2 +- rules/host-libusb.make | 3 +- rules/host-libxml2.make | 3 +- rules/host-libxslt.make | 3 +- rules/host-lrzsz.make| 3 +- rules/host-pelts.make| 2 +- rules/host-xorg-app-bdftopcf.make| 2 +- rules/host-xorg-app-mkfontscale.make | 2 +- rules/host-xorg-font-util.make | 2 +- rules/host-xorg-lib-Xau.make | 2 +- rules/host-xorg-lib-fontenc.make | 2 +- rules/host-xorg-lib-xtrans.make | 2 +- rules/ima-evm-utils.make | 4 +- rules/imagemagick.make | 4 +- rules/inotify-tools.make | 3 +- rules/iperf.make | 3 +- rules/iperf3.make| 3 +- rules/jamvm.make | 27 +-- rules/jed.make | 5 +- rules/joe.make | 3 +- rules/kexec-tools.make | 3 +- rules/libassuan.make | 3 +- rules/libcaca.make | 7 ++- rules/libcgi.make| 3 +- rules/libcgicc.make | 3 +- rules/libconfuse.make| 7 +-- rules/libdaemon.make | 3 +- rules/libfsl-vpu.make| 3 +- rules/libftdi.make | 7 +-- rules/libgcrypt.make | 7 +-- rules/libgd.make | 3 +- rules/libgsloop.make | 3 +- rules/libid3tag.make | 3 +- rules/libiodbc.make | 3 +- rules/libksba.make | 3 +- rules/liblist.make | 3 +- rules/liblockfile.make | 3 +- rules/libltdl.make | 5 +- rules/liblzo.make| 3 +- rules/libmad.make| 7 +-- rules/libmemcache.make | 7 +-- rules/libmemcached.make | 15 +++--- rules/libmng.make| 3 +- rules/liboop.make| 3 +- rules/libpthread-stubs.make | 4 +- rules/librn.make | 3 +- rules/librsvg.make | 3 +- rules/libsigcpp.make | 3 +- rules/libsocketcan.make | 3 +- rules/libssh2.make | 4 +- rules/libsysfs.make | 3 +- rules/libucdaemon.make | 3 +- rules/libusb-compat.make | 3 +- rules/libusb.make| 3 +- rules/libxml2.make | 11 +++-- rules/libxmlconfig.make | 3 +- rules/libxslt.make | 5 +- rules/links.make | 11 +++-- rules/lsuio.make | 3 +- rules/ltt-control.make | 3 +- rules/madplay.make | 4 +- rules/memedit.make | 3 +- rules/module-init-tools.make | 3 +- rules/mtr.make
[ptxdist] [PATCH v2] mmc-utils: add license files
Newly added README file clearly states that license is GPL-2.0-only. 3rdparty hmac_sha2 has a dual BSD and GPLv2 license when distributed with mmc-utils. Add README, mmc.c and 3rdparty/hmac_sha/sha2.h license header as license files. Signed-off-by: Bruno Thomsen --- rules/mmc-utils.make | 4 1 file changed, 4 insertions(+) diff --git a/rules/mmc-utils.make b/rules/mmc-utils.make index a5045b079..9a43c148b 100644 --- a/rules/mmc-utils.make +++ b/rules/mmc-utils.make @@ -23,6 +23,10 @@ MMC_UTILS_URL:= https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git;tag=$(M MMC_UTILS_SOURCE := $(SRCDIR)/$(MMC_UTILS).$(MMC_UTILS_SUFFIX) MMC_UTILS_DIR := $(BUILDDIR)/$(MMC_UTILS) MMC_UTILS_LICENSE := GPL-2.0-only AND BSD-3-Clause +MMC_UTILS_LICENSE_FILES := \ + file://README;startline=28;endline=31;md5=73e5e3ce638b21eca6e204e260201d4a \ + file://mmc.c;startline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d \ + file://3rdparty/hmac_sha/sha2.h;startline=1;endline=36;md5=6ce341e87c5fcac36e417f4a0e283afd # # Prepare base-commit: 8b46f8923ebfeb2bd1ead374035255df1df26f85 -- 2.37.3
[ptxdist] [RFC] ptxd_make_world_common: optionally bailout on deprecated variable use
From: Ladislav Michl
Signed-off-by: Ladislav Michl
---
This is aimed as helper for those willing to remove deprecated
variables.
Most of them are gone now, but a few _ENV is still there.
You may use (regexp provided by Uwe Kleine-König)
grep -rPe '(?_${depname[i]}: ${var}=\"${val}\""
echo
+
+ if [ "${PTXCONF_SETUP_DEPRECATED_FATAL}" = "y" ]; then
+ ptxd_bailout "${FUNCNAME}: deprecated variable _${depname[i]}
detected!"
+ fi
done
}
--
2.32.0
[ptxdist] [PATCH] rules: Replace deprecated _BUILDDIR
From: Ladislav Michl Signed-off-by: Ladislav Michl --- rules/db.make | 4 ++-- rules/tf-a.make | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/db.make b/rules/db.make index 1fce58623..2872a1c02 100644 --- a/rules/db.make +++ b/rules/db.make @@ -25,7 +25,7 @@ DB_URL:= http://download.oracle.com/berkeley-db/$(DB).$(DB_SUFFIX) DB_SOURCE := $(SRCDIR)/$(DB).$(DB_SUFFIX) DB_DIR := $(BUILDDIR)/$(DB) DB_SUBDIR := dist -DB_BUILDDIR:= $(DB_DIR)/build_unix +DB_BUILD_DIR := $(DB_DIR)/build_unix DB_LICENCE := Sleepycat # @@ -35,7 +35,7 @@ DB_LICENCE:= Sleepycat # # autoconf # -DB_CONF_TOOL := autoconf +DB_CONF_TOOL := autoconf DB_CONF_OPT:= \ $(CROSS_AUTOCONF_USR) \ --disable-smallbuild \ diff --git a/rules/tf-a.make b/rules/tf-a.make index 561af0d39..0a9c0179c 100644 --- a/rules/tf-a.make +++ b/rules/tf-a.make @@ -22,7 +22,7 @@ TF_A_SUFFIX := tar.gz TF_A_URL := $(call remove_quotes, $(PTXCONF_TF_A_URL))/$(TF_A_VERSION).$(TF_A_SUFFIX) TF_A_SOURCE:= $(SRCDIR)/$(TF_A).$(TF_A_SUFFIX) TF_A_DIR := $(BUILDDIR)/$(TF_A) -TF_A_BUILDDIR := $(TF_A_DIR)/build +TF_A_BUILD_DIR := $(TF_A_DIR)/build TF_A_BUILD_OOT := YES TF_A_LICENSE := BSD-3-Clause AND BSD-2-Clause \ AND (GPL-2.0-or-later OR BSD-2-Clause) \ -- 2.32.0
[ptxdist] [PATCH] rules: Replace deprecated _COMPILE_ENV
From: Ladislav Michl Signed-off-by: Ladislav Michl --- rules/host-nodejs.make | 2 +- rules/libpcap.make | 2 +- rules/pcmciautils.make | 2 +- rules/poppler.make | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/host-nodejs.make b/rules/host-nodejs.make index 6da85be2c..2bf5f7971 100644 --- a/rules/host-nodejs.make +++ b/rules/host-nodejs.make @@ -13,7 +13,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_NODEJS) += host-nodejs # Always run the preprocessor locally. -HOST_NODEJS_COMPILE_ENV:= \ +HOST_NODEJS_MAKE_ENV := \ ICECC_REMOTE_CPP=0 # diff --git a/rules/libpcap.make b/rules/libpcap.make index ae7292fed..1d51449ae 100644 --- a/rules/libpcap.make +++ b/rules/libpcap.make @@ -31,7 +31,7 @@ LIBPCAP_CONF_ENV := \ $(CROSS_ENV) \ ac_cv_lbl_hci_channel_monitor_is_defined=no -LIBPCAP_COMPILE_ENV := \ +LIBPCAP_MAKE_ENV := \ $(CROSS_ENV_CFLAGS) \ $(CROSS_ENV_CPPFLAGS) \ $(CROSS_ENV_LDFLAGS) \ diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make index 6dc358c89..e9328a589 100644 --- a/rules/pcmciautils.make +++ b/rules/pcmciautils.make @@ -27,7 +27,7 @@ PCMCIAUTILS_DIR := $(BUILDDIR)/$(PCMCIAUTILS) # Prepare # -PCMCIAUTILS_COMPILE_ENV := \ +PCMCIAUTILS_MAKE_ENV := \ $(CROSS_ENV_CFLAGS) \ $(CROSS_ENV_CPPFLAGS) \ $(CROSS_ENV_LDFLAGS) diff --git a/rules/poppler.make b/rules/poppler.make index d56e2601b..9679ccc65 100644 --- a/rules/poppler.make +++ b/rules/poppler.make @@ -78,7 +78,7 @@ POPPLER_CONF_OPT := \ -DWITH_TIFF=$(call ptx/onoff,PTXCONF_POPPLER_TIFF) ifdef PTXCONF_POPPLER_QT5 -POPPLER_COMPILE_ENV := \ +POPPLER_MAKE_ENV := \ ICECC_REMOTE_CPP=0 endif -- 2.32.0
[ptxdist] [PATCH] rules: Replace deprecated _MAKEVARS
From: Ladislav Michl Signed-off-by: Ladislav Michl --- rules/ckermit.make | 2 +- rules/etherwake.make | 2 +- rules/gdb.make | 2 +- rules/host-libaio.make | 2 +- rules/killproc.make | 2 +- rules/libcgi.make| 2 +- rules/liblockfile.make | 2 +- rules/lpc21isp.make | 2 -- rules/module-init-tools.make | 2 +- rules/netcat.make| 2 -- rules/pcmciautils.make | 2 +- rules/pv.make| 2 +- rules/wireless.make | 2 +- 13 files changed, 11 insertions(+), 15 deletions(-) diff --git a/rules/ckermit.make b/rules/ckermit.make index e983803c1..2a6f08528 100644 --- a/rules/ckermit.make +++ b/rules/ckermit.make @@ -35,7 +35,7 @@ CKERMIT_CONF_TOOL := NO # Compile # -CKERMIT_MAKEVARS := \ +CKERMIT_MAKE_OPT := \ xermit \ KTARGET=linuxa \ prefix=/usr \ diff --git a/rules/etherwake.make b/rules/etherwake.make index 8ae6fd734..b5eb9eaf4 100644 --- a/rules/etherwake.make +++ b/rules/etherwake.make @@ -29,7 +29,7 @@ ETHERWAKE_LICENSE := GPL # Prepare # -ETHERWAKE_MAKEVARS := CC=$(CROSS_CC) +ETHERWAKE_MAKE_OPT := CC=$(CROSS_CC) # # Target-Install diff --git a/rules/gdb.make b/rules/gdb.make index 8d2c7ffdb..1eef9beb2 100644 --- a/rules/gdb.make +++ b/rules/gdb.make @@ -54,7 +54,7 @@ GDB_CONF_ENV := \ host_configargs='$(GDB_CONF_OPT_HOST)' ifndef PTXCONF_GDB_SHARED -GDB_MAKEVARS := LDFLAGS=-static +GDB_MAKE_OPT := LDFLAGS=-static endif # diff --git a/rules/host-libaio.make b/rules/host-libaio.make index 4c428e477..251a4e68a 100644 --- a/rules/host-libaio.make +++ b/rules/host-libaio.make @@ -17,6 +17,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBAIO) += host-libaio HOST_LIBAIO_CONF_TOOL := NO HOST_LIBAIO_MAKE_ENV := $(HOST_ENV) -HOST_LIBAIO_MAKEVARS := prefix= +HOST_LIBAIO_MAKE_OPT := prefix= # vim: syntax=make diff --git a/rules/killproc.make b/rules/killproc.make index 196d2a45c..17c649569 100644 --- a/rules/killproc.make +++ b/rules/killproc.make @@ -28,7 +28,7 @@ KILLPROC_LICENSE := GPL-2.0-only # Prepare # -KILLPROC_MAKEVARS := \ +KILLPROC_MAKE_OPT := \ CC=$(CROSS_CC) \ SBINDIR=$(KILLPROC_PKGDIR)/usr/sbin \ UBINDIR=$(KILLPROC_PKGDIR)/usr/bin \ diff --git a/rules/libcgi.make b/rules/libcgi.make index eb9d704d2..f761ebaed 100644 --- a/rules/libcgi.make +++ b/rules/libcgi.make @@ -34,7 +34,7 @@ LIBCGI_LICENSE:= LGPL-2.1-only LIBCGI_CONF_TOOL := autoconf LIBCGI_CONF_OPT := $(CROSS_AUTOCONF_USR) -LIBCGI_MAKEVARS:= $(CROSS_ENV_CC) $(CROSS_ENV_AR) +LIBCGI_MAKE_OPT:= $(CROSS_ENV_CC) $(CROSS_ENV_AR) # # Target-Install diff --git a/rules/liblockfile.make b/rules/liblockfile.make index 0022c3320..20213203b 100644 --- a/rules/liblockfile.make +++ b/rules/liblockfile.make @@ -30,7 +30,7 @@ LIBLOCKFILE_LICENSE_FILES := file://COPYRIGHT;md5=35127b30003a121544b5d13a2ac868 # Prepare # -LIBLOCKFILE_MAKEVARS := ROOT=$(PKGDIR)/$(LIBLOCKFILE) $(CROSS_ENV_AR) +LIBLOCKFILE_MAKE_OPT := ROOT=$(PKGDIR)/$(LIBLOCKFILE) $(CROSS_ENV_AR) # # autoconf diff --git a/rules/lpc21isp.make b/rules/lpc21isp.make index f18ad84ee..25d229080 100644 --- a/rules/lpc21isp.make +++ b/rules/lpc21isp.make @@ -29,8 +29,6 @@ LPC21ISP_LICENSE := GPL-3.0-or-later # LPC21ISP_CONF_TOOL := NO -LPC21ISP_MAKE_ENV := $(CROSS_ENV) -LPC21ISP_MAKEVARS := $(CROSS_ENV) # # Install diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make index eb8811b24..34e193a5d 100644 --- a/rules/module-init-tools.make +++ b/rules/module-init-tools.make @@ -28,7 +28,7 @@ MODULE_INIT_TOOLS_LICENSE := GPL-2.0-only # Prepare # -MODULE_INIT_TOOLS_MAKEVARS := MAN5="" MAN8="" +MODULE_INIT_TOOLS_MAKE_OPT := MAN5="" MAN8="" # # autoconf diff --git a/rules/netcat.make b/rules/netcat.make index 7dd209f61..6e5d046f6 100644 --- a/rules/netcat.make +++ b/rules/netcat.make @@ -29,8 +29,6 @@ NETCAT_LICENSE:= BSD # NETCAT_CONF_TOOL := NO -NETCAT_MAKEVARS:= \ - $(CROSS_ENV) # # Install diff --git a/rules/pcmciautils.ma
[ptxdist] [PATCH] proftpd: Use ptx/endis to enable options
From: Ladislav Michl Remove some ifdefs and replace deprecated variables while there. Signed-off-by: Ladislav Michl --- rules/proftpd.make | 35 --- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/rules/proftpd.make b/rules/proftpd.make index 6554dced7..889a9fef8 100644 --- a/rules/proftpd.make +++ b/rules/proftpd.make @@ -27,39 +27,20 @@ PROFTPD_DIR := $(BUILDDIR)/$(PROFTPD) # Prepare # -PROFTPD_COMPILE_ENV:= $(CROSS_ENV_CC_FOR_BUILD) +PROFTPD_MAKE_ENV := $(CROSS_ENV_CC_FOR_BUILD) # # autoconf # -PROFTPD_AUTOCONF := \ +PROFTPD_CONF_TOOL := autoconf +PROFTPD_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ $(GLOBAL_IPV6_OPTION) \ - --disable-cap - -ifdef PTXCONF_PROFTPD_PAM -PROFTPD_AUTOCONF += --enable-auth-pam -else -PROFTPD_AUTOCONF += --disable-auth-pam -endif - -ifdef PTXCONF_PROFTPD_SENDFILE -PROFTPD_AUTOCONF += --enable-sendfile -else -PROFTPD_AUTOCONF += --disable-sendfile -endif - -ifdef PTXCONF_PROFTPD_SHADOW -PROFTPD_AUTOCONF += --enable-shadow -else -PROFTPD_AUTOCONF += --disable-shadow -endif - -ifdef PTXCONF_PROFTPD_AUTOSHADOW -PROFTPD_AUTOCONF += --enable-autoshadow -else -PROFTPD_AUTOCONF += --disable-autoshadow -endif + --disable-cap \ + --$(call ptx/endis, PTXCONF_PROFTPD_PAM)-auth-pam \ + --$(call ptx/endis, PTXCONF_PROFTPD_SENDFILE)-sendfile \ + --$(call ptx/endis, PTXCONF_PROFTPD_SHADOW)-shadow \ + --$(call ptx/endis, PTXCONF_PROFTPD_AUTOSHADOW)-autoshadow PROFTPD_MAKE_PAR := NO -- 2.32.0
[ptxdist] [PATCH v2] rules: Replace deprecated _AUTOCONF
From: Ladislav Michl Signed-off-by: Ladislav Michl --- CHANGES: - v2: add a few more previously forgotten rules rules/argtable2.make | 3 +- rules/bash.make | 5 +- rules/bc.make| 3 +- rules/binutils.make | 3 +- rules/bridge-utils.make | 2 +- rules/cairomm.make | 3 +- rules/classpath.make | 5 +- rules/daemonize.make | 3 +- rules/dash.make | 3 +- rules/dbench.make| 13 -- rules/diffutils.make | 3 +- rules/eggdbus.make | 3 +- rules/eventlog.make | 3 +- rules/failmalloc.make| 3 +- rules/fcgi.make | 3 +- rules/fftw.make | 3 +- rules/findutils.make | 3 +- rules/frodo.make | 4 +- rules/glibmm.make| 3 +- rules/gnuplot.make | 3 +- rules/grub.make | 21 + rules/gtk-engines.make | 3 +- rules/haserl.make| 3 +- rules/host-eggdbus.make | 3 +- rules/host-genext2fs.make| 5 +- rules/host-gettext.make | 3 +- rules/host-libgd.make| 3 +- rules/host-libusb.make | 3 +- rules/host-libxml2.make | 3 +- rules/host-libxslt.make | 3 +- rules/host-lrzsz.make| 3 +- rules/ima-evm-utils.make | 4 +- rules/imagemagick.make | 4 +- rules/inotify-tools.make | 3 +- rules/iperf.make | 3 +- rules/iperf3.make| 3 +- rules/jamvm.make | 27 +-- rules/jed.make | 5 +- rules/joe.make | 3 +- rules/kexec-tools.make | 3 +- rules/libassuan.make | 3 +- rules/libcaca.make | 7 ++- rules/libcgi.make| 3 +- rules/libcgicc.make | 3 +- rules/libconfuse.make| 7 +-- rules/libdaemon.make | 3 +- rules/libfsl-vpu.make| 3 +- rules/libftdi.make | 7 +-- rules/libgcrypt.make | 7 +-- rules/libgd.make | 3 +- rules/libgsloop.make | 3 +- rules/libid3tag.make | 3 +- rules/libiodbc.make | 3 +- rules/libksba.make | 3 +- rules/liblist.make | 3 +- rules/libltdl.make | 5 +- rules/liblzo.make| 3 +- rules/libmad.make| 7 +-- rules/libmemcache.make | 7 +-- rules/libmemcached.make | 15 +++--- rules/libmng.make| 3 +- rules/liboop.make| 3 +- rules/libpthread-stubs.make | 4 +- rules/librn.make | 3 +- rules/librsvg.make | 3 +- rules/libsigcpp.make | 3 +- rules/libsocketcan.make | 3 +- rules/libssh2.make | 4 +- rules/libsysfs.make | 3 +- rules/libucdaemon.make | 3 +- rules/libusb-compat.make | 3 +- rules/libusb.make| 3 +- rules/libxml2.make | 11 +++-- rules/libxmlconfig.make | 3 +- rules/libxslt.make | 5 +- rules/links.make | 11 +++-- rules/lsuio.make | 3 +- rules/ltt-control.make | 3 +- rules/madplay.make | 4 +- rules/memedit.make | 3 +- rules/module-init-tools.make | 3 +- rules/mtr.make | 3 +- rules/net-snmp.make | 7 +-- rules/netkit-ftp.make| 3 +- rules/npth.make | 3 +- rules/pangomm.make | 3 +- rules/pelts_tests.make | 3 +- rules/php8.make | 3 +- rules/pop3spam.make | 3 +- rules/prelink.make | 3 +- rules/ps3-utils.make | 3 +- rules/pureftpd.make | 3 +- rules/pv.make| 3 +- rules/quota-tools.make | 3 +- rules/readline.make | 3 +- rules/rsync.make | 7 +-- rules/rsync3.make|
Re: [ptxdist] [PATCH 1/3] rules: Remove default assignments to _PATH and _ENV
On Tue, Oct 18, 2022 at 09:48:34AM +0200, Michael Olbrich wrote: > On Mon, Oct 17, 2022 at 09:59:04PM +0200, Ladislav Michl wrote: > > From: Ladislav Michl > > > > Undefined _PATH is set to PATH=$(CROSS_PATH) for target packages, > > PATH=$(HOST_PATH) for host packages and PATH=$(HOST_CROSS_PATH) for > > cross packages. > > > > Undefined _ENV is set to $(CROSS_ENV) for target packages, > > $(HOST_ENV) for host packages and $(HOST_CROSS_ENV) for cross > > packages. > > Hmmm, _ENV is also used in the install stage and it has no default > here. But it's not used in the compile stage. In general I think those two > stages should have the default environment. So if this breaks something, > then it was probably somewhat broken anyways. > I'll throw in in my 'build everything' test. Let's see what happens here. Thank you, it was meant as preparation for _AUTOCONF removal patch where _CONF_ENV is used when needed. _AUTOCONF and _ENV are two heavily used deprecated variables. There are few _MAKEVARS and _COMPILE_ENV left. I can prepare patch to replace them, so we can bail out with error after some transitional period. l. > Michael
Re: [ptxdist] [PATCH 1/3] rules: Remove default assignments to _PATH and _ENV
On Mon, Oct 17, 2022 at 09:59:04PM +0200, Ladislav Michl wrote: > From: Ladislav Michl > > Undefined _PATH is set to PATH=$(CROSS_PATH) for target packages, > PATH=$(HOST_PATH) for host packages and PATH=$(HOST_CROSS_PATH) for > cross packages. > > Undefined _ENV is set to $(CROSS_ENV) for target packages, > $(HOST_ENV) for host packages and $(HOST_CROSS_ENV) for cross > packages. Hmmm, _ENV is also used in the install stage and it has no default here. But it's not used in the compile stage. In general I think those two stages should have the default environment. So if this breaks something, then it was probably somewhat broken anyways. I'll throw in in my 'build everything' test. Let's see what happens here. Michael > Remove those default assignments. > > Signed-off-by: Ladislav Michl > --- > rules/argtable2.make | 3 --- > rules/bash.make | 1 - > rules/bc.make| 3 --- > rules/boost.make | 1 - > rules/bustle.make| 1 - > rules/cairomm.make | 3 --- > rules/calibrator.make| 1 - > rules/classpath.make | 1 - > rules/daemonize.make | 3 --- > rules/dash.make | 3 --- > rules/dbench.make| 1 - > rules/diffutils.make | 3 --- > rules/efax.make | 1 - > rules/etherwake.make | 3 --- > rules/eventlog.make | 3 --- > rules/failmalloc.make| 3 --- > rules/fbtest.make| 1 - > rules/fbutils.make | 1 - > rules/fftw.make | 3 --- > rules/findutils.make | 2 -- > rules/frodo.make | 1 - > rules/glibmm.make| 3 --- > rules/gnuplot.make | 3 --- > rules/grub.make | 2 -- > rules/haserl.make| 3 --- > rules/heirloom-mailx.make| 1 - > rules/host-libgd.make| 3 --- > rules/host-libpng.make | 3 --- > rules/host-libpthread-stubs.make | 3 --- > rules/host-libsigcpp.make| 3 --- > rules/host-libxml2.make | 3 --- > rules/host-libxslt.make | 3 --- > rules/host-pelts.make| 3 --- > rules/host-tz-database.make | 1 - > rules/host-xorg-app-bdftopcf.make| 3 --- > rules/host-xorg-app-mkfontscale.make | 3 --- > rules/host-xorg-font-util.make | 3 --- > rules/host-xorg-lib-Xfont.make | 3 --- > rules/host-xorg-lib-fontenc.make | 3 --- > rules/host-xorg-lib-xtrans.make | 3 --- > rules/hpanel.make| 1 - > rules/hping.make | 1 - > rules/hwdata.make| 3 --- > rules/inotify-tools.make | 3 --- > rules/iperf.make | 3 --- > rules/jamvm.make | 3 --- > rules/jed.make | 1 - > rules/joe.make | 3 --- > rules/kernel-header.make | 2 -- > rules/killproc.make | 3 --- > rules/krb5.make | 1 - > rules/libcaca.make | 1 - > rules/libcgi.make| 3 --- > rules/libcgicc.make | 3 --- > rules/libconfuse.make| 3 --- > rules/libdaemon.make | 3 --- > rules/libftdi.make | 3 --- > rules/libgd.make | 3 --- > rules/libgsloop.make | 3 --- > rules/libid3tag.make | 3 --- > rules/libiodbc.make | 2 -- > rules/liblist.make | 3 --- > rules/liblockfile.make | 2 -- > rules/libltdl.make | 1 - > rules/liblzo.make| 3 --- > rules/libmad.make| 3 --- > rules/libmng.make| 3 --- > rules/libpthread-stubs.make | 3 --- > rules/librn.make | 3 --- > rules/librsvg.make | 3 --- > rules/libsigcpp.make | 3 --- > rules/libssh2.make | 3 --- > rules/libsysfs.make | 3 --- > rules/libucdaemon.make | 3 --- > rules/libusb-compat.make | 3 --- > rules/libxml2.make | 3 --- > rules/libxmlconfig.make | 3 --- > rules/links.make | 3 --- > rules/lsuio.make | 3 --- > rules/ltt-control.make | 3 --- > rules/madplay.make | 3 --- > rules/memedit.
Re: [ptxdist] [PATCH v4 1/1] libcamera: new package
Hi.
Seems libcamera is now available as a released version.
https://www.phoronix.com/news/libcamera-First-Release
Regards,
Christian
On 9/17/22 8:33 PM, Matthias Fend wrote:
libcamera is an open source camera stack and framework for Linux, Android,
and ChromeOS.
Signed-off-by: Matthias Fend
---
...t-information-for-version-generation.patch | 29
.../libcamera-2022-08-30-g68683d3811a8/series | 4 +
rules/libcamera.in| 129
rules/libcamera.make | 143 ++
4 files changed, 305 insertions(+)
create mode 100644
patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
create mode 100644 patches/libcamera-2022-08-30-g68683d3811a8/series
create mode 100644 rules/libcamera.in
create mode 100644 rules/libcamera.make
diff --git
a/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
b/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
new file mode 100644
index 0..3e5c5ce68
--- /dev/null
+++
b/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
@@ -0,0 +1,29 @@
+From: Matthias Fend
+Date: Wed, 31 Aug 2022 16:54:20 +0200
+Subject: [PATCH] do not use git information for version generation
+
+Since libcamera is checked out without a git repo, git version reports the
+version of the BSP. Since this is obviously wrong, just use the project
+version.
+
+Signed-off-by: Matthias Fend
+---
+ meson.build | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 72919102ad55..e333df59388d 100644
+--- a/meson.build
b/meson.build
+@@ -20,9 +20,8 @@ libcamera_git_version = run_command('utils/gen-version.sh',
+ meson.project_build_root(),
+ meson.project_source_root(),
+ check: false).stdout().strip()
+-if libcamera_git_version == ''
+-libcamera_git_version = meson.project_version()
+-endif
++
++libcamera_git_version = meson.project_version()
+
+ libcamera_version = libcamera_git_version.split('+')[0]
+
diff --git a/patches/libcamera-2022-08-30-g68683d3811a8/series
b/patches/libcamera-2022-08-30-g68683d3811a8/series
new file mode 100644
index 0..6ca42eafc
--- /dev/null
+++ b/patches/libcamera-2022-08-30-g68683d3811a8/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-do-not-use-git-information-for-version-generation.patch
+# c3a57143ea9764ab95b84a7fb79896f4 - git-ptx-patches magic
diff --git a/rules/libcamera.in b/rules/libcamera.in
new file mode 100644
index 0..1f2d70aad
--- /dev/null
+++ b/rules/libcamera.in
@@ -0,0 +1,129 @@
+## SECTION=multimedia_libs
+
+menuconfig LIBCAMERA
+ bool
+ select HOST_MESON
+ select HOST_SYSTEM_PYTHON3
+ select HOST_SYSTEM_PYTHON3_JINJA2
+ select HOST_SYSTEM_PYTHON3_PYYAML
+ select HOST_SYSTEM_PYTHON3_PLY
+ select HOST_OPENSSL
+ select GNUTLS if
LIBCAMERA_IPA_MODULE_SIGN_GNUTLS
+ select OPENSSL if
LIBCAMERA_IPA_MODULE_SIGN_OPENSSL
+ select UDEV_LIBUDEV
+ select LIBYAML
+ select LIBUNWINDif LIBCAMERA_BACKTRACE
+ select GSTREAMER1 if LIBCAMERA_GSTREAMER
+ select GST_PLUGINS_BASE1if LIBCAMERA_GSTREAMER
+ select LIBEVENT if LIBCAMERA_CAM
+ select LIBDRM if LIBCAMERA_CAM_KMS_SINK
+ select QT5 if LIBCAMERA_QCAM
+ select QT5_MODULE_QTBASEif LIBCAMERA_QCAM
+ select QT5_MODULE_QTBASE_GUIif LIBCAMERA_QCAM
+ select QT5_MODULE_QTBASE_WIDGETSif LIBCAMERA_QCAM
+ prompt "libcamera "
+ help
+ A complex camera support library for Linux, Android, and ChromeOS.
+
+if LIBCAMERA
+
+config LIBCAMERA_GSTREAMER
+ bool
+ prompt "Install GStreamer plugin"
+
+config LIBCAMERA_CAM
+ bool
+ prompt "Install cam test application"
+
+if LIBCAMERA_CAM
+
+config LIBCAMERA_CAM_KMS_SINK
+ bool
+ prompt "Enable KMS sink"
+endif
+
+config LIBCAMERA_QCAM
+ bool
+ prompt "Install qcam test application"
+
+config LIBCAMERA_BACKTRACE
+ bool
+ prompt "Add support for backtraces"
+
+menu "Platforms"
+
+config LIBCAMERA_PIPELINE_IPU3
+ bool
+ prompt "ipu3 pipeline"
+
+config LIBCAMERA_IPA_IPU3
+ bool
+ default y
+ prompt "ipu3 IPA"
+ depends on LIBCAMERA_PIPELINE_IPU3
+
+config LIBCAMERA_PIPELINE_RASPBERRYPI
+ bool
+ prompt "raspberrypi pipeline"
+
+config LIBCAMERA_IPA_RASPBERRYPI
+ bool
+ default
Re: [ptxdist] [PATCH v2 3/3] util-linux-ng: Rename to util-linux
On Tue, Oct 18, 2022 at 07:52:18AM +0200, Ladislav Michl wrote: > Hi Michael, > > On Thu, Sep 29, 2022 at 07:54:38PM +0200, Ladislav Michl wrote: > > diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx > > index caee22fdd..7779c2937 100755 > > --- a/scripts/migrate/migrate_ptx > > +++ b/scripts/migrate/migrate_ptx > > @@ -453,3 +453,10 @@ s/^\(\(# \)\?PTXCONF_LIBTHEORA_\)_/\1/ > > # reason : upstream lighttpd module mod_compress was replaced by > > mod_deflate > > # > > s/^\(\(# \)\?PTXCONF_LIGHTTPD_MOD_\)COMPRESS\>/\1DEFLATE/ > > + > > +# from : ptxdist-2022.09.0 > > +# to : ptxdist-2022.10.0 > > This should now read: > # from : ptxdist-2022.10.0 > # to : ptxdist-2022.11.0 > > Will you fixup while applying or is there a need for v3? I'll do the fixup. Michael > > +# symbol : UTIL_LINUX_NG* -> UTIL_LINUX* > > +# reason : upstream util-linux-ng fork was renamed back to util-linux over > > a decade ago > > +# > > +s/^\(\(# \)\?PTXCONF_UTIL_LINUX\)_NG/\1/ > > -- > > 2.32.0 > > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
