diff options
| -rw-r--r-- | debian/patches/make-build-output-independent-of-basenam.patch | 24 | ||||
| -rw-r--r-- | debian/patches/patch-makefile.am-to-disable-installing-.patch | 55 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 81 insertions, 0 deletions
diff --git a/debian/patches/make-build-output-independent-of-basenam.patch b/debian/patches/make-build-output-independent-of-basenam.patch new file mode 100644 index 0000000..650dcd9 --- /dev/null +++ b/debian/patches/make-build-output-independent-of-basenam.patch @@ -0,0 +1,24 @@ +From: Daniel Shahaf <danielsh@apache.org> +Date: Tue, 22 Dec 2020 02:34:33 +0000 +X-Dgit-Generated: 265-6 39b5ad825edc1220edb289947a53c7ad26e79614 +Subject: Make build output independent of basename of source directory + +(Closes: #845229) + +Needed for reproducible builds. + +Author: Daniel Shahaf <danielsh@apache.org> +Bug-Debian: https://bugs.debian.org/845229 +Last-Update: 2016-11-21 + +--- + +--- libnss-ldap-265.orig/Makefile.am ++++ libnss-ldap-265/Makefile.am +@@ -109,5 +109,5 @@ uninstall-local: + @$(NORMAL_UNINSTALL) + + vers.c: $(top_srcdir)/CVSVersionInfo.txt +- CVSVERSIONDIR=$(top_srcdir) $(top_srcdir)/vers_string -v ++ CVSVERSIONDIR=$(top_srcdir) PROGRAM="libnss-ldap-$(VERSION)" $(top_srcdir)/vers_string -v + diff --git a/debian/patches/patch-makefile.am-to-disable-installing-.patch b/debian/patches/patch-makefile.am-to-disable-installing-.patch new file mode 100644 index 0000000..4346399 --- /dev/null +++ b/debian/patches/patch-makefile.am-to-disable-installing-.patch @@ -0,0 +1,55 @@ +From: Vagrant Cascadian <vagrant@reproducible-builds.org> +Date: Tue, 22 Dec 2020 07:53:43 +0000 +X-Dgit-Generated: 265-6 a2dabc3763748bb5da1fb696f10d5e83eb790c0e +Subject: Patch Makefile.am to disable installing with a specified UID or GID. + +This should allow "Rules-Requires-Root: no" to work. + +--- + +--- libnss-ldap-265.orig/Makefile.am ++++ libnss-ldap-265/Makefile.am +@@ -68,9 +68,9 @@ if AIX + + install-exec-local: nss_ldap.so NSS_LDAP + $(mkinstalldirs) $(DESTDIR)$(libdir)/netsvc/dynload +- $(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/netsvc/dynload/nss_ldap.so ++ $(INSTALL_PROGRAM) nss_ldap.so $(DESTDIR)$(libdir)/netsvc/dynload/nss_ldap.so + $(mkinstalldirs) $(DESTDIR)$(libdir)/security +- $(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) NSS_LDAP $(DESTDIR)$(libdir)/security/NSS_LDAP ++ $(INSTALL_PROGRAM) NSS_LDAP $(DESTDIR)$(libdir)/security/NSS_LDAP + + else + +@@ -81,16 +81,16 @@ install-exec-local: nss_ldap.so + if GLIBC + -rm -f $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED) + $(mkinstalldirs) $(DESTDIR)$(libdir) +- $(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED) ++ $(INSTALL_PROGRAM) nss_ldap.so $(DESTDIR)$(libdir)/$(NSS_LDAP_LIBC_VERSIONED) + (cd $(DESTDIR)$(libdir); ln -sf $(NSS_LDAP_LIBC_VERSIONED) $(NSS_LDAP_NSS_VERSIONED)) + $(mkinstalldirs) $(DESTDIR)/usr$(libdir) + (cd $(DESTDIR)/usr$(libdir); ln -sf $(libdir)/$(NSS_LDAP_NSS_VERSIONED) libnss_ldap.so) + else + $(mkinstalldirs) $(DESTDIR)$(libdir) + if HPUX +- $(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/libnss_ldap.1 ++ $(INSTALL_PROGRAM) nss_ldap.so $(DESTDIR)$(libdir)/libnss_ldap.1 + else +- $(INSTALL_PROGRAM) -o $(INST_UID) -g $(INST_GID) nss_ldap.so $(DESTDIR)$(libdir)/nss_ldap.so.1 ++ $(INSTALL_PROGRAM) nss_ldap.so $(DESTDIR)$(libdir)/nss_ldap.so.1 + (cd $(DESTDIR)$(libdir); rm -f nss_ldap.so; ln -s nss_ldap.so.1 nss_ldap.so) + endif + endif +@@ -101,9 +101,9 @@ install-data-local: + @$(NORMAL_INSTALL) + @if test ! -f $(DESTDIR)$(NSS_LDAP_PATH_CONF); then \ + $(mkinstalldirs) $(DESTDIR)$(dir $(NSS_LDAP_PATH_CONF)); \ +- $(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/ldap.conf $(DESTDIR)$(NSS_LDAP_PATH_CONF); \ ++ $(INSTALL_DATA) $(srcdir)/ldap.conf $(DESTDIR)$(NSS_LDAP_PATH_CONF); \ + fi +- $(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/nsswitch.ldap $(DESTDIR)$(sysconfdir)/nsswitch.ldap; ++ $(INSTALL_DATA) $(srcdir)/nsswitch.ldap $(DESTDIR)$(sysconfdir)/nsswitch.ldap; + + uninstall-local: + @$(NORMAL_UNINSTALL) diff --git a/debian/patches/series b/debian/patches/series index ec1b7ab..5ceeeaa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,5 @@ spelling-fix.patch glibc-2.16.patch fix-nsswitch-example.patch reproducible-build.patch +make-build-output-independent-of-basenam.patch +patch-makefile.am-to-disable-installing-.patch |