[Buildroot] [PATCH v1] package/webkitgtk: bump to 2.44.3

[Buildroot] [PATCH v1] package/webkitgtk: bump to 2.44.3

[Thomas Devoogdt]

Bugfix release with many security fixes, including (but not limited to)
patches for CVE-2024-40776, CVE-2024-40779, CVE-2024-40780, CVE-2024-40782,
CVE-2024-40789, and CVE-2024-4558.

Release notes:

  https://webkitgtk.org/2024/08/13/webkitgtk2.44.3-released.html.

Accompanying security advisory:

  https://webkitgtk.org/security/WSA-2024-0004.html

Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
---
 package/webkitgtk/webkitgtk.hash | 6 +++---
 package/webkitgtk/webkitgtk.mk   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash
index 7da0e97e5d..b81a4c2793 100644
--- a/package/webkitgtk/webkitgtk.hash
+++ b/package/webkitgtk/webkitgtk.hash
@@ -1,6 +1,6 @@
-# From https://www.webkitgtk.org/releases/webkitgtk-2.44.2.tar.xz.sums
-sha1  e62b2c545011a2f180a914529a68950c4d34a2ee  webkitgtk-2.44.2.tar.xz
-sha256  523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b  webkitgtk-2.44.2.tar.xz
+# From https://www.webkitgtk.org/releases/webkitgtk-2.44.3.tar.xz.sums
+sha1  c9bcb2097d8f774b2c64ca650a4f8a6365ff54f6  webkitgtk-2.44.3.tar.xz
+sha256  dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54  webkitgtk-2.44.3.tar.xz
 
 # Hashes for license files:
 sha256  0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4  Source/WebCore/LICENSE-APPLE
diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
index 5115f3eec5..ff39ee01e1 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WEBKITGTK_VERSION = 2.44.2
+WEBKITGTK_VERSION = 2.44.3
 WEBKITGTK_SITE = https://www.webkitgtk.org/releases
 WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
 WEBKITGTK_INSTALL_STAGING = YES
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1] package/webkitgtk: bump to 2.44.3

[Adrian Perez de Castro]

[-- Attachment #1.1: Type: text/plain, Size: 1293 bytes --]

Hi Thomas,

Thanks for working on this update. There is one issue that needs
addressing, though...

On Sat, 31 Aug 2024 14:07:07 +0200 Thomas Devoogdt <thomas@devoogdt.com> wrote:

> Bugfix release with many security fixes, including (but not limited to)
> patches for CVE-2024-40776, CVE-2024-40779, CVE-2024-40780, CVE-2024-40782,
> CVE-2024-40789, and CVE-2024-4558.
> 
> Release notes:
> 
>   https://webkitgtk.org/2024/08/13/webkitgtk2.44.3-released.html.

Alongside with the announcement, we found a couple of issues that need
importing a couple of patches, both of which are already present in the
webkitglib/2.44 release branch. I sent an e-mail to let packagers know a
couple of weeks ago:

  https://lists.webkit.org/pipermail/webkit-gtk/2024-August/004002.html

The two patches you would need to add are these:

  https://github.com/WebKit/WebKit/commit/9140ce712aa87091613874d802787ab476be0e39
  https://github.com/WebKit/WebKit/commit/4854b944b345990e4100319662777856fe8ea4aa

Otherwise, changes LGTM.

Also, another tidbit: I am planning to release 2.44.4 next week, which
will be the last version from the series, and in a few weeks more we
are planning to release 2.46.0 as well -- just a heads up in case it may
be preferable to wait until either version.

Cheers,
—Adrián

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1] package/webkitgtk: bump to 2.44.3

[Thomas Petazzoni via buildroot]

Hello Adrian,

On Sun, 1 Sep 2024 17:13:38 +0300
Adrian Perez de Castro <aperez@igalia.com> wrote:

> Alongside with the announcement, we found a couple of issues that need
> importing a couple of patches, both of which are already present in the
> webkitglib/2.44 release branch. I sent an e-mail to let packagers know a
> couple of weeks ago:
> 
>   https://lists.webkit.org/pipermail/webkit-gtk/2024-August/004002.html
> 
> The two patches you would need to add are these:
> 
>   https://github.com/WebKit/WebKit/commit/9140ce712aa87091613874d802787ab476be0e39
>   https://github.com/WebKit/WebKit/commit/4854b944b345990e4100319662777856fe8ea4aa

