From patchwork Sat Apr 13 13:10:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Dr. Arne Babenhauserheide" X-Patchwork-Id: 62954 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 17C8A27BBEA; Sat, 13 Apr 2024 14:15:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D28C027BBE9 for ; Sat, 13 Apr 2024 14:15:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvd9k-0001ma-5m; Sat, 13 Apr 2024 09:10:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rvd9g-0001mC-L7 for guix-patches@gnu.org; Sat, 13 Apr 2024 09:10:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvd9g-0004h5-Cx for guix-patches@gnu.org; Sat, 13 Apr 2024 09:10:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rvd9q-000347-JR for guix-patches@gnu.org; Sat, 13 Apr 2024 09:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70366] Update Mercurial to 6.7.2 and python-hg-evolve to 11.1.3 Resent-From: "Dr. Arne Babenhauserheide" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Apr 2024 13:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70366 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 70366@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171301386111771 (code B ref -1); Sat, 13 Apr 2024 13:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Apr 2024 13:11:01 +0000 Received: from localhost ([127.0.0.1]:60322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvd9n-00033h-PA for submit@debbugs.gnu.org; Sat, 13 Apr 2024 09:11:00 -0400 Received: from lists.gnu.org ([2001:470:142::17]:48562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvd9j-00031x-ND for submit@debbugs.gnu.org; Sat, 13 Apr 2024 09:10:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rvd9R-0001lV-3D for guix-patches@gnu.org; Sat, 13 Apr 2024 09:10:38 -0400 Received: from mout.web.de ([217.72.192.78]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rvd9M-0004eR-PO for guix-patches@gnu.org; Sat, 13 Apr 2024 09:10:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1713013828; x=1713618628; i=arne_bab@web.de; bh=LqHiYV9kWEl0T69k7sWoeSoTJp5PFlF1LAGXAmB3f7o=; h=X-UI-Sender-Class:From:To:Subject:Date; b=Jvay1XImxdCAWgfW5MjRxGwSM0jg5YIDIbCjJjgZ7tAPLOMRujsYLBbVWCl6oSlD Dhjtqk5rSCcF0BQlypxUdeeL1culoJ50F6jx6uBXL8sNprKVxvgKnzv7T9cvEmL72 Vz1UKnq/zkIvDx2qbnDZX/eoua5Necu0hl3c3x+1jl5lnvICNYbm1E5AQV4JX6phM uCi5vZC4L5cZsEHssVlhKUHGJLr4s7TnkmFq+h8+Mb1BBFaPwAaYG2sTJ0GFvpvtM FY1mcubqs64R+h0UuZqCq2dU7RubG6rP4Ki5vT2mD1nl9E8YKuu+l2fgEXYyG/9W4 DENX5/ODVe7l2rBAGw== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from fluss ([84.165.16.40]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MrOdp-1sZxzP0n3v-00oBw4; Sat, 13 Apr 2024 15:10:28 +0200 User-Agent: mu4e 1.12.2; emacs 30.0.50 Date: Sat, 13 Apr 2024 15:10:15 +0200 Message-ID: <87sezp1k94.fsf@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:YRPZ5/rDDgApEp1AcL03CyWJ+Y6RQ4VrbMjrgTOxgekQpM/90Gw u7tDNThxrwtddRdFWuCL+QGvpYQ489NpFpYCAtlEI2q8Izhw2bttCHDNqfcuEADUqcQiP02 lZNIEjyborZckh5qCq3mgieTmG3HEFciWLQXroqS1tS+QPth4UKEEghmXNWe4T4uWM1uoin a/yemPmfOyGN5pp86CIFA== UI-OutboundReport: notjunk:1;M01:P0:fUTG7smn/GY=;APK88kffg67BV2GbRBiqeho4b3+ GsCxHh4bgU3HQgfKftHH7dabXGlwYcB5OtfdnwvccpAmWqxpMSAFgpsvYezesSFc1tP764c3F PGHG5V7bqtt5RLV/gT/8NW5mL3vFrytLkt4WglJVCu4g1OljAyLSK6sbOn9Ejq42VygmIQZMw oVoV0MmcHhCv247dYHfm3btXHq7dGZwUJV4ECvoaqb2r68+uR5xN2WNGreyckec3vPFvWKw41 H/Smi/l4MKEPzPkX4uNdPz7C0tnpTKL/JwTjUUcqixk3eNbvCFzRb3Hbq110V5d6gOli6TEMm +CAISQZ4Mxp5o1Mvj8d0eZmTpDcurfFsIcTIfYasp13UNN78fWqcbhoz3991ZfKcPkH+Ksnnf WdB+TAiTLhWTTzDmYK7XsQH2IVSZPl5pY149qqBntH2WRWuc10N81bB7t/nUx/TetLmAmcTbX n6h/ciqV1usnTJ98asUIdQHovfneJ8Uq8D9cDPXrFNS+AU0mAhCLN4cIXF2H0+X/MCa+siwHR +23lIYaXtXEMlYFxuavGPl54RbrPCDjhKiW2xVCNopr9A24J482YXUmWbvMLAkeZn5HIo+Ws6 98AbfNY7VN6SddulDdZG/nkltyjU9MoOcabNlxfZewD47o9aE9t27N3ugua2Czm/2ybkZsGeZ 7YzoqAk5C2OrRogjQQQjFjkQoSGAEX32aok2PZxGnIaB0ImyguRjnqZSnY0hxNmnDSYvem7I1 tY38kYz//hoeSWroCctRR16A+b+HUIX6yg9fLcvam6cKjeXBBzSME7srMlZjgtcowQ6zU8y1f mQ1GWXZTJoA0CD1SGDFHq/cGllilUbUnh1qolB6Pml0iE= Received-SPF: pass client-ip=217.72.192.78; envelope-from=arne_bab@web.de; helo=mout.web.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: "Dr. Arne Babenhauserheide" X-ACL-Warn: , "Dr. Arne Babenhauserheide via Guix-patches" X-Patchwork-Original-From: "Dr. Arne Babenhauserheide via Guix-patches" via From: "Dr. Arne Babenhauserheide" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, the attached patch updates both Mercurial and python-hg-evolve to their respective newest version. Both need to be in compatible versions, so I’m sending both together. Best wishes, Arne From 9a5aea3eaad92caf8800f0dff7240e8ca77e9416 Mon Sep 17 00:00:00 2001 Message-ID: <9a5aea3eaad92caf8800f0dff7240e8ca77e9416.1713013282.git.arne_bab@web.de> From: Arne Babenhauserheide Date: Sat, 13 Apr 2024 14:58:08 +0200 Subject: [PATCH] gnu: mercurial and python-hg-evolve: Update to 6.7.2 and 11.1.3 * gnu/packages/version-control.scm (mercurial): Update to 6.7.2. * gnu/packages/version-control.scm (python-hg-evolve): Update to 11.1.3. * gnu/packages/patches/mercurial-hg-extension-path.patch: adapt for mercurial 6.7.2 * gnu/packages/patches/mercurial-openssl-compat.patch: delete file * gnu/local.mk (dist_patch_DATA): remove mercurial-openssl-compat.patch Change-Id: I1e22d7f38e264576bfa3adef7004fef582a1137e --- gnu/local.mk | 1 - .../patches/mercurial-hg-extension-path.patch | 14 +-- .../patches/mercurial-openssl-compat.patch | 89 ------------------- gnu/packages/version-control.scm | 11 ++- 4 files changed, 8 insertions(+), 107 deletions(-) delete mode 100644 gnu/packages/patches/mercurial-openssl-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index e08b0d1c75..a9f388d06d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1700,7 +1700,6 @@ dist_patch_DATA = \ %D%/packages/patches/mecab-variable-param.patch \ %D%/packages/patches/memtest86+-build-reproducibly.patch \ %D%/packages/patches/mercurial-hg-extension-path.patch \ - %D%/packages/patches/mercurial-openssl-compat.patch \ %D%/packages/patches/mhash-keygen-test-segfault.patch \ %D%/packages/patches/mia-fix-boost-headers.patch \ %D%/packages/patches/mia-vtk9.patch \ diff --git a/gnu/packages/patches/mercurial-hg-extension-path.patch b/gnu/packages/patches/mercurial-hg-extension-path.patch index d1073dd01c..8b9d185a89 100644 --- a/gnu/packages/patches/mercurial-hg-extension-path.patch +++ b/gnu/packages/patches/mercurial-hg-extension-path.patch @@ -7,15 +7,7 @@ will get this into Mercurial proper. diff --git a/mercurial/extensions.py b/mercurial/extensions.py --- a/mercurial/extensions.py +++ b/mercurial/extensions.py -@@ -13,6 +13,7 @@ - import imp - import inspect - import os -+import sys - - from .i18n import ( - _, -@@ -108,6 +109,11 @@ +@@ -103,6 +103,11 @@ def _importh(name): """import and return the module""" @@ -24,6 +16,6 @@ diff --git a/mercurial/extensions.py b/mercurial/extensions.py + if extension_path is not None: + for path in extension_path: + sys.path.append(path) - mod = __import__(pycompat.sysstr(name)) - components = name.split(b'.') + mod = __import__(name) + components = name.split('.') for comp in components[1:]: diff --git a/gnu/packages/patches/mercurial-openssl-compat.patch b/gnu/packages/patches/mercurial-openssl-compat.patch deleted file mode 100644 index 139356f285..0000000000 --- a/gnu/packages/patches/mercurial-openssl-compat.patch +++ /dev/null @@ -1,89 +0,0 @@ -Tweak cipher selection to make TLS < 1.2 work with OpenSSL 3. - -Taken from Debian: - - https://salsa.debian.org/python-team/packages/mercurial/-/blob/debian/master/debian/patches/openssl_3_cipher_tlsv1.patch - ---- a/mercurial/sslutil.py -+++ b/mercurial/sslutil.py -@@ -117,17 +117,17 @@ def _hostsettings(ui, hostname): - ciphers = ui.config(b'hostsecurity', b'%s:ciphers' % bhostname, ciphers) - - # If --insecure is used, we allow the use of TLS 1.0 despite config options. - # We always print a "connection security to %s is disabled..." message when - # --insecure is used. So no need to print anything more here. - if ui.insecureconnections: - minimumprotocol = b'tls1.0' - if not ciphers: -- ciphers = b'DEFAULT' -+ ciphers = b'DEFAULT:@SECLEVEL=0' - - s[b'minimumprotocol'] = minimumprotocol - s[b'ciphers'] = ciphers - - # Look for fingerprints in [hostsecurity] section. Value is a list - # of : strings. - fingerprints = ui.configlist( - b'hostsecurity', b'%s:fingerprints' % bhostname -@@ -621,17 +621,17 @@ def wrapserversocket( - - # Improve forward secrecy. - sslcontext.options |= getattr(ssl, 'OP_SINGLE_DH_USE', 0) - sslcontext.options |= getattr(ssl, 'OP_SINGLE_ECDH_USE', 0) - - # In tests, allow insecure ciphers - # Otherwise, use the list of more secure ciphers if found in the ssl module. - if exactprotocol: -- sslcontext.set_ciphers('DEFAULT') -+ sslcontext.set_ciphers('DEFAULT:@SECLEVEL=0') - elif util.safehasattr(ssl, b'_RESTRICTED_SERVER_CIPHERS'): - sslcontext.options |= getattr(ssl, 'OP_CIPHER_SERVER_PREFERENCE', 0) - # pytype: disable=module-attr - sslcontext.set_ciphers(ssl._RESTRICTED_SERVER_CIPHERS) - # pytype: enable=module-attr - - if requireclientcert: - sslcontext.verify_mode = ssl.CERT_REQUIRED ---- a/tests/test-https.t -+++ b/tests/test-https.t -@@ -356,19 +356,19 @@ Start servers running supported TLS vers - $ cat ../hg1.pid >> $DAEMON_PIDS - $ hg serve -p $HGPORT2 -d --pid-file=../hg2.pid --certificate=$PRIV \ - > --config devel.serverexactprotocol=tls1.2 - $ cat ../hg2.pid >> $DAEMON_PIDS - $ cd .. - - Clients talking same TLS versions work - -- $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.0 --config hostsecurity.ciphers=DEFAULT id https://localhost:$HGPORT/ -+ $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.0 --config hostsecurity.ciphers=DEFAULT:@SECLEVEL=0 id https://localhost:$HGPORT/ - 5fed3813f7f5 -- $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.1 --config hostsecurity.ciphers=DEFAULT id https://localhost:$HGPORT1/ -+ $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.1 --config hostsecurity.ciphers=DEFAULT:@SECLEVEL=0 id https://localhost:$HGPORT1/ - 5fed3813f7f5 - $ P="$CERTSDIR" hg --config hostsecurity.minimumprotocol=tls1.2 id https://localhost:$HGPORT2/ - 5fed3813f7f5 - - Clients requiring newer TLS version than what server supports fail - - $ P="$CERTSDIR" hg id https://localhost:$HGPORT/ - (could not negotiate a common security protocol (tls1.1+) with localhost; the likely cause is Mercurial is configured to be more secure than the server can support) -@@ -400,17 +400,17 @@ Clients requiring newer TLS version than - - $ hg --config hostsecurity.minimumprotocol=tls1.2 id --insecure https://localhost:$HGPORT1/ - warning: connection security to localhost is disabled per current settings; communication is susceptible to eavesdropping and tampering - 5fed3813f7f5 - - The per-host config option overrides the default - - $ P="$CERTSDIR" hg id https://localhost:$HGPORT/ \ -- > --config hostsecurity.ciphers=DEFAULT \ -+ > --config hostsecurity.ciphers=DEFAULT:@SECLEVEL=0 \ - > --config hostsecurity.minimumprotocol=tls1.2 \ - > --config hostsecurity.localhost:minimumprotocol=tls1.0 - 5fed3813f7f5 - - The per-host config option by itself works - - $ P="$CERTSDIR" hg id https://localhost:$HGPORT/ \ - > --config hostsecurity.localhost:minimumprotocol=tls1.2 diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 19f128d45f..d6fdb3fcec 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2084,16 +2084,15 @@ (define-public python-pre-commit (define-public mercurial (package (name "mercurial") - (version "6.2.2") + (version "6.7.2") (source (origin (method url-fetch) (uri (string-append "https://www.mercurial-scm.org/" "release/mercurial-" version ".tar.gz")) - (patches (search-patches "mercurial-hg-extension-path.patch" - "mercurial-openssl-compat.patch")) + (patches (search-patches "mercurial-hg-extension-path.patch")) (sha256 (base32 - "1pr00hdk3l9095fhq6302fgj0wmbqhqs93y4r457ba4pyjjrvyly")) + "01nqvp3cvidlz9z5vm05vpq81r6x10jwwfcaz0gw9anz0l60f8hw")) (modules '((guix build utils))) (snippet '(substitute* (find-files "tests" "\\.(t|sh)$") @@ -2195,7 +2194,7 @@ (define-public mercurial (define-public python-hg-evolve (package (name "python-hg-evolve") - (version "10.3.2") + (version "11.1.3") (source (origin (method hg-fetch) @@ -2205,7 +2204,7 @@ (define-public python-hg-evolve (file-name (hg-file-name name version)) (sha256 (base32 - "0qgk39s5pwxbshfa6x1f1ccxahja3fs265dddxy6q99spy3b3x5h")))) + "09rq3hgbb6qjws0kymnh8lbglsc5yjby3b2bc0savs2agf88j83z")))) (build-system python-build-system) (arguments ;; Tests need mercurial source code. base-commit: 15a523ea213065c275e4852673cbb27c72c0ad87 prerequisite-patch-id: 088a72da8c11e5d1c7087b4a5e8bb9c4a3b9b2af prerequisite-patch-id: a092dba2c994aba4c74f1484621cebe53f548492 prerequisite-patch-id: 09ee3fdfcc708aeec9e6a7a54e2993e857e19aca prerequisite-patch-id: 7957383d6685c848a7cbfa78e930adeaf528a2e1 -- 2.41.0