diff --git a/TODO b/TODO
index e69de29bb2..8607543516 100644
--- a/TODO
+++ b/TODO
@@ -0,0 +1,5 @@
+openssl-1.0.0(d):
+ - problems using urllib2 in Python -> using openssl-0.9.8
+
+ncurses-5.8/5.9:
+ - segfaults in nano and dialog -> using ncurses-5.7
diff --git a/packages/addons/debugging/tools/evtest/changelog.txt b/packages/addons/debugging/tools/evtest/changelog.txt
index e7cdeca3a2..dd60311c55 100644
--- a/packages/addons/debugging/tools/evtest/changelog.txt
+++ b/packages/addons/debugging/tools/evtest/changelog.txt
@@ -1,3 +1,6 @@
+0.99.3
+- change icon
+
0.99.2
- build as shared lib
- include libiconv libs
diff --git a/packages/addons/debugging/tools/evtest/icon/icon.png b/packages/addons/debugging/tools/evtest/icon/icon.png
index c1cc6c21a3..47d97637e0 100644
Binary files a/packages/addons/debugging/tools/evtest/icon/icon.png and b/packages/addons/debugging/tools/evtest/icon/icon.png differ
diff --git a/packages/addons/debugging/tools/evtest/meta b/packages/addons/debugging/tools/evtest/meta
index 2d0b0dd72d..c70e099691 100644
--- a/packages/addons/debugging/tools/evtest/meta
+++ b/packages/addons/debugging/tools/evtest/meta
@@ -20,7 +20,7 @@
PKG_NAME="evtest"
PKG_VERSION="1.27"
-PKG_REV="2"
+PKG_REV="3"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://cgit.freedesktop.org/evtest/"
diff --git a/packages/addons/debugging/tools/htop/changelog.txt b/packages/addons/debugging/tools/htop/changelog.txt
index cb0a38f8ec..0b317e8f5a 100644
--- a/packages/addons/debugging/tools/htop/changelog.txt
+++ b/packages/addons/debugging/tools/htop/changelog.txt
@@ -1,3 +1,6 @@
+0.99.4
+- change icon
+
0.99.3
- build as shared lib
- include ncurses libs
diff --git a/packages/addons/debugging/tools/htop/icon/icon.png b/packages/addons/debugging/tools/htop/icon/icon.png
index c1cc6c21a3..07a2f44796 100644
Binary files a/packages/addons/debugging/tools/htop/icon/icon.png and b/packages/addons/debugging/tools/htop/icon/icon.png differ
diff --git a/packages/addons/debugging/tools/htop/meta b/packages/addons/debugging/tools/htop/meta
index bd82dc184f..fa054e23d0 100644
--- a/packages/addons/debugging/tools/htop/meta
+++ b/packages/addons/debugging/tools/htop/meta
@@ -20,7 +20,7 @@
PKG_NAME="htop"
PKG_VERSION="0.9"
-PKG_REV="3"
+PKG_REV="4"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://htop.sourceforge.net/"
diff --git a/packages/addons/multimedia/libav/changelog.txt b/packages/addons/multimedia/libav/changelog.txt
index f9f2a03db2..39b3bbb7b3 100644
--- a/packages/addons/multimedia/libav/changelog.txt
+++ b/packages/addons/multimedia/libav/changelog.txt
@@ -1,2 +1,5 @@
+0.99.2
+- change icon
+
0.99.1
- initial addon based on libav-0.7_beta2
diff --git a/packages/addons/multimedia/libav/icon/icon.png b/packages/addons/multimedia/libav/icon/icon.png
index 55ca201e8c..013e00d519 100644
Binary files a/packages/addons/multimedia/libav/icon/icon.png and b/packages/addons/multimedia/libav/icon/icon.png differ
diff --git a/packages/addons/multimedia/libav/meta b/packages/addons/multimedia/libav/meta
index 68e80709fb..fdd410d858 100644
--- a/packages/addons/multimedia/libav/meta
+++ b/packages/addons/multimedia/libav/meta
@@ -20,7 +20,7 @@
PKG_NAME="libav"
PKG_VERSION="0.7_beta2"
-PKG_REV="1"
+PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.libav.org"
diff --git a/packages/addons/multimedia/makemkv/changelog.txt b/packages/addons/multimedia/makemkv/changelog.txt
index 9c9c58eb1c..45123e0790 100644
--- a/packages/addons/multimedia/makemkv/changelog.txt
+++ b/packages/addons/multimedia/makemkv/changelog.txt
@@ -1,2 +1,5 @@
+0.99.2
+- change icon
+
0.99.1
- initial addon based on makemkv-1.6.10
diff --git a/packages/addons/multimedia/makemkv/icon/icon.png b/packages/addons/multimedia/makemkv/icon/icon.png
index e0411d8ac6..dc82051426 100644
Binary files a/packages/addons/multimedia/makemkv/icon/icon.png and b/packages/addons/multimedia/makemkv/icon/icon.png differ
diff --git a/packages/addons/multimedia/makemkv/meta b/packages/addons/multimedia/makemkv/meta
index ce4cb7ddeb..5cf5c2a427 100644
--- a/packages/addons/multimedia/makemkv/meta
+++ b/packages/addons/multimedia/makemkv/meta
@@ -20,7 +20,7 @@
PKG_NAME="makemkv"
PKG_VERSION="1.6.10"
-PKG_REV="1"
+PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"
diff --git a/packages/addons/networking/backup/rsync/changelog.txt b/packages/addons/networking/backup/rsync/changelog.txt
index 65521b3380..83597c7c7b 100644
--- a/packages/addons/networking/backup/rsync/changelog.txt
+++ b/packages/addons/networking/backup/rsync/changelog.txt
@@ -1,3 +1,6 @@
+0.99.3
+- change icon
+
0.99.2
- prepare for release
diff --git a/packages/addons/networking/backup/rsync/icon/icon.png b/packages/addons/networking/backup/rsync/icon/icon.png
index 1efeeb9a03..b56515574a 100644
Binary files a/packages/addons/networking/backup/rsync/icon/icon.png and b/packages/addons/networking/backup/rsync/icon/icon.png differ
diff --git a/packages/addons/networking/backup/rsync/meta b/packages/addons/networking/backup/rsync/meta
index d535cc7c5f..56656bac76 100644
--- a/packages/addons/networking/backup/rsync/meta
+++ b/packages/addons/networking/backup/rsync/meta
@@ -20,7 +20,7 @@
PKG_NAME="rsync"
PKG_VERSION="3.0.8"
-PKG_REV="2"
+PKG_REV="3"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html"
diff --git a/packages/addons/service/downloadmanager/transmission/changelog.txt b/packages/addons/service/downloadmanager/transmission/changelog.txt
index 8fc8480024..386c74a05d 100644
--- a/packages/addons/service/downloadmanager/transmission/changelog.txt
+++ b/packages/addons/service/downloadmanager/transmission/changelog.txt
@@ -1,3 +1,6 @@
+0.99.7
+- change icon
+
0.99.6
- rebuild for openssl downgrade
diff --git a/packages/addons/service/downloadmanager/transmission/icon/icon.png b/packages/addons/service/downloadmanager/transmission/icon/icon.png
index f7b3af06dc..02e077365f 100644
Binary files a/packages/addons/service/downloadmanager/transmission/icon/icon.png and b/packages/addons/service/downloadmanager/transmission/icon/icon.png differ
diff --git a/packages/addons/service/downloadmanager/transmission/meta b/packages/addons/service/downloadmanager/transmission/meta
index 7dd88c5180..0bcd3d5d17 100644
--- a/packages/addons/service/downloadmanager/transmission/meta
+++ b/packages/addons/service/downloadmanager/transmission/meta
@@ -20,7 +20,7 @@
PKG_NAME="transmission"
PKG_VERSION="2.31"
-PKG_REV="6"
+PKG_REV="7"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.transmissionbt.com/"
diff --git a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
index cb58016308..b37ad49d4c 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/hts-tvheadend/changelog.txt
@@ -1,3 +1,6 @@
+0.99.4
+- change icon
+
0.99.3
- rebuild for openssl downgrade
diff --git a/packages/addons/service/multimedia/hts-tvheadend/icon/icon.png b/packages/addons/service/multimedia/hts-tvheadend/icon/icon.png
index f0bb3997e7..929671317f 100644
Binary files a/packages/addons/service/multimedia/hts-tvheadend/icon/icon.png and b/packages/addons/service/multimedia/hts-tvheadend/icon/icon.png differ
diff --git a/packages/addons/service/multimedia/hts-tvheadend/meta b/packages/addons/service/multimedia/hts-tvheadend/meta
index 71ebb37a11..8bd7b801e6 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/meta
+++ b/packages/addons/service/multimedia/hts-tvheadend/meta
@@ -20,7 +20,7 @@
PKG_NAME="hts-tvheadend"
PKG_VERSION="90e3570"
-PKG_REV="3"
+PKG_REV="4"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
diff --git a/packages/addons/shell/texteditor/nano/changelog.txt b/packages/addons/shell/texteditor/nano/changelog.txt
index 9776725a9c..92fb70e8e6 100644
--- a/packages/addons/shell/texteditor/nano/changelog.txt
+++ b/packages/addons/shell/texteditor/nano/changelog.txt
@@ -1,3 +1,6 @@
+0.99.4
+- change icon
+
0.99.3
- build as shared lib
- include ncurses libs
diff --git a/packages/addons/shell/texteditor/nano/icon/icon.png b/packages/addons/shell/texteditor/nano/icon/icon.png
index 70c6da0693..84cfefded5 100644
Binary files a/packages/addons/shell/texteditor/nano/icon/icon.png and b/packages/addons/shell/texteditor/nano/icon/icon.png differ
diff --git a/packages/addons/shell/texteditor/nano/meta b/packages/addons/shell/texteditor/nano/meta
index 5f28e32fc3..230cbc9b20 100644
--- a/packages/addons/shell/texteditor/nano/meta
+++ b/packages/addons/shell/texteditor/nano/meta
@@ -20,7 +20,7 @@
PKG_NAME="nano"
PKG_VERSION="2.3.0"
-PKG_REV="3"
+PKG_REV="4"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.nano-editor.org/"
diff --git a/packages/linux/meta b/packages/linux/meta
index aa1859653b..18fc8d2ba0 100644
--- a/packages/linux/meta
+++ b/packages/linux/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="linux"
-PKG_VERSION="2.6.39"
+PKG_VERSION="2.6.39.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/linux/patches/linux-2.6.39-000_crosscompile.patch b/packages/linux/patches/linux-2.6.39.1-000_crosscompile.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-000_crosscompile.patch
rename to packages/linux/patches/linux-2.6.39.1-000_crosscompile.patch
diff --git a/packages/linux/patches/linux-2.6.39-002_bash_only_feature.patch b/packages/linux/patches/linux-2.6.39.1-002_bash_only_feature.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-002_bash_only_feature.patch
rename to packages/linux/patches/linux-2.6.39.1-002_bash_only_feature.patch
diff --git a/packages/linux/patches/linux-2.6.39-003-no_dev_console.patch b/packages/linux/patches/linux-2.6.39.1-003-no_dev_console.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-003-no_dev_console.patch
rename to packages/linux/patches/linux-2.6.39.1-003-no_dev_console.patch
diff --git a/packages/linux/patches/linux-2.6.39-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-2.6.39.1-004_lower_undefined_mode_timeout.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-004_lower_undefined_mode_timeout.patch
rename to packages/linux/patches/linux-2.6.39.1-004_lower_undefined_mode_timeout.patch
diff --git a/packages/linux/patches/linux-2.6.39-005_kconfig_no_timestamp.patch b/packages/linux/patches/linux-2.6.39.1-005_kconfig_no_timestamp.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-005_kconfig_no_timestamp.patch
rename to packages/linux/patches/linux-2.6.39.1-005_kconfig_no_timestamp.patch
diff --git a/packages/linux/patches/linux-2.6.39-006_enable_utf8.patch b/packages/linux/patches/linux-2.6.39.1-006_enable_utf8.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-006_enable_utf8.patch
rename to packages/linux/patches/linux-2.6.39.1-006_enable_utf8.patch
diff --git a/packages/linux/patches/linux-2.6.39-007_die_floppy_die.patch b/packages/linux/patches/linux-2.6.39.1-007_die_floppy_die.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-007_die_floppy_die.patch
rename to packages/linux/patches/linux-2.6.39.1-007_die_floppy_die.patch
diff --git a/packages/linux/patches/linux-2.6.39-008-hda_intel_prealloc_4mb_dmabuffer.patch b/packages/linux/patches/linux-2.6.39.1-008-hda_intel_prealloc_4mb_dmabuffer.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-008-hda_intel_prealloc_4mb_dmabuffer.patch
rename to packages/linux/patches/linux-2.6.39.1-008-hda_intel_prealloc_4mb_dmabuffer.patch
diff --git a/packages/linux/patches/linux-2.6.39-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-2.6.39.1-009_disable_i8042_check_on_apple_mac.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-009_disable_i8042_check_on_apple_mac.patch
rename to packages/linux/patches/linux-2.6.39.1-009_disable_i8042_check_on_apple_mac.patch
diff --git a/packages/linux/patches/linux-2.6.39-050_add_appleir_usb_driver.patch b/packages/linux/patches/linux-2.6.39.1-050_add_appleir_usb_driver.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-050_add_appleir_usb_driver.patch
rename to packages/linux/patches/linux-2.6.39.1-050_add_appleir_usb_driver.patch
diff --git a/packages/linux/patches/linux-2.6.39-051-Use_a_more_consistent_value_for_RC_repeat_period-0.1.patch b/packages/linux/patches/linux-2.6.39.1-051-Use_a_more_consistent_value_for_RC_repeat_period-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-051-Use_a_more_consistent_value_for_RC_repeat_period-0.1.patch
rename to packages/linux/patches/linux-2.6.39.1-051-Use_a_more_consistent_value_for_RC_repeat_period-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.39-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-2.6.39.1-052-aureal_remote_quirk-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-052-aureal_remote_quirk-0.1.patch
rename to packages/linux/patches/linux-2.6.39.1-052-aureal_remote_quirk-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.39-053_ati-remote_all_keys_and_keychange-0.1.patch b/packages/linux/patches/linux-2.6.39.1-053_ati-remote_all_keys_and_keychange-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-053_ati-remote_all_keys_and_keychange-0.1.patch
rename to packages/linux/patches/linux-2.6.39.1-053_ati-remote_all_keys_and_keychange-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.39-054_nuvoton-cir-only-warn-about-unknown-chips.patch b/packages/linux/patches/linux-2.6.39.1-054_nuvoton-cir-only-warn-about-unknown-chips.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-054_nuvoton-cir-only-warn-about-unknown-chips.patch
rename to packages/linux/patches/linux-2.6.39.1-054_nuvoton-cir-only-warn-about-unknown-chips.patch
diff --git a/packages/linux/patches/linux-2.6.39-055_nuvoton-cir-enable-CIR-on-w83667hg-chip-variant.patch b/packages/linux/patches/linux-2.6.39.1-055_nuvoton-cir-enable-CIR-on-w83667hg-chip-variant.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-055_nuvoton-cir-enable-CIR-on-w83667hg-chip-variant.patch
rename to packages/linux/patches/linux-2.6.39.1-055_nuvoton-cir-enable-CIR-on-w83667hg-chip-variant.patch
diff --git a/packages/linux/patches/linux-2.6.39-056_fintek-cir-v2.patch b/packages/linux/patches/linux-2.6.39.1-056_fintek-cir-v2.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-056_fintek-cir-v2.patch
rename to packages/linux/patches/linux-2.6.39.1-056_fintek-cir-v2.patch
diff --git a/packages/linux/patches/linux-2.6.39-057_ite-resume-debug-0.1.patch b/packages/linux/patches/linux-2.6.39.1-057_ite-resume-debug-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-057_ite-resume-debug-0.1.patch
rename to packages/linux/patches/linux-2.6.39.1-057_ite-resume-debug-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.39-057_media-ite-cir-make-IR-receive-work-after-resume.patch b/packages/linux/patches/linux-2.6.39.1-057_media-ite-cir-make-IR-receive-work-after-resume.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-057_media-ite-cir-make-IR-receive-work-after-resume.patch
rename to packages/linux/patches/linux-2.6.39.1-057_media-ite-cir-make-IR-receive-work-after-resume.patch
diff --git a/packages/linux/patches/linux-2.6.39-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch b/packages/linux/patches/linux-2.6.39.1-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch
rename to packages/linux/patches/linux-2.6.39.1-062-Pioneer_DVR-216D_failed_xfermode-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.39-071-silence_i915_agp-module-0.1.patch b/packages/linux/patches/linux-2.6.39.1-071-silence_i915_agp-module-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-071-silence_i915_agp-module-0.1.patch
rename to packages/linux/patches/linux-2.6.39.1-071-silence_i915_agp-module-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.39-322-omap4_pandaboard_fix_dvi_support-0.1.patch b/packages/linux/patches/linux-2.6.39.1-322-omap4_pandaboard_fix_dvi_support-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-322-omap4_pandaboard_fix_dvi_support-0.1.patch
rename to packages/linux/patches/linux-2.6.39.1-322-omap4_pandaboard_fix_dvi_support-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.39-716_mm-zero_swappiness.patch b/packages/linux/patches/linux-2.6.39.1-716_mm-zero_swappiness.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.39-716_mm-zero_swappiness.patch
rename to packages/linux/patches/linux-2.6.39.1-716_mm-zero_swappiness.patch
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
index 493b522f7f..c804349a18 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/packages/multimedia/libva/meta b/packages/multimedia/libva/meta
index aa3868302e..fd02a22117 100644
--- a/packages/multimedia/libva/meta
+++ b/packages/multimedia/libva/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="libva"
-PKG_VERSION="1.0.12"
+PKG_VERSION="1.0.13"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"
diff --git a/packages/multimedia/rtmpdump/build b/packages/multimedia/rtmpdump/build
index 2b4b94e44a..d0ae072f8b 100755
--- a/packages/multimedia/rtmpdump/build
+++ b/packages/multimedia/rtmpdump/build
@@ -31,7 +31,7 @@ make prefix=/usr \
CC="$CC" \
LD="$LD" \
AR="$AR" \
- CRYPTO="GNUTLS" \
+ CRYPTO="OPENSSL" \
XCFLAGS="$CFLAGS $LDFLAGS"
$MAKEINSTALL prefix=/usr \
@@ -41,5 +41,5 @@ $MAKEINSTALL prefix=/usr \
CC="$CC" \
LD="$LD" \
AR="$AR" \
- CRYPTO="GNUTLS" \
+ CRYPTO="OPENSSL" \
XCFLAGS="$CFLAGS $LDFLAGS"
diff --git a/packages/multimedia/rtmpdump/meta b/packages/multimedia/rtmpdump/meta
index 11fc26cdb3..b948ad19a3 100644
--- a/packages/multimedia/rtmpdump/meta
+++ b/packages/multimedia/rtmpdump/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://rtmpdump.mplayerhq.hu/"
PKG_URL="http://rtmpdump.mplayerhq.hu/download/$PKG_NAME-$PKG_VERSION.tgz"
-PKG_DEPENDS="zlib gnutls"
-PKG_BUILD_DEPENDS="toolchain zlib gnutls"
+PKG_DEPENDS="zlib openssl"
+PKG_BUILD_DEPENDS="toolchain zlib openssl"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
PKG_SHORTDESC="rtmpdump: a toolkit for RTMP streams."
diff --git a/packages/network/bluez/meta b/packages/network/bluez/meta
index 2a05930025..69db97067a 100644
--- a/packages/network/bluez/meta
+++ b/packages/network/bluez/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="bluez"
-PKG_VERSION="4.93"
+PKG_VERSION="4.94"
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
index b630acfabd..cf82b67066 100644
--- a/packages/network/connman/config/network.conf
+++ b/packages/network/connman/config/network.conf
@@ -67,10 +67,10 @@
# WLAN Security
# This option lets you chose the security protocol for your wireless
# network
-# Options are "NONE" / "WEP" / "PSK" )
+# Options are "NONE" / "WEP" / "WPA/WPA2" )
# "NONE" or left blank for an open WLAN (default)
# "WEP" for WEP protected WLAN's
-# "PSK" for WPA protected WLAN's
+# "WPA/WPA2" for WPA protected WLAN's
SECURITY=""
# WLAN Passphrase
diff --git a/packages/network/connman/init.d/21_network b/packages/network/connman/init.d/21_network
index 396ab400a6..c82b6472c6 100644
--- a/packages/network/connman/init.d/21_network
+++ b/packages/network/connman/init.d/21_network
@@ -64,10 +64,10 @@ fi
if [ "$NET_NETWORK" = "WLAN" -a -n "$NET_SSID" ]; then
NET_SSID_HEX=`echo -n "$NET_SSID" | od -tx1 | cut -c8-| tr -d ' \n'`
- # NET_SECURITY: ( NONE / WEP / PSK )
+ # NET_SECURITY: ( NONE / WEP / WPA/WPA2 )
if [ "$NET_SECURITY" = "WEP" -a -n "$NET_PASSPHRASE" ]; then
MODE="managed_wep"
- elif [ "$NET_SECURITY" = "PSK" -a -n "$NET_PASSPHRASE" ]; then
+ elif [ "$NET_SECURITY" = "WPA/WPA2" -a -n "$NET_PASSPHRASE" ]; then
MODE="managed_psk"
else
MODE="managed_none"
diff --git a/packages/network/connman/meta b/packages/network/connman/meta
index 1dbbad7609..f0799057ca 100644
--- a/packages/network/connman/meta
+++ b/packages/network/connman/meta
@@ -19,14 +19,13 @@
################################################################################
PKG_NAME="connman"
-#PKG_VERSION="0.73"
-PKG_VERSION="1ae333e"
+PKG_VERSION="0.74"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.connman.net"
-#PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.bz2"
+#PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="glib dbus udev iptables wpa_supplicant ntp netstatus"
PKG_BUILD_DEPENDS="toolchain glib dbus udev iptables"
PKG_PRIORITY="optional"
diff --git a/packages/python/devel/distribute/meta b/packages/python/devel/distribute/meta
index e771259b2c..6ac3cabe39 100644
--- a/packages/python/devel/distribute/meta
+++ b/packages/python/devel/distribute/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="distribute"
-PKG_VERSION="0.6.16"
+PKG_VERSION="0.6.19"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
diff --git a/packages/sysutils/dbus/meta b/packages/sysutils/dbus/meta
index 4a44625e40..380cd81282 100644
--- a/packages/sysutils/dbus/meta
+++ b/packages/sysutils/dbus/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="dbus"
-PKG_VERSION="1.4.8"
+PKG_VERSION="1.4.10"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/sysutils/dbus/patches/dbus-1.4.8-remove_pie.patch b/packages/sysutils/dbus/patches/dbus-1.4.8-remove_pie.patch
deleted file mode 100644
index 192e401c94..0000000000
--- a/packages/sysutils/dbus/patches/dbus-1.4.8-remove_pie.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur dbus-1.4.6-old/bus/Makefile.am dbus-1.4.6-new/bus/Makefile.am
---- dbus-1.4.6-old/bus/Makefile.am 2011-02-17 08:15:23.000000000 -0800
-+++ dbus-1.4.6-new/bus/Makefile.am 2011-02-18 09:11:44.000000000 -0800
-@@ -1,7 +1,7 @@
-
- configdir=$(sysconfdir)/dbus-1
-
--INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \
-+INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) \
- -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
- -DDBUS_COMPILATION
-
-@@ -88,7 +88,7 @@
- $(EFENCE) \
- $(DBUS_BUS_LIBS)
-
--dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
-+dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
-
- LAUNCH_HELPER_SOURCES= \
- $(XML_SOURCES) \
-diff -Naur dbus-1.4.6-old/bus/Makefile.in dbus-1.4.6-new/bus/Makefile.in
---- dbus-1.4.6-old/bus/Makefile.in 2011-02-17 12:06:58.000000000 -0800
-+++ dbus-1.4.6-new/bus/Makefile.in 2011-02-18 09:11:44.000000000 -0800
-@@ -514,7 +514,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- configdir = $(sysconfdir)/dbus-1
--INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \
-+INCLUDES = -I$(top_srcdir) $(DBUS_BUS_CFLAGS) \
- -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
- -DDBUS_COMPILATION
-
-@@ -582,7 +582,7 @@
- $(EFENCE) \
- $(DBUS_BUS_LIBS)
-
--dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
-+dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- LAUNCH_HELPER_SOURCES = \
- $(XML_SOURCES) \
- config-parser-common.c \
diff --git a/packages/toolchain/devel/eglibc/build b/packages/toolchain/devel/eglibc/build
index 941fdb30e7..7dcc7b1f86 100755
--- a/packages/toolchain/devel/eglibc/build
+++ b/packages/toolchain/devel/eglibc/build
@@ -117,7 +117,7 @@ EOF
--enable-bind-now \
--with-elf \
--with-tls \
- --enable-kernel=2.6.35 \
+ --enable-kernel=2.6.39 \
--with-__thread \
--with-binutils=$BUILD/toolchain/bin \
--with-headers=$SYSROOT_PREFIX/usr/include \
diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.13-13177-Handle_DSOs_without_any_dependency_in_ld.so.patch b/packages/toolchain/devel/eglibc/patches/eglibc-2.13-13177-Handle_DSOs_without_any_dependency_in_ld.so.patch
new file mode 100644
index 0000000000..7d88fc3b77
--- /dev/null
+++ b/packages/toolchain/devel/eglibc/patches/eglibc-2.13-13177-Handle_DSOs_without_any_dependency_in_ld.so.patch
@@ -0,0 +1,205 @@
+From glibc-cvs-return-51051-listarch-glibc-cvs=sources dot redhat dot com at sourceware dot org Mon May 30 16:32:22 2011
+Return-Path:
+Delivered-To: listarch-glibc-cvs at sources dot redhat dot com
+Received: (qmail 24844 invoked by alias); 30 May 2011 16:32:18 -0000
+Received: (qmail 24805 invoked by uid 321); 30 May 2011 16:32:17 -0000
+Date: 30 May 2011 16:32:15 -0000
+Message-ID: <20110530163215.24780.qmail@sourceware.org>
+From: drepper at sourceware dot org
+To: glibc-cvs at sourceware dot org
+Subject: GNU C Library master sources branch, master, updated. glibc-2.13-254-g6b1e7d1
+X-Git-Refname: refs/heads/master
+X-Git-Reftype: branch
+X-Git-Oldrev: 4997db742946d08be4378cf91221f558f928bc73
+X-Git-Newrev: 6b1e7d1992cd89032df431c0e0d1418b97e57cd8
+Mailing-List: contact glibc-cvs-help at sourceware dot org; run by ezmlm
+Precedence: bulk
+List-Id:
+List-Archive:
+List-Post:
+List-Help: ,
+Sender: glibc-cvs-owner at sourceware dot org
+List-Subscribe:
+Delivered-To: mailing list glibc-cvs at sourceware dot org
+
+This is an automated email from the git hooks/post-receive script. It was
+generated because a ref change was pushed to the repository containing
+the project "GNU C Library master sources".
+
+The branch, master has been updated
+ via 6b1e7d1992cd89032df431c0e0d1418b97e57cd8 (commit)
+ from 4997db742946d08be4378cf91221f558f928bc73 (commit)
+
+Those revisions listed above that are new to this repository have
+not appeared on any other notification email; so we list those
+revisions in full, below.
+
+- Log -----------------------------------------------------------------
+http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6b1e7d1992cd89032df431c0e0d1418b97e57cd8
+
+commit 6b1e7d1992cd89032df431c0e0d1418b97e57cd8
+Author: Ulrich Drepper
+Date: Mon May 30 12:31:25 2011 -0400
+
+ Handle DSOs without any dependency in ld.so
+
+diff --git a/elf/dl-deps.c b/elf/dl-deps.c
+index d3c27f1..0b03b90 100644
+--- a/elf/dl-deps.c
++++ b/elf/dl-deps.c
+@@ -617,61 +617,64 @@ Filters not supported with LD_TRACE_PRELINKING"));
+ map->l_searchlist.r_list[i]->l_reserved = 0;
+ }
+
+- /* Now determine the order in which the initialization has to happen. */
++ /* Sort the initializer list to take dependencies into account. The binary
++ itself will always be initialize last. */
+ memcpy (l_initfini, map->l_searchlist.r_list,
+ nlist * sizeof (struct link_map *));
+-
+- /* We can skip looking for the binary itself which is at the front
+- of the search list. */
+- assert (nlist > 1);
+- i = 1;
+- bool seen[nlist];
+- memset (seen, false, nlist * sizeof (seen[0]));
+- while (1)
++ if (__builtin_expect (nlist > 1, 1))
+ {
+- /* Keep track of which object we looked at this round. */
+- seen[i] = true;
+- struct link_map *thisp = l_initfini[i];
+-
+- /* Find the last object in the list for which the current one is
+- a dependency and move the current object behind the object
+- with the dependency. */
+- unsigned int k = nlist - 1;
+- while (k > i)
++ /* We can skip looking for the binary itself which is at the front
++ of the search list. */
++ i = 1;
++ bool seen[nlist];
++ memset (seen, false, nlist * sizeof (seen[0]));
++ while (1)
+ {
+- struct link_map **runp = l_initfini[k]->l_initfini;
+- if (runp != NULL)
+- /* Look through the dependencies of the object. */
+- while (*runp != NULL)
+- if (__builtin_expect (*runp++ == thisp, 0))
+- {
+- /* Move the current object to the back past the last
+- object with it as the dependency. */
+- memmove (&l_initfini[i], &l_initfini[i + 1],
+- (k - i) * sizeof (l_initfini[0]));
+- l_initfini[k] = thisp;
+-
+- if (seen[i + 1])
++ /* Keep track of which object we looked at this round. */
++ seen[i] = true;
++ struct link_map *thisp = l_initfini[i];
++
++ /* Find the last object in the list for which the current one is
++ a dependency and move the current object behind the object
++ with the dependency. */
++ unsigned int k = nlist - 1;
++ while (k > i)
++ {
++ struct link_map **runp = l_initfini[k]->l_initfini;
++ if (runp != NULL)
++ /* Look through the dependencies of the object. */
++ while (*runp != NULL)
++ if (__builtin_expect (*runp++ == thisp, 0))
+ {
+- ++i;
+- goto next_clear;
++ /* Move the current object to the back past the last
++ object with it as the dependency. */
++ memmove (&l_initfini[i], &l_initfini[i + 1],
++ (k - i) * sizeof (l_initfini[0]));
++ l_initfini[k] = thisp;
++
++ if (seen[i + 1])
++ {
++ ++i;
++ goto next_clear;
++ }
++
++ memmove (&seen[i], &seen[i + 1],
++ (k - i) * sizeof (seen[0]));
++ seen[k] = true;
++
++ goto next;
+ }
+
+- memmove (&seen[i], &seen[i + 1], (k - i) * sizeof (seen[0]));
+- seen[k] = true;
++ --k;
++ }
+
+- goto next;
+- }
++ if (++i == nlist)
++ break;
++ next_clear:
++ memset (&seen[i], false, (nlist - i) * sizeof (seen[0]));
+
+- --k;
++ next:;
+ }
+-
+- if (++i == nlist)
+- break;
+- next_clear:
+- memset (&seen[i], false, (nlist - i) * sizeof (seen[0]));
+-
+- next:;
+ }
+
+ /* Terminate the list of dependencies. */
+diff --git a/elf/dl-fini.c b/elf/dl-fini.c
+index ba6c62a..269bcec 100644
+--- a/elf/dl-fini.c
++++ b/elf/dl-fini.c
+@@ -33,9 +33,12 @@ internal_function
+ _dl_sort_fini (struct link_map *l, struct link_map **maps, size_t nmaps,
+ char *used, Lmid_t ns)
+ {
++ /* A list of one element need not be sorted. */
++ if (nmaps == 1)
++ return;
++
+ /* We can skip looking for the binary itself which is at the front
+ of the search list for the main namespace. */
+- assert (nmaps > 1);
+ unsigned int i = ns == LM_ID_BASE;
+ bool seen[nmaps];
+ memset (seen, false, nmaps * sizeof (seen[0]));
+@@ -195,9 +198,8 @@ _dl_fini (void)
+ assert (ns == LM_ID_BASE || i == nloaded || i == nloaded - 1);
+ nmaps = i;
+
+- if (nmaps > 1)
+- /* Now we have to do the sorting. */
+- _dl_sort_fini (GL(dl_ns)[ns]._ns_loaded, maps, nmaps, NULL, ns);
++ /* Now we have to do the sorting. */
++ _dl_sort_fini (GL(dl_ns)[ns]._ns_loaded, maps, nmaps, NULL, ns);
+
+ /* We do not rely on the linked list of loaded object anymore from
+ this point on. We have our own list here (maps). The various
+
+-----------------------------------------------------------------------
+
+Summary of changes:
+ ChangeLog | 6 ++++
+ NEWS | 4 +-
+ elf/dl-deps.c | 93 +++++++++++++++++++++++++++++---------------------------
+ elf/dl-fini.c | 10 ++++--
+ elf/rtld.c | 1 -
+ 5 files changed, 62 insertions(+), 52 deletions(-)
+
+
+hooks/post-receive
+--
+GNU C Library master sources
+
diff --git a/packages/x11/data/xkeyboard-config/meta b/packages/x11/data/xkeyboard-config/meta
index feb3580599..3cfee36011 100644
--- a/packages/x11/data/xkeyboard-config/meta
+++ b/packages/x11/data/xkeyboard-config/meta
@@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xkeyboard-config"
-PKG_VERSION="2.2.1"
+PKG_VERSION="2.3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
diff --git a/packages/x11/driver/xf86-video-nvidia/meta b/packages/x11/driver/xf86-video-nvidia/meta
index 136c91789c..feced14386 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="270.41.19"
+PKG_VERSION="275.09"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="nonfree"