[packages/coreutils] - su moved to util-linux package; TODO: R/C with util-linux
arekm
arekm at pld-linux.org
Sun Oct 14 10:43:12 CEST 2012
commit e3b5fe3f1f596ef6c1f0d932d5123c0d93cedc4b
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Oct 14 10:43:09 2012 +0200
- su moved to util-linux package; TODO: R/C with util-linux
coreutils-su-paths.patch | 18 ------------------
coreutils.spec | 26 ++++++++------------------
su-l.pamd | 6 ------
su.pamd | 9 ---------
4 files changed, 8 insertions(+), 51 deletions(-)
---
diff --git a/coreutils.spec b/coreutils.spec
index e523002..def8408 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -7,7 +7,7 @@ Summary: GNU Core-utils - basic command line utilities
Summary(pl.UTF-8): GNU Core-utils - podstawowe narzędzia działające z linii poleceń
Name: coreutils
Version: 8.16
-Release: 1
+Release: 1.1
License: GPL v3+
Group: Applications/System
Source0: http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
@@ -17,15 +17,14 @@ Source1: %{name}-non-english-man-pages.tar.bz2
Source2: DIR_COLORS
Source3: fileutils.sh
Source4: fileutils.csh
-Source5: su.pamd
-Source6: su-l.pamd
+
Source7: runuser.pamd
Source8: runuser-l.pamd
Source9: mktemp.1.pl
Patch0: %{name}-info.patch
Patch1: %{name}-pam.patch
Patch2: %{name}-getgid.patch
-Patch3: %{name}-su-paths.patch
+
Patch4: %{name}-uname-cpuinfo.patch
Patch5: %{name}-date-man.patch
Patch6: %{name}-mem.patch
@@ -59,13 +58,11 @@ BuildRequires: strace
%endif
Requires: pam >= 0.77.3
Requires: setup >= 2.4.6-2
-Provides: coreutils-su
Provides: fileutils
Provides: mktemp = %{version}-%{release}
Provides: sh-utils
Provides: stat
Provides: textutils
-Obsoletes: coreutils-su
Obsoletes: fileutils
Obsoletes: mktemp
Obsoletes: sh-utils
@@ -91,7 +88,7 @@ The programs that can be built with this package are:
fold install groups head hostid id join link ln logname ls md5sum
mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr printenv
printf ptx pwd realpath rm rmdir runuser seq sha1sum shred sleep sort
- split stat stty su sum sync tac tail tee test touch tr true tsort tty
+ split stat stty sum sync tac tail tee test touch tr true tsort tty
uname unexpand uniq unlink users vdir wc who whoami yes
%description -l pl.UTF-8
@@ -109,7 +106,7 @@ Programy zawarte w tym pakiecie to:
fold ginstall groups head hostid id join link ln logname ls md5sum
mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr printenv
printf ptx pwd realpath rm rmdir runuser seq sha1sum shred sleep sort
- split stat stty su sum sync tac tail tee test touch tr true tsort tty
+ split stat stty sum sync tac tail tee test touch tr true tsort tty
uname unexpand uniq unlink users vdir wc who whoami yes
%prep
@@ -118,7 +115,7 @@ Programy zawarte w tym pakiecie to:
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+
%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -167,7 +164,7 @@ Programy zawarte w tym pakiecie to:
CFLAGS="%{rpmcflags} -DSYSLOG_SUCCESS -DSYSLOG_FAILURE -DSYSLOG_NON_ROOT" \
DEFAULT_POSIX2_VERSION=199209 \
--disable-silent-rules \
- --enable-install-program=arch,su \
+ --enable-install-program=arch \
--enable-no-install-program=hostname,kill,uptime \
--enable-pam
@@ -192,13 +189,9 @@ sleep,sort,stat,stty,sync,touch,true,unlink,uname} $RPM_BUILD_ROOT/bin
mv -f $RPM_BUILD_ROOT%{_bindir}/chroot $RPM_BUILD_ROOT%{_sbindir}
mv $RPM_BUILD_ROOT{%{_bindir},/sbin}/runuser
-# su is missed by "make install" called by non-root
-install -p src/su $RPM_BUILD_ROOT/bin
-
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}
cp -p %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT/etc/shrc.d
-cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/su
-cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/su-l
+
cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/runuser
cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/runuser-l
@@ -229,13 +222,10 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS ChangeLog NEWS README THANKS THANKS-to-translators TODO
%attr(755,root,root) /bin/[!s]*
%attr(755,root,root) /bin/s[!u]*
-%attr(4755,root,root) /bin/su
%attr(755,root,root) /sbin/runuser
%attr(755,root,root) %{_bindir}/*
%attr(755,root,root) %{_sbindir}/chroot
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/DIR_COLORS
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/su
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/su-l
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/runuser
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/runuser-l
%config(noreplace) /etc/shrc.d/fileutils.*sh
diff --git a/coreutils-su-paths.patch b/coreutils-su-paths.patch
deleted file mode 100644
index 2f0a467..0000000
--- a/coreutils-su-paths.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- coreutils-4.5.3/src/su.c.orig Sun Oct 27 21:57:03 2002
-+++ coreutils-4.5.3/src/su.c Sun Oct 27 22:15:05 2002
-@@ -154,6 +154,15 @@
- # define DEFAULT_ROOT_LOGIN_PATH "/usr/ucb:/bin:/usr/bin:/etc"
- #endif
-
-+/* The default paths which get set are both bogus and oddly influenced
-+ by <paths.h> and -D on the commands line. Just to be clear, we'll set
-+ these explicitly. -ewt */
-+#undef DEFAULT_LOGIN_PATH
-+#undef DEFAULT_ROOT_LOGIN_PATH
-+#define DEFAULT_LOGIN_PATH "/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
-+#define DEFAULT_ROOT_LOGIN_PATH \
-+ "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/X11R6/bin:/usr/X11R6/sbin"
-+
- /* The shell to run if none is given in the user's passwd entry. */
- #define DEFAULT_SHELL "/bin/sh"
-
diff --git a/su-l.pamd b/su-l.pamd
deleted file mode 100644
index 656a139..0000000
--- a/su-l.pamd
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth include su
-account include su
-password include su
-session optional pam_keyinit.so force revoke
-session include su
diff --git a/su.pamd b/su.pamd
deleted file mode 100644
index 013bb59..0000000
--- a/su.pamd
+++ /dev/null
@@ -1,9 +0,0 @@
-#%PAM-1.0
-auth sufficient pam_rootok.so
-auth required pam_wheel.so group=wheel use_uid
-auth include system-auth
-account sufficient pam_succeed_if.so uid = 0 use_uid quiet
-account include system-auth
-password include system-auth
-session optional pam_xauth.so
-session include system-auth
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/coreutils.git/commitdiff/e3b5fe3f1f596ef6c1f0d932d5123c0d93cedc4b
More information about the pld-cvs-commit
mailing list