Merge branch '3.6' into 3.7
This commit is contained in:
commit
8c91d11a16
@ -1,7 +1,5 @@
|
||||
untrusted comment: verify with /etc/ports/core.pub
|
||||
RWRJc1FUaeVeqsSwn6rGE53VP0VRGPKE6DE8oDn15ClApYv2+jLMDLEQW0A/j2HIQSSmH10QSFvHOWG4v6UbppogbYGbz9WefgQ=
|
||||
SHA256 (Pkgfile) = 59b470f83ff2c2e31f41dafebd9b0f883983d1bca83be7bd8faf0cb930a752fa
|
||||
RWRJc1FUaeVeqizY79FkUd3U7opV/c1Anz0RW0qQ11kwdyZnc0ubcKiUlLUetWS+5JzWjqckq3FtZNIbyRWm9O0mD1nTkmN1pgQ=
|
||||
SHA256 (Pkgfile) = 7871a51852ce35882cd4d7ba64382fbdb721d2f609cf66c1516e40dc9b1b4001
|
||||
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
|
||||
|
||||
@ -4,21 +4,14 @@
|
||||
# Depends on: acl libcap libgmp
|
||||
|
||||
name=coreutils
|
||||
version=9.0
|
||||
version=9.1
|
||||
release=1
|
||||
source=(https://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 \
|
||||
|
||||
@ -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
|
||||
@ -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 <carlos@techlinux.com.br>, but
|
||||
heavily reworked to suck less.
|
||||
|
||||
To add support for additional platforms, check out the show_cpuinfo()
|
||||
func in the linux/arch/<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 <mach-o/arch.h>
|
||||
#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
|
||||
@ -1,8 +1,8 @@
|
||||
untrusted comment: verify with /etc/ports/core.pub
|
||||
RWRJc1FUaeVeqrs4/p/FsMBM5IxZXG1mh/O5e+ZYb8hLUVj6lJGO4vKSoMDf/YXZ032CTr/QhpEcdiGum/3hAPTwGuA33rtO+wo=
|
||||
SHA256 (Pkgfile) = 7b317178a47e65f88fc61046ccb18ab3e394a5c610af1141ea976aeee6ebf005
|
||||
RWRJc1FUaeVeqsk1RsEzGx/CQ0MGqMUHYQLc/BRM4RFS8Zniokw7aruJvZmHlMWMx0J++7o3YXnziC5yRI4g+if75zj+81JtMgY=
|
||||
SHA256 (Pkgfile) = d81ec905826ef4d5b0c20373f96e5d25cf01ed4112eecbdf293d04c90b0883ed
|
||||
SHA256 (.footprint) = bf468272af3c29c8b4b4d150730c23071cf0093dc06172548b7dbddaeee6c3c3
|
||||
SHA256 (rsync-3.2.3.tar.gz) = becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e
|
||||
SHA256 (rsync-3.2.4.tar.gz) = 6f761838d08052b0b6579cf7f6737d93e47f01f4da04c5d24d3447b7f2a5fad1
|
||||
SHA256 (rsyncd.conf) = ada548bd0ff96a02dea1fc58dd3d0821027526c4f3cd1a35dcaf30b22dc02c7e
|
||||
SHA256 (rsyncd) = 424dbf7cbe8d4f60a1868984084d107445a3dd33c77a82eb36598f012204946a
|
||||
SHA256 (rsync.driver) = 5e0f94a972cf7e47f153ccd0ac454ec2bd3056a834b69e82d3f3984d44308ef7
|
||||
|
||||
@ -1,25 +1,24 @@
|
||||
# Description: Utility for incremental file transfers over networks
|
||||
# URL: https://rsync.samba.org
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
# Depends on: acl openssl zlib
|
||||
# Depends on: acl openssl zlib zstd
|
||||
|
||||
name=rsync
|
||||
version=3.2.3
|
||||
version=3.2.4
|
||||
release=1
|
||||
source=(https://download.samba.org/pub/rsync/$name-$version.tar.gz
|
||||
source=(https://download.samba.org/pub/rsync/$name-$version.tar.gz \
|
||||
rsyncd.conf rsyncd rsync.driver)
|
||||
|
||||
build () {
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--runstatedir=/run \
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--with-rsh=ssh \
|
||||
--with-included-zlib=no \
|
||||
--with-included-popt=yes \
|
||||
--disable-xxhash \
|
||||
--disable-lz4 \
|
||||
--disable-zstd
|
||||
--disable-lz4
|
||||
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user