* [ptxdist] [PATCH 1/2] glib: Version bump. 2.70.4 -> 2.72.0
@ 2022-04-04 12:22 Christian Melki
2022-04-04 12:22 ` [ptxdist] [PATCH 2/2] glib-networking: Version bump. 2.68.1 " Christian Melki
2022-04-08 13:36 ` [ptxdist] [APPLIED] glib: Version bump. 2.70.4 " Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Christian Melki @ 2022-04-04 12:22 UTC (permalink / raw)
To: ptxdist
Next stable series.
https://gitlab.gnome.org/GNOME/glib/-/blob/main/NEWS
Needs wringing with various packages.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/glib.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/glib.make b/rules/glib.make
index 0ea3d66ad..3679362e8 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib
#
# Paths and names
#
-GLIB_VERSION := 2.70.4
-GLIB_MD5 := 71e5bb2948622fab36f5fa683fd7d3ab
+GLIB_VERSION := 2.72.0
+GLIB_MD5 := 46a8e04b1b42b64cbef2ea434923e704
GLIB := glib-$(GLIB_VERSION)
GLIB_SUFFIX := tar.xz
GLIB_URL := $(call ptx/mirror, GNOME, glib/$(basename $(GLIB_VERSION))/$(GLIB).$(GLIB_SUFFIX))
--
2.32.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH 2/2] glib-networking: Version bump. 2.68.1 -> 2.72.0
2022-04-04 12:22 [ptxdist] [PATCH 1/2] glib: Version bump. 2.70.4 -> 2.72.0 Christian Melki
@ 2022-04-04 12:22 ` Christian Melki
2022-04-08 13:36 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-04-08 13:36 ` [ptxdist] [APPLIED] glib: Version bump. 2.70.4 " Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Christian Melki @ 2022-04-04 12:22 UTC (permalink / raw)
To: ptxdist
Bump to be coherent with glib.
https://gitlab.gnome.org/GNOME/glib-networking/-/blob/master/NEWS
Mostly cryptographic related fixes.
* Forward port old patch to this release, but since the build
system changed slightly, the patch is new.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
.../0001-don-t-build-tls-tests.patch | 27 -------------------
patches/glib-networking-2.68.1/series | 4 ---
.../0001-tls-Don-t-build-TLS-tests.patch | 23 ++++++++++++++++
patches/glib-networking-2.72.0/series | 4 +++
rules/glib-networking.make | 4 +--
5 files changed, 29 insertions(+), 33 deletions(-)
delete mode 100644 patches/glib-networking-2.68.1/0001-don-t-build-tls-tests.patch
delete mode 100644 patches/glib-networking-2.68.1/series
create mode 100644 patches/glib-networking-2.72.0/0001-tls-Don-t-build-TLS-tests.patch
create mode 100644 patches/glib-networking-2.72.0/series
diff --git a/patches/glib-networking-2.68.1/0001-don-t-build-tls-tests.patch b/patches/glib-networking-2.68.1/0001-don-t-build-tls-tests.patch
deleted file mode 100644
index 53356897d..000000000
--- a/patches/glib-networking-2.68.1/0001-don-t-build-tls-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Tue, 13 Jul 2021 07:30:20 +0200
-Subject: [PATCH] don't build tls tests
-
-They fail to compile because gnutls is built without pkcs11 support in
-ptxdist:
-
-.../tls/tests/certificate.c:597: undefined reference to `gnutls_pkcs11_init'
-.../tls/tests/certificate.c:598: undefined reference to `gnutls_pkcs11_add_provider'
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 81c2a8b15ca0..1a2c447b21e8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -189,7 +189,6 @@ if backends.contains('openssl')
- subdir('tls/openssl')
- endif
-
--subdir('tls/tests')
-
- # Will automatically pick it up from the cross file if defined
- gio_querymodules = find_program('gio-querymodules', required : false)
diff --git a/patches/glib-networking-2.68.1/series b/patches/glib-networking-2.68.1/series
deleted file mode 100644
index 38027c13d..000000000
--- a/patches/glib-networking-2.68.1/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-don-t-build-tls-tests.patch
-# 8ebc581a61077fad77b1bf442bb096d1 - git-ptx-patches magic
diff --git a/patches/glib-networking-2.72.0/0001-tls-Don-t-build-TLS-tests.patch b/patches/glib-networking-2.72.0/0001-tls-Don-t-build-TLS-tests.patch
new file mode 100644
index 000000000..4ca5b6d87
--- /dev/null
+++ b/patches/glib-networking-2.72.0/0001-tls-Don-t-build-TLS-tests.patch
@@ -0,0 +1,23 @@
+From: Christian Melki <christian.melki@t2data.com>
+Date: Mon, 4 Apr 2022 13:59:16 +0200
+Subject: [PATCH] tls: Don't build TLS tests.
+
+* Rework previous patch for glib-networking.
+
+TLS tests fail to compile because gnutls is built without
+pkcs11 support in ptxdist.
+
+Signed-off-by: Christian Melki <christian.melki@t2data.com>
+---
+ tls/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/tls/meson.build b/tls/meson.build
+index e76e7666bb30..c96d145f6d8d 100644
+--- a/tls/meson.build
++++ b/tls/meson.build
+@@ -14,4 +14,3 @@ if backends.contains('openssl')
+ subdir('openssl')
+ endif
+
+-subdir('tests')
diff --git a/patches/glib-networking-2.72.0/series b/patches/glib-networking-2.72.0/series
new file mode 100644
index 000000000..00f04e9bf
--- /dev/null
+++ b/patches/glib-networking-2.72.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-tls-Don-t-build-TLS-tests.patch
+# b8239d52e458030f4b9cd353000ddd21 - git-ptx-patches magic
diff --git a/rules/glib-networking.make b/rules/glib-networking.make
index 0b4408198..c6f616d14 100644
--- a/rules/glib-networking.make
+++ b/rules/glib-networking.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLIB_NETWORKING) += glib-networking
#
# Paths and names
#
-GLIB_NETWORKING_VERSION := 2.68.1
-GLIB_NETWORKING_MD5 := 182ae3263763160a2cf0bd4f854448c3
+GLIB_NETWORKING_VERSION := 2.72.0
+GLIB_NETWORKING_MD5 := ff149a669ea3d1d193a468472bcdc696
GLIB_NETWORKING := glib-networking-$(GLIB_NETWORKING_VERSION)
GLIB_NETWORKING_SUFFIX := tar.xz
GLIB_NETWORKING_URL := $(call ptx/mirror, GNOME, glib-networking/$(basename $(GLIB_NETWORKING_VERSION))/$(GLIB_NETWORKING).$(GLIB_NETWORKING_SUFFIX))
--
2.32.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] glib: Version bump. 2.70.4 -> 2.72.0
2022-04-04 12:22 [ptxdist] [PATCH 1/2] glib: Version bump. 2.70.4 -> 2.72.0 Christian Melki
2022-04-04 12:22 ` [ptxdist] [PATCH 2/2] glib-networking: Version bump. 2.68.1 " Christian Melki
@ 2022-04-08 13:36 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2022-04-08 13:36 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 81bacb64a6f8c71bcf9c929185757466bb291e12.
Michael
[sent from post-receive hook]
On Fri, 08 Apr 2022 15:36:00 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Next stable series.
> https://gitlab.gnome.org/GNOME/glib/-/blob/main/NEWS
> Needs wringing with various packages.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220404122259.3502437-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/glib.make b/rules/glib.make
> index 0ea3d66ad328..3679362e89f7 100644
> --- a/rules/glib.make
> +++ b/rules/glib.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib
> #
> # Paths and names
> #
> -GLIB_VERSION := 2.70.4
> -GLIB_MD5 := 71e5bb2948622fab36f5fa683fd7d3ab
> +GLIB_VERSION := 2.72.0
> +GLIB_MD5 := 46a8e04b1b42b64cbef2ea434923e704
> GLIB := glib-$(GLIB_VERSION)
> GLIB_SUFFIX := tar.xz
> GLIB_URL := $(call ptx/mirror, GNOME, glib/$(basename $(GLIB_VERSION))/$(GLIB).$(GLIB_SUFFIX))
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] glib-networking: Version bump. 2.68.1 -> 2.72.0
2022-04-04 12:22 ` [ptxdist] [PATCH 2/2] glib-networking: Version bump. 2.68.1 " Christian Melki
@ 2022-04-08 13:36 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2022-04-08 13:36 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as b55cfabdd46145509f3638c93711264a312afc00.
Michael
[sent from post-receive hook]
On Fri, 08 Apr 2022 15:36:01 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Bump to be coherent with glib.
> https://gitlab.gnome.org/GNOME/glib-networking/-/blob/master/NEWS
> Mostly cryptographic related fixes.
>
> * Forward port old patch to this release, but since the build
> system changed slightly, the patch is new.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220404122259.3502437-2-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/glib-networking-2.68.1/0001-don-t-build-tls-tests.patch b/patches/glib-networking-2.68.1/0001-don-t-build-tls-tests.patch
> deleted file mode 100644
> index 53356897d66d..000000000000
> --- a/patches/glib-networking-2.68.1/0001-don-t-build-tls-tests.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Tue, 13 Jul 2021 07:30:20 +0200
> -Subject: [PATCH] don't build tls tests
> -
> -They fail to compile because gnutls is built without pkcs11 support in
> -ptxdist:
> -
> -.../tls/tests/certificate.c:597: undefined reference to `gnutls_pkcs11_init'
> -.../tls/tests/certificate.c:598: undefined reference to `gnutls_pkcs11_add_provider'
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - meson.build | 1 -
> - 1 file changed, 1 deletion(-)
> -
> -diff --git a/meson.build b/meson.build
> -index 81c2a8b15ca0..1a2c447b21e8 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -189,7 +189,6 @@ if backends.contains('openssl')
> - subdir('tls/openssl')
> - endif
> -
> --subdir('tls/tests')
> -
> - # Will automatically pick it up from the cross file if defined
> - gio_querymodules = find_program('gio-querymodules', required : false)
> diff --git a/patches/glib-networking-2.68.1/series b/patches/glib-networking-2.68.1/series
> deleted file mode 100644
> index 38027c13d3ce..000000000000
> --- a/patches/glib-networking-2.68.1/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-don-t-build-tls-tests.patch
> -# 8ebc581a61077fad77b1bf442bb096d1 - git-ptx-patches magic
> diff --git a/patches/glib-networking-2.72.0/0001-tls-Don-t-build-TLS-tests.patch b/patches/glib-networking-2.72.0/0001-tls-Don-t-build-TLS-tests.patch
> new file mode 100644
> index 000000000000..4ca5b6d875a5
> --- /dev/null
> +++ b/patches/glib-networking-2.72.0/0001-tls-Don-t-build-TLS-tests.patch
> @@ -0,0 +1,23 @@
> +From: Christian Melki <christian.melki@t2data.com>
> +Date: Mon, 4 Apr 2022 13:59:16 +0200
> +Subject: [PATCH] tls: Don't build TLS tests.
> +
> +* Rework previous patch for glib-networking.
> +
> +TLS tests fail to compile because gnutls is built without
> +pkcs11 support in ptxdist.
> +
> +Signed-off-by: Christian Melki <christian.melki@t2data.com>
> +---
> + tls/meson.build | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/tls/meson.build b/tls/meson.build
> +index e76e7666bb30..c96d145f6d8d 100644
> +--- a/tls/meson.build
> ++++ b/tls/meson.build
> +@@ -14,4 +14,3 @@ if backends.contains('openssl')
> + subdir('openssl')
> + endif
> +
> +-subdir('tests')
> diff --git a/patches/glib-networking-2.72.0/series b/patches/glib-networking-2.72.0/series
> new file mode 100644
> index 000000000000..00f04e9bf79c
> --- /dev/null
> +++ b/patches/glib-networking-2.72.0/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-tls-Don-t-build-TLS-tests.patch
> +# b8239d52e458030f4b9cd353000ddd21 - git-ptx-patches magic
> diff --git a/rules/glib-networking.make b/rules/glib-networking.make
> index 0b4408198df5..c6f616d141a8 100644
> --- a/rules/glib-networking.make
> +++ b/rules/glib-networking.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLIB_NETWORKING) += glib-networking
> #
> # Paths and names
> #
> -GLIB_NETWORKING_VERSION := 2.68.1
> -GLIB_NETWORKING_MD5 := 182ae3263763160a2cf0bd4f854448c3
> +GLIB_NETWORKING_VERSION := 2.72.0
> +GLIB_NETWORKING_MD5 := ff149a669ea3d1d193a468472bcdc696
> GLIB_NETWORKING := glib-networking-$(GLIB_NETWORKING_VERSION)
> GLIB_NETWORKING_SUFFIX := tar.xz
> GLIB_NETWORKING_URL := $(call ptx/mirror, GNOME, glib-networking/$(basename $(GLIB_NETWORKING_VERSION))/$(GLIB_NETWORKING).$(GLIB_NETWORKING_SUFFIX))
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-08 13:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-04 12:22 [ptxdist] [PATCH 1/2] glib: Version bump. 2.70.4 -> 2.72.0 Christian Melki
2022-04-04 12:22 ` [ptxdist] [PATCH 2/2] glib-networking: Version bump. 2.68.1 " Christian Melki
2022-04-08 13:36 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-04-08 13:36 ` [ptxdist] [APPLIED] glib: Version bump. 2.70.4 " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox