haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

coreutils: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2017-10-26 13:31:23 +02:00
parent 023f20be0d
commit c61232faef
2 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
sys-apps/coreutils/patches/coreutils-8.26.patchset → sys-apps/coreutils/patches/coreutils-8.28.patchset
View File

@@ -1,11 +1,11 @@
From 2febd541c8cf8040aa8b2b220f43a8792bc379b5 Mon Sep 17 00:00:00 2001
From 2ad10befa33d331800346cab63417bebb1db3e6f Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 13 May 2014 17:18:52 +0000
Subject: define __USE_GNU for wempcpy
diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index a9a6924..8a4394a 100644
index 5559ba2..8ca4cc4 100644
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -21,6 +21,9 @@
@@ -16,20 +16,20 @@ index a9a6924..8a4394a 100644
+# define __USE_GNU 1
+#endif
#if ! defined __builtin_expect && (!defined __GNUC__ || __GNUC__ < 3)
# define __builtin_expect(expr, expected) (expr)
#include <fnmatch.h>
--
2.10.2
2.14.2
From 021c43ca9218d65ea24ccfe7d93760c186b49d90 Mon Sep 17 00:00:00 2001
From 2524d0dde2a381c8f8c76620c3fe01befb8e83fd Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 13 May 2014 17:22:10 +0000
Subject: force declaration of rpl_inet_ntop
diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h
index 026c4dc..758391f 100644
index dc3d2bd..62b4786 100644
--- a/lib/arpa_inet.in.h
+++ b/lib/arpa_inet.in.h
@@ -72,7 +72,7 @@
@@ -42,17 +42,17 @@ index 026c4dc..758391f 100644
# undef inet_ntop
# define inet_ntop rpl_inet_ntop
--
2.10.2
2.14.2
From 22a527c6a80be7648a456d2499d6219148bb44d8 Mon Sep 17 00:00:00 2001
From c09450fe92943d42ee78ed86944d38ebcd18726a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 13 May 2014 17:32:36 +0000
Subject: Haiku defines mknod in unistd.h
diff --git a/lib/mknod.c b/lib/mknod.c
index 26e80cc..601aa79 100644
index b6bfb2a..4bbd3d7 100644
--- a/lib/mknod.c
+++ b/lib/mknod.c
@@ -18,6 +18,7 @@
@@ -64,17 +64,17 @@ index 26e80cc..601aa79 100644
#include <errno.h>
--
2.10.2
2.14.2
From 5d8a5e1cc55c083afb7ca44600c499a2f94499a6 Mon Sep 17 00:00:00 2001
From ecd1f97294f01f1d3ee3d71e40601acd624ecd8a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 13 May 2014 17:35:25 +0000
Subject: protect the label, not used on Haiku
diff --git a/lib/mountlist.c b/lib/mountlist.c
index cf4020e..c269690 100644
index 1a40d15..9a8af06 100644
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -1109,6 +1109,7 @@ read_file_system_list (bool need_fs_type)
@@ -94,17 +94,17 @@ index cf4020e..c269690 100644
/* Free a mount entry as returned from read_file_system_list (). */
--
2.10.2
2.14.2
From 10a9d74eb18a959683035b9464ef06737be4eb92 Mon Sep 17 00:00:00 2001
From 7f075f99fa7a5d78148ab5d79965a969db423c45 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 15 May 2014 15:40:32 +0000
Subject: strchrnul needs __USE_GNU on Haiku
diff --git a/lib/regex.h b/lib/regex.h
index b7496f9..620d9bd 100644
index 18b8cbd..64d084d 100644
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -31,8 +31,10 @@ extern "C" {
@@ -119,7 +119,7 @@ index b7496f9..620d9bd 100644
#ifdef _REGEX_LARGE_OFFSETS
diff --git a/lib/string.in.h b/lib/string.in.h
index b3213c4..657910a 100644
index aaff563..32fa98f 100644
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -37,6 +37,9 @@
@@ -133,30 +133,30 @@ index b3213c4..657910a 100644
#undef _GL_ALREADY_INCLUDING_STRING_H
--
2.10.2
2.14.2
From 074016eac630acde7f0c9f79b640eae9f295ea42 Mon Sep 17 00:00:00 2001
From c7af057601c8fa8f0dd152c10257b44ec132c1f9 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 15 May 2014 20:13:58 +0000
Subject: don't build hostid, uptime, nice, users, who, dd
diff --git a/Makefile.in b/Makefile.in
index ea37995..d97ab47 100644
index 521f293..5eb943a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1521,16 +1521,16 @@ nodist_src_libver_a_OBJECTS = src/version.$(OBJEXT)
@@ -1541,16 +1541,16 @@ nodist_src_libver_a_OBJECTS = src/version.$(OBJEXT)
src_libver_a_OBJECTS = $(nodist_src_libver_a_OBJECTS)
am__EXEEXT_1 = src/arch$(EXEEXT) src/coreutils$(EXEEXT) \
src/hostname$(EXEEXT)
-am__EXEEXT_2 = src/chroot$(EXEEXT) src/df$(EXEEXT) src/hostid$(EXEEXT) \
- src/libstdbuf.so$(EXEEXT) src/nice$(EXEEXT) src/pinky$(EXEEXT) \
- src/stdbuf$(EXEEXT) src/stty$(EXEEXT) src/uptime$(EXEEXT) \
+am__EXEEXT_2 = src/chroot$(EXEEXT) src/df$(EXEEXT) \
+ src/libstdbuf.so$(EXEEXT) \
+ src/stdbuf$(EXEEXT) src/stty$(EXEEXT) \
src/users$(EXEEXT) src/who$(EXEEXT)
src/stdbuf$(EXEEXT) src/stty$(EXEEXT) src/timeout$(EXEEXT) \
- src/uptime$(EXEEXT) src/users$(EXEEXT) src/who$(EXEEXT)
+ src/users$(EXEEXT) src/who$(EXEEXT)
am__EXEEXT_3 = src/[$(EXEEXT) src/b2sum$(EXEEXT) src/base64$(EXEEXT) \
src/base32$(EXEEXT) src/basename$(EXEEXT) src/cat$(EXEEXT) \
src/chcon$(EXEEXT) src/chgrp$(EXEEXT) src/chmod$(EXEEXT) \
@@ -167,20 +167,20 @@ index ea37995..d97ab47 100644
src/dircolors$(EXEEXT) src/dirname$(EXEEXT) src/du$(EXEEXT) \
src/echo$(EXEEXT) src/env$(EXEEXT) src/expand$(EXEEXT) \
src/expr$(EXEEXT) src/factor$(EXEEXT) src/false$(EXEEXT) \
@@ -4407,7 +4407,7 @@ WARN_ON_USE_H = lib/warn-on-use.h
@@ -4469,7 +4469,7 @@ WARN_ON_USE_H = $(top_srcdir)/lib/warn-on-use.h
# FIXME: once lib/ and gnulib-tests/ are also converted, hoist to Makefile.am
AM_CFLAGS = $(WERROR_CFLAGS)
no_install__progs = src/arch src/coreutils src/hostname
-build_if_possible__progs = src/chroot src/df src/hostid \
+build_if_possible__progs = src/chroot src/df \
src/libstdbuf.so src/nice src/pinky src/stdbuf src/stty \
src/uptime src/users src/who
src/timeout src/uptime src/users src/who
default__progs = src/[ src/b2sum src/base64 src/base32 src/basename \
--
2.10.2
2.14.2
From 2d94b239beac4ea7805e1154afdcab8751e8b081 Mon Sep 17 00:00:00 2001
From 4215e27a5cd2f0e04547345544301b7d85aba915 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 6 Feb 2015 20:24:12 +0000
Subject: import Haiku changes, fix warnings.
@@ -204,19 +204,19 @@ index 8865734..5bc8a54 100644
Specifying the System Type
==========================
diff --git a/lib/localcharset.c b/lib/localcharset.c
index b2a0369..7dcf3d9 100644
index 9b7e6cb..7f5d64f 100644
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -128,7 +128,7 @@ get_charset_aliases (void)
@@ -129,7 +129,7 @@ get_charset_aliases (void)
cp = charset_aliases;
if (cp == NULL)
{
-#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2)
+#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2 || defined __HAIKU__)
char *malloc_dir = NULL;
const char *dir;
const char *base = "charset.alias";
char *file_name;
@@ -372,6 +372,13 @@ get_charset_aliases (void)
@@ -376,6 +376,13 @@ get_charset_aliases (void)
"CP1386" "\0" "GBK" "\0"
"CP3372" "\0" "EUC-JP" "\0";
# endif
@@ -231,7 +231,7 @@ index b2a0369..7dcf3d9 100644
charset_aliases = cp;
diff --git a/src/copy.c b/src/copy.c
index b3acff3..013fc28 100644
index c4c5740..a35c3c5 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -18,6 +18,7 @@
@@ -242,7 +242,7 @@ index b3acff3..013fc28 100644
#include <assert.h>
#include <sys/ioctl.h>
#include <sys/types.h>
@@ -64,6 +65,10 @@
@@ -65,6 +66,10 @@
#include "yesno.h"
#include "selinux.h"
@@ -253,7 +253,7 @@ index b3acff3..013fc28 100644
#if USE_XATTR
# include <attr/error_context.h>
# include <attr/libattr.h>
@@ -589,6 +594,92 @@ is_ancestor (const struct stat *sb, const struct dir_list *ancestors)
@@ -591,6 +596,92 @@ is_ancestor (const struct stat *sb, const struct dir_list *ancestors)
return false;
}
@@ -346,7 +346,7 @@ index b3acff3..013fc28 100644
static bool
errno_unsupported (int err)
{
@@ -722,6 +813,10 @@ copy_dir (char const *src_name_in, char const *dst_name_in, bool new_dst,
@@ -724,6 +815,10 @@ copy_dir (char const *src_name_in, char const *dst_name_in, bool new_dst,
error (0, errno, _("cannot access %s"), quoteaf (src_name_in));
return false;
}
@@ -357,7 +357,7 @@ index b3acff3..013fc28 100644
/* For cp's -H option, dereference command line arguments, but do not
dereference symlinks that are found via recursive traversal. */
@@ -1390,6 +1485,11 @@ preserve_metadata:
@@ -1392,6 +1487,11 @@ preserve_metadata:
return_val = false;
}
}
@@ -369,7 +369,7 @@ index b3acff3..013fc28 100644
close_src_and_dst_desc:
if (close (dest_desc) < 0)
@@ -2320,6 +2420,12 @@ copy_internal (char const *src_name, char const *dst_name,
@@ -2313,6 +2413,12 @@ copy_internal (char const *src_name, char const *dst_name,
dereference))
goto un_backup;
@@ -382,7 +382,7 @@ index b3acff3..013fc28 100644
return true;
}
}
@@ -2721,6 +2827,11 @@ copy_internal (char const *src_name, char const *dst_name,
@@ -2729,6 +2835,11 @@ copy_internal (char const *src_name, char const *dst_name,
preserving owner/group is a potential security problem. */
}
}
@@ -395,7 +395,7 @@ index b3acff3..013fc28 100644
else
{
diff --git a/src/copy.h b/src/copy.h
index a516002..87ac381 100644
index c4bf23c..94eac15 100644
--- a/src/copy.h
+++ b/src/copy.h
@@ -187,6 +187,9 @@ struct cp_options
@@ -409,7 +409,7 @@ index a516002..87ac381 100644
Set this only if the kernel is SELinux enabled. */
bool preserve_security_context;
diff --git a/src/cp.c b/src/cp.c
index 1b528c6..e07f7a6 100644
index 6949a67..3e1bd67 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -74,6 +74,7 @@ struct dir_attr
@@ -436,7 +436,7 @@ index 1b528c6..e07f7a6 100644
-i, --interactive prompt before overwrite (overrides a previous -n\
\n\
option)\n\
@@ -790,6 +793,7 @@ cp_option_init (struct cp_options *x)
@@ -809,6 +812,7 @@ cp_option_init (struct cp_options *x)
x->data_copy_required = true;
x->require_preserve = false;
x->recursive = false;
@@ -444,7 +444,7 @@ index 1b528c6..e07f7a6 100644
x->sparse_mode = SPARSE_AUTO;
x->symbolic_link = false;
x->set_mode = false;
@@ -990,6 +994,10 @@ main (int argc, char **argv)
@@ -1010,6 +1014,10 @@ main (int argc, char **argv)
x.dereference = DEREF_COMMAND_LINE_ARGUMENTS;
break;
@@ -456,7 +456,7 @@ index 1b528c6..e07f7a6 100644
x.interactive = I_ASK_USER;
break;
diff --git a/src/dircolors.h b/src/dircolors.h
index f3f38a4..024b82b 100644
index 259336d..2529504 100644
--- a/src/dircolors.h
+++ b/src/dircolors.h
@@ -59,7 +59,7 @@ static char const G_line[] =
@@ -469,7 +469,7 @@ index f3f38a4..024b82b 100644
'#',' ','T','h','i','s',' ','i','s',' ','f','o','r',' ','f','i','l','e','s',' ','w','i','t','h',' ','e','x','e','c','u','t','e',' ','p','e','r','m','i','s','s','i','o','n',':',0,
'E','X','E','C',' ','0','1',';','3','2',0,
diff --git a/src/dircolors.hin b/src/dircolors.hin
index 3c00faf..031deae 100644
index fca51f2..83706ba 100644
--- a/src/dircolors.hin
+++ b/src/dircolors.hin
@@ -61,7 +61,7 @@ SETUID 37;41 # file that is setuid (u+s)
@@ -482,10 +482,10 @@ index 3c00faf..031deae 100644
# This is for files with execute permission:
diff --git a/src/ls.c b/src/ls.c
index f462e61..12984fa 100644
index 745c65f..dae5755 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -697,6 +697,11 @@ static struct ignore_pattern *hide_patterns;
@@ -708,6 +708,11 @@ static struct ignore_pattern *hide_patterns;
want to mess up the terminal if control chars get sent to it, and some
quoting methods pass through control chars as-is. */
static bool qmark_funny_chars;
@@ -497,7 +497,7 @@ index f462e61..12984fa 100644
/* Quoting options for file and dir name output. */
@@ -1655,7 +1660,7 @@ decode_switches (int argc, char **argv)
@@ -1684,7 +1689,7 @@ decode_switches (int argc, char **argv)
bool sort_type_specified = false;
bool kibibytes_specified = false;
@@ -506,7 +506,7 @@ index f462e61..12984fa 100644
/* initialize all switches to default settings */
@@ -1680,7 +1685,9 @@ decode_switches (int argc, char **argv)
@@ -1709,7 +1714,9 @@ decode_switches (int argc, char **argv)
format = many_per_line;
set_quoting_style (NULL, shell_escape_quoting_style);
/* See description of qmark_funny_chars, above. */
@@ -516,7 +516,7 @@ index f462e61..12984fa 100644
}
else
{
@@ -4054,6 +4061,7 @@ print_long_format (const struct fileinfo *f)
@@ -4122,6 +4129,7 @@ print_long_format (const struct fileinfo *f)
p = buf;
}
@@ -524,7 +524,7 @@ index f462e61..12984fa 100644
if (f->stat_ok
&& (S_ISCHR (f->stat.st_mode) || S_ISBLK (f->stat.st_mode)))
{
@@ -4070,6 +4078,7 @@ print_long_format (const struct fileinfo *f)
@@ -4138,6 +4146,7 @@ print_long_format (const struct fileinfo *f)
p += file_size_width + 1;
}
else
@@ -533,7 +533,7 @@ index f462e61..12984fa 100644
char hbuf[LONGEST_HUMAN_READABLE + 1];
char const *size =
diff --git a/src/mv.c b/src/mv.c
index 04d2be3..c6a14eb 100644
index fc1fca4..c9ec96e 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -126,6 +126,7 @@ cp_option_init (struct cp_options *x)
@@ -545,7 +545,7 @@ index 04d2be3..c6a14eb 100644
x->preserve_xattr = true;
x->require_preserve_xattr = false;
diff --git a/src/remove.c b/src/remove.c
index 7309f03..56c876f 100644
index 5ba19ee..4d5102c 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -214,7 +214,7 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir,
@@ -558,7 +558,7 @@ index 7309f03..56c876f 100644
if (0 <= write_protected && dirent_type == DT_UNKNOWN)
{
diff --git a/src/uname.c b/src/uname.c
index 6371ca2..0831319 100644
index 6378ab7..6954275 100644
--- a/src/uname.c
+++ b/src/uname.c
@@ -49,6 +49,10 @@
@@ -604,5 +604,5 @@ index 6371ca2..0831319 100644
print_element (element);
}
--
2.10.2
2.14.2