Thanks for the heads up. I think the second patch isn't strictly needed
in our case, because we don't support building with Clang.

> Also, another tidbit: I am planning to release 2.44.4 next week, which
> will be the last version from the series, and in a few weeks more we
> are planning to release 2.46.0 as well -- just a heads up in case it may
> be preferable to wait until either version.

Let's update to 2.44.4 when it's available then!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v2] package/webkitgtk: bump to 2.44.4

[Thomas Devoogdt]

Bugfix release with many security fixes, including (but not limited to)
patches for CVE-2024-40776, CVE-2024-40779, CVE-2024-40780, CVE-2024-40782,
CVE-2024-40789, and CVE-2024-4558.

Release notes:

  https://webkitgtk.org/2024/08/13/webkitgtk2.44.3-released.html
  https://www.webkitgtk.org/release/webkitgtk-2.44.4.html

Accompanying security advisory:

  https://webkitgtk.org/security/WSA-2024-0004.html

Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
---
v2: bump to 2.44.4 iso 2.44.3
---
 package/webkitgtk/webkitgtk.hash | 6 +++---
 package/webkitgtk/webkitgtk.mk   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash
index 7da0e97e5d..49f758d6a8 100644
--- a/package/webkitgtk/webkitgtk.hash
+++ b/package/webkitgtk/webkitgtk.hash
@@ -1,6 +1,6 @@
-# From https://www.webkitgtk.org/releases/webkitgtk-2.44.2.tar.xz.sums
-sha1  e62b2c545011a2f180a914529a68950c4d34a2ee  webkitgtk-2.44.2.tar.xz
-sha256  523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b  webkitgtk-2.44.2.tar.xz
+# From https://www.webkitgtk.org/releases/webkitgtk-2.44.4.tar.xz.sums
+sha1  3699ff9c9b84e755a0736e72dfd6e5a13151f7d6  webkitgtk-2.44.4.tar.xz
+sha256  2ce4ec1b78413035037aba8326b31ed72696626b7bea7bace5e46ac0d8cbe796  webkitgtk-2.44.4.tar.xz
 
 # Hashes for license files:
 sha256  0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4  Source/WebCore/LICENSE-APPLE
diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
index 5ecc1d1d09..a5bb81c3fa 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WEBKITGTK_VERSION = 2.44.2
+WEBKITGTK_VERSION = 2.44.4
 WEBKITGTK_SITE = https://www.webkitgtk.org/releases
 WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
 WEBKITGTK_INSTALL_STAGING = YES
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 1/2] package/webkitgtk: bump to 2.44.4

[Thomas Devoogdt]

Bugfix release with many security fixes, including (but not limited to)
patches for CVE-2024-40776, CVE-2024-40779, CVE-2024-40780, CVE-2024-40782,
CVE-2024-40789, and CVE-2024-4558.

Release notes:

  https://webkitgtk.org/2024/08/13/webkitgtk2.44.3-released.html
  https://www.webkitgtk.org/release/webkitgtk-2.44.4.html

Accompanying security advisory:

  https://webkitgtk.org/security/WSA-2024-0004.html

Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
---
v2: bump to 2.44.4 iso 2.44.3
v3: no change
---
 package/webkitgtk/webkitgtk.hash | 6 +++---
 package/webkitgtk/webkitgtk.mk   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash
index 7da0e97e5d..49f758d6a8 100644
--- a/package/webkitgtk/webkitgtk.hash
+++ b/package/webkitgtk/webkitgtk.hash
@@ -1,6 +1,6 @@
-# From https://www.webkitgtk.org/releases/webkitgtk-2.44.2.tar.xz.sums
-sha1  e62b2c545011a2f180a914529a68950c4d34a2ee  webkitgtk-2.44.2.tar.xz
-sha256  523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b  webkitgtk-2.44.2.tar.xz
+# From https://www.webkitgtk.org/releases/webkitgtk-2.44.4.tar.xz.sums
+sha1  3699ff9c9b84e755a0736e72dfd6e5a13151f7d6  webkitgtk-2.44.4.tar.xz
+sha256  2ce4ec1b78413035037aba8326b31ed72696626b7bea7bace5e46ac0d8cbe796  webkitgtk-2.44.4.tar.xz
 
 # Hashes for license files:
 sha256  0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4  Source/WebCore/LICENSE-APPLE
diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
index ecdb3c788c..49a532d9aa 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WEBKITGTK_VERSION = 2.44.2
+WEBKITGTK_VERSION = 2.44.4
 WEBKITGTK_SITE = https://www.webkitgtk.org/releases
 WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
 WEBKITGTK_INSTALL_STAGING = YES
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 2/2] package/webkitgtk: bump to 2.46.4

[Thomas Devoogdt]

From: Thomas Devoogdt <thomas.devoogdt@barco.com>

Stable release to the 2.46 series.

Release notes:

  https://webkitgtk.org/2024/09/17/webkitgtk2.46.0-released.html
  https://webkitgtk.org/2024/09/30/webkitgtk2.46.1-released.html
  https://webkitgtk.org/2024/10/21/webkitgtk2.46.2-released.html
  https://webkitgtk.org/2024/10/30/webkitgtk2.46.3-released.html
  https://webkitgtk.org/2024/11/27/webkitgtk2.46.4-released.html

Added BR2_PACKAGE_WEBP_MUX to fix this error:

-- The following WebP libraries were not found:
--  mux (required)

Added USE_SYSTEM_SYSPROF_CAPTURE=OFF to fix this error:

-- Checking for module 'sysprof-capture-4'
--   Package 'sysprof-capture-4', required by 'virtual:world', not found
-- Could NOT find SysProfCapture (missing: SysProfCapture_LIBRARY SysProfCapture_INCLUDE_DIR)

For now, use USE_SKIA=OFF which is the replacement for cairo.

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
---
v3: only because it applies on top of "package/webkitgtk: bump to 2.44.4"
---
 package/webkitgtk/Config.in      | 1 +
 package/webkitgtk/webkitgtk.hash | 6 +++---
 package/webkitgtk/webkitgtk.mk   | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
index dca62cf0f8..3594299314 100644
--- a/package/webkitgtk/Config.in
+++ b/package/webkitgtk/Config.in
@@ -53,6 +53,7 @@ config BR2_PACKAGE_WEBKITGTK
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_WEBP
 	select BR2_PACKAGE_WEBP_DEMUX
+	select BR2_PACKAGE_WEBP_MUX
 	select BR2_PACKAGE_WOFF2
 	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11
diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash
index 49f758d6a8..96100d4c7c 100644
--- a/package/webkitgtk/webkitgtk.hash
+++ b/package/webkitgtk/webkitgtk.hash
@@ -1,6 +1,6 @@
-# From https://www.webkitgtk.org/releases/webkitgtk-2.44.4.tar.xz.sums
-sha1  3699ff9c9b84e755a0736e72dfd6e5a13151f7d6  webkitgtk-2.44.4.tar.xz
-sha256  2ce4ec1b78413035037aba8326b31ed72696626b7bea7bace5e46ac0d8cbe796  webkitgtk-2.44.4.tar.xz
+# From https://www.webkitgtk.org/releases/webkitgtk-2.46.4.tar.xz.sums
+sha1  10d4dbd222acec30b1d20ee3b7d02c0d9727c5a9  webkitgtk-2.46.4.tar.xz
+sha256  0eff5f0ab0a2872ec87df62bc32e3289c8af625716ac71e94b298d74e0374176  webkitgtk-2.46.4.tar.xz
 
 # Hashes for license files:
 sha256  0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4  Source/WebCore/LICENSE-APPLE
diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
index 49a532d9aa..ec63d093b7 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WEBKITGTK_VERSION = 2.44.4
+WEBKITGTK_VERSION = 2.46.4
 WEBKITGTK_SITE = https://www.webkitgtk.org/releases
 WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
 WEBKITGTK_INSTALL_STAGING = YES
@@ -30,6 +30,8 @@ WEBKITGTK_CONF_OPTS = \
 	-DUSE_AVIF=OFF \
 	-DUSE_GTK4=OFF \
 	-DUSE_LIBHYPHEN=OFF \
