From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 08 Apr 2022 15:37:19 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ncong-00BuMz-BA for lore@lore.pengutronix.de; Fri, 08 Apr 2022 15:37:19 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ncone-0001ni-2u; Fri, 08 Apr 2022 15:37:18 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ncomR-0008Pc-DY; Fri, 08 Apr 2022 15:36:03 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1ncomS-001oSG-3g; Fri, 08 Apr 2022 15:36:02 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ncomP-000W1s-TE; Fri, 08 Apr 2022 15:36:01 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 8 Apr 2022 15:36:01 +0200 Message-Id: <20220408133601.123077-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220404122259.3502437-2-christian.melki@t2data.com> References: <20220404122259.3502437-2-christian.melki@t2data.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] glib-networking: Version bump. 2.68.1 -> 2.72.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as b55cfabdd46145509f3638c93711264a312afc00. Michael [sent from post-receive hook] On Fri, 08 Apr 2022 15:36:01 +0200, Christian Melki 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 > Message-Id: <20220404122259.3502437-2-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > 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 > -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 > ---- > - 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 > +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 > +--- > + 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