From d35857edb2dbc2cfe3a784bbd231f9171e110d34 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 11:55:03 +0000 Subject: auto-import changelog data from rsh-0.17-14.src.rpm Wed Jan 22 2003 Tim Powers - rebuilt Fri Jan 17 2003 Phil Knirsch 0.17-13 - Added LFS support (#67362). - Fixed user and host patch (#80822). Tue Jan 14 2003 Phil Knirsch 0.17-12 - Fixed bug #79391 (typo in description). Mon Nov 11 2002 Nalin Dahyabhai 0.17-11 - remove directory names from PAM configuration files, allowing them to be used for all arches on multilib systems --- diff --git a/netkit-rsh-0.17-lfs.patch b/netkit-rsh-0.17-lfs.patch new file mode 100644 index 0000000..75d016b --- /dev/null +++ b/netkit-rsh-0.17-lfs.patch @@ -0,0 +1,25 @@ +--- netkit-rsh-0.17/rcp/rcp.c.bigfile 2003-01-17 16:06:44.000000000 +0200 ++++ netkit-rsh-0.17/rcp/rcp.c 2003-01-17 16:08:48.000000000 +0200 +@@ -482,7 +482,7 @@ + } + } + (void)snprintf(buf, sizeof(buf), +- "C%04o %ld %s\n", stb.st_mode&07777, stb.st_size, last); ++ "C%04o %lld %s\n", stb.st_mode&07777, (long long)(stb.st_size), last); + (void)write(rem, buf, (int)strlen(buf)); + if (response() < 0) { + (void)close(f); +@@ -614,11 +614,11 @@ + struct timeval tv[2]; + enum { YES, NO, DISPLAYED } wrerr; + BUF *bp; +- off_t i, j; ++ off_t i, j, size; + char ch, *targ; + const char *why; + int amt, count, exists, first, mask, mode; +- int ofd, setimes, size, targisdir; ++ int ofd, setimes, targisdir; + char *np, *vect[1], buf[BUFSIZ]; + + #define atime tv[0] diff --git a/netkit-rsh-0.17-rexec.patch b/netkit-rsh-0.17-rexec.patch new file mode 100644 index 0000000..1b582b8 --- /dev/null +++ b/netkit-rsh-0.17-rexec.patch @@ -0,0 +1,55 @@ +--- netkit-rsh-0.10/rexecd/rexecd.8.rexec Mon Jul 15 03:53:47 1996 ++++ netkit-rsh-0.10/rexecd/rexecd.8 Fri Jul 30 19:13:15 1999 +@@ -68,8 +68,9 @@ + it is interpreted as the port number of a secondary + stream to be used for the + .Em stderr . +-A second connection is then created to the specified +-port on the client's machine. ++A second connection will be created to the specified ++port on the client's machine after receiving and authenticating ++the user, password, and command from the client. + .It + A NUL terminated user name of at most 16 characters + is retrieved on the initial socket. +--- netkit-rsh-0.10/rexec/Makefile.rexec Thu Jul 29 23:32:28 1999 ++++ netkit-rsh-0.10/rexec/Makefile Fri Jul 30 19:14:15 1999 +@@ -1,30 +1,23 @@ + + SHELL = /bin/sh + +-BINDIR = /usr/local/bin +-MANDIR = /usr/local/man/man1 ++include ../MCONFIG ++include ../MRULES + + # Uncomment this line if you get link errors under Solaris + #LDLIBS=-lsocket -lnsl + + .PHONY: all + +-all: rexec install ++all: rexec + + rexec: rexec.c + + rexec.1: + ++clean: ++ rm -f *.o rexec ++ + install: rexec rexec.1 +- @ echo "Installation: Press enter for defaults."; \ +- echo -n "Enter the location to install executable "; \ +- echo -n " (default: $(BINDIR)): "; \ +- read bindir; \ +- bindir=$${bindir:-$(BINDIR)}; \ +- echo -n "Enter the manpage location (default $(MANDIR)): ";\ +- read mandir; \ +- mandir=$${mandir:-$(MANDIR)}; \ +- cp rexec $$bindir; \ +- chmod a+rx $${bindir}/rexec; \ +- cp rexec.1 $$mandir; \ +- chmod a+r $${mandir}/rexec.1 ++ install -m 0755 rexec $(INSTALLROOT)/$(BINDIR)/rexec ++ install -m 0644 rexec.1 $(INSTALLROOT)/$(MANDIR)/man1/rexec.1 diff --git a/netkit-rsh-0.17-userandhost.patch b/netkit-rsh-0.17-userandhost.patch index f1e873a..a5b760c 100644 --- a/netkit-rsh-0.17-userandhost.patch +++ b/netkit-rsh-0.17-userandhost.patch @@ -1,7 +1,6 @@ -diff -Nur netkit-rsh-0.17-pre20000412.orig/rlogind/rlogind.c netkit-rsh-0.17-pre20000412/rlogind/rlogind.c ---- netkit-rsh-0.17-pre20000412.orig/rlogind/rlogind.c Thu Jan 6 04:26:21 2000 -+++ netkit-rsh-0.17-pre20000412/rlogind/rlogind.c Wed May 30 14:28:45 2001 -@@ -333,7 +333,8 @@ +--- netkit-rsh-0.17/rlogind/rlogind.c.userandhost 2000-07-23 05:07:58.000000000 +0200 ++++ netkit-rsh-0.17/rlogind/rlogind.c 2003-01-17 17:31:25.000000000 +0100 +@@ -333,9 +333,10 @@ static void child(const char *hname, const char *termtype, @@ -9,7 +8,10 @@ diff -Nur netkit-rsh-0.17-pre20000412.orig/rlogind/rlogind.c netkit-rsh-0.17-pre + const char *localuser, int authenticated, + const char *rusername) { - char *termenv[2]; +- char *termenv[2]; ++ char *termenv[4]; + + setup_term(0, termtype); @@ -344,7 +345,17 @@ strcpy(termenv[0], "TERM="); @@ -39,9 +41,8 @@ diff -Nur netkit-rsh-0.17-pre20000412.orig/rlogind/rlogind.c netkit-rsh-0.17-pre } on = 1; ioctl(netfd, FIONBIO, &on); -diff -Nur netkit-rsh-0.17-pre20000412.orig/rshd/rshd.c netkit-rsh-0.17-pre20000412/rshd/rshd.c ---- netkit-rsh-0.17-pre20000412.orig/rshd/rshd.c Fri Dec 17 15:57:09 1999 -+++ netkit-rsh-0.17-pre20000412/rshd/rshd.c Wed May 30 15:06:03 2001 +--- netkit-rsh-0.17/rshd/rshd.c.userandhost 2003-01-17 17:25:22.000000000 +0100 ++++ netkit-rsh-0.17/rshd/rshd.c 2003-01-17 17:25:22.000000000 +0100 @@ -102,8 +102,10 @@ char homedir[64] = "HOME="; char shell[64] = "SHELL="; @@ -54,16 +55,16 @@ diff -Nur netkit-rsh-0.17-pre20000412.orig/rshd/rshd.c netkit-rsh-0.17-pre200004 extern char **environ; static void error(const char *fmt, ...); -@@ -450,6 +452,12 @@ - +@@ -460,6 +462,12 @@ strncat(homedir, pwd->pw_dir, sizeof(homedir)-6); homedir[sizeof(homedir)-1] = 0; -+ + + strncat(remoteuser, remuser, sizeof(remoteuser)-12); + remoteuser[sizeof(remoteuser)-1] = 0; + + strncat(remotehost, hostname, sizeof(remotehost)-12); + remotehost[sizeof(remotehost)-1] = 0; - ++ strcat(path, _PATH_DEFPATH); + strncat(shell, theshell, sizeof(shell)-7); diff --git a/rexec.pam b/rexec.pam index 7fb1cc7..22ad660 100644 --- a/rexec.pam +++ b/rexec.pam @@ -1,9 +1,9 @@ #%PAM-1.0 # For root login to succeed here with pam_securetty, "rexec" must be # listed in /etc/securetty. -auth required /lib/security/pam_nologin.so -auth required /lib/security/pam_securetty.so -auth required /lib/security/pam_env.so -auth required /lib/security/pam_stack.so service=system-auth -account required /lib/security/pam_stack.so service=system-auth -session required /lib/security/pam_stack.so service=system-auth +auth required pam_nologin.so +auth required pam_securetty.so +auth required pam_env.so +auth required pam_stack.so service=system-auth +account required pam_stack.so service=system-auth +session required pam_stack.so service=system-auth diff --git a/rlogin.pam b/rlogin.pam index ae4cd2f..df01146 100644 --- a/rlogin.pam +++ b/rlogin.pam @@ -1,11 +1,11 @@ #%PAM-1.0 # For root login to succeed here with pam_securetty, "rlogin" must be # listed in /etc/securetty. -auth required /lib/security/pam_nologin.so -auth required /lib/security/pam_securetty.so -auth required /lib/security/pam_env.so -auth sufficient /lib/security/pam_rhosts_auth.so -auth required /lib/security/pam_stack.so service=system-auth -account required /lib/security/pam_stack.so service=system-auth -password required /lib/security/pam_stack.so service=system-auth -session required /lib/security/pam_stack.so service=system-auth +auth required pam_nologin.so +auth required pam_securetty.so +auth required pam_env.so +auth sufficient pam_rhosts_auth.so +auth required pam_stack.so service=system-auth +account required pam_stack.so service=system-auth +password required pam_stack.so service=system-auth +session required pam_stack.so service=system-auth diff --git a/rsh.pam b/rsh.pam index 9feb9af..651b860 100644 --- a/rsh.pam +++ b/rsh.pam @@ -1,9 +1,9 @@ #%PAM-1.0 # For root login to succeed here with pam_securetty, "rsh" must be # listed in /etc/securetty. -auth required /lib/security/pam_nologin.so -auth required /lib/security/pam_securetty.so -auth required /lib/security/pam_env.so -auth required /lib/security/pam_rhosts_auth.so -account required /lib/security/pam_stack.so service=system-auth -session required /lib/security/pam_stack.so service=system-auth +auth required pam_nologin.so +auth required pam_securetty.so +auth required pam_env.so +auth required pam_rhosts_auth.so +account required pam_stack.so service=system-auth +session required pam_stack.so service=system-auth diff --git a/rsh.spec b/rsh.spec index 88da310..b9c93c9 100644 --- a/rsh.spec +++ b/rsh.spec @@ -1,8 +1,8 @@ Summary: Clients for remote access commands (rsh, rlogin, rcp). Name: rsh Version: 0.17 -Release: 10 -Copyright: BSD +Release: 14 +License: BSD Group: Applications/Internet Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rsh-%{version}.tar.gz Source1: rexec.pam @@ -13,7 +13,7 @@ Source5: rsh-xinetd Source6: rlogin-xinetd Source7: rexec-xinetd Patch2: netkit-rsh-0.17-sectty.patch -Patch3: netkit-rsh-0.10-rexec.patch +Patch3: netkit-rsh-0.17-rexec.patch Patch4: netkit-rsh-0.10-stdarg.patch Patch5: netkit-rsh-0.16-jbj.patch Patch6: netkit-rsh-0.16-pamfix.patch @@ -26,13 +26,14 @@ Patch12: netkit-rsh-0.16-nokrb.patch Patch13: netkit-rsh-0.17-pre20000412-jbj5.patch Patch14: netkit-rsh-0.17-userandhost.patch Patch15: netkit-rsh-0.17-strip.patch +Patch16: netkit-rsh-0.17-lfs.patch BuildRoot: %{_tmppath}/%{name}-root BuildPrereq: perl BuildPrereq: libtermcap-devel %description The rsh package contains a set of programs which allow users to run -commmands on remote machines, login to other machines and copy files +commands on remote machines, login to other machines and copy files between machines (rsh, rlogin and rcp). All three of these commands use rhosts style authentication. This package contains the clients needed for all of these services. @@ -64,21 +65,18 @@ from other machines. %patch3 -p1 -b .rexec %patch4 -p1 -b .stdarg %patch5 -p1 -b .jbj - # XXX patches {6,7,8} not applied #%patch6 -p1 -b .pamfix #%patch7 -p1 -b .jbj2 #%patch8 -p1 -b .jbj3 - %patch9 -p1 -b .jbj4 %patch10 -p1 -b .prompt %patch11 -p1 -b .rsh %patch12 -p1 -b .rsh.nokrb - %patch13 -p1 -b .jbj5 %patch14 -p1 -b .userandhost - %patch15 -p1 -b .strip +%patch16 -p1 -b .lfs # No, I don't know what this is doing in the tarball. rm -f rexec/rexec @@ -87,7 +85,7 @@ rm -f rexec/rexec sh configure --with-c-compiler=gcc %{__perl} -pi -e ' s,^CC=.*$,CC=cc,; - s,-O2,\$(RPM_OPT_FLAGS),; + s,-O2,\$(RPM_OPT_FLAGS) -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64,; s,^BINDIR=.*$,BINDIR=%{_bindir},; s,^MANDIR=.*$,MANDIR=%{_mandir},; s,^SBINDIR=.*$,SBINDIR=%{_sbindir},; @@ -135,6 +133,20 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man8/*.8* %changelog +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Fri Jan 17 2003 Phil Knirsch 0.17-13 +- Added LFS support (#67362). +- Fixed user and host patch (#80822). + +* Tue Jan 14 2003 Phil Knirsch 0.17-12 +- Fixed bug #79391 (typo in description). + +* Mon Nov 11 2002 Nalin Dahyabhai 0.17-11 +- remove directory names from PAM configuration files, allowing them to be used + for all arches on multilib systems + * Fri Jun 21 2002 Tim Powers - automated rebuild