Merge pull request #3 from current/pam:current

fix pam_selinux check
This commit is contained in:
din 2015-02-16 04:56:41 +04:00
commit afcda4f39c

View file

@ -109,7 +109,9 @@ BuildRequires: gettext-devel
BuildRequires: pkgconfig(libtirpc) BuildRequires: pkgconfig(libtirpc)
BuildRequires: db-devel BuildRequires: db-devel
BuildRequires: html2text BuildRequires: html2text
BuildRequires: docbook-dtd-xml BuildRequires: docbook-dtd412-xml
BuildRequires: docbook-dtd43-xml
BuildRequires: docbook-dtd44-xml
BuildRequires: docbook-style-xsl BuildRequires: docbook-style-xsl
BuildRequires: xsltproc BuildRequires: xsltproc
%if %{with prelude} %if %{with prelude}
@ -293,6 +295,8 @@ autoreconf -i
%endif %endif
%if %{with selinux} %if %{with selinux}
--enable-selinux \ --enable-selinux \
%else
--disable-selinux \
%endif %endif
--enable-audit --enable-audit
%make %make
@ -343,14 +347,17 @@ cp -f %{buildroot}/etc/pam.d/system-auth %{buildroot}/etc/pam.d/system-auth-defa
%find_lang Linux-PAM %find_lang Linux-PAM
%check %check
EXCEPT=''
%if %{without selinux} %if %{without selinux}
EXCEPT="--hide=pam_selinux.*" EXCEPT='pam_selinux'
%endif %endif
for dir in modules/pam_* ; do for dir in modules/pam_* ; do
if ! ls -1 $EXCEPT %{buildroot}/%{_lib}/security/`basename ${dir}`*.so ; then if ![[ ${dir} =~ "${except}" ]]; then
if ! ls -1 %{buildroot}/%{_lib}/security/`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
done done
# Check for module problems. Specifically, check that every module we just # Check for module problems. Specifically, check that every module we just