rpms/rsh/devel rsh.spec, 1.54, 1.55 netkit-rsh-0.16-jbj2.patch, 1.1, NONE netkit-rsh-0.16-jbj3.patch, 1.1, NONE netkit-rsh-0.16-pamfix.patch, 1.1, NONE

[Adam Tkac]

Author: atkac

Update of /cvs/pkgs/rpms/rsh/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15589

Modified Files:
	rsh.spec 
Removed Files:
	netkit-rsh-0.16-jbj2.patch netkit-rsh-0.16-jbj3.patch 
	netkit-rsh-0.16-pamfix.patch 
Log Message:
- merge review related fixes (#226379)
- remove unused patches
  - netkit-rsh-0.16-pamfix.patch
  - netkit-rsh-0.16-jbj2.patch
  - netkit-rsh-0.16-jbj3.patch



Index: rsh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsh/devel/rsh.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- rsh.spec	16 Sep 2009 18:37:52 -0000	1.54
+++ rsh.spec	30 Nov 2009 14:50:54 -0000	1.55
@@ -1,18 +1,15 @@
-Summary: Clients for remote access commands (rsh, rlogin, rcp).
+Summary: Clients for remote access commands (rsh, rlogin, rcp)
 Name: rsh
 Version: 0.17
-Release: 58%{?dist}
+Release: 59%{?dist}
 License: BSD
 Group: Applications/Internet
 
 BuildRoot: %{_tmppath}/%{name}-root
-BuildPrereq: perl
-BuildPrereq: ncurses-devel
+BuildRequires: perl, ncurses-devel, pam-devel, audit-libs-devel >= 1.5
 
-BuildRequires: pam-devel
-BuildRequires: audit-libs-devel >= 1.5
-
-Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rsh-%{version}.tar.gz
+URL: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit
+Source0 ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rsh-%{version}.tar.gz
 Source1: rexec.pam
 Source2: rlogin.pam
 Source3: rsh.pam
@@ -25,9 +22,6 @@ Patch1: netkit-rsh-0.17-sectty.patch
 Patch2: netkit-rsh-0.17-rexec.patch
 Patch3: netkit-rsh-0.10-stdarg.patch
 Patch4: netkit-rsh-0.16-jbj.patch
-Patch5: netkit-rsh-0.16-pamfix.patch
-Patch6: netkit-rsh-0.16-jbj2.patch
-Patch7: netkit-rsh-0.16-jbj3.patch
 Patch8: netkit-rsh-0.16-jbj4.patch
 Patch9: netkit-rsh-0.16-prompt.patch
 Patch10: netkit-rsh-0.16-rlogin=rsh.patch
@@ -66,10 +60,10 @@ between machines (rsh, rlogin and rcp). 
 use rhosts style authentication.  This package contains the clients
 needed for all of these services.
 The rsh package should be installed to enable remote access to other
-machines.
+machines
 
 %package server
-Summary: Servers for remote access commands (rsh, rlogin, rcp).
+Summary: Servers for remote access commands (rsh, rlogin, rcp)
 Group: System Environment/Daemons
 Requires: pam >= 0.59, /etc/pam.d/system-auth, xinetd
 
@@ -80,11 +74,11 @@ files between machines (rsh, rlogin and 
 commands use rhosts style authentication.  This package contains the
 servers needed for all of these services.  It also contains a server
 for rexec, an alternate method of executing remote commands.
-All of these servers are run by inetd and configured using
+All of these servers are run by xinetd and configured using
 /etc/xinet.d/ and PAM.
 
 The rsh-server package should be installed to enable remote access
-from other machines.
+from other machines
 
 %prep
 %setup -q -n netkit-rsh-%{version} -a 4
@@ -92,10 +86,6 @@ from other machines.
 %patch2 -p1 -b .rexec
 %patch3 -p1 -b .stdarg
 %patch4 -p1 -b .jbj
-# XXX patches {6,7,8} not applied
-#%patch5 -p1 -b .pamfix
-#%patch6 -p1 -b .jbj2
-#%patch7 -p1 -b .jbj3
 %patch8 -p1 -b .jbj4
 %patch9 -p1 -b .prompt
 %patch10 -p1 -b .rsh
@@ -162,9 +152,9 @@ mkdir -p ${RPM_BUILD_ROOT}/etc/pam.d
 
 make INSTALLROOT=${RPM_BUILD_ROOT} BINDIR=%{_bindir} MANDIR=%{_mandir} install
 
-install -m 644 $RPM_SOURCE_DIR/rexec.pam ${RPM_BUILD_ROOT}/etc/pam.d/rexec
-install -m 644 $RPM_SOURCE_DIR/rlogin.pam ${RPM_BUILD_ROOT}/etc/pam.d/rlogin
-install -m 644 $RPM_SOURCE_DIR/rsh.pam ${RPM_BUILD_ROOT}/etc/pam.d/rsh
+install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}/etc/pam.d/rexec
+install -m 644 %SOURCE2 ${RPM_BUILD_ROOT}/etc/pam.d/rlogin
+install -m 644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/pam.d/rsh
 
 mkdir -p ${RPM_BUILD_ROOT}/etc/xinetd.d/
 install -m644 %SOURCE5 ${RPM_BUILD_ROOT}/etc/xinetd.d/rsh
@@ -175,7 +165,7 @@ install -m644 %SOURCE7 ${RPM_BUILD_ROOT}
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %attr(4755,root,root)	%{_bindir}/rcp
 %{_bindir}/rexec
 %attr(4755,root,root)	%{_bindir}/rlogin
@@ -183,10 +173,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man1/*.1*
 
 %files server
-%defattr(-,root,root)
-%config	/etc/pam.d/rsh
-%config	/etc/pam.d/rlogin
-%config	/etc/pam.d/rexec
+%defattr(-,root,root,-)
+%config(noreplace) /etc/pam.d/rsh
+%config(noreplace) /etc/pam.d/rlogin
+%config(noreplace) /etc/pam.d/rexec
 %{_sbindir}/in.rexecd
 %{_sbindir}/in.rlogind
 %{_sbindir}/in.rshd
@@ -194,6 +184,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*.8*
 
 %changelog
+* Mon Nov 30 2009 Adam Tkac <atkac redhat com> - 0.17-59
+- merge review related fixes (#226379)
+- remove unused patches
+  - netkit-rsh-0.16-pamfix.patch
+  - netkit-rsh-0.16-jbj2.patch
+  - netkit-rsh-0.16-jbj3.patch
+
 * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 0.17-58
 - use password-auth common PAM configuration instead of system-auth
 
@@ -320,7 +317,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Wed Nov 17 2004 Karel Zak <kzak at redhat.com> 0.17-25
 - rexecd uses PAM session now (#68590)
 - fixed errno usage in rcp (#67361)
-- fixed  rexec fails with "Invalid Argument" (#118630)
+- fixed rexec fails with "Invalid Argument" (#118630)
 
 * Mon Oct 18 2004 Radek Vokal <rvokal at redhat.com> 0.17-24
 - The username and password for ~/.netrc are used (#135643)
@@ -449,7 +446,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - workaround (by explicitly prompting for password) #4328 and #9715.
 
 * Wed Feb  9 2000 Jeff Johnson <jbj at redhat.com>
-- mark pam config files as %config.
+- mark pam config files as %%config.
 
 * Fri Feb  4 2000 Bill Nottingham <notting at redhat.com>
 - handle compressed manpages


--- netkit-rsh-0.16-jbj2.patch DELETED ---


--- netkit-rsh-0.16-jbj3.patch DELETED ---


--- netkit-rsh-0.16-pamfix.patch DELETED ---