+	-DUSE_SKIA=OFF \
+	-DUSE_SYSTEM_SYSPROF_CAPTURE=OFF \
 	-DUSE_WOFF2=ON
 
 ifeq ($(BR2_PACKAGE_WEBKITGTK_SANDBOX),y)
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 2/2] package/webkitgtk: bump to 2.46.4

[Thomas Devoogdt]

Hi all,

I just found out that this one is no longer building.

>>> webkitgtk 2.46.3 Building
GIT_DIR=. PATH="/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/bin:/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/sbin:/home/thomas/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin"
 /home/thomas/.local/bin/cmake --build
/home/thomas/br-test-pkg/bootlin-armv5-uclibc/build/webkitgtk-2.46.3/
-j25
ninja: error: '/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/share/wayland-protocols/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
needed by 'WebKitGTK/DerivedSources/pointer-constraints-unstable-v1-protocol.c',
missing and no known rule to make it
make[1]: *** [package/pkg-generic.mk:289:
/home/thomas/br-test-pkg/bootlin-armv5-uclibc/build/webkitgtk-2.46.3/.stamp_built]
Error 1
make: *** [Makefile:83: _all] Error 2

I have not a clue why
"/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/home/thomas/br-test-pkg/bootlin-armv5-uclibc"
is concatenated twice in the path.

The WebKit source for it,
https://github.com/WebKit/WebKit/blob/main/Source/cmake/FindWaylandProtocols.cmake,
hasn't been touched for a while.

Kr,

Thomas Devoogdt
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 2/2] package/webkitgtk: bump to 2.46.4

[Thomas Devoogdt]

Hi all,

Update;

Reverting commit a3b2bc8e16d58e6009b2c628e170dc480fe00035 does fix it.
@James Hilliard, do you have any clue on this?

Kr,

Thomas
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 2/2] package/webkitgtk: bump to 2.46.4

[Thomas Devoogdt]

Hi all,


Update;

I discovered that dropping "pkgdatadir" in the
package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
fixes the problem.
It's btw the same key that was added years ago by commit
3e74c1312d35866c05813b4690412548eaaff61a.

It fixed this error back then:

Making all in xwayland
make[3]: Entering directory
'/home/buildroot/br5/output/build/xserver_xorg-server-1.19.0/hw/xwayland'
make[3]: *** No rule to make target
'/usr/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xml',
needed by 'relative-pointer-unstable-v1-client-protocol.h'. Stop.

It's the same wayland-protocols that now give me those problems. So I
think that we can just drop "pkgdatadir" from the patch list.


Kr,

Thomas Devoogdt
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v1] package/pkgconf: fix sysroot being prepended twice to the pkgdatadir path

[Thomas Devoogdt]

When building webkit, I got this build error:

>>> webkitgtk 2.46.3 Building
GIT_DIR=. PATH="/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/bin:/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/sbin:/home/thomas/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin"
 /home/thomas/.local/bin/cmake --build
/home/thomas/br-test-pkg/bootlin-armv5-uclibc/build/webkitgtk-2.46.3/
-j25
ninja: error: '/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/share/wayland-protocols/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
needed by 'WebKitGTK/DerivedSources/pointer-constraints-unstable-v1-protocol.c',
missing and no known rule to make it
make[1]: *** [package/pkg-generic.mk:289:
/home/thomas/br-test-pkg/bootlin-armv5-uclibc/build/webkitgtk-2.46.3/.stamp_built]
Error 1
make: *** [Makefile:83: _all] Error 2

The sysroot path is prepended twice to the path. This error persists
since a3b2bc8 "package/pkgconf: bump to version 2.3.0".

After digging into it, I found out that dropping "pkgdatadir" from the
patch does fix it. This is, in fact, the same, or similar problem that
was fixed in 3e74c13 "package/pkgconf: variable pkgdatadir also needs
sysroot prefixing, wayland patch III" years ago.

I was not able to find out which pkgconf commit caused the behavior
change. Commit a3b2bc8 bumped it from 1.6.3 to 2.3.0, which is a
considerable big change.

Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
---
 ...th-the-sysroot-a-subset-of-variables.patch | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch b/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
index d25039ade2..986058d400 100644
--- a/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
+++ b/package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
@@ -1,4 +1,4 @@
-From c1f9e60f46f2207f9dd07dd290ad5a2da05ad41d Mon Sep 17 00:00:00 2001
+From c912e9bb8d5be414fda74b2019deb2a6d2d041a0 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 Date: Sun, 16 Dec 2018 11:52:18 +0100
 Subject: [PATCH] Only prefix with the sysroot a subset of variables
