[arch-commits] Commit in nss_ldap/trunk (PKGBUILD reproducible-build.patch)

[Evangelos Foutras]

    Date: Thursday, December 2, 2021 @ 13:45:39
  Author: foutrelis
Revision: 430284

upgpkg: nss_ldap 265-9: apply repro fix by kpcyrd

Added:
  nss_ldap/trunk/reproducible-build.patch
Modified:
  nss_ldap/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   21 +++++++++++++++++----
 reproducible-build.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-02 13:11:20 UTC (rev 430283)
+++ PKGBUILD	2021-12-02 13:45:39 UTC (rev 430284)
@@ -3,7 +3,7 @@
 
 pkgname=nss_ldap
 pkgver=265
-pkgrel=8
+pkgrel=9
 pkgdesc="The nss_ldap module provides the means for Linux and Solaris workstations to resolve the entities defined in RFC 2307 from LDAP directories."
 arch=('x86_64')
 url="http://www.padl.com/OSS/nss_ldap.html"
@@ -12,12 +12,18 @@
 backup=("etc/nss_ldap.conf")
 source=("https://fossies.org/linux/privat/old/${pkgname}-${pkgver}.tar.gz"
         "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/6a27f55c8370f8b49fd3c10d46214de9c9c37932/extra/nss_ldap/nss_ldap-265-glibc-2.16.patch"
-        "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/6a27f55c8370f8b49fd3c10d46214de9c9c37932/extra/nss_ldap/nss_ldap-265-pthread.patch")
+        "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/6a27f55c8370f8b49fd3c10d46214de9c9c37932/extra/nss_ldap/nss_ldap-265-pthread.patch"
+        "reproducible-build.patch")
 md5sums=('c1cb02d1a85538cf16bca6f6a562abe4'
          '49df78dc482f90f5c3d850a664308216'
-         '38c881edcb8df6b426f8a9d8f269d567')
+         '38c881edcb8df6b426f8a9d8f269d567'
+         'fd05b8e76fe16a3ac54bffe58db57ff1')
+b2sums=('31b233ef7680204abfb62408141609b9489e133327c787c59afedd9ac41194189bde26d1f3b0a885622f57ec769ddee2bdf7d274b9584d4d5002d1c016c86892'
+        'f736842ef193d863c80349cacd2dfc6991e4e92d5e2205f2f40767a9786b86b0fa4b06d671dd17d93e7c7a8da65c2a7d3111914480d7a9cf308a9c2f37753b89'
+        'ff732b836d4405041337f653cc3f8d4645704d94023285cd31af58739331459337fb66c1928ff3a4b42b3aed29ffa95e0408734ab5e18b67c4f86ce84b5362af'
+        'da2f5b2a35c723acf464a6ec85a1658799e5fcdc898645f57224a50848287a7716b9e02fbaa731838417d1e54f8322f9748d83e324f997bbf737c215cbd42c6e')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   # FS#41068 
@@ -24,6 +30,13 @@
   patch -p0 -i ../nss_ldap-265-glibc-2.16.patch
   patch -p0 -i ../nss_ldap-265-pthread.patch
 
+  # reproducible builds
+  patch -p1 -i ../reproducible-build.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   export PERL5LIB="$PWD"
   ./configure \
        --prefix=/usr \

Added: reproducible-build.patch
===================================================================
--- reproducible-build.patch	                        (rev 0)
+++ reproducible-build.patch	2021-12-02 13:45:39 UTC (rev 430284)
@@ -0,0 +1,43 @@
+Author: Reiner Herrmann <reiner at reiner-h.de>
+Description: Remove build user and date from version string to make build reproducible
+
+--- libnss-ldap-265.orig/vers_string
++++ libnss-ldap-265/vers_string
+@@ -32,17 +32,17 @@ if ($ARGV[0] eq "-f") {
+ 	print $PROJECT, $SEP, $VERSION, "\n";
+ } elsif ($ARGV[0] eq "-l") {
+ 	print "static const char SGS_VERS[160] = \"";
+-	print '@(#)LIBRARY:', $PROGRAM, '  PROJECT:', $PROJECT, $SEP, $VERSION, '  DEVELOPER:', $AUTHOR,  '  BUILT:', $DATE;
++	print '@(#)LIBRARY:', $PROGRAM, '  PROJECT:', $PROJECT, $SEP, $VERSION;
+ 	print "\";\n";
+ } elsif ($ARGV[0] eq "-c") {
+ 	print "const char SGS_VERS[160] = \"";
+-	print '@(#)PROGRAM:', $PROGRAM, '  PROJECT:', $PROJECT, $SEP, $VERSION, '  DEVELOPER:', $AUTHOR,  '  BUILT:', $DATE;
++	print '@(#)PROGRAM:', $PROGRAM, '  PROJECT:', $PROJECT, $SEP, $VERSION;
+ 	print "\";\n";
+ 	print "const char VERS_NUM[10] = \"$VERSION\";\n";
+ } elsif ($ARGV[0] eq "-n") {
+ 	print "$VERSION\n";
+ } elsif ($ARGV[0] eq "-B") {
+-	print 'PROGRAM:', $PROGRAM, '  PROJECT:', $PROJECT, $SEP, $VERSION, '  DEVELOPER:', $AUTHOR,  '  BUILT:NO DATE SET (-B used)',"\n";
++	print 'PROGRAM:', $PROGRAM, '  PROJECT:', $PROJECT, $SEP, $VERSION,"\n";
+ } elsif ($ARGV[0] eq "-v") {
+ 	unlink($OUTFILE);
+ 	open(OUTFILE,">$OUTFILE");
+@@ -52,7 +52,7 @@ if ($ARGV[0] eq "-f") {
+ 		print OUTFILE "#define USE_SGS_VERS\n\n";
+ 	}
+ 	print OUTFILE "const char SGS_VERS[160] = \"";
+-	print OUTFILE '@(#)PROGRAM:', $PROGRAM, '  PROJECT:', $PROJECT, $SEP, $VERSION, '  DEVELOPER:', $AUTHOR,  '  BUILT:', $DATE;
++	print OUTFILE '@(#)PROGRAM:', $PROGRAM, '  PROJECT:', $PROJECT, $SEP, $VERSION;
+ 	print OUTFILE "\";\n\n";
+ 	print OUTFILE "const char VERS_NUM[10] = \"$VERSION\";\n\n";
+ 	close(OUTFILE);
+@@ -78,6 +78,6 @@ if ($ARGV[0] eq "-f") {
+ 	print STDERR "\tTo create a project distribution, type tarup\n";
+ 	print STDERR "\tTo commit a project, type commit [message]\n";
+ } else {
+-	print 'PROGRAM:', $PROGRAM, '  PROJECT:', $PROJECT, $SEP, $VERSION, '  DEVELOPER:', $AUTHOR,  '  BUILT:', $DATE;
++	print 'PROGRAM:', $PROGRAM, '  PROJECT:', $PROJECT, $SEP, $VERSION;
+ 	print "\n";
+ }