mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
coreutils: bump version
This commit is contained in:
@@ -5,12 +5,12 @@ arbitrary limits.
|
||||
|
||||
The programs that can be built with this package are:
|
||||
|
||||
[ arch base64 basename cat chcon chgrp chmod chown chroot cksum comm cp \
|
||||
[ arch base64 basename cat chgrp chmod chown chroot cksum comm cp \
|
||||
csplit cut date dd df dir dircolors dirname du echo env expand expr \
|
||||
factor false fmt fold groups head hostid hostname id install join kill \
|
||||
link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup \
|
||||
nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd readlink \
|
||||
realpath rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum \
|
||||
realpath rm rmdir seq sha1sum sha224sum sha256sum sha384sum sha512sum \
|
||||
shred shuf sleep sort split stat stdbuf stty sum sync tac tail tee test \
|
||||
timeout touch tr true truncate tsort tty uname unexpand uniq unlink \
|
||||
uptime users vdir wc who whoami yes"
|
||||
@@ -20,7 +20,7 @@ LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://ftpmirror.gnu.org/coreutils/coreutils-$portVersion.tar.xz
|
||||
https://ftp.gnu.org/gnu/coreutils/coreutils-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="7a0124327b398fd9eb1a6abde583389821422c744ffa10734b24f557610d3283"
|
||||
CHECKSUM_SHA256="19bcb6ca867183c57d77155eae946c5eced88183143b45ca51ad7d26c628ca75"
|
||||
PATCHES="coreutils-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
@@ -43,7 +43,6 @@ PROVIDES="
|
||||
cmd:basename$commandSuffix = $binVersionCompat
|
||||
cmd:basenc$commandSuffix = $binVersionCompat
|
||||
cmd:cat$commandSuffix = $binVersionCompat
|
||||
cmd:chcon$commandSuffix = $binVersionCompat
|
||||
cmd:chgrp$commandSuffix = $binVersionCompat
|
||||
cmd:chmod$commandSuffix = $binVersionCompat
|
||||
cmd:chown$commandSuffix = $binVersionCompat
|
||||
@@ -101,7 +100,6 @@ PROVIDES="
|
||||
cmd:realpath$commandSuffix = $binVersionCompat
|
||||
cmd:rm$commandSuffix = $binVersionCompat
|
||||
cmd:rmdir$commandSuffix = $binVersionCompat
|
||||
cmd:runcon$commandSuffix = $binVersionCompat
|
||||
cmd:seq$commandSuffix = $binVersionCompat
|
||||
cmd:sha1sum$commandSuffix = $binVersionCompat
|
||||
cmd:sha224sum$commandSuffix = $binVersionCompat
|
||||
@@ -172,7 +170,6 @@ defineDebugInfoPackage coreutils$secondaryArchSuffix \
|
||||
$commandBinDir/basename \
|
||||
$commandBinDir/basenc \
|
||||
$commandBinDir/cat \
|
||||
$commandBinDir/chcon \
|
||||
$commandBinDir/chgrp \
|
||||
$commandBinDir/chmod \
|
||||
$commandBinDir/chown \
|
||||
@@ -230,7 +227,6 @@ defineDebugInfoPackage coreutils$secondaryArchSuffix \
|
||||
$commandBinDir/realpath \
|
||||
$commandBinDir/rm \
|
||||
$commandBinDir/rmdir \
|
||||
$commandBinDir/runcon \
|
||||
$commandBinDir/seq \
|
||||
$commandBinDir/sha1sum \
|
||||
$commandBinDir/sha224sum \
|
||||
@@ -1,4 +1,4 @@
|
||||
From fc5ef7ecc71c18aaa1da346409ebf53c91c756b7 Mon Sep 17 00:00:00 2001
|
||||
From cad02d90d5d789d7fed678da3c9a2cdde6e7da8d 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
|
||||
@@ -19,10 +19,10 @@ index 0270bfd..36438dc 100644
|
||||
#include <fnmatch.h>
|
||||
|
||||
--
|
||||
2.45.2
|
||||
2.51.0
|
||||
|
||||
|
||||
From f6c057508406f3c9b4328a001b4da19883597701 Mon Sep 17 00:00:00 2001
|
||||
From 06bb6947c7888dbe75cdecedab4a17de324f501b 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
|
||||
@@ -42,10 +42,10 @@ index d7417bf..0a56cfe 100644
|
||||
# undef inet_ntop
|
||||
# define inet_ntop rpl_inet_ntop
|
||||
--
|
||||
2.45.2
|
||||
2.51.0
|
||||
|
||||
|
||||
From e903b1e42ee803c3a631ca37f5f580977675b341 Mon Sep 17 00:00:00 2001
|
||||
From c0de634e5440f083be9bd76893140ba7ba773833 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
|
||||
@@ -64,20 +64,20 @@ index cc2dfe5..28a2c8c 100644
|
||||
|
||||
#include <errno.h>
|
||||
--
|
||||
2.45.2
|
||||
2.51.0
|
||||
|
||||
|
||||
From 99d0930da42fe64bd361ce81b9d86336b0e97eeb Mon Sep 17 00:00:00 2001
|
||||
From 04ca63f414a974765ee6fb890c3c2dd697e68433 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 3376b73..adcf779 100644
|
||||
index 1a1e7fb..c12e50a 100644
|
||||
--- a/lib/mountlist.c
|
||||
+++ b/lib/mountlist.c
|
||||
@@ -1096,7 +1096,8 @@ read_file_system_list (bool need_fs_type)
|
||||
@@ -1292,7 +1292,8 @@ read_file_system_list (bool need_fs_type)
|
||||
return mount_list;
|
||||
|
||||
|
||||
@@ -87,7 +87,7 @@ index 3376b73..adcf779 100644
|
||||
{
|
||||
int saved_errno = errno;
|
||||
*mtail = NULL;
|
||||
@@ -1111,6 +1112,7 @@ read_file_system_list (bool need_fs_type)
|
||||
@@ -1307,6 +1308,7 @@ read_file_system_list (bool need_fs_type)
|
||||
errno = saved_errno;
|
||||
return NULL;
|
||||
}
|
||||
@@ -96,17 +96,17 @@ index 3376b73..adcf779 100644
|
||||
|
||||
/* Free a mount entry as returned from read_file_system_list (). */
|
||||
--
|
||||
2.45.2
|
||||
2.51.0
|
||||
|
||||
|
||||
From 482ff403cd056190491d88b854d64da1f72afd60 Mon Sep 17 00:00:00 2001
|
||||
From 4b4c6b8640ea0016238696332fe0c8e3534de16b 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 67a3aa7..079a3ce 100644
|
||||
index e9ab85e..c0eb2b1 100644
|
||||
--- a/lib/regex.h
|
||||
+++ b/lib/regex.h
|
||||
@@ -30,8 +30,10 @@ extern "C" {
|
||||
@@ -121,7 +121,7 @@ index 67a3aa7..079a3ce 100644
|
||||
#ifdef _REGEX_LARGE_OFFSETS
|
||||
|
||||
diff --git a/lib/string.in.h b/lib/string.in.h
|
||||
index ce48829..241e4c7 100644
|
||||
index fdcdd21..17c73ce 100644
|
||||
--- a/lib/string.in.h
|
||||
+++ b/lib/string.in.h
|
||||
@@ -37,6 +37,9 @@
|
||||
@@ -135,51 +135,51 @@ index ce48829..241e4c7 100644
|
||||
|
||||
#undef _@GUARD_PREFIX@_ALREADY_INCLUDING_STRING_H
|
||||
--
|
||||
2.45.2
|
||||
2.51.0
|
||||
|
||||
|
||||
From 80ba1951f510da7b2369df9c14ffdbdfa287459d Mon Sep 17 00:00:00 2001
|
||||
From 52292482f8d2431209387e7b92a6ec61ae5b728e 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, nice, users, who
|
||||
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index 6a4294a..738b32b 100644
|
||||
index 0a19863..ea71298 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -1206,8 +1206,8 @@ CONFIG_CLEAN_FILES =
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
@@ -1274,8 +1274,8 @@ CONFIG_CLEAN_VPATH_FILES =
|
||||
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) \
|
||||
+am__EXEEXT_2 = src/chroot$(EXEEXT) src/df$(EXEEXT) \
|
||||
am__EXEEXT_2 = src/chcon$(EXEEXT) src/chroot$(EXEEXT) src/df$(EXEEXT) \
|
||||
- src/hostid$(EXEEXT) src/libstdbuf.so$(EXEEXT) \
|
||||
- src/nice$(EXEEXT) src/pinky$(EXEEXT) src/runcon$(EXEEXT) \
|
||||
+ src/libstdbuf.so$(EXEEXT) \
|
||||
+ src/runcon$(EXEEXT) \
|
||||
src/stdbuf$(EXEEXT) src/stty$(EXEEXT) src/timeout$(EXEEXT) \
|
||||
src/users$(EXEEXT) src/who$(EXEEXT)
|
||||
am__EXEEXT_3 = src/[$(EXEEXT) src/b2sum$(EXEEXT) src/base64$(EXEEXT) \
|
||||
@@ -7399,7 +7399,7 @@ WARN_ON_USE_H = $(top_srcdir)/lib/warn-on-use.h
|
||||
@@ -7857,7 +7857,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/timeout src/users src/who
|
||||
-build_if_possible__progs = src/chcon src/chroot src/df src/hostid \
|
||||
+build_if_possible__progs = src/chcon src/chroot src/df \
|
||||
src/libstdbuf.so src/nice src/pinky src/runcon src/stdbuf \
|
||||
src/stty src/timeout src/users src/who
|
||||
default__progs = src/[ src/b2sum src/base64 src/base32 src/basenc \
|
||||
--
|
||||
2.45.2
|
||||
2.51.0
|
||||
|
||||
|
||||
From d2b5acefca4416f95accdeb4ae391d46554c6b68 Mon Sep 17 00:00:00 2001
|
||||
From 93e39d61231cbb4114e9f49c20bf7ca52e8c5ade 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.
|
||||
|
||||
|
||||
diff --git a/lib/localcharset.c b/lib/localcharset.c
|
||||
index 32f6f78..77d0076 100644
|
||||
index 79a55c5..24cdad6 100644
|
||||
--- a/lib/localcharset.c
|
||||
+++ b/lib/localcharset.c
|
||||
@@ -41,6 +41,13 @@
|
||||
@@ -197,7 +197,7 @@ index 32f6f78..77d0076 100644
|
||||
|
||||
#if !defined WINDOWS_NATIVE
|
||||
diff --git a/src/copy.c b/src/copy.c
|
||||
index 7ffb998..10e9740 100644
|
||||
index 4af66c8..624664c 100644
|
||||
--- a/src/copy.c
|
||||
+++ b/src/copy.c
|
||||
@@ -18,6 +18,7 @@
|
||||
@@ -208,7 +208,7 @@ index 7ffb998..10e9740 100644
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/types.h>
|
||||
#include <selinux/selinux.h>
|
||||
@@ -67,6 +68,10 @@
|
||||
@@ -63,6 +64,10 @@
|
||||
# define USE_XATTR false
|
||||
#endif
|
||||
|
||||
@@ -219,7 +219,7 @@ index 7ffb998..10e9740 100644
|
||||
#if USE_XATTR
|
||||
# include <attr/error_context.h>
|
||||
# include <attr/libattr.h>
|
||||
@@ -689,6 +694,92 @@ is_ancestor (const struct stat *sb, const struct dir_list *ancestors)
|
||||
@@ -256,6 +261,92 @@ is_ancestor (const struct stat *sb, const struct dir_list *ancestors)
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -312,7 +312,7 @@ index 7ffb998..10e9740 100644
|
||||
static bool
|
||||
errno_unsupported (int err)
|
||||
{
|
||||
@@ -832,6 +923,10 @@ copy_dir (char const *src_name_in, char const *dst_name_in,
|
||||
@@ -399,6 +490,10 @@ copy_dir (char const *src_name_in, char const *dst_name_in,
|
||||
error (0, errno, _("cannot access %s"), quoteaf (src_name_in));
|
||||
return false;
|
||||
}
|
||||
@@ -323,7 +323,7 @@ index 7ffb998..10e9740 100644
|
||||
|
||||
/* For cp's -H option, dereference command line arguments, but do not
|
||||
dereference symlinks that are found via recursive traversal. */
|
||||
@@ -1529,6 +1624,11 @@ copy_reg (char const *src_name, char const *dst_name,
|
||||
@@ -1034,6 +1129,11 @@ copy_reg (char const *src_name, char const *dst_name,
|
||||
return_val = false;
|
||||
goto close_src_and_dst_desc;
|
||||
}
|
||||
@@ -335,7 +335,7 @@ index 7ffb998..10e9740 100644
|
||||
|
||||
/* If extra permissions needed for copy_xattr didn't happen (e.g.,
|
||||
due to umask) chmod to add them temporarily; if that fails give
|
||||
@@ -2708,6 +2808,12 @@ skip:
|
||||
@@ -2143,6 +2243,12 @@ skip:
|
||||
true, x->verbose, dereference))
|
||||
goto un_backup;
|
||||
|
||||
@@ -348,7 +348,7 @@ index 7ffb998..10e9740 100644
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -3159,6 +3265,11 @@ skip:
|
||||
@@ -2594,6 +2700,11 @@ skip:
|
||||
preserving owner/group is a potential security problem. */
|
||||
}
|
||||
}
|
||||
@@ -361,7 +361,7 @@ index 7ffb998..10e9740 100644
|
||||
else
|
||||
{
|
||||
diff --git a/src/copy.h b/src/copy.h
|
||||
index 35068ea..1c6fbd0 100644
|
||||
index 1f2b2bb..61f6294 100644
|
||||
--- a/src/copy.h
|
||||
+++ b/src/copy.h
|
||||
@@ -208,6 +208,9 @@ struct cp_options
|
||||
@@ -375,7 +375,7 @@ index 35068ea..1c6fbd0 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 a0ec067..88dcf5a 100644
|
||||
index 317d667..164f13c 100644
|
||||
--- a/src/cp.c
|
||||
+++ b/src/cp.c
|
||||
@@ -60,6 +60,7 @@ struct dir_attr
|
||||
@@ -422,10 +422,10 @@ index a0ec067..88dcf5a 100644
|
||||
x.interactive = I_ASK_USER;
|
||||
break;
|
||||
diff --git a/src/dircolors.h b/src/dircolors.h
|
||||
index 76e42e2..702fbcc 100644
|
||||
index 1907b03..9b48d8c 100644
|
||||
--- a/src/dircolors.h
|
||||
+++ b/src/dircolors.h
|
||||
@@ -71,7 +71,7 @@ static char const G_line[] =
|
||||
@@ -72,7 +72,7 @@ static char const G_line[] =
|
||||
'S','E','T','G','I','D',' ','3','0',';','4','3',' ','#',' ','r','e','g','u','l','a','r',' ','f','i','l','e',' ','t','h','a','t',' ','i','s',' ','s','e','t','g','i','d',' ','(','g','+','s',')',0,
|
||||
'C','A','P','A','B','I','L','I','T','Y',' ','0','0',' ','#',' ','r','e','g','u','l','a','r',' ','f','i','l','e',' ','w','i','t','h',' ','c','a','p','a','b','i','l','i','t','y',' ','(','v','e','r','y',' ','e','x','p','e','n','s','i','v','e',' ','t','o',' ','l','o','o','k','u','p',')',0,
|
||||
'S','T','I','C','K','Y','_','O','T','H','E','R','_','W','R','I','T','A','B','L','E',' ','3','0',';','4','2',' ','#',' ','d','i','r',' ','t','h','a','t',' ','i','s',' ','s','t','i','c','k','y',' ','a','n','d',' ','o','t','h','e','r','-','w','r','i','t','a','b','l','e',' ','(','+','t',',','o','+','w',')',0,
|
||||
@@ -435,10 +435,10 @@ index 76e42e2..702fbcc 100644
|
||||
'#',' ','T','h','i','s',' ','i','s',' ','f','o','r',' ','r','e','g','u','l','a','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 0e4e321..ce2616e 100644
|
||||
index ac57522..86de811 100644
|
||||
--- a/src/dircolors.hin
|
||||
+++ b/src/dircolors.hin
|
||||
@@ -74,7 +74,7 @@ SETUID 37;41 # regular file that is setuid (u+s)
|
||||
@@ -75,7 +75,7 @@ SETUID 37;41 # regular file that is setuid (u+s)
|
||||
SETGID 30;43 # regular file that is setgid (g+s)
|
||||
CAPABILITY 00 # regular file with capability (very expensive to lookup)
|
||||
STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
|
||||
@@ -448,10 +448,10 @@ index 0e4e321..ce2616e 100644
|
||||
|
||||
# This is for regular files with execute permission:
|
||||
diff --git a/src/ls.c b/src/ls.c
|
||||
index 3215360..83c2a88 100644
|
||||
index 7144d0d..faa77c9 100644
|
||||
--- a/src/ls.c
|
||||
+++ b/src/ls.c
|
||||
@@ -748,6 +748,11 @@ static struct ignore_pattern *hide_patterns;
|
||||
@@ -747,6 +747,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;
|
||||
@@ -463,7 +463,7 @@ index 3215360..83c2a88 100644
|
||||
|
||||
/* Quoting options for file and dir name output. */
|
||||
|
||||
@@ -4393,6 +4398,7 @@ print_long_format (const struct fileinfo *f)
|
||||
@@ -4392,6 +4397,7 @@ print_long_format (const struct fileinfo *f)
|
||||
p = buf;
|
||||
}
|
||||
|
||||
@@ -471,8 +471,8 @@ index 3215360..83c2a88 100644
|
||||
if (f->stat_ok
|
||||
&& (S_ISCHR (f->stat.st_mode) || S_ISBLK (f->stat.st_mode)))
|
||||
{
|
||||
@@ -4408,6 +4414,7 @@ print_long_format (const struct fileinfo *f)
|
||||
umaxtostr (minor (f->stat.st_rdev), minorbuf));
|
||||
@@ -4405,6 +4411,7 @@ print_long_format (const struct fileinfo *f)
|
||||
(uintmax_t) minor (f->stat.st_rdev));
|
||||
}
|
||||
else
|
||||
+#endif
|
||||
@@ -492,7 +492,7 @@ index cf1ac56..4802224 100644
|
||||
x->preserve_xattr = true;
|
||||
x->require_preserve_xattr = false;
|
||||
diff --git a/src/remove.c b/src/remove.c
|
||||
index 079b00f..18e6644 100644
|
||||
index 86226b1..9935055 100644
|
||||
--- a/src/remove.c
|
||||
+++ b/src/remove.c
|
||||
@@ -218,7 +218,7 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir,
|
||||
@@ -551,10 +551,10 @@ index 96c532b..63067e9 100644
|
||||
print_element (element);
|
||||
}
|
||||
--
|
||||
2.45.2
|
||||
2.51.0
|
||||
|
||||
|
||||
From 3cbbd1a375e0b9e64ad21bbb1bb0959ab3929f25 Mon Sep 17 00:00:00 2001
|
||||
From 843c5d641aea59c409163df3f671309211dfb22a Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Mon, 1 Nov 2021 21:08:55 +0100
|
||||
Subject: ln: handle negative errno
|
||||
@@ -562,10 +562,10 @@ Subject: ln: handle negative errno
|
||||
explicit check for -1 which is a special value in this code.
|
||||
|
||||
diff --git a/src/copy.c b/src/copy.c
|
||||
index 10e9740..33c145c 100644
|
||||
index 624664c..376edd7 100644
|
||||
--- a/src/copy.c
|
||||
+++ b/src/copy.c
|
||||
@@ -2222,7 +2222,7 @@ create_hard_link (char const *src_name, int src_dirfd, char const *src_relname,
|
||||
@@ -1657,7 +1657,7 @@ create_hard_link (char const *src_name, int src_dirfd, char const *src_relname,
|
||||
int err = force_linkat (src_dirfd, src_relname, dst_dirfd, dst_relname,
|
||||
dereference ? AT_SYMLINK_FOLLOW : 0,
|
||||
replace, -1);
|
||||
@@ -574,7 +574,7 @@ index 10e9740..33c145c 100644
|
||||
{
|
||||
|
||||
char *a_src_name = nullptr;
|
||||
@@ -2234,7 +2234,7 @@ create_hard_link (char const *src_name, int src_dirfd, char const *src_relname,
|
||||
@@ -1669,7 +1669,7 @@ create_hard_link (char const *src_name, int src_dirfd, char const *src_relname,
|
||||
free (a_src_name);
|
||||
return false;
|
||||
}
|
||||
@@ -583,7 +583,7 @@ index 10e9740..33c145c 100644
|
||||
printf (_("removed %s\n"), quoteaf (dst_name));
|
||||
return true;
|
||||
}
|
||||
@@ -3127,7 +3127,7 @@ skip:
|
||||
@@ -2562,7 +2562,7 @@ skip:
|
||||
|
||||
int err = force_symlinkat (src_name, dst_dirfd, dst_relname,
|
||||
x->unlink_dest_after_failed_open, -1);
|
||||
@@ -592,7 +592,7 @@ index 10e9740..33c145c 100644
|
||||
{
|
||||
error (0, err, _("cannot create symbolic link %s to %s"),
|
||||
quoteaf_n (0, dst_name), quoteaf_n (1, src_name));
|
||||
@@ -3214,7 +3214,7 @@ skip:
|
||||
@@ -2649,7 +2649,7 @@ skip:
|
||||
|
||||
int symlink_err = force_symlinkat (src_link_val, dst_dirfd, dst_relname,
|
||||
x->unlink_dest_after_failed_open, -1);
|
||||
@@ -601,7 +601,7 @@ index 10e9740..33c145c 100644
|
||||
&& !new_dst && S_ISLNK (dst_sb.st_mode)
|
||||
&& dst_sb.st_size == strlen (src_link_val))
|
||||
{
|
||||
@@ -3232,7 +3232,7 @@ skip:
|
||||
@@ -2667,7 +2667,7 @@ skip:
|
||||
}
|
||||
}
|
||||
free (src_link_val);
|
||||
@@ -611,7 +611,7 @@ index 10e9740..33c145c 100644
|
||||
error (0, symlink_err, _("cannot create symbolic link %s"),
|
||||
quoteaf (dst_name));
|
||||
diff --git a/src/ln.c b/src/ln.c
|
||||
index 76ffc49..2e5a143 100644
|
||||
index 7a366bc..3590e5f 100644
|
||||
--- a/src/ln.c
|
||||
+++ b/src/ln.c
|
||||
@@ -152,7 +152,7 @@ convert_abs_rel (char const *from, char const *target)
|
||||
@@ -650,7 +650,7 @@ index 76ffc49..2e5a143 100644
|
||||
{
|
||||
/* Right after creating a hard link, do this: (note dest name and
|
||||
source_stats, which are also the just-linked-destinations stats) */
|
||||
@@ -391,7 +391,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
|
||||
@@ -404,7 +404,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
|
||||
|
||||
free (backup_base);
|
||||
free (rel_source);
|
||||
@@ -660,33 +660,33 @@ index 76ffc49..2e5a143 100644
|
||||
fail:
|
||||
free (rel_source);
|
||||
--
|
||||
2.45.2
|
||||
2.51.0
|
||||
|
||||
|
||||
From d556560e8b6a7fc6f95ae95b3ce229c9f0b3ff8c Mon Sep 17 00:00:00 2001
|
||||
From 2e61df991a91b21b41cbf20d677d72aaa3aa4b48 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Tue, 16 Nov 2021 10:22:30 +0100
|
||||
Subject: uptime: make utmp error not critical
|
||||
|
||||
|
||||
diff --git a/src/uptime.c b/src/uptime.c
|
||||
index 63b3551..5437116 100644
|
||||
index 0faaf06..16ee50f 100644
|
||||
--- a/src/uptime.c
|
||||
+++ b/src/uptime.c
|
||||
@@ -45,7 +45,7 @@ print_uptime (idx_t n, struct gl_utmp const *utmp_buf)
|
||||
@@ -45,7 +45,7 @@ print_uptime (idx_t n, STRUCT_UTMP const *utmp_buf)
|
||||
/* Loop through all the utmp entries we just read and count up the valid
|
||||
ones, also in the process possibly gleaning boottime. */
|
||||
idx_t entries = 0;
|
||||
- for (idx_t i = 0; i < n; i++)
|
||||
+ for (idx_t i = 0; utmp_buf && i < n; i++)
|
||||
{
|
||||
struct gl_utmp const *this = &utmp_buf[i];
|
||||
STRUCT_UTMP const *this = &utmp_buf[i];
|
||||
entries += IS_USER_PROCESS (this);
|
||||
--
|
||||
2.45.2
|
||||
2.51.0
|
||||
|
||||
|
||||
From 63e542c0689d44ca86430ed69a0a60a68581157d Mon Sep 17 00:00:00 2001
|
||||
From 259156aa351b093f7222aacf149a3df48187b236 Mon Sep 17 00:00:00 2001
|
||||
From: PulkoMandy <pulkomandy@pulkomandy.tk>
|
||||
Date: Fri, 30 Jun 2023 20:14:30 +0200
|
||||
Subject: stty: fix sign extension in check_speed
|
||||
@@ -696,10 +696,10 @@ expansion. So, if you set a speed_t to -1, it is converted to 255 and
|
||||
doesn't compare equal to -1.
|
||||
|
||||
diff --git a/src/stty.c b/src/stty.c
|
||||
index 133b33c..f19f4b5 100644
|
||||
index 919e32b..2db1c8e 100644
|
||||
--- a/src/stty.c
|
||||
+++ b/src/stty.c
|
||||
@@ -2076,7 +2076,7 @@ display_all (struct termios *mode, char const *device_name)
|
||||
@@ -2074,7 +2074,7 @@ display_all (struct termios *mode, char const *device_name)
|
||||
static void
|
||||
check_speed (struct termios *mode)
|
||||
{
|
||||
@@ -709,5 +709,5 @@ index 133b33c..f19f4b5 100644
|
||||
if (cfgetispeed (mode) != last_ibaud
|
||||
|| cfgetospeed (mode) != last_obaud)
|
||||
--
|
||||
2.45.2
|
||||
2.51.0
|
||||
|
||||
Reference in New Issue
Block a user