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
2022-09-21 20:57:03 +02:00
parent 71b3466d19
commit b6ae6333c0
2 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sys-apps/coreutils/coreutils-9.0.recipe → sys-apps/coreutils/coreutils-9.1.recipe
View File

@@ -17,10 +17,10 @@ uptime users vdir wc who whoami yes"
HOMEPAGE="https://www.gnu.org/software/coreutils/"
COPYRIGHT="1994-2017 Free Software Foundation, Inc."
LICENSE="GNU GPL v3"
REVISION="6"
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="ce30acdf4a41bc5bb30dd955e9eaa75fa216b4e3deb08889ed32433c7b3b97ce"
CHECKSUM_SHA256="61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423"
PATCHES="coreutils-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"

150
sys-apps/coreutils/patches/coreutils-9.0.patchset → sys-apps/coreutils/patches/coreutils-9.1.patchset
View File

@@ -1,11 +1,11 @@
From f4cebd00212260f57eb61458fd39668f97621ce0 Mon Sep 17 00:00:00 2001
From e5e1815a0af4280c4d2176e9ba95efb5e32e2cae 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 b8a71f1..0dc18c7 100644
index b33a127..a84975d 100644
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -23,6 +23,9 @@
@@ -22,14 +22,14 @@ index b8a71f1..0dc18c7 100644
2.30.2
From 7166a522bd4bc179519fa4dbc54584a71df131db Mon Sep 17 00:00:00 2001
From 7be9386aca21161cfe5b9ea969b7043aa3d7b582 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 9968067..ad11a60 100644
index f5d7db2..96399e2 100644
--- a/lib/arpa_inet.in.h
+++ b/lib/arpa_inet.in.h
@@ -78,7 +78,7 @@
@@ -45,14 +45,14 @@ index 9968067..ad11a60 100644
2.30.2
From 3f890e14e94eed728d7bfe47f3cf5ffb3b6fbedd Mon Sep 17 00:00:00 2001
From 4cb50474e898d22a044c7558e9305eec934404ac 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 c54e60c..018ed23 100644
index 3627ee3..56d7866 100644
--- a/lib/mknod.c
+++ b/lib/mknod.c
@@ -18,6 +18,7 @@
@@ -67,14 +67,14 @@ index c54e60c..018ed23 100644
2.30.2
From 921e841dc52b6821052c4a635b9b8a2e7e3e7356 Mon Sep 17 00:00:00 2001
From a412c27a91c895540e340a05f147fbdbbdc5965d 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 352b35f..7514f57 100644
index fac5c45..1c2812a 100644
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -1089,7 +1089,8 @@ read_file_system_list (bool need_fs_type)
@@ -99,14 +99,14 @@ index 352b35f..7514f57 100644
2.30.2
From 48ac0174b030f909a4ff706249692d0d6803ae83 Mon Sep 17 00:00:00 2001
From 408e4290cd364356e97edf9304a5cf238a5a61da 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 adb6976..3aefdd9 100644
index a7e0bd0..691334a 100644
--- a/lib/regex.h
+++ b/lib/regex.h
@@ -30,8 +30,10 @@ extern "C" {
@@ -121,7 +121,7 @@ index adb6976..3aefdd9 100644
#ifdef _REGEX_LARGE_OFFSETS
diff --git a/lib/string.in.h b/lib/string.in.h
index 8d77ae3..892640b 100644
index c943294..26f556b 100644
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -37,6 +37,9 @@
@@ -138,17 +138,17 @@ index 8d77ae3..892640b 100644
2.30.2
From 67f9206d4658a42d5f46483d400eae8852c64294 Mon Sep 17 00:00:00 2001
From 70f9f980cb41d00f338d9968b3221503918f4edf 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 b42c218..34c917e 100644
index 6011805..fb6146d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -944,8 +944,8 @@ CONFIG_CLEAN_FILES =
@@ -1145,8 +1145,8 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__EXEEXT_1 = src/arch$(EXEEXT) src/coreutils$(EXEEXT) \
src/hostname$(EXEEXT)
@@ -159,7 +159,7 @@ index b42c218..34c917e 100644
src/stdbuf$(EXEEXT) src/stty$(EXEEXT) src/timeout$(EXEEXT) \
src/uptime$(EXEEXT) src/users$(EXEEXT) src/who$(EXEEXT)
am__EXEEXT_3 = src/[$(EXEEXT) src/b2sum$(EXEEXT) src/base64$(EXEEXT) \
@@ -5715,7 +5715,7 @@ WARN_ON_USE_H = $(top_srcdir)/lib/warn-on-use.h
@@ -6589,7 +6589,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
@@ -172,7 +172,7 @@ index b42c218..34c917e 100644
2.30.2
From d19184fd828775f44f397f51d150d145ab577106 Mon Sep 17 00:00:00 2001
From 4024d54f8c1bf10cb4bc8819ff2dec64ec5ba4d3 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.
@@ -196,7 +196,7 @@ index e82fd21..771315d 100644
Specifying the System Type
==========================
diff --git a/lib/localcharset.c b/lib/localcharset.c
index 3c50858..5777260 100644
index 17a4a1e..1fbd2d3 100644
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -41,6 +41,13 @@
@@ -214,7 +214,7 @@ index 3c50858..5777260 100644
#if !defined WINDOWS_NATIVE
diff --git a/src/copy.c b/src/copy.c
index cb9018f..495831e 100644
index b15d919..2b1549a 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -18,6 +18,7 @@
@@ -225,9 +225,9 @@ index cb9018f..495831e 100644
#include <assert.h>
#include <sys/ioctl.h>
#include <sys/types.h>
@@ -66,6 +67,10 @@
#include "xstrtol.h"
#include "selinux.h"
@@ -69,6 +70,10 @@
# define USE_XATTR false
#endif
+#if (defined(__BEOS__) || defined(__HAIKU__))
+# include <fs_attr.h>
@@ -236,7 +236,7 @@ index cb9018f..495831e 100644
#if USE_XATTR
# include <attr/error_context.h>
# include <attr/libattr.h>
@@ -664,6 +669,92 @@ is_ancestor (const struct stat *sb, const struct dir_list *ancestors)
@@ -601,6 +606,92 @@ is_ancestor (const struct stat *sb, const struct dir_list *ancestors)
return false;
}
@@ -329,7 +329,7 @@ index cb9018f..495831e 100644
static bool
errno_unsupported (int err)
{
@@ -797,6 +888,10 @@ copy_dir (char const *src_name_in, char const *dst_name_in, bool new_dst,
@@ -744,6 +835,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;
}
@@ -340,7 +340,7 @@ index cb9018f..495831e 100644
/* For cp's -H option, dereference command line arguments, but do not
dereference symlinks that are found via recursive traversal. */
@@ -1488,6 +1583,11 @@ copy_reg (char const *src_name, char const *dst_name,
@@ -1447,6 +1542,11 @@ copy_reg (char const *src_name, char const *dst_name,
return_val = false;
}
}
@@ -352,8 +352,8 @@ index cb9018f..495831e 100644
close_src_and_dst_desc:
if (close (dest_desc) < 0)
@@ -2465,6 +2565,12 @@ copy_internal (char const *src_name, char const *dst_name,
dereference))
@@ -2468,6 +2568,12 @@ copy_internal (char const *src_name, char const *dst_name,
true, x->verbose, dereference))
goto un_backup;
+ if (x->ignore_attributes == 0
@@ -365,7 +365,7 @@ index cb9018f..495831e 100644
return true;
}
}
@@ -2883,6 +2989,11 @@ copy_internal (char const *src_name, char const *dst_name,
@@ -2900,6 +3006,11 @@ copy_internal (char const *src_name, char const *dst_name,
preserving owner/group is a potential security problem. */
}
}
@@ -378,7 +378,7 @@ index cb9018f..495831e 100644
else
{
diff --git a/src/copy.h b/src/copy.h
index 68d52e1..2da80a8 100644
index 1f1de86..f8365cf 100644
--- a/src/copy.h
+++ b/src/copy.h
@@ -189,6 +189,9 @@ struct cp_options
@@ -392,10 +392,10 @@ index 68d52e1..2da80a8 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 c97a675..4050cba 100644
index 0f44b35..31f5764 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -64,6 +64,7 @@ struct dir_attr
@@ -61,6 +61,7 @@ struct dir_attr
enum
{
ATTRIBUTES_ONLY_OPTION = CHAR_MAX + 1,
@@ -403,7 +403,7 @@ index c97a675..4050cba 100644
COPY_CONTENTS_OPTION,
NO_PRESERVE_ATTRIBUTES_OPTION,
PARENTS_OPTION,
@@ -112,6 +113,7 @@ static struct option const long_opts[] =
@@ -109,6 +110,7 @@ static struct option const long_opts[] =
{"copy-contents", no_argument, NULL, COPY_CONTENTS_OPTION},
{"dereference", no_argument, NULL, 'L'},
{"force", no_argument, NULL, 'f'},
@@ -411,7 +411,7 @@ index c97a675..4050cba 100644
{"interactive", no_argument, NULL, 'i'},
{"link", no_argument, NULL, 'l'},
{"no-clobber", no_argument, NULL, 'n'},
@@ -170,6 +172,7 @@ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\
@@ -167,6 +169,7 @@ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\
-f, --force if an existing destination file cannot be\n\
opened, remove it and try again (this option\n\
is ignored when the -n option is also used)\n\
@@ -419,7 +419,7 @@ index c97a675..4050cba 100644
-i, --interactive prompt before overwrite (overrides a previous -n\
\n\
option)\n\
@@ -814,6 +817,7 @@ cp_option_init (struct cp_options *x)
@@ -812,6 +815,7 @@ cp_option_init (struct cp_options *x)
x->data_copy_required = true;
x->require_preserve = false;
x->recursive = false;
@@ -427,7 +427,7 @@ index c97a675..4050cba 100644
x->sparse_mode = SPARSE_AUTO;
x->symbolic_link = false;
x->set_mode = false;
@@ -1015,6 +1019,10 @@ main (int argc, char **argv)
@@ -1013,6 +1017,10 @@ main (int argc, char **argv)
x.dereference = DEREF_COMMAND_LINE_ARGUMENTS;
break;
@@ -439,12 +439,12 @@ index c97a675..4050cba 100644
x.interactive = I_ASK_USER;
break;
diff --git a/src/dircolors.h b/src/dircolors.h
index c06ecb7..6c059c4 100644
index abe1a1f..1972483 100644
--- a/src/dircolors.h
+++ b/src/dircolors.h
@@ -62,7 +62,7 @@ static char const G_line[] =
@@ -64,7 +64,7 @@ static char const G_line[] =
'S','E','T','G','I','D',' ','3','0',';','4','3',' ','#',' ','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',' ','3','0',';','4','1',' ','#',' ','f','i','l','e',' ','w','i','t','h',' ','c','a','p','a','b','i','l','i','t','y',0,
'C','A','P','A','B','I','L','I','T','Y',' ','0','0',' ','#',' ','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,
- 'O','T','H','E','R','_','W','R','I','T','A','B','L','E',' ','3','4',';','4','2',' ','#',' ','d','i','r',' ','t','h','a','t',' ','i','s',' ','o','t','h','e','r','-','w','r','i','t','a','b','l','e',' ','(','o','+','w',')',' ','a','n','d',' ','n','o','t',' ','s','t','i','c','k','y',0,
+ 'O','T','H','E','R','_','W','R','I','T','A','B','L','E',' ','3','4',';','4','3',' ','#',' ','d','i','r',' ','t','h','a','t',' ','i','s',' ','o','t','h','e','r','-','w','r','i','t','a','b','l','e',' ','(','o','+','w',')',' ','a','n','d',' ','n','o','t',' ','s','t','i','c','k','y',0,
@@ -452,12 +452,12 @@ index c06ecb7..6c059c4 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 b5d6452..6352dea 100644
index f117359..e189948 100644
--- a/src/dircolors.hin
+++ b/src/dircolors.hin
@@ -64,7 +64,7 @@ SETUID 37;41 # file that is setuid (u+s)
@@ -67,7 +67,7 @@ SETUID 37;41 # file that is setuid (u+s)
SETGID 30;43 # file that is setgid (g+s)
CAPABILITY 30;41 # file with capability
CAPABILITY 00 # file with capability (very expensive to lookup)
STICKY_OTHER_WRITABLE 30;42 # dir that is sticky and other-writable (+t,o+w)
-OTHER_WRITABLE 34;42 # dir that is other-writable (o+w) and not sticky
+OTHER_WRITABLE 34;43 # dir that is other-writable (o+w) and not sticky
@@ -465,7 +465,7 @@ index b5d6452..6352dea 100644
# This is for files with execute permission:
diff --git a/src/ls.c b/src/ls.c
index 1047801..fc33bff 100644
index d15a103..de10484 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -719,6 +719,11 @@ static struct ignore_pattern *hide_patterns;
@@ -480,7 +480,7 @@ index 1047801..fc33bff 100644
/* Quoting options for file and dir name output. */
@@ -4395,6 +4400,7 @@ print_long_format (const struct fileinfo *f)
@@ -4400,6 +4405,7 @@ print_long_format (const struct fileinfo *f)
p = buf;
}
@@ -488,7 +488,7 @@ index 1047801..fc33bff 100644
if (f->stat_ok
&& (S_ISCHR (f->stat.st_mode) || S_ISBLK (f->stat.st_mode)))
{
@@ -4410,6 +4416,7 @@ print_long_format (const struct fileinfo *f)
@@ -4415,6 +4421,7 @@ print_long_format (const struct fileinfo *f)
umaxtostr (minor (f->stat.st_rdev), minorbuf));
}
else
@@ -497,10 +497,10 @@ index 1047801..fc33bff 100644
char hbuf[LONGEST_HUMAN_READABLE + 1];
char const *size =
diff --git a/src/mv.c b/src/mv.c
index 7d81b59..2fa32c1 100644
index 53b9c13..8d8c7be 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -129,6 +129,7 @@ cp_option_init (struct cp_options *x)
@@ -127,6 +127,7 @@ cp_option_init (struct cp_options *x)
x->reduce_diagnostics = false;
x->data_copy_required = true;
x->require_preserve = false; /* FIXME: maybe make this an option */
@@ -509,7 +509,7 @@ index 7d81b59..2fa32c1 100644
x->preserve_xattr = true;
x->require_preserve_xattr = false;
diff --git a/src/remove.c b/src/remove.c
index 5dd0479..457b8f4 100644
index b5d1ea8..f3b3a6b 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -215,7 +215,7 @@ prompt (FTS const *fts, FTSENT const *ent, bool is_dir,
@@ -522,11 +522,11 @@ index 5dd0479..457b8f4 100644
if (0 <= write_protected && dirent_type == DT_UNKNOWN)
{
diff --git a/src/uname.c b/src/uname.c
index ae9b8e2..2c551af 100644
index 385674f..cdb9e81 100644
--- a/src/uname.c
+++ b/src/uname.c
@@ -49,6 +49,10 @@
# include <mach-o/arch.h>
@@ -44,6 +44,10 @@
# endif
#endif
+#ifdef __HAIKU__
@@ -536,8 +536,8 @@ index ae9b8e2..2c551af 100644
#include "system.h"
#include "die.h"
#include "error.h"
@@ -338,6 +342,30 @@ main (int argc, char **argv)
# endif
@@ -341,6 +345,30 @@ main (int argc, char **argv)
element = processor;
}
#endif
+
@@ -571,7 +571,7 @@ index ae9b8e2..2c551af 100644
2.30.2
From 1990ba710bdfd4ab907bea396d2b3be3d1dc2f0a Mon Sep 17 00:00:00 2001
From 01549c096a5b86c11402f63e616a5195cc9509ec Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 21 Oct 2021 20:28:22 +0200
Subject: config.h is required for stdint.h
@@ -590,7 +590,7 @@ index 20a1e41..fdf2fdf 100644
2.30.2
From 2964f144f60577b518e17857df5f2137a0b39fda Mon Sep 17 00:00:00 2001
From 98f0505371e0b0e9626897ec20c4a4a097224659 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
@@ -598,18 +598,20 @@ 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 495831e..2e45278 100644
index 2b1549a..74cda27 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -2002,13 +2002,13 @@ create_hard_link (char const *src_name, char const *dst_name,
int err = force_linkat (AT_FDCWD, src_name, AT_FDCWD, dst_name,
@@ -1966,7 +1966,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);
- if (0 < err)
+ if (err != 0 && err != -1)
{
error (0, err, _("cannot create hard link %s to %s"),
quoteaf_n (0, dst_name), quoteaf_n (1, src_name));
char *a_src_name = NULL;
@@ -1978,7 +1978,7 @@ create_hard_link (char const *src_name, int src_dirfd, char const *src_relname,
free (a_src_name);
return false;
}
- if (err < 0 && verbose)
@@ -617,18 +619,18 @@ index 495831e..2e45278 100644
printf (_("removed %s\n"), quoteaf (dst_name));
return true;
}
@@ -2858,7 +2858,7 @@ copy_internal (char const *src_name, char const *dst_name,
@@ -2869,7 +2869,7 @@ copy_internal (char const *src_name, char const *dst_name,
int err = force_symlinkat (src_name, AT_FDCWD, dst_name,
int err = force_symlinkat (src_name, dst_dirfd, dst_relname,
x->unlink_dest_after_failed_open, -1);
- if (0 < err)
+ if (err != 0 && err != -1)
{
error (0, err, _("cannot create symbolic link %s to %s"),
quoteaf_n (0, dst_name), quoteaf_n (1, src_name));
@@ -2941,7 +2941,8 @@ copy_internal (char const *src_name, char const *dst_name,
@@ -2956,7 +2956,8 @@ copy_internal (char const *src_name, char const *dst_name,
int symlink_err = force_symlinkat (src_link_val, AT_FDCWD, dst_name,
int symlink_err = force_symlinkat (src_link_val, dst_dirfd, dst_relname,
x->unlink_dest_after_failed_open, -1);
- if (0 < symlink_err && x->update && !new_dst && S_ISLNK (dst_sb.st_mode)
+ if (symlink_err != 0 && symlink_err != -1 && x->update && !new_dst
@@ -636,7 +638,7 @@ index 495831e..2e45278 100644
&& dst_sb.st_size == strlen (src_link_val))
{
/* See if the destination is already the desired symlink.
@@ -2958,7 +2959,7 @@ copy_internal (char const *src_name, char const *dst_name,
@@ -2973,7 +2974,7 @@ copy_internal (char const *src_name, char const *dst_name,
}
}
free (src_link_val);
@@ -646,10 +648,10 @@ index 495831e..2e45278 100644
error (0, symlink_err, _("cannot create symbolic link %s"),
quoteaf (dst_name));
diff --git a/src/ln.c b/src/ln.c
index c7eb740..dde3e4b 100644
index bb46958..4cfa36e 100644
--- a/src/ln.c
+++ b/src/ln.c
@@ -160,7 +160,7 @@ convert_abs_rel (char const *from, char const *target)
@@ -154,7 +154,7 @@ convert_abs_rel (char const *from, char const *target)
/* Link SOURCE to DESTDIR_FD + DEST_BASE atomically. DESTDIR_FD is
the directory containing DEST_BASE. Return 0 if successful, a
@@ -658,7 +660,7 @@ index c7eb740..dde3e4b 100644
done. This handles the common case where the destination does not
already exist and -r is not specified. */
@@ -191,7 +191,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
@@ -185,7 +185,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
char *backup_base = NULL;
char *rel_source = NULL;
int nofollow_flag = logical ? 0 : AT_SYMLINK_NOFOLLOW;
@@ -667,7 +669,7 @@ index c7eb740..dde3e4b 100644
link_errno = atomic_link (source, destdir_fd, dest_base);
/* Get SOURCE_STATS if later code will need it, if only for sharper
@@ -278,7 +278,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
@@ -272,7 +272,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
}
}
@@ -676,7 +678,7 @@ index c7eb740..dde3e4b 100644
{
if (interactive)
{
@@ -344,7 +344,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
@@ -338,7 +338,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
required removing the destination first. */
}
@@ -685,7 +687,7 @@ index c7eb740..dde3e4b 100644
{
/* Right after creating a hard link, do this: (note dest name and
source_stats, which are also the just-linked-destinations stats) */
@@ -399,7 +399,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
@@ -393,7 +393,7 @@ do_link (char const *source, int destdir_fd, char const *dest_base,
free (backup_base);
free (rel_source);
@@ -697,17 +699,15 @@ index c7eb740..dde3e4b 100644
--
2.30.2
From ce0ad419f18d006929850e56b6fd2d50f1857789 Mon Sep 17 00:00:00 2001
From 37f12fc0ac8373632c58616302cb989fae7f28f8 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 16 Nov 2021 10:22:30 +0100
Subject: [PATCH] uptime: make utmp error not critical
Subject: uptime: make utmp error not critical
---
src/uptime.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/uptime.c b/src/uptime.c
index fc0f0a5..779fc09 100644
index 1adacaa..711ea60 100644
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -105,7 +105,7 @@ print_uptime (size_t n, const STRUCT_UTMP *this)