From 76fdf60b56c0e619362a257f5feff0187c3cd2ec Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 5 Nov 2019 13:16:28 -0500
Subject: [PATCH] import nss-altfiles-2.18.1-12.el8

---
 SOURCES/ldflags.patch   | 41 +++++++++++++++++++++++++++++++++++++++++
 SPECS/nss-altfiles.spec |  9 +++++++--
 2 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 SOURCES/ldflags.patch

diff --git a/SOURCES/ldflags.patch b/SOURCES/ldflags.patch
new file mode 100644
index 0000000..9ec6bcb
--- /dev/null
+++ b/SOURCES/ldflags.patch
@@ -0,0 +1,41 @@
+Only in nss-altfiles-2.18.1.new: config.mk
+diff -ur nss-altfiles-2.18.1/configure nss-altfiles-2.18.1.new/configure
+--- nss-altfiles-2.18.1/configure	2014-03-14 13:13:43.000000000 +0000
++++ nss-altfiles-2.18.1.new/configure	2019-04-02 14:44:03.399819940 +0000
+@@ -34,13 +34,14 @@
+ #
+ test -n "${CXXFLAGS}" && EXTRA_CXXFLAGS=${CXXFLAGS}
+ test -n "${CFLAGS}"   && EXTRA_CFLAGS=${CFLAGS}
++test -n "${LDFLAGS}"   && EXTRA_LDFLAGS=${LDFLAGS}
+ 
+ # Inspect arguments and generate config.mk
+ #
+ echo "# autogenerated by: $0 $*" > config.mk
+ for var in "$@" ; do
+ 	case ${var} in
+-		CFLAGS=* | CXXFLAGS=*)
++		CFLAGS=* | CXXFLAGS=* | LDFLAGS=* )
+ 			echo "Setting EXTRA_${var}"
+ 			echo "EXTRA_${var}" >> config.mk
+ 			;;
+Only in nss-altfiles-2.18.1.new: debugfiles.list
+Only in nss-altfiles-2.18.1.new: debuglinks.list
+Only in nss-altfiles-2.18.1.new: debugsourcefiles.list
+Only in nss-altfiles-2.18.1.new: debugsources.list
+Only in nss-altfiles-2.18.1.new: elfbins.list
+Only in nss-altfiles-2.18.1.new: files-grp.o
+Only in nss-altfiles-2.18.1.new: files-have_o_cloexec.o
+Only in nss-altfiles-2.18.1.new: files-pwd.o
+Only in nss-altfiles-2.18.1.new: libnss_altfiles.so.2
+diff -ur nss-altfiles-2.18.1/Makefile nss-altfiles-2.18.1.new/Makefile
+--- nss-altfiles-2.18.1/Makefile	2014-03-14 13:13:43.000000000 +0000
++++ nss-altfiles-2.18.1.new/Makefile	2019-04-02 14:44:28.023780755 +0000
+@@ -10,7 +10,7 @@
+      files-have_o_cloexec.o
+ 
+ CFLAGS   += $(EXTRA_CFLAGS) -pthread -fpic
+-LDFLAGS  += $(CFLAGS) -Wl,-soname,$T -Wl,-as-needed -nostdlib -lpthread
++LDFLAGS  += $(CFLAGS) $(EXTRA_LDFLAGS) -Wl,-soname,$T -Wl,-as-needed -nostdlib -lpthread
+ CPPFLAGS += -D_GNU_SOURCE
+ 
+ ifneq ($(strip $(DATADIR)),)
diff --git a/SPECS/nss-altfiles.spec b/SPECS/nss-altfiles.spec
index c8de8eb..905b458 100644
--- a/SPECS/nss-altfiles.spec
+++ b/SPECS/nss-altfiles.spec
@@ -4,12 +4,13 @@
 Summary: NSS module to look up users in /usr/lib/passwd too
 Name: nss-altfiles
 Version: 2.18.1
-Release: 10%{?dist}
+Release: 12%{?dist}
 #VCS: https://github.com/aperezdc/nss-altfiles
 Source0: https://github.com/aperezdc/nss-altfiles/archive/v%{version}.tar.gz
 # From pull request: https://github.com/marineam/nss-altfiles/commit/dda5073238b88b4537f2d2707b0ef67bdd11fe06
 # FIXME: Change nss-altfiles to not use glibc internal symbols
 #Patch0: 0001-Explicitly-link-to-libc.patch
+Patch1: ldflags.patch
 License: LGPLv2+
 URL: https://github.com/aperezdc/nss-altfiles
 
@@ -23,7 +24,7 @@ in %{prefix}/lib/passwd, similarly, groups in %{prefix}/lib/group.
 %autosetup
 
 %build
-./configure --prefix=%{_prefix} --libdir=%{_libdir} CFLAGS="%{optflags}"
+./configure --prefix=%{_prefix} --libdir=%{_libdir} CFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
 make %{?_smp_mflags}
 
 %install
@@ -38,6 +39,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 02 2019 Colin Walters <walters@redhat.com> - 2.18.1-12
+- Add system LDFLAGS
+- Resolves: rhbz#1630609
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild