From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 47C0F59CA9 for ; Tue, 29 Mar 2016 13:29:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 304A0E07EA; Tue, 29 Mar 2016 13:29:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CCB8CE07EA for ; Tue, 29 Mar 2016 13:29:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7F27340CA7 for ; Tue, 29 Mar 2016 13:29:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09561226 for ; Tue, 29 Mar 2016 13:29:11 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1459258140.aca92bb5062e3d4f796e8ffa263b5bb3600409c1.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/connman/files/connman-1.31-xtables.patch X-VCS-Directories: net-misc/connman/files/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: aca92bb5062e3d4f796e8ffa263b5bb3600409c1 X-VCS-Branch: master Date: Tue, 29 Mar 2016 13:29:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 25e17886-dd20-4a37-b439-5491d9ffea9e X-Archives-Hash: 4cad6f757a2c70494e9758d1e2b9e715 commit: aca92bb5062e3d4f796e8ffa263b5bb3600409c1 Author: Nicholas Vinson gmail com> AuthorDate: Mon Mar 28 12:53:17 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Tue Mar 29 13:29:00 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca92bb5 net-misc/connman: Disable compatibility logic to kernels < 4.5 The compatiblity logic is only needed for kernel headers 4.5 or newer. The older headers don't need this fix. Make sure the fix is not applied for them. Gentoo-bug: 578404 Package-Manager: portage-2.2.28 Closes: https://github.com/gentoo/gentoo/pull/1154 Signed-off-by: Ian Delaney gentoo.org> net-misc/connman/files/connman-1.31-xtables.patch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net-misc/connman/files/connman-1.31-xtables.patch b/net-misc/connman/files/connman-1.31-xtables.patch index 10bdecd..5fdb648 100644 --- a/net-misc/connman/files/connman-1.31-xtables.patch +++ b/net-misc/connman/files/connman-1.31-xtables.patch @@ -30,9 +30,14 @@ #define CHAIN_PREFIX "connman-" --- /dev/null 2016-03-18 06:21:16.372989086 -0700 +++ connman-1.31/include/connman_xtables.h 2016-03-22 21:32:21.349504786 -0700 -@@ -0,0 +1,14 @@ +@@ -0,0 +1,20 @@ +#ifndef CONNMAN_XTABLES_H +#define CONNMAN_XTABLES_H ++ ++#include ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) ++#include ++#else +#ifdef __USE_MISC +#define GENTOO_USE_MISC __USE_MISC +#undef __USE_MISC @@ -45,3 +50,4 @@ +#undef GENTOO_USE_MISC +#endif +#endif ++#endif