commit: e5b584b1a787678a9a7b7e547034b32710a6b314 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Jan 11 17:55:18 2019 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Sat Feb 9 19:55:01 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b584b1
net-misc/connman: remove unused patches Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/10806 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> .../files/connman-1.16-execinfo-assumptions.patch | 54 ---------------------- net-misc/connman/files/connman-1.31-xtables.patch | 54 ---------------------- net-misc/connman/files/connman.service | 11 ----- 3 files changed, 119 deletions(-) diff --git a/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch b/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch deleted file mode 100644 index 5404414fc0e..00000000000 --- a/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch +++ /dev/null @@ -1,54 +0,0 @@ -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/log.c b/src/log.c ---- a/src/log.c 2013-07-02 17:41:03.727261747 +0000 -+++ b/src/log.c 2013-07-02 17:42:12.717257603 +0000 -@@ -30,7 +30,9 @@ - #include <stdlib.h> - #include <string.h> - #include <syslog.h> -+#ifdef HAVE_EXECINFO_H - #include <execinfo.h> -+#endif - #include <dlfcn.h> - - #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 - } - - static void signal_handler(int signo) 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 84f4445e8da..00000000000 --- 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 <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,21 @@ -+#ifndef CONNMAN_XTABLES_H -+#define CONNMAN_XTABLES_H -+ -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) || \ -+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+#include <xtables.h> -+#else -+#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 -+#endif diff --git a/net-misc/connman/files/connman.service b/net-misc/connman/files/connman.service deleted file mode 100644 index ece38a716e9..00000000000 --- 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
