diff options
| author |   Nicholas Vinson <nvinson234@gmail.com> | 2016-10-08 12:09:05 -0700 |
|---|---|---|
| committer |   Yixun Lan <dlan@gentoo.org> | 2016-10-11 16:59:02 +0800 |
| commit | 6b88e653f4cc941302f16d1bf7a85412657a478b (patch) | |
| tree | 9bac05342c4f014cab08d4e019a9967ef312224b /net-misc/connman/files | |
| parent | sys-fs/e2fsprogs: Stable for HPPA (bug #596788). (diff) | |
| download | gentoo-6b88e653f4cc941302f16d1bf7a85412657a478b.tar.gz gentoo-6b88e653f4cc941302f16d1bf7a85412657a478b.tar.bz2 gentoo-6b88e653f4cc941302f16d1bf7a85412657a478b.zip | |
net-misc/connman: Fix polkit check, resolv.conf overwrite issue
Fixes the broken pollkit detection error
Fixes the issue of /etc/resolv.conf being overwritten unconditionally
Removes the unneeded hunks from the connman-1.32-execinfo-assumptions.patch
Gentoo-bug: #591596
Gentoo-bug: #596270
Gentoo-bug: #596276
Closes: https://github.com/gentoo/gentoo/pull/2515
Package-Manager: portage-2.3.1
Signed-off-by: Yixun Lan <dlan@gentoo.org>
Diffstat (limited to 'net-misc/connman/files')
3 files changed, 21 insertions, 25 deletions
diff --git a/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch b/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch index eb8e4fc0c131..c27e89610cd9 100644 --- a/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch +++ b/net-misc/connman/files/connman-1.32-execinfo-assumptions.patch @@ -1,28 +1,3 @@ -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 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 new file mode 100644 index 000000000000..57ef5e8ccbac --- /dev/null +++ b/net-misc/connman/files/connman-1.33-polkit-configure-check-fix.patch @@ -0,0 +1,15 @@ +--- 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 new file mode 100644 index 000000000000..49bb8ba3c5a1 --- /dev/null +++ b/net-misc/connman/files/connman-1.33-resolv-conf-overwrite.patch @@ -0,0 +1,6 @@ +--- 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 |