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));
03b051945ab08030169228556cc2a4a'>commitdiff
|
Age | Commit message (Expand) | Author |
2023-05-07 | gnu: icu4c-70: Fix gexp in builder script for riscv64....As phases from icu4c is a gexp.
* gnu/packages/icu4c.scm (icu4c-70)[arguments]: Use gexps.
| Christopher Baines |
2022-09-27 | Merge branch 'staging' into core-updates...Conflicts resolved in:
gnu/local.mk
gnu/packages/cran.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/icu4c.scm
gnu/packages/java.scm
gnu/packages/machine-learning.scm
gnu/packages/tex.scm
| Maxim Cournoyer |
2022-09-24 | gnu: Remove icu4c-67....* gnu/packages/icu4c.scm (icu4c-67): Remove variable.
| Efraim Flashner |
2022-07-22 | Merge branch 'staging' into core-updates | Marius Bakke |
2022-07-16 | gnu: mozjs: Build with ICU 69....* gnu/packages/icu4c.scm (icu4c-69): New variable.
* gnu/packages/gnuzilla.scm (mozjs)[inputs]: Change from ICU4C to ICU4C-69.
| Marius Bakke |
2022-07-11 | gnu: icu4c-70: Fix building on riscv64-linux....* gnu/packages/icu4c.scm (icu4c-70)[arguments]: When building for
riscv64-linux replace the custom 'disable-failing-test phase to skip an
additional test.
| Efraim Flashner |
2022-06-30 | gnu: icu4c: Remove input labels....* gnu/packages/icu4c.scm (icu4c)[arguments]: Use G-expression.
[native-inputs]: Remove labels.
* gnu/packages/icu4c.scm (icu4c-build-root)[arguments]: Use gexp.
| Marius Bakke |
2022-06-27 | gnu: icu4c: Update to 71.1....* gnu/packages/icu4c.scm (icu4c): Update to 71.1.
(icu4c-71): Remove variable.
* gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change ICU4C-71 to
ICU4C.
| Marius Bakke |
2022-06-23 | gnu: icu4c: Add 71.1....* gnu/packages/icu4c.scm (icu4c-71): New variable.
| Marius Bakke |