@@ -22,15 +22,17 @@ Buildroot development. All other paths are not prefixed by the sysroot.
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 [Updated to include gobject-introspection paths]
 Signed-off-by: Adam Duskett <aduskett@gmail.com>
+[Dropped the pkgdatadir path]
+Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
 ---
- libpkgconf/tuple.c | 65 ++++++++++++++++++++++++++++++++--------------
- 1 file changed, 46 insertions(+), 19 deletions(-)
+ libpkgconf/tuple.c | 64 ++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 45 insertions(+), 19 deletions(-)
 
 diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c
-index 83f6a47..a2aa427 100644
+index 83f6a47..d56fcec 100644
 --- a/libpkgconf/tuple.c
 +++ b/libpkgconf/tuple.c
-@@ -178,6 +178,21 @@ dequote(const char *value)
+@@ -178,6 +178,20 @@ dequote(const char *value)
  	return buf;
  }
  
@@ -44,7 +46,6 @@ index 83f6a47..a2aa427 100644
 +	"includedir",
 +	"libdir",
 +	"mapdir",
-+	"pkgdatadir",
 +	"sdkdir",
 +	NULL,
 +};
@@ -52,7 +53,7 @@ index 83f6a47..a2aa427 100644
  static const char *
  find_sysroot(const pkgconf_client_t *client, pkgconf_list_t *vars)
  {
-@@ -237,14 +252,20 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch
+@@ -237,14 +251,20 @@ pkgconf_tuple_add(const pkgconf_client_t *client, pkgconf_list_t *list, const ch
  {
  	char *dequote_value;
  	pkgconf_tuple_t *tuple = calloc(1, sizeof(pkgconf_tuple_t));
@@ -74,7 +75,7 @@ index 83f6a47..a2aa427 100644
  	else
  		tuple->value = strdup(dequote_value);
  
-@@ -294,22 +315,8 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c
+@@ -294,22 +314,8 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c
  	return NULL;
  }
  
@@ -99,7 +100,7 @@ index 83f6a47..a2aa427 100644
  {
  	char buf[PKGCONF_BUFSIZE];
  	const char *ptr;
-@@ -318,7 +325,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
+@@ -318,7 +324,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
  	if (!(client->flags & PKGCONF_PKG_PKGF_FDO_SYSROOT_RULES) &&
  		(!(flags & PKGCONF_PKG_PROPF_UNINSTALLED) || (client->flags & PKGCONF_PKG_PKGF_PKGCONF1_SYSROOT_RULES)))
  	{
@@ -108,7 +109,7 @@ index 83f6a47..a2aa427 100644
  			bptr += pkgconf_strlcpy(buf, client->sysroot_dir, sizeof buf);
  	}
  
-@@ -381,7 +388,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
+@@ -381,7 +387,7 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
  				{
  					size_t nlen;
  
@@ -117,7 +118,7 @@ index 83f6a47..a2aa427 100644
  					nlen = pkgconf_strlcpy(bptr, parsekv, remain);
  					free(parsekv);
  
-@@ -432,6 +439,26 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
+@@ -432,6 +438,26 @@ pkgconf_tuple_parse(const pkgconf_client_t *client, pkgconf_list_t *vars, const
  	return strdup(buf);
  }
  
@@ -145,5 +146,5 @@ index 83f6a47..a2aa427 100644
   * !doc
   *
 -- 
-2.34.1
+2.43.0
 
-- 
2.43.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 2/2] package/webkitgtk: bump to 2.46.4

[Thomas Petazzoni via buildroot]

Hello Thomas,

On Tue, 17 Dec 2024 23:20:47 +0100
Thomas Devoogdt <thomas@devoogdt.com> wrote:

> I discovered that dropping "pkgdatadir" in the
> package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
> fixes the problem.
> It's btw the same key that was added years ago by commit
> 3e74c1312d35866c05813b4690412548eaaff61a.
> 
> It fixed this error back then:
> 
> Making all in xwayland
> make[3]: Entering directory
> '/home/buildroot/br5/output/build/xserver_xorg-server-1.19.0/hw/xwayland'
> make[3]: *** No rule to make target
> '/usr/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xml',
> needed by 'relative-pointer-unstable-v1-client-protocol.h'. Stop.
> 
> It's the same wayland-protocols that now give me those problems. So I
> think that we can just drop "pkgdatadir" from the patch list.

Do you have more details about "the same wayland-protocols that now
give me those problems" ? Do you have a defconfig that exhibits the
issue?

Essentially, I'm obviously concerned by the side effect of changing how
this pkgdatadir pkg-config variable gets handled. Your change will fix
some stuff for sure, but will it break something else?

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 2/2] package/webkitgtk: bump to 2.46.4

[Thomas Devoogdt]

Hi,


>> Do you have a defconfig that exhibits the issue?

I just used the test-pkg tool to figure this out.

$ cat webkitgtk.config
BR2_PACKAGE_WAYLAND=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_OPENGL_EGL=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
BR2_PACKAGE_LIBGTK3=y
BR2_PACKAGE_WEBKITGTK=y
BR2_PACKAGE_WEBKITGTK_MINIBROWSER=y

$ ./utils/test-pkg -p webkitgtk -c webkitgtk.config

All builds will fail due to the same reason. Are there other possible
side effects?; I don't know. All I know is that a similar issue was
fixed years ago, which was re-introduced by bumping pkg-config. Btw, I
was searching https://autobuild.buildroot.org/ for this issue, but I
didn't find any webkitgtk build. Is there a reason why this one has
never been compiled?


Kind regards,

Thomas Devoogdt


Op zo 29 dec 2024 om 23:03 schreef Thomas Petazzoni
<thomas.petazzoni@bootlin.com>:
>
> Hello Thomas,
>
> On Tue, 17 Dec 2024 23:20:47 +0100
> Thomas Devoogdt <thomas@devoogdt.com> wrote:
>
> > I discovered that dropping "pkgdatadir" in the
> > package/pkgconf/0001-Only-prefix-with-the-sysroot-a-subset-of-variables.patch
> > fixes the problem.
> > It's btw the same key that was added years ago by commit
> > 3e74c1312d35866c05813b4690412548eaaff61a.
> >
> > It fixed this error back then:
> >
> > Making all in xwayland
> > make[3]: Entering directory
> > '/home/buildroot/br5/output/build/xserver_xorg-server-1.19.0/hw/xwayland'
> > make[3]: *** No rule to make target
> > '/usr/share/wayland-protocols/unstable/relative-pointer/relative-pointer-unstable-v1.xml',
> > needed by 'relative-pointer-unstable-v1-client-protocol.h'. Stop.
> >
> > It's the same wayland-protocols that now give me those problems. So I
> > think that we can just drop "pkgdatadir" from the patch list.
>
> Do you have more details about "the same wayland-protocols that now
> give me those problems" ? Do you have a defconfig that exhibits the
> issue?
>
> Essentially, I'm obviously concerned by the side effect of changing how
> this pkgdatadir pkg-config variable gets handled. Your change will fix
> some stuff for sure, but will it break something else?
>
> Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://bootlin.com
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 2/2] package/webkitgtk: bump to 2.46.4

[Thomas Petazzoni via buildroot]

Hello Thomas,

Happy New Year and best wishes for 2025!

On Mon, 30 Dec 2024 18:31:31 +0100
Thomas Devoogdt <thomas@devoogdt.com> wrote:

> >> Do you have a defconfig that exhibits the issue?  
> 
> I just used the test-pkg tool to figure this out.
> 
> $ cat webkitgtk.config
> BR2_PACKAGE_WAYLAND=y
> BR2_PACKAGE_MESA3D=y
> BR2_PACKAGE_MESA3D_OPENGL_EGL=y
> BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
> BR2_PACKAGE_LIBGTK3=y
> BR2_PACKAGE_WEBKITGTK=y
> BR2_PACKAGE_WEBKITGTK_MINIBROWSER=y
> 
> $ ./utils/test-pkg -p webkitgtk -c webkitgtk.config

Thanks for providing this snippet.

> All builds will fail due to the same reason. Are there other possible
> side effects?; I don't know. All I know is that a similar issue was
> fixed years ago, which was re-introduced by bumping pkg-config. Btw, I
> was searching https://autobuild.buildroot.org/ for this issue, but I
> didn't find any webkitgtk build. Is there a reason why this one has
> never been compiled?

Webkitgtk is a huge beast with a lot of dependencies. Therefore, there
is a significant chance that something else fails in the build before
that...

You can find all builds that had BR2_PACKAGE_WEBKITGTK=y by using:

  http://autobuild.buildroot.net/index.php?symbols%5BBR2_PACKAGE_WEBKITGTK%5D=y

but as you can see, all of them failed on some other package, most
likely even before getting to webkitgtk.

Ah and also: webkitgtk starts with a "w". So if nothing depends on
webkitgtk, webkitgtk is going to be the last package to be built.

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1] package/pkgconf: fix sysroot being prepended twice to the pkgdatadir path

