- added rpasswdd subpackage

Changed files:
    pwdutils.spec -> 1.11

diff --git a/pwdutils.spec b/pwdutils.spec
index 7465f57838ec043fbf166fd0c664251f4f5bd26f..56edf020c91ca3212ddc5f6396e765c994388021 100644 (file)
--- a/pwdutils.spec
+++ b/pwdutils.spec
@@ -12,8 +12,7 @@ Group:                Applications/System
 Source0:       ftp://ftp.kernel.org/pub/linux/utils/net/NIS/%{name}-%{version}.tar.bz2
 # Source0-md5: 7635c09b005f0e9447df8b42b3942187
 Source1:       %{name}.useradd
-# missing in repo
-#Source2:      %{name}.rpasswdd.init
+Source2:       %{name}.rpasswdd.init
 Source3:       %{name}.login.defs
 Source4:       chage.pamd
 Source5:       chfn.pamd
@@ -23,6 +22,7 @@ Source8:      useradd.pamd
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
+BuildRequires: libselinux-devel
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
 BuildRequires: pam-devel
@@ -50,6 +50,17 @@ chage, chfn, chsh oraz demona do zmiany has
 bezpiecznym po³±czeniu SSL. Demon tak¿e u¿ywa PAM, wiêc mo¿na zmieniaæ
 has³a niezale¿nie od tego, gdzie s± przechowywane.
 
+%package -n rpasswdd
+Summary:       Remote password update daemon
+Group:         Applications/System
+
+%description -n rpasswdd
+rpasswdd is a daemon that lets users change their passwords in the
+presence of a directory service like NIS, NIS+ or LDAP over a secure
+SSL connection. rpasswdd behaves like the normal passwd(1) program and
+uses PAM for authentification and changing the password, so it can be
+configured very flexibel for the local requirements.
+
 %prep
 %setup -q
 
@@ -60,6 +71,7 @@ has
 %{__autoheader}
 %{__automake}
 %configure \
+       --enable-selinux \
        --disable-rpath
 %{__make}
 
@@ -70,10 +82,10 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d/,pwdutils,skel}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_sbindir}/*.local $RPM_BUILD_ROOT/etc/pwdutils
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/default/useradd
-#install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpasswdd
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/login.defs
+mv $RPM_BUILD_ROOT%{_sbindir}/*.local $RPM_BUILD_ROOT%{_sysconfdir}/pwdutils
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/default/useradd
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpasswdd
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/login.defs
 
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/chage
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/chfn
@@ -94,9 +106,25 @@ fi
 
 %postun -p /sbin/ldconfig
 
+%post -n rpasswdd
+/sbin/chkconfig --add rpasswdd
+if [ -f /var/lock/subsys/rpasswdd ]; then
+        /etc/rc.d/init.d/rpasswdd restart 1>&2
+else
+        echo "Run \"/etc/rc.d/init.d/rpasswdd start\" to start rpasswdd daemon."
+fi
+
+%preun -n rpasswdd
+if [ "$1" = "0" ]; then
+        if [ -f /var/lock/subsys/rpasswdd ]; then
+                /etc/rc.d/init.d/rpasswdd stop 1>&2
+        fi
+        /sbin/chkconfig --del rpasswdd
+fi
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc NEWS README THANKS TODO
+%doc ChangeLog NEWS README THANKS TODO
 %attr(750,root,root) %dir %{_sysconfdir}/default
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/default/*
 %attr(750,root,root) %dir %{_sysconfdir}/%{name}
@@ -105,7 +133,6 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/chfn
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/chsh
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/passwd
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/rpasswd
 %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/useradd
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/login.defs
 %dir /etc/skel
@@ -127,4 +154,11 @@ fi
 %attr(755,root,root) %{_sbindir}/vigr
 %attr(755,root,root) %{_sbindir}/vipw
 %{_mandir}/man?/*
-#%attr(754,root,root) /etc/rc.d/init.d/rpasswdd
+%exclude %{_mandir}/man8/rpasswdd*
+
+%files -n rpasswdd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/rpasswdd
+%attr(754,root,root) /etc/rc.d/init.d/rpasswdd
+%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/rpasswd
+%{_mandir}/man8/rpasswdd*