Commit 1bd118ca authored by Christian Kastner's avatar Christian Kastner

Add patch cgrulesengd-_GNU_SOURCE.patch

Fixes a FTBFS on ia64. Thanks, James Clarke!

Closes: #886744
parent 1f2f7bca
From: James Clarke <jrtc27@debian.org>
Date: Tue, 9 Jan 2018 13:23:26 +0000
Subject: libcgroup: FTBFS on ia64
Currently libcgroup FTBFS on ia64. This is a result of cgrulesengd.h
defining __USE_GNU itself after features.h has been included, and since
_GNU_SOURCE was not defined before features.h was included, this breaks
assumptions in the glibc headers about the implications of the different
__USE_FOO macros, eventually leading to siginfo-consts-arch.h being
included but TRAP_TRACE not having been defined (which is guarded by
__USE_XOPEN_EXTENDED). The attached patch fixes this on ia64, although
is untested elsewhere.
Bug-Debian: https://bugs.debian.org/886744
Last-Update: 2019-02-22
--- a/src/daemon/cgrulesengd.c
+++ b/src/daemon/cgrulesengd.c
@@ -31,6 +31,10 @@
* TODO Stop using netlink for communication (or at least rewrite that part).
*/
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
#include "libcgroup.h"
#include "cgrulesengd.h"
#include "../libcgroup-internal.h"
--- a/src/daemon/cgrulesengd.h
+++ b/src/daemon/cgrulesengd.h
@@ -15,8 +15,6 @@
#ifndef _CGRULESENGD_H
#define _CGRULESENGD_H
-#include <features.h>
-
__BEGIN_DECLS
#include "config.h"
@@ -24,14 +22,6 @@ __BEGIN_DECLS
#include <linux/connector.h>
#include <linux/cn_proc.h>
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#ifndef __USE_GNU
-#define __USE_GNU
-#endif
-
/* The following ten macros are all for the Netlink code. */
#define SEND_MESSAGE_LEN (NLMSG_LENGTH(sizeof(struct cn_msg) + \
sizeof(enum proc_cn_mcast_op)))
......@@ -5,3 +5,4 @@ initscript-return.patch
Syntax-fixes-for-man-pages.patch
pam_cgroup-Revert-broken-cache-usage.patch
CVE-2018-14348.patch
cgrulesengd-_GNU_SOURCE.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment