From 4faecd7c3d7e381f720c23b721cb1191e3f3d35f Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 31 May 2023 01:46:29 +0100 Subject: net-misc/connman: treeclean ::gentoo should work. Signed-off-by: Sam James --- net-misc/connman/Manifest | 2 - net-misc/connman/connman-1.35-r1.ebuild | 94 ----------- net-misc/connman/connman-1.38.ebuild | 106 ------------ net-misc/connman/connman-9999.ebuild | 106 ------------ .../connman/files/connman-1.29-musl-sockaddr.patch | 12 -- net-misc/connman/files/connman-1.31-xtables.patch | 54 ------- net-misc/connman/files/connman-1.32-execinfo.patch | 27 ---- .../connman-1.33-polkit-configure-check-fix.patch | 15 -- .../files/connman-1.33-resolv-conf-overwrite.patch | 6 - .../connman/files/connman-1.35-musl-fixes.patch | 179 --------------------- .../connman/files/connman-1.38-musl-fixes.patch | 81 ---------- .../connman/files/connman-9999-musl-fixes.patch | 81 ---------- .../connman/files/connman-musl-libresolv.patch | 61 ------- net-misc/connman/files/connman-musl-log.patch | 29 ---- net-misc/connman/files/connman-musl.patch | 125 -------------- net-misc/connman/files/connman.confd | 15 -- net-misc/connman/files/connman.initd2 | 22 --- net-misc/connman/files/connman.service | 11 -- net-misc/connman/metadata.xml | 26 --- 19 files changed, 1052 deletions(-) delete mode 100644 net-misc/connman/Manifest delete mode 100644 net-misc/connman/connman-1.35-r1.ebuild delete mode 100644 net-misc/connman/connman-1.38.ebuild delete mode 100644 net-misc/connman/connman-9999.ebuild delete mode 100644 net-misc/connman/files/connman-1.29-musl-sockaddr.patch delete mode 100644 net-misc/connman/files/connman-1.31-xtables.patch delete mode 100644 net-misc/connman/files/connman-1.32-execinfo.patch delete mode 100644 net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch delete mode 100644 net-misc/connman/files/connman-1.33-resolv-conf-overwrite.patch delete mode 100644 net-misc/connman/files/connman-1.35-musl-fixes.patch delete mode 100644 net-misc/connman/files/connman-1.38-musl-fixes.patch delete mode 100644 net-misc/connman/files/connman-9999-musl-fixes.patch delete mode 100644 net-misc/connman/files/connman-musl-libresolv.patch delete mode 100644 net-misc/connman/files/connman-musl-log.patch delete mode 100644 net-misc/connman/files/connman-musl.patch delete mode 100644 net-misc/connman/files/connman.confd delete mode 100644 net-misc/connman/files/connman.initd2 delete mode 100644 net-misc/connman/files/connman.service delete mode 100644 net-misc/connman/metadata.xml diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest deleted file mode 100644 index 8900f8b4..00000000 --- a/net-misc/connman/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST connman-1.35.tar.xz 686092 BLAKE2B 706d8333dc2fcbee8d0ef3849325c4975dfe312a7a542ee96859a1724e05b1302c244a0108ab70033b398301c235fb13cb9509e9147dc2bb049e900f3799cd98 SHA512 2234b4d18b038f9a33939035cddebd31c74ce962e5616c2c30b2912476612ef3f7d5b9edca64bf6e69fa358252ed432124e036ac3516b291b86695cb9a96c6a8 -DIST connman-1.38.tar.xz 749288 BLAKE2B 3f0ec95c87d9b3bf4f188e2523cb8ed97f462953ed95180fadf98bfe0d01c67a3b73e18e39d616e9299fa0251b9a86afea6161b9e280ae6999eb66e6bd5c4406 SHA512 9c8f77c4dd62763ccb9ea5cc5d285a8a1c51bb09a82eafc73246231557a4f627ae1e5e4a9df5e104457390ebba643349d7d67800a4ee4c17c6dceff192afe8d4 diff --git a/net-misc/connman/connman-1.35-r1.ebuild b/net-misc/connman/connman-1.35-r1.ebuild deleted file mode 100644 index a14ee5de..00000000 --- a/net-misc/connman/connman-1.35-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -inherit autotools systemd - -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 ~mips ~ppc x86" - -IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables 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 - iptables? ( >=net-firewall/iptables-1.4.8 ) - bluetooth? ( net-wireless/bluez ) - 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" - "${FILESDIR}/${PN}-1.33-resolv-conf-overwrite.patch" - - # musl fixes - "${FILESDIR}/${PN}-musl-libresolv.patch" - "${FILESDIR}/${PN}-1.35-musl-fixes.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 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-iwd \ - --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} -} diff --git a/net-misc/connman/connman-1.38.ebuild b/net-misc/connman/connman-1.38.ebuild deleted file mode 100644 index bf2a96da..00000000 --- a/net-misc/connman/connman-1.38.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2020 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 x86" -fi - -DESCRIPTION="Provides a daemon for managing internet connections" -HOMEPAGE="https://01.org/connman" - -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=( - # musl fixes - "${FILESDIR}/${PN}-musl-libresolv.patch" - "${FILESDIR}/${P}-musl-fixes.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 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 /usr/lib/tmpfiles.d/connman_resolvconf.conf -} \ No newline at end of file diff --git a/net-misc/connman/connman-9999.ebuild b/net-misc/connman/connman-9999.ebuild deleted file mode 100644 index 082263b7..00000000 --- a/net-misc/connman/connman-9999.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2020 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 ~x86" -fi - -DESCRIPTION="Provides a daemon for managing internet connections" -HOMEPAGE="https://01.org/connman" - -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=( - # musl fixes - "${FILESDIR}/${PN}-musl-libresolv.patch" - "${FILESDIR}/${P}-musl-fixes.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 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 /usr/lib/tmpfiles.d/connman_resolvconf.conf -} diff --git a/net-misc/connman/files/connman-1.29-musl-sockaddr.patch b/net-misc/connman/files/connman-1.29-musl-sockaddr.patch deleted file mode 100644 index a5eb6905..00000000 --- a/net-misc/connman/files/connman-1.29-musl-sockaddr.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurw connman-1.29.orig/src/ntp.c connman-1.29/src/ntp.c ---- connman-1.29.orig/src/ntp.c 2014-12-13 01:23:18.000000000 +0000 -+++ connman-1.29/src/ntp.c 2015-08-12 16:17:19.636686053 +0000 -@@ -180,7 +180,7 @@ - msg.xmttime.fraction = htonl(transmit_timeval.tv_usec * 1000); - - len = sendto(fd, &msg, sizeof(msg), MSG_DONTWAIT, -- &addr, sizeof(addr)); -+ (struct sockaddr *) &addr, sizeof(addr)); - if (len < 0) { - connman_error("Time request for server %s failed (%d/%s)", - server, errno, strerror(errno)); diff --git a/net-misc/connman/files/connman-1.31-xtables.patch b/net-misc/connman/files/connman-1.31-xtables.patch deleted file mode 100644 index 84f4445e..00000000 --- a/net-misc/connman/files/connman-1.31-xtables.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- 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 - #include - #include - #include - #include --#include -+#include "connman_xtables.h" - #include - - #include - - #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 - #endif - - #include - --#include -+#include "connman_xtables.h" - #include - - #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,21 @@ -+#ifndef CONNMAN_XTABLES_H -+#define CONNMAN_XTABLES_H -+ -+#include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) || \ -+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+#include -+#else -+#ifdef __USE_MISC -+#define GENTOO_USE_MISC __USE_MISC -+#undef __USE_MISC -+#endif -+ -+#include -+ -+#ifdef GENTOO_USE_MISC -+#define __USE_MISC GENTOO_USE_MISC -+#undef GENTOO_USE_MISC -+#endif -+#endif -+#endif diff --git a/net-misc/connman/files/connman-1.32-execinfo.patch b/net-misc/connman/files/connman-1.32-execinfo.patch deleted file mode 100644 index 66f91602..00000000 --- a/net-misc/connman/files/connman-1.32-execinfo.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur connman-1.32/src/backtrace.c connman-1.32.new/src/backtrace.c ---- connman-1.32/src/backtrace.c 2016-04-18 00:04:30.000000000 -0700 -+++ connman-1.32.new/src/backtrace.c 2016-06-17 13:55:08.257320750 -0700 -@@ -29,7 +29,9 @@ - #include - #include - #include -+#ifdef HAVE_EXECINFO_H - #include -+#endif - #include - - #include "connman.h" -@@ -37,6 +39,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,4 +138,5 @@ - - close(outfd[1]); - close(infd[0]); -+#endif /* HAVE_EXECINFO_H */ - } 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 57ef5e8c..00000000 --- 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) diff --git a/net-misc/connman/files/connman-1.33-resolv-conf-overwrite.patch b/net-misc/connman/files/connman-1.33-resolv-conf-overwrite.patch deleted file mode 100644 index 49bb8ba3..00000000 --- a/net-misc/connman/files/connman-1.33-resolv-conf-overwrite.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- connman-1.33/scripts/connman_resolvconf.conf.in.old 2016-10-09 11:27:20.425341843 -0700 -+++ connman-1.33/scripts/connman_resolvconf.conf.in 2016-10-09 11:27:10.662476565 -0700 -@@ -1,2 +1,2 @@ - d @runstatedir@/connman - - - - --L+ /etc/resolv.conf - - - - @runstatedir@/connman/resolv.conf -+L /etc/resolv.conf - - - - @runstatedir@/connman/resolv.conf diff --git a/net-misc/connman/files/connman-1.35-musl-fixes.patch b/net-misc/connman/files/connman-1.35-musl-fixes.patch deleted file mode 100644 index 6290f68d..00000000 --- a/net-misc/connman/files/connman-1.35-musl-fixes.patch +++ /dev/null @@ -1,179 +0,0 @@ ---- ./configure.ac.orig -+++ ./configure.ac -@@ -171,6 +171,8 @@ - AM_CONDITIONAL(PPTP, test "${enable_pptp}" != "no") - AM_CONDITIONAL(PPTP_BUILTIN, test "${enable_pptp}" = "builtin") - -+AC_CHECK_MEMBERS([struct in6_pktinfo.ipi6_addr], [], [], [[#include ]]) -+AC_CHECK_HEADERS(execinfo.h) - AC_CHECK_HEADERS(resolv.h, dummy=yes, - AC_MSG_ERROR(resolver header files are required)) - AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [ -diff --git a/gdhcp/common.c b/gdhcp/common.c -index e111150..ee4dc43 100644 ---- a/gdhcp/common.c -+++ b/gdhcp/common.c -@@ -22,6 +22,7 @@ - #include - #endif - -+#define _GNU_SOURCE - #include - #include - #include -@@ -31,7 +32,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -39,6 +39,8 @@ - #include "gdhcp.h" - #include "common.h" - -+#include -+ - static const DHCPOption client_options[] = { - { OPTION_IP, 0x01 }, /* subnet-mask */ - { OPTION_IP | OPTION_LIST, 0x03 }, /* routers */ -diff --git a/src/log.c b/src/log.c -index a693bd0..9054462 100644 ---- a/src/log.c -+++ b/src/log.c - static void signal_handler(int signo) -diff --git a/tools/dhcp-test.c b/tools/dhcp-test.c -index c34e10a..eae66fc 100644 ---- a/tools/dhcp-test.c -+++ b/tools/dhcp-test.c -@@ -33,7 +33,6 @@ - #include - #include - #include --#include - - #include - -diff --exclude '*.*o' -ru connman-1.24.orig/plugins/wifi.c connman-1.24/plugins/wifi.c ---- connman-1.24.orig/plugins/wifi.c 2014-06-07 21:46:22.000000000 -0300 -+++ connman-1.24/plugins/wifi.c 2014-07-18 20:37:16.811343663 -0300 -@@ -30,9 +30,8 @@ - #include - #include - #include --#include --#include - #include -+#include - - #ifndef IFF_LOWER_UP - #define IFF_LOWER_UP 0x10000 -diff --exclude '*.*o' -ru connman-1.24.orig/src/tethering.c connman-1.24/src/tethering.c ---- connman-1.24.orig/src/tethering.c 2014-04-04 15:12:07.000000000 -0300 -+++ connman-1.24/src/tethering.c 2014-07-18 20:39:12.091344804 -0300 -@@ -31,10 +31,8 @@ - #include - #include - #include --#include - #include - #include --#include - #include - #include - -diff --exclude '*.*o' -ru connman-1.24.orig/tools/dnsproxy-test.c connman-1.24/tools/dnsproxy-test.c ---- connman-1.24.orig/tools/dnsproxy-test.c 2013-12-05 09:12:12.000000000 -0200 -+++ connman-1.24/tools/dnsproxy-test.c 2014-07-18 20:36:37.484676606 -0300 -@@ -24,6 +24,7 @@ - #endif - - #include -+#include - #include - #include - #include -diff --exclude '*.*o' -ru connman-1.24.orig/tools/private-network-test.c connman-1.24/tools/private-network-test.c ---- connman-1.24.orig/tools/private-network-test.c 2013-08-19 19:57:25.000000000 -0300 -+++ connman-1.24/tools/private-network-test.c 2014-07-18 20:28:42.644671909 -0300 -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -diff --exclude '*.*o' -ru connman-1.24.orig/tools/tap-test.c connman-1.24/tools/tap-test.c ---- connman-1.24.orig/tools/tap-test.c 2013-12-05 09:12:12.000000000 -0200 -+++ connman-1.24/tools/tap-test.c 2014-07-18 20:28:35.351338499 -0300 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - #include - - #include -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:43:40.000000000 -0300 -+++ connman-1.24/gweb/gresolv.c 2014-07-18 20:44:43.284681413 -0300 -@@ -24,6 +24,7 @@ - #endif - - #include -+#include - #include - #include - #include -diff '--exclude=*.*o' -ru connman-1.24.orig/src/ippool.c connman-1.24/src/ippool.c ---- connman-1.24.orig/src/ippool.c 2014-04-04 15:12:07.000000000 -0300 -+++ connman-1.24/src/ippool.c 2014-07-18 20:44:56.068014872 -0300 -@@ -28,7 +28,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "connman.h" -diff '--exclude=*.*o' -ru connman-1.24.orig/src/iptables.c connman-1.24/src/iptables.c ---- connman-1.24.orig/src/iptables.c 2014-04-04 15:12:07.000000000 -0300 -+++ connman-1.24/src/iptables.c 2014-07-18 20:44:25.844681240 -0300 -@@ -28,7 +28,7 @@ - #include - #include - #include --#include -+#include - #include - #include - - ---- ./gdhcp/common.h.orig -+++ ./gdhcp/common.h -@@ -18,6 +18,9 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ -+#ifdef HAVE_CONFIG_H -+#include -+#endif - - #include - #include -@@ -170,8 +173,8 @@ - [OPTION_U32] = 4, - }; - --/* already defined within netinet/in.h if using GNU compiler */ --#ifndef __USE_GNU -+/* already defined within netinet/in.h if using GNU or musl libc */ -+#ifndef HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR - struct in6_pktinfo { - struct in6_addr ipi6_addr; /* src/dst IPv6 address */ - unsigned int ipi6_ifindex; /* send/recv interface index */ diff --git a/net-misc/connman/files/connman-1.38-musl-fixes.patch b/net-misc/connman/files/connman-1.38-musl-fixes.patch deleted file mode 100644 index 043f13f1..00000000 --- a/net-misc/connman/files/connman-1.38-musl-fixes.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- ./configure.ac.orig -+++ ./configure.ac -@@ -171,6 +171,8 @@ - AM_CONDITIONAL(PPTP, test "${enable_pptp}" != "no") - AM_CONDITIONAL(PPTP_BUILTIN, test "${enable_pptp}" = "builtin") - -+AC_CHECK_MEMBERS([struct in6_pktinfo.ipi6_addr], [], [], [[#include ]]) -+AC_CHECK_HEADERS(execinfo.h) - AC_CHECK_HEADERS(resolv.h, dummy=yes, - AC_MSG_ERROR(resolver header files are required)) - AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [ -diff --git a/gdhcp/common.c b/gdhcp/common.c -index e111150..ee4dc43 100644 ---- a/gdhcp/common.c -+++ b/gdhcp/common.c -@@ -22,6 +22,7 @@ - #include - #endif - -+#define _GNU_SOURCE - #include - #include - #include -@@ -31,7 +32,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -39,6 +39,8 @@ - #include "gdhcp.h" - #include "common.h" - -+#include -+ - static const DHCPOption client_options[] = { - { OPTION_IP, 0x01 }, /* subnet-mask */ - { OPTION_IP | OPTION_LIST, 0x03 }, /* routers */ -diff --git a/src/log.c b/src/log.c -index a693bd0..9054462 100644 ---- a/src/log.c -+++ b/src/log.c - static void signal_handler(int signo) -diff --exclude '*.*o' -ru connman-1.24.orig/src/tethering.c connman-1.24/src/tethering.c ---- connman-1.24.orig/src/tethering.c 2014-04-04 15:12:07.000000000 -0300 -+++ connman-1.24/src/tethering.c 2014-07-18 20:39:12.091344804 -0300 -@@ -31,8 +31,6 @@ - #include - #include - #include --#include --#include - #include - - #include "connman.h" -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:43:40.000000000 -0300 -+++ connman-1.24/gweb/gresolv.c 2014-07-18 20:44:43.284681413 -0300 -@@ -24,6 +24,8 @@ - #endif - - #include -+#include -+#include - #include - #include - #include ---- ./gdhcp/common.h.orig -+++ ./gdhcp/common.h -@@ -18,6 +18,9 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ -+#ifdef HAVE_CONFIG_H -+#include -+#endif - - #include - #include \ No newline at end of file diff --git a/net-misc/connman/files/connman-9999-musl-fixes.patch b/net-misc/connman/files/connman-9999-musl-fixes.patch deleted file mode 100644 index 043f13f1..00000000 --- a/net-misc/connman/files/connman-9999-musl-fixes.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- ./configure.ac.orig -+++ ./configure.ac -@@ -171,6 +171,8 @@ - AM_CONDITIONAL(PPTP, test "${enable_pptp}" != "no") - AM_CONDITIONAL(PPTP_BUILTIN, test "${enable_pptp}" = "builtin") - -+AC_CHECK_MEMBERS([struct in6_pktinfo.ipi6_addr], [], [], [[#include ]]) -+AC_CHECK_HEADERS(execinfo.h) - AC_CHECK_HEADERS(resolv.h, dummy=yes, - AC_MSG_ERROR(resolver header files are required)) - AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [ -diff --git a/gdhcp/common.c b/gdhcp/common.c -index e111150..ee4dc43 100644 ---- a/gdhcp/common.c -+++ b/gdhcp/common.c -@@ -22,6 +22,7 @@ - #include - #endif - -+#define _GNU_SOURCE - #include - #include - #include -@@ -31,7 +32,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -39,6 +39,8 @@ - #include "gdhcp.h" - #include "common.h" - -+#include -+ - static const DHCPOption client_options[] = { - { OPTION_IP, 0x01 }, /* subnet-mask */ - { OPTION_IP | OPTION_LIST, 0x03 }, /* routers */ -diff --git a/src/log.c b/src/log.c -index a693bd0..9054462 100644 ---- a/src/log.c -+++ b/src/log.c - static void signal_handler(int signo) -diff --exclude '*.*o' -ru connman-1.24.orig/src/tethering.c connman-1.24/src/tethering.c ---- connman-1.24.orig/src/tethering.c 2014-04-04 15:12:07.000000000 -0300 -+++ connman-1.24/src/tethering.c 2014-07-18 20:39:12.091344804 -0300 -@@ -31,8 +31,6 @@ - #include - #include - #include --#include --#include - #include - - #include "connman.h" -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:43:40.000000000 -0300 -+++ connman-1.24/gweb/gresolv.c 2014-07-18 20:44:43.284681413 -0300 -@@ -24,6 +24,8 @@ - #endif - - #include -+#include -+#include - #include - #include - #include ---- ./gdhcp/common.h.orig -+++ ./gdhcp/common.h -@@ -18,6 +18,9 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ -+#ifdef HAVE_CONFIG_H -+#include -+#endif - - #include - #include \ No newline at end of file diff --git a/net-misc/connman/files/connman-musl-libresolv.patch b/net-misc/connman/files/connman-musl-libresolv.patch deleted file mode 100644 index c28a7c1e..00000000 --- a/net-misc/connman/files/connman-musl-libresolv.patch +++ /dev/null @@ -1,61 +0,0 @@ -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) - diff --git a/net-misc/connman/files/connman-musl-log.patch b/net-misc/connman/files/connman-musl-log.patch deleted file mode 100644 index 42516c92..00000000 --- a/net-misc/connman/files/connman-musl-log.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naurw connman-1.31.orig/src/log.c connman-1.31/src/log.c ---- connman-1.31.orig/src/log.c 2014-04-04 05:12:07.000000000 -0700 -+++ connman-1.31/src/log.c 2016-02-01 11:25:11.137973207 -0800 -@@ -30,7 +30,9 @@ - #include - #include - #include -+#ifdef HAVE_EXECINFO_H - #include -+#endif - #include - - #include "connman.h" -@@ -112,6 +114,7 @@ - - static void print_backtrace(unsigned int offset) - { -+#ifdef HAVE_EXECINFO_H - void *frames[99]; - size_t n_ptrs; - unsigned int i; -@@ -210,6 +213,7 @@ - - close(outfd[1]); - close(infd[0]); -+#endif /* HAVE_EXECINFO_H */ - } - - static void signal_handler(int signo) diff --git a/net-misc/connman/files/connman-musl.patch b/net-misc/connman/files/connman-musl.patch deleted file mode 100644 index 18f40870..00000000 --- a/net-misc/connman/files/connman-musl.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff -Naurw connman-1.31.orig/configure.ac connman-1.31/configure.ac ---- connman-1.31.orig/configure.ac 2015-12-27 19:05:49.000000000 -0800 -+++ connman-1.31/configure.ac 2016-02-01 11:22:09.576978370 -0800 -@@ -175,6 +175,8 @@ - AM_CONDITIONAL(PPTP, test "${enable_pptp}" != "no") - AM_CONDITIONAL(PPTP_BUILTIN, test "${enable_pptp}" = "builtin") - -+AC_CHECK_MEMBERS([struct in6_pktinfo.ipi6_addr], [], [], [[#include ]]) -+AC_CHECK_HEADERS(execinfo.h) - AC_CHECK_HEADERS(resolv.h, dummy=yes, - AC_MSG_ERROR(resolver header files are required)) - AC_CHECK_LIB(resolv, ns_initparse, dummy=yes, [ -diff -Naurw connman-1.31.orig/gdhcp/common.c connman-1.31/gdhcp/common.c ---- connman-1.31.orig/gdhcp/common.c 2015-04-19 15:16:21.000000000 -0700 -+++ connman-1.31/gdhcp/common.c 2016-02-01 11:22:46.169977330 -0800 -@@ -22,6 +22,7 @@ - #include - #endif - -+#define _GNU_SOURCE - #include - #include - #include -@@ -31,7 +32,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -40,6 +40,8 @@ - #include "gdhcp.h" - #include "common.h" - -+#include -+ - static const DHCPOption client_options[] = { - { OPTION_IP, 0x01 }, /* subnet-mask */ - { OPTION_IP | OPTION_LIST, 0x03 }, /* routers */ -diff -Naurw connman-1.31.orig/gdhcp/common.h connman-1.31/gdhcp/common.h ---- connman-1.31.orig/gdhcp/common.h 2015-04-19 15:16:21.000000000 -0700 -+++ connman-1.31/gdhcp/common.h 2016-02-01 11:29:53.731965170 -0800 -@@ -18,6 +18,9 @@ - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ -+#ifdef HAVE_CONFIG_H -+#include -+#endif - - #include - #include -@@ -170,8 +173,8 @@ - [OPTION_U32] = 4, - }; - --/* already defined within netinet/in.h if using GNU compiler */ --#ifndef __USE_GNU -+/* already defined within netinet/in.h if using GNU compiler or musl libc */ -+#ifndef HAVE_STRUCT_IN6_PKTINFO_IPI6_ADDR - struct in6_pktinfo { - struct in6_addr ipi6_addr; /* src/dst IPv6 address */ - unsigned int ipi6_ifindex; /* send/recv interface index */ -diff -Naurw connman-1.31.orig/gweb/gresolv.c connman-1.31/gweb/gresolv.c ---- connman-1.31.orig/gweb/gresolv.c 2014-04-04 05:12:07.000000000 -0700 -+++ connman-1.31/gweb/gresolv.c 2016-02-01 11:27:46.207968797 -0800 -@@ -24,6 +24,7 @@ - #endif - - #include -+#include - #include - #include - #include -diff -Naurw connman-1.31.orig/plugins/wifi.c connman-1.31/plugins/wifi.c ---- connman-1.31.orig/plugins/wifi.c 2015-12-27 19:05:49.000000000 -0800 -+++ connman-1.31/plugins/wifi.c 2016-02-01 11:25:59.192971840 -0800 -@@ -30,9 +30,8 @@ - #include - #include - #include --#include --#include - #include -+#include - - #ifndef IFF_LOWER_UP - #define IFF_LOWER_UP 0x10000 -diff -Naurw connman-1.31.orig/src/tethering.c connman-1.31/src/tethering.c ---- connman-1.31.orig/src/tethering.c 2015-12-27 19:05:49.000000000 -0800 -+++ connman-1.31/src/tethering.c 2016-02-01 11:26:50.049970394 -0800 -@@ -31,10 +31,8 @@ - #include - #include - #include --#include - #include - #include --#include - #include - #include - -diff -Naurw connman-1.31.orig/tools/dhcp-test.c connman-1.31/tools/dhcp-test.c ---- connman-1.31.orig/tools/dhcp-test.c 2013-08-19 09:57:25.000000000 -0700 -+++ connman-1.31/tools/dhcp-test.c 2016-02-01 11:25:21.907972901 -0800 -@@ -33,7 +33,6 @@ - #include - #include - #include --#include - - #include - -diff -Naurw connman-1.31.orig/tools/dnsproxy-test.c connman-1.31/tools/dnsproxy-test.c ---- connman-1.31.orig/tools/dnsproxy-test.c 2013-12-04 23:12:12.000000000 -0800 -+++ connman-1.31/tools/dnsproxy-test.c 2016-02-01 11:27:04.525969982 -0800 -@@ -24,6 +24,7 @@ - #endif - - #include -+#include - #include - #include - #include diff --git a/net-misc/connman/files/connman.confd b/net-misc/connman/files/connman.confd deleted file mode 100644 index 6d0c399e..00000000 --- a/net-misc/connman/files/connman.confd +++ /dev/null @@ -1,15 +0,0 @@ -# conf.d file for connman -# -# Please check connmand --help for more information. -# Useful options are: -# -c, --compat: enable NetworkManager compatibility mode. -# -W, --wifi=NAME: select wpa_supplicant wifi driver to use. -# This is useful if your wpa_supplicant is < 0.7 -# since connmand by default gives wpa_supplicant a -# comma separated list of values and < 0.7 does not -# understand or accept it. -# -i, --device=DEV: force use of given interface name. -# -I, --nodevice=DEV: force ignore of given interface name. -# -p, --plugin=NAME: specify plugins to load. -# -P, --noplugin=NAME: specify plugins not to load. -CONNMAN_OPTS="" diff --git a/net-misc/connman/files/connman.initd2 b/net-misc/connman/files/connman.initd2 deleted file mode 100644 index 428245d7..00000000 --- a/net-misc/connman/files/connman.initd2 +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Purpose License v2 - -depend() { - need dbus - provide net -} - -start() { - ebegin "Starting Connection Manager" - start-stop-daemon --start --quiet --exec /usr/sbin/connmand -- ${CONNMAN_OPTS} - eend $? -} - -stop() { - ebegin "Stopping Connection Manager" - start-stop-daemon --stop --quiet --exec /usr/sbin/connmand - eend $? -} - -# vim: set ft=gentoo-init-d ts=3 sw=3 et: diff --git a/net-misc/connman/files/connman.service b/net-misc/connman/files/connman.service deleted file mode 100644 index ece38a71..00000000 --- a/net-misc/connman/files/connman.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Network Connection Manager Daemon - -[Service] -Type=dbus -BusName=net.connman -ExecStart=/usr/sbin/connmand --nodaemon - -[Install] -WantedBy=multi-user.target -Alias=net.connman.service diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml deleted file mode 100644 index 7ca0a323..00000000 --- a/net-misc/connman/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - bkohler@gentoo.org - Ben Kohler - - - Enable ethernet support. - Enable wifi support via net-wireless/iwd - Use net-dialup/xl2tpd for L2TP VPN support. - Use net-firewall/iptables as firewall. - Use net-firewall/nftables as firewall. - Use net-misc/ofono for telephony support. - Use net-vpn/openconnect for VPN support. - Use net-vpn/openvpn for openvpn support. - Use net-dialup/pptpclient for PPTP VPN support. - Enable testing tools. - Use net-vpn/vpnc for cisco VPN support. - Enable support for WISPr hotspot logins. - Enable WireGuard VPN support. - - - cpe:/a:intel:connman - - -- cgit v1.2.3-65-gdbad