wok rev 7775
Up: coreutils to 8.8.
line diff
1.1 --- a/coreutils-character/receipt Thu Dec 23 01:15:54 2010 +0000 1.2 +++ b/coreutils-character/receipt Thu Dec 23 01:28:18 2010 +0000 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="coreutils-character" 1.7 -VERSION="8.7" 1.8 +VERSION="8.8" 1.9 CATEGORY="system-tools" 1.10 SHORT_DESC="GNU utilities that operate on characters." 1.11 MAINTAINER="rcx@zoominternet.net"
2.1 --- a/coreutils-command/receipt Thu Dec 23 01:15:54 2010 +0000 2.2 +++ b/coreutils-command/receipt Thu Dec 23 01:28:18 2010 +0000 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="coreutils-command" 2.7 -VERSION="8.7" 2.8 +VERSION="8.8" 2.9 CATEGORY="system-tools" 2.10 SHORT_DESC="GNU command utilities." 2.11 MAINTAINER="rcx@zoominternet.net"
3.1 --- a/coreutils-conditions/receipt Thu Dec 23 01:15:54 2010 +0000 3.2 +++ b/coreutils-conditions/receipt Thu Dec 23 01:28:18 2010 +0000 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="coreutils-conditions" 3.7 -VERSION="8.7" 3.8 +VERSION="8.8" 3.9 CATEGORY="system-tools" 3.10 SHORT_DESC="GNU utilities for conditions." 3.11 MAINTAINER="rcx@zoominternet.net"
4.1 --- a/coreutils-context-system/receipt Thu Dec 23 01:15:54 2010 +0000 4.2 +++ b/coreutils-context-system/receipt Thu Dec 23 01:28:18 2010 +0000 4.3 @@ -1,7 +1,7 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="coreutils-context-system" 4.7 -VERSION="8.7" 4.8 +VERSION="8.8" 4.9 CATEGORY="system-tools" 4.10 SHORT_DESC="GNU utilities related to the system context." 4.11 MAINTAINER="rcx@zoominternet.net"
5.1 --- a/coreutils-context-user/receipt Thu Dec 23 01:15:54 2010 +0000 5.2 +++ b/coreutils-context-user/receipt Thu Dec 23 01:28:18 2010 +0000 5.3 @@ -1,7 +1,7 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="coreutils-context-user" 5.7 -VERSION="8.7" 5.8 +VERSION="8.8" 5.9 CATEGORY="system-tools" 5.10 SHORT_DESC="GNU utilities related to the user context." 5.11 MAINTAINER="rcx@zoominternet.net"
6.1 --- a/coreutils-context-working/receipt Thu Dec 23 01:15:54 2010 +0000 6.2 +++ b/coreutils-context-working/receipt Thu Dec 23 01:28:18 2010 +0000 6.3 @@ -1,7 +1,7 @@ 6.4 # SliTaz package receipt. 6.5 6.6 PACKAGE="coreutils-context-working" 6.7 -VERSION="8.7" 6.8 +VERSION="8.8" 6.9 CATEGORY="system-tools" 6.10 SHORT_DESC="GNU utilities related to the working context." 6.11 MAINTAINER="rcx@zoominternet.net"
7.1 --- a/coreutils-directory/receipt Thu Dec 23 01:15:54 2010 +0000 7.2 +++ b/coreutils-directory/receipt Thu Dec 23 01:28:18 2010 +0000 7.3 @@ -1,7 +1,7 @@ 7.4 # SliTaz package receipt. 7.5 7.6 PACKAGE="coreutils-directory" 7.7 -VERSION="8.7" 7.8 +VERSION="8.8" 7.9 CATEGORY="system-tools" 7.10 SHORT_DESC="GNU utilities that list directories." 7.11 MAINTAINER="rcx@zoominternet.net"
8.1 --- a/coreutils-disk/receipt Thu Dec 23 01:15:54 2010 +0000 8.2 +++ b/coreutils-disk/receipt Thu Dec 23 01:28:18 2010 +0000 8.3 @@ -1,7 +1,7 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="coreutils-disk" 8.7 -VERSION="8.7" 8.8 +VERSION="8.8" 8.9 CATEGORY="system-tools" 8.10 SHORT_DESC="GNU utilities that work with disks." 8.11 MAINTAINER="rcx@zoominternet.net"
9.1 --- a/coreutils-file-attributes/receipt Thu Dec 23 01:15:54 2010 +0000 9.2 +++ b/coreutils-file-attributes/receipt Thu Dec 23 01:28:18 2010 +0000 9.3 @@ -1,7 +1,7 @@ 9.4 # SliTaz package receipt. 9.5 9.6 PACKAGE="coreutils-file-attributes" 9.7 -VERSION="8.7" 9.8 +VERSION="8.8" 9.9 CATEGORY="system-tools" 9.10 SHORT_DESC="GNU utilities that change file attributes." 9.11 MAINTAINER="rcx@zoominternet.net"
10.1 --- a/coreutils-file-format/receipt Thu Dec 23 01:15:54 2010 +0000 10.2 +++ b/coreutils-file-format/receipt Thu Dec 23 01:28:18 2010 +0000 10.3 @@ -1,7 +1,7 @@ 10.4 # SliTaz package receipt. 10.5 10.6 PACKAGE="coreutils-file-format" 10.7 -VERSION="8.7" 10.8 +VERSION="8.8" 10.9 CATEGORY="system-tools" 10.10 SHORT_DESC="GNU utilities that format file contents." 10.11 MAINTAINER="rcx@zoominternet.net"
11.1 --- a/coreutils-file-output-full/receipt Thu Dec 23 01:15:54 2010 +0000 11.2 +++ b/coreutils-file-output-full/receipt Thu Dec 23 01:28:18 2010 +0000 11.3 @@ -1,7 +1,7 @@ 11.4 # SliTaz package receipt. 11.5 11.6 PACKAGE="coreutils-file-output-full" 11.7 -VERSION="8.7" 11.8 +VERSION="8.8" 11.9 CATEGORY="system-tools" 11.10 SHORT_DESC="GNU utilities that output entire files." 11.11 MAINTAINER="rcx@zoominternet.net"
12.1 --- a/coreutils-file-output-part/receipt Thu Dec 23 01:15:54 2010 +0000 12.2 +++ b/coreutils-file-output-part/receipt Thu Dec 23 01:28:18 2010 +0000 12.3 @@ -1,7 +1,7 @@ 12.4 # SliTaz package receipt. 12.5 12.6 PACKAGE="coreutils-file-output-part" 12.7 -VERSION="8.7" 12.8 +VERSION="8.8" 12.9 CATEGORY="system-tools" 12.10 SHORT_DESC="GNU utilities that output file parts." 12.11 MAINTAINER="rcx@zoominternet.net"
13.1 --- a/coreutils-file-sort/receipt Thu Dec 23 01:15:54 2010 +0000 13.2 +++ b/coreutils-file-sort/receipt Thu Dec 23 01:28:18 2010 +0000 13.3 @@ -1,7 +1,7 @@ 13.4 # SliTaz package receipt. 13.5 13.6 PACKAGE="coreutils-file-sort" 13.7 -VERSION="8.7" 13.8 +VERSION="8.8" 13.9 CATEGORY="system-tools" 13.10 SHORT_DESC="GNU utilities that operate on sorted files." 13.11 MAINTAINER="rcx@zoominternet.net"
14.1 --- a/coreutils-file-special/receipt Thu Dec 23 01:15:54 2010 +0000 14.2 +++ b/coreutils-file-special/receipt Thu Dec 23 01:28:18 2010 +0000 14.3 @@ -1,7 +1,7 @@ 14.4 # SliTaz package receipt. 14.5 14.6 PACKAGE="coreutils-file-special" 14.7 -VERSION="8.7" 14.8 +VERSION="8.8" 14.9 CATEGORY="system-tools" 14.10 SHORT_DESC="GNU utilities that work with special file types." 14.11 MAINTAINER="rcx@zoominternet.net"
15.1 --- a/coreutils-file-summarize/receipt Thu Dec 23 01:15:54 2010 +0000 15.2 +++ b/coreutils-file-summarize/receipt Thu Dec 23 01:28:18 2010 +0000 15.3 @@ -1,7 +1,7 @@ 15.4 # SliTaz package receipt. 15.5 15.6 PACKAGE="coreutils-file-summarize" 15.7 -VERSION="8.7" 15.8 +VERSION="8.8" 15.9 CATEGORY="system-tools" 15.10 SHORT_DESC="GNU utilities that summarize files." 15.11 MAINTAINER="rcx@zoominternet.net"
16.1 --- a/coreutils-line/receipt Thu Dec 23 01:15:54 2010 +0000 16.2 +++ b/coreutils-line/receipt Thu Dec 23 01:28:18 2010 +0000 16.3 @@ -1,7 +1,7 @@ 16.4 # SliTaz package receipt. 16.5 16.6 PACKAGE="coreutils-line" 16.7 -VERSION="8.7" 16.8 +VERSION="8.8" 16.9 CATEGORY="system-tools" 16.10 SHORT_DESC="GNU utilities that operate on fields within a line." 16.11 MAINTAINER="rcx@zoominternet.net"
17.1 --- a/coreutils-numeric/receipt Thu Dec 23 01:15:54 2010 +0000 17.2 +++ b/coreutils-numeric/receipt Thu Dec 23 01:28:18 2010 +0000 17.3 @@ -1,7 +1,7 @@ 17.4 # SliTaz package receipt. 17.5 17.6 PACKAGE="coreutils-numeric" 17.7 -VERSION="8.7" 17.8 +VERSION="8.8" 17.9 CATEGORY="system-tools" 17.10 SHORT_DESC="GNU numeric utilities." 17.11 MAINTAINER="rcx@zoominternet.net"
18.1 --- a/coreutils-operations/receipt Thu Dec 23 01:15:54 2010 +0000 18.2 +++ b/coreutils-operations/receipt Thu Dec 23 01:28:18 2010 +0000 18.3 @@ -1,7 +1,7 @@ 18.4 # SliTaz package receipt. 18.5 18.6 PACKAGE="coreutils-operations" 18.7 -VERSION="8.7" 18.8 +VERSION="8.8" 18.9 CATEGORY="system-tools" 18.10 SHORT_DESC="GNU utilities that perform basic operations." 18.11 MAINTAINER="rcx@zoominternet.net"
19.1 --- a/coreutils-path/receipt Thu Dec 23 01:15:54 2010 +0000 19.2 +++ b/coreutils-path/receipt Thu Dec 23 01:28:18 2010 +0000 19.3 @@ -1,7 +1,7 @@ 19.4 # SliTaz package receipt. 19.5 19.6 PACKAGE="coreutils-path" 19.7 -VERSION="8.7" 19.8 +VERSION="8.8" 19.9 CATEGORY="system-tools" 19.10 SHORT_DESC="GNU utilities that perform path manipulation." 19.11 MAINTAINER="rcx@zoominternet.net"
20.1 --- a/coreutils-print/receipt Thu Dec 23 01:15:54 2010 +0000 20.2 +++ b/coreutils-print/receipt Thu Dec 23 01:28:18 2010 +0000 20.3 @@ -1,7 +1,7 @@ 20.4 # SliTaz package receipt. 20.5 20.6 PACKAGE="coreutils-print" 20.7 -VERSION="8.7" 20.8 +VERSION="8.8" 20.9 CATEGORY="system-tools" 20.10 SHORT_DESC="GNU utilities that print text." 20.11 MAINTAINER="rcx@zoominternet.net"
21.1 --- a/coreutils-redirection/receipt Thu Dec 23 01:15:54 2010 +0000 21.2 +++ b/coreutils-redirection/receipt Thu Dec 23 01:28:18 2010 +0000 21.3 @@ -1,7 +1,7 @@ 21.4 # SliTaz package receipt. 21.5 21.6 PACKAGE="coreutils-redirection" 21.7 -VERSION="8.7" 21.8 +VERSION="8.8" 21.9 CATEGORY="system-tools" 21.10 SHORT_DESC="GNU utilities that work with disks." 21.11 MAINTAINER="rcx@zoominternet.net"
22.1 --- a/coreutils/receipt Thu Dec 23 01:15:54 2010 +0000 22.2 +++ b/coreutils/receipt Thu Dec 23 01:28:18 2010 +0000 22.3 @@ -1,7 +1,7 @@ 22.4 # SliTaz package receipt. 22.5 22.6 PACKAGE="coreutils" 22.7 -VERSION="8.7" 22.8 +VERSION="8.8" 22.9 CATEGORY="system-tools" 22.10 SHORT_DESC="Utilities for using and setting the basic system." 22.11 MAINTAINER="pankso@slitaz.org" 22.12 @@ -19,6 +19,7 @@ 22.13 # NOTE: There does not seem to be a problem with sigcontext.h in Linux 2.6.29.3 22.14 22.15 # Hack to fix ls: expected specifier-qualifier-list before '__u64' 22.16 + # Hack to change uname: so can see the cpu type your running on with uname 22.17 while read patch_file; do 22.18 if [ -f done.$patch_file ]; then 22.19 echo "Skipping $patch_file" 22.20 @@ -29,6 +30,7 @@ 22.21 touch done.$patch_file 22.22 done <<EOT 22.23 ls.u 22.24 +uname.u 22.25 EOT 22.26 22.27 sed -i 's/1.10a/1.10.2/' configure.ac || exit 1
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 23.2 +++ b/coreutils/stuff/uname.u Thu Dec 23 01:28:18 2010 +0000 23.3 @@ -0,0 +1,173 @@ 23.4 +On linux platforms, grok /proc/cpuinfo for the CPU/vendor info. 23.5 + 23.6 +Prob not suitable for upstream seeing as how it's 100% linux-specific 23.7 +http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html 23.8 + 23.9 +Patch originally by Carlos E. Gorges <carlos@techlinux.com.br>, but 23.10 +heavily reworked to suck less. 23.11 + 23.12 +To add support for additional platforms, check out the show_cpuinfo() 23.13 +func in the linux/arch/<ARCH>/ source tree of the kernel. 23.14 + 23.15 +--- coreutils/src/uname.c 23.16 ++++ coreutils/src/uname.c 23.17 +@@ -50,6 +50,11 @@ 23.18 + # include <mach-o/arch.h> 23.19 + #endif 23.20 + 23.21 ++#if defined(__linux__) 23.22 ++# define USE_PROCINFO 23.23 ++# define UNAME_HARDWARE_PLATFORM 23.24 ++#endif 23.25 ++ 23.26 + #include "system.h" 23.27 + #include "error.h" 23.28 + #include "quote.h" 23.29 +@@ -138,6 +143,117 @@ 23.30 + exit (status); 23.31 + } 23.32 + 23.33 ++#if defined(USE_PROCINFO) 23.34 ++ 23.35 ++# if defined(__s390__) || defined(__s390x__) 23.36 ++# define CPUINFO_FILE "/proc/sysinfo" 23.37 ++# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c" 23.38 ++# else 23.39 ++# define CPUINFO_FILE "/proc/cpuinfo" 23.40 ++# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c" 23.41 ++# endif 23.42 ++ 23.43 ++# define PROCINFO_PROCESSOR 0 23.44 ++# define PROCINFO_HARDWARE_PLATFORM 1 23.45 ++ 23.46 ++static void __eat_cpuinfo_space(char *buf) 23.47 ++{ 23.48 ++ /* first eat trailing space */ 23.49 ++ char *tmp = buf + strlen(buf) - 1; 23.50 ++ while (tmp > buf && isspace(*tmp)) 23.51 ++ *tmp-- = '\0'; 23.52 ++ /* then eat leading space */ 23.53 ++ tmp = buf; 23.54 ++ while (*tmp && isspace(*tmp)) 23.55 ++ tmp++; 23.56 ++ if (tmp != buf) 23.57 ++ memmove(buf, tmp, strlen(tmp)+1); 23.58 ++ /* finally collapse whitespace */ 23.59 ++ tmp = buf; 23.60 ++ while (tmp[0] && tmp[1]) { 23.61 ++ if (isspace(tmp[0]) && isspace(tmp[1])) { 23.62 ++ memmove(tmp, tmp+1, strlen(tmp)); 23.63 ++ continue; 23.64 ++ } 23.65 ++ ++tmp; 23.66 ++ } 23.67 ++} 23.68 ++ 23.69 ++static int __linux_procinfo(int x, char *fstr, size_t s) 23.70 ++{ 23.71 ++ FILE *fp; 23.72 ++ 23.73 ++ char *procinfo_keys[] = { 23.74 ++ /* --processor --hardware-platform */ 23.75 ++ #if defined(__alpha__) 23.76 ++ "cpu model", "system type" 23.77 ++ #elif defined(__arm__) 23.78 ++ "Processor", "Hardware" 23.79 ++ #elif defined(__avr32__) 23.80 ++ "processor", "cpu family" 23.81 ++ #elif defined(__bfin__) 23.82 ++ "CPU", "BOARD Name" 23.83 ++ #elif defined(__cris__) 23.84 ++ "cpu", "cpu model" 23.85 ++ #elif defined(__frv__) 23.86 ++ "CPU-Core", "System" 23.87 ++ #elif defined(__i386__) || defined(__x86_64__) 23.88 ++ "model name", "vendor_id" 23.89 ++ #elif defined(__ia64__) 23.90 ++ "family", "vendor" 23.91 ++ #elif defined(__hppa__) 23.92 ++ "cpu", "model" 23.93 ++ #elif defined(__m68k__) 23.94 ++ "CPU", "MMU" 23.95 ++ #elif defined(__mips__) 23.96 ++ "cpu model", "system type" 23.97 ++ #elif defined(__powerpc__) || defined(__powerpc64__) 23.98 ++ "cpu", "machine" 23.99 ++ #elif defined(__s390__) || defined(__s390x__) 23.100 ++ "Type", "Manufacturer" 23.101 ++ #elif defined(__sh__) 23.102 ++ "cpu type", "machine" 23.103 ++ #elif defined(sparc) || defined(__sparc__) 23.104 ++ "type", "cpu" 23.105 ++ #elif defined(__vax__) 23.106 ++ "cpu type", "cpu" 23.107 ++ #else 23.108 ++ "unknown", "unknown" 23.109 ++ #endif 23.110 ++ }; 23.111 ++ 23.112 ++ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { 23.113 ++ char key[65], value[257], eol, *ret = NULL; 23.114 ++ 23.115 ++ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { 23.116 ++ __eat_cpuinfo_space(key); 23.117 ++ if (!strcmp(key, procinfo_keys[x])) { 23.118 ++ __eat_cpuinfo_space(value); 23.119 ++ ret = value; 23.120 ++ break; 23.121 ++ } 23.122 ++ if (eol != '\n') { 23.123 ++ /* we need two fscanf's here in case the previous 23.124 ++ * length limit caused us to read right up to the 23.125 ++ * newline ... doing "%*[^\n]\n" wont eat the newline 23.126 ++ */ 23.127 ++ fscanf(fp, "%*[^\n]"); 23.128 ++ fscanf(fp, "\n"); 23.129 ++ } 23.130 ++ } 23.131 ++ fclose(fp); 23.132 ++ 23.133 ++ if (ret) { 23.134 ++ strncpy(fstr, ret, s); 23.135 ++ return 0; 23.136 ++ } 23.137 ++ } 23.138 ++ 23.139 ++ return -1; 23.140 ++} 23.141 ++ 23.142 ++#endif 23.143 ++ 23.144 + /* Print ELEMENT, preceded by a space if something has already been 23.145 + printed. */ 23.146 + 23.147 +@@ -250,10 +344,14 @@ main (int argc, char **argv) 23.148 + if (toprint & PRINT_PROCESSOR) 23.149 + { 23.150 + char const *element = unknown; 23.151 +-#if HAVE_SYSINFO && defined SI_ARCHITECTURE 23.152 ++#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) 23.153 + { 23.154 + static char processor[257]; 23.155 ++#if defined(USE_PROCINFO) 23.156 ++ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) 23.157 ++#else 23.158 + if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) 23.159 ++#endif 23.160 + element = processor; 23.161 + } 23.162 + #endif 23.163 +@@ -306,9 +404,13 @@ main (int argc, char **argv) 23.164 + if (element == unknown) 23.165 + { 23.166 + static char hardware_platform[257]; 23.167 ++#if defined(USE_PROCINFO) 23.168 ++ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) 23.169 ++#else 23.170 + size_t s = sizeof hardware_platform; 23.171 + static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; 23.172 + if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) 23.173 ++#endif 23.174 + element = hardware_platform; 23.175 + } 23.176 + #endif