Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv into …

…openelec-eden
OpenELEC · Sep 24, 2011 · 955afeb · 955afeb
2 parents 3da9954 + 219327a
commit 955afeb
Show file tree

Hide file tree

Showing 10 changed files with 100 additions and 4 deletions.
diff --git a/packages/databases/sqlite/meta b/packages/databases/sqlite/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="sqlite"
-PKG_VERSION="autoconf-3070701"
+PKG_VERSION="autoconf-3070800"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="PublicDomain"

diff --git a/packages/devel/dbus-glib/meta b/packages/devel/dbus-glib/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dbus-glib"
-PKG_VERSION="0.92"
+PKG_VERSION="0.96"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/devel/file/meta b/packages/devel/file/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="file"
-PKG_VERSION="5.08"
+PKG_VERSION="5.09"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"

diff --git a/...es/devel/file/patches/file-5.08-zip.patch → ...es/devel/file/patches/file-5.09-zip.patch b/...es/devel/file/patches/file-5.08-zip.patch → ...es/devel/file/patches/file-5.09-zip.patch
diff --git a/packages/sysutils/busybox/patches/busybox-1.19.2-android.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-android.patch
@@ -0,0 +1,11 @@
+--- busybox-1.19.2/include/platform.h
++++ busybox-1.19.2-android/include/platform.h
+@@ -433,7 +433,7 @@ typedef unsigned smalluint;
+ # undef HAVE_STPCPY
+ #endif
+
+-#if defined(ANDROID)
++#if defined(ANDROID) || defined(__ANDROID__)
+ # undef HAVE_DPRINTF
+ # undef HAVE_GETLINE
+ # undef HAVE_STPCPY
diff --git a/packages/sysutils/busybox/patches/busybox-1.19.2-buildsys.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-buildsys.patch
@@ -0,0 +1,19 @@
+--- busybox-1.19.2/applets/applet_tables.c
++++ busybox-1.19.2-buildsys/applets/applet_tables.c
+@@ -80,8 +80,15 @@ int main(int argc, char **argv)
+
+ 	printf("#define NUM_APPLETS %u\n", NUM_APPLETS);
+ 	if (NUM_APPLETS == 1) {
++		char *dash_to_underscore, *p;
+ 		printf("#define SINGLE_APPLET_STR \"%s\"\n", applets[0].name);
+-		printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].name);
++		/* Example: "ether-wake" -> "ether_wake" */
++		p = dash_to_underscore = strdup(applets[0].name);
++		p--;
++		while (*++p)
++			if (*p == '-')
++				*p = '_';
++		printf("#define SINGLE_APPLET_MAIN %s_main\n", dash_to_underscore);
+ 	}
+ 	printf("\n");
+
diff --git a/packages/sysutils/busybox/patches/busybox-1.19.2-syslogd.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-syslogd.patch
@@ -0,0 +1,20 @@
+--- busybox-1.19.2/sysklogd/syslogd.c
++++ busybox-1.19.2-syslogd/sysklogd/syslogd.c
+@@ -278,7 +278,7 @@ static void parse_syslogdcfg(const char 
+ 	parser_t *parser;
+
+ 	parser = config_open2(file ? file : "/etc/syslog.conf",
+-				file ? xfopen_for_read : fopen_or_warn_stdin);
++				file ? xfopen_for_read : fopen_for_read);
+ 	if (!parser)
+ 		/* didn't find default /etc/syslog.conf */
+ 		/* proceed as if we built busybox without config support */
+@@ -678,7 +678,7 @@ static void timestamp_and_log(int pri, c
+ 	if (LOG_PRI(pri) < G.logLevel) {
+ #if ENABLE_FEATURE_IPC_SYSLOG
+ 		if ((option_mask32 & OPT_circularlog) && G.shbuf) {
+-			log_to_shmem(msg);
++			log_to_shmem(G.printbuf);
+ 			return;
+ 		}
+ #endif
diff --git a/packages/sysutils/busybox/patches/busybox-1.19.2-tail.patch b/packages/sysutils/busybox/patches/busybox-1.19.2-tail.patch
@@ -0,0 +1,43 @@
+--- busybox-1.19.2/coreutils/tail.c
++++ busybox-1.19.2-tail/coreutils/tail.c
+@@ -203,7 +203,7 @@ int tail_main(int argc, char **argv)
+ 		int fd = fds[i];
+
+ 		if (ENABLE_FEATURE_FANCY_TAIL && fd < 0)
+-			continue; /* may happen with -E */
++			continue; /* may happen with -F */
+
+ 		if (nfiles > header_threshhold) {
+ 			tail_xprint_header(fmt, argv[i]);
+@@ -252,14 +252,14 @@ int tail_main(int argc, char **argv)
+ 		 * Used only by +N code ("start from Nth", 1-based): */
+ 		seen = 1;
+ 		newlines_seen = 0;
+-		while ((nread = tail_read(fd, buf, tailbufsize-taillen)) > 0) {
++		while ((nread = tail_read(fd, buf, tailbufsize - taillen)) > 0) {
+ 			if (G.from_top) {
+ 				int nwrite = nread;
+ 				if (seen < count) {
+ 					/* We need to skip a few more bytes/lines */
+ 					if (COUNT_BYTES) {
+ 						nwrite -= (count - seen);
+-						seen = count;
++						seen += nread;
+ 					} else {
+ 						char *s = buf;
+ 						do {
+--- busybox-1.19.2/testsuite/tail.tests
++++ busybox-1.19.2-tail/testsuite/tail.tests
+@@ -14,4 +14,12 @@ testing "tail: +N with N > file length" 
+ 	"0\n" \
+ 	"" "qw"
+
++testing "tail: -c +N with largish N" \
++	"
++	dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8200 | wc -c;
++	dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8208 | wc -c;
++	" \
++	"8185\n8177\n" \
++	"" ""
++
+ exit $FAILCOUNT
diff --git a/packages/sysutils/dbus/meta b/packages/sysutils/dbus/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="dbus"
-PKG_VERSION="1.4.14"
+PKG_VERSION="1.4.16"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/sysutils/remote/eventlircd/evmap/ircore.evmap b/packages/sysutils/remote/eventlircd/evmap/ircore.evmap
@@ -40,3 +40,6 @@ KEY_PLAYPAUSE    = KEY_PLAY
 KEY_TITLE        = KEY_SUBTITLE
 KEY_CONTEXT_MENU = KEY_EPG # used for context menu # todo
 KEY_EJECTCLOSECD = KEY_EJECT
+KEY_EJECTCD      = KEY_EJECT
+
+KEY_SLEEP        = KEY_POWER