From c29f4442e5ae542ad033eb7364a20d78a959fd70 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Mon, 2 Jul 2012 13:46:22 +0100 Subject: [PATCH] Cleanup spec Change-Id: I7ccb3e1dd96f8c06c9150d969059f3ee7c46287a --- packaging/pam.changes | 16 +++++++--- packaging/pam.spec | 85 ++++++++++++++++++++++++--------------------------- 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/packaging/pam.changes b/packaging/pam.changes index 68ccf8f..a12e0f5 100644 --- a/packaging/pam.changes +++ b/packaging/pam.changes @@ -1,4 +1,12 @@ -* Wed Jun 13 2012 William Douglas - 1.1.5 -- Add pam 1.1.5 -- Add manifests -- Add system-auth and other pamconf files +* Mon Jul 02 2012 Anas Nashif 83f34ef +- Cleanup spec + +* Wed Jun 13 2012 William Douglas 93268c7 +- Include pam configuration files for systemd + +* Mon Jun 11 2012 William Douglas 9fd9175 +- Import Linux-PAM. + +* Fri Jun 08 2012 Hyesook Choi 13330e2 +- Initial empty repository + diff --git a/packaging/pam.spec b/packaging/pam.spec index a4dcf1b..52103c5 100644 --- a/packaging/pam.spec +++ b/packaging/pam.spec @@ -3,38 +3,37 @@ %define _secconfdir %{_sysconfdir}/security %define _pamconfdir %{_sysconfdir}/pam.d -Name: pam -Version: 1.1.5 -Release: 1 -License: BSD and GPLv2+ and BSD with advertising -Group: System/Base -Summary: PAM -URL: http://www.linux-pam.org/ -Source0: %{name}-%{version}.tar.bz2 -Source1: packaging/system-auth -Source2: packaging/other -Source1001: packaging/%{name}.manifest - +Name: pam +Version: 1.1.5 +Release: 1 +License: BSD and GPLv2+ and BSD with advertising +Summary: PAM +Url: http://www.linux-pam.org/ +Group: System/Base +Source0: %{name}-%{version}.tar.bz2 +Source1: system-auth +Source2: other +Source1001: %{name}.manifest + +BuildRequires: bison +BuildRequires: db4-devel +BuildRequires: flex +BuildRequires: gcc +BuildRequires: net-tools +BuildRequires: zlib-devel Requires(post): /sbin/ldconfig Requires(post): /usr/bin/install Requires(postun): /sbin/ldconfig -BuildRequires: db4-devel -BuildRequires: bison -BuildRequires: flex -BuildRequires: gcc -BuildRequires: zlib-devel -BuildRequires: net-tools %description PAM (Pluggable Authentication Modules) is a system security tool that allows system administrators to set authentication policy without having to recompile programs that handle authentication. - %package -n pam-modules-extra -Group: System/Base -Summary: Extra modules provided by PAM not used in the base system -Requires: pam = %{version}-%{release} +Summary: Extra modules provided by PAM not used in the base system +Group: System/Base +Requires: pam = %{version} %description -n pam-modules-extra PAM (Pluggable Authentication Modules) is a system security tool that @@ -43,11 +42,10 @@ having to recompile programs that handle authentication. This package contains extra modules for use by programs that are not used in the default Tizen install. - %package devel -Group: Development/Libraries -Summary: Files needed for developing PAM-aware applications and modules for PAM -Requires: pam = %{version}-%{release} +Summary: Files needed for developing PAM-aware applications and modules for PAM +Group: Development/Libraries +Requires: pam = %{version} %description devel PAM (Pluggable Authentication Modules) is a system security tool that @@ -57,24 +55,24 @@ contains header files and static libraries used for building both PAM-aware applications and modules for use with PAM. %prep -%setup +%setup -q libtoolize -f #--copy --force && aclocal && autoheader autoreconf %build cp %{SOURCE1001} . -CFLAGS="-fPIC $RPM_OPT_FLAGS " ; export CFLAGS +CFLAGS="-fPIC %{optflags} " ; export CFLAGS %configure \ - --libdir=%{_libdir} \ - --includedir=%{_includedir}/security \ - --enable-isadir=../..%{_moduledir} \ - --disable-audit \ - --disable-nls \ - --with-db-uniquename=_pam \ - --with-libiconv-prefix=/usr \ - --enable-read-both-confs && + --libdir=%{_libdir} \ + --includedir=%{_includedir}/security \ + --enable-isadir=../..%{_moduledir} \ + --disable-audit \ + --disable-nls \ + --with-db-uniquename=_pam \ + --with-libiconv-prefix=/usr \ + --enable-read-both-confs && make %{?_smp_flags} CFLAGS="$CFLAGS -lfl -lcrypt" @@ -82,12 +80,12 @@ make %{?_smp_flags} CFLAGS="$CFLAGS -lfl -lcrypt" %make_install # RPM uses docs from source tree -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/Linux-PAM +rm -rf %{buildroot}%{_datadir}/doc/Linux-PAM # Included in setup package -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/environment +rm -f %{buildroot}%{_sysconfdir}/environment for phase in auth acct passwd session ; do - ln -sf pam_unix.so $RPM_BUILD_ROOT%{_moduledir}/pam_unix_${phase}.so + ln -sf pam_unix.so %{buildroot}%{_moduledir}/pam_unix_${phase}.so done # Install default pam configuration files @@ -107,8 +105,7 @@ fi %postun -p /sbin/ldconfig -%files -%defattr(-,root,root,-) +%files %manifest pam.manifest %doc Copyright %{_sbindir}/pam_tally @@ -117,7 +114,7 @@ fi %attr(4755,root,root) %{_sbindir}/unix_chkpwd %attr(0700,root,root) %{_sbindir}/unix_update %attr(0755,root,root) %{_sbindir}/mkhomedir_helper -/etc/security/limits.conf +%{_sysconfdir}/security/limits.conf %{_libdir}/libpam.so.* %{_libdir}/libpam_misc.so.* %{_libdir}/libpamc.so.* @@ -145,13 +142,12 @@ fi %attr(755,root,root) %config(noreplace) %{_secconfdir}/namespace.init %config(noreplace) %{_secconfdir}/pam_env.conf %config(noreplace) %{_secconfdir}/time.conf -%exclude /var/run/sepermit +%exclude %{_localstatedir}/run/sepermit %dir %{_pamconfdir} %{_pamconfdir}/system-auth %{_pamconfdir}/other %files -n pam-modules-extra -%defattr(-,root,root,-) %manifest pam.manifest %{_moduledir}/pam_access.so %{_moduledir}/pam_debug.so @@ -183,7 +179,6 @@ fi %{_moduledir}/pam_warn.so %files devel -%defattr(-,root,root) %manifest pam.manifest %{_includedir}/security/* %doc %{_mandir}/man3/* -- 2.7.4