diff --git a/coreutils-5.2.1-runuser.patch b/coreutils-5.2.1-runuser.patch index 07f8430..b7be72c 100644 --- a/coreutils-5.2.1-runuser.patch +++ b/coreutils-5.2.1-runuser.patch @@ -1,114 +1,5 @@ ---- /dev/null 2004-09-30 04:21:43.103661032 -0400 -+++ coreutils-5.2.1/man/runuser.1 2004-10-04 13:27:51.000000000 -0400 -@@ -0,0 +1,59 @@ -+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. -+.TH RUNUSER "1" "September 2004" "runuser (coreutils) 5.2.1" "User Commands" -+.SH NAME -+runuser \- run a shell with substitute user and group IDs, similar to su, but will not prompt for password. -+.SH SYNOPSIS -+.B runuser -+[\fIOPTION\fR]... [\fI-\fR] [\fIUSER \fR[\fIARG\fR]...] -+.SH DESCRIPTION -+.\" Add any additional description here -+.PP -+Change the effective user id and group id to that of USER. -+.TP -+-, \fB\-l\fR, \fB\-\-login\fR -+make the shell a login shell -+.TP -+\fB\-c\fR, \fB\-\-commmand\fR=\fICOMMAND\fR -+pass a single COMMAND to the shell with \fB\-c\fR -+.TP -+\fB\-f\fR, \fB\-\-fast\fR -+pass \fB\-f\fR to the shell (for csh or tcsh) -+.TP -+\fB\-m\fR, \fB\-\-preserve\-environment\fR -+do not reset environment variables -+.TP -+\fB\-p\fR -+same as \fB\-m\fR -+.TP -+\fB\-s\fR, \fB\-\-shell\fR=\fISHELL\fR -+run SHELL if /etc/shells allows it -+.TP -+\fB\-\-help\fR -+display this help and exit -+.TP -+\fB\-\-version\fR -+output version information and exit -+.PP -+A mere - implies \fB\-l\fR. If USER not given, assume root. -+.SH AUTHOR -+Written by David MacKenzie, Dan Walsh. -+.SH "REPORTING BUGS" -+Report bugs to . -+.SH COPYRIGHT -+Copyright \(co 2004 Free Software Foundation, Inc. -+.br -+This is free software; see the source for copying conditions. There is NO -+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+.SH "SEE ALSO" -+Since this command is trimmed down version of su use you can use the su manual. -+The full documentation for -+.B su -+is maintained as a Texinfo manual. If the -+.B info -+and -+.B su -+programs are properly installed at your site, the command -+.IP -+.B info coreutils su -+.PP -+should give you access to the complete manual. ---- coreutils-5.2.1/man/Makefile.am.runuser 2004-10-04 13:26:23.000000000 -0400 -+++ coreutils-5.2.1/man/Makefile.am 2004-10-04 13:26:23.000000000 -0400 -@@ -10,7 +10,7 @@ - rm.1 rmdir.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \ - su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \ - tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \ -- who.1 whoami.1 yes.1 chcon.1 runcon.1 -+ who.1 whoami.1 yes.1 chcon.1 runcon.1 runuser.1 - - man_aux = $(dist_man_MANS:.1=.x) - -@@ -114,6 +114,7 @@ - yes.1: $(common_dep) $(srcdir)/yes.x ../src/yes.c - chcon.1: $(common_dep) $(srcdir)/chcon.x ../src/chcon.c - runcon.1: $(common_dep) $(srcdir)/runcon.x ../src/runcon.c -+runuser.1: $(common_dep) $(srcdir)/runuser.x ../src/runuser.c - - SUFFIXES = .x .1 - ---- /dev/null 2004-09-30 04:21:43.103661032 -0400 -+++ coreutils-5.2.1/man/runuser.x 2004-10-04 13:26:23.000000000 -0400 -@@ -0,0 +1,4 @@ -+[NAME] -+runuser \- run a shell with substitute user and group IDs -+[DESCRIPTION] -+.\" Add any additional description here ---- coreutils-5.2.1/README.runuser 2004-10-04 13:26:23.000000000 -0400 -+++ coreutils-5.2.1/README 2004-10-04 13:26:23.000000000 -0400 -@@ -11,7 +11,7 @@ - df dir dircolors dirname du echo env expand expr factor false fmt fold - ginstall groups head hostid hostname id join kill link ln logname ls - md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr -- printenv printf ptx pwd readlink rm rmdir runcon seq sha1sum shred sleep sort -+ printenv printf ptx pwd readlink rm rmdir runcon runuser seq sha1sum shred sleep sort - split stat stty su sum sync tac tail tee test touch tr true tsort tty - uname unexpand uniq unlink uptime users vdir wc who whoami yes - ---- coreutils-5.2.1/tests/help-version.runuser 2004-10-04 13:26:23.000000000 -0400 -+++ coreutils-5.2.1/tests/help-version 2004-10-04 13:26:23.000000000 -0400 -@@ -132,6 +132,7 @@ - seq_args=10 - sleep_args=0 - su_args=--version -+runuser_args=--version - test_args=foo - - # This is necessary in the unusual event that there is ---- coreutils-5.2.1/src/su.c.runuser 2004-10-04 13:26:23.000000000 -0400 -+++ coreutils-5.2.1/src/su.c 2004-10-04 13:26:23.000000000 -0400 +--- coreutils-5.2.1/src/su.c.runuser 2004-10-05 12:50:23.915824850 +0100 ++++ coreutils-5.2.1/src/su.c 2004-10-05 12:50:24.254760375 +0100 @@ -171,6 +171,10 @@ #ifndef USE_PAM char *crypt (); @@ -129,8 +20,8 @@ { #ifdef SYSLOG_FAILURE log_su (pw, 0); ---- coreutils-5.2.1/src/Makefile.am.runuser 2004-10-04 13:26:23.000000000 -0400 -+++ coreutils-5.2.1/src/Makefile.am 2004-10-04 14:26:31.123772661 -0400 +--- coreutils-5.2.1/src/Makefile.am.runuser 2004-10-05 12:50:23.909825991 +0100 ++++ coreutils-5.2.1/src/Makefile.am 2004-10-05 12:50:24.258759614 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- @@ -138,8 +29,8 @@ +EXTRA_PROGRAMS = chroot df hostid nice pinky stty su runuser uname uptime users who bin_SCRIPTS = groups - bin_PROGRAMS = [ chgrp chown chmod chcon cp dd dircolors du \ -@@ -74,6 +74,7 @@ + bin_PROGRAMS = [ chgrp chown chmod cp dd dircolors du \ +@@ -67,6 +67,7 @@ uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS) su_LDADD = $(LDADD) $(LIB_CRYPT) @LIB_PAM@ @@ -147,7 +38,7 @@ $(PROGRAMS): ../lib/libfetish.a -@@ -91,7 +92,7 @@ +@@ -84,7 +85,7 @@ chmod +x $@-t mv $@-t $@ @@ -156,7 +47,7 @@ installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'` -@@ -107,7 +108,7 @@ +@@ -100,7 +101,7 @@ chmod $(setuid_root_mode) $(installed_su) install-root: su$(EXEEXT) @@ -165,8 +56,8 @@ install-exec-local: su$(EXEEXT) @TMPFILE=$(DESTDIR)$(bindir)/.su-$$$$; \ ---- /dev/null 2004-09-30 04:21:43.103661032 -0400 -+++ coreutils-5.2.1/src/runuser.c 2004-10-04 13:26:23.000000000 -0400 +--- /dev/null 2004-09-27 14:44:32.781829323 +0100 ++++ coreutils-5.2.1/src/runuser.c 2004-10-05 12:50:24.261759043 +0100 @@ -0,0 +1,33 @@ +#define CHECKPASSWD 0 +#define pam_start my_pam_start @@ -201,3 +92,112 @@ + return NULL; +} + +--- /dev/null 2004-09-27 14:44:32.781829323 +0100 ++++ coreutils-5.2.1/man/runuser.1 2004-10-05 12:50:24.265758283 +0100 +@@ -0,0 +1,59 @@ ++.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. ++.TH RUNUSER "1" "September 2004" "runuser (coreutils) 5.2.1" "User Commands" ++.SH NAME ++runuser \- run a shell with substitute user and group IDs, similar to su, but will not prompt for password. ++.SH SYNOPSIS ++.B runuser ++[\fIOPTION\fR]... [\fI-\fR] [\fIUSER \fR[\fIARG\fR]...] ++.SH DESCRIPTION ++.\" Add any additional description here ++.PP ++Change the effective user id and group id to that of USER. ++.TP ++-, \fB\-l\fR, \fB\-\-login\fR ++make the shell a login shell ++.TP ++\fB\-c\fR, \fB\-\-commmand\fR=\fICOMMAND\fR ++pass a single COMMAND to the shell with \fB\-c\fR ++.TP ++\fB\-f\fR, \fB\-\-fast\fR ++pass \fB\-f\fR to the shell (for csh or tcsh) ++.TP ++\fB\-m\fR, \fB\-\-preserve\-environment\fR ++do not reset environment variables ++.TP ++\fB\-p\fR ++same as \fB\-m\fR ++.TP ++\fB\-s\fR, \fB\-\-shell\fR=\fISHELL\fR ++run SHELL if /etc/shells allows it ++.TP ++\fB\-\-help\fR ++display this help and exit ++.TP ++\fB\-\-version\fR ++output version information and exit ++.PP ++A mere - implies \fB\-l\fR. If USER not given, assume root. ++.SH AUTHOR ++Written by David MacKenzie, Dan Walsh. ++.SH "REPORTING BUGS" ++Report bugs to . ++.SH COPYRIGHT ++Copyright \(co 2004 Free Software Foundation, Inc. ++.br ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++.SH "SEE ALSO" ++Since this command is trimmed down version of su use you can use the su manual. ++The full documentation for ++.B su ++is maintained as a Texinfo manual. If the ++.B info ++and ++.B su ++programs are properly installed at your site, the command ++.IP ++.B info coreutils su ++.PP ++should give you access to the complete manual. +--- coreutils-5.2.1/man/Makefile.am.runuser 2004-01-23 15:54:23.000000000 +0000 ++++ coreutils-5.2.1/man/Makefile.am 2004-10-05 12:50:54.285047667 +0100 +@@ -7,7 +7,7 @@ + link.1 ln.1 logname.1 \ + ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nice.1 nl.1 nohup.1 od.1 \ + paste.1 pathchk.1 pinky.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \ +- rm.1 rmdir.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \ ++ rm.1 rmdir.1 runuser.1 seq.1 sha1sum.1 shred.1 sleep.1 sort.1 split.1 stat.1 stty.1 \ + su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \ + tty.1 uname.1 unexpand.1 uniq.1 unlink.1 uptime.1 users.1 vdir.1 wc.1 \ + who.1 whoami.1 yes.1 +@@ -81,6 +81,7 @@ + readlink.1: $(common_dep) $(srcdir)/readlink.x ../src/readlink.c + rm.1: $(common_dep) $(srcdir)/rm.x ../src/rm.c + rmdir.1: $(common_dep) $(srcdir)/rmdir.x ../src/rmdir.c ++runuser.1: $(common_dep) $(srcdir)/runuser.x ../src/runuser.c + seq.1: $(common_dep) $(srcdir)/seq.x ../src/seq.c + sha1sum.1: $(common_dep) $(srcdir)/sha1sum.x ../src/md5sum.c + shred.1: $(common_dep) $(srcdir)/shred.x ../src/shred.c +--- /dev/null 2004-09-27 14:44:32.781829323 +0100 ++++ coreutils-5.2.1/man/runuser.x 2004-10-05 12:50:24.282755049 +0100 +@@ -0,0 +1,4 @@ ++[NAME] ++runuser \- run a shell with substitute user and group IDs ++[DESCRIPTION] ++.\" Add any additional description here +--- coreutils-5.2.1/tests/help-version.runuser 2004-02-17 16:04:23.000000000 +0000 ++++ coreutils-5.2.1/tests/help-version 2004-10-05 12:50:24.284754669 +0100 +@@ -130,6 +130,7 @@ + seq_args=10 + sleep_args=0 + su_args=--version ++runuser_args=--version + test_args=foo + + # This is necessary in the unusual event that there is +--- coreutils-5.2.1/README.runuser 2004-01-18 07:59:41.000000000 +0000 ++++ coreutils-5.2.1/README 2004-10-05 12:50:24.287754098 +0100 +@@ -11,7 +11,7 @@ + df dir dircolors dirname du echo env expand expr factor false fmt fold + ginstall groups head hostid hostname id join kill link ln logname ls + md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr +- printenv printf ptx pwd readlink rm rmdir seq sha1sum shred sleep sort ++ printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum shred sleep sort + split stat stty su sum sync tac tail tee test touch tr true tsort tty + uname unexpand uniq unlink uptime users vdir wc who whoami yes + diff --git a/coreutils-selinux.patch b/coreutils-selinux.patch index 7c04a55..d2b6d13 100644 --- a/coreutils-selinux.patch +++ b/coreutils-selinux.patch @@ -2730,8 +2730,8 @@ df dir dircolors dirname du echo env expand expr factor false fmt fold ginstall groups head hostid hostname id join kill link ln logname ls md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr -- printenv printf ptx pwd readlink rm rmdir seq sha1sum shred sleep sort -+ printenv printf ptx pwd readlink rm rmdir runcon seq sha1sum shred sleep sort +- printenv printf ptx pwd readlink rm rmdir runuser seq sha1sum shred sleep sort ++ printenv printf ptx pwd readlink rm rmdir runcon runuser seq sha1sum shred sleep sort split stat stty su sum sync tac tail tee test touch tr true tsort tty uname unexpand uniq unlink uptime users vdir wc who whoami yes diff --git a/coreutils.spec b/coreutils.spec index 234afa5..c47ccc6 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -44,6 +44,7 @@ Patch800: coreutils-i18n.patch Patch904: coreutils-5.0-allow_old_options.patch Patch905: coreutils-jday.patch Patch906: coreutils-fchown.patch +Patch907: coreutils-5.2.1-runuser.patch # From upstream Patch920: coreutils-dateseconds.patch @@ -53,7 +54,6 @@ Patch923: coreutils-copy.patch #SELINUX Patch Patch950: coreutils-selinux.patch -Patch951: coreutils-5.2.1-runuser.patch BuildRoot: %_tmppath/%{name}-root BuildRequires: gettext libtermcap-devel bison @@ -103,6 +103,7 @@ the old GNU fileutils, sh-utils, and textutils packages. %patch904 -p1 -b .allow_old_options %patch905 -p1 -b .jday %patch906 -p1 -b .fchown +%patch907 -p1 -b .runuser # From upstream %patch920 -p1 -b .dateseconds @@ -112,7 +113,6 @@ the old GNU fileutils, sh-utils, and textutils packages. #SELinux %patch950 -p1 -b .selinux -%patch951 -p1 -b .runuser # Don't run basic-1 test, since it breaks when run in the background @@ -247,10 +247,13 @@ fi /sbin/runuser %changelog -* Mon Oct 4 2004 Dan Walsh 5.2.1-30 +* Tue Oct 5 2004 Tim Waugh +- The selinux patch should be applied last. + +* Mon Oct 4 2004 Dan Walsh 5.2.1-30 - Mv runuser to /sbin -* Mon Oct 4 2004 Dan Walsh 5.2.1-28 +* Mon Oct 4 2004 Dan Walsh 5.2.1-28 - Fix runuser man page. * Mon Oct 4 2004 Tim Waugh