diff --git a/packages/databases/sqlite/meta b/packages/databases/sqlite/meta index 2daa00c51e..2df110d0d2 100644 --- a/packages/databases/sqlite/meta +++ b/packages/databases/sqlite/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="sqlite" -PKG_VERSION="autoconf-3070400" +PKG_VERSION="autoconf-3070500" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="PublicDomain" diff --git a/packages/graphics/glew/meta b/packages/graphics/glew/meta index 2117b417e0..a0eaa79f09 100644 --- a/packages/graphics/glew/meta +++ b/packages/graphics/glew/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="glew" -PKG_VERSION="1.5.7" +PKG_VERSION="1.5.8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="BSD" diff --git a/packages/graphics/glew/patches/glew-1.5.7-010_crosscompiling.patch b/packages/graphics/glew/patches/glew-1.5.8-010_crosscompiling.patch similarity index 100% rename from packages/graphics/glew/patches/glew-1.5.7-010_crosscompiling.patch rename to packages/graphics/glew/patches/glew-1.5.8-010_crosscompiling.patch diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml index 375c283f76..ce40d2fe29 100644 --- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml @@ -22,4 +22,5 @@ + diff --git a/packages/mediacenter/xbmc-addon-settings/source/addon.xml b/packages/mediacenter/xbmc-addon-settings/source/addon.xml index 76453efdaf..0a0508496c 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/addon.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/addon.xml @@ -1,7 +1,7 @@ diff --git a/packages/mediacenter/xbmc-addon-settings/source/default.py b/packages/mediacenter/xbmc-addon-settings/source/default.py index 547ddba574..cc8fc94470 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/default.py +++ b/packages/mediacenter/xbmc-addon-settings/source/default.py @@ -27,7 +27,7 @@ __author__ = "OpenELEC" __url__ = "http://www.openelec.tv" __svn_url__ = "" __credits__ = "" -__version__ = "0.0.3" +__version__ = "0.0.4" __XBMC_Revision__ = "22240" __settings__ = xbmcaddon.Addon(id='os.openelec.settings') diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml index cf51531315..af1ab2e97e 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml @@ -1,10 +1,14 @@ - - Update - Update - Auto update + + System + Toetsenbord + Toetsenbord layout + System Update + Auto update + LCD/VFD Driver + Te gebruiken LCD Driver Netwerk @@ -26,11 +30,6 @@ WLAN beveiliging WLAN wachtwoord - - LCD/VFD - Driver - Te gebruiken LCD Driver - TV/PVR Configuratie diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml index 5137a33f67..f666cff917 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml @@ -1,10 +1,14 @@ - - Update - Update - Auto update + + System + Keyboard + Keyboardlayout + System Update + Auto update + LCD/VFD + LCD Driver to use Network @@ -26,11 +30,6 @@ WLAN Security WLAN Passphrase - - LCD/VFD - Driver - LCD Driver to use - TV/PVR Boot diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml index d65cba4a11..a0df776b75 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml @@ -2,9 +2,13 @@ - Mise à jour - Mise à jour - Mise à jour automatique + Système + Clavier + Clavier + Mise à jour du système + Mise à jour automatique + LCD/VFD + Pilote LCD Réseau @@ -26,11 +30,6 @@ Sécurité WIFI Passphrase - - LCD/VFD - Pilote - Pilote LCD - TV/PVR Démarrage diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml index e53b26a52f..dd2ad35851 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml @@ -1,11 +1,17 @@ - + - + + + + + + + @@ -33,13 +39,6 @@ - - - - - - - diff --git a/packages/network/transmission/meta b/packages/network/transmission/meta index b62a064458..c29e2cf875 100644 --- a/packages/network/transmission/meta +++ b/packages/network/transmission/meta @@ -19,13 +19,12 @@ ################################################################################ PKG_NAME="transmission" -PKG_VERSION="11666" +PKG_VERSION="2.20b3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.transmissionbt.com/" -#PKG_URL="http://download.m0k.org/transmission/files/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://download.transmissionbt.com/files/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="zlib openssl curl libevent connman" PKG_BUILD_DEPENDS="toolchain zlib openssl curl libevent" PKG_PRIORITY="optional" diff --git a/packages/sysutils/busybox/patches/busybox-1.18.2-buildsys.patch b/packages/sysutils/busybox/patches/busybox-1.18.2-buildsys.patch new file mode 100644 index 0000000000..d904806bf8 --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.18.2-buildsys.patch @@ -0,0 +1,62 @@ +--- busybox-1.18.2/loginutils/Config.src ++++ busybox-1.18.2-buildsys/loginutils/Config.src +@@ -186,7 +186,6 @@ config GETTY + config LOGIN + bool "login" + default y +- select FEATURE_SUID + select FEATURE_SYSLOG + help + login is used when signing onto a system. +@@ -229,7 +228,6 @@ config FEATURE_SECURETTY + config PASSWD + bool "passwd" + default y +- select FEATURE_SUID + select FEATURE_SYSLOG + help + passwd changes passwords for user and group accounts. A normal user +@@ -265,7 +263,6 @@ config CHPASSWD + config SU + bool "su" + default y +- select FEATURE_SUID + select FEATURE_SYSLOG + help + su is used to become another user during a login session. +@@ -295,7 +292,6 @@ config SULOGIN + config VLOCK + bool "vlock" + default y +- select FEATURE_SUID + help + Build the "vlock" applet which allows you to lock (virtual) terminals. + +--- busybox-1.18.2/miscutils/Config.src ++++ busybox-1.18.2-buildsys/miscutils/Config.src +@@ -170,7 +170,6 @@ config FEATURE_CROND_DIR + config CRONTAB + bool "crontab" + default y +- select FEATURE_SUID + help + Crontab manipulates the crontab for a particular user. Only + the superuser may specify a different user and/or crontab directory. +--- busybox-1.18.2/util-linux/Config.src ++++ busybox-1.18.2-buildsys/util-linux/Config.src +@@ -354,7 +354,6 @@ config FEATURE_HWCLOCK_ADJTIME_FHS + config IPCRM + bool "ipcrm" + default y +- select FEATURE_SUID + help + The ipcrm utility allows the removal of System V interprocess + communication (IPC) objects and the associated data structures +@@ -364,7 +363,6 @@ config IPCS + bool "ipcs" + default y + depends on PLATFORM_LINUX +- select FEATURE_SUID + help + The ipcs utility is used to provide information on the currently + allocated System V interprocess (IPC) objects in the system. diff --git a/packages/sysutils/busybox/patches/busybox-1.18.2-hush.patch b/packages/sysutils/busybox/patches/busybox-1.18.2-hush.patch new file mode 100644 index 0000000000..d08e5194d6 --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.18.2-hush.patch @@ -0,0 +1,34 @@ +--- busybox-1.18.2/shell/hush.c ++++ busybox-1.18.2-hush/shell/hush.c +@@ -4123,15 +4123,26 @@ static struct pipe *parse_stream(char ** + && dest.length == 0 && !dest.has_quoted_part + ) { + /* This newline can be ignored. But... +- * without the below check, interactive shell +- * will ignore even lines with bare , +- * and show the continuation prompt: ++ * Without check #1, interactive shell ++ * ignores even bare , ++ * and shows the continuation prompt: + * ps1_prompt$ +- * ps2> _ <=== wrong prompt, should be ps1 ++ * ps2> _ <=== wrong, should be ps1 ++ * Without check #2, "cmd & " ++ * is similarly mistreated. ++ * (BTW, this makes "cmd & cmd" ++ * and "cmd && cmd" non-orthogonal. ++ * Really, ask yourself, why ++ * "cmd && " doesn't start ++ * cmd but waits for more input? ++ * No reason...) + */ + struct pipe *pi = ctx.list_head; +- if (pi->num_cmds != 0) ++ if (pi->num_cmds != 0 /* check #1 */ ++ && pi->followup != PIPE_BG /* check #2 */ ++ ) { + continue; ++ } + } + /* Treat newline as a command separator. */ + done_pipe(&ctx, PIPE_SEQ); diff --git a/packages/sysutils/busybox/patches/busybox-1.18.2-libbb.patch b/packages/sysutils/busybox/patches/busybox-1.18.2-libbb.patch new file mode 100644 index 0000000000..aa7e75d700 --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.18.2-libbb.patch @@ -0,0 +1,10 @@ +--- busybox-1.18.2/libbb/vfork_daemon_rexec.c ++++ busybox-1.18.2-libbb/libbb/vfork_daemon_rexec.c +@@ -52,6 +52,7 @@ pid_t FAST_FUNC spawn(char **argv) + * Interested party can wait on pid and learn exit code. + * If 111 - then it (most probably) failed to exec */ + if (failed) { ++ safe_waitpid(pid, NULL, 0); /* prevent zombie */ + errno = failed; + return -1; + } diff --git a/packages/sysutils/busybox/patches/busybox-1.18.2-modprobe-small.patch b/packages/sysutils/busybox/patches/busybox-1.18.2-modprobe-small.patch new file mode 100644 index 0000000000..b0623f2550 --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.18.2-modprobe-small.patch @@ -0,0 +1,19 @@ +--- busybox-1.18.2/modutils/modprobe-small.c ++++ busybox-1.18.2-modprobe-small/modutils/modprobe-small.c +@@ -205,6 +205,7 @@ static void parse_module(module_info *in + /* Read (possibly compressed) module */ + len = 64 * 1024 * 1024; /* 64 Mb at most */ + module_image = xmalloc_open_zipped_read_close(pathname, &len); ++ /* module_image == NULL is ok here, find_keyword handles it */ + //TODO: optimize redundant module body reads + + /* "alias1 symbol:sym1 alias2 symbol:sym2" */ +@@ -845,6 +846,8 @@ int modprobe_main(int argc UNUSED_PARAM, + + len = MAXINT(ssize_t); + map = xmalloc_open_zipped_read_close(*argv, &len); ++ if (!map) ++ bb_perror_msg_and_die("can't read '%s'", *argv); + if (init_module(map, len, + IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(options ? options : "") + IF_NOT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE("") diff --git a/packages/sysutils/busybox/patches/busybox-1.18.2-modprobe.patch b/packages/sysutils/busybox/patches/busybox-1.18.2-modprobe.patch new file mode 100644 index 0000000000..cad887e054 --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.18.2-modprobe.patch @@ -0,0 +1,20 @@ +--- busybox-1.18.2/modutils/modutils.c ++++ busybox-1.18.2-modprobe/modutils/modutils.c +@@ -71,12 +71,11 @@ char* FAST_FUNC parse_cmdline_module_opt + optlen = 0; + while (*++argv) { + options = xrealloc(options, optlen + 2 + strlen(*argv) + 2); +- /* Older versions were enclosing space-containing *argv in "", +- * but both modprobe and insmod from module-init-tools 3.11.1 +- * don't do this anymore. (As to extra trailing space, +- * insmod adds it but modprobe does not. We do in both cases) +- */ +- optlen += sprintf(options + optlen, "%s ", *argv); ++ /* Spaces handled by "" pairs, but no way of escaping quotes */ ++//TODO: module-init-tools version 3.11.1 quotes only value: ++//it generates var="val with spaces", not "var=val with spaces" ++//(and it won't quote var *name* even if it has spaces) ++ optlen += sprintf(options + optlen, (strchr(*argv, ' ') ? "\"%s\" " : "%s "), *argv); + } + return options; + } diff --git a/packages/sysutils/busybox/patches/busybox-1.18.2-wc.patch b/packages/sysutils/busybox/patches/busybox-1.18.2-wc.patch new file mode 100644 index 0000000000..558896d9b7 --- /dev/null +++ b/packages/sysutils/busybox/patches/busybox-1.18.2-wc.patch @@ -0,0 +1,41 @@ +--- busybox-1.18.2/coreutils/wc.c ++++ busybox-1.18.2-wc/coreutils/wc.c +@@ -81,11 +81,11 @@ + * column order in "wc -cmlwL" output: + */ + enum { +- WC_LINES = 0, +- WC_WORDS = 1, +- WC_UNICHARS = 2, +- WC_CHARS = 3, +- WC_LENGTH = 4, ++ WC_LINES = 0, /* -l */ ++ WC_WORDS = 1, /* -w */ ++ WC_UNICHARS = 2, /* -m */ ++ WC_BYTES = 3, /* -c */ ++ WC_LENGTH = 4, /* -L */ + NUM_WCS = 5, + }; + +@@ -104,10 +104,10 @@ int wc_main(int argc UNUSED_PARAM, char + + init_unicode(); + +- print_type = getopt32(argv, "lwcmL"); ++ print_type = getopt32(argv, "lwmcL"); + + if (print_type == 0) { +- print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS); ++ print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_BYTES); + } + + argv += optind; +@@ -157,7 +157,7 @@ int wc_main(int argc UNUSED_PARAM, char + } + + /* Cater for -c and -m */ +- ++counts[WC_CHARS]; ++ ++counts[WC_BYTES]; + if (unicode_status != UNICODE_ON /* every byte is a new char */ + || (c & 0xc0) != 0x80 /* it isn't a 2nd+ byte of a Unicode char */ + ) { diff --git a/packages/toolchain/devel/ccache/meta b/packages/toolchain/devel/ccache/meta index faed310b15..359d21c28b 100644 --- a/packages/toolchain/devel/ccache/meta +++ b/packages/toolchain/devel/ccache/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="ccache" -PKG_VERSION="3.1.3" +PKG_VERSION="3.1.4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/x11/app/setxkbmap/build b/packages/x11/app/setxkbmap/build new file mode 100755 index 0000000000..d8601440b8 --- /dev/null +++ b/packages/x11/app/setxkbmap/build @@ -0,0 +1,31 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +cd $PKG_BUILD +./configure --host=$TARGET_NAME \ + --build=$HOST_NAME \ + --prefix=/usr \ + --sysconfdir=/etc \ + +make diff --git a/packages/x11/app/setxkbmap/init.d/72_keyboard b/packages/x11/app/setxkbmap/init.d/72_keyboard new file mode 100644 index 0000000000..dc1c643800 --- /dev/null +++ b/packages/x11/app/setxkbmap/init.d/72_keyboard @@ -0,0 +1,43 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +# setup keyboard layout +# +# runlevels: openelec + +OPENELEC_SETTINGS="$HOME/.xbmc/userdata/addon_data/os.openelec.settings/settings.xml" + +( + if [ -f "$OPENELEC_SETTINGS" ]; then + X11_KEYMAP=`grep X11_KEYMAP $OPENELEC_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"` + + progress "setup keyboard layout" + + if [ -z $X11_KEYMAP ]; then + X11_KEYMAP="us" + fi + + # waiting for Xorg to start + wait_for_xorg + + # setup keymap + setxkbmap -display $DISPLAY $X11_KEYMAP + fi +)& diff --git a/packages/x11/app/setxkbmap/install b/packages/x11/app/setxkbmap/install new file mode 100755 index 0000000000..7f41bd205f --- /dev/null +++ b/packages/x11/app/setxkbmap/install @@ -0,0 +1,27 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +mkdir -p $INSTALL/usr/bin + cp $PKG_BUILD/$1 $INSTALL/usr/bin + diff --git a/packages/x11/app/setxkbmap/meta b/packages/x11/app/setxkbmap/meta new file mode 100644 index 0000000000..415e262127 --- /dev/null +++ b/packages/x11/app/setxkbmap/meta @@ -0,0 +1,36 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="setxkbmap" +PKG_VERSION="1.2.0" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="OSS" +PKG_SITE="http://www.X.org" +PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_DEPENDS="libX11" +PKG_BUILD_DEPENDS="toolchain libX11" +PKG_PRIORITY="optional" +PKG_SECTION="x11/app" +PKG_SHORTDESC="setxkbmap: Sets the keyboard using the X Keyboard Extension" +PKG_LONGDESC="Setxkbmap sets the keyboard using the X Keyboard Extension." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="yes" diff --git a/packages/x11/lib/libpciaccess/install b/packages/x11/lib/libpciaccess/install index e85ccfe613..2b47da89e6 100755 --- a/packages/x11/lib/libpciaccess/install +++ b/packages/x11/lib/libpciaccess/install @@ -26,5 +26,5 @@ mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/src/.libs/libpciaccess.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/bin - cp -P $PKG_BUILD/src/.libs/scanpci $INSTALL/usr/bin + cp -P $PKG_BUILD/scanpci/.libs/scanpci $INSTALL/usr/bin diff --git a/packages/x11/lib/libpciaccess/meta b/packages/x11/lib/libpciaccess/meta index 7dbe3bc1b4..ea6de2abd0 100644 --- a/packages/x11/lib/libpciaccess/meta +++ b/packages/x11/lib/libpciaccess/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libpciaccess" -PKG_VERSION="0.12.0" +PKG_VERSION="0.12.1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta index a313fc3259..6c4e243beb 100644 --- a/packages/x11/xserver/xorg-server/meta +++ b/packages/x11/xserver/xorg-server/meta @@ -56,4 +56,4 @@ fi done # Tools - PKG_DEPENDS="$PKG_DEPENDS pciutils ratpoison xrandr" + PKG_DEPENDS="$PKG_DEPENDS pciutils ratpoison xrandr setxkbmap"