From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-878966-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 15E00138208 for <garchives@archives.gentoo.org>; Fri, 29 Apr 2016 07:30:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA48721C009; Fri, 29 Apr 2016 07:30:09 +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 7AB1921C009 for <gentoo-commits@lists.gentoo.org>; Fri, 29 Apr 2016 07:30:09 +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 D4E25335DED for <gentoo-commits@lists.gentoo.org>; Fri, 29 Apr 2016 07:30:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D17E1333 for <gentoo-commits@lists.gentoo.org>; Fri, 29 Apr 2016 07:30:04 +0000 (UTC) From: "Sam Jorna" <wraeth@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam Jorna" <wraeth@gentoo.org> Message-ID: <1461914978.f600ad8e74a53e37d8e1657789959523a2c6e84d.wraeth@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/connman/, net-misc/connman/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/connman/connman-1.31-r1.ebuild net-misc/connman/files/connman-1.31-iptables-1.6.0.patch X-VCS-Directories: net-misc/connman/files/ net-misc/connman/ X-VCS-Committer: wraeth X-VCS-Committer-Name: Sam Jorna X-VCS-Revision: f600ad8e74a53e37d8e1657789959523a2c6e84d X-VCS-Branch: master Date: Fri, 29 Apr 2016 07:30:04 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c1493067-1d84-42cc-ba6c-12bfc07f44e1 X-Archives-Hash: e49c320ef782459529e5dc33e21ac819 commit: f600ad8e74a53e37d8e1657789959523a2c6e84d Author: Nicholas Vinson <nvinson234 <AT> gmail <DOT> com> AuthorDate: Wed Apr 27 14:00:42 2016 +0000 Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org> CommitDate: Fri Apr 29 07:29:38 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f600ad8e net-misc/connman remove outdated versions Closes: https://github.com/gentoo/gentoo/pull/1373 net-misc/connman/connman-1.31-r1.ebuild | 74 ---------------------- .../files/connman-1.31-iptables-1.6.0.patch | 36 ----------- 2 files changed, 110 deletions(-) diff --git a/net-misc/connman/connman-1.31-r1.ebuild b/net-misc/connman/connman-1.31-r1.ebuild deleted file mode 100644 index 2b1ee46..0000000 --- a/net-misc/connman/connman-1.31-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" -inherit systemd - -DESCRIPTION="Provides a daemon for managing internet connections" -HOMEPAGE="https://01.org/connman" -SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="bluetooth debug doc examples +ethernet l2tp ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr" - -RDEPEND=">=dev-libs/glib-2.16 - >=sys-apps/dbus-1.2.24 - >=net-firewall/iptables-1.4.8 - bluetooth? ( net-wireless/bluez ) - l2tp? ( net-dialup/xl2tpd ) - ofono? ( net-misc/ofono ) - openconnect? ( net-misc/openconnect ) - openvpn? ( net-misc/openvpn ) - policykit? ( sys-auth/polkit ) - pptp? ( net-dialup/pptpclient ) - vpnc? ( net-misc/vpnc ) - wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] ) - wispr? ( net-libs/gnutls )" - -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.39" - -PATCHES=( - "${FILESDIR}/${PN}-1.16-execinfo-assumptions.patch" - "${FILESDIR}/${PN}-1.31-iptables-1.6.0.patch" - "${FILESDIR}/${PN}-1.31-xtables.patch" -) - -src_configure() { - econf \ - --localstatedir=/var \ - --enable-client \ - --enable-datafiles \ - --enable-loopback=builtin \ - $(use_enable examples test) \ - $(use_enable ethernet ethernet builtin) \ - $(use_enable wifi wifi builtin) \ - $(use_enable bluetooth bluetooth builtin) \ - $(use_enable l2tp l2tp builtin) \ - $(use_enable ofono ofono builtin) \ - $(use_enable openconnect openconnect builtin) \ - $(use_enable openvpn openvpn builtin) \ - $(use_enable policykit polkit builtin) \ - $(use_enable pptp pptp builtin) \ - $(use_enable vpnc vpnc builtin) \ - $(use_enable wispr wispr builtin) \ - $(use_enable debug) \ - $(use_enable tools) \ - --disable-iospm \ - --disable-hh2serial-gps -} - -src_install() { - default - dobin client/connmanctl - - if use doc; then - dodoc doc/*.txt - fi - keepdir /var/lib/${PN} - newinitd "${FILESDIR}"/${PN}.initd2 ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} -} diff --git a/net-misc/connman/files/connman-1.31-iptables-1.6.0.patch b/net-misc/connman/files/connman-1.31-iptables-1.6.0.patch deleted file mode 100644 index 30131e6..0000000 --- a/net-misc/connman/files/connman-1.31-iptables-1.6.0.patch +++ /dev/null @@ -1,36 +0,0 @@ -From acea08a0e4234a4c1a87bedc087c73ff36de0c7b Mon Sep 17 00:00:00 2001 -From: Wu Zheng <wu.zheng@intel.com> -Date: Thu, 28 Jan 2016 18:04:17 +0800 -Subject: iptables: Add missing function item of xtables to match iptables 1.6 - -The struct of xtables_globals has been modified in iptables 1.6. -If connman runs with iptables 1.6, it can crash. - -Program received signal SIGSEGV, Segmentation fault. -0x00000000 in ?? () -0xb7dea89c in xtables_find_target () from /usr/lib/libxtables.so.11 -0xb7deac1c in ?? () from /usr/lib/libxtables.so.11 -0xb7dea793 in xtables_find_target () from /usr/lib/libxtables.so.11 - -The the missing function item of xtables is added to xtables_globals. ---- - src/iptables.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/iptables.c b/src/iptables.c -index bc0c763..5ef757a 100644 ---- a/src/iptables.c -+++ b/src/iptables.c -@@ -1566,6 +1566,9 @@ struct xtables_globals iptables_globals = { - .option_offset = 0, - .opts = iptables_opts, - .orig_opts = iptables_opts, -+#if XTABLES_VERSION_CODE > 10 -+ .compat_rev = xtables_compatible_revision, -+#endif - }; - - static struct xtables_target *prepare_target(struct connman_iptables *table, --- -cgit v0.12 -