Received: from wnew4-smtp.messagingengine.com (wnew4-smtp.messagingengine.com [64.147.123.18]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 746F5781B6D for ; Tue, 10 Mar 2020 21:01:00 +0000 (UTC) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailnew.west.internal (Postfix) with ESMTP id 1BFA4879; Tue, 10 Mar 2020 16:47:55 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 10 Mar 2020 16:47:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chabant.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=1CaYWOFn1IwRiCRY0hl6la/v/D M69Tz6ynA2HCyAt1Y=; b=DZsxqOnxA6VlVgZRRMdmiAGfPFoDDtSc0zxhJs42Lp 5/UNpMS7Mhyw+YJLyDtIi0kU0VwrfUJI0Ymkap5zGgMV/E1expjoQLsNR3rnXUll 7iEHRq/Wn2oGtkbuaoOLVrsefp4xeg5QCZEdszeNXzftaJ4OskFHBraDLKsOgyGr vUqcDWviMPKaxgpctR1jz3afcvSYv+aRMNr4g4JaMviLO34PZEDR+eB1acyel121 Jk0CTd3tuAAz/TECvH0w03bVyxYgEOFo3fQJuZnzXjsE6TWARhEU+mR7uI3u70gQ nhZvhLQ/Q0cxkwci73Rwk0uV8AwpPIdBX/dmgFfECPbg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=1CaYWOFn1IwRiCRY0 hl6la/v/DM69Tz6ynA2HCyAt1Y=; b=writtvaN1dEJPu6SanubJnYjs9KuMJgzY GNdP0sdHd5GnCfIhsz0g4CYAm2p1ACfJECb+bamTtrS5d1NZcpkMmNfZW7RyXPMG IpHnZGsNLGUujWtzJh/1L3sjDvzcc70sdfE19V1309tEKCfP4yCjsBC6bUMH61p6 jMILiQGs5isXyR7Fo0275nnLVw7TVPvKBlODe2ea9sf1QxOViKf1CgiegaSRzH0F 6U7NL7KvKpmCcUX6eC+HLChbtYzHIU+F3ZmwScg526WEbVGV/HzKQukO26pUV03m v8bdOVhDb0RgTRHL2R5vEy0XFD3HhmF+7JIVnQk1dHfOOVG3KB7/g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedruddvtddgudefgecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecuogfrhhhishhhihhnghdqkfhppfgvthifohhrkh culdeftddtmdenucfjughrpefhvffufffkofgggfestdekredtredttdenucfhrhhomhep nfhuughovhhitgcuvehhrggsrghnthcuoehluhguohhvihgtsegthhgrsggrnhhtrdgtoh hmqeenucffohhmrghinhepmhgvrhgtuhhrihgrlhdqshgtmhdrohhrghenucfkphepudej vddruddthedrvddvrddvjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehluhguohhvihgtsegthhgrsggrnhhtrdgtohhm X-ME-Proxy: Received: from localhost.members.linode.com (li1977-27.members.linode.com [172.105.22.27]) by mail.messagingengine.com (Postfix) with ESMTPA id 146A23280068; Tue, 10 Mar 2020 16:47:54 -0400 (EDT) From: Ludovic Chabant To: alpine-aports@lists.alpinelinux.org Cc: Ludovic Chabant Subject: [PATCH] Add hotfix for running `hg archive` with gzip files on python 3.8.2+ Date: Tue, 10 Mar 2020 20:47:48 +0000 Message-Id: <20200310204748.28104-1-ludovic@chabant.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit --- main/mercurial/APKBUILD | 7 ++++--- main/mercurial/archive_gzip.patch | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 main/mercurial/archive_gzip.patch diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD index 7932977c84..9c53e77fd3 100644 --- a/main/mercurial/APKBUILD +++ b/main/mercurial/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=mercurial pkgver=5.3.1 -pkgrel=0 +pkgrel=1 pkgdesc="Scalable distributed SCM tool" url="https://www.mercurial-scm.org" arch="all" @@ -15,7 +15,7 @@ subpackages=" $pkgname-zsh-completion:zshcomp:noarch $pkgname-bash-completion:bashcomp:noarch " -source="https://www.mercurial-scm.org/release/mercurial-$pkgver.tar.gz" +source="https://www.mercurial-scm.org/release/mercurial-$pkgver.tar.gz archive_gzip.patch" # secfixes: # 4.9-r0: @@ -65,4 +65,5 @@ bashcomp() { "$subpkgdir"/usr/share/bash-completion/completions/$pkgname } -sha512sums="3bc49ea96cb4ac0e777f667a3243917af495a001534b6b91141fc93b5c47a8eddc84331e1cb0b981fac1bf451dcfc91b8c538134983733466248fdc20afd39c6 mercurial-5.3.1.tar.gz" +sha512sums="3bc49ea96cb4ac0e777f667a3243917af495a001534b6b91141fc93b5c47a8eddc84331e1cb0b981fac1bf451dcfc91b8c538134983733466248fdc20afd39c6 mercurial-5.3.1.tar.gz +42974b580e5dafc562fdce9728b90f882a2cfb10c3c0adbd50d41382bd6bcf3a430be6fc81c52a3baa3955677999bf4662c5e5b5bc90891ba9c862ec27c448a2 archive_gzip.patch" diff --git a/main/mercurial/archive_gzip.patch b/main/mercurial/archive_gzip.patch new file mode 100644 index 0000000000..5f4f81ecff --- /dev/null +++ b/main/mercurial/archive_gzip.patch @@ -0,0 +1,22 @@ +# HG changeset patch +# User Ludovic Chabant +# Date 1583871438 0 +# Tue Mar 10 20:17:18 2020 +0000 +# Node ID 70878db5d0ede9c39128328cfa8cb6ee758d5374 +# Parent a08bbdf839ae08ff69c6f99a289ee85b3a012f03 +archive: fix crash when archiving to gzip file with Python 3.8.2+ + +Differential Revision: https://phab.mercurial-scm.org/D8272 + +diff --git a/mercurial/archival.py b/mercurial/archival.py +--- a/mercurial/archival.py ++++ b/mercurial/archival.py +@@ -146,7 +146,7 @@ + self.timestamp = timestamp + gzip.GzipFile.__init__(self, *args, **kw) + +- def _write_gzip_header(self): ++ def _write_gzip_header(self, *args, **kwargs): + self.fileobj.write(b'\037\213') # magic header + self.fileobj.write(b'\010') # compression method + fname = self.name -- 2.24.1