diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-22 07:40:51 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-22 07:41:19 +0000 |
| commit | 71b46747aa2c97de1019cf62657967e2cfb686f7 (patch) | |
| tree | 7e32e9a1a6cb379afea15dfc04ea34759c2712d0 /testing | |
| parent | 8d0f3c6c1348a40d12399dcef5df4e6f5207c310 (diff) | |
| download | aports-71b46747aa2c97de1019cf62657967e2cfb686f7.tar.bz2 aports-71b46747aa2c97de1019cf62657967e2cfb686f7.tar.xz | |
testing/connman: upgrade to 1.29
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/connman/APKBUILD | 17 | ||||
| -rw-r--r-- | testing/connman/musl-fixes.patch | 45 |
2 files changed, 36 insertions, 26 deletions
diff --git a/testing/connman/APKBUILD b/testing/connman/APKBUILD index 37cf41b150..905c2b6407 100644 --- a/testing/connman/APKBUILD +++ b/testing/connman/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=connman -pkgver=1.24 +pkgver=1.29 pkgrel=0 pkgdesc="An alternative daemon for managing internet connections on Linux" url="http://connman.net/" @@ -9,7 +9,7 @@ license="GPLv2" depends="wpa_supplicant" depends_dev="" makedepends="$depends_dev glib-dev iptables-dev readline-dev - dbus-dev" + dbus-dev autoconf automake libtool" install="" subpackages="$pkgname-dev $pkgname-doc" source="http://www.kernel.org/pub/linux/network/connman/connman-$pkgver.tar.xz @@ -27,6 +27,7 @@ prepare() { esac done update_config_sub + autoreconf -vif || return 1 } build() { @@ -50,12 +51,12 @@ package() { rm -f "$pkgdir"/usr/lib/*.la } -md5sums="dd6e1b4d9b9a28d127edb9f9b58bdec1 connman-1.24.tar.xz -07b13030c281a0114cd376e094f1eb1c musl-fixes.patch +md5sums="5283884504860f5fba2e6f489f517293 connman-1.29.tar.xz +649a12007599e37f250f053e38b197c3 musl-fixes.patch 7ce81d8578903db13b92aae7479f0624 libresolv.patch" -sha256sums="551df7a5f0c6e4d69523dd2b3aa2c54525b323457d5135f64816215bad3dc24c connman-1.24.tar.xz -76b43bb4b0ee93434721e4aa0d1b6f4e45fbe5c33329286f6cb4f3cf458b6eed musl-fixes.patch +sha256sums="2a5a69693566f7fd59b2e677fa89356ada6d709998aa665caef8707b1e7a8594 connman-1.29.tar.xz +9e4fe373cdffef36e5559581e285c34be2f70f3056b8478a157f0170a192a0a0 musl-fixes.patch 6a36a7d85d12d5ce927c741ca41ddb40a4eb5351dd0112cebc93134113641edb libresolv.patch" -sha512sums="12ed0b476e8b590602eb5eea6175404cb6e377aba3a061fe42a16548325e2ad1ac3e285e92b4e66bd430ba3766c84da884383abaed0c89dca2ca511d83c8d7b4 connman-1.24.tar.xz -aee4fd55447492edc0f4ee9f9c8fa4eb45a4b7eb158bd896cff31773a069c2aed1feeac0b4189ffd314b38275768601cb37b89f2fbbf12945410c9b7c7928c07 musl-fixes.patch +sha512sums="19f623dd23c6312f29bbd570dcb22d31154ffcd16ee66ed2280df3d9d844301f18538418363222d99eabdc33da0021488ed66ba2e4f88df30646004b724538ee connman-1.29.tar.xz +5894ca5656bf2643815f1c9efbd6ce5ce413893f82e381da12cbf826d896bbcdced8f051a9a255ca8e3071047a1ac34f072a413cd2f27f1ad413639e16a08c03 musl-fixes.patch c258e747e13b86c81ae96ac1743abf0c1461b9053c5b386d594a49f0b1890f10d89bea92610762ff609a4cc5fea04a43fab83894702f552b05af400f01cb011e libresolv.patch" diff --git a/testing/connman/musl-fixes.patch b/testing/connman/musl-fixes.patch index 4fce03d02b..38cb147f7c 100644 --- a/testing/connman/musl-fixes.patch +++ b/testing/connman/musl-fixes.patch @@ -1,11 +1,10 @@ -diff --git a/configure.ac b/configure.ac -index 805f02b..df211d0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -165,6 +165,7 @@ fi +--- ./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 <netinet/in.h>]]) +AC_CHECK_HEADERS(execinfo.h) AC_CHECK_HEADERS(resolv.h, dummy=yes, AC_MSG_ERROR(resolver header files are required)) @@ -39,19 +38,6 @@ index e111150..ee4dc43 100644 static const DHCPOption client_options[] = { { OPTION_IP, 0x01 }, /* subnet-mask */ { OPTION_IP | OPTION_LIST, 0x03 }, /* routers */ -@@ -435,10 +437,12 @@ static const struct in6_addr in6addr_all_dhcp_relay_agents_and_servers_mc = - IN6ADDR_ALL_DHCP_RELAY_AGENTS_AND_SERVERS_MC_INIT; - - /* from netinet/in.h */ -+#if 0 - struct in6_pktinfo { - struct in6_addr ipi6_addr; /* src/dst IPv6 address */ - unsigned int ipi6_ifindex; /* send/recv interface index */ - }; -+#endif - - int dhcpv6_send_packet(int index, struct dhcpv6_packet *dhcp_pkt, int len) - { diff --git a/src/log.c b/src/log.c index a693bd0..9054462 100644 --- a/src/log.c @@ -205,3 +191,26 @@ diff '--exclude=*.*o' -ru connman-1.24.orig/src/iptables.c connman-1.24/src/ipta #include <xtables.h> +--- ./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 <config.h> ++#endif + + #include <netinet/udp.h> + #include <netinet/ip.h> +@@ -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 */ |