diff --git a/packages/devel/ncurses/install b/packages/devel/ncurses/install index a6c15d1b27..883ff9b267 100755 --- a/packages/devel/ncurses/install +++ b/packages/devel/ncurses/install @@ -36,6 +36,10 @@ TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe linux \ $PKG_BUILD/misc/terminfo.src + mkdir -p $INSTALL/usr/share/terminfo/s + TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe screen \ + $PKG_BUILD/misc/terminfo.src + mkdir -p $INSTALL/usr/share/terminfo/v TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe vt100 \ $PKG_BUILD/misc/terminfo.src @@ -45,5 +49,3 @@ $PKG_BUILD/misc/terminfo.src TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe xterm-color \ $PKG_BUILD/misc/terminfo.src - TERMINFO=$INSTALL/usr/share/terminfo $ROOT/$TOOLCHAIN/bin/tic -xe vt100 \ - $PKG_BUILD/misc/terminfo.src diff --git a/packages/linux-drivers/dvbhdhomerun/meta b/packages/linux-drivers/dvbhdhomerun/meta index c64c40ce5a..af55830e4f 100644 --- a/packages/linux-drivers/dvbhdhomerun/meta +++ b/packages/linux-drivers/dvbhdhomerun/meta @@ -19,12 +19,13 @@ ################################################################################ PKG_NAME="dvbhdhomerun" -PKG_VERSION="20130121" +PKG_VERSION="0.0.15" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://sourceforge.net/projects/dvbhdhomerun/" -PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" +# PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" +PKG_URL="$SOURCEFORGE_SRC/project/dvbhdhomerun/${PKG_NAME}_${PKG_VERSION}.tar.gz" PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain linux libhdhomerun" PKG_PRIORITY="optional" diff --git a/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-20120831-001-conf_file.patch b/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-001-conf_file.patch similarity index 60% rename from packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-20120831-001-conf_file.patch rename to packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-001-conf_file.patch index 60f1a492f6..d93002d43f 100644 --- a/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-20120831-001-conf_file.patch +++ b/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-001-conf_file.patch @@ -1,7 +1,7 @@ -diff -uNr dvbhdhomerun-0.0.9-orig/userhdhomerun/conf_inifile.cpp dvbhdhomerun-0.0.9/userhdhomerun/conf_inifile.cpp ---- dvbhdhomerun-0.0.9-orig/userhdhomerun/conf_inifile.cpp 2011-03-06 21:00:01.000000000 +0100 -+++ dvbhdhomerun-0.0.9/userhdhomerun/conf_inifile.cpp 2011-12-20 23:21:46.000000000 +0100 -@@ -8,6 +8,37 @@ +diff -uNr dvbhdhomerun-0.0.15-orig/userhdhomerun/conf_inifile.cpp dvbhdhomerun-0.0.15/userhdhomerun/conf_inifile.cpp +--- dvbhdhomerun-0.0.15-orig/userhdhomerun/conf_inifile.cpp 2013-02-17 22:37:34.000000000 +0100 ++++ dvbhdhomerun-0.0.15/userhdhomerun/conf_inifile.cpp 2013-03-02 10:23:46.000000000 +0100 +@@ -8,6 +8,38 @@ using namespace std; @@ -35,17 +35,18 @@ diff -uNr dvbhdhomerun-0.0.9-orig/userhdhomerun/conf_inifile.cpp dvbhdhomerun-0. + } + } +} ++ + bool ConfIniFile::OpenIniFile(const string& _filename) { - ifstream conffile; -@@ -15,7 +46,8 @@ - if(conffile.is_open()) { - string line; - string section; -- while(getline(conffile, line)) { -+ //while(getline(conffile, line)) { -+ while(safeGetline(conffile, line)) { - if(line.empty()) { - //LOG() << " ignore, empty"; - } + m_sectionKeyValue.clear(); +@@ -17,7 +49,8 @@ + if(conffile.is_open()) { + string line; + string section; +- while(getline(conffile, line)) { ++ //while(getline(conffile, line)) { ++ while(safeGetline(conffile, line)) { + if(line.empty()) { + //LOG() << " ignore, empty"; + } diff --git a/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-20120831-002-auto_detect.patch b/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-002-auto_detect.patch similarity index 78% rename from packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-20120831-002-auto_detect.patch rename to packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-002-auto_detect.patch index e81954c809..9a926b9960 100644 --- a/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-20120831-002-auto_detect.patch +++ b/packages/linux-drivers/dvbhdhomerun/patches/dvbhdhomerun-002-auto_detect.patch @@ -1,6 +1,6 @@ -diff -uNr dvbhdhomerun-0.0.10-orig/userhdhomerun/hdhomerun_tuner.cpp dvbhdhomerun-0.0.10/userhdhomerun/hdhomerun_tuner.cpp ---- dvbhdhomerun-0.0.10-orig/userhdhomerun/hdhomerun_tuner.cpp 2012-04-28 18:05:40.000000000 +0200 -+++ dvbhdhomerun-0.0.10/userhdhomerun/hdhomerun_tuner.cpp 2012-06-05 13:21:16.000000000 +0200 +diff -uNr dvbhdhomerun-0.0.15-orig/userhdhomerun/hdhomerun_tuner.cpp dvbhdhomerun-0.0.15/userhdhomerun/hdhomerun_tuner.cpp +--- dvbhdhomerun-0.0.15-orig/userhdhomerun/hdhomerun_tuner.cpp 2013-02-17 22:37:34.000000000 +0100 ++++ dvbhdhomerun-0.0.15/userhdhomerun/hdhomerun_tuner.cpp 2013-03-02 10:25:15.000000000 +0100 @@ -97,12 +97,28 @@ string type(tmp); LOG() << "Type of device: " << type << endl; diff --git a/packages/linux-drivers/vboxguest/meta b/packages/linux-drivers/vboxguest/meta index 81b9612339..7fa904095f 100644 --- a/packages/linux-drivers/vboxguest/meta +++ b/packages/linux-drivers/vboxguest/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vboxguest" -PKG_VERSION="4.2.6" +PKG_VERSION="4.2.8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/bash/profile.d/shell.conf b/packages/sysutils/bash/profile.d/shell.conf index 468a3bb085..5081c35522 100644 --- a/packages/sysutils/bash/profile.d/shell.conf +++ b/packages/sysutils/bash/profile.d/shell.conf @@ -26,5 +26,21 @@ PS1='\[\e[0;32m\]\u\[\e[m\] \[\e[1;34m\]\w\[\e[m\] \[\e[1;32m\]\$\[\e[m\] ' export PS1 -TERM="linux" +case "$TERM" in + + # Do nothing when TERM already set (e.g. by SSH) and known + (linux|nxterm|screen|vt100|vt100-am|xterm|xterm-color) + ;; + + # Default to "linux" when unset + ("") + TERM="linux" + ;; + + # Default to "xterm" when unknown + (*) + TERM="xterm" + ;; + +esac export TERM \ No newline at end of file diff --git a/packages/x11/driver/xf86-video-virtualbox/meta b/packages/x11/driver/xf86-video-virtualbox/meta index a113d47395..7f086e6f09 100644 --- a/packages/x11/driver/xf86-video-virtualbox/meta +++ b/packages/x11/driver/xf86-video-virtualbox/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xf86-video-virtualbox" -PKG_VERSION="4.2.6" +PKG_VERSION="4.2.8" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS"