diff --git a/coreutils/.signature b/coreutils/.signature index d850fe3a..3f1bd6bf 100644 --- a/coreutils/.signature +++ b/coreutils/.signature @@ -1,7 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqos33FXS192P29ki3nqRetEBqbwtxszjHRjavXGyiUD5sXhMRBrXQN7tY/KToEzMt61c5M6qfWu3oRaT3WXfBw8= -SHA256 (Pkgfile) = da6676ddf3de9a8ae63422facac997634c11fd21cd10d5a07469e6b37809fe81 +RWRJc1FUaeVeqj3DY6ibFB37aQfLG0WDtm7Hos0EbIYg4tQG5S74eeaucMI/+RxHscgI5zu91mKSy9K36S7DUIXq4O5zjhZW/Qg= +SHA256 (Pkgfile) = 0d1b09fcff40df62b507f36466daa62ae26c4ea0b114cbe49ab8e14d373eb0a7 SHA256 (.footprint) = 45c2d1805ada036f538df41d4f15b3148670d9247839effbc39276b9d0c37819 -SHA256 (coreutils-9.0.tar.xz) = ce30acdf4a41bc5bb30dd955e9eaa75fa216b4e3deb08889ed32433c7b3b97ce -SHA256 (coreutils-uname.patch) = 164ad5976c67dd49f1d28d3124a6cb5395d52a23d9a3112a10a795af6069d97d -SHA256 (chmod.c.patch) = 3c5084f36a543902ee57c477318c0cec97d845c4784b8314c55e00ac86a29091 +SHA256 (coreutils-9.1.tar.xz) = 61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423 diff --git a/coreutils/Pkgfile b/coreutils/Pkgfile index dc7c9bea..c36e6640 100644 --- a/coreutils/Pkgfile +++ b/coreutils/Pkgfile @@ -1,24 +1,17 @@ # Description: A collection of core GNU utilities -# URL: http://www.gnu.org/software/coreutils/ +# URL: https://www.gnu.org/software/coreutils/ # Maintainer: CRUX System Team, core-ports at crux dot nu # Depends on: libgmp acl libcap name=coreutils -version=9.0 +version=9.1 release=1 -source=(http://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.xz - coreutils-uname.patch - chmod.c.patch) +source=(https://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.xz) build() { cd $name-$version - # https://bugs.gnu.org/50784 - patch -p1 -i $SRC/chmod.c.patch - - patch -p1 -i $SRC/coreutils-uname.patch - export FORCE_UNSAFE_CONFIGURE=1 - + FORCE_UNSAFE_CONFIGURE=1 \ ./configure \ --prefix=/usr \ --libexecdir=/usr/lib \ diff --git a/coreutils/chmod.c.patch b/coreutils/chmod.c.patch deleted file mode 100644 index 4e9ed631..00000000 --- a/coreutils/chmod.c.patch +++ /dev/null @@ -1,25 +0,0 @@ -X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blobdiff_plain;f=src%2Fchmod.c;h=57ac47f33a8c8643f8b22f29d81b8303db06b93b;hp=37b04f5006bbcd049b2ae1be1b2e0f73730e2dd5;hb=e8b56ebd536e82b15542a00c888109471936bfda;hpb=6f38c4b27921a57a2bb5d999549411c2abe2fae6 - -diff --git a/src/chmod.c b/src/chmod.c -index 37b04f5..57ac47f 100644 ---- a/src/chmod.c -+++ b/src/chmod.c -@@ -44,8 +44,8 @@ struct change_status - enum - { - CH_NO_STAT, -- CH_NOT_APPLIED, - CH_FAILED, -+ CH_NOT_APPLIED, - CH_NO_CHANGE_REQUESTED, - CH_SUCCEEDED - } -@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent) - if ( ! recurse) - fts_set (fts, ent, FTS_SKIP); - -- return CH_NO_CHANGE_REQUESTED <= ch.status; -+ return CH_NOT_APPLIED <= ch.status; - } - - /* Recursively change the modes of the specified FILES (the last entry diff --git a/coreutils/coreutils-uname.patch b/coreutils/coreutils-uname.patch deleted file mode 100644 index 37f47296..00000000 --- a/coreutils/coreutils-uname.patch +++ /dev/null @@ -1,176 +0,0 @@ -# http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/coreutils/7.5/ - -On linux platforms, grok /proc/cpuinfo for the CPU/vendor info. - -Prob not suitable for upstream seeing as how it's 100% linux-specific -http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html - -Patch originally by Carlos E. Gorges , but -heavily reworked to suck less. - -To add support for additional platforms, check out the show_cpuinfo() -func in the linux/arch// source tree of the kernel. - -diff -Nru coreutils-7.6.orig/src/uname.c coreutils-7.6/src/uname.c ---- coreutils-7.6.orig/src/uname.c 2009-09-11 16:34:48.000000000 +0200 -+++ coreutils-7.6/src/uname.c 2009-09-11 16:40:29.000000000 +0200 -@@ -50,6 +50,11 @@ - # include - #endif - -+#if defined(__linux__) -+# define USE_PROCINFO -+# define UNAME_HARDWARE_PLATFORM -+#endif -+ - #include "system.h" - #include "error.h" - #include "quote.h" -@@ -155,6 +160,117 @@ - exit (status); - } - -+#if defined(USE_PROCINFO) -+ -+# if defined(__s390__) || defined(__s390x__) -+# define CPUINFO_FILE "/proc/sysinfo" -+# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c" -+# else -+# define CPUINFO_FILE "/proc/cpuinfo" -+# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c" -+# endif -+ -+# define PROCINFO_PROCESSOR 0 -+# define PROCINFO_HARDWARE_PLATFORM 1 -+ -+static void __eat_cpuinfo_space(char *buf) -+{ -+ /* first eat trailing space */ -+ char *tmp = buf + strlen(buf) - 1; -+ while (tmp > buf && isspace(*tmp)) -+ *tmp-- = '\0'; -+ /* then eat leading space */ -+ tmp = buf; -+ while (*tmp && isspace(*tmp)) -+ tmp++; -+ if (tmp != buf) -+ memmove(buf, tmp, strlen(tmp)+1); -+ /* finally collapse whitespace */ -+ tmp = buf; -+ while (tmp[0] && tmp[1]) { -+ if (isspace(tmp[0]) && isspace(tmp[1])) { -+ memmove(tmp, tmp+1, strlen(tmp)); -+ continue; -+ } -+ ++tmp; -+ } -+} -+ -+static int __linux_procinfo(int x, char *fstr, size_t s) -+{ -+ FILE *fp; -+ -+ char *procinfo_keys[] = { -+ /* --processor --hardware-platform */ -+ #if defined(__alpha__) -+ "cpu model", "system type" -+ #elif defined(__arm__) -+ "Processor", "Hardware" -+ #elif defined(__avr32__) -+ "processor", "cpu family" -+ #elif defined(__bfin__) -+ "CPU", "BOARD Name" -+ #elif defined(__cris__) -+ "cpu", "cpu model" -+ #elif defined(__frv__) -+ "CPU-Core", "System" -+ #elif defined(__i386__) || defined(__x86_64__) -+ "model name", "vendor_id" -+ #elif defined(__ia64__) -+ "family", "vendor" -+ #elif defined(__hppa__) -+ "cpu", "model" -+ #elif defined(__m68k__) -+ "CPU", "MMU" -+ #elif defined(__mips__) -+ "cpu model", "system type" -+ #elif defined(__powerpc__) || defined(__powerpc64__) -+ "cpu", "machine" -+ #elif defined(__s390__) || defined(__s390x__) -+ "Type", "Manufacturer" -+ #elif defined(__sh__) -+ "cpu type", "machine" -+ #elif defined(sparc) || defined(__sparc__) -+ "type", "cpu" -+ #elif defined(__vax__) -+ "cpu type", "cpu" -+ #else -+ "unknown", "unknown" -+ #endif -+ }; -+ -+ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { -+ char key[65], value[257], eol, *ret = NULL; -+ -+ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { -+ __eat_cpuinfo_space(key); -+ if (!strcmp(key, procinfo_keys[x])) { -+ __eat_cpuinfo_space(value); -+ ret = value; -+ break; -+ } -+ if (eol != '\n') { -+ /* we need two fscanf's here in case the previous -+ * length limit caused us to read right up to the -+ * newline ... doing "%*[^\n]\n" wont eat the newline -+ */ -+ fscanf(fp, "%*[^\n]"); -+ fscanf(fp, "\n"); -+ } -+ } -+ fclose(fp); -+ -+ if (ret) { -+ strncpy(fstr, ret, s); -+ return 0; -+ } -+ } -+ -+ return -1; -+} -+ -+#endif -+ - /* Print ELEMENT, preceded by a space if something has already been - printed. */ - -@@ -302,10 +418,14 @@ - if (toprint & PRINT_PROCESSOR) - { - char const *element = unknown; --#if HAVE_SYSINFO && defined SI_ARCHITECTURE -+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) - { - static char processor[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) -+#else - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) -+#endif - element = processor; - } - #endif -@@ -358,9 +478,13 @@ - if (element == unknown) - { - static char hardware_platform[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) -+#else - size_t s = sizeof hardware_platform; - static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; - if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) -+#endif - element = hardware_platform; - } - #endif