commit: c008e237dd1dfd1139373e4e6287e95f94c60346 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Apr 10 01:05:07 2016 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Apr 10 01:05:35 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c008e237
sys-apps/systemd: Add workaround for if.h conflict Bug: https://bugs.gentoo.org/577660 Package-Manager: portage-2.2.28_p3 sys-apps/systemd/files/linux-headers-if.h.patch | 34 +++++++++++++++++++++++++ sys-apps/systemd/systemd-229-r100.ebuild | 1 + sys-apps/systemd/systemd-229.ebuild | 1 + 3 files changed, 36 insertions(+) diff --git a/sys-apps/systemd/files/linux-headers-if.h.patch b/sys-apps/systemd/files/linux-headers-if.h.patch new file mode 100644 index 0000000..d0c38a9 --- /dev/null +++ b/sys-apps/systemd/files/linux-headers-if.h.patch @@ -0,0 +1,34 @@ +From 96b90055e1e21417d4beb973fcb62858d7c69c17 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <flop...@gentoo.org> +Date: Sat, 9 Apr 2016 18:07:02 -0400 +Subject: [PATCH] Work around net/if.h / linux/if.h conflict + +--- + src/shared/firewall-util.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c +index 0d3da2e..521e09c 100644 +--- a/src/shared/firewall-util.c ++++ b/src/shared/firewall-util.c +@@ -17,14 +17,16 @@ + along with systemd; If not, see <http://www.gnu.org/licenses/>. + ***/ + ++#define _NET_IF_H 1 ++ + #include <alloca.h> + #include <arpa/inet.h> + #include <endian.h> + #include <errno.h> +-#include <net/if.h> + #include <stddef.h> + #include <string.h> + #include <sys/socket.h> ++#include <linux/if.h> + #include <linux/netfilter_ipv4/ip_tables.h> + #include <linux/netfilter/nf_nat.h> + #include <linux/netfilter/xt_addrtype.h> +-- +2.8.1 + diff --git a/sys-apps/systemd/systemd-229-r100.ebuild b/sys-apps/systemd/systemd-229-r100.ebuild index 0a7cf4d..cd9d446 100644 --- a/sys-apps/systemd/systemd-229-r100.ebuild +++ b/sys-apps/systemd/systemd-229-r100.ebuild @@ -152,6 +152,7 @@ src_prepare() { local PATCHES=( "${FILESDIR}/218-Dont-enable-audit-by-default.patch" "${FILESDIR}/228-noclean-tmp.patch" + "${FILESDIR}/linux-headers-if.h.patch" ) [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches ) diff --git a/sys-apps/systemd/systemd-229.ebuild b/sys-apps/systemd/systemd-229.ebuild index 70ec90f..0a35d50 100644 --- a/sys-apps/systemd/systemd-229.ebuild +++ b/sys-apps/systemd/systemd-229.ebuild @@ -152,6 +152,7 @@ src_prepare() { local PATCHES=( "${FILESDIR}/218-Dont-enable-audit-by-default.patch" "${FILESDIR}/228-noclean-tmp.patch" + "${FILESDIR}/linux-headers-if.h.patch" ) [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
