* [gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/, net-misc/connman/
@ 2016-03-27 5:12 Ian Delaney
0 siblings, 0 replies; 5+ messages in thread
From: Ian Delaney @ 2016-03-27 5:12 UTC (permalink / raw
To: gentoo-commits
commit: 9df5a7e55212f98ea227493da7ff244aebca4e65
Author: Nicholas Vinson <nvinson234 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 26 22:41:16 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 05:12:16 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df5a7e5
net-misc/connman: Fix iptables and xtables issues
Fixes issues with iptables, xtables, and glibc when building and running
connan. Specifically, the patch, connman-1.31-iptables-1.6.0.patch,
fixes the icompatibilities between iptables and connman (due to an ABI
break in iptables-1.6.0). The patch, connman-1.31-xtables.patch, uses
some preprocessor tricks to route around incompatibilies seen between
newer Linux kernels and glibc when both net/if.h and linu/if.h are
included in the same source.
Gentoo-bug: #573174, #577584
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1144
net-misc/connman/connman-1.31-r1.ebuild | 74 ++++++++++++++++++++++
.../files/connman-1.31-iptables-1.6.0.patch | 36 +++++++++++
net-misc/connman/files/connman-1.31-xtables.patch | 47 ++++++++++++++
3 files changed, 157 insertions(+)
diff --git a/net-misc/connman/connman-1.31-r1.ebuild b/net-misc/connman/connman-1.31-r1.ebuild
new file mode 100644
index 0000000..2b1ee46
--- /dev/null
+++ b/net-misc/connman/connman-1.31-r1.ebuild
@@ -0,0 +1,74 @@
+# 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
new file mode 100644
index 0000000..30131e6
--- /dev/null
+++ b/net-misc/connman/files/connman-1.31-iptables-1.6.0.patch
@@ -0,0 +1,36 @@
+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
+
diff --git a/net-misc/connman/files/connman-1.31-xtables.patch b/net-misc/connman/files/connman-1.31-xtables.patch
new file mode 100644
index 0000000..10bdecd
--- /dev/null
+++ b/net-misc/connman/files/connman-1.31-xtables.patch
@@ -0,0 +1,47 @@
+--- connman-1.31/src/iptables.c.old 2016-03-22 20:12:47.829460752 -0700
++++ connman-1.31/src/iptables.c 2016-03-22 21:33:36.835384724 -0700
+@@ -28,11 +28,11 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/errno.h>
+ #include <sys/socket.h>
+-#include <xtables.h>
++#include "connman_xtables.h"
+ #include <inttypes.h>
+
+ #include <linux/netfilter_ipv4/ip_tables.h>
+
+ #include "connman.h"
+--- connman-1.31/src/firewall.c.old 2016-03-22 21:29:01.959472262 -0700
++++ connman-1.31/src/firewall.c 2016-03-22 21:33:53.048144181 -0700
+@@ -23,11 +23,11 @@
+ #include <config.h>
+ #endif
+
+ #include <errno.h>
+
+-#include <xtables.h>
++#include "connman_xtables.h"
+ #include <linux/netfilter_ipv4/ip_tables.h>
+
+ #include "connman.h"
+
+ #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 @@
++#ifndef CONNMAN_XTABLES_H
++#define CONNMAN_XTABLES_H
++#ifdef __USE_MISC
++#define GENTOO_USE_MISC __USE_MISC
++#undef __USE_MISC
++#endif
++
++#include <xtables.h>
++
++#ifdef GENTOO_USE_MISC
++#define __USE_MISC GENTOO_USE_MISC
++#undef GENTOO_USE_MISC
++#endif
++#endif
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/, net-misc/connman/
@ 2016-04-29 7:30 Sam Jorna
0 siblings, 0 replies; 5+ messages in thread
From: Sam Jorna @ 2016-04-29 7:30 UTC (permalink / raw
To: gentoo-commits
commit: 5209abd6842cfe1306874c0766f10ec939e4869c
Author: Nicholas Vinson <nvinson234 <AT> gmail <DOT> com>
AuthorDate: Wed Apr 27 13:46:41 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 07:29:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5209abd6
net-misc/connman: Version bump to 1.32
Gentoo-bug: 581368
Package-Manager: portage-2.2.28
net-misc/connman/Manifest | 2 +-
net-misc/connman/connman-1.32.ebuild | 73 ++++++++++++++++++++++
.../files/connman-1.32-execinfo-assumptions.patch | 54 ++++++++++++++++
3 files changed, 128 insertions(+), 1 deletion(-)
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 4c1b30e..ef0a9eb 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,2 +1,2 @@
DIST connman-1.29.tar.xz 653324 SHA256 2a5a69693566f7fd59b2e677fa89356ada6d709998aa665caef8707b1e7a8594 SHA512 19f623dd23c6312f29bbd570dcb22d31154ffcd16ee66ed2280df3d9d844301f18538418363222d99eabdc33da0021488ed66ba2e4f88df30646004b724538ee WHIRLPOOL 9439cadeb20b72c922b1426da213f8567fe7b0da45f9a4abf270c38687a9d9161a8ee14250623344864d612e130e6f28926918468aaf4346a9e5ff41e6ad22bb
-DIST connman-1.31.tar.xz 668120 SHA256 88fcf0b6df334796b90e2fd2e434d6f5b36cd6f13b886a119b8c90276b72b8e2 SHA512 f9871ead096ead37d3bc524fb143ec8c88125e9c18b5eb1f451581b9a2061719e90361e5b7f3e09901701707d977c42c630457b0ead8e76e04e964a7542c7bbd WHIRLPOOL 0e7f73e1d83a862fb33d2a3b6983c00b2305fea95803836d5dadbb31a8a55d19e2a21447e5e5654b04b0320929eaef2eba99b5921ab4a6fbf2d89e3befbe81b4
+DIST connman-1.32.tar.xz 668404 SHA256 3185864c73206a6033d12e9f583689dcd03f714a40a58333709d3f74a4e0934c SHA512 031b876f98b27c1a657af1e5242d06d9295f3710053c365fc94b13f386fe25e150ef95fbed81462c0d770522625bd5f55c621f5ecb1ad638dd64779c3e444066 WHIRLPOOL b20652bcb19b172b09aa3c10de3736eaeb500bd56a131b8580d750bf72ef9ba034b80c563b929f9d81de226b381e56b2aeee84186db66b0d169ffd2463e9417b
diff --git a/net-misc/connman/connman-1.32.ebuild b/net-misc/connman/connman-1.32.ebuild
new file mode 100644
index 0000000..d035086
--- /dev/null
+++ b/net-misc/connman/connman-1.32.ebuild
@@ -0,0 +1,73 @@
+# 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.32-execinfo-assumptions.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.32-execinfo-assumptions.patch b/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch
new file mode 100644
index 0000000..eb8e4fc
--- /dev/null
+++ b/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch
@@ -0,0 +1,54 @@
+diff -uNr a/config.h.in b/config.h.in
+--- a/config.h.in 2013-07-02 17:41:03.715261748 +0000
++++ b/config.h.in 2013-07-02 17:41:21.707260667 +0000
+@@ -3,6 +3,9 @@
+ /* Define to 1 if you have the <dlfcn.h> header file. */
+ #undef HAVE_DLFCN_H
+
++/* Define to 1 if you have the <execinfo.h> header file. */
++#undef HAVE_EXECINFO_H
++
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+
+diff -uNr a/configure.ac b/configure.ac
+--- a/configure.ac 2013-07-02 17:41:03.715261748 +0000
++++ b/configure.ac 2013-07-02 17:41:21.719260666 +0000
+@@ -181,6 +181,8 @@
+ AC_CHECK_FUNC(signalfd, dummy=yes,
+ AC_MSG_ERROR(signalfd support is required))
+
++AC_CHECK_HEADERS([execinfo.h], [], [])
++
+ AC_CHECK_LIB(dl, dlopen, dummy=yes,
+ AC_MSG_ERROR(dynamic linking loader is required))
+
+diff -uNr a/src/backtrace.c b/src/backtrace.c
+--- a/src/backtrace.c 2013-07-02 17:41:03.727261747 +0000
++++ b/src/backtrace.c 2013-07-02 17:42:12.717257603 +0000
+@@ -30,7 +30,9 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ #include <dlfcn.h>
+
+ #include "connman.h"
+@@ -37,6 +38,7 @@
+ void print_backtrace(const char* program_path, const char* program_exec,
+ unsigned int offset)
+ {
++#ifdef HAVE_EXECINFO_H
+ void *frames[99];
+ size_t n_ptrs;
+ unsigned int i;
+@@ -135,6 +138,7 @@
+
+ close(outfd[1]);
+ close(infd[0]);
++#endif
+ }
+
+ static void signal_handler(int signo)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/, net-misc/connman/
@ 2018-04-22 18:21 Maxim Koltsov
0 siblings, 0 replies; 5+ messages in thread
From: Maxim Koltsov @ 2018-04-22 18:21 UTC (permalink / raw
To: gentoo-commits
commit: a093754f351397ff2794e337fd823fecd8b64144
Author: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 18:19:16 2018 +0000
Commit: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 18:21:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a093754f
net-misc/connman: fix compilation
Closes: https://bugs.gentoo.org/646464
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-misc/connman/connman-1.35-r1.ebuild | 1 +
.../files/connman-1.35-include-ifbridge-before-netinet.patch | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/net-misc/connman/connman-1.35-r1.ebuild b/net-misc/connman/connman-1.35-r1.ebuild
index 6805bf58a4d..67a8c779709 100644
--- a/net-misc/connman/connman-1.35-r1.ebuild
+++ b/net-misc/connman/connman-1.35-r1.ebuild
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
"${FILESDIR}/${PN}-1.33-resolv-conf-overwrite.patch"
+ "${FILESDIR}/${PN}-1.35-include-ifbridge-before-netinet.patch"
)
src_prepare() {
diff --git a/net-misc/connman/files/connman-1.35-include-ifbridge-before-netinet.patch b/net-misc/connman/files/connman-1.35-include-ifbridge-before-netinet.patch
new file mode 100644
index 00000000000..53f3c194db6
--- /dev/null
+++ b/net-misc/connman/files/connman-1.35-include-ifbridge-before-netinet.patch
@@ -0,0 +1,12 @@
+--- connman-1.35/src/tethering.c
++++ connman-1.35/src/tethering.c
+@@ -35,8 +35,8 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <linux/if_tun.h>
+-#include <netinet/in.h>
+ #include <linux/if_bridge.h>
++#include <netinet/in.h>
+
+ #include "connman.h"
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/, net-misc/connman/
@ 2020-04-05 22:22 Ben Kohler
0 siblings, 0 replies; 5+ messages in thread
From: Ben Kohler @ 2020-04-05 22:22 UTC (permalink / raw
To: gentoo-commits
commit: 9f12c7cd3f476882232029079681c3c6fd22d32f
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 5 22:22:22 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sun Apr 5 22:22:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f12c7cd
net-misc/connman: drop old
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
net-misc/connman/Manifest | 1 -
net-misc/connman/connman-1.37.ebuild | 95 ----------------------
.../connman-1.33-polkit-configure-check-fix.patch | 15 ----
3 files changed, 111 deletions(-)
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 6710329589c..dda3fee7303 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -1,2 +1 @@
-DIST connman-1.37.tar.xz 707752 BLAKE2B ad8993764a444d205b0a8cf1ad38acc249a1a28014e6f4e5a89c8662194ad2e2ee6091b51445b88a885808461413b3aaf88eeb7b75a32f417b578d2da80a2e9f SHA512 5d5363105aedd0c9d609dd5c64eb832d9ff80923a944d9d3738337a61f180ded227f2ae1ff7912bed8826b35f0cfd20488e3ffd3801f0e53e90f98498e19efb6
DIST connman-1.38.tar.xz 749288 BLAKE2B 3f0ec95c87d9b3bf4f188e2523cb8ed97f462953ed95180fadf98bfe0d01c67a3b73e18e39d616e9299fa0251b9a86afea6161b9e280ae6999eb66e6bd5c4406 SHA512 9c8f77c4dd62763ccb9ea5cc5d285a8a1c51bb09a82eafc73246231557a4f627ae1e5e4a9df5e104457390ebba643349d7d67800a4ee4c17c6dceff192afe8d4
diff --git a/net-misc/connman/connman-1.37.ebuild b/net-misc/connman/connman-1.37.ebuild
deleted file mode 100644
index a81c15709fc..00000000000
--- a/net-misc/connman/connman-1.37.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools systemd tmpfiles
-
-DESCRIPTION="Provides a daemon for managing internet connections"
-HOMEPAGE="https://01.org/connman"
-SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-
-IUSE="${IUSE} bluetooth debug doc examples +ethernet +iptables iwd l2tp nftables"
-IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
-
-REQUIRED_USE="^^ ( iptables nftables )"
-RDEPEND=">=dev-libs/glib-2.16
- >=sys-apps/dbus-1.2.24
- sys-libs/readline:0=
- iptables? ( >=net-firewall/iptables-1.4.8 )
- bluetooth? ( net-wireless/bluez )
- iwd? ( net-wireless/iwd )
- l2tp? ( net-dialup/xl2tpd )
- nftables? (
- >=net-libs/libnftnl-1.0.4:0=
- >=net-libs/libmnl-1.0.0:0= )
- ofono? ( net-misc/ofono )
- openconnect? ( net-vpn/openconnect )
- openvpn? ( net-vpn/openvpn )
- policykit? ( sys-auth/polkit )
- pptp? ( net-dialup/pptpclient )
- vpnc? ( net-vpn/vpnc )
- wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
- wispr? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-2.6.39
- virtual/pkgconfig"
-
-#PATCHES=(
-# "${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
-#)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --localstatedir=/var \
- --with-systemdunitdir=$(systemd_get_systemunitdir) \
- --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
- --enable-client \
- --enable-datafiles \
- --enable-loopback=builtin \
- $(use_enable examples test) \
- $(use_enable ethernet ethernet builtin) \
- $(use_enable wifi wifi builtin) \
- $(use_enable iwd) \
- $(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) \
- $(use_enable networkmanager nmcompat) \
- --with-firewall=$(usex iptables "iptables" "nftables" ) \
- --disable-iospm \
- --disable-hh2serial-gps
-}
-
-src_install() {
- default
- dobin client/connmanctl
-
- if use doc; then
- dodoc doc/*.txt
- fi
- keepdir /usr/lib/${PN}/scripts
- keepdir /var/lib/${PN}
- newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
- tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf
-}
diff --git a/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch b/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch
deleted file mode 100644
index 57ef5e8ccba..00000000000
--- a/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- connman-1.33/configure.ac.old 2016-10-09 11:26:43.137856416 -0700
-+++ connman-1.33/configure.ac 2016-10-09 11:26:52.819722799 -0700
-@@ -281,11 +281,11 @@ AM_CONDITIONAL(NMCOMPAT, test "${enable_
-
- AC_ARG_ENABLE(polkit, AC_HELP_STRING([--enable-polkit],
- [enable PolicyKit support]),
- [enable_polkit=${enableval}], [enable_polkit="no"])
- if (test "${enable_polkit}" != "no"); then
-- POLKIT_DATADIR="`$PKG_CONFIG --variable=actiondir polkit`"
-+ POLKIT_DATADIR="`$PKG_CONFIG --variable=actiondir polkit-gobject-1`"
- POLKIT_DATADIR=""
- if (test -z "${POLKIT_DATADIR}"); then
- POLKIT_DATADIR="${datadir}/polkit-1/actions"
- fi
- AC_SUBST(POLKIT_DATADIR)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/, net-misc/connman/
@ 2022-02-04 20:27 Ben Kohler
0 siblings, 0 replies; 5+ messages in thread
From: Ben Kohler @ 2022-02-04 20:27 UTC (permalink / raw
To: gentoo-commits
commit: f3641eecc7c75afc5307e248ca98a390ded51bc2
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 4 20:15:28 2022 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Feb 4 20:25:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3641eec
net-misc/connman: musl fix
Closes: https://bugs.gentoo.org/832548
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
net-misc/connman/connman-1.41-r1.ebuild | 103 ++++++++++++++++++++++++
net-misc/connman/files/libresolv-musl-fix.patch | 61 ++++++++++++++
2 files changed, 164 insertions(+)
diff --git a/net-misc/connman/connman-1.41-r1.ebuild b/net-misc/connman/connman-1.41-r1.ebuild
new file mode 100644
index 000000000000..2db37a70b743
--- /dev/null
+++ b/net-misc/connman/connman-1.41-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit autotools systemd tmpfiles
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
+else
+ SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/connman/connman.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="bluetooth debug doc +ethernet examples iptables iwd l2tp networkmanager
++nftables ofono openconnect openvpn policykit pptp tools vpnc +wifi wireguard
+wispr"
+
+REQUIRED_USE="^^ ( iptables nftables )"
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=dev-libs/glib-2.16
+ >=sys-apps/dbus-1.2.24
+ sys-libs/readline:0=
+ bluetooth? ( net-wireless/bluez )
+ iptables? ( >=net-firewall/iptables-1.4.8 )
+ iwd? ( net-wireless/iwd )
+ l2tp? ( net-dialup/xl2tpd )
+ nftables? (
+ >=net-libs/libnftnl-1.0.4:0=
+ >=net-libs/libmnl-1.0.0:0= )
+ ofono? ( net-misc/ofono )
+ openconnect? ( net-vpn/openconnect )
+ openvpn? ( net-vpn/openvpn )
+ policykit? ( sys-auth/polkit )
+ pptp? ( net-dialup/pptpclient )
+ vpnc? ( net-vpn/vpnc )
+ wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+ wireguard? ( >=net-libs/libmnl-1.0.0:0= )
+ wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-2.6.39"
+
+PATCHES=( "${FILESDIR}/libresolv-musl-fix.patch" )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --localstatedir=/var \
+ --runstatedir=/run \
+ --with-systemdunitdir=$(systemd_get_systemunitdir) \
+ --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+ --enable-client \
+ --enable-datafiles \
+ --enable-loopback=builtin \
+ $(use_enable bluetooth bluetooth builtin) \
+ $(use_enable debug) \
+ $(use_enable ethernet ethernet builtin) \
+ $(use_enable examples test) \
+ $(use_enable iwd) \
+ $(use_enable l2tp l2tp builtin) \
+ $(use_enable networkmanager nmcompat) \
+ $(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 tools) \
+ $(use_enable vpnc vpnc builtin) \
+ $(use_enable wifi wifi builtin) \
+ $(use_enable wireguard) \
+ $(use_enable wispr wispr builtin) \
+ --with-firewall=$(usex iptables "iptables" "nftables" ) \
+ --disable-iospm \
+ --disable-hh2serial-gps
+}
+
+src_install() {
+ default
+ dobin client/connmanctl
+
+ if use doc; then
+ dodoc doc/*.txt
+ fi
+ keepdir /usr/lib/${PN}/scripts
+ keepdir /var/lib/${PN}
+ newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+ tmpfiles_process connman_resolvconf.conf
+}
diff --git a/net-misc/connman/files/libresolv-musl-fix.patch b/net-misc/connman/files/libresolv-musl-fix.patch
new file mode 100644
index 000000000000..c28a7c1e3589
--- /dev/null
+++ b/net-misc/connman/files/libresolv-musl-fix.patch
@@ -0,0 +1,61 @@
+musl does not implement res_ninit
+
+diff --exclude '*.*o' -ru connman-1.24.orig/gweb/gresolv.c connman-1.24/gweb/gresolv.c
+--- connman-1.24.orig/gweb/gresolv.c 2014-07-18 20:17:25.000000000 -0300
++++ connman-1.24/gweb/gresolv.c 2014-07-18 20:24:01.874669130 -0300
+@@ -874,8 +874,6 @@
+ resolv->index = index;
+ resolv->nameserver_list = NULL;
+
+- res_ninit(&resolv->res);
+-
+ return resolv;
+ }
+
+@@ -915,8 +913,6 @@
+
+ flush_nameservers(resolv);
+
+- res_nclose(&resolv->res);
+-
+ g_free(resolv);
+ }
+
+@@ -1019,24 +1015,19 @@
+ debug(resolv, "hostname %s", hostname);
+
+ if (!resolv->nameserver_list) {
+- int i;
+-
+- for (i = 0; i < resolv->res.nscount; i++) {
+- char buf[100];
+- int family = resolv->res.nsaddr_list[i].sin_family;
+- void *sa_addr = &resolv->res.nsaddr_list[i].sin_addr;
+-
+- if (family != AF_INET &&
+- resolv->res._u._ext.nsaddrs[i]) {
+- family = AF_INET6;
+- sa_addr = &resolv->res._u._ext.nsaddrs[i]->sin6_addr;
++ FILE *f = fopen("/etc/resolv.conf", "r");
++ if (f) {
++ char line[256], *s;
++ int i;
++ while (fgets(line, sizeof(line), f)) {
++ if (strncmp(line, "nameserver", 10) || !isspace(line[10]))
++ continue;
++ for (s = &line[11]; isspace(s[0]); s++);
++ for (i = 0; s[i] && !isspace(s[i]); i++);
++ s[i] = 0;
++ g_resolv_add_nameserver(resolv, s, 53, 0);
+ }
+-
+- if (family != AF_INET && family != AF_INET6)
+- continue;
+-
+- if (inet_ntop(family, sa_addr, buf, sizeof(buf)))
+- g_resolv_add_nameserver(resolv, buf, 53, 0);
++ fclose(f);
+ }
+
+ if (!resolv->nameserver_list)
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-02-04 20:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-05 22:22 [gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/, net-misc/connman/ Ben Kohler
-- strict thread matches above, loose matches on Subject: below --
2022-02-04 20:27 Ben Kohler
2018-04-22 18:21 Maxim Koltsov
2016-04-29 7:30 Sam Jorna
2016-03-27 5:12 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox