diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt index d93fa8200e..20fd222ada 100644 --- a/packages/addons/service/multimedia/tvheadend/changelog.txt +++ b/packages/addons/service/multimedia/tvheadend/changelog.txt @@ -1,3 +1,6 @@ +3.1.2 +- fix unloading multiple modules on suspend + 3.1.1 - rebuild for OpenELEC-3.2 diff --git a/packages/addons/service/multimedia/tvheadend/meta b/packages/addons/service/multimedia/tvheadend/meta index 1089e9cd2f..8c43bc318a 100644 --- a/packages/addons/service/multimedia/tvheadend/meta +++ b/packages/addons/service/multimedia/tvheadend/meta @@ -20,7 +20,7 @@ PKG_NAME="tvheadend" PKG_VERSION="3.4" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html" diff --git a/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power b/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power index 7fd90f9d3a..b1c0375226 100755 --- a/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power +++ b/packages/addons/service/multimedia/tvheadend/source/sleep.d/tvheadend.power @@ -24,7 +24,7 @@ ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.tvheadend" ADDON_SETTINGS="$ADDON_HOME/settings.xml" -REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` +REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | sed 's|.*value="\([^"]*\)".*|\1|g'` LOCKFILE="/var/lock/tvheadend.sleep" diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt index dcab2954a7..63569c77fd 100644 --- a/packages/addons/service/multimedia/vdr-addon/changelog.txt +++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt @@ -1,3 +1,6 @@ +3.1.2 +- fix unloading multiple modules on suspend + 3.1.1 - rebuild for OpenELEC-3.2 diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta index f8a44abc38..dfada03149 100644 --- a/packages/addons/service/multimedia/vdr-addon/meta +++ b/packages/addons/service/multimedia/vdr-addon/meta @@ -21,7 +21,7 @@ PKG_NAME="vdr-addon" PKG_VERSION="3.1" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" diff --git a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power b/packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power index 59b037f014..4b650f08ba 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power +++ b/packages/addons/service/multimedia/vdr-addon/source/sleep.d/vdr.power @@ -25,7 +25,7 @@ ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.vdr-addon" ADDON_CONFIG_DIR="$ADDON_HOME/config" ADDON_SETTINGS="$ADDON_HOME/settings.xml" -REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"` +REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | sed 's|.*value="\([^"]*\)".*|\1|g'` LOCKFILE="/var/lock/vdr.sleep" diff --git a/packages/graphics/libdrm/meta b/packages/graphics/libdrm/meta index 106f5459f0..abd352431d 100644 --- a/packages/graphics/libdrm/meta +++ b/packages/graphics/libdrm/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libdrm" -PKG_VERSION="2.4.44" +PKG_VERSION="2.4.45" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/sleep.d/99_custom-sleep b/packages/mediacenter/xbmc/sleep.d/99_custom-sleep new file mode 100755 index 0000000000..c75768a686 --- /dev/null +++ b/packages/mediacenter/xbmc/sleep.d/99_custom-sleep @@ -0,0 +1,30 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2013 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. /etc/profile + +for script in $HOME/.config/sleep.d/*.power; do + if [ -f $script ]; then + progress "running custom sleep script $script ($1)..." + sh $script $1 + fi +done diff --git a/packages/multimedia/ffmpeg/patches/1.2/ffmpeg-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch b/packages/multimedia/ffmpeg/patches/1.2/ffmpeg-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch new file mode 100644 index 0000000000..03ad57a3b4 --- /dev/null +++ b/packages/multimedia/ffmpeg/patches/1.2/ffmpeg-901.05-xvba_fix_pix_fmt_vda_vld_assert.patch @@ -0,0 +1,13 @@ +diff --git a/libavutil/utils.c b/libavutil/utils.c +index fbfbc49..56a83a7 100644 +--- a/libavutil/utils.c ++++ b/libavutil/utils.c +@@ -28,7 +28,7 @@ + + unsigned avutil_version(void) + { +- av_assert0(AV_PIX_FMT_VDA_VLD == 81); //check if the pix fmt enum has not had anything inserted or removed by mistake ++ av_assert0(AV_PIX_FMT_VDA_VLD == 82); //check if the pix fmt enum has not had anything inserted or removed by mistake + av_assert0(AV_SAMPLE_FMT_DBLP == 9); + av_assert0(AVMEDIA_TYPE_ATTACHMENT == 4); + av_assert0(AV_PICTURE_TYPE_BI == 7); diff --git a/packages/multimedia/libva-driver-intel/meta b/packages/multimedia/libva-driver-intel/meta index ef3dc690fc..883bfbc5ed 100644 --- a/packages/multimedia/libva-driver-intel/meta +++ b/packages/multimedia/libva-driver-intel/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libva-driver-intel" -PKG_VERSION="752da5e" +PKG_VERSION="1.2.0" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="GPL" diff --git a/packages/multimedia/libva/meta b/packages/multimedia/libva/meta index ea93626098..b9c73cee73 100644 --- a/packages/multimedia/libva/meta +++ b/packages/multimedia/libva/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libva" -PKG_VERSION="3c15867" +PKG_VERSION="1.2.1" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="GPL" diff --git a/packages/network/bluez/meta b/packages/network/bluez/meta index 1492a34147..d0d358e7ba 100644 --- a/packages/network/bluez/meta +++ b/packages/network/bluez/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bluez" -PKG_VERSION="5.5" +PKG_VERSION="5.6" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/connman/config/network.conf b/packages/network/connman/config/network.conf deleted file mode 100644 index 82789dc0ba..0000000000 --- a/packages/network/connman/config/network.conf +++ /dev/null @@ -1,83 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ -# network.conf -# -# This configuration file allows you to customize your network -# configuration - -# Hostname -# Sets the machine's hostname - This setting also also affects Samba, -# Avahi and some other services -# This option left blank sets the hostname to the default setting, "openelec" - HOSTNAME="" - -# Network Technology ( LAN / WLAN ) -# This option lets you switch between a LAN and WLAN connection -# Left blank or set to "LAN" sets the machine to use a wired network connection -# "WLAN" sets the machine to use a wireless connection - NETWORK="" - -# Network interface name or address -# This option lets you specificy a network device's name or address -# e.g. "eth0", "wlan0" or "00:0d:56:ec:ba:0c" -# Leaving this option blank uses the default setting "eth0" - IFACE="" - -# Static IP address -# This option lets you set a static IP address in CIDR format -# e.g. "192.168.1.1/24" -# Leave blank to use DHCP (default) - IPADDRESS="" - -# Network gateway -# This option lets you set your gateway address -# e.g. "192.168.1.254" -# This variable must be set if you are using a static IP address - GATEWAY="" - -# DNS servers -# This option lets you set up DNS for your network -# e.g. "192.168.1.253;192.168.1.254" -# This variable must be set if you are using a static IP address - NAMESERVER="" - -# WLAN SSID -# This option lets you set the SSID for your wireless network -# e.g. "MyNetwork" -# This variable must be set if you are using a wireless device - SSID="" - -# WLAN Security -# This option lets you chose the security protocol for your wireless -# network -# Options are "NONE" / "WEP" / "WPA/WPA2" ) -# "NONE" or left blank for an open WLAN (default) -# "WEP" for WEP protected WLAN's -# "WPA/WPA2" for WPA protected WLAN's - SECURITY="" - -# WLAN Passphrase -# This option lets you set the password for your wireless network -# e.g. "TopSecret" -# This variable must be set if you are using a secure wireless network - PASSPHRASE="" - -# start SAMBA Server (if installed) on boot (yes / no) - SAMBA_START="yes" diff --git a/packages/network/connman/install b/packages/network/connman/install index c06fafaa65..3f64248b57 100755 --- a/packages/network/connman/install +++ b/packages/network/connman/install @@ -34,7 +34,7 @@ mkdir -p $INSTALL/etc/connman -e "s|^# BackgroundScanning.*|BackgroundScanning = true|g" \ -e "s|^# FallbackNameservers.*|FallbackNameservers = 8.8.8.8,8.8.4.4|g" \ -e "s|^# PreferredTechnologies.*|PreferredTechnologies = ethernet,wifi,cellular|g" \ - -e "s|^# AllowedTetheringTechnologies.*|AllowedTetheringTechnologies = wifi|g" \ + -e "s|^# TetheringTechnologies.*|TetheringTechnologies = wifi|g" \ -e "s|^# PersistentTetheringMode.*|PersistentTetheringMode = true|g" mkdir -p $INSTALL/etc/dbus-1/system.d diff --git a/packages/network/connman/meta b/packages/network/connman/meta index 425fa7bb54..fd6d59cc33 100644 --- a/packages/network/connman/meta +++ b/packages/network/connman/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="connman" -PKG_VERSION="475a695" +PKG_VERSION="3ddffce" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/connman/patches/connman-990.01.01-tethering-Add_debug_print_so_we_know_when_restarting.patch b/packages/network/connman/patches/connman-990.01.01-tethering-Add_debug_print_so_we_know_when_restarting.patch new file mode 100644 index 0000000000..b15cf64e1d --- /dev/null +++ b/packages/network/connman/patches/connman-990.01.01-tethering-Add_debug_print_so_we_know_when_restarting.patch @@ -0,0 +1,29 @@ + +Betreff: +[PATCH 1/5] tethering: Add debug print so we know when restarting +Von: +Jukka Rissanen +Datum: +25.06.2013 14:58 +An: +connman@connman.net + +--- + src/tethering.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/tethering.c b/src/tethering.c +index 223873b..eb05056 100644 +--- a/src/tethering.c ++++ b/src/tethering.c +@@ -176,6 +176,7 @@ static void dhcp_server_stop(GDHCPServer *server) + + static void tethering_restart(struct connman_ippool *pool, void *user_data) + { ++ DBG("pool %p", pool); + __connman_tethering_set_disabled(); + __connman_tethering_set_enabled(); + } +-- +1.7.11.7 + diff --git a/packages/network/connman/patches/connman-990.01.02-tethering-Use_the_prefix_lenght_from_ippool_instead_of_hard_coded_value.patch b/packages/network/connman/patches/connman-990.01.02-tethering-Use_the_prefix_lenght_from_ippool_instead_of_hard_coded_value.patch new file mode 100644 index 0000000000..692fe47514 --- /dev/null +++ b/packages/network/connman/patches/connman-990.01.02-tethering-Use_the_prefix_lenght_from_ippool_instead_of_hard_coded_value.patch @@ -0,0 +1,77 @@ + +Betreff: +[PATCH 2/5] tethering: Use the prefix lenght from ippool instead of hard coded value +Von: +Jukka Rissanen +Datum: +25.06.2013 14:58 +An: +connman@connman.net + +We were always using prefix length 24 instead of the correct +value from ippool. +--- + src/bridge.c | 8 ++++---- + src/connman.h | 4 ++-- + src/tethering.c | 4 +++- + 3 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/src/bridge.c b/src/bridge.c +index e46cdda..1610f96 100644 +--- a/src/bridge.c ++++ b/src/bridge.c +@@ -111,8 +111,8 @@ int __connman_bridge_remove(const char *name) + return 0; + } + +-int __connman_bridge_enable(const char *name, const char *gateway, +- const char *broadcast) ++int __connman_bridge_enable(const char *name, const char *ip_address, ++ int prefix_len, const char *broadcast) + { + int err, index; + +@@ -121,8 +121,8 @@ int __connman_bridge_enable(const char *name, const char *gateway, + return index; + + err = __connman_inet_modify_address(RTM_NEWADDR, +- NLM_F_REPLACE | NLM_F_ACK, index, AF_INET, +- gateway, NULL, 24, broadcast); ++ NLM_F_REPLACE | NLM_F_ACK, index, AF_INET, ++ ip_address, NULL, prefix_len, broadcast); + if (err < 0) + return err; + +diff --git a/src/connman.h b/src/connman.h +index 11dbc35..96f8466 100644 +--- a/src/connman.h ++++ b/src/connman.h +@@ -899,8 +899,8 @@ void __connman_ippool_deladdr(int index, const char *address, + + int __connman_bridge_create(const char *name); + int __connman_bridge_remove(const char *name); +-int __connman_bridge_enable(const char *name, const char *gateway, +- const char *broadcast); ++int __connman_bridge_enable(const char *name, const char *ip_address, ++ int prefix_len, const char *broadcast); + int __connman_bridge_disable(const char *name); + + int __connman_nat_init(void); +diff --git a/src/tethering.c b/src/tethering.c +index eb05056..0b373b9 100644 +--- a/src/tethering.c ++++ b/src/tethering.c +@@ -221,7 +221,9 @@ void __connman_tethering_set_enabled(void) + start_ip = __connman_ippool_get_start_ip(dhcp_ippool); + end_ip = __connman_ippool_get_end_ip(dhcp_ippool); + +- err = __connman_bridge_enable(BRIDGE_NAME, gateway, broadcast); ++ err = __connman_bridge_enable(BRIDGE_NAME, gateway, ++ __connman_ipaddress_netmask_prefix_len(subnet_mask), ++ broadcast); + if (err < 0 && err != -EALREADY) { + __connman_ippool_unref(dhcp_ippool); + __connman_bridge_remove(BRIDGE_NAME); +-- +1.7.11.7 + diff --git a/packages/network/connman/patches/connman-990.01.03-connection-Use_netlink_functions_to_set_default_gateway.patch b/packages/network/connman/patches/connman-990.01.03-connection-Use_netlink_functions_to_set_default_gateway.patch new file mode 100644 index 0000000000..dbd1ed1834 --- /dev/null +++ b/packages/network/connman/patches/connman-990.01.03-connection-Use_netlink_functions_to_set_default_gateway.patch @@ -0,0 +1,57 @@ + +Betreff: +[PATCH 3/5] connection: Use netlink functions to set default gateway +Von: +Jukka Rissanen +Datum: +25.06.2013 14:58 +An: +connman@connman.net + +We were using earlier the ioctl() to set the default gateway. +In some cases that could fail because the desired interface +was not set when calling the ioctl(). +This happened with tethering with following scenario: +* Ethernet cable (uplink connection) is not connected +* Wifi tethering is started with address 192.168.1.1 +* Ethernet cable is connected, uplink address is 192.168.1.0/24 +* There is now a conflict, ippool resolves that in __connman_ippool_newaddr() + and calls tethering_restart() which stops and then starts tethering +* Because of the problems when calling the SIOCADDRT (we do not know + to what interface the default route was added to), the default route + of uplink connection was added to tethering interface (tether) instead + of uplink interface (eth0). This caused the default route to disappear + when tether interface was taken down. +* Solution was to use the netlink interface to set the default gateway + as we can unambiguously set the desired default route to be via the + uplink interface + +Thanks for Stephan Raue for reporting this issue. +--- + src/connection.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/connection.c b/src/connection.c +index c7b1f62..c0fdaf8 100644 +--- a/src/connection.c ++++ b/src/connection.c +@@ -479,12 +479,12 @@ static void set_default_gateway(struct gateway_data *data, + } + + if (do_ipv6 == TRUE && data->ipv6_gateway != NULL) +- status6 = connman_inet_set_ipv6_gateway_address(index, +- data->ipv6_gateway->gateway); ++ status6 = __connman_inet_add_default_to_table(RT_TABLE_MAIN, ++ index, data->ipv6_gateway->gateway); + + if (do_ipv4 == TRUE && data->ipv4_gateway != NULL) +- status4 = connman_inet_set_gateway_address(index, +- data->ipv4_gateway->gateway); ++ status4 = __connman_inet_add_default_to_table(RT_TABLE_MAIN, ++ index, data->ipv4_gateway->gateway); + + if (status4 < 0 || status6 < 0) + return; +-- +1.7.11.7 + diff --git a/packages/network/connman/patches/connman-990.01.04-inet-Remove_unused_gateway_setting_functions.patch b/packages/network/connman/patches/connman-990.01.04-inet-Remove_unused_gateway_setting_functions.patch new file mode 100644 index 0000000000..1a04aada5e --- /dev/null +++ b/packages/network/connman/patches/connman-990.01.04-inet-Remove_unused_gateway_setting_functions.patch @@ -0,0 +1,156 @@ + +Betreff: +[PATCH 4/5] inet: Remove unused gateway setting functions +Von: +Jukka Rissanen +Datum: +25.06.2013 14:58 +An: +connman@connman.net + +No need for these functions any more as we are using the netlink +variants to set the default gateway. +--- + include/inet.h | 2 -- + src/inet.c | 98 ---------------------------------------------------------- + 2 files changed, 100 deletions(-) + +diff --git a/include/inet.h b/include/inet.h +index 8f7a35c..10d9dae 100644 +--- a/include/inet.h ++++ b/include/inet.h +@@ -50,7 +50,6 @@ int connman_inet_del_host_route(int index, const char *host); + int connman_inet_add_network_route(int index, const char *host, const char *gateway, + const char *netmask); + int connman_inet_del_network_route(int index, const char *host); +-int connman_inet_set_gateway_address(int index, const char *gateway); + int connman_inet_clear_gateway_address(int index, const char *gateway); + int connman_inet_set_gateway_interface(int index); + int connman_inet_clear_gateway_interface(int index); +@@ -66,7 +65,6 @@ int connman_inet_add_ipv6_host_route(int index, const char *host, + int connman_inet_del_ipv6_network_route(int index, const char *host, + unsigned char prefix_len); + int connman_inet_del_ipv6_host_route(int index, const char *host); +-int connman_inet_set_ipv6_gateway_address(int index, const char *gateway); + int connman_inet_clear_ipv6_gateway_address(int index, const char *gateway); + int connman_inet_set_ipv6_gateway_interface(int index); + int connman_inet_clear_ipv6_gateway_interface(int index); +diff --git a/src/inet.c b/src/inet.c +index ed98dd5..840f9b1 100644 +--- a/src/inet.c ++++ b/src/inet.c +@@ -727,47 +727,6 @@ int connman_inet_add_ipv6_host_route(int index, const char *host, + return connman_inet_add_ipv6_network_route(index, host, gateway, 128); + } + +-int connman_inet_set_ipv6_gateway_address(int index, const char *gateway) +-{ +- struct in6_rtmsg rt; +- int sk, err = 0; +- +- DBG("index %d gateway %s", index, gateway); +- +- if (gateway == NULL) +- return -EINVAL; +- +- memset(&rt, 0, sizeof(rt)); +- +- if (inet_pton(AF_INET6, gateway, &rt.rtmsg_gateway) < 0) { +- err = -errno; +- goto out; +- } +- +- rt.rtmsg_flags = RTF_UP | RTF_GATEWAY; +- rt.rtmsg_metric = 1; +- rt.rtmsg_dst_len = 0; +- rt.rtmsg_ifindex = index; +- +- sk = socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0); +- if (sk < 0) { +- err = -errno; +- goto out; +- } +- +- if (ioctl(sk, SIOCADDRT, &rt) < 0 && errno != EEXIST) +- err = -errno; +- +- close(sk); +- +-out: +- if (err < 0) +- connman_error("Set default IPv6 gateway error (%s)", +- strerror(-err)); +- +- return err; +-} +- + int connman_inet_clear_ipv6_gateway_address(int index, const char *gateway) + { + struct in6_rtmsg rt; +@@ -809,63 +768,6 @@ out: + return err; + } + +-int connman_inet_set_gateway_address(int index, const char *gateway) +-{ +- struct ifreq ifr; +- struct rtentry rt; +- struct sockaddr_in addr; +- int sk, err = 0; +- +- DBG("index %d gateway %s", index, gateway); +- +- sk = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0); +- if (sk < 0) { +- err = -errno; +- goto out; +- } +- +- memset(&ifr, 0, sizeof(ifr)); +- ifr.ifr_ifindex = index; +- +- if (ioctl(sk, SIOCGIFNAME, &ifr) < 0) { +- err = -errno; +- close(sk); +- goto out; +- } +- +- DBG("ifname %s", ifr.ifr_name); +- +- memset(&rt, 0, sizeof(rt)); +- rt.rt_flags = RTF_UP | RTF_GATEWAY; +- +- memset(&addr, 0, sizeof(addr)); +- addr.sin_family = AF_INET; +- addr.sin_addr.s_addr = INADDR_ANY; +- memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst)); +- +- memset(&addr, 0, sizeof(addr)); +- addr.sin_family = AF_INET; +- addr.sin_addr.s_addr = inet_addr(gateway); +- memcpy(&rt.rt_gateway, &addr, sizeof(rt.rt_gateway)); +- +- memset(&addr, 0, sizeof(addr)); +- addr.sin_family = AF_INET; +- addr.sin_addr.s_addr = INADDR_ANY; +- memcpy(&rt.rt_genmask, &addr, sizeof(rt.rt_genmask)); +- +- if (ioctl(sk, SIOCADDRT, &rt) < 0 && errno != EEXIST) +- err = -errno; +- +- close(sk); +- +-out: +- if (err < 0) +- connman_error("Setting default gateway route failed (%s)", +- strerror(-err)); +- +- return err; +-} +- + int connman_inet_set_gateway_interface(int index) + { + struct ifreq ifr; +-- +1.7.11.7 + diff --git a/packages/network/connman/patches/connman-990.02.01-tethering-Cleanup_tethering_when_connman_is_shutting_down.patch b/packages/network/connman/patches/connman-990.02.01-tethering-Cleanup_tethering_when_connman_is_shutting_down.patch new file mode 100644 index 0000000000..337ae19655 --- /dev/null +++ b/packages/network/connman/patches/connman-990.02.01-tethering-Cleanup_tethering_when_connman_is_shutting_down.patch @@ -0,0 +1,36 @@ + +Betreff: +[PATCH] tethering: Cleanup tethering when connman is shutting down +Von: +Jukka Rissanen +Datum: +26.06.2013 09:40 +An: +connman@connman.net + +We do not want to leave the tether interface and bridge hanging +around after shutdown. +--- + src/tethering.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tethering.c b/src/tethering.c +index 0b373b9..03ed02a 100644 +--- a/src/tethering.c ++++ b/src/tethering.c +@@ -532,10 +532,10 @@ int __connman_tethering_init(void) + + void __connman_tethering_cleanup(void) + { +- DBG(""); ++ DBG("enabled %d", tethering_enabled); + + __sync_synchronize(); +- if (tethering_enabled == 0) { ++ if (tethering_enabled > 0) { + if (tethering_dhcp_server) + dhcp_server_stop(tethering_dhcp_server); + __connman_bridge_disable(BRIDGE_NAME); +-- +1.7.11.7 + diff --git a/packages/sysutils/pm-utils/config.d/module b/packages/sysutils/pm-utils/config.d/module index d8c4e9ad58..04c04bc7d3 100644 --- a/packages/sysutils/pm-utils/config.d/module +++ b/packages/sysutils/pm-utils/config.d/module @@ -1 +1 @@ -SUSPEND_MODULES="xhci-hcd jme asix anysee rtl8192se imon r8712u" +SUSPEND_MODULES="xhci-hcd jme asix anysee rtl8192se imon r8712u cx23885" diff --git a/packages/toolchain/devel/cmake/meta b/packages/toolchain/devel/cmake/meta index 33a31e41a8..209f8f0f75 100644 --- a/packages/toolchain/devel/cmake/meta +++ b/packages/toolchain/devel/cmake/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="cmake" -PKG_VERSION="2.8.11" +PKG_VERSION="2.8.11.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="BSD" diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta index 16cae2d7ad..bdbbebfe1a 100644 --- a/packages/x11/driver/xf86-video-nvidia/meta +++ b/packages/x11/driver/xf86-video-nvidia/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-nvidia" -PKG_VERSION="319.23" +PKG_VERSION="319.32" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="nonfree" diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index e422229219..053a60198b 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -743,7 +743,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -757,7 +757,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 2c3b6d765b..f148f753f6 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -767,7 +767,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -781,7 +781,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 8f4346b4df..ca2ed79069 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -787,7 +787,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -801,7 +801,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index daa985ecbe..d387b9ab10 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -756,7 +756,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -770,7 +770,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 215e2c5780..6d48f1224e 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -797,7 +797,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -811,7 +811,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index f3712b09f7..2504861973 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -764,7 +764,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -778,7 +778,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index d5522ccee0..8820ccaac2 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -797,7 +797,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -811,7 +811,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 2a2dac6b29..470ef0eeb3 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -792,7 +792,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -806,7 +806,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 7211f2bfad..4bdcb0a927 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -743,7 +743,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -757,7 +757,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 6b2f847708..a36dbc4cc2 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -794,7 +794,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -808,7 +808,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index d67a9bdc53..9d80cb6ca4 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -746,7 +746,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -760,7 +760,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 1668864052..7322e8c766 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -646,7 +646,7 @@ CONFIG_WIRELESS_EXT=y CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -656,7 +656,7 @@ CONFIG_CFG80211_DEFAULT_PS=y # CONFIG_CFG80211_INTERNAL_REGDB is not set CONFIG_CFG80211_WEXT=y # CONFIG_LIB80211 is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index 1ef6cb6fae..3114be6d56 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -742,7 +742,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -756,7 +756,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index f661a2a11f..564a04d40b 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -797,7 +797,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -811,7 +811,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index f8b42b6ad2..cc6ccc6a51 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -764,7 +764,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m # CONFIG_NL80211_TESTMODE is not set # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -778,7 +778,7 @@ CONFIG_LIB80211_CRYPT_WEP=m CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y