From 09defa27453ff43648340defa31f3c4468cb01dc Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 2 Dec 2021 16:02:36 +0000 Subject: [PATCH] extra/nss_ldap to 265-9 --- extra/nss_ldap/PKGBUILD | 23 ++++++++++--- extra/nss_ldap/reproducible-build.patch | 43 +++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 extra/nss_ldap/reproducible-build.patch diff --git a/extra/nss_ldap/PKGBUILD b/extra/nss_ldap/PKGBUILD index ce1d45c1c..7377838b3 100644 --- a/extra/nss_ldap/PKGBUILD +++ b/extra/nss_ldap/PKGBUILD @@ -8,7 +8,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" @@ -16,19 +16,32 @@ license=('LGPL') depends=('libldap' 'krb5') backup=("etc/nss_ldap.conf") source=("https://fossies.org/linux/privat/old/${pkgname}-${pkgver}.tar.gz" - 'nss_ldap-265-glibc-2.16.patch' - 'nss_ldap-265-pthread.patch') + 'nss_ldap-265-glibc-2.16.patch' + '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}" patch -p0 -i ../nss_ldap-265-glibc-2.16.patch patch -p0 -i ../nss_ldap-265-pthread.patch cp /usr/share/libtool/build-aux/config.{sub,guess} . + # reproducible builds + patch -p1 -i ../reproducible-build.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export PERL5LIB="$PWD" ./configure \ --prefix=/usr \ diff --git a/extra/nss_ldap/reproducible-build.patch b/extra/nss_ldap/reproducible-build.patch new file mode 100644 index 000000000..f2e8af622 --- /dev/null +++ b/extra/nss_ldap/reproducible-build.patch @@ -0,0 +1,43 @@ +Author: Reiner Herrmann +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"; + }