[debrepatch] 01/01: toolchain-patches: dpkg: update
Ximin Luo
infinity0 at debian.org
Tue Oct 17 11:26:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository debrepatch.
commit f272bdc4697eb2a615b6c73ee459463f4f17078d
Author: Ximin Luo <infinity0 at debian.org>
Date: Tue Oct 17 13:25:55 2017 +0200
toolchain-patches: dpkg: update
---
toolchain-patches/dpkg_BPPM.patch | 73 ++++++++++++++++-----------------------
1 file changed, 29 insertions(+), 44 deletions(-)
diff --git a/toolchain-patches/dpkg_BPPM.patch b/toolchain-patches/dpkg_BPPM.patch
index 0bfe401..58c336c 100644
--- a/toolchain-patches/dpkg_BPPM.patch
+++ b/toolchain-patches/dpkg_BPPM.patch
@@ -1,27 +1,15 @@
-From 9cb8b730d5672b3f3531d543c8fdd85cabd1e5da Mon Sep 17 00:00:00 2001
-From: Ximin Luo <infinity0 at debian.org>
-Date: Fri, 7 Apr 2017 17:04:26 +0200
-Subject: [PATCH] Support BUILD_PATH_PREFIX_MAP
- https://reproducible-builds.org/specs/build-path-prefix-map/
+commit 2e5b5c96c882976d151636ce6a52385dd309b194
+Author: Ximin Luo <infinity0 at debian.org>
+Date: Tue Oct 17 13:08:49 2017 +0200
----
- debian/changelog | 13 +++++++++++++
- man/dpkg-buildflags.man | 8 ++++++--
- man/dpkg-buildpackage.man | 9 +++++++++
- scripts/Dpkg/Path.pm | 29 +++++++++++++++++++++++++++++
- scripts/Dpkg/Vendor/Debian.pm | 2 +-
- scripts/dpkg-buildpackage.pl | 5 ++++-
- scripts/dpkg-genbuildinfo.pl | 5 ++++-
- scripts/mk/pkg-info.mk | 15 ++++++++++++++-
- scripts/t/dpkg_buildpackage.t | 1 +
- 9 files changed, 81 insertions(+), 6 deletions(-)
+ Support BUILD_PATH_PREFIX_MAP https://reproducible-builds.org/specs/build-path-prefix-map/
diff --git a/debian/changelog b/debian/changelog
-index 6538c61eb..886a4cbbb 100644
+index 9d2b28bd2..62ee55b6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
-+dpkg (1.18.23.0~reproducible2) unstable; urgency=medium
++dpkg (1.19.0.1.0~reproducible1) unstable; urgency=medium
+
+ * dpkg-buildpackage: Append ${pkg}_${ver} to the BUILD_PATH_PREFIX_MAP envvar
+ as described by https://reproducible-builds.org/specs/build-path-prefix-map/
@@ -34,14 +22,14 @@ index 6538c61eb..886a4cbbb 100644
+
+ -- Ximin Luo <infinity0 at debian.org> Fri, 31 Mar 2017 15:58:56 -0400
+
- dpkg (1.18.23) unstable; urgency=medium
+ dpkg (1.19.0.1) unstable; urgency=medium
- * Handle unmatched arch-qualified virtual packages in dpkg-genbuildinfo,
+ * Packaging:
diff --git a/man/dpkg-buildflags.man b/man/dpkg-buildflags.man
-index 60f67a5ce..57bb1b8d1 100644
+index 541132e0b..3998fa3e9 100644
--- a/man/dpkg-buildflags.man
+++ b/man/dpkg-buildflags.man
-@@ -427,13 +427,17 @@ This will cause warnings when the \fB__TIME__\fP, \fB__DATE__\fP and
+@@ -470,13 +470,17 @@ This will cause warnings when the \fB__TIME__\fP, \fB__DATE__\fP and
.
.TP
.B fixdebugpath
@@ -62,10 +50,10 @@ index 60f67a5ce..57bb1b8d1 100644
.SH ENVIRONMENT
There are 2 sets of environment variables doing the same operations, the
diff --git a/man/dpkg-buildpackage.man b/man/dpkg-buildpackage.man
-index 79aa18f58..4d4be4f5c 100644
+index bf9c6ace1..51ea977f9 100644
--- a/man/dpkg-buildpackage.man
+++ b/man/dpkg-buildpackage.man
-@@ -519,6 +519,15 @@ option is integrated in the build environment.
+@@ -523,6 +523,15 @@ This variable is set to \fIgain-root-command\fP when the field
This variable is set to the Unix timestamp since the epoch of the
latest entry in \fIdebian/changelog\fP, if it is not already defined.
.
@@ -129,20 +117,20 @@ index f352cac35..0443ca7fe 100644
=head1 CHANGES
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
-index 091ec42ad..2562b29e0 100644
+index e0fd01113..ab92021ce 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
-@@ -145,7 +145,7 @@ sub _add_reproducible_flags {
- # Default feature states.
- my %use_feature = (
- timeless => 1,
-- fixdebugpath => 1,
-+ fixdebugpath => 0,
- );
-
- my $build_path;
+@@ -112,7 +112,7 @@ sub _add_build_flags {
+ },
+ reproducible => {
+ timeless => 1,
+- fixdebugpath => 1,
++ fixdebugpath => 0,
+ },
+ sanitize => {
+ address => 0,
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
-index 2eea20391..9f5f3dc40 100755
+index affcca8d0..3c4779da0 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -43,7 +43,7 @@ use Dpkg::Version;
@@ -154,7 +142,7 @@ index 2eea20391..9f5f3dc40 100755
use Dpkg::IPC;
textdomain('dpkg-dev');
-@@ -449,6 +449,9 @@ if ($changedby) {
+@@ -461,6 +461,9 @@ if ($changedby) {
# <https://reproducible-builds.org/specs/source-date-epoch/>
$ENV{SOURCE_DATE_EPOCH} ||= $changelog->{timestamp} || time;
@@ -162,13 +150,13 @@ index 2eea20391..9f5f3dc40 100755
+$ENV{"BUILD_PATH_PREFIX_MAP"} = path_prefix_map_append(
+ $ENV{"BUILD_PATH_PREFIX_MAP"}, "${pkg}_${version}", $cwd);
- my @arch_opts;
- push @arch_opts, ('--host-arch', $host_arch) if $host_arch;
+ # Check whether we are doing some kind of rootless build, and sanity check
+ # the fields values.
diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl
-index 27bf7dcef..1e2d056ed 100755
+index 45c45089d..b1f6be384 100755
--- a/scripts/dpkg-genbuildinfo.pl
+++ b/scripts/dpkg-genbuildinfo.pl
-@@ -249,11 +249,14 @@ sub collect_installed_builddeps {
+@@ -250,11 +250,14 @@ sub collect_installed_builddeps {
sub cleansed_environment {
# Consider only whitelisted variables which are not supposed to leak
# local user information.
@@ -216,7 +204,7 @@ index 15322cedd..6f42d3292 100644
+# FIXME: "export" makes dpkg_late_eval completely pointless since it forces
+# evaluation. This is true for both SOURCE_DATE_EPOCH and BUILD_PATH_PREFIX_MAP
diff --git a/scripts/t/dpkg_buildpackage.t b/scripts/t/dpkg_buildpackage.t
-index faae2cba4..6f6a2ef07 100644
+index 2b4345539..bdea5d859 100644
--- a/scripts/t/dpkg_buildpackage.t
+++ b/scripts/t/dpkg_buildpackage.t
@@ -44,6 +44,7 @@ delete $ENV{MAKEFLAGS};
@@ -227,6 +215,3 @@ index faae2cba4..6f6a2ef07 100644
# Delete other variables that can affect the tests.
delete $ENV{$_} foreach grep { m/^DEB_/ } keys %ENV;
---
-2.14.2
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debrepatch.git
More information about the Reproducible-commits
mailing list