Received: (at submit) by debbugs.gnu.org; 13 Apr 2024 13:11:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 13 09:11:00 2024
Received: from localhost ([127.0.0.1]:60322 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rvd9n-00033h-PA
for submit <at> 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 <arne_bab@HIDDEN>) id 1rvd9j-00031x-ND
for submit <at> 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 <arne_bab@HIDDEN>) id 1rvd9R-0001lV-3D
for guix-patches@HIDDEN; 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 <arne_bab@HIDDEN>) id 1rvd9M-0004eR-PO
for guix-patches@HIDDEN; 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@HIDDEN;
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
From: "Dr. Arne Babenhauserheide" <arne_bab@HIDDEN>
To: guix-patches@HIDDEN
Subject: Update Mercurial to 6.7.2 and python-hg-evolve to 11.1.3
User-Agent: mu4e 1.12.2; emacs 30.0.50
Date: Sat, 13 Apr 2024 15:10:15 +0200
Message-ID: <87sezp1k94.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
micalg=pgp-sha256; protocol="application/pgp-signature"
X-Provags-ID: V03:K1:YRPZ5/rDDgApEp1AcL03CyWJ+Y6RQ4VrbMjrgTOxgekQpM/90Gw
u7tDNThxrwtddRdFWuCL+QGvpYQ489NpFpYCAtlEI2q8Izhw2bttCHDNqfcuEADUqcQiP02
lZNIEjyborZckh5qCq3mgieTmG3HEFciWLQXroqS1tS+QPth4UKEEghmXNWe4T4uWM1uoin
a/yemPmfOyGN5pp86CIFA==
X-Spam-Flag: NO
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@HIDDEN;
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-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
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=E2=80=99m sending both togethe=
r.
Best wishes,
Arne
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline;
filename=0001-gnu-mercurial-and-python-hg-evolve-Update-to-6.7.2-a.patch
Content-Transfer-Encoding: quoted-printable
From=209a5aea3eaad92caf8800f0dff7240e8ca77e9416 Mon Sep 17 00:00:00 2001
Message-ID: <9a5aea3eaad92caf8800f0dff7240e8ca77e9416.1713013282.git.arne_b=
ab@HIDDEN>
From: Arne Babenhauserheide <arne_bab@HIDDEN>
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 mer=
curial 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
=2D--
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
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1700,7 +1700,6 @@ dist_patch_DATA =3D \
%D%/packages/patches/mecab-variable-param.patch \
%D%/packages/patches/memtest86+-build-reproducibly.patch \
%D%/packages/patches/mercurial-hg-extension-path.patch \
=2D %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/p=
ackages/patches/mercurial-hg-extension-path.patch
index d1073dd01c..8b9d185a89 100644
=2D-- 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
=2D@@ -13,6 +13,7 @@
=2D import imp
=2D import inspect
=2D import os
=2D+import sys
=2D=20
=2D from .i18n import (
=2D _,
=2D@@ -108,6 +109,11 @@
+@@ -103,6 +103,11 @@
=20=20
def _importh(name):
"""import and return the <name> module"""
@@ -24,6 +16,6 @@ diff --git a/mercurial/extensions.py b/mercurial/extensio=
ns.py
+ if extension_path is not None:
+ for path in extension_path:
+ sys.path.append(path)
=2D mod =3D __import__(pycompat.sysstr(name))
=2D components =3D name.split(b'.')
+ mod =3D __import__(name)
+ components =3D name.split('.')
for comp in components[1:]:
diff --git a/gnu/packages/patches/mercurial-openssl-compat.patch b/gnu/pack=
ages/patches/mercurial-openssl-compat.patch
deleted file mode 100644
index 139356f285..0000000000
=2D-- a/gnu/packages/patches/mercurial-openssl-compat.patch
+++ /dev/null
@@ -1,89 +0,0 @@
=2DTweak cipher selection to make TLS < 1.2 work with OpenSSL 3.
=2D
=2DTaken from Debian:
=2D
=2D https://salsa.debian.org/python-team/packages/mercurial/-/blob/debian/=
master/debian/patches/openssl_3_cipher_tlsv1.patch
=2D
=2D--- a/mercurial/sslutil.py
=2D+++ b/mercurial/sslutil.py
=2D@@ -117,17 +117,17 @@ def _hostsettings(ui, hostname):
=2D ciphers =3D ui.config(b'hostsecurity', b'%s:ciphers' % bhostname, c=
iphers)
=2D=20
=2D # If --insecure is used, we allow the use of TLS 1.0 despite config=
options.
=2D # We always print a "connection security to %s is disabled..." mess=
age when
=2D # --insecure is used. So no need to print anything more here.
=2D if ui.insecureconnections:
=2D minimumprotocol =3D b'tls1.0'
=2D if not ciphers:
=2D- ciphers =3D b'DEFAULT'
=2D+ ciphers =3D b'DEFAULT:@SECLEVEL=3D0'
=2D=20
=2D s[b'minimumprotocol'] =3D minimumprotocol
=2D s[b'ciphers'] =3D ciphers
=2D=20
=2D # Look for fingerprints in [hostsecurity] section. Value is a list
=2D # of <alg>:<fingerprint> strings.
=2D fingerprints =3D ui.configlist(
=2D b'hostsecurity', b'%s:fingerprints' % bhostname
=2D@@ -621,17 +621,17 @@ def wrapserversocket(
=2D=20
=2D # Improve forward secrecy.
=2D sslcontext.options |=3D getattr(ssl, 'OP_SINGLE_DH_USE', 0)
=2D sslcontext.options |=3D getattr(ssl, 'OP_SINGLE_ECDH_USE', 0)
=2D=20
=2D # In tests, allow insecure ciphers
=2D # Otherwise, use the list of more secure ciphers if found in the ss=
l module.
=2D if exactprotocol:
=2D- sslcontext.set_ciphers('DEFAULT')
=2D+ sslcontext.set_ciphers('DEFAULT:@SECLEVEL=3D0')
=2D elif util.safehasattr(ssl, b'_RESTRICTED_SERVER_CIPHERS'):
=2D sslcontext.options |=3D getattr(ssl, 'OP_CIPHER_SERVER_PREFEREN=
CE', 0)
=2D # pytype: disable=3Dmodule-attr
=2D sslcontext.set_ciphers(ssl._RESTRICTED_SERVER_CIPHERS)
=2D # pytype: enable=3Dmodule-attr
=2D=20
=2D if requireclientcert:
=2D sslcontext.verify_mode =3D ssl.CERT_REQUIRED
=2D--- a/tests/test-https.t
=2D+++ b/tests/test-https.t
=2D@@ -356,19 +356,19 @@ Start servers running supported TLS vers
=2D $ cat ../hg1.pid >> $DAEMON_PIDS
=2D $ hg serve -p $HGPORT2 -d --pid-file=3D../hg2.pid --certificate=3D$PR=
IV \
=2D > --config devel.serverexactprotocol=3Dtls1.2
=2D $ cat ../hg2.pid >> $DAEMON_PIDS
=2D $ cd ..
=2D=20
=2D Clients talking same TLS versions work
=2D=20
=2D- $ P=3D"$CERTSDIR" hg --config hostsecurity.minimumprotocol=3Dtls1.0 -=
-config hostsecurity.ciphers=3DDEFAULT id https://localhost:$HGPORT/
=2D+ $ P=3D"$CERTSDIR" hg --config hostsecurity.minimumprotocol=3Dtls1.0 -=
-config hostsecurity.ciphers=3DDEFAULT:@SECLEVEL=3D0 id https://localhost:$=
HGPORT/
=2D 5fed3813f7f5
=2D- $ P=3D"$CERTSDIR" hg --config hostsecurity.minimumprotocol=3Dtls1.1 -=
-config hostsecurity.ciphers=3DDEFAULT id https://localhost:$HGPORT1/
=2D+ $ P=3D"$CERTSDIR" hg --config hostsecurity.minimumprotocol=3Dtls1.1 -=
-config hostsecurity.ciphers=3DDEFAULT:@SECLEVEL=3D0 id https://localhost:$=
HGPORT1/
=2D 5fed3813f7f5
=2D $ P=3D"$CERTSDIR" hg --config hostsecurity.minimumprotocol=3Dtls1.2 i=
d https://localhost:$HGPORT2/
=2D 5fed3813f7f5
=2D=20
=2D Clients requiring newer TLS version than what server supports fail
=2D=20
=2D $ P=3D"$CERTSDIR" hg id https://localhost:$HGPORT/
=2D (could not negotiate a common security protocol (tls1.1+) with localh=
ost; the likely cause is Mercurial is configured to be more secure than the=
server can support)
=2D@@ -400,17 +400,17 @@ Clients requiring newer TLS version than
=2D=20
=2D $ hg --config hostsecurity.minimumprotocol=3Dtls1.2 id --insecure htt=
ps://localhost:$HGPORT1/
=2D warning: connection security to localhost is disabled per current set=
tings; communication is susceptible to eavesdropping and tampering
=2D 5fed3813f7f5
=2D=20
=2D The per-host config option overrides the default
=2D=20
=2D $ P=3D"$CERTSDIR" hg id https://localhost:$HGPORT/ \
=2D- > --config hostsecurity.ciphers=3DDEFAULT \
=2D+ > --config hostsecurity.ciphers=3DDEFAULT:@SECLEVEL=3D0 \
=2D > --config hostsecurity.minimumprotocol=3Dtls1.2 \
=2D > --config hostsecurity.localhost:minimumprotocol=3Dtls1.0
=2D 5fed3813f7f5
=2D=20
=2D The per-host config option by itself works
=2D=20
=2D $ P=3D"$CERTSDIR" hg id https://localhost:$HGPORT/ \
=2D > --config hostsecurity.localhost:minimumprotocol=3Dtls1.2
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-contro=
l.scm
index 19f128d45f..d6fdb3fcec 100644
=2D-- 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")
=2D (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"))
=2D (patches (search-patches "mercurial-hg-extension-path.patch"
=2D "mercurial-openssl-compat.patch"))
+ (patches (search-patches "mercurial-hg-extension-path.patch"))
(sha256
(base32
=2D "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")
=2D (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
=2D "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
=2D-=20
2.41.0
--=-=-=--
--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQJEBAEBCAAuFiEE801qEjXQSQPNItXAE++NRSQDw+sFAmYahDcQHGFybmVfYmFi
QHdlYi5kZQAKCRAT741FJAPD6/8kEACvDXb5Qs+kcn96YBf4dBfCTj0MeweOfqVo
vRObSrhmJ1P/fZYhCY8t9r8Oknxwa5yAJQTiTTPWmhPPcW8tQmI2HsdRfnpE7HDT
X9+dSd8hrppO5/8nCOJWk+ggm1oOJkrChxwcH5j/jgJ2Tb6Jq1pKj2QK6ZHXQPEH
4t5+3/M7r2GkfEW4o4TxRcZaytKj7ivE+WYY/JOYx1xm1YEgkquJL3v+dMwSlEUN
33SEFaRxJmWA+FYMMPujgqQoAK7nJlf7b06RRfUj+su4EGbQp6Au25GRL+HoP8fj
QNoJXwnhvs8XmB0IFwqm0EsyUIEeQJSOMuPFCJNTIewJ7JQ7cYKMsht1uUvQOGMx
rdUwb7fHmlRitsbCSRKy64FVahw6GgfpAudg6f9b1KUlEy3v59/eiBrr7+K6YElp
R1bizPjIolbxP4CkyjYbHo9L+yJrEYtUZUt6CnPpwND3lmrXSa5miSuB7Lr6oTRi
evqfBFuJEnHpfgvh/g4puhXAmcibaDicj2FtIkQfPCgyL95Kstk4F3+LvG3jpvKQ
OwZKJUf7sHnpq+sfIRZc3/v4QDDtbRtps8hQiddzllLCXMtrXZmTNtFR0T/LFop5
TKSt2ifGciMh/eOfnHmDmfOO4acHvcdOyVDP8HwbMkxmc5RLsq6e9LETU+N41cbx
XahDzb9vY4jEBAEBCAAuFiEE3Si95tmHXKvOSosd3M8NswvBBUgFAmYahEMQHGFy
bmVfYmFiQHdlYi5kZQAKCRDczw2zC8EFSMFvA/9Oh5T7c3rQ1p3PAYd5aEqIELdZ
CbJ2v60L1vt24Rll0FbNeoqG9KVCorY7mCewrGuFkkJ18q2R/au8EgZy/s+K57tq
I4eao3A0BpoytBIVII3zmSGKQToQt2WK7TAxgejiYoCMQVM3gMhB/FMYkFY9gGZ8
vCzmRtMmxHkcY4lfow==
=6Vz1
-----END PGP SIGNATURE-----
--==-=-=--
"Dr. Arne Babenhauserheide" <arne_bab@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#70366; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.