diff options
| author | Marius Bakke <marius@gnu.org> | 2023-09-07 23:24:02 +0800 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2023-09-08 18:53:47 +0800 |
| commit | 51939d19c14bbc755417d4a4ef98e21fd1b6d690 (patch) | |
| tree | afa63ef15adabf48ac7302c524ef578093ef6f10 /gnu/packages/patches | |
| parent | 963abdf05de996f3f18133b8f06ab457ecdd1848 (diff) | |
| download | guix-51939d19c14bbc755417d4a4ef98e21fd1b6d690.tar.gz | |
gnu: iputils: Update to 20221126.
* gnu/packages/networking.scm (iputils): Update to 20221126. [source](patches): Remove. [arguments]: Remove obsolete phase. Disable one new test. [description]: Adjust for removed commands. * gnu/packages/patches/iputils-libcap-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/iputils-libcap-compat.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/gnu/packages/patches/iputils-libcap-compat.patch b/gnu/packages/patches/iputils-libcap-compat.patch deleted file mode 100644 index dc6da310ce..0000000000 --- a/gnu/packages/patches/iputils-libcap-compat.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fix name clash with libcap 2.29. - -Taken from upstream: -https://github.com/iputils/iputils/commit/18f9a84e0e702841d6cc4d5f593de4fbd1348e83 - -diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c ---- a/ninfod/ninfod.c -+++ b/ninfod/ninfod.c -@@ -455,7 +455,7 @@ static void do_daemonize(void) - /* --------- */ - #ifdef HAVE_LIBCAP - static const cap_value_t cap_net_raw = CAP_NET_RAW; --static const cap_value_t cap_setuid = CAP_SETUID; -+static const cap_value_t cap_setuserid = CAP_SETUID; - static cap_flag_value_t cap_ok; - #else - static uid_t euid; -@@ -487,7 +487,7 @@ static void limit_capabilities(void) - - cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, &cap_ok); - if (cap_ok != CAP_CLEAR) -- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); -+ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); - - if (cap_set_proc(cap_p) < 0) { - DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); -@@ -520,8 +520,8 @@ static void drop_capabilities(void) - - /* setuid / setuid */ - if (cap_ok != CAP_CLEAR) { -- cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET); -- cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid, CAP_SET); -+ cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuserid, CAP_SET); -+ cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuserid, CAP_SET); - - if (cap_set_proc(cap_p) < 0) { - DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno)); |