[Thomas Devoogdt]

Hi Thomas,


There was some discussion about this patch in
https://patchwork.ozlabs.org/project/buildroot/patch/20241216181719.770389-2-thomas@devoogdt.com/.
What is the outcome now, any reason to not take it along? It also
would be nice if the WebKitGTK 2.46 series gets merged with the
upcoming buildroot 2025.02 release. Because WebKitGTK will most
probably also release 2.48 in the near future.


With kind regards,

Thomas Devoogdt
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 1/2] package/webkitgtk: bump to 2.44.4

[Peter Korsgaard]

On 12/16/24 19:17, Thomas Devoogdt wrote:
> Bugfix release with many security fixes, including (but not limited to)
> patches for CVE-2024-40776, CVE-2024-40779, CVE-2024-40780, CVE-2024-40782,
> CVE-2024-40789, and CVE-2024-4558.
> 
> Release notes:
> 
>    https://webkitgtk.org/2024/08/13/webkitgtk2.44.3-released.html
>    https://www.webkitgtk.org/release/webkitgtk-2.44.4.html
> 
> Accompanying security advisory:
> 
>    https://webkitgtk.org/security/WSA-2024-0004.html
> 
> Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
> ---
> v2: bump to 2.44.4 iso 2.44.3
> v3: no change


