rpms/pam
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Constantly use spaces for indentation

Browse Source 
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
This commit is contained in:
Björn Esser 2021-10-06 22:30:06 +02:00
parent 4886bd212f
commit c3ee4c26f3
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
pam.spec
View File

@ -114,22 +114,22 @@ autoreconf -i
%build %build
%configure \ %configure \
--libdir=%{_pam_libdir} \ --libdir=%{_pam_libdir} \
--includedir=%{_includedir}/security \ --includedir=%{_includedir}/security \
--disable-rpath \ --disable-rpath \
--disable-static \ --disable-static \
--disable-prelude \ --disable-prelude \
--enable-audit \ --enable-audit \
--enable-openssl \ --enable-openssl \
--enable-selinux \ --enable-selinux \
--enable-vendordir=%{_datadir} --enable-vendordir=%{_datadir}
%make_build -C po update-gmo %make_build -C po update-gmo
%make_build %make_build
%install %install
mkdir -p doc/txts mkdir -p doc/txts
for readme in modules/pam_*/README ; do for readme in modules/pam_*/README ; do
cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'` cp -f ${readme} doc/txts/README.`dirname ${readme} | sed -e 's|^modules/||'`
done done
# Install the macros file # Install the macros file
@ -170,23 +170,23 @@ ln -sf system-auth.5 %{buildroot}%{_mandir}/man5/smartcard-auth.5
for phase in auth acct passwd session ; do for phase in auth acct passwd session ; do
ln -sf pam_unix.so %{buildroot}%{_pam_moduledir}/pam_unix_${phase}.so ln -sf pam_unix.so %{buildroot}%{_pam_moduledir}/pam_unix_${phase}.so
done done
# Remove .la files and make new .so links -- this depends on the value # Remove .la files and make new .so links -- this depends on the value
# of _libdir not changing, and *not* being /usr/lib. # of _libdir not changing, and *not* being /usr/lib.
for lib in libpam libpamc libpam_misc ; do for lib in libpam libpamc libpam_misc ; do
rm -f %{buildroot}%{_pam_libdir}/${lib}.la rm -f %{buildroot}%{_pam_libdir}/${lib}.la
done done
rm -f %{buildroot}%{_pam_moduledir}/*.la rm -f %{buildroot}%{_pam_moduledir}/*.la
%if "%{_pam_libdir}" != "%{_libdir}" %if "%{_pam_libdir}" != "%{_libdir}"
install -d -m 755 %{buildroot}%{_libdir} install -d -m 755 %{buildroot}%{_libdir}
for lib in libpam libpamc libpam_misc ; do for lib in libpam libpamc libpam_misc ; do
pushd %{buildroot}%{_libdir} pushd %{buildroot}%{_libdir}
ln -sf %{_pam_libdir}/${lib}.so.*.* ${lib}.so ln -sf %{_pam_libdir}/${lib}.so.*.* ${lib}.so
popd popd
rm -f %{buildroot}%{_pam_libdir}/${lib}.so rm -f %{buildroot}%{_pam_libdir}/${lib}.so
done done
%endif %endif
@ -217,13 +217,13 @@ find %{buildroot}%{_pkgdocdir} -type f | xargs chmod 644
# Make sure every module subdirectory gave us a module. Yes, this is hackish. # Make sure every module subdirectory gave us a module. Yes, this is hackish.
for dir in modules/pam_* ; do for dir in modules/pam_* ; do
if [ -d ${dir} ] ; then if [ -d ${dir} ] ; then
[ ${dir} = "modules/pam_selinux" ] && continue [ ${dir} = "modules/pam_selinux" ] && continue
[ ${dir} = "modules/pam_sepermit" ] && continue [ ${dir} = "modules/pam_sepermit" ] && continue
[ ${dir} = "modules/pam_tty_audit" ] && continue [ ${dir} = "modules/pam_tty_audit" ] && continue
if ! ls -1 %{buildroot}%{_pam_moduledir}/`basename ${dir}`*.so ; then if ! ls -1 %{buildroot}%{_pam_moduledir}/`basename ${dir}`*.so ; then
echo ERROR `basename ${dir}` did not build a module. echo ERROR `basename ${dir}` did not build a module.
exit 1 exit 1
fi fi
fi fi
done done
@ -231,11 +231,11 @@ done
# installed can actually be loaded by a minimal PAM-aware application. # installed can actually be loaded by a minimal PAM-aware application.
/sbin/ldconfig -n %{buildroot}%{_pam_libdir} /sbin/ldconfig -n %{buildroot}%{_pam_libdir}
for module in %{buildroot}%{_pam_moduledir}/pam*.so ; do for module in %{buildroot}%{_pam_moduledir}/pam*.so ; do
if ! env LD_LIBRARY_PATH=%{buildroot}%{_pam_libdir} \ if ! env LD_LIBRARY_PATH=%{buildroot}%{_pam_libdir} \
%{SOURCE11} -ldl -lpam -L%{buildroot}%{_libdir} ${module} ; then %{SOURCE11} -ldl -lpam -L%{buildroot}%{_libdir} ${module} ; then
echo ERROR module: ${module} cannot be loaded. echo ERROR module: ${module} cannot be loaded.
exit 1 exit 1
fi fi
done done
%files -f Linux-PAM.lang %files -f Linux-PAM.lang
@ -380,6 +380,7 @@ exit 0
- Rename docs sub-package to doc - Rename docs sub-package to doc
- Replace $RPM_BUILD_ROOT with %%{buildroot} - Replace $RPM_BUILD_ROOT with %%{buildroot}
- Move documentation to %%{_pkgdocdir} - Move documentation to %%{_pkgdocdir}
- Constantly use spaces for indentation
* Thu Sep 23 2021 Björn Esser <besser82@fedoraproject.org> - 1.5.2-5 * Thu Sep 23 2021 Björn Esser <besser82@fedoraproject.org> - 1.5.2-5
- Rebase to pam-redhat-1.1.5 - Rebase to pam-redhat-1.1.5