From a49e853d78ae399b5375e45fc0cd8740d2f625ca Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 24 Sep 2011 13:35:30 +0200 Subject: [PATCH 1/6] busybox: update upstream patches Signed-off-by: Stephan Raue --- .../patches/busybox-1.19.2-android.patch | 11 +++++ .../patches/busybox-1.19.2-buildsys.patch | 19 ++++++++ .../patches/busybox-1.19.2-syslogd.patch | 20 +++++++++ .../busybox/patches/busybox-1.19.2-tail.patch | 43 +++++++++++++++++++ 4 files changed, 93 insertions(+) create mode 100644 packages/sysutils/busybox/patches/busybox-1.19.2-android.patch create mode 100644 packages/sysutils/busybox/patches/busybox-1.19.2-buildsys.patch create mode 100644 packages/sysutils/busybox/patches/busybox-1.19.2-syslogd.patch create mode 100644 packages/sysutils/busybox/patches/busybox-1.19.2-tail.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 new file mode 100644 index 0000000000..e2e6528a2f --- /dev/null +++ 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 new file mode 100644 index 0000000000..8e0c4c33ee --- /dev/null +++ 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 new file mode 100644 index 0000000000..d54f5d4307 --- /dev/null +++ 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 new file mode 100644 index 0000000000..f3cc79814e --- /dev/null +++ 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 From ee848dd970af49a9d1378081cd6574916ef457ae Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 24 Sep 2011 13:36:08 +0200 Subject: [PATCH 2/6] file: update to file-5.09 Signed-off-by: Stephan Raue --- packages/devel/file/meta | 2 +- .../file/patches/{file-5.08-zip.patch => file-5.09-zip.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/devel/file/patches/{file-5.08-zip.patch => file-5.09-zip.patch} (100%) diff --git a/packages/devel/file/meta b/packages/devel/file/meta index c4f4896f78..6374af413d 100644 --- 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/packages/devel/file/patches/file-5.08-zip.patch b/packages/devel/file/patches/file-5.09-zip.patch similarity index 100% rename from packages/devel/file/patches/file-5.08-zip.patch rename to packages/devel/file/patches/file-5.09-zip.patch From faf3f93b9ffaca8988b0b1c432aaabea240dbfcb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 24 Sep 2011 13:37:10 +0200 Subject: [PATCH 3/6] sqlite: update to sqlite-autoconf-3070800 Signed-off-by: Stephan Raue --- packages/databases/sqlite/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/databases/sqlite/meta b/packages/databases/sqlite/meta index 59f584093c..077a8a3318 100644 --- 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" From 2f6543e2fc6eec8754c9c4e60aedf5f795a507a5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 24 Sep 2011 13:37:42 +0200 Subject: [PATCH 4/6] dbus: update to dbus-1.4.16 Signed-off-by: Stephan Raue --- packages/sysutils/dbus/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/dbus/meta b/packages/sysutils/dbus/meta index e4f5adb65b..6f6c013875 100644 --- 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" From 1921ead5e22fac5b2a7b5580c6157cfc187603ac Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 24 Sep 2011 13:38:18 +0200 Subject: [PATCH 5/6] dbus-glib: update to dbus-glib-0.96 Signed-off-by: Stephan Raue --- packages/devel/dbus-glib/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/dbus-glib/meta b/packages/devel/dbus-glib/meta index 28d36e819d..31870a294e 100644 --- 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" From 2361f5ebdef5b22a7cfff92a46619361c35f5d3e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 24 Sep 2011 17:02:55 +0200 Subject: [PATCH 6/6] eventlircd: add some keymappings Signed-off-by: Stephan Raue --- packages/sysutils/remote/eventlircd/evmap/ircore.evmap | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/sysutils/remote/eventlircd/evmap/ircore.evmap b/packages/sysutils/remote/eventlircd/evmap/ircore.evmap index 2d4c7e7257..9983fc44c8 100644 --- 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