Committed after adjusting the summary line to make it clear that this is 
a security bump, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 1/2] package/webkitgtk: bump to 2.44.4

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > On 12/16/24 19:17, Thomas Devoogdt wrote:
 >> Bugfix release with many security fixes, including (but not limited to)
 >> patches for CVE-2024-40776, CVE-2024-40779, CVE-2024-40780, CVE-2024-40782,
 >> CVE-2024-40789, and CVE-2024-4558.
 >> Release notes:
 >> https://webkitgtk.org/2024/08/13/webkitgtk2.44.3-released.html
 >> https://www.webkitgtk.org/release/webkitgtk-2.44.4.html
 >> Accompanying security advisory:
 >> https://webkitgtk.org/security/WSA-2024-0004.html
 >> Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
 >> ---
 >> v2: bump to 2.44.4 iso 2.44.3
 >> v3: no change


 > Committed after adjusting the summary line to make it clear that this
 > is a security bump, thanks.

Committed to 2024.02.x and 2024.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1] package/pkgconf: fix sysroot being prepended twice to the pkgdatadir path

[Peter Korsgaard]

On 12/18/24 09:43, Thomas Devoogdt wrote:
> When building webkit, I got this build error:
> 
>>>> webkitgtk 2.46.3 Building
> GIT_DIR=. PATH="/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/bin:/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/sbin:/home/thomas/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin"
>   /home/thomas/.local/bin/cmake --build
> /home/thomas/br-test-pkg/bootlin-armv5-uclibc/build/webkitgtk-2.46.3/
> -j25
> ninja: error: '/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/home/thomas/br-test-pkg/bootlin-armv5-uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/share/wayland-protocols/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml',
> needed by 'WebKitGTK/DerivedSources/pointer-constraints-unstable-v1-protocol.c',
> missing and no known rule to make it
> make[1]: *** [package/pkg-generic.mk:289:
> /home/thomas/br-test-pkg/bootlin-armv5-uclibc/build/webkitgtk-2.46.3/.stamp_built]
> Error 1
> make: *** [Makefile:83: _all] Error 2
> 
> The sysroot path is prepended twice to the path. This error persists
> since a3b2bc8 "package/pkgconf: bump to version 2.3.0".
> 
> After digging into it, I found out that dropping "pkgdatadir" from the
> patch does fix it. This is, in fact, the same, or similar problem that
> was fixed in 3e74c13 "package/pkgconf: variable pkgdatadir also needs
> sysroot prefixing, wayland patch III" years ago.
> 
> I was not able to find out which pkgconf commit caused the behavior
> change. Commit a3b2bc8 bumped it from 1.6.3 to 2.3.0, which is a
> considerable big change.
> 
> Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>

