From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 425751395E2 for ; Sun, 6 Nov 2016 11:06:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E465EE09B9; Sun, 6 Nov 2016 11:06:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBA2FE09B9 for ; Sun, 6 Nov 2016 11:06:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 580853416BA for ; Sun, 6 Nov 2016 11:06:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BF432306 for ; Sun, 6 Nov 2016 11:06:41 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1478430400.7edf995959b4a06a5e9b14de3d9de7a88d0103d4.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/dpkg/, app-arch/dpkg/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/dpkg/dpkg-1.18.12.ebuild app-arch/dpkg/files/dpkg-1.18.12-dpkg_buildpackage-test.patch app-arch/dpkg/files/dpkg-1.18.12-rsyncable.patch X-VCS-Directories: app-arch/dpkg/files/ app-arch/dpkg/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 7edf995959b4a06a5e9b14de3d9de7a88d0103d4 X-VCS-Branch: master Date: Sun, 6 Nov 2016 11:06:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fee03f15-a91d-469a-8562-32cc70394bf8 X-Archives-Hash: 78a5364889bd7e096ee0e0ddd462faf5 commit: 7edf995959b4a06a5e9b14de3d9de7a88d0103d4 Author: Jeroen Roovers gentoo org> AuthorDate: Sun Nov 6 11:05:50 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Sun Nov 6 11:06:40 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7edf9959 app-arch/dpkg: Fix the gzip --rsyncable check. Disable one pedantic test. Package-Manager: portage-2.3.2 app-arch/dpkg/dpkg-1.18.12.ebuild | 2 ++ .../dpkg-1.18.12-dpkg_buildpackage-test.patch | 10 ++++++++ app-arch/dpkg/files/dpkg-1.18.12-rsyncable.patch | 28 ++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/app-arch/dpkg/dpkg-1.18.12.ebuild b/app-arch/dpkg/dpkg-1.18.12.ebuild index f647cdb..94b5afe 100644 --- a/app-arch/dpkg/dpkg-1.18.12.ebuild +++ b/app-arch/dpkg/dpkg-1.18.12.ebuild @@ -47,6 +47,8 @@ DOCS=( PATCHES=( "${FILESDIR}"/${PN}-1.18.9-strerror.patch "${FILESDIR}"/${PN}-1.18.12-flags.patch + "${FILESDIR}"/${PN}-1.18.12-rsyncable.patch + "${FILESDIR}"/${PN}-1.18.12-dpkg_buildpackage-test.patch ) src_prepare() { diff --git a/app-arch/dpkg/files/dpkg-1.18.12-dpkg_buildpackage-test.patch b/app-arch/dpkg/files/dpkg-1.18.12-dpkg_buildpackage-test.patch new file mode 100644 index 00000000..e971675 --- /dev/null +++ b/app-arch/dpkg/files/dpkg-1.18.12-dpkg_buildpackage-test.patch @@ -0,0 +1,10 @@ +--- a/scripts/Makefile.am ++++ b/scripts/Makefile.am +@@ -238,7 +238,6 @@ + t/Dpkg_Source_Package.t \ + t/Dpkg_Dist_Files.t \ + t/dpkg_source.t \ +- t/dpkg_buildpackage.t \ + t/merge_changelogs.t \ + t/mk.t \ + $(nil) diff --git a/app-arch/dpkg/files/dpkg-1.18.12-rsyncable.patch b/app-arch/dpkg/files/dpkg-1.18.12-rsyncable.patch new file mode 100644 index 00000000..69802da --- /dev/null +++ b/app-arch/dpkg/files/dpkg-1.18.12-rsyncable.patch @@ -0,0 +1,28 @@ +--- a/scripts/Dpkg/Compression.pm ++++ b/scripts/Dpkg/Compression.pm +@@ -81,20 +81,12 @@ + }; + + # +-# XXX: The gzip package in Debian at some point acquired a Debian-specific +-# --rsyncable option via a vendor patch. Which is not present in most of the +-# major distributions, dpkg downstream systems, nor gzip upstream, who have +-# stated they will most probably not accept it because people should be using +-# pigz instead. ++# If gzip supports --rsyncable (version >=1.7 or the Debian patched variant), ++# we use it. Sadly a non-compliant gzip will not complain about the argument ++# when it does not understand it, so we can only print out the usage and infer ++# --rsyncable support from that. + # +-# This option should have never been accepted in dpkg, ever. But removing it +-# now would probably cause demands for tarring and feathering. In addition +-# we cannot use the Dpkg::Vendor logic because that would cause circular +-# module dependencies. The whole affair is pretty disgusting really. +-# +-# Check the perl Config to discern Debian and hopefully derivatives too. +-# +-if ($Config{cf_by} eq 'Debian Project') { ++if (system("gzip --help 2>&1 | grep -q -- --rsyncable") == 0) { + push @{$COMP->{gzip}->{comp_prog}}, '--rsyncable'; + } +