[gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/

[Ian Delaney]

commit:     aca92bb5062e3d4f796e8ffa263b5bb3600409c1
Author:     Nicholas Vinson <nvinson234 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 28 12:53:17 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 13:29:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca92bb5

net-misc/connman: Disable compatibility logic to kernels < 4.5

The compatiblity logic is only needed for kernel headers 4.5 or newer.
The older headers don't need this fix.  Make sure the fix is not applied
for them.

Gentoo-bug: 578404

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1154

Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>

 net-misc/connman/files/connman-1.31-xtables.patch | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/net-misc/connman/files/connman-1.31-xtables.patch b/net-misc/connman/files/connman-1.31-xtables.patch
index 10bdecd..5fdb648 100644
--- a/net-misc/connman/files/connman-1.31-xtables.patch
+++ b/net-misc/connman/files/connman-1.31-xtables.patch
@@ -30,9 +30,14 @@
  #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 @@
+@@ -0,0 +1,20 @@
 +#ifndef CONNMAN_XTABLES_H
 +#define CONNMAN_XTABLES_H
++
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)
++#include <xtables.h>
++#else
 +#ifdef __USE_MISC
 +#define GENTOO_USE_MISC __USE_MISC
 +#undef __USE_MISC
@@ -45,3 +50,4 @@
 +#undef GENTOO_USE_MISC
 +#endif
 +#endif
++#endif

[gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/

[Sam Jorna]

commit:     f8f65155cda9182554dcbaba8f16b3f89592f598
Author:     Nicholas Vinson <nvinson234 <AT> gmail <DOT> com>
AuthorDate: Wed May 18 13:38:36 2016 +0000
Commit:     Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Wed May 18 14:32:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8f65155

net-misc/connman: Update xtables patch for kernel versions >= 4.6.0

Gentoo-bug: 583402
Package-Manager: portage-2.3.0_rc1
Signed-off-by: Sam Jorna <wraeth <AT> gentoo.org>

 net-misc/connman/files/connman-1.31-xtables.patch | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net-misc/connman/files/connman-1.31-xtables.patch b/net-misc/connman/files/connman-1.31-xtables.patch
index 5fdb648..84f4445 100644
--- a/net-misc/connman/files/connman-1.31-xtables.patch
+++ b/net-misc/connman/files/connman-1.31-xtables.patch
@@ -30,12 +30,13 @@
  #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,20 @@
+@@ -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)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) || \
++    LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
 +#include <xtables.h>
 +#else
 +#ifdef __USE_MISC

[gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/

[Aaron Bauman]

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

[gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/

[Ben Kohler]

commit:     fe81adba6cfbeee8fa8de51dd08cc6cc3f534775
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 16:20:27 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 29 16:20:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe81adba

net-misc/connman: adjust license header on connman.initd2

Closes: https://bugs.gentoo.org/611522
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 net-misc/connman/files/connman.initd2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/connman/files/connman.initd2 b/net-misc/connman/files/connman.initd2
index 428245d7f6e..8fb98821e42 100644
--- a/net-misc/connman/files/connman.initd2
+++ b/net-misc/connman/files/connman.initd2
@@ -1,6 +1,6 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Purpose License v2
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 depend() {
    need dbus

[gentoo-commits] repo/gentoo:master commit in: net-misc/connman/files/

[Aaron Bauman]

commit:     ab6a2627b39eec6136e83f2a8806ea2b084fd0e9
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Nov  8 15:15:56 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov  8 16:03:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab6a2627

net-misc/connman: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../connman/files/connman-1.33-resolv-conf-overwrite.patch   |  6 ------
 .../files/connman-1.35-include-ifbridge-before-netinet.patch | 12 ------------
 2 files changed, 18 deletions(-)

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 49bb8ba3c5a..00000000000
--- 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-include-ifbridge-before-netinet.patch b/net-misc/connman/files/connman-1.35-include-ifbridge-before-netinet.patch
deleted file mode 100644
index 53f3c194db6..00000000000
--- a/net-misc/connman/files/connman-1.35-include-ifbridge-before-netinet.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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"
-