diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2012-01-26 16:29:47 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-01-30 17:46:16 +0100 |
| commit | f823dadf0af64133c07f1e185c0c4d9dd452c74c (patch) | |
| tree | 52e95ac86c7d14948e6b8167296c64b9088f3098 | |
| parent | 83f969bee74d9eaaeafe97cbfc18cbbfbf767b9c (diff) | |
| download | ptxdist-f823dadf0af64133c07f1e185c0c4d9dd452c74c.tar.gz ptxdist-f823dadf0af64133c07f1e185c0c4d9dd452c74c.tar.xz | |
connman: update to 0.78 and pick a bugfix from upstream
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/connman-0.78/0001-iptables-Avoid-NULL-pointer-dereference-in-table_cle.patch | 23 | ||||
| -rw-r--r-- | patches/connman-0.78/series | 1 | ||||
| -rw-r--r-- | rules/connman.make | 7 |
3 files changed, 28 insertions, 3 deletions
diff --git a/patches/connman-0.78/0001-iptables-Avoid-NULL-pointer-dereference-in-table_cle.patch b/patches/connman-0.78/0001-iptables-Avoid-NULL-pointer-dereference-in-table_cle.patch new file mode 100644 index 000000000..c78ae00a1 --- /dev/null +++ b/patches/connman-0.78/0001-iptables-Avoid-NULL-pointer-dereference-in-table_cle.patch @@ -0,0 +1,23 @@ +From a4ae1cf0ac362fdda02522eb8bed94059d3ed3e8 Mon Sep 17 00:00:00 2001 +From: Daniel Mack <zonque@gmail.com> +Date: Wed, 21 Dec 2011 11:18:20 +0100 +Subject: [PATCH] iptables: Avoid NULL pointer dereference in table_cleanup() + +--- + src/iptables.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/src/iptables.c b/src/iptables.c +index 807f22c..1494216 100644 +--- a/src/iptables.c ++++ b/src/iptables.c +@@ -1152,6 +1152,9 @@ static void table_cleanup(struct connman_iptables *table) + GList *list; + struct connman_iptables_entry *entry; + ++ if (table == NULL) ++ return; ++ + close(table->ipt_sock); + + for (list = table->entries; list; list = list->next) { diff --git a/patches/connman-0.78/series b/patches/connman-0.78/series new file mode 100644 index 000000000..8ae4c83e5 --- /dev/null +++ b/patches/connman-0.78/series @@ -0,0 +1 @@ +0001-iptables-Avoid-NULL-pointer-dereference-in-table_cle.patch diff --git a/rules/connman.make b/rules/connman.make index 2cf8b16dd..71ce71e09 100644 --- a/rules/connman.make +++ b/rules/connman.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_CONNMAN) += connman # # Paths and names # -CONNMAN_VERSION := 0.77 -CONNMAN_MD5 := 6cad9f9c9dd216a148bb8aef5732c9aa 2e95edb0ead4fff3e84458f7fa192a64 +CONNMAN_VERSION := 0.78 +CONNMAN_MD5 := 91be619c28af2bed4c79a771c4845a33 CONNMAN := connman-$(CONNMAN_VERSION) CONNMAN_SUFFIX := tar.gz CONNMAN_URL := $(call ptx/mirror, KERNEL, network/connman/$(CONNMAN).$(CONNMAN_SUFFIX)) @@ -43,9 +43,10 @@ CONNMAN_CONF_OPT := \ --disable-hh2serial-gps \ --disable-ofono \ --disable-openconnect \ - --disable-portal \ --disable-openvpn \ --disable-vpnc \ + --disable-l2tp \ + --disable-pptp \ --$(call ptx/endis, PTXCONF_CONNMAN_LOOPBACK)-loopback \ --disable-pacrunner \ --disable-google \ |