From: Marcin Krol <hawk@tld-linux.org>
Date: Thu, 12 Apr 2012 08:49:09 +0000 (+0000)
Subject: - synced with PLD (update to 8.15)
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=16cd08ef52602a04b23e28d9983270323c0b829f;p=packages%2Fcoreutils.git
- synced with PLD (update to 8.15)
---
diff --git a/coreutils-info.patch b/coreutils-info.patch
index 848ab64..c725998 100644
--- a/coreutils-info.patch
+++ b/coreutils-info.patch
@@ -82,6 +82,7 @@
-* ptx: (coreutils)ptx invocation. Produce permuted indexes.
-* pwd: (coreutils)pwd invocation. Print working directory.
-* readlink: (coreutils)readlink invocation. Print referent of a symlink.
+-* realpath: (coreutils)readpath invocation. Print resolved file names.
-* rm: (coreutils)rm invocation. Remove files.
-* rmdir: (coreutils)rmdir invocation. Remove empty directories.
-* runcon: (coreutils)runcon invocation. Run in specified SELinux CTX.
@@ -181,6 +182,7 @@
+* ptx: (coreutils)ptx. Produce permuted indexes
+* pwd: (coreutils)pwd. Print working directory
+* readlink: (coreutils)readlink. Print referent of a symlink
++* realpath: (coreutils)realpath. Print resolved file names
+* rm: (coreutils)rm. Remove files
+* rmdir: (coreutils)rmdir. Remove empty directories
+* runcon: (coreutils)runcon. Run in specified SELinux CTX
@@ -420,7 +422,7 @@
@command{test}: Check file types and compare values
-@@ -372,21 +363,21 @@
+@@ -372,22 +363,22 @@
Redirection
@@ -433,10 +435,12 @@
-* dirname invocation:: Strip last file name component
-* pathchk invocation:: Check file name validity and portability
-* mktemp invocation:: Create temporary file or directory
+-* realpath invocation:: Print resolved file names
+* basename:: Strip directory and suffix from a file name
+* dirname:: Strip last file name component
+* pathchk:: Check file name validity and portability
+* mktemp:: Create temporary file or directory
++* realpath:: Print resolved file names
Working context
@@ -1401,7 +1405,7 @@
@section @command{tee}: Redirect output to multiple files or processes
@pindex tee
-@@ -12138,14 +12123,14 @@
+@@ -12138,15 +12123,15 @@
This section describes commands that manipulate file names.
@menu
@@ -1409,10 +1413,12 @@
-* dirname invocation:: Strip last file name component.
-* pathchk invocation:: Check file name validity and portability.
-* mktemp invocation:: Create temporary file or directory.
+-* realpath invocation:: Print resolved file names.
+* basename:: Strip directory and suffix from a file name.
+* dirname:: Strip last file name component.
+* pathchk:: Check file name validity and portability.
+* mktemp:: Create temporary file or directory.
++* realpath:: Print resolved file names.
@end menu
diff --git a/coreutils-pam.patch b/coreutils-pam.patch
index 6c2b01e..3f0cf31 100644
--- a/coreutils-pam.patch
+++ b/coreutils-pam.patch
@@ -474,7 +474,7 @@
+msgid " killed.\n"
+msgstr " zabito.\n"
+
- #: src/su.c:382
+ #: src/su.c:373
msgid ""
"Change the effective user id and group id to that of USER.\n"
diff -Nur coreutils-5.2.1.orig/man/es/su.1 coreutils-5.2.1/man/es/su.1
diff --git a/coreutils-runuser.patch b/coreutils-runuser.patch
index 15035bd..978bb07 100644
--- a/coreutils-runuser.patch
+++ b/coreutils-runuser.patch
@@ -4,15 +4,15 @@ diff -urNp coreutils-8.7-orig/README coreutils-8.7/README
@@ -12,10 +12,10 @@ The programs that can be built with this
factor false fmt fold groups head hostid hostname id install join kill
link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup
- nproc od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir
-- runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf
-- sleep sort split stat stdbuf stty su sum sync tac tail tee test timeout
-- touch tr true truncate tsort tty uname unexpand uniq unlink uptime users
-- vdir wc who whoami yes
-+ runcon runuser seq sha1sum sha224sum sha256sum sha384sum sha512sum shred
-+ shuf sleep sort split stat stdbuf stty su sum sync tac tail tee test
-+ timeout touch tr true truncate tsort tty uname unexpand uniq unlink uptime
-+ users vdir wc who whoami yes
+ nproc od paste pathchk pinky pr printenv printf ptx pwd readlink realpath
+- rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred
+- shuf sleep sort split stat stdbuf stty su sum sync tac tail tee test
+- timeout touch tr true truncate tsort tty uname unexpand uniq unlink
+- uptime users vdir wc who whoami yes
++ rm rmdir runcon runuser seq sha1sum sha224sum sha256sum sha384sum sha512sum
++ shred shuf sleep sort split stat stdbuf stty su sum sync tac tail tee
++ test timeout touch tr true truncate tsort tty uname unexpand uniq
++ unlink uptime users vdir wc who whoami yes
See the file NEWS for a list of major changes in the current release.
diff --git a/coreutils.spec b/coreutils.spec
index 6e9c505..714d48c 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,16 +1,16 @@
# Conditional build:
%bcond_with advcopy # progress bar in cp (orphaned patch)
%bcond_without tests # do not perform "make test check"
-
+#
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.13
+Version: 8.15
Release: 2
License: GPL v3+
Group: Applications/System
Source0: http://ftp.gnu.org/gnu/coreutils/%{name}-%{version}.tar.xz
-# Source0-md5: 8e1675c6c336ff55557c698706a63d6c
+# Source0-md5: 094909fafa86110140b32e4948941545
Source1: %{name}-non-english-man-pages.tar.bz2
# Source1-md5: f7c986ebc74ccb8d08ed70141063f14c
Source2: DIR_COLORS
@@ -29,7 +29,6 @@ Patch4: %{name}-uname-cpuinfo.patch
Patch5: %{name}-date-man.patch
Patch6: %{name}-mem.patch
Patch7: %{name}-7.4-sttytcsadrain.patch
-
Patch9: %{name}-fmt-wchars.patch
Patch10: %{name}-runuser.patch
Patch11: %{name}-split-pam.patch
@@ -90,9 +89,9 @@ The programs that can be built with this package are:
dd df dir dircolors dirname du echo env expand expr factor false fmt
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 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 users vdir wc who whoami yes
+ 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
+ uname unexpand uniq unlink users vdir wc who whoami yes
%description -l pl.UTF-8
NarzÄdzia podstawowe (core utilities) GNU to poÅÄ
czone paczki GNU
@@ -108,9 +107,9 @@ Programy zawarte w tym pakiecie to:
dd df dir dircolors dirname du echo env expand expr factor false fmt
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 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 users vdir wc who whoami yes
+ 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
+ uname unexpand uniq unlink users vdir wc who whoami yes
%prep
%setup -q -a1
@@ -153,6 +152,10 @@ Programy zawarte w tym pakiecie to:
%{__rm} tests/misc/help-version
%{__sed} -i -e '/misc\/help-version/d' tests/Makefile.am
+# fails on some filesystems (like XFS), where readdir returns d_type=DT_UNKNOWN
+%{__rm} tests/ls/stat-free-color
+%{__sed} -i -e '/ls\/stat-free-color/d' tests/Makefile.am
+
%build
%{__gettextize}
%{__aclocal} -I m4
@@ -163,7 +166,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 \
+ --enable-install-program=arch,su \
--enable-no-install-program=hostname,kill,uptime \
--enable-pam
@@ -186,10 +189,10 @@ df,echo,false,id,link,ln,ls,mkdir,mknod,mktemp,mv,nice,printf,pwd,rm,rmdir,\
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
-install -p src/runuser $RPM_BUILD_ROOT/sbin
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}
cp -p %{SOURCE3} %{SOURCE4} $RPM_BUILD_ROOT/etc/shrc.d
@@ -206,7 +209,6 @@ done
install %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/pl/man1/mktemp.1
# unwanted (-f left intentionally - some manuals could have no translations)
rm -f $RPM_BUILD_ROOT%{_mandir}/*/man1/{hostname,kill,uptime}.1
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/eo
# always remove, never packaged but sometimes installed
rm -f $RPM_BUILD_ROOT%{_infodir}/dir