From 156722dccb6c0df2ea4d1e1c157e06651cea32ab Mon Sep 17 00:00:00 2001 From: "din (Dmitry Fedorov)" Date: Mon, 16 Feb 2015 02:53:12 +0300 Subject: [PATCH 1/2] fix pam_selinux check --- pam.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pam.spec b/pam.spec index 9e11977..f481159 100644 --- a/pam.spec +++ b/pam.spec @@ -109,7 +109,9 @@ BuildRequires: gettext-devel BuildRequires: pkgconfig(libtirpc) BuildRequires: db-devel BuildRequires: html2text -BuildRequires: docbook-dtd-xml +BuildRequires: docbook-dtd412-xml +BuildRequires: docbook-dtd43-xml +BuildRequires: docbook-dtd44-xml BuildRequires: docbook-style-xsl BuildRequires: xsltproc %if %{with prelude} @@ -293,6 +295,8 @@ autoreconf -i %endif %if %{with selinux} --enable-selinux \ +%else + --disable-selinux \ %endif --enable-audit %make @@ -343,11 +347,12 @@ cp -f %{buildroot}/etc/pam.d/system-auth %{buildroot}/etc/pam.d/system-auth-defa %find_lang Linux-PAM %check +EXCEPT='' %if %{without selinux} - EXCEPT="--hide=pam_selinux.*" + EXCEPT='--hide=pam_selinux.*' %endif for dir in modules/pam_* ; do - if ! ls -1 $EXCEPT %{buildroot}/%{_lib}/security/`basename ${dir}`*.so ; then + if ! ls -1 `echo $(EXCEPT)` %{buildroot}/%{_lib}/security/`basename ${dir}`*.so ; then echo ERROR `basename ${dir}` did not build a module. exit 1 fi From cc98cfc707a86b9f81f014e59f59a6d2b05a6704 Mon Sep 17 00:00:00 2001 From: "din (Dmitry Fedorov)" Date: Mon, 16 Feb 2015 03:11:04 +0300 Subject: [PATCH 2/2] fix pam_selinux check --- pam.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pam.spec b/pam.spec index f481159..78c4db2 100644 --- a/pam.spec +++ b/pam.spec @@ -349,12 +349,14 @@ cp -f %{buildroot}/etc/pam.d/system-auth %{buildroot}/etc/pam.d/system-auth-defa %check EXCEPT='' %if %{without selinux} - EXCEPT='--hide=pam_selinux.*' + EXCEPT='pam_selinux' %endif for dir in modules/pam_* ; do - if ! ls -1 `echo $(EXCEPT)` %{buildroot}/%{_lib}/security/`basename ${dir}`*.so ; then - echo ERROR `basename ${dir}` did not build a module. - exit 1 + if ![[ ${dir} =~ "${except}" ]]; then + if ! ls -1 %{buildroot}/%{_lib}/security/`basename ${dir}`*.so ; then + echo ERROR `basename ${dir}` did not build a module. + exit 1 + fi fi done