.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1 +1 @@
-SOURCES/v2.18.1.tar.gz
+/v2.18.1.tar.gz

.nss-altfiles.metadata

@@ -1 +0,0 @@
-65ca705337cee4b1042896709cb5b537874e672e SOURCES/v2.18.1.tar.gz

0001-build-sys-Inherit-LDFLAGS.patch

@@ -0,0 +1,47 @@
+From a4ba0ead6c82b3efe409c04d17de7ca06054356a Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Wed, 3 Oct 2018 15:11:52 +0000
+Subject: [PATCH] build-sys: Inherit LDFLAGS
+
+So that we can respect e.g. the Fedora hardening flags.
+---
+ Makefile  | 2 +-
+ configure | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8d9b7d2..badecdc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,7 +10,7 @@ O := files-pwd.o \
+      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/configure b/configure
+index 3336c3d..8d0bf6d 100755
+--- a/configure
++++ b/configure
+@@ -34,13 +34,14 @@ done
+ #
+ 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
+ 			;;
+-- 
+2.17.1
+

SOURCES/ldflags.patch

@@ -1,41 +0,0 @@
-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)),)

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-gating.functional}

nss-altfiles.spec

@@ -4,24 +4,27 @@
 Summary: NSS module to look up users in /usr/lib/passwd too
 Name: nss-altfiles
 Version: 2.18.1
-Release: 12%{?dist}
+Release: 20%{?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
+Patch1: 0001-build-sys-Inherit-LDFLAGS.patch
 License: LGPLv2+
 URL: https://github.com/aperezdc/nss-altfiles
 
+BuildRequires: make
 BuildRequires: glibc-devel
+BuildRequires: gcc
+BuildRequires: git
 
 %description
 When installed, this package allows looking up users
 in %{prefix}/lib/passwd, similarly, groups in %{prefix}/lib/group.
 
 %prep
-%autosetup
+%autosetup -Sgit
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir} CFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
@@ -34,14 +37,38 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %doc README.md
 %{_libdir}/*.so.*
 
-%post -p /sbin/ldconfig
+%ldconfig_scriptlets
-
-%postun -p /sbin/ldconfig
 
 %changelog
-* Tue Apr 02 2019 Colin Walters <walters@redhat.com> - 2.18.1-12
+* Mon Aug 02 2021 Colin Walters <walters@verbum.org> - 2.18.1-20
-- Add system LDFLAGS
+- Pointless rebuild to re-trigger gating etc
-- Resolves: rhbz#1630609
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.1-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.1-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.1-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 20 2018 Colin Walters <walters@verbum.org> - 2.18.1-13
+- BR gcc
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
 * 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

plans/tier1-gating.fmf

@@ -0,0 +1,11 @@
+summary: Tier1 tests plan
+discover:
+    how: fmf
+    filter: 'tag: CI-Tier-1'
+    url: https://pkgs.devel.redhat.com/git/tests/nss-altfiles
+    ref: master
+execute:
+    how: tmt
+adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora

sources

@@ -0,0 +1 @@
+SHA512 (v2.18.1.tar.gz) = 1b39bcb7c086b8673da5e953d0ae712ff46555043b9cd3b218ddfa822a18706c0a94d1875164abf16c0463720182d6761378d5f45aa599c63f6ba963244e7c31

tests/tests.yaml

@@ -0,0 +1,11 @@
+---
+- hosts: localhost
+  gather_facts: yes
+  tags:
+    - classic
+
+  tasks:
+      # This is only used as part of rpm-ostree which has extensive tests
+      # and there is no point to testing it separately.
+      - name: true
+        shell: true