From 4c6b49e1af1d3a200b0bdc460af5faf1672f6a2e Mon Sep 17 00:00:00 2001 From: hannes Date: Sun, 10 Oct 2004 11:41:57 +0000 Subject: [PATCH] hannes: updated coreutils to 5.1.2 thx to fedora for acl patches adapted old patches to fit add patch to correct date behaviour please test... [2004100117192313437] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4508 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/coreutils/acl-xattr.diff | 1354 +++++++---------- package/base/coreutils/coreutils.desc | 4 +- package/base/coreutils/cross.patch | 58 +- package/base/coreutils/dateseconds.patch | 10 + .../no-broken-progs-am.patch.disabled | 90 -- .../base/coreutils/no-broken-progs-in.patch | 343 ++++- package/base/coreutils/no-generate-hack.patch | 28 +- 7 files changed, 900 insertions(+), 987 deletions(-) create mode 100644 package/base/coreutils/dateseconds.patch delete mode 100644 package/base/coreutils/no-broken-progs-am.patch.disabled diff --git a/package/base/coreutils/acl-xattr.diff b/package/base/coreutils/acl-xattr.diff index 3e0a47939..4c92baf28 100644 --- a/package/base/coreutils/acl-xattr.diff +++ b/package/base/coreutils/acl-xattr.diff @@ -1,97 +1,119 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/coreutils/acl-xattr.diff -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -2003-04-09 Clifford Wolf - - * This patch is created using combinediff based on some patches from - the linux acl homepage at http://acl.bestbits.at/. - * Fixed some includes (lib/acl.c and src/copy.c) - -2002-08-15 Andreas Gruenbacher - - * lib/acl.h: Add copy_acl() and set_acl(). Fix for POSIX/Linux ACLs. - * lib/acl.c: Add dummy copy_acl() and set_acl() implementations. - * src/copy.[hc]: Remove umask_kill; this makes no sense with POSIX - ACLs. Use copy_acl() instead of chmod(). Fix the logic for - POSIX ACLs. - * src/ls.c: Switch back from HAVE_ACL to USE_ACL: The acl() syscall - is no requirement for ACL support. - * src/cp.c: Remove umask_kill. Fix logic in make_path_private() for - POSIX ACLs. - * src/cp.c, src/mv.c, src/install.c: Remove umask_kill. - * m4/acl.m4: Add POSIX/Linux ACL tests. - * lib/acl.c: Add POSIX/Linux ACL support. - ---- coreutils-4.5.6/lib/acl.c 2003-02-13 21:39:29.000000000 +0100 -+++ coreutils-4.5.6/lib/acl.c 2003-02-13 21:42:45.000000000 +0100 -@@ -27,12 +27,29 @@ - # define S_ISLNK(Mode) 0 +--- /dev/null 2004-02-23 21:02:56.000000000 +0000 ++++ ./m4/posix_acl.m4 2004-03-13 11:50:03.000000000 +0000 +@@ -0,0 +1,28 @@ ++#serial 1 ++ ++dnl Written by Andreas Gruenbacher . ++ ++dnl Posix 1003.1e draft standard 17 (abandoned) and similar ++dnl access control list support ++AC_DEFUN([ag_POSIX_ACL], ++[ ++ AC_CHECK_HEADERS(sys/acl.h) ++ AC_CHECK_LIB(acl, main, cu_cv_lacl=yes, cu_cv_lacl=no) ++ if test "$cu_cv_lacl" = yes; then ++ LIBACL=-lacl ++ else ++ LIBACL= ++ fi ++ AC_SUBST(LIBACL) ++ OLDLIBS="$LIBS" ++ LIBS="$LIBS $LIBACL" ++ AC_CHECK_FUNCS(acl_get_file acl_set_file acl_free acl_to_text \ ++ acl_from_text acl_delete_def_file) ++ # Linux specific extensions: ++ AC_CHECK_FUNCS(acl_entries acl_extended_file) ++ LIBS="$OLDLIBS" ++ ++ if test $ac_cv_header_sys_acl_h = yes; then ++ AC_DEFINE(USE_ACL, 1, [Define if you want access control list support.]) ++ fi ++]) +--- ./m4/Makefile.am.acl 2004-03-08 09:56:31.000000000 +0000 ++++ ./m4/Makefile.am 2004-03-13 11:50:03.000000000 +0000 +@@ -108,6 +108,7 @@ + EXTRA_DIST += path-concat.m4 + EXTRA_DIST += pathmax.m4 + EXTRA_DIST += perl.m4 ++EXTRA_DIST += posix_acl.m4 + EXTRA_DIST += physmem.m4 + EXTRA_DIST += po.m4 + EXTRA_DIST += posixtm.m4 +--- ./lib/acl.h.acl 2004-02-02 08:13:21.000000000 +0000 ++++ ./lib/acl.h 2004-03-13 11:50:03.000000000 +0000 +@@ -18,11 +18,16 @@ + + Written by Paul Eggert. */ + +-#if HAVE_SYS_ACL_H && HAVE_ACL ++#if HAVE_SYS_ACL_H + # include + #endif ++#if HAVE_SYS_TYPES_H ++# include ++#endif + #if ! defined GETACLCNT && defined ACL_CNT + # define GETACLCNT ACL_CNT #endif -+#include -+#include "error.h" -+#include "quote.h" - #include "acl.h" + int file_has_acl (char const *, struct stat const *); ++int copy_acl (char const *, char const *, mode_t); ++int set_acl (char const *, mode_t); +--- ./lib/acl.c.acl 2004-02-02 08:13:21.000000000 +0000 ++++ ./lib/acl.c 2004-03-13 11:50:03.000000000 +0000 +@@ -22,18 +22,30 @@ + # include + #endif -+#ifdef HAVE_ACL_LIBACL_H -+# include ++#if ENABLE_NLS ++# include ++# define _(Text) gettext (Text) ++#else ++# define _(Text) Text +#endif + + #include + #include + #ifndef S_ISLNK + # define S_ISLNK(Mode) 0 + #endif + ++#include ++ + #include "acl.h" + #include #ifndef ENOSYS # define ENOSYS (-1) #endif +#ifndef ENOTSUP +# define ENOTSUP (-1) -+#endif -+ -+#if ENABLE_NLS -+# include -+# define _(Text) gettext (Text) -+#else -+# define _(Text) Text +#endif #ifndef MIN_ACL_ENTRIES # define MIN_ACL_ENTRIES 4 -@@ -46,17 +62,196 @@ +@@ -45,19 +57,201 @@ + int + file_has_acl (char const *path, struct stat const *pathstat) { - /* FIXME: This implementation should work on recent-enough versions - of HP-UX, Solaris, and Unixware, but it simply returns 0 with - POSIX 1003.1e (draft 17 -- abandoned), AIX, GNU/Linux, Irix, and - Tru64. Please see Samba's source/lib/sysacls.c file for - fix-related ideas. */ -+#if USE_ACL && HAVE_ACL && defined GETACLCNT +- + #if HAVE_ACL && defined GETACLCNT + /* This implementation should work on recent-enough versions of HP-UX, + Solaris, and Unixware. */ - --#if HAVE_ACL && defined GETACLCNT ++ if (! S_ISLNK (pathstat->st_mode)) { int n = acl (path, GETACLCNT, 0, NULL); return n < 0 ? (errno == ENOSYS ? 0 : -1) : (MIN_ACL_ENTRIES < n); } -+#elif USE_ACL && HAVE_ACL_EXTENDED_FILE -+ /* Linux specific version. */ ++#elif HAVE_ACL_EXTENDED_FILE ++ ++ /* Linux specific. */ + + if (! S_ISLNK (pathstat->st_mode)) + { @@ -100,25 +122,27 @@ + return (errno == ENOSYS || errno == ENOTSUP) ? 0 : -1; + return ret; + } -+#endif -+ -+ /* FIXME: Add support for POSIX 1003.1e (draft 17 -- abandoned), AIX, Irix, -+ and Tru64. Please see Samba's source/lib/sysacls.c file for fix-related -+ ideas. */ ++#else ++ /* FIXME: Add support for AIX, Irix, and Tru64, FreeBSD, etc. ++ Please see Samba's source/lib/sysacls.c file for fix-related ideas. */ + #endif + + return 0; + } + -+ return 0; -+} ++/* Copy the permissions from SRC_PATH to DST_PATH, including access control ++ lists on systems where this is supported. MODE is the file mode for ++ DST_PATH, including the file type. ++ Also sets special bits in MODE on DST_PATH. */ + -+/* Copy the access control list of src_path to dst_path. Fall back to -+ src_st.st_mode if access control lists are not supported for either -+ file. */ +int +copy_acl (char const *src_path, char const *dst_path, mode_t mode) +{ -+#if USE_ACL && HAVE_ACL_GET_FILE && HAVE_ACL_SET_FILE && \ -+ HAVE_ACL_FREE && HAVE_ACL_ENTRIES ++#if HAVE_ACL_GET_FILE && HAVE_ACL_SET_FILE && HAVE_ACL_FREE && \ ++ HAVE_ACL_ENTRIES ++ + /* Linux specific. Will work on all POSIX 1003.1e draft 17 (abandoned) -+ systems if the Linux specific acl_entries() function is substituted. */ ++ compliant systems if the acl_entries() function is implemented. */ + + acl_t acl = acl_get_file (src_path, ACL_TYPE_ACCESS); + if (acl == NULL) @@ -160,8 +184,7 @@ + quote (dst_path)); + return -1; + } -+ else -+ acl_free (acl); ++ acl_free (acl); + + if (mode & (S_ISUID | S_ISGID | S_ISVTX)) + { @@ -201,17 +224,18 @@ + if (ret) + error (0, errno, _("preserving permissions for %s"), quote (dst_path)); + return ret; - #endif ++#endif +} + -+/* Set the access control list of path to the permissions defined by mode. */ ++/* Set the permissions of PATH, overwriting access control lists, on systems ++ where this is supported. MODE is the file mode for PATH, including the ++ file type. Also sets special bits in MODE on PATH. */ ++ +int +set_acl (char const *path, mode_t mode) +{ -+#if USE_ACL && HAVE_ACL_FROM_TEXT && HAVE_ACL_SET_FILE && HAVE_ACL_FREE && \ -+ HAVE_ACL_DELETE_DEF_FILE -+ /* POSIX 1003.1e draft 17 (abandoned) specific version. */ - ++#if HAVE_ACL_FROM_TEXT && HAVE_ACL_SET_FILE && HAVE_ACL_FREE && \ ++ HAVE_ACL_DELETE_DEF_FILE + char acl_text[] = "u::---,g::---,o::---"; + acl_t acl; + @@ -247,8 +271,7 @@ + error (0, saved_errno, _("setting permissions for %s"), quote (path)); + return -1; + } -+ else -+ acl_free (acl); ++ acl_free (acl); + + if (mode & (S_ISUID | S_ISGID | S_ISVTX)) + { @@ -268,260 +291,98 @@ + error (0, errno, _("setting permissions for %s"), quote (path)); + return -1; + } - return 0; ++ return 0; +#else + int ret = chmod (path, mode); + if (ret) + error (0, errno, _("setting permissions for %s"), quote (path)); + return ret; +#endif - } ---- coreutils-4.5.6~coreutils-acl/lib/acl.h 2003-02-13 21:15:48.000000000 +0100 -+++ coreutils-4.5.6/lib/acl.h 2003-02-13 21:28:21.000000000 +0100 -@@ -18,11 +18,13 @@ - - Written by Paul Eggert. */ - --#if HAVE_SYS_ACL_H && HAVE_ACL -+#if HAVE_SYS_ACL_H - # include - #endif --#if ! defined GETACLCNT && defined ACL_CNT -+#if defined HAVE_ACL && ! defined GETACLCNT && defined ACL_CNT - # define GETACLCNT ACL_CNT - #endif - - int file_has_acl (char const *, struct stat const *); -+int copy_acl(char const *, char const *, mode_t); -+int set_acl(char const *, mode_t); ---- coreutils-4.5.6~coreutils-acl/src/copy.c 2003-02-13 21:15:48.000000000 +0100 -+++ coreutils-4.5.6/src/copy.c 2003-02-13 21:39:46.000000000 +0100 -@@ -45,6 +45,7 @@ - #include "quote.h" - #include "same.h" - #include "xreadlink.h" -+#include "acl.h" - - #define DO_CHOWN(Chown, File, New_uid, New_gid) \ - (Chown (File, New_uid, New_gid) \ -@@ -99,26 +100,6 @@ - /* The invocation name of this program. */ - extern char *program_name; ++} ++ +--- ./src/mv.c.acl 2004-02-07 15:41:02.000000000 +0000 ++++ ./src/mv.c 2004-03-13 11:50:03.000000000 +0000 +@@ -132,12 +132,6 @@ + x->mode = 0; + x->stdin_tty = isatty (STDIN_FILENO); --/* Encapsulate selection of the file mode to be applied to -- new non-directories. */ -- --static mode_t --get_dest_mode (const struct cp_options *option, mode_t mode) --{ -- /* In some applications (e.g., install), use precisely the -- specified mode. */ -- if (option->set_mode) -- return option->mode; -- -- /* Honor the umask for `cp', but not for `mv' or `cp -p'. -- In addition, `cp' without -p must clear the set-user-ID and set-group-ID -- bits. POSIX requires it do that when creating new files. */ -- if (!option->move_mode && !option->preserve_mode) -- mode &= (option->umask_kill & ~(S_ISUID | S_ISGID)); -- -- return mode; --} +- /* Find out the current file creation mask, to knock the right bits +- when using chmod. The creation mask is set to be liberal, so +- that created directories can be written, even if it would not +- have been allowed with the mask this process was started with. */ +- x->umask_kill = ~ umask (0); - - /* FIXME: describe */ - /* FIXME: rewrite this to use a hash table so we avoid the quadratic - performance hit that's probably noticeable only on trees deeper -@@ -793,12 +774,13 @@ - struct stat dst_sb; - mode_t src_mode; - mode_t src_type; -+ mode_t dst_mode IF_LINT(= 0); -+ int dst_mode_valid = 0; - char *earlier_file = NULL; - char *dst_backup = NULL; - int backup_succeeded = 0; - int delayed_fail; - int copied_as_regular = 0; -- int ran_chown = 0; - int preserve_metadata; - - if (x->move_mode && rename_succeeded) -@@ -1262,15 +1244,36 @@ + x->update = 0; + x->verbose = 0; + x->dest_info = NULL; +--- ./src/ls.c.acl 2004-03-13 11:50:03.000000000 +0000 ++++ ./src/ls.c 2004-03-13 11:50:03.000000000 +0000 +@@ -188,13 +188,13 @@ - if (new_dst || !S_ISDIR (dst_sb.st_mode)) - { -- /* Create the new directory writable and searchable, so -- we can create new entries in it. */ -- -- if (mkdir (dst_path, (src_mode & x->umask_kill) | S_IRWXU)) -+ if (mkdir (dst_path, src_mode)) - { - error (0, errno, _("cannot create directory %s"), - quote (dst_path)); - goto un_backup; - } -+ /* We need search and write permissions to the new directory -+ for writing the directory's contents. Check if these -+ permissions are there. */ -+ -+ if (lstat (dst_path, &dst_sb)) -+ { -+ error (0, errno, _("cannot stat %s"), quote (dst_path)); -+ delayed_fail = 1; -+ } -+ else if ((dst_sb.st_mode & S_IRWXU) != S_IRWXU) -+ { -+ /* Make the new directory searchable and writable. The -+ original permissions will be restored later. */ -+ -+ dst_mode = dst_sb.st_mode; -+ dst_mode_valid = 1; -+ -+ if (chmod (dst_path, dst_mode | S_IRWXU)) -+ { -+ error (0, errno, _("setting permissions for %s"), -+ quote (dst_path)); -+ goto un_backup; -+ } -+ } + enum filetype filetype; - /* Insert the created directory's inode and device - numbers into the search structure, so that we can -@@ -1358,15 +1361,14 @@ - /* POSIX says the permission bits of the source file must be - used as the 3rd argument in the open call, but that's not consistent - with historical practice. */ -- if (copy_reg (src_path, dst_path, x, -- get_dest_mode (x, src_mode), &new_dst, &src_sb)) -+ if (copy_reg (src_path, dst_path, x, src_mode, &new_dst, &src_sb)) - goto un_backup; - } - else - #ifdef S_ISFIFO - if (S_ISFIFO (src_type)) - { -- if (mkfifo (dst_path, get_dest_mode (x, src_mode))) -+ if (mkfifo (dst_path, src_mode)) - { - error (0, errno, _("cannot create fifo %s"), quote (dst_path)); - goto un_backup; -@@ -1380,7 +1382,7 @@ - #endif - ) - { -- if (mknod (dst_path, get_dest_mode (x, src_mode), src_sb.st_rdev)) -+ if (mknod (dst_path, src_mode, src_sb.st_rdev)) - { - error (0, errno, _("cannot create special file %s"), - quote (dst_path)); -@@ -1495,7 +1497,8 @@ - if (x->preserve_ownership - && (new_dst || !SAME_OWNER_AND_GROUP (src_sb, dst_sb))) - { -- ran_chown = 1; -+ /* The chown() system call may clear the SUID and SGID bits, so we -+ may need to set them again later. */ - if (DO_CHOWN (chown, dst_path, src_sb.st_uid, src_sb.st_gid)) - { - error (0, errno, _("failed to preserve ownership for %s"), -@@ -1516,20 +1519,27 @@ - } +-#if HAVE_ACL ++#if HAVE_ACL || USE_ACL + /* For long listings, true if the file has an access control list. */ + bool have_acl; #endif + }; -- /* Permissions of newly-created regular files were set upon `open' in -- copy_reg. But don't return early if there were any special bits and -- we had to run chown, because the chown must have reset those bits. */ -- if ((new_dst && copied_as_regular) -- && !(ran_chown && (src_mode & ~S_IRWXUGO))) -- return delayed_fail; -- -- if ((x->preserve_mode || new_dst) -- && (x->copy_as_regular || S_ISREG (src_type) || S_ISDIR (src_type))) -+ if (x->preserve_mode || x->move_mode) -+ { -+ if (copy_acl (src_path, dst_path, src_mode) && x->require_preserve) -+ return 1; -+ } -+ else if (x->set_mode) -+ { -+ if (chmod (dst_path, x->mode)) -+ { -+ error (0, errno, _("preserving permissions for %s"), -+ quote (dst_path)); -+ if (x->require_preserve) -+ return 1; -+ } -+ } -+ else if (dst_mode_valid) - { -- if (chmod (dst_path, get_dest_mode (x, src_mode))) -+ if (chmod (dst_path, dst_mode)) - { -- error (0, errno, _("setting permissions for %s"), quote (dst_path)); -- if (x->set_mode || x->require_preserve) -+ error (0, errno, _("setting permissions for %s"), quote(dst_path)); -+ if (x->require_preserve) - return 1; +-#if HAVE_ACL ++#if HAVE_ACL || USE_ACL + # define FILE_HAS_ACL(F) ((F)->have_acl) + #else + # define FILE_HAS_ACL(F) 0 +@@ -2409,7 +2409,7 @@ + return 0; } - } ---- coreutils-4.5.6~coreutils-acl/src/copy.h 2003-02-13 21:15:48.000000000 +0100 -+++ coreutils-4.5.6/src/copy.h 2003-02-13 21:28:21.000000000 +0100 -@@ -139,9 +139,6 @@ - Create destination directories as usual. */ - int symbolic_link; -- /* The bits to preserve in created files' modes. */ -- mode_t umask_kill; -- - /* If nonzero, do not copy a nondirectory that has an existing destination - with the same or newer modification time. */ - int update; ---- coreutils-4.5.6~coreutils-acl/src/cp.c 2003-02-13 21:15:48.000000000 +0100 -+++ coreutils-4.5.6/src/cp.c 2003-02-13 21:35:58.000000000 +0100 -@@ -36,6 +36,7 @@ - #include "dirname.h" - #include "path-concat.h" - #include "quote.h" -+#include "acl.h" +-#if HAVE_ACL ++#if HAVE_ACL || USE_ACL + if (format == long_format) + { + int n = file_has_acl (path, &f->stat); +--- ./src/install.c.acl 2004-03-13 11:50:03.000000000 +0000 ++++ ./src/install.c 2004-03-13 11:50:03.000000000 +0000 +@@ -242,7 +242,6 @@ + x->mode = S_IRUSR | S_IWUSR; + x->stdin_tty = 0; - #define ASSIGN_BASENAME_STRDUPA(Dest, File_name) \ - do \ -@@ -61,7 +62,8 @@ +- x->umask_kill = 0; + x->update = 0; + x->verbose = 0; + x->dest_info = NULL; +--- ./src/cp.c.acl 2004-02-07 15:55:09.000000000 +0000 ++++ ./src/cp.c 2004-03-13 11:50:03.000000000 +0000 +@@ -58,7 +58,8 @@ need to be fixed after copying. */ struct dir_attr { - int is_new_dir; -+ mode_t mode; + int mode_valid; ++ mode_t mode; int slash_offset; struct dir_attr *next; }; -@@ -287,6 +289,7 @@ - char *dst_path; /* A copy of CONST_DST_PATH we can change. */ - char *src_path; /* The source name in `dst_path'. */ - uid_t myeuid = geteuid (); -+ mode_t umask_kill = ~umask (0); - - dst_path = (char *) alloca (strlen (const_dst_path) + 1); - strcpy (dst_path, const_dst_path); -@@ -342,9 +345,14 @@ +@@ -333,9 +334,14 @@ } } - if (x->preserve_mode || p->is_new_dir) -+ if (x->preserve_mode) - { +- { - if (chmod (dst_path, src_sb.st_mode & x->umask_kill)) -+ if (copy_acl (src_path, dst_path, src_sb.st_mode)) -+ return 1; -+ } ++ if (x->preserve_mode) ++ { ++ if (copy_acl (src_path, dst_path, src_sb.st_mode)) ++ return 1; ++ } + else if (p->mode_valid) -+ { -+ if (chmod (dst_path, p->mode)) ++ { ++ if (chmod (dst_path, p->mode)) { error (0, errno, _("failed to preserve permissions for %s"), quote (dst_path)); -@@ -362,8 +370,7 @@ +@@ -353,8 +359,7 @@ SRC_OFFSET is the index in CONST_DIRPATH (which is a destination path) of the beginning of the source directory name. @@ -531,7 +392,7 @@ If VERBOSE_FMT_STRING is nonzero, use it as a printf format string for printing a message after successfully making a directory. The format should take two string arguments: the names of the -@@ -378,9 +385,9 @@ +@@ -369,15 +374,20 @@ /* FIXME: find a way to synch this function with the one in lib/makepath.c. */ static int @@ -539,86 +400,84 @@ +make_path_private (const char *const_dirpath, int src_offset, const char *verbose_fmt_string, struct dir_attr **attr_list, - int *new_dst, int (*xstat)()) -+ int *new_dst, struct cp_options const *x) ++ int *new_dst, const struct cp_options *x) { struct stat stats; char *dirpath; /* A copy of CONST_DIRPATH we can change. */ -@@ -400,7 +407,7 @@ - - *attr_list = NULL; + char *src; /* Source name in `dirpath'. */ + char *dst_dirname; /* Leading path of `dirpath'. */ + size_t dirlen; /* Length of leading path of `dirpath'. */ ++ mode_t mode; ++ int (*xstat)() = (x->dereference == DEREF_COMMAND_LINE_ARGUMENTS ++ || x->dereference == DEREF_ALWAYS ++ ? stat ++ : lstat); -- if ((*xstat) (dst_dirname, &stats)) -+ if ((*x->xstat) (dst_dirname, &stats)) - { - /* Parent of CONST_DIRNAME does not exist. - Make all missing intermediate directories. */ -@@ -420,16 +427,26 @@ - *attr_list = new; + ASSIGN_STRDUPA (dirpath, const_dirpath); - *slash = '\0'; -- if ((*xstat) (dirpath, &stats)) -+ if ((*x->xstat) (dirpath, &stats)) +@@ -412,12 +422,20 @@ + if ((*xstat) (dirpath, &stats)) { -+ mode_t src_mode; -+ /* This element of the path does not exist. We must set - *new_dst and new->is_new_dir inside this loop because, -+ *new_dst and new->mode inside this loop because, ++ *new_dst inside this loop because, for example, in the command `cp --parents ../a/../b/c e_dir', make_path_private creates only e_dir/../a if ./b already exists. */ *new_dst = 1; - new->is_new_dir = 1; -- if (mkdir (dirpath, mode)) + -+ if ((*x->xstat) (src, &stats)) -+ { ++ if ((*xstat) (src, &stats)) ++ { + error (0, errno, _("failed to get attributes of %s"), + quote (src)); + return 1; + } -+ src_mode = stats.st_mode; ++ mode = stats.st_mode; + -+ if (mkdir (dirpath, src_mode)) + if (mkdir (dirpath, mode)) { error (0, errno, _("cannot make directory %s"), - quote (dirpath)); -@@ -440,6 +457,42 @@ +@@ -429,6 +447,46 @@ if (verbose_fmt_string != NULL) printf (verbose_fmt_string, src, dirpath); } + + /* We need search and write permissions to the new directory -+ for writing the directory's contents. Check if these -+ permissions are there. */ ++ for adding the directory's contents. Check if these ++ permissions are already there. */ + + if (lstat (dirpath, &stats)) -+ { ++ { + error (0, errno, _("failed to get attributes of %s"), -+ quote (dirpath)); ++ quote (dirpath)); + return 1; + } + else -+ { -+ if (x->preserve_mode) { -+ new->mode = src_mode; -+ new->mode_valid = (src_mode != stats.st_mode); -+ } else { -+ new->mode = stats.st_mode; ++ { ++ if (x->preserve_mode && mode != stats.st_mode) ++ { ++ new->mode = mode; ++ new->mode_valid = 1; ++ } ++ else + new->mode_valid = 0; -+ } + + if ((stats.st_mode & S_IRWXU) != S_IRWXU) + { -+ /* Make the new directory searchable and writable. The -+ original permissions will be restored later. */ ++ /* Make the new directory writable and searchable. The ++ original permissions will be restored later. */ + -+ new->mode_valid = 1; ++ if (!new->mode_valid) ++ { ++ new->mode = stats.st_mode; ++ new->mode_valid = 1; ++ } + + if (chmod (dirpath, stats.st_mode | S_IRWXU)) + { + error (0, errno, _("setting permissions for %s"), -+ quote (dirpath)); ++ quote (dirpath)); + return 1; + } + } @@ -626,7 +485,7 @@ } else if (!S_ISDIR (stats.st_mode)) { -@@ -449,7 +502,7 @@ +@@ -438,7 +496,7 @@ } else { @@ -635,7 +494,18 @@ *new_dst = 0; } *slash++ = '/'; -@@ -600,11 +653,9 @@ +@@ -552,10 +610,6 @@ + Copy the files `file1' through `filen' + to the existing directory `edir'. */ + int i; +- int (*xstat)() = (x->dereference == DEREF_COMMAND_LINE_ARGUMENTS +- || x->dereference == DEREF_ALWAYS +- ? stat +- : lstat); + + for (i = 0; i < n_files; i++) + { +@@ -593,11 +647,9 @@ leading directories. */ parent_exists = !make_path_private (dst_path, arg_in_concat - dst_path, @@ -643,12 +513,12 @@ (x->verbose ? "%s -> %s\n" : NULL), - &attr_list, &new_dst, -- x->xstat); +- xstat); + &attr_list, &new_dst, x); } - else - { -@@ -739,12 +790,6 @@ + else + { +@@ -731,12 +783,6 @@ /* Not used. */ x->stdin_tty = 0; @@ -661,7 +531,7 @@ x->update = 0; x->verbose = 0; x->dest_info = NULL; -@@ -1017,9 +1062,6 @@ +@@ -1011,9 +1057,6 @@ version_control_string) : none); @@ -671,448 +541,398 @@ if (x.dereference == DEREF_UNDEFINED) { if (x.recursive) ---- coreutils-4.5.6~coreutils-acl/src/install.c 2003-02-13 21:15:48.000000000 +0100 -+++ coreutils-4.5.6/src/install.c 2003-02-13 21:28:21.000000000 +0100 -@@ -165,7 +165,6 @@ - x->mode = S_IRUSR | S_IWUSR; - x->stdin_tty = 0; - -- x->umask_kill = 0; - x->update = 0; - x->verbose = 0; - x->xstat = stat; ---- coreutils-4.5.6~coreutils-acl/src/ls.c 2003-02-13 21:15:48.000000000 +0100 -+++ coreutils-4.5.6/src/ls.c 2003-02-13 21:28:21.000000000 +0100 -@@ -223,13 +223,13 @@ - - enum filetype filetype; - --#if HAVE_ACL -+#if USE_ACL - /* For long listings, true if the file has an access control list. */ - bool have_acl; - #endif - }; - --#if HAVE_ACL -+#if USE_ACL - # define FILE_HAS_ACL(F) ((F)->have_acl) - #else - # define FILE_HAS_ACL(F) 0 -@@ -2400,7 +2400,7 @@ - return 0; - } +--- ./src/copy.h.acl 2004-02-07 16:00:59.000000000 +0000 ++++ ./src/copy.h 2004-03-13 11:50:03.000000000 +0000 +@@ -143,9 +143,6 @@ + Create destination directories as usual. */ + int symbolic_link; --#if HAVE_ACL -+#if USE_ACL - if (format == long_format) - { - int n = file_has_acl (path, &files[files_index].stat); ---- coreutils-4.5.6~coreutils-acl/src/mv.c 2003-02-13 21:15:48.000000000 +0100 -+++ coreutils-4.5.6/src/mv.c 2003-02-13 21:28:21.000000000 +0100 -@@ -137,12 +137,6 @@ - x->mode = 0; - x->stdin_tty = isatty (STDIN_FILENO); +- /* The bits to preserve in created files' modes. */ +- mode_t umask_kill; +- + /* If nonzero, do not copy a nondirectory that has an existing destination + with the same or newer modification time. */ + int update; +--- ./src/copy.c.acl 2004-03-12 11:48:59.000000000 +0000 ++++ ./src/copy.c 2004-03-13 11:50:43.000000000 +0000 +@@ -95,26 +95,6 @@ + /* The invocation name of this program. */ + extern char *program_name; -- /* Find out the current file creation mask, to knock the right bits -- when using chmod. The creation mask is set to be liberal, so -- that created directories can be written, even if it would not -- have been allowed with the mask this process was started with. */ -- x->umask_kill = ~ umask (0); +-/* Encapsulate selection of the file mode to be applied to +- new non-directories. */ - - x->update = 0; - x->verbose = 0; - x->xstat = lstat; ---- coreutils-4.5.6~coreutils-acl+posix/m4/acl.m4 2003-02-13 21:39:29.000000000 +0100 -+++ coreutils-4.5.6/m4/acl.m4 2003-02-13 21:49:04.000000000 +0100 -@@ -20,4 +20,22 @@ +-static mode_t +-get_dest_mode (const struct cp_options *option, mode_t mode) +-{ +- /* In some applications (e.g., install), use precisely the +- specified mode. */ +- if (option->set_mode) +- return option->mode; +- +- /* Honor the umask for `cp', but not for `mv' or `cp -p'. +- In addition, `cp' without -p must clear the set-user-ID and set-group-ID +- bits. POSIX requires it do that when creating new files. */ +- if (!option->move_mode && !option->preserve_mode) +- mode &= (option->umask_kill & ~(S_ISUID | S_ISGID)); +- +- return mode; +-} +- + /* FIXME: describe */ + /* FIXME: rewrite this to use a hash table so we avoid the quadratic + performance hit that's probably noticeable only on trees deeper +@@ -817,13 +797,13 @@ + struct stat src_sb; + struct stat dst_sb; + mode_t src_mode; +- mode_t src_type; ++ mode_t dst_mode; + char *earlier_file = NULL; + char *dst_backup = NULL; + int backup_succeeded = 0; + int delayed_fail; + int copied_as_regular = 0; +- int ran_chown = 0; ++ int dst_mode_valid = 0; + int preserve_metadata; - AC_DEFUN([AC_FUNC_ACL], - [AC_CHECK_HEADERS(sys/acl.h) -- AC_CHECK_FUNCS(acl)]) -+ if test "$ac_cv_header_sys_acl_h" = yes; then -+ use_acl=1 -+ else -+ use_acl=0 -+ fi -+ AC_DEFINE_UNQUOTED(USE_ACL, $use_acl, -+ [Define if you want access control list support.]) -+ AC_CHECK_FUNCS(acl) -+ ac_save_LIBS="$LIBS" -+ AC_SEARCH_LIBS(acl_get_file, acl) -+ LIB_ACL=`echo "$LIBS" | \ -+ awk -- "{ print substr(\\$_, length(\"$ac_save_LIBS\")+1)}"` -+ AC_SUBST(LIB_ACL) -+ AC_CHECK_HEADERS(acl/libacl.h) -+ AC_CHECK_FUNCS(acl_get_file acl_set_file acl_free acl_to_text \ -+ acl_from_text acl_delete_def_file \ -+ acl_entries acl_extended_file) -+ LIBS="$ac_save_LIBS" -+ ]) ---- coreutils-4.5.6~coreutils-acl+posix/src/Makefile.am 2003-02-13 21:39:29.000000000 +0100 -+++ coreutils-4.5.6/src/Makefile.am 2003-02-13 21:40:44.000000000 +0100 -@@ -34,10 +34,13 @@ - # replacement functions defined in libfetish.a. - LDADD = ../lib/libfetish.a @LIBINTL@ ../lib/libfetish.a + if (x->move_mode && rename_succeeded) +@@ -837,11 +817,9 @@ + return 1; + } --dir_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@ --ls_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@ -+dir_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@ @LIB_ACL@ -+ls_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@ @LIB_ACL@ - shred_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@ --vdir_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@ -+vdir_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@ @LIB_ACL@ -+cp_LDADD = $(LDADD) @LIB_ACL@ -+mv_LDADD = $(LDADD) @LIB_ACL@ -+ginstall_LDADD = $(LDADD) @LIB_ACL@ +- src_type = src_sb.st_mode; +- + src_mode = src_sb.st_mode; - ## If necessary, add -lm to resolve use of pow in lib/strtod.c. - sort_LDADD = $(LDADD) @POW_LIB@ ---- coreutils-4.5.8/configure.ac -+++ coreutils-4.5.8/configure.ac -@@ -245,6 +245,9 @@ - # For src/kill.c. - AC_CHECK_DECLS([strsignal, strtoimax, sys_siglist, _sys_siglist]) +- if (S_ISDIR (src_type) && !x->recursive) ++ if (S_ISDIR (src_mode) && !x->recursive) + { + error (0, 0, _("omitting directory %s"), quote (src_path)); + return 1; +@@ -909,7 +887,7 @@ -+# Extended attribute copying. -+AC_FUNC_XATTR -+ - jm_LIB_CHECK + if (!S_ISDIR (dst_sb.st_mode)) + { +- if (S_ISDIR (src_type)) ++ if (S_ISDIR (src_mode)) + { + error (0, 0, + _("cannot overwrite non-directory %s with directory %s"), +@@ -935,7 +913,7 @@ + } + } - AM_GNU_GETTEXT([external], [need-ngettext]) ---- coreutils-4.5.8/doc/coreutils.texi -+++ coreutils-4.5.8/doc/coreutils.texi -@@ -5859,6 +5859,19 @@ - directory in a different order). - Equivalent to @option{-dpPR}. +- if (!S_ISDIR (src_type)) ++ if (!S_ISDIR (src_mode)) + { + if (S_ISDIR (dst_sb.st_mode)) + { +@@ -963,7 +941,7 @@ + This may be due to an interactive `negative' reply to the + prompt about the existing file. It may also be due to the + use of the --reply=no option. */ +- if (!S_ISDIR (src_type)) ++ if (!S_ISDIR (src_mode)) + { + /* cp and mv treat -i and -f differently. */ + if (x->move_mode) +@@ -1084,7 +1062,7 @@ + /* If the source is a directory, we don't always create the destination + directory. So --verbose should not announce anything until we're + sure we'll create a directory. */ +- if (x->verbose && !S_ISDIR (src_type)) ++ if (x->verbose && !S_ISDIR (src_mode)) + { + printf ("%s -> %s", quote_n (0, src_path), quote_n (1, dst_path)); + if (backup_succeeded) +@@ -1132,7 +1110,7 @@ + || (command_line_arg + && x->dereference == DEREF_COMMAND_LINE_ARGUMENTS) + || x->dereference == DEREF_ALWAYS)) +- || (x->recursive && S_ISDIR (src_type))) ++ || (x->recursive && S_ISDIR (src_mode))) + { + earlier_file = remember_copied (dst_path, src_sb.st_ino, src_sb.st_dev); + } +@@ -1145,7 +1123,7 @@ + /* Avoid damaging the destination filesystem by refusing to preserve + hard-linked directories (which are found at least in Netapp snapshot + directories). */ +- if (S_ISDIR (src_type)) ++ if (S_ISDIR (src_mode)) + { + /* If src_path and earlier_file refer to the same directory entry, + then warn about copying a directory into itself. */ +@@ -1197,7 +1175,7 @@ + { + if (rename (src_path, dst_path) == 0) + { +- if (x->verbose && S_ISDIR (src_type)) ++ if (x->verbose && S_ISDIR (src_mode)) + printf ("%s -> %s\n", quote_n (0, src_path), quote_n (1, dst_path)); + if (rename_succeeded) + *rename_succeeded = 1; +@@ -1310,7 +1288,7 @@ + In such cases, set this variable to zero. */ + preserve_metadata = 1; + +- if (S_ISDIR (src_type)) ++ if (S_ISDIR (src_mode)) + { + struct dir_list *dir; -+@itemx @w{@kbd{--attributes}=@var{regex}} -+@opindex --attributes -+Preserve extended attributes whose names match the specified regular -+expression. The default behavior or @command{cp} if no -+@option{--attributes} option is given is to preserve all extended -+attributes except file permissions. If @var{regex} is ``@samp{-}'', no -+extended attributes are preserved. -+ -+This option does not affect the preservation of discretionary file -+permissions (i.e., file mode permission bits and access control lists). -+To control the preservation of file permissions, the @option{-p} or -+@option{--preserve=mode} options are used. -+ - @item -b - @itemx @w{@kbd{--backup}[=@var{method}]} - @opindex -b -@@ -5962,7 +5975,7 @@ +@@ -1335,16 +1313,38 @@ - @table @samp - @itemx mode --Preserve the permission attributes. -+Preserve the permission attributes, including access control lists. - @itemx ownership - Preserve the owner and group. On most modern systems, - only the super-user may change the owner of a file, and regular users -@@ -5978,7 +5991,6 @@ - @itemx all - Preserve all file attributes. - Equivalent to specifying all of the above. --@c Mention ACLs here. - @end table + if (new_dst || !S_ISDIR (dst_sb.st_mode)) + { +- /* Create the new directory writable and searchable, so +- we can create new entries in it. */ +- +- if (mkdir (dst_path, (src_mode & x->umask_kill) | S_IRWXU)) ++ if (mkdir (dst_path, src_mode)) + { + error (0, errno, _("cannot create directory %s"), + quote (dst_path)); + goto un_backup; + } - Using @option{--preserve} with no @var{attribute_list} is equivalent ---- coreutils-4.5.8/m4/xattr.m4 -+++ coreutils-4.5.8/m4/xattr.m4 -@@ -0,0 +1,38 @@ -+# xattr.m4 - check for Extended Attributes (Linux) -+ -+# Copyright (C) 2003 Free Software Foundation, Inc. ++ /* We need search and write permissions to the new directory ++ for adding the directory's contents. Check if these permissions ++ are already there. */ + -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2, or (at your option) -+# any later version. ++ if (lstat (dst_path, &dst_sb)) ++ { ++ error (0, errno, _("cannot stat %s"), quote (dst_path)); ++ delayed_fail = 1; ++ } ++ else if ((dst_sb.st_mode & S_IRWXU) != S_IRWXU) ++ { ++ /* Make the new directory writable and searchable. The original ++ permissions will be restored later. */ + -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. ++ dst_mode_valid = 1; ++ dst_mode = dst_sb.st_mode; + -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software Foundation, -+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ++ if (chmod (dst_path, dst_mode | S_IRWXU)) ++ { ++ error (0, errno, _("setting permissions for %s"), ++ quote (dst_path)); ++ goto un_backup; ++ } ++ } + -+# Written by Andreas Gruenbacher. + /* Insert the created directory's inode and device + numbers into the search structure, so that we can + avoid copying it again. */ +@@ -1420,23 +1420,22 @@ + goto un_backup; + } + } +- else if (S_ISREG (src_type) +- || (x->copy_as_regular && !S_ISDIR (src_type) +- && !S_ISLNK (src_type))) ++ else if (S_ISREG (src_mode) ++ || (x->copy_as_regular && !S_ISDIR (src_mode) ++ && !S_ISLNK (src_mode))) + { + copied_as_regular = 1; + /* POSIX says the permission bits of the source file must be + used as the 3rd argument in the open call, but that's not consistent + with historical practice. */ +- if (copy_reg (src_path, dst_path, x, +- get_dest_mode (x, src_mode), &new_dst, &src_sb)) ++ if (copy_reg (src_path, dst_path, x, src_mode, &new_dst, &src_sb)) + goto un_backup; + } + else + #ifdef S_ISFIFO +- if (S_ISFIFO (src_type)) ++ if (S_ISFIFO (src_mode)) + { +- if (mkfifo (dst_path, get_dest_mode (x, src_mode))) ++ if (mkfifo (dst_path, src_mode)) + { + error (0, errno, _("cannot create fifo %s"), quote (dst_path)); + goto un_backup; +@@ -1444,10 +1443,10 @@ + } + else + #endif +- if (S_ISBLK (src_type) || S_ISCHR (src_type) +- || S_ISSOCK (src_type)) ++ if (S_ISBLK (src_mode) || S_ISCHR (src_mode) ++ || S_ISSOCK (src_mode)) + { +- if (mknod (dst_path, get_dest_mode (x, src_mode), src_sb.st_rdev)) ++ if (mknod (dst_path, src_mode, src_sb.st_rdev)) + { + error (0, errno, _("cannot create special file %s"), + quote (dst_path)); +@@ -1456,7 +1455,7 @@ + } + else + #ifdef S_ISLNK +- if (S_ISLNK (src_type)) ++ if (S_ISLNK (src_mode)) + { + char *src_link_val = xreadlink (src_path); + if (src_link_val == NULL) +@@ -1560,7 +1559,25 @@ + if (x->preserve_ownership + && (new_dst || !SAME_OWNER_AND_GROUP (src_sb, dst_sb))) + { +- ran_chown = 1; ++ /* The chown() system call may clear the SUID and SGID bits, so we ++ need to set them again later. (But we don't care if we will ++ overwrite the permissions of the destination file anyway.) */ ++ ++ if ((src_mode & (S_ISUID | S_ISGID)) ++ && !x->preserve_mode && !x->move_mode && !x->set_mode) ++ { ++ if (lstat (dst_path, &dst_sb)) ++ { ++ error (0, errno, _("cannot stat %s"), quote (dst_path)); ++ delayed_fail = 1; ++ } ++ else ++ { ++ dst_mode_valid = 1; ++ dst_mode = dst_sb.st_mode; ++ } ++ } + -+AC_DEFUN([AC_FUNC_XATTR], -+[ -+ AC_CHECK_HEADERS(attr/error_context.h attr/libattr.h) -+ if test "$ac_cv_header_attr_libattr_h" = yes \ -+ && test "$ac_cv_header_attr_error_context_h" = yes; then -+ use_xattr=1 -+ else -+ use_xattr=0 -+ fi -+ AC_DEFINE_UNQUOTED(USE_XATTR, $use_xattr, -+ [Define if you want extended attribute support.]) -+ xattr_saved_LIBS=$LIBS -+ AC_SEARCH_LIBS(attr_copy_file, attr, -+ [LIB_XATTR=$ac_cv_search_attr_copy_file]) -+ AC_SUBST(LIB_XATTR) -+ AC_CHECK_FUNCS(attr_copy_file) -+ LIBS=$xattr_saved_LIBS -+]) ---- coreutils-4.5.8/man/cp.1 -+++ coreutils-4.5.8/man/cp.1 -@@ -60,6 +60,14 @@ - mode,ownership,timestamps), if possible - additional attributes: links, all - .TP -+\fB\-\-attributes\fR=\fIregex\fR -+preserve extended attributes whose name -+matches the specified regular expression -+(defaults to preserving all extended -+.IP -+attributes except file permissions; -+regex=`-' preserves no extended attributes). -+.TP - \fB\-\-no\-preserve\fR=\fIATTR_LIST\fR - don't preserve the specified attributes - .TP ---- coreutils-4.5.8/src/Makefile.am -+++ coreutils-4.5.8/src/Makefile.am -@@ -38,9 +38,9 @@ - ls_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@ @LIB_ACL@ - shred_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@ - vdir_LDADD = $(LDADD) @LIB_CLOCK_GETTIME@ @LIB_ACL@ --cp_LDADD = $(LDADD) @LIB_ACL@ --mv_LDADD = $(LDADD) @LIB_ACL@ --ginstall_LDADD = $(LDADD) @LIB_ACL@ -+cp_LDADD = $(LDADD) @LIB_ACL@ @LIB_XATTR@ -+mv_LDADD = $(LDADD) @LIB_ACL@ @LIB_XATTR@ -+ginstall_LDADD = $(LDADD) @LIB_ACL@ @LIB_XATTR@ + if (DO_CHOWN (chown, dst_path, src_sb.st_uid, src_sb.st_gid)) + { + error (0, errno, _("failed to preserve ownership for %s"), +@@ -1587,20 +1604,23 @@ + } + #endif + +- /* Permissions of newly-created regular files were set upon `open' in +- copy_reg. But don't return early if there were any special bits and +- we had to run chown, because the chown must have reset those bits. */ +- if ((new_dst && copied_as_regular) +- && !(ran_chown && (src_mode & ~S_IRWXUGO))) +- return delayed_fail; +- +- if ((x->preserve_mode || new_dst) +- && (x->copy_as_regular || S_ISREG (src_type) || S_ISDIR (src_type))) ++ if (x->preserve_mode || x->move_mode) + { +- if (chmod (dst_path, get_dest_mode (x, src_mode))) +- { +- error (0, errno, _("setting permissions for %s"), quote (dst_path)); +- if (x->set_mode || x->require_preserve) ++ if (copy_acl (src_path, dst_path, src_mode) && x->require_preserve) ++ return 1; ++ } ++ else if (x->set_mode) ++ { ++ if (set_acl (dst_path, x->mode) && x->require_preserve) ++ return 1; ++ } ++ else if (dst_mode_valid) ++ { ++ if (chmod (dst_path, dst_mode)) ++ { ++ error (0, errno, _("preserving permissions for %s"), ++ quote (dst_path)); ++ if (x->require_preserve) + return 1; + } + } +--- ./src/Makefile.am.acl 2004-02-02 08:12:57.000000000 +0000 ++++ ./src/Makefile.am 2004-03-13 11:50:03.000000000 +0000 +@@ -32,10 +32,13 @@ + # replacement functions defined in libfetish.a. + LDADD = ../lib/libfetish.a $(LIBINTL) ../lib/libfetish.a + +-dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) +-ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) ++dir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBACL@ ++ls_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBACL@ + shred_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) +-vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) ++vdir_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBACL@ ++cp_LDADD = $(LDADD) @LIBACL@ ++ginstall_LDADD = $(LDADD) @LIBACL@ ++mv_LDADD = $(LDADD) @LIBACL@ ## If necessary, add -lm to resolve use of pow in lib/strtod.c. - sort_LDADD = $(LDADD) @POW_LIB@ ---- coreutils-4.5.8/src/copy.c -+++ coreutils-4.5.8/src/copy.c -@@ -47,6 +47,14 @@ - #include "xreadlink.h" - #include "acl.h" + sort_LDADD = $(LDADD) $(POW_LIB) +--- ./configure.ac.acl 2004-03-02 22:47:31.000000000 +0000 ++++ ./configure.ac 2004-03-13 11:50:03.000000000 +0000 +@@ -16,6 +16,9 @@ + AC_PROG_RANLIB + AC_PROG_LN_S + AC_CANONICAL_HOST ++AM_C_PROTOTYPES ++AC_PROG_YACC ++AC_SUBST(YACC) + + + AC_CHECK_FUNCS(uname, +@@ -235,6 +238,8 @@ + AM_GNU_GETTEXT([external], [need-ngettext]) + AM_GNU_GETTEXT_VERSION(0.13.1) -+#ifdef USE_XATTR -+# include "regex.h" -+# include -+# include -+# include -+# include -+#endif ++ag_POSIX_ACL + - #define DO_CHOWN(Chown, File, New_uid, New_gid) \ - (Chown (File, New_uid, New_gid) \ - /* If non-root uses -p, it's ok if we can't preserve ownership. \ -@@ -117,6 +124,104 @@ - return 0; - } + AC_CONFIG_FILES( + Makefile + doc/Makefile +--- ./config.hin.acl 2004-03-11 08:59:16.000000000 +0000 ++++ ./config.hin 2004-03-13 11:50:03.000000000 +0000 +@@ -96,6 +96,30 @@ + /* Define to 1 if you have the `acl' function. */ + #undef HAVE_ACL -+#if USE_XATTR -+static void -+copy_attr_error (struct error_context *ctx, const char *fmt, ...) -+{ -+ int err = errno; -+ va_list ap; -+ int len; -+ char *buffer; -+ -+ /* There is no error function that takes a va_list argument, -+ so we print the message in a buffer first. */ -+ -+ va_start (ap, fmt); -+ len = vsnprintf (NULL, 0, fmt, ap); -+ if (len > 0) -+ { -+ buffer = xmalloc (len + 1); -+ vsnprintf (buffer, len + 1, fmt, ap); -+ error (0, err, "%s", buffer); -+ free (buffer); -+ } -+ va_end (ap); -+} ++/* Define to 1 if you have the `acl_delete_def_file' function. */ ++#undef HAVE_ACL_DELETE_DEF_FILE + -+static const char * -+copy_attr_quote (struct error_context *ctx, const char *str) -+{ -+ return xstrdup (quote (str)); -+} ++/* Define to 1 if you have the `acl_entries' function. */ ++#undef HAVE_ACL_ENTRIES + -+static void -+copy_attr_free (struct error_context *ctx, const char *str) -+{ -+ free ((void *) str); -+} -+ -+struct copy_attr_context -+ { -+ struct error_context ctx; -+ const char *re_pattern; -+ struct re_pattern_buffer re_compiled; -+ } copy_attr_ctx = { -+ { copy_attr_error, -+ copy_attr_quote, -+ copy_attr_free } -+ }; ++/* Define to 1 if you have the `acl_extended_file' function. */ ++#undef HAVE_ACL_EXTENDED_FILE + -+static int -+copy_attr_filter (const char *name, struct error_context *ctx) -+{ -+ struct copy_attr_context *copy_ctx = (struct copy_attr_context *) ctx; ++/* Define to 1 if you have the `acl_free' function. */ ++#undef HAVE_ACL_FREE + -+ return (attr_copy_check_permissions (name, ctx) -+ && copy_ctx->re_pattern != NULL -+ && re_search (©_ctx->re_compiled, name, strlen (name), 0, -+ strlen (name), NULL) >= 0); -+} -+#endif /* USE_XATTR */ ++/* Define to 1 if you have the `acl_from_text' function. */ ++#undef HAVE_ACL_FROM_TEXT + -+static int -+copy_extended_attributes (const char *src_path, const char *dst_path, -+ const struct cp_options *x) -+{ -+#if USE_XATTR -+ if (x->attr_pattern == NULL) -+ return 0; ++/* Define to 1 if you have the `acl_get_file' function. */ ++#undef HAVE_ACL_GET_FILE + -+ if (copy_attr_ctx.re_pattern != x->attr_pattern) -+ { -+ struct re_pattern_buffer *c = ©_attr_ctx.re_compiled; -+ size_t len = strlen (x->attr_pattern); -+ const char *err; -+ -+ free (c->fastmap); -+ free (c->buffer); ++/* Define to 1 if you have the `acl_set_file' function. */ ++#undef HAVE_ACL_SET_FILE + -+ copy_attr_ctx.re_pattern = x->attr_pattern; -+ c->allocated = 2 * len; -+ c->buffer = xmalloc (c->allocated); -+ c->fastmap = xmalloc (256); -+ c->translate = 0; -+ err = re_compile_pattern (x->attr_pattern, len, c); -+ if (err) -+ { -+ free (c->fastmap); -+ free (c->buffer); -+ copy_attr_ctx.re_pattern = NULL; -+ error (EXIT_FAILURE, 0, _("%s: invalid regular expression: %s"), -+ x->attr_pattern, err); -+ } -+ } -+ return attr_copy_file (src_path, dst_path, -+ copy_attr_filter, ©_attr_ctx.ctx); -+#else /* USE_XATTR */ -+ return 0; -+#endif /* USE_XATTR */ -+} ++/* Define to 1 if you have the `acl_to_text' function. */ ++#undef HAVE_ACL_TO_TEXT + - /* Read the contents of the directory SRC_PATH_IN, and recursively - copy the contents to DST_PATH_IN. NEW_DST is nonzero if - DST_PATH_IN is a directory that was created previously in the -@@ -1519,6 +1624,9 @@ - } - #endif + /* Define to 1 if you have the `alarm' function. */ + #undef HAVE_ALARM -+ if (copy_extended_attributes (src_path, dst_path, x)) -+ delayed_fail = 1; -+ - if (x->preserve_mode || x->move_mode) - { - if (copy_acl (src_path, dst_path, src_mode) && x->require_preserve) ---- coreutils-4.5.8/src/copy.h -+++ coreutils-4.5.8/src/copy.h -@@ -102,6 +102,10 @@ - int preserve_mode; - int preserve_timestamps; +@@ -489,6 +513,9 @@ + /* Define to 1 if you have the `lchown' function. */ + #undef HAVE_LCHOWN -+ /* Regular expression pattern that specifies which extended attributes to -+ copy. NULL stands for copying no extended attributes. */ -+ const char *attr_pattern; ++/* Define to 1 if you have the `acl' library (-lacl). */ ++#undef HAVE_LIBACL + - /* Enabled for mv, and for cp by the --preserve=links option. - If nonzero, attempt to preserve in the destination files any - logical hard links between the source files. If used with cp's ---- coreutils-4.5.8/src/cp.c -+++ coreutils-4.5.8/src/cp.c -@@ -81,7 +81,8 @@ - SPARSE_OPTION, - STRIP_TRAILING_SLASHES_OPTION, - TARGET_DIRECTORY_OPTION, -- UNLINK_DEST_BEFORE_OPENING -+ UNLINK_DEST_BEFORE_OPENING, -+ PRESERVE_XATTRS_OPTION - }; + /* Define to 1 if you have the `dgc' library (-ldgc). */ + #undef HAVE_LIBDGC - /* Initial number of entries in each hash table entry's table of inodes. */ -@@ -137,6 +138,7 @@ - {"parents", no_argument, NULL, PARENTS_OPTION}, - {"path", no_argument, NULL, PARENTS_OPTION}, /* Deprecated. */ - {"preserve", optional_argument, NULL, PRESERVE_ATTRIBUTES_OPTION}, -+ {"attributes", required_argument, NULL, PRESERVE_XATTRS_OPTION}, - {"recursive", no_argument, NULL, 'R'}, - {"remove-destination", no_argument, NULL, UNLINK_DEST_BEFORE_OPENING}, - {"reply", required_argument, NULL, REPLY_OPTION}, -@@ -225,6 +227,13 @@ - -v, --verbose explain what is being done\n\ - -x, --one-file-system stay on this file system\n\ - "), stdout); -+ fputs(_("\n\ -+ --attributes=regex preserve extended attributes whose name\n\ -+ matches the specified regular expression\n\ -+ (defaults to preserving all extended\n\ -+ attributes except file permissions;\n\ -+ regex=`-' preserves no extended attributes).\n\ -+"), stdout); - fputs (HELP_OPTION_DESCRIPTION, stdout); - fputs (VERSION_OPTION_DESCRIPTION, stdout); - fputs (_("\ -@@ -792,6 +801,8 @@ - x->verbose = 0; - x->dest_info = NULL; - x->src_info = NULL; -+ -+ x->attr_pattern = ""; /* all extended attributes */ - } +@@ -1335,6 +1362,9 @@ + . */ + #undef UMAX4_3 - /* Given a string, ARG, containing a comma-separated list of arguments -@@ -1004,6 +1015,13 @@ - x.require_preserve = 1; - break; - -+ case PRESERVE_XATTRS_OPTION: -+ if (strcmp (optarg, "-") == 0) -+ x.attr_pattern = NULL; -+ else -+ x.attr_pattern = optarg; -+ break; ++/* Define if you want access control list support. */ ++#undef USE_ACL + - case PARENTS_OPTION: - flag_path = 1; - break; ---- coreutils-4.5.8/src/install.c -+++ coreutils-4.5.8/src/install.c -@@ -170,6 +170,8 @@ - x->xstat = stat; - x->dest_info = NULL; - x->src_info = NULL; -+ -+ x->attr_pattern = NULL; /* no extended attributes */ - } - - int ---- coreutils-4.5.8/src/mv.c -+++ coreutils-4.5.8/src/mv.c -@@ -142,6 +142,8 @@ - x->xstat = lstat; - x->dest_info = NULL; - x->src_info = NULL; -+ -+ x->attr_pattern = ""; /* all extended attributes */ - } + /* Version number of package */ + #undef VERSION - /* If PATH is an existing directory, return nonzero, else 0. */ diff --git a/package/base/coreutils/coreutils.desc b/package/base/coreutils/coreutils.desc index af3f0f2d6..c6ea29b3f 100644 --- a/package/base/coreutils/coreutils.desc +++ b/package/base/coreutils/coreutils.desc @@ -40,8 +40,8 @@ [F] DIETLIBC [L] GPL [S] Stable -[V] 5.0 +[V] 5.2.1 [P] X X1-3-5---9 107.100 -[D] 2154791780 coreutils-5.0.tar.bz2 ftp://ftp.gnu.org/pub/gnu/coreutils/ +[D] 2800604816 coreutils-5.2.1.tar.bz2 ftp://ftp.gnu.org/pub/gnu/coreutils/ diff --git a/package/base/coreutils/cross.patch b/package/base/coreutils/cross.patch index 7f8cd39e6..e439198ab 100644 --- a/package/base/coreutils/cross.patch +++ b/package/base/coreutils/cross.patch @@ -1,51 +1,29 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/coreutils/cross.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./lib/putenv.c.orig Mon Apr 22 18:21:01 2002 -+++ ./lib/putenv.c Mon Apr 22 18:23:04 2002 -@@ -31,8 +31,10 @@ +--- ./lib/putenv.c.orig 2004-10-01 05:45:46.844122664 +0200 ++++ ./lib/putenv.c 2004-10-01 05:45:56.619636560 +0200 +@@ -37,8 +37,10 @@ with a non-const argument. That would conflict with the declaration of rpl_putenv below (due to the #define putenv rpl_putenv from config.h). */ - + +#if 0 - char *malloc (); + void *malloc (); void free (); +#endif - - #if defined (__GNU_LIBRARY__) || defined (HAVE_STRING_H) - # include ---- ./lib/getline.c.orig Mon Apr 22 18:23:35 2002 -+++ ./lib/getline.c Mon Apr 22 18:24:06 2002 -@@ -33,11 +33,13 @@ - + + #include + +--- ./lib/getline.c.orig 2004-10-01 05:46:07.911919872 +0200 ++++ ./lib/getline.c 2004-10-01 05:46:56.900472480 +0200 +@@ -34,11 +34,13 @@ + #if defined __GNU_LIBRARY__ && HAVE_GETDELIM - + +#if 0 - int - getline (char **lineptr, size_t *n, FILE *stream) + ssize_t + getline (char **lineptr, size_t *linesize, FILE *stream) { - return getdelim (lineptr, n, '\n', stream); + return getdelim (lineptr, linesize, '\n', stream); } +#endif - + #else /* ! have getdelim */ - + diff --git a/package/base/coreutils/dateseconds.patch b/package/base/coreutils/dateseconds.patch new file mode 100644 index 000000000..b9c48eec0 --- /dev/null +++ b/package/base/coreutils/dateseconds.patch @@ -0,0 +1,10 @@ +--- ./lib/getdate.y 10 Sep 2003 08:37:15 -0000 1.80 ++++ ./lib/getdate.y 15 Mar 2004 08:30:57 -0000 +@@ -220,6 +220,7 @@ time: + { + PC.hour = $1.value; + PC.minutes = $3.value; ++ PC.seconds = 0; + PC.meridian = MER24; + PC.zones_seen++; + PC.time_zone = $4.value % 100 + ($4.value / 100) * 60; diff --git a/package/base/coreutils/no-broken-progs-am.patch.disabled b/package/base/coreutils/no-broken-progs-am.patch.disabled deleted file mode 100644 index 69f40c478..000000000 --- a/package/base/coreutils/no-broken-progs-am.patch.disabled +++ /dev/null @@ -1,90 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/coreutils/no-broken-progs-am.patch.disabled -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -This patch disables su, uptime, hostname and groups which are rather -feature-less and included in other packages like shadow, procps or -net-tools. - Rene and Clifford - ---- ./src/Makefile.am.orig 2003-04-09 18:38:17.000000000 +0200 -+++ ./src/Makefile.am 2003-04-09 18:49:27.000000000 +0200 -@@ -1,16 +1,16 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- - --EXTRA_PROGRAMS = chroot df hostid nice pinky stty su uname uptime users who -+EXTRA_PROGRAMS = chroot df hostid nice pinky stty su uname users who - EXTRA_SCRIPTS = nohup - --bin_SCRIPTS = groups @OPTIONAL_BIN_ZCRIPTS@ -+bin_SCRIPTS = @OPTIONAL_BIN_ZCRIPTS@ - bin_PROGRAMS = chgrp chown chmod cp dd dircolors du \ - ginstall link ln dir vdir ls mkdir \ - mkfifo mknod mv readlink rm rmdir shred stat sync touch unlink \ - cat cksum comm csplit cut expand fmt fold head join md5sum \ - nl od paste pr ptx sha1sum sort split sum tac tail tr tsort unexpand uniq wc \ - basename date dirname echo env expr factor false \ -- hostname id kill logname pathchk printenv printf pwd seq sleep tee \ -+ id kill logname pathchk printenv printf pwd seq sleep tee \ - test true tty whoami yes \ - @OPTIONAL_BIN_PROGS@ @DF_PROG@ - -@@ -88,7 +88,7 @@ - - all-local: su$(EXEEXT) - --installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'` -+installed_su = $(DESTDIR)$(bindir)/`echo su-coreutils|sed '$(transform)'` - - setuid_root_mode = a=rx,u+s - ---- ./configure.ac.orig 2003-04-09 18:59:17.000000000 +0200 -+++ ./configure.ac 2003-04-09 19:00:21.000000000 +0200 -@@ -182,10 +182,6 @@ - fi - fi - --GNULIB_BOOT_TIME( -- [OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uptime\$(EXEEXT)" -- MAN="$MAN uptime.1"]) -- - AC_SYS_POSIX_TERMIOS() - jm_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL - ---- ./man/Makefile.am.orig 2003-04-09 19:01:33.000000000 +0200 -+++ ./man/Makefile.am 2003-04-09 19:02:50.000000000 +0200 -@@ -2,13 +2,13 @@ - dist_man_MANS = \ - basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \ - cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \ -- echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \ -- head.1 hostid.1 hostname.1 id.1 install.1 join.1 link.1 ln.1 logname.1 \ -+ echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 \ -+ head.1 hostid.1 id.1 install.1 join.1 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 \ -- 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 \ -+ 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 users.1 vdir.1 wc.1 \ - who.1 whoami.1 yes.1 - - man_aux = $(dist_man_MANS:.1=.x) diff --git a/package/base/coreutils/no-broken-progs-in.patch b/package/base/coreutils/no-broken-progs-in.patch index 48292c84d..ddb0fb2d6 100644 --- a/package/base/coreutils/no-broken-progs-in.patch +++ b/package/base/coreutils/no-broken-progs-in.patch @@ -1,50 +1,46 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/coreutils/no-broken-progs-in.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -ur coreutils-5.0/configure coreutils-5.0-fixed/configure ---- coreutils-5.0/configure 2003-04-02 16:28:50.000000000 +0200 -+++ coreutils-5.0-fixed/configure 2003-05-18 01:55:50.000000000 +0200 -@@ -37706,10 +37706,6 @@ - fi +--- ./Makefile.in.orig 2004-10-01 19:05:13.027154464 +0200 ++++ ./Makefile.in 2004-10-01 19:04:44.930425816 +0200 +@@ -127,7 +127,7 @@ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unlink-busy.m4 \ +- $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \ ++ $(top_srcdir)/m4/unlocked-io.m4 \ + $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \ +--- ./configure.orig 2004-10-01 19:04:58.239402544 +0200 ++++ ./configure 2004-10-01 19:04:44.924426728 +0200 +@@ -47462,8 +47462,7 @@ echo "$as_me:$LINENO: result: $gnulib_cv_have_boot_time" >&5 echo "${ECHO_T}$gnulib_cv_have_boot_time" >&6 -- if test $gnulib_cv_have_boot_time = yes; then + if test $gnulib_cv_have_boot_time = yes; then - OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uptime\$(EXEEXT)" - MAN="$MAN uptime.1" --fi - ++echo "uptime is surpressed" + fi -diff -ur coreutils-5.0/man/Makefile.in coreutils-5.0-fixed/man/Makefile.in ---- coreutils-5.0/man/Makefile.in 2003-04-02 16:28:42.000000000 +0200 -+++ coreutils-5.0-fixed/man/Makefile.in 2003-05-18 01:58:31.000000000 +0200 -@@ -151,13 +151,13 @@ +--- ./man/Makefile.in.orig 2004-10-01 19:05:24.542403880 +0200 ++++ ./man/Makefile.in 2004-10-01 19:05:56.565535624 +0200 +@@ -122,7 +122,7 @@ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unlink-busy.m4 \ +- $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \ ++ $(top_srcdir)/m4/unlocked-io.m4 \ + $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \ +@@ -265,14 +265,14 @@ dist_man_MANS = \ basename.1 cat.1 chgrp.1 chmod.1 chown.1 chroot.1 cksum.1 comm.1 \ cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \ - echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \ -- head.1 hostid.1 hostname.1 id.1 install.1 join.1 link.1 ln.1 logname.1 \ +- head.1 hostid.1 hostname.1 id.1 install.1 join.1 kill.1 \ + echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 \ -+ head.1 hostid.1 id.1 install.1 join.1 link.1 ln.1 logname.1 \ ++ head.1 hostid.1 id.1 install.1 join.1 \ + 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 \ @@ -54,37 +50,258 @@ diff -ur coreutils-5.0/man/Makefile.in coreutils-5.0-fixed/man/Makefile.in + tty.1 uname.1 unexpand.1 uniq.1 unlink.1 users.1 vdir.1 wc.1 \ who.1 whoami.1 yes.1 + man_aux = $(dist_man_MANS:.1=.x) +@@ -532,14 +532,11 @@ + false.1: $(common_dep) $(srcdir)/false.x ../src/false.c + fmt.1: $(common_dep) $(srcdir)/fmt.x ../src/fmt.c + fold.1: $(common_dep) $(srcdir)/fold.x ../src/fold.c +-groups.1: $(common_dep) $(srcdir)/groups.x ../src/groups.sh + head.1: $(common_dep) $(srcdir)/head.x ../src/head.c + hostid.1: $(common_dep) $(srcdir)/hostid.x ../src/hostid.c +-hostname.1: $(common_dep) $(srcdir)/hostname.x ../src/hostname.c + id.1: $(common_dep) $(srcdir)/id.x ../src/id.c + install.1: $(common_dep) $(srcdir)/install.x ../src/install.c + join.1: $(common_dep) $(srcdir)/join.x ../src/join.c +-kill.1: $(common_dep) $(srcdir)/kill.x ../src/kill.c + link.1: $(common_dep) $(srcdir)/link.x ../src/link.c + ln.1: $(common_dep) $(srcdir)/ln.x ../src/ln.c + logname.1: $(common_dep) $(srcdir)/logname.x ../src/logname.c +@@ -572,7 +569,6 @@ + split.1: $(common_dep) $(srcdir)/split.x ../src/split.c + stat.1: $(common_dep) $(srcdir)/stat.x ../src/stat.c + stty.1: $(common_dep) $(srcdir)/stty.x ../src/stty.c +-su.1: $(common_dep) $(srcdir)/su.x ../src/su.c + sum.1: $(common_dep) $(srcdir)/sum.x ../src/sum.c + sync.1: $(common_dep) $(srcdir)/sync.x ../src/sync.c + tac.1: $(common_dep) $(srcdir)/tac.x ../src/tac.c +@@ -588,7 +584,6 @@ + unexpand.1: $(common_dep) $(srcdir)/unexpand.x ../src/unexpand.c + uniq.1: $(common_dep) $(srcdir)/uniq.x ../src/uniq.c + unlink.1: $(common_dep) $(srcdir)/unlink.x ../src/unlink.c +-uptime.1: $(common_dep) $(srcdir)/uptime.x ../src/uptime.c + users.1: $(common_dep) $(srcdir)/users.x ../src/users.c + vdir.1: $(common_dep) $(srcdir)/vdir.x ../src/ls.c + wc.1: $(common_dep) $(srcdir)/wc.x ../src/wc.c +@@ -619,7 +614,7 @@ + check-x-vs-1: + PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH; \ + t=ls-files.$$$$; \ +- (cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\ ++ (cd $(srcdir) && ls -1 *.x) | grep -v 'uptime.x' | grep -v 'kill.x' | sed 's/\.x$$//' | $(ASSORT) > $$t; \ + echo $(dist_man_MANS) | tr -s ' ' '\n' | sed 's/\.1$$//' \ + | $(ASSORT) | diff - $$t || { rm $$t; exit 1; }; \ + rm $$t +--- ./src/Makefile.in.orig 2004-10-01 19:05:35.737701936 +0200 ++++ ./src/Makefile.in 2004-10-01 19:04:44.941424144 +0200 +@@ -16,7 +16,7 @@ -diff -ur coreutils-5.0/src/Makefile.in coreutils-5.0-fixed/src/Makefile.in ---- coreutils-5.0/src/Makefile.in 2003-04-02 16:46:19.000000000 +0200 -+++ coreutils-5.0-fixed/src/Makefile.in 2003-05-18 01:54:10.000000000 +0200 -@@ -155,17 +155,17 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - --EXTRA_PROGRAMS = chroot df hostid nice pinky stty su uname uptime users who -+EXTRA_PROGRAMS = chroot df hostid nice pinky stty su uname users who - EXTRA_SCRIPTS = nohup --bin_SCRIPTS = groups @OPTIONAL_BIN_ZCRIPTS@ -+bin_SCRIPTS = @OPTIONAL_BIN_ZCRIPTS@ - bin_PROGRAMS = chgrp chown chmod cp dd dircolors du \ - ginstall link ln dir vdir ls mkdir \ - mkfifo mknod mv readlink rm rmdir shred stat sync touch unlink \ - cat cksum comm csplit cut expand fmt fold head join md5sum \ - nl od paste pr ptx sha1sum sort split sum tac tail tr tsort unexpand uniq wc \ - basename date dirname echo env expr factor false \ -- hostname id kill logname pathchk printenv printf pwd seq sleep tee \ -+ id kill logname pathchk printenv printf pwd seq sleep tee \ - test true tty whoami yes \ - @OPTIONAL_BIN_PROGS@ @DF_PROG@ -@@ -226,7 +226,7 @@ +-SOURCES = $(__SOURCES) basename.c cat.c $(chgrp_SOURCES) chmod.c $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c yes.c ++SOURCES = $(__SOURCES) basename.c cat.c $(chgrp_SOURCES) chmod.c $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c id.c join.c link.c ln.c logname.c $(ls_SOURCES) $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c unlink.c users.c $(vdir_SOURCES) wc.c who.c whoami.c yes.c - SUFFIXES = .sh + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -40,7 +40,7 @@ + host_triplet = @host@ + EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \ + nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \ +- uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT) ++ uname$(EXEEXT) users$(EXEEXT) who$(EXEEXT) + bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \ + cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \ + ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \ +@@ -56,8 +56,8 @@ + tail$(EXEEXT) tr$(EXEEXT) tsort$(EXEEXT) unexpand$(EXEEXT) \ + uniq$(EXEEXT) wc$(EXEEXT) basename$(EXEEXT) date$(EXEEXT) \ + dirname$(EXEEXT) echo$(EXEEXT) env$(EXEEXT) expr$(EXEEXT) \ +- factor$(EXEEXT) false$(EXEEXT) hostname$(EXEEXT) id$(EXEEXT) \ +- kill$(EXEEXT) logname$(EXEEXT) pathchk$(EXEEXT) \ ++ factor$(EXEEXT) false$(EXEEXT) id$(EXEEXT) \ ++ logname$(EXEEXT) pathchk$(EXEEXT) \ + printenv$(EXEEXT) printf$(EXEEXT) pwd$(EXEEXT) seq$(EXEEXT) \ + sleep$(EXEEXT) tee$(EXEEXT) test$(EXEEXT) true$(EXEEXT) \ + tty$(EXEEXT) whoami$(EXEEXT) yes$(EXEEXT) $(am__EXEEXT_1) \ +@@ -151,7 +151,7 @@ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unlink-busy.m4 \ +- $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/uptime.m4 \ ++ $(top_srcdir)/m4/unlocked-io.m4 \ + $(top_srcdir)/m4/userspec.m4 $(top_srcdir)/m4/utimbuf.m4 \ + $(top_srcdir)/m4/utime.m4 $(top_srcdir)/m4/utimens.m4 \ + $(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \ +@@ -320,11 +320,6 @@ + hostid_LDADD = $(LDADD) + hostid_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \ + ../lib/libfetish.a +-hostname_SOURCES = hostname.c +-hostname_OBJECTS = hostname.$(OBJEXT) +-hostname_LDADD = $(LDADD) +-hostname_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \ +- ../lib/libfetish.a + id_SOURCES = id.c + id_OBJECTS = id.$(OBJEXT) + id_LDADD = $(LDADD) +@@ -335,11 +330,6 @@ + join_LDADD = $(LDADD) + join_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \ + ../lib/libfetish.a +-kill_SOURCES = kill.c +-kill_OBJECTS = kill.$(OBJEXT) +-kill_LDADD = $(LDADD) +-kill_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \ +- ../lib/libfetish.a + link_SOURCES = link.c + link_OBJECTS = link.$(OBJEXT) + link_LDADD = $(LDADD) +@@ -574,9 +564,6 @@ + unlink_LDADD = $(LDADD) + unlink_DEPENDENCIES = ../lib/libfetish.a $(am__DEPENDENCIES_1) \ + ../lib/libfetish.a +-uptime_SOURCES = uptime.c +-uptime_OBJECTS = uptime.$(OBJEXT) +-uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) + users_SOURCES = users.c + users_OBJECTS = users.$(OBJEXT) + users_LDADD = $(LDADD) +@@ -625,9 +612,9 @@ + @AMDEP_TRUE@ ./$(DEPDIR)/factor.Po ./$(DEPDIR)/false.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/fmt.Po ./$(DEPDIR)/fold.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/head.Po ./$(DEPDIR)/hostid.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/hostname.Po ./$(DEPDIR)/id.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/id.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/install.Po ./$(DEPDIR)/join.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/kill.Po ./$(DEPDIR)/lbracket.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/lbracket.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/link.Po ./$(DEPDIR)/ln.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/logname.Po ./$(DEPDIR)/ls-dir.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/ls-ls.Po ./$(DEPDIR)/ls-vdir.Po \ +@@ -655,7 +642,7 @@ + @AMDEP_TRUE@ ./$(DEPDIR)/tsort.Po ./$(DEPDIR)/tty.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/uname.Po ./$(DEPDIR)/unexpand.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/uniq.Po ./$(DEPDIR)/unlink.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/uptime.Po ./$(DEPDIR)/users.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/users.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/wc.Po ./$(DEPDIR)/who.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/whoami.Po ./$(DEPDIR)/yes.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -666,29 +653,29 @@ + $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \ + csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \ + dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \ +- fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \ +- id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \ ++ fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c \ ++ id.c join.c link.c ln.c logname.c $(ls_SOURCES) \ + $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \ + nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \ + printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \ + rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c \ + sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c \ + tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c \ +- unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) \ ++ unexpand.c uniq.c unlink.c users.c $(vdir_SOURCES) \ + wc.c who.c whoami.c yes.c + DIST_SOURCES = $(__SOURCES) basename.c cat.c $(chgrp_SOURCES) chmod.c \ + $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \ + csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \ + dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \ +- fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \ +- id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \ ++ fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c \ ++ id.c join.c link.c ln.c logname.c $(ls_SOURCES) \ + $(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \ + nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \ + printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \ + rmdir.c seq.c setuidgid.c $(sha1sum_SOURCES) shred.c sleep.c \ + sort.c split.c stat.c stty.c su.c sum.c sync.c tac.c tail.c \ + tee.c test.c touch.c tr.c true.c tsort.c tty.c uname.c \ +- unexpand.c uniq.c unlink.c uptime.c users.c $(vdir_SOURCES) \ ++ unexpand.c uniq.c unlink.c users.c $(vdir_SOURCES) \ + wc.c who.c whoami.c yes.c + HEADERS = $(noinst_HEADERS) + ETAGS = etags +@@ -816,14 +803,14 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-bin_SCRIPTS = groups ++bin_SCRIPTS = + noinst_HEADERS = \ + system.h checksum.h copy.h cp-hash.h ls.h dircolors.h remove.h \ + chown-core.h fs.h \ + wheel.h wheel-size.h --installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'` -+installed_su = $(DESTDIR)$(bindir)/`echo su-coreutils|sed '$(transform)'` + EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \ +- groups.sh wheel-gen.pl extract-magic ++ wheel-gen.pl extract-magic - setuid_root_mode = a=rx,u+s + CLEANFILES = $(SCRIPTS) su + AM_CPPFLAGS = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib +@@ -860,7 +847,6 @@ + sleep_LDADD = $(nanosec_libs) + tail_LDADD = $(nanosec_libs) +-uptime_LDADD = $(LDADD) $(GETLOADAVG_LIBS) + su_LDADD = $(LDADD) $(LIB_CRYPT) + SUFFIXES = .sh + installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'` +@@ -1083,18 +1069,12 @@ + hostid$(EXEEXT): $(hostid_OBJECTS) $(hostid_DEPENDENCIES) + @rm -f hostid$(EXEEXT) + $(LINK) $(hostid_LDFLAGS) $(hostid_OBJECTS) $(hostid_LDADD) $(LIBS) +-hostname$(EXEEXT): $(hostname_OBJECTS) $(hostname_DEPENDENCIES) +- @rm -f hostname$(EXEEXT) +- $(LINK) $(hostname_LDFLAGS) $(hostname_OBJECTS) $(hostname_LDADD) $(LIBS) + id$(EXEEXT): $(id_OBJECTS) $(id_DEPENDENCIES) + @rm -f id$(EXEEXT) + $(LINK) $(id_LDFLAGS) $(id_OBJECTS) $(id_LDADD) $(LIBS) + join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES) + @rm -f join$(EXEEXT) + $(LINK) $(join_LDFLAGS) $(join_OBJECTS) $(join_LDADD) $(LIBS) +-kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES) +- @rm -f kill$(EXEEXT) +- $(LINK) $(kill_LDFLAGS) $(kill_OBJECTS) $(kill_LDADD) $(LIBS) + link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES) + @rm -f link$(EXEEXT) + $(LINK) $(link_LDFLAGS) $(link_OBJECTS) $(link_LDADD) $(LIBS) +@@ -1242,9 +1222,6 @@ + unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES) + @rm -f unlink$(EXEEXT) + $(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS) +-uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES) +- @rm -f uptime$(EXEEXT) +- $(LINK) $(uptime_LDFLAGS) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS) + users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES) + @rm -f users$(EXEEXT) + $(LINK) $(users_LDFLAGS) $(users_OBJECTS) $(users_LDADD) $(LIBS) +@@ -1333,11 +1310,9 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fold.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/head.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hostid.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hostname.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbracket.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@ +@@ -1393,7 +1368,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@ +@@ -1623,7 +1597,7 @@ + && can_create_suid_root_executable=yes; \ + rm -f $$TMPFILE; \ + if test $$can_create_suid_root_executable = yes; then \ +- $(INSTALL_SU); \ ++ echo "Installation of su is surpressed"; \ + else \ + echo "WARNING: insufficient access; not installing su"; \ + echo "NOTE: to install su, run 'make install-root' as root"; \ diff --git a/package/base/coreutils/no-generate-hack.patch b/package/base/coreutils/no-generate-hack.patch index 48ed3532d..54930401a 100644 --- a/package/base/coreutils/no-generate-hack.patch +++ b/package/base/coreutils/no-generate-hack.patch @@ -1,28 +1,6 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/coreutils/no-generate-hack.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- coreutils-5.0/config/missing 2002-06-13 11:30:02.000000000 +0200 -+++ coreutils-5.0-fixed/config/missing 2003-05-18 02:33:33.000000000 +0200 -@@ -28,6 +28,8 @@ +--- ./config/missing.orig 2004-10-01 05:48:27.453706296 +0200 ++++ ./config/missing 2004-10-01 05:48:41.973498952 +0200 +@@ -32,6 +32,8 @@ exit 1 fi