Thanks. = )

Em 17/11/2022 16:48, Vagrant Cascadian escreveu:
Control: tags 834050 pending

On 2017-02-15, Chris Lamb wrote:
Lucas Castro wrote:

I suppose the patch hadn't fixed the bug.
Ah, try:

   --- libpam-ldap-186.orig/vers_string
   +++ libpam-ldap-186/vers_string
   @@ -14,6 +14,10 @@ if ($ENV{'PROGRAM'}) { $PROGRAM = $ENV{'
chop($AUTHOR);
    chop($DATE=`date -u`);
   +if (defined $ENV{SOURCE_DATE_EPOCH}) {
   +    chop($DATE=`LC_ALL=C date --date="@\${SOURCE_DATE_EPOCH}" -u`);
   +    $AUTHOR="NO DEVELOPER SET";
   +}
    chop($CWD=`pwd`);
($PROJECT, $VERSION) = split(/\-/, &getCVSVersionInfo());
This solved both the timestamp and build user issue!

There was another issue where the package and version information is
derived from the top-level build directory, but this can be fixed easily
by passing PROGRAM to dh_auto_build.

Uploaded an NMU to DELAYED/10 which fixes both outstanding issues:

diff -Nru libpam-ldap-186/debian/changelog libpam-ldap-186/debian/changelog
--- libpam-ldap-186/debian/changelog    2017-05-31 10:19:41.000000000 -0700
+++ libpam-ldap-186/debian/changelog    2022-11-17 11:42:13.000000000 -0800
@@ -1,3 +1,17 @@
+libpam-ldap (186-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Chris Lamb ]
+  * vers_string: Use fixed value for AUTHOR if SOURCE_DATE_EPOCH is
+    set. (Closes: #834050)
+
+  [ Vagrant Cascadian ]
+  * debian/rules: Pass PROGRAM to dh_auto_build override.
+    (Closes: #834050)
+
+ -- Vagrant Cascadian <vagr...@reproducible-builds.org>  Thu, 17 Nov 2022 
11:42:13 -0800
+
  libpam-ldap (186-4) unstable; urgency=medium
* Install /usr/share/pam-configs/ldap
diff -Nru libpam-ldap-186/debian/patches/series 
libpam-ldap-186/debian/patches/series
--- libpam-ldap-186/debian/patches/series       2017-02-10 20:39:24.000000000 
-0800
+++ libpam-ldap-186/debian/patches/series       2022-11-17 11:42:13.000000000 
-0800
@@ -6,3 +6,4 @@
  reproducible_build.patch
  configfile_install.patch
  configfile_references.patch
+vers_string-use-fixed-value-for-author-i.patch
diff -Nru 
libpam-ldap-186/debian/patches/vers_string-use-fixed-value-for-author-i.patch 
libpam-ldap-186/debian/patches/vers_string-use-fixed-value-for-author-i.patch
--- 
libpam-ldap-186/debian/patches/vers_string-use-fixed-value-for-author-i.patch   
    1969-12-31 16:00:00.000000000 -0800
+++ 
libpam-ldap-186/debian/patches/vers_string-use-fixed-value-for-author-i.patch   
    2022-11-17 11:42:13.000000000 -0800
@@ -0,0 +1,21 @@
+From: Chris Lamb <la...@debian.org>
+Date: Wed, 15 Feb 2017 17:12:58 +1300
+X-Dgit-Generated: 186-4.1 98efdb0f8a716ed9c1403523c90f3b0b6ff8c493
+Subject: vers_string: Use fixed value for AUTHOR if SOURCE_DATE_EPOCH is set.
+
+(Closes: #834050)
+
+---
+
+diff --git a/vers_string b/vers_string
+index 11af68a..5a072f3 100755
+--- a/vers_string
++++ b/vers_string
+@@ -16,6 +16,7 @@ chop($AUTHOR);
+ chop($DATE=`date -u`);
+ if (defined $ENV{SOURCE_DATE_EPOCH}) {
+       chop($DATE=`LC_ALL=C date --date="@\${SOURCE_DATE_EPOCH}" -u`);
++      $AUTHOR="NO DEVELOPER SET";
+ }
+ chop($CWD=`pwd`);
+
diff -Nru libpam-ldap-186/debian/rules libpam-ldap-186/debian/rules
--- libpam-ldap-186/debian/rules        2017-05-31 10:19:28.000000000 -0700
+++ libpam-ldap-186/debian/rules        2022-11-17 11:42:13.000000000 -0800
@@ -4,6 +4,8 @@
export DEB_BUILD_MAINT_OPTIONS= hardening=+bindnow +include /usr/share/dpkg/pkg-info.mk
+
  %:
        dh $@ --with autoreconf
@@ -17,3 +19,6 @@
        dh_install
        install -D -m 644 debian/libpam-ldap.pam-auth-update \
                debian/libpam-ldap/usr/share/pam-configs/ldap
+
+override_dh_auto_build:
+       dh_auto_build -- PROGRAM=$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)



live well,
   vagrant

Attachment: OpenPGP_signature
Description: OpenPGP digital signature

Reply via email to