From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2ArBJEN7hmAwiQAAgWs5BA (envelope-from ) for ; Mon, 26 Apr 2021 10:35:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id QPpUIEN7hmDsLwAAbx9fmQ (envelope-from ) for ; Mon, 26 Apr 2021 08:35:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4809C246E9 for ; Mon, 26 Apr 2021 10:35:15 +0200 (CEST) Received: from localhost ([::1]:45878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lawi2-0005tI-9Q for larch@yhetil.org; Mon, 26 Apr 2021 04:35:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lawhq-0005t9-Ex for guix-patches@gnu.org; Mon, 26 Apr 2021 04:35:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lawhq-0008SB-67 for guix-patches@gnu.org; Mon, 26 Apr 2021 04:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lawhq-0001JD-1S for guix-patches@gnu.org; Mon, 26 Apr 2021 04:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48028] [PATCH wip-gnome 4/8] gnu: libsoup: Simplify adjustment of tests and disable ssl-test. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Apr 2021 08:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48028 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Raghav Gururajan , 48028@debbugs.gnu.org Received: via spool by 48028-submit@debbugs.gnu.org id=B48028.16194260724992 (code B ref 48028); Mon, 26 Apr 2021 08:35:01 +0000 Received: (at 48028) by debbugs.gnu.org; 26 Apr 2021 08:34:32 +0000 Received: from localhost ([127.0.0.1]:44418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lawhL-0001IS-Ko for submit@debbugs.gnu.org; Mon, 26 Apr 2021 04:34:32 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:57267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lawhI-0001IG-Uf for 48028@debbugs.gnu.org; Mon, 26 Apr 2021 04:34:30 -0400 Received: from nijino.local (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FTJ8w2dHQz1LBRt; Mon, 26 Apr 2021 10:34:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FTJ8w2dHQz1LBRt DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1619426064; bh=433qiVPeX2i6CtrZVxjrWbNqkVSwDX75LDXeR5+TPsE=; h=Subject:From:To:Date:In-Reply-To:References:From; b=dakxqcakaQN8wArcEexAp1wNmMi9bKzt++ewo6ZrR1Q1KEiZIJhuQFe1aEzauDh2u nQVpoZR0wuHiIjcvaZDuG/ZgkNzapmOVZH/dbD4Aut5vo90+Xhjhgb+2SsKBu7uoIw w4RhZbs138B/mFUtiBEaTQ0PwSANgC0JgSmfMB70= Message-ID: <795eec65c654e1f74d147b3e39729ef41086d9ff.camel@student.tugraz.at> From: Leo Prikler Date: Mon, 26 Apr 2021 10:34:23 +0200 In-Reply-To: <20210426081145.28926-4-rg@raghavgururajan.name> References: <20210426081145.28926-1-rg@raghavgururajan.name> <20210426081145.28926-4-rg@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; none X-Migadu-Queue-Id: 4809C246E9 X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: R03KQV1DrwMb Am Montag, den 26.04.2021, 04:11 -0400 schrieb Raghav Gururajan: > * gnu/packages/gnome.scm (libsoup)[phases](adjust-tests): Modify. > [native-inputs]: Remove gnutls. > --- > gnu/packages/gnome.scm | 70 +++++++--------------------------------- > -- > 1 file changed, 11 insertions(+), 59 deletions(-) > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index 97cf80c586..29779c39af 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -4927,64 +4927,17 @@ libxml to ease remote use of the RESTful > API.") > #t))) > (add-after 'unpack 'adjust-tests > (lambda _ > - ;; This test fails due to missing /etc/nsswitch.conf > - ;; in the build environment. > - (substitute* "tests/socket-test.c" > - ((".*/sockets/unconnected.*") "")) > - > - ;; These fail because "subdomain.localhost" does not > resolve in > - ;; the build environment. > - (substitute* "tests/hsts-test.c" > - ((".*/hsts/basic.*") "") > - ((".*/hsts/subdomains.*") "") > - ((".*/hsts/superdomain.*") "") > - ((".*/hsts/utf8-address.*") "")) > - (substitute* "tests/hsts-db-test.c" > - ((".*/hsts-db/subdomains.*") "")) > - > - ;; Generate a self-signed certificate that has > "localhost" as its > - ;; 'dnsName'. Failing to do that, and starting with > GnuTLS > - ;; 3.5.12, tests such as "ssl-tests" fail: > - ;; > - ;; ERROR:ssl-test.c:406:do_tls_interaction_test: > Unexpected status 6 Unacceptable TLS certificate (expected 200 OK) > - ;; > - ;; 'certtool' is interactive so we have to pipe it the > answers. > - ;; Reported at < > https://bugzilla.gnome.org/show_bug.cgi?id=784696>;. > - (let ((pipe (open-output-pipe "certtool --generate- > self-signed \ > - --load-privkey tests/test-key.pem --outfile tests/test-cert.pem"))) > - (for-each (lambda (line) > - (display line pipe) > - (newline pipe)) > - '("" ;Common name > - "" ;UID > - "Guix" ;Organizational unit > name > - "GNU" ;Organization name > - "" ;Locality name > - "" ;State or province > - "" ;Country > - "" ;subject's domain > component (DC) > - "" ;E-mail > - "" ;serial number > - "-1" ;expiration time > - "N" ;belong to authority? > - "N" ;web client certificate? > - "N" ;IPsec IKE? > - "Y" ;web server certificate? > - "localhost" ;dnsName of subject > - "" ;dnsName of subject > (end) > - "" ;URI of subject > - "127.0.0.1" ;IP address of subject > - "" ;signing? > - "" ;encryption (RSA)? > - "" ;data encryption? > - "" ;sign OCSP requests? > - "" ;sign code? > - "" ;time stamping? > - "" ;email protection? > - "" ;URI of the CRL > distribution point > - "y" ;above info OK? > - )) > - (close-pipe pipe)) > + (substitute* "tests/meson.build" > + ;; These fail because "subdomain.localhost" does not > resolve in > + ;; the build environment. > + (("[ \t]*\\['hsts', true, \\[\\]\\],") "") > + (("[ \t]*\\['hsts-db', true, \\[\\]\\],") "") > + ;; This test fails due to missing /etc/nsswitch.conf > + ;; in the build environment. > + (("[ \t]*\\['socket', true, \\[\\]\\],") "") > + ;; FIX-ME: ssl-test fails, starting with > + ;; glib-networking 2.68.x. > + (("[ \t]*\\['ssl', true, \\[\\]\\],") "")) > #t)) > (add-after 'install 'move-doc > (lambda* (#:key outputs #:allow-other-keys) > @@ -5006,7 +4959,6 @@ libxml to ease remote use of the RESTful API.") > ("vala" ,vala) > ("php" ,php) > ("curl" ,curl) > - ("gnutls" ,gnutls) ;for 'certtool' > ("httpd" ,httpd))) > (propagated-inputs > ;; libsoup-2.4.pc refers to all these. This does not look much like a simplification to me. Instead, the regexp seems to have been more complicated, and also the patchee has been changed from some C file to meson.build. Is this necessary to disable the SSL test? If not, try separating this patch into two parts. Regards, Leo