rpms/coreutils/devel .cvsignore, 1.23, 1.24 coreutils-5.2.1-runuser.patch, 1.28, 1.29 coreutils-i18n.patch, 1.39, 1.40 coreutils-pam.patch, 1.17, 1.18 coreutils-selinux.patch, 1.60, 1.61 coreutils.spec, 1.282, 1.283 sources, 1.25, 1.26 coreutils-7.6-lzipcolor.patch, 1.1, NONE coreutils-cpxattrreadonly.patch, 1.1, NONE coreutils-ls-inode.patch, 1.1, NONE
Ondrej Vasik
ovasik at fedoraproject.org
Tue Oct 6 13:43:27 UTC 2009
Author: ovasik
Update of /cvs/extras/rpms/coreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15997
Modified Files:
.cvsignore coreutils-5.2.1-runuser.patch coreutils-i18n.patch
coreutils-pam.patch coreutils-selinux.patch coreutils.spec
sources
Removed Files:
coreutils-7.6-lzipcolor.patch coreutils-cpxattrreadonly.patch
coreutils-ls-inode.patch
Log Message:
New upstream release 8.0 (beta), defuzz patches, remove applied patches
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore 12 Sep 2009 09:28:48 -0000 1.23
+++ .cvsignore 6 Oct 2009 13:43:24 -0000 1.24
@@ -1 +1 @@
-coreutils-7.6.tar.xz
+coreutils-8.0.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 | 138 +++++++++++++++++++++++++++++++---
coreutils-7.5/tests/misc/help-version | 1
coreutils-7.6/man/help2man | 3
8 files changed, 157 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.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- coreutils-5.2.1-runuser.patch 22 Sep 2009 13:24:02 -0000 1.28
+++ coreutils-5.2.1-runuser.patch 6 Oct 2009 13:43:24 -0000 1.29
@@ -105,18 +105,14 @@ diff -urNp coreutils-7.0.orig/src/su.c c
#if HAVE_PATHS_H
# include <paths.h>
-@@ -149,6 +155,10 @@
+@@ -149,11 +155,18 @@
#ifndef USE_PAM
char *crypt (char const *key, char const *salt);
#endif
+#ifndef CHECKPASSWD
+#define CHECKPASSWD 1
+#endif
-+
- char *getusershell (void);
- void endusershell (void);
- void setusershell (void);
-@@ -156,7 +166,11 @@ void setusershell ();
+
extern char **environ;
static void run_shell (char const *, char const *, char **, size_t,
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 | 160 +++++++
coreutils-6.8+/src/fold.c | 309 +++++++++++++-
coreutils-6.8+/src/join.c | 233 +++++++++--
coreutils-6.8+/src/pr.c | 431 ++++++++++++++++++--
coreutils-6.8+/src/sort.c | 673 ++++++++++++++++++++++++++++++--
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, 2736 insertions(+), 178 deletions(-)
Index: coreutils-i18n.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-i18n.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- coreutils-i18n.patch 12 Sep 2009 09:28:49 -0000 1.39
+++ coreutils-i18n.patch 6 Oct 2009 13:43:24 -0000 1.40
@@ -346,7 +346,7 @@ diff -urN coreutils-6.12-orig/tests/Make
error (EXIT_FAILURE, errno, "-");
--- coreutils-6.8+/src/join.c.i18n 2007-01-14 15:41:28.000000000 +0000
+++ coreutils-6.8+/src/join.c 2007-03-01 15:08:24.000000000 +0000
-@@ -23,16 +23,30 @@
+@@ -23,17 +23,31 @@
#include <sys/types.h>
#include <getopt.h>
@@ -362,6 +362,7 @@ diff -urN coreutils-6.12-orig/tests/Make
+
#include "system.h"
#include "error.h"
+ #include "hard-locale.h"
#include "linebuffer.h"
-#include "memcasecmp.h"
#include "quote.h"
coreutils-pam.patch:
coreutils-6.7/doc/coreutils.texi | 36 +-----
coreutils-6.7/src/Makefile.am | 2
coreutils-6.7/src/su.c | 224 +++++++++++++++++++++++++++++++++++++--
coreutils-7.1/configure.ac | 7 +
4 files changed, 233 insertions(+), 36 deletions(-)
Index: coreutils-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-pam.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- coreutils-pam.patch 12 Sep 2009 09:28:49 -0000 1.17
+++ coreutils-pam.patch 6 Oct 2009 13:43:24 -0000 1.18
@@ -44,16 +44,13 @@
#include "system.h"
#include "getpass.h"
-@@ -128,15 +147,22 @@
+@@ -128,12 +147,19 @@
/* The user to become if none is specified. */
#define DEFAULT_USER "root"
+#ifndef USE_PAM
char *crypt (char const *key, char const *salt);
+#endif
- char *getusershell (void);
- void endusershell (void);
- void setusershell (void);
extern char **environ;
coreutils-selinux.patch:
configure.ac | 7 ++
man/chcon.x | 2
man/runcon.x | 2
src/chcon.c | 6 +
src/copy.c | 2
src/copy.h | 3
src/cp.c | 39 ++++++++++++
src/id.c | 2
src/install.c | 13 +++-
src/ls.c | 161 +++++++++++++++++++++++++++++++++++++++++++----------
src/mkdir.c | 1
src/mknod.c | 2
src/mv.c | 1
src/runcon.c | 2
src/stat.c | 85 +++++++++++++++++++--------
tests/misc/selinux | 2
16 files changed, 263 insertions(+), 67 deletions(-)
Index: coreutils-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils-selinux.patch,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- coreutils-selinux.patch 5 Oct 2009 07:06:38 -0000 1.60
+++ coreutils-selinux.patch 6 Oct 2009 13:43:24 -0000 1.61
@@ -557,8 +557,8 @@ diff -urNp coreutils-7.1-orig/src/ls.c c
+
DIRED_INDENT ();
-- if (print_owner | print_group | print_author | print_scontext)
-+ if (print_owner | print_group | print_author)
+- if (print_owner || print_group || print_author || print_scontext)
++ if (print_owner || print_group || print_author)
{
DIRED_FPUTS (buf, stdout, p - buf);
Index: coreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- coreutils.spec 5 Oct 2009 07:06:38 -0000 1.282
+++ coreutils.spec 6 Oct 2009 13:43:24 -0000 1.283
@@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils
-Version: 7.6
-Release: 7%{?dist}
+Version: 8.0
+Release: 1%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -18,9 +18,6 @@ Source202: coreutils-su-l.pamd
Source203: coreutils-runuser-l.pamd
# From upstream
-Patch1: coreutils-cpxattrreadonly.patch
-Patch2: coreutils-7.6-lzipcolor.patch
-Patch3: coreutils-ls-inode.patch
# Our patches
Patch100: coreutils-6.10-configuration.patch
@@ -110,8 +107,6 @@ Libraries for coreutils package.
%setup -q
# From upstream
-%patch1 -p1 -b .roxattr
-%patch2 -p1 -b .lzip
# Our patches
%patch100 -p1 -b .configure
@@ -139,9 +134,6 @@ Libraries for coreutils package.
%patch950 -p1 -b .selinux
%patch951 -p1 -b .selinuxman
-#apply upstream patch later to prevent defuzzing
-%patch3 -p1 -b .inode
-
chmod a+x tests/misc/sort-mb-tests
#fix typos/mistakes in localized documentation(#439410, #440056)
@@ -333,6 +325,10 @@ fi
%{_libdir}/coreutils
%changelog
+* Wed Oct 07 2009 Ondrej Vasik <ovasik at redhat.com> - 8.0-1
+- New upstream release 8.0 (beta), defuzz patches,
+ remove applied patches
+
* Mon Oct 05 2009 Ondrej Vasik <ovasik at redhat.com> - 7.6-7
- chcon no longer aborts on a selinux disabled system
(#527142)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/coreutils/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources 12 Sep 2009 09:28:49 -0000 1.25
+++ sources 6 Oct 2009 13:43:25 -0000 1.26
@@ -1 +1 @@
-a9fb9368e40205d70fc37b9fe441e8ec coreutils-7.6.tar.xz
+fe3bb9376150acb5af4a2a280d6fd91a coreutils-8.0.tar.xz
--- coreutils-7.6-lzipcolor.patch DELETED ---
--- coreutils-cpxattrreadonly.patch DELETED ---
--- coreutils-ls-inode.patch DELETED ---
More information about the fedora-extras-commits
mailing list