From c21d4ad3e501faa7bec6bfdc1583e3b1e514df9cdb9af63e4e34ecaa6aad7e61 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 20 Nov 2008 14:16:45 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=32 --- coreutils-cifs-afs.diff | 38 ++++++++++++++++++++++++++++++++++++++ coreutils.changes | 5 +++++ coreutils.spec | 6 +++++- 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 coreutils-cifs-afs.diff diff --git a/coreutils-cifs-afs.diff b/coreutils-cifs-afs.diff new file mode 100644 index 0000000..0e1e381 --- /dev/null +++ b/coreutils-cifs-afs.diff @@ -0,0 +1,38 @@ +--- src/fs.h ++++ src/fs.h 2008-11-19 12:28:00.977049694 +0100 +@@ -34,6 +34,7 @@ + # define S_MAGIC_MINIX_V2_30 0x2478 + # define S_MAGIC_MSDOS 0x4D44 + # define S_MAGIC_NCP 0x564C ++# define S_MAGIC_AFS 0x6B414653 + # define S_MAGIC_NFS 0x6969 + # define S_MAGIC_NFSD 0x6E667364 + # define S_MAGIC_NTFS 0x5346544E +@@ -44,6 +45,7 @@ + # define S_MAGIC_REISERFS 0x52654973 + # define S_MAGIC_ROMFS 0x7275 + # define S_MAGIC_SMB 0x517B ++# define S_MAGIC_CIFS 0xFF534D42 + # define S_MAGIC_SQUASHFS 0x73717368 + # define S_MAGIC_SYSFS 0x62656572 + # define S_MAGIC_SYSV2 0x012FF7B6 +--- src/stat.c ++++ src/stat.c 2008-11-19 12:28:26.235780004 +0100 +@@ -283,6 +283,8 @@ human_fstype (STRUCT_STATVFS const *stat + return "msdos"; + case S_MAGIC_NCP: /* 0x564C */ + return "novell"; ++ case S_MAGIC_AFS: /* 0x6B414653 */ ++ return "afs"; + case S_MAGIC_NFS: /* 0x6969 */ + return "nfs"; + case S_MAGIC_NFSD: /* 0x6E667364 */ +@@ -303,6 +305,8 @@ human_fstype (STRUCT_STATVFS const *stat + return "romfs"; + case S_MAGIC_SMB: /* 0x517B */ + return "smb"; ++ case S_MAGIC_CIFS: /* 0xFF534D42 */ ++ return "cifs"; + case S_MAGIC_SQUASHFS: /* 0x73717368 */ + return "squashfs"; + case S_MAGIC_SYSFS: /* 0x62656572 */ diff --git a/coreutils.changes b/coreutils.changes index 0d7f7a3..67a417e 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 19 12:42:10 CET 2008 - werner@suse.de + +- Enable stat(1) to detect (k)AFS and CIFS network file systems + ------------------------------------------------------------------- Tue Nov 18 16:48:05 CET 2008 - schwab@suse.de diff --git a/coreutils.spec b/coreutils.spec index 1fd7466..493ed1c 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -24,7 +24,7 @@ Url: http://www.gnu.org/software/coreutils/ License: GNU Free Documentation License, Version 1.2 (GFDL 1.2); GPL v2 or later; GPL v3 or later Group: System/Base Version: 6.12 -Release: 31 +Release: 32 Provides: fileutils sh-utils stat textutils mktemp Obsoletes: fileutils sh-utils stat textutils mktemp Obsoletes: libselinux <= 1.23.11-3 libselinux-32bit = 9 libselinux-64bit = 9 libselinux-x86 = 9 @@ -50,6 +50,7 @@ Patch21: coreutils-6.8.0-pie.diff Patch22: coreutils-5.3.0-sbin4su.diff Patch23: coreutils-getaddrinfo.diff Patch24: utimens.diff +Patch25: coreutils-cifs-afs.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -121,6 +122,7 @@ Authors: %patch22 %patch23 -p1 %patch24 -p1 +%patch25 %build AUTOPOINT=true autoreconf -fi @@ -189,6 +191,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %changelog +* Wed Nov 19 2008 werner@suse.de +- Enable stat(1) to detect (k)AFS and CIFS network file systems * Tue Nov 18 2008 schwab@suse.de - Move stat to /bin. * Tue Oct 21 2008 schwab@suse.de