This commit is contained in:
parent
63063c2e49
commit
b762f923e3
@ -1,58 +0,0 @@
|
||||
---
|
||||
src/cp.c | 24 ++++++++++++------------
|
||||
1 file changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
Index: b/src/cp.c
|
||||
===================================================================
|
||||
--- a/src/cp.c
|
||||
+++ b/src/cp.c
|
||||
@@ -404,6 +404,7 @@ make_dir_parents_private (char const *co
|
||||
slash++;
|
||||
while ((slash = strchr (slash, '/')))
|
||||
{
|
||||
+ int src_errno;
|
||||
/* Add this directory to the list of directories whose modes need
|
||||
fixing later. */
|
||||
struct dir_attr *new = xmalloc (sizeof *new);
|
||||
@@ -413,12 +414,22 @@ make_dir_parents_private (char const *co
|
||||
*attr_list = new;
|
||||
|
||||
*slash = '\0';
|
||||
+ src_errno = (stat (src, &new->st) != 0
|
||||
+ ? errno
|
||||
+ : S_ISDIR (new->st.st_mode)
|
||||
+ ? 0
|
||||
+ : ENOTDIR);
|
||||
+ if (src_errno)
|
||||
+ {
|
||||
+ error (0, src_errno, _("failed to get attributes of %s"),
|
||||
+ quote (src));
|
||||
+ return false;
|
||||
+ }
|
||||
if (stat (dir, &stats) != 0)
|
||||
{
|
||||
mode_t src_mode;
|
||||
mode_t omitted_permissions;
|
||||
mode_t mkdir_mode;
|
||||
- int src_errno;
|
||||
|
||||
/* This component does not exist. We must set
|
||||
*new_dst and new->st.st_mode inside this loop because,
|
||||
@@ -426,17 +437,6 @@ make_dir_parents_private (char const *co
|
||||
make_dir_parents_private creates only e_dir/../a if
|
||||
./b already exists. */
|
||||
*new_dst = true;
|
||||
- src_errno = (stat (src, &new->st) != 0
|
||||
- ? errno
|
||||
- : S_ISDIR (new->st.st_mode)
|
||||
- ? 0
|
||||
- : ENOTDIR);
|
||||
- if (src_errno)
|
||||
- {
|
||||
- error (0, src_errno, _("failed to get attributes of %s"),
|
||||
- quote (src));
|
||||
- return false;
|
||||
- }
|
||||
src_mode = new->st.st_mode;
|
||||
|
||||
/* If the ownership or special mode bits might change,
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:493514a920b3d73e8714b2e8e884febb494b663d02bd8fac194a35640b95fa2b
|
||||
size 5979771
|
3
coreutils-6.9.91.tar.bz2
Normal file
3
coreutils-6.9.91.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1604c2916d209af7461ee4821eeef6a4847fa30d8b7a982ff97470e265325732
|
||||
size 6034366
|
@ -1,15 +0,0 @@
|
||||
Index: coreutils-6.9.90/gnulib-tests/test-getaddrinfo.c
|
||||
===================================================================
|
||||
--- coreutils-6.9.90.orig/gnulib-tests/test-getaddrinfo.c 2007-11-17 07:59:42.000000000 +0100
|
||||
+++ coreutils-6.9.90/gnulib-tests/test-getaddrinfo.c 2007-12-12 11:25:49.000000000 +0100
|
||||
@@ -61,6 +61,10 @@ int simple (char *host, char *service)
|
||||
if (res == EAI_SERVICE)
|
||||
return 0;
|
||||
|
||||
+ /* Do not fail this test for temporary name resolution errors. */
|
||||
+ if (res == EAI_AGAIN)
|
||||
+ return 0;
|
||||
+
|
||||
return 1;
|
||||
}
|
||||
|
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 12 02:53:10 CET 2008 - mrueckert@suse.de
|
||||
|
||||
- reverted back to bzip2 for the tarball as decided on the dist
|
||||
meeting
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 7 16:14:51 CET 2008 - schwab@suse.de
|
||||
|
||||
- Update to coreutils 6.9.91.
|
||||
** Bug fixes
|
||||
"ls -l" would not output "+" on SELinux hosts unless -Z was also given.
|
||||
"rm" would fail to unlink a non-directory when run in an environment
|
||||
in which the user running rm is capable of unlinking a directory.
|
||||
[bug introduced in coreutils-6.9]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 7 11:12:01 CET 2008 - jblunck@suse.de
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package coreutils (Version 6.9.90)
|
||||
# spec file for package coreutils (Version 6.9.91)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -19,8 +19,8 @@ Obsoletes: fileutils sh-utils stat textutils mktemp
|
||||
Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit >= 9 libselinux-64bit = 9 libselinux-x86 = 9
|
||||
AutoReqProv: on
|
||||
PreReq: %{install_info_prereq}
|
||||
Version: 6.9.90
|
||||
Release: 9
|
||||
Version: 6.9.91
|
||||
Release: 1
|
||||
Summary: GNU Core Utilities
|
||||
Source: coreutils-%{version}.tar.bz2
|
||||
Source1: su.pamd
|
||||
@ -38,8 +38,6 @@ Patch16: invalid-ids.diff
|
||||
Patch20: coreutils-6.8-su.diff
|
||||
Patch21: coreutils-6.8.0-pie.diff
|
||||
Patch22: coreutils-5.3.0-sbin4su.diff
|
||||
Patch23: coreutils-getaddrinfo.diff
|
||||
Patch24: coreutils-6.9.90-preserve_mode-fix.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -107,8 +105,6 @@ Authors:
|
||||
%patch20
|
||||
%patch21
|
||||
%patch22
|
||||
%patch23 -p1
|
||||
%patch24 -p1
|
||||
|
||||
%build
|
||||
AUTOPOINT=true autoreconf -fi
|
||||
@ -173,6 +169,16 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%dir %{_prefix}/share/locale/*/LC_TIME
|
||||
|
||||
%changelog
|
||||
* Sat Jan 12 2008 - mrueckert@suse.de
|
||||
- reverted back to bzip2 for the tarball as decided on the dist
|
||||
meeting
|
||||
* Mon Jan 07 2008 - schwab@suse.de
|
||||
- Update to coreutils 6.9.91.
|
||||
** Bug fixes
|
||||
"ls -l" would not output "+" on SELinux hosts unless -Z was also given.
|
||||
"rm" would fail to unlink a non-directory when run in an environment
|
||||
in which the user running rm is capable of unlinking a directory.
|
||||
[bug introduced in coreutils-6.9]
|
||||
* Mon Jan 07 2008 - jblunck@suse.de
|
||||
- fix a cp bug with -p --parents
|
||||
* Wed Dec 12 2007 - rguenther@suse.de
|
||||
|
Loading…
Reference in New Issue
Block a user