1 |
commit: e5b584b1a787678a9a7b7e547034b32710a6b314 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jan 11 17:55:18 2019 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 9 19:55:01 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b584b1 |
7 |
|
8 |
net-misc/connman: remove unused patches |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/10806 |
12 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
13 |
|
14 |
.../files/connman-1.16-execinfo-assumptions.patch | 54 ---------------------- |
15 |
net-misc/connman/files/connman-1.31-xtables.patch | 54 ---------------------- |
16 |
net-misc/connman/files/connman.service | 11 ----- |
17 |
3 files changed, 119 deletions(-) |
18 |
|
19 |
diff --git a/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch b/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch |
20 |
deleted file mode 100644 |
21 |
index 5404414fc0e..00000000000 |
22 |
--- a/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch |
23 |
+++ /dev/null |
24 |
@@ -1,54 +0,0 @@ |
25 |
-diff -uNr a/config.h.in b/config.h.in |
26 |
---- a/config.h.in 2013-07-02 17:41:03.715261748 +0000 |
27 |
-+++ b/config.h.in 2013-07-02 17:41:21.707260667 +0000 |
28 |
-@@ -3,6 +3,9 @@ |
29 |
- /* Define to 1 if you have the <dlfcn.h> header file. */ |
30 |
- #undef HAVE_DLFCN_H |
31 |
- |
32 |
-+/* Define to 1 if you have the <execinfo.h> header file. */ |
33 |
-+#undef HAVE_EXECINFO_H |
34 |
-+ |
35 |
- /* Define to 1 if you have the <inttypes.h> header file. */ |
36 |
- #undef HAVE_INTTYPES_H |
37 |
- |
38 |
-diff -uNr a/configure.ac b/configure.ac |
39 |
---- a/configure.ac 2013-07-02 17:41:03.715261748 +0000 |
40 |
-+++ b/configure.ac 2013-07-02 17:41:21.719260666 +0000 |
41 |
-@@ -181,6 +181,8 @@ |
42 |
- AC_CHECK_FUNC(signalfd, dummy=yes, |
43 |
- AC_MSG_ERROR(signalfd support is required)) |
44 |
- |
45 |
-+AC_CHECK_HEADERS([execinfo.h], [], []) |
46 |
-+ |
47 |
- AC_CHECK_LIB(dl, dlopen, dummy=yes, |
48 |
- AC_MSG_ERROR(dynamic linking loader is required)) |
49 |
- |
50 |
-diff -uNr a/src/log.c b/src/log.c |
51 |
---- a/src/log.c 2013-07-02 17:41:03.727261747 +0000 |
52 |
-+++ b/src/log.c 2013-07-02 17:42:12.717257603 +0000 |
53 |
-@@ -30,7 +30,9 @@ |
54 |
- #include <stdlib.h> |
55 |
- #include <string.h> |
56 |
- #include <syslog.h> |
57 |
-+#ifdef HAVE_EXECINFO_H |
58 |
- #include <execinfo.h> |
59 |
-+#endif |
60 |
- #include <dlfcn.h> |
61 |
- |
62 |
- #include "connman.h" |
63 |
-@@ -112,6 +114,7 @@ |
64 |
- |
65 |
- static void print_backtrace(unsigned int offset) |
66 |
- { |
67 |
-+#ifdef HAVE_EXECINFO_H |
68 |
- void *frames[99]; |
69 |
- size_t n_ptrs; |
70 |
- unsigned int i; |
71 |
-@@ -210,6 +213,7 @@ |
72 |
- |
73 |
- close(outfd[1]); |
74 |
- close(infd[0]); |
75 |
-+#endif |
76 |
- } |
77 |
- |
78 |
- static void signal_handler(int signo) |
79 |
|
80 |
diff --git a/net-misc/connman/files/connman-1.31-xtables.patch b/net-misc/connman/files/connman-1.31-xtables.patch |
81 |
deleted file mode 100644 |
82 |
index 84f4445e8da..00000000000 |
83 |
--- a/net-misc/connman/files/connman-1.31-xtables.patch |
84 |
+++ /dev/null |
85 |
@@ -1,54 +0,0 @@ |
86 |
---- connman-1.31/src/iptables.c.old 2016-03-22 20:12:47.829460752 -0700 |
87 |
-+++ connman-1.31/src/iptables.c 2016-03-22 21:33:36.835384724 -0700 |
88 |
-@@ -28,11 +28,11 @@ |
89 |
- #include <stdio.h> |
90 |
- #include <string.h> |
91 |
- #include <unistd.h> |
92 |
- #include <sys/errno.h> |
93 |
- #include <sys/socket.h> |
94 |
--#include <xtables.h> |
95 |
-+#include "connman_xtables.h" |
96 |
- #include <inttypes.h> |
97 |
- |
98 |
- #include <linux/netfilter_ipv4/ip_tables.h> |
99 |
- |
100 |
- #include "connman.h" |
101 |
---- connman-1.31/src/firewall.c.old 2016-03-22 21:29:01.959472262 -0700 |
102 |
-+++ connman-1.31/src/firewall.c 2016-03-22 21:33:53.048144181 -0700 |
103 |
-@@ -23,11 +23,11 @@ |
104 |
- #include <config.h> |
105 |
- #endif |
106 |
- |
107 |
- #include <errno.h> |
108 |
- |
109 |
--#include <xtables.h> |
110 |
-+#include "connman_xtables.h" |
111 |
- #include <linux/netfilter_ipv4/ip_tables.h> |
112 |
- |
113 |
- #include "connman.h" |
114 |
- |
115 |
- #define CHAIN_PREFIX "connman-" |
116 |
---- /dev/null 2016-03-18 06:21:16.372989086 -0700 |
117 |
-+++ connman-1.31/include/connman_xtables.h 2016-03-22 21:32:21.349504786 -0700 |
118 |
-@@ -0,0 +1,21 @@ |
119 |
-+#ifndef CONNMAN_XTABLES_H |
120 |
-+#define CONNMAN_XTABLES_H |
121 |
-+ |
122 |
-+#include <linux/version.h> |
123 |
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) || \ |
124 |
-+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) |
125 |
-+#include <xtables.h> |
126 |
-+#else |
127 |
-+#ifdef __USE_MISC |
128 |
-+#define GENTOO_USE_MISC __USE_MISC |
129 |
-+#undef __USE_MISC |
130 |
-+#endif |
131 |
-+ |
132 |
-+#include <xtables.h> |
133 |
-+ |
134 |
-+#ifdef GENTOO_USE_MISC |
135 |
-+#define __USE_MISC GENTOO_USE_MISC |
136 |
-+#undef GENTOO_USE_MISC |
137 |
-+#endif |
138 |
-+#endif |
139 |
-+#endif |
140 |
|
141 |
diff --git a/net-misc/connman/files/connman.service b/net-misc/connman/files/connman.service |
142 |
deleted file mode 100644 |
143 |
index ece38a716e9..00000000000 |
144 |
--- a/net-misc/connman/files/connman.service |
145 |
+++ /dev/null |
146 |
@@ -1,11 +0,0 @@ |
147 |
-[Unit] |
148 |
-Description=Network Connection Manager Daemon |
149 |
- |
150 |
-[Service] |
151 |
-Type=dbus |
152 |
-BusName=net.connman |
153 |
-ExecStart=/usr/sbin/connmand --nodaemon |
154 |
- |
155 |
-[Install] |
156 |
-WantedBy=multi-user.target |
157 |
-Alias=net.connman.service |