diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-14 15:21:02 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-14 23:15:22 +0200 |
| commit | 065cb27abb354958d716d21a6a6561f6023c5a1e (patch) | |
| tree | f9f13dbcbaea9e70ceccd2288f818189f757a11e /gnu/packages/patches/iputils-libcap-compat.patch | |
| parent | bf7321cc9171a0b4145debd770666efafe0b2f24 (diff) | |
| download | guix-patches-065cb27abb354958d716d21a6a6561f6023c5a1e.tar guix-patches-065cb27abb354958d716d21a6a6561f6023c5a1e.tar.gz | |
gnu: Add iputils.
* gnu/packages/patches/iputils-libcap-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/networking.scm (iputils): New public variable.
Diffstat (limited to 'gnu/packages/patches/iputils-libcap-compat.patch')
| -rw-r--r-- | gnu/packages/patches/iputils-libcap-compat.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/gnu/packages/patches/iputils-libcap-compat.patch b/gnu/packages/patches/iputils-libcap-compat.patch new file mode 100644 index 0000000000..dc6da310ce --- /dev/null +++ b/gnu/packages/patches/iputils-libcap-compat.patch @@ -0,0 +1,37 @@ +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)); |