This is a somewhat scary change as it is hard to know if any other 
packages expect pkgdatadir to be the build time path rather than the 
runtime one, but it has been pending for a while and I guess to only 
real way to know is to give it a try.

So committed to master, thanks. Can you please have a look at the 
autobuilders the next few days to see if it causes any regressions? If 
so then we may have to revert it again for 2025.02.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1] package/pkgconf: fix sysroot being prepended twice to the pkgdatadir path

[Thomas Devoogdt]

Hi,


> This is a somewhat scary change as it is hard to know if any other
> packages expect pkgdatadir to be the build time path rather than the
> runtime one, but it has been pending for a while and I guess to only
> real way to know is to give it a try.
>
> So committed to master, thanks. Can you please have a look at the
> autobuilders the next few days to see if it causes any regressions? If
> so then we may have to revert it again for 2025.02.

Thx for considering this change. I will have a look in the coming days.


Kr,

Thomas Devoogdt
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 2/2] package/webkitgtk: bump to 2.46.4

[Thomas Devoogdt]

Hi Thomas, All,

In the meantime, Peter merged the pkgconf patch [1] [2]. No real
issues were reported since. So I expect that this webkitgtk bump can
be reconsidered. In the meantime, version 2.46.6 has been released
[3]. I can have a look to bump further. But I would like to have this
one merged first, since I've tested it. Also, beware that webkitgtk
will release 2.48 soon, and having the buildroot 2025.02 LTS still on
2.44 seems a bit odd to me.

[1] https://patchwork.ozlabs.org/project/buildroot/patch/20241218084337.3775491-1-thomas@devoogdt.com/#3468433
[2] https://gitlab.com/buildroot.org/buildroot/-/commit/139b580ca4aea35f5c451bce4a1b42da4cec2209
[3] https://webkitgtk.org/2025/02/07/webkitgtk2.46.6-released.html

Kind regards,

Thomas Devoogdt
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 2/2] package/webkitgtk: bump to 2.46.4

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes:

 > Hi Thomas, All,
 > In the meantime, Peter merged the pkgconf patch [1] [2]. No real
 > issues were reported since. So I expect that this webkitgtk bump can
 > be reconsidered. In the meantime, version 2.46.6 has been released
 > [3]. I can have a look to bump further. But I would like to have this
 > one merged first, since I've tested it. Also, beware that webkitgtk
 > will release 2.48 soon, and having the buildroot 2025.02 LTS still on
 > 2.44 seems a bit odd to me.

That and the fact that 2.44.x has a number of known security issues.

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1] package/pkgconf: fix sysroot being prepended twice to the pkgdatadir path

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > This is a somewhat scary change as it is hard to know if any other
 > packages expect pkgdatadir to be the build time path rather than the
 > runtime one, but it has been pending for a while and I guess to only
 > real way to know is to give it a try.

 > So committed to master, thanks. Can you please have a look at the
 > autobuilders the next few days to see if it causes any regressions? If
 > so then we may have to revert it again for 2025.02.

It seems to be working, so committed to 2024.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 2/2] package/webkitgtk: bump to 2.46.4

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

>>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes:
 >> Hi Thomas, All,
 >> In the meantime, Peter merged the pkgconf patch [1] [2]. No real
 >> issues were reported since. So I expect that this webkitgtk bump can
 >> be reconsidered. In the meantime, version 2.46.6 has been released
 >> [3]. I can have a look to bump further. But I would like to have this
 >> one merged first, since I've tested it. Also, beware that webkitgtk
 >> will release 2.48 soon, and having the buildroot 2025.02 LTS still on
 >> 2.44 seems a bit odd to me.

 > That and the fact that 2.44.x has a number of known security issues.

 > Committed, thanks.

Committed to 2024.02.x and 2024.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot