rpm/pam
SHA256
1
0
Fork 0
forked from pool/pam
Code Pull Requests Activity

Accepting request 725419 from home:jengelh:branches:Linux-PAM

Browse Source 
- Replace old $RPM_* shell vars by macros.
- Avoid unnecessary invocation of subshells.
- Shorten recipe for constructing securetty contents on s390.

OBS-URL: https://build.opensuse.org/request/show/725419
OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam?expand=0&rev=193
This commit is contained in:
Josef Möllers 2019-08-23 12:39:21 +00:00 committed by Git OBS Bridge
parent 8952f5370e
commit 9b6fc55e33
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pam.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Aug 22 20:29:24 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Replace old $RPM_* shell vars by macros.
- Avoid unnecessary invocation of subshells.
- Shorten recipe for constructing securetty contents on s390.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 19 14:45:43 CEST 2019 - kukuk@suse.de Mon Aug 19 14:45:43 CEST 2019 - kukuk@suse.de

32
pam.spec
View File

@ -95,7 +95,7 @@ having to recompile programs that do authentication.
This package contains the documentation. This package contains the documentation.
%package devel %package devel
Summary: Include Files and Libraries for PAM-Development Summary: Include Files and Libraries for PAM Development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: glibc-devel Requires: glibc-devel
Requires: pam = %{version} Requires: pam = %{version}
@ -132,7 +132,7 @@ export CFLAGS="%{optflags} -DNDEBUG"
--enable-isadir=../../%{_lib}/security \ --enable-isadir=../../%{_lib}/security \
--enable-securedir=/%{_lib}/security --enable-securedir=/%{_lib}/security
make %{?_smp_mflags} make %{?_smp_mflags}
gcc -fwhole-program -fpie -pie -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE %{optflags} -I$RPM_BUILD_DIR/linux-pam-%{version}/libpam/include %{SOURCE10} -o $RPM_BUILD_DIR/unix2_chkpwd -L$RPM_BUILD_DIR/linux-pam-%{version}/libpam/.libs/ -lpam gcc -fwhole-program -fpie -pie -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE %{optflags} -I%{_builddir}/linux-pam-%{version}/libpam/include %{SOURCE10} -o %{_builddir}/unix2_chkpwd -L%{_builddir}/linux-pam-%{version}/libpam/.libs/ -lpam
%check %check
make %{?_smp_mflags} check make %{?_smp_mflags} check
@ -147,22 +147,13 @@ mkdir -p -m 755 %{buildroot}%{_libdir}
%make_install %make_install
/sbin/ldconfig -n %{buildroot}/%{_lib} /sbin/ldconfig -n %{buildroot}/%{_lib}
# Install documentation # Install documentation
make -C doc install DESTDIR=%{buildroot} %make_install -C doc
# install securetty # install securetty
install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir} install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}
%ifarch s390 s390x %ifarch s390 s390x
echo "ttyS0" >> %{buildroot}%{_sysconfdir}/securetty for i in ttyS0 ttyS1 hvc0 hvc1 hvc2 hvc3 hvc4 hvc5 hvc6 hvc7 sclp_line0 ttysclp0; do
echo "ttyS1" >> %{buildroot}%{_sysconfdir}/securetty echo "$i" >>%{buildroot}/%{_sysconfdir}/securetty
echo "hvc0" >> %{buildroot}%{_sysconfdir}/securetty done
echo "hvc1" >> %{buildroot}%{_sysconfdir}/securetty
echo "hvc2" >> %{buildroot}%{_sysconfdir}/securetty
echo "hvc3" >> %{buildroot}%{_sysconfdir}/securetty
echo "hvc4" >> %{buildroot}%{_sysconfdir}/securetty
echo "hvc5" >> %{buildroot}%{_sysconfdir}/securetty
echo "hvc6" >> %{buildroot}%{_sysconfdir}/securetty
echo "hvc7" >> %{buildroot}%{_sysconfdir}/securetty
echo "sclp_line0" >> %{buildroot}%{_sysconfdir}/securetty
echo "ttysclp0" >> %{buildroot}%{_sysconfdir}/securetty
%endif %endif
# install /etc/security/namespace.d used by pam_namespace.so for namespace.conf iscript # install /etc/security/namespace.d used by pam_namespace.so for namespace.conf iscript
install -d %{buildroot}%{_sysconfdir}/security/namespace.d install -d %{buildroot}%{_sysconfdir}/security/namespace.d
@ -190,12 +181,11 @@ done
# #
DOC=%{buildroot}%{_defaultdocdir}/pam DOC=%{buildroot}%{_defaultdocdir}/pam
mkdir -p $DOC/modules mkdir -p $DOC/modules
( pushd modules
cd modules;
for i in pam_*/README; do for i in pam_*/README; do
cp -fpv ${i} $DOC/modules/README.`dirname ${i}` cp -fpv "$i" "$DOC/modules/README.${i%/*}"
done done
) popd
# #
# pam_tally is deprecated since ages # pam_tally is deprecated since ages
# #
@ -204,8 +194,8 @@ rm -f %{buildroot}/sbin/pam_tally
rm -f %{buildroot}%{_mandir}/man8/pam_tally.8* rm -f %{buildroot}%{_mandir}/man8/pam_tally.8*
rm -f %{buildroot}%{_defaultdocdir}/pam/modules/README.pam_tally rm -f %{buildroot}%{_defaultdocdir}/pam/modules/README.pam_tally
# Install unix2_chkpwd # Install unix2_chkpwd
install -m 755 $RPM_BUILD_DIR/unix2_chkpwd %{buildroot}/sbin/ install -m 755 %{_builddir}/unix2_chkpwd %{buildroot}/sbin/
install -m 644 $RPM_SOURCE_DIR/unix2_chkpwd.8 %{buildroot}%{_mandir}/man8/ install -m 644 %{_sourcedir}/unix2_chkpwd.8 %{buildroot}/%{_mandir}/man8/
# Create filelist with translatins # Create filelist with translatins
%find_lang Linux-PAM %find_lang Linux-PAM