rpms/coreutils/devel .cvsignore, 1.21, 1.22 coreutils-5.2.1-runuser.patch, 1.25, 1.26 coreutils-6.10-configuration.patch, 1.21, 1.22 coreutils-i18n.patch, 1.35, 1.36 coreutils.spec, 1.266, 1.267 sources, 1.23, 1.24 coreutils-7.4-install-SELinux.patch, 1.1, NONE coreutils-7.4-ls-1U.patch, 1.1, NONE
Ondrej Vasik
ovasik at fedoraproject.org
Fri Aug 21 07:01:01 UTC 2009
Author: ovasik
Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16751
Modified Files:
.cvsignore coreutils-5.2.1-runuser.patch
coreutils-6.10-configuration.patch coreutils-i18n.patch
coreutils.spec sources
Removed Files:
coreutils-7.4-install-SELinux.patch coreutils-7.4-ls-1U.patch
Log Message:
New upstream release 7.5, remove already applied patches,defuzz few others
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore 6 Aug 2009 13:24:22 -0000 1.21
+++ .cvsignore 21 Aug 2009 07:00:58 -0000 1.22
@@ -1 +1 @@
-coreutils-7.4.tar.xz
+coreutils-7.5.tar.xz
coreutils-5.2.1-runuser.patch:
coreutils-7.0/AUTHORS | 1
coreutils-7.0/README | 8 -
coreutils-7.0/man/Makefile.am | 1
coreutils-7.0/man/runuser.x | 12 ++
coreutils-7.0/src/Makefile.am | 8 +
coreutils-7.0/src/su.c | 137 +++++++++++++++++++++++++++++++---
coreutils-7.5/tests/misc/help-version | 1
7 files changed, 153 insertions(+), 15 deletions(-)
Index: coreutils-5.2.1-runuser.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-5.2.1-runuser.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- coreutils-5.2.1-runuser.patch 25 May 2009 12:11:34 -0000 1.25
+++ coreutils-5.2.1-runuser.patch 21 Aug 2009 07:00:58 -0000 1.26
@@ -44,13 +44,13 @@ diff -urNp coreutils-7.0.orig/README cor
link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup
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 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
+- 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 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
++ 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.
@@ -355,13 +355,13 @@ diff -urNp coreutils-7.0.orig/src/su.c c
+#endif
+ );
}
-diff -urNp coreutils-7.0.orig/tests/misc/help-version coreutils-7.0/tests/misc/help-version
---- coreutils-7.0.orig/tests/misc/help-version 2008-09-27 19:28:54.000000000 +0200
-+++ coreutils-7.0/tests/misc/help-version 2009-01-28 18:11:00.321247443 +0100
-@@ -148,6 +148,7 @@ printf_args=foo
- seq_args=10
+diff -urNp coreutils-7.5.orig/tests/misc/help-version coreutils-7.5/tests/misc/help-version
+--- coreutils-7.5.orig/tests/misc/help-version
++++ coreutils-7.5/tests/misc/help-version
+@@ -150,6 +150,7 @@ printf_args=foo
sleep_args=0
su_args=--version
+ stdbuf_args="-oL true"
+runuser_args=--version
timeout_args=--version
coreutils-6.10-configuration.patch:
coreutils-6.11/tests/mkdir/selinux | 1 +
coreutils-6.11/tests/test-lib.sh | 4 ++--
coreutils-7.1/src/ls.c | 8 ++++----
coreutils-7.2/gnulib-tests/gnulib.mk | 12 ++++++------
4 files changed, 13 insertions(+), 12 deletions(-)
Index: coreutils-6.10-configuration.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-6.10-configuration.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- coreutils-6.10-configuration.patch 17 Apr 2009 13:27:36 -0000 1.21
+++ coreutils-6.10-configuration.patch 21 Aug 2009 07:00:58 -0000 1.22
@@ -7,10 +7,10 @@ diff -urNp coreutils-7.2-orig/gnulib-tes
-TESTS += test-memchr
-check_PROGRAMS += test-memchr
--EXTRA_DIST += test-memchr.c
+-EXTRA_DIST += test-memchr.c zerosize-ptr.h
+#TESTS += test-memchr
+#check_PROGRAMS += test-memchr
-+#EXTRA_DIST += test-memchr.c
++#EXTRA_DIST += test-memchr.c zerosize-ptr.h
## end gnulib module memchr-tests
coreutils-i18n.patch:
coreutils-6.11/src/join.c | 105 +++-
coreutils-6.12-orig/src/join.c | 5
coreutils-6.12/tests/Makefile.am | 5
coreutils-6.12/tests/misc/cut | 6
coreutils-6.8+/lib/linebuffer.h | 8
coreutils-6.8+/src/cut.c | 420 ++++++++++++++++++-
coreutils-6.8+/src/expand.c | 161 +++++++
coreutils-6.8+/src/fold.c | 312 +++++++++++++-
coreutils-6.8+/src/join.c | 237 ++++++++++-
coreutils-6.8+/src/pr.c | 431 ++++++++++++++++++--
coreutils-6.8+/src/sort.c | 675 ++++++++++++++++++++++++++++++--
coreutils-6.8+/src/unexpand.c | 226 ++++++++++
coreutils-6.8+/src/uniq.c | 259 +++++++++++-
coreutils-6.8+/tests/misc/mb1.I | 4
coreutils-6.8+/tests/misc/mb1.X | 4
coreutils-6.8+/tests/misc/mb2.I | 4
coreutils-6.8+/tests/misc/mb2.X | 4
coreutils-6.8+/tests/misc/sort-mb-tests | 58 ++
18 files changed, 2744 insertions(+), 180 deletions(-)
Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- coreutils-i18n.patch 6 Jul 2009 21:40:43 -0000 1.35
+++ coreutils-i18n.patch 21 Aug 2009 07:00:58 -0000 1.36
@@ -2089,7 +2089,7 @@ diff -urNp coreutils-6.11-orig/src/join.
while (blanks[to_uchar (*a)])
a++;
@@ -1510,6 +1813,25 @@
- return strnumcmp (a, b, decimal_point, thousands_sep);
+ : strnumcmp (a, b, decimal_point, thousands_sep));
}
+#if HAVE_MBRTOWC
@@ -2202,7 +2202,7 @@ diff -urNp coreutils-6.11-orig/src/join.
-keycompare (const struct line *a, const struct line *b)
+keycompare_uni (const struct line *a, const struct line *b)
{
- struct keyfield const *key = keylist;
+ struct keyfield *key = keylist;
@@ -1875,6 +2265,181 @@
return key->reverse ? -diff : diff;
Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -p -r1.266 -r1.267
--- coreutils.spec 6 Aug 2009 13:31:14 -0000 1.266
+++ coreutils.spec 21 Aug 2009 07:00:58 -0000 1.267
@@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils
-Version: 7.4
-Release: 6%{?dist}
+Version: 7.5
+Release: 1%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -18,8 +18,6 @@ Source202: coreutils-su-l.pamd
Source203: coreutils-runuser-l.pamd
# From upstream
-Patch1: coreutils-7.4-ls-1U.patch
-Patch2: coreutils-7.4-install-SELinux.patch
# Our patches
Patch100: coreutils-6.10-configuration.patch
@@ -101,8 +99,6 @@ the old GNU fileutils, sh-utils, and tex
%setup -q
# From upstream
-%patch1 -p1 -b .ls-1U
-%patch2 -p1 -b .install-SELinux
# Our patches
%patch100 -p1 -b .configure
@@ -318,6 +314,10 @@ fi
/sbin/runuser
%changelog
+* Fri Aug 21 2009 Ondrej Vasik <ovasik at redhat.com> - 7.5-1
+- New upstream release 7.5, remove already applied patches,
+ defuzz few others
+
* Thu Aug 06 2009 Ondrej Vasik <ovasik at redhat.com> - 7.4-6
- do process install-info only with info files present(#515970)
- BuildRequires for xz, use xz tarball
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources 6 Aug 2009 13:24:22 -0000 1.23
+++ sources 21 Aug 2009 07:00:59 -0000 1.24
@@ -1 +1 @@
-e8d906c153f271430e3efb2b9a35a35f coreutils-7.4.tar.xz
+ca9219c5b7efa533d552f61a3880f458 coreutils-7.5.tar.xz
--- coreutils-7.4-install-SELinux.patch DELETED ---
--- coreutils-7.4-ls-1U.patch DELETED ---
More information about the scm-commits
mailing list