aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2009-03-03 21:20:53 -0600
committerMike Westerhof <mwester@dls.net>2009-03-03 21:20:53 -0600
commit6b809bb153c1493caa4934b43075b7402d85055d (patch)
treef014923999b8d2ddb5c422fb4994a47fdbf0a82c
parentd7e67eab50bc6e577fc67284ecc659b0073343e6 (diff)
downloadopenembedded-6b809bb153c1493caa4934b43075b7402d85055d.tar.gz
openembedded-6b809bb153c1493caa4934b43075b7402d85055d.tar.bz2
openembedded-6b809bb153c1493caa4934b43075b7402d85055d.zip
SlugOS 5.3 - fix opkg unarchive.c filename length bug.
-rw-r--r--packages/opkg/files/opkg_unarchive.patch30
-rw-r--r--packages/opkg/opkg-native_svn.bb2
-rw-r--r--packages/opkg/opkg-nogpg-nocurl_svn.bb2
-rw-r--r--packages/opkg/opkg-nogpg_svn.bb2
-rw-r--r--packages/opkg/opkg-sdk_svn.bb2
-rw-r--r--packages/opkg/opkg_svn.bb2
6 files changed, 24 insertions, 16 deletions
diff --git a/packages/opkg/files/opkg_unarchive.patch b/packages/opkg/files/opkg_unarchive.patch
index 9e5ccfb714..a147cc87ee 100644
--- a/packages/opkg/files/opkg_unarchive.patch
+++ b/packages/opkg/files/opkg_unarchive.patch
@@ -1,13 +1,21 @@
---- trunk/libbb/unarchive.c.orig 2009-02-11 22:14:58.000000000 +0100
-+++ trunk/libbb/unarchive.c 2009-02-11 22:15:07.000000000 +0100
-@@ -606,6 +606,10 @@
- tar_entry->name = concat_path_file(tar.formated.prefix, tar.formated.name);
- }
-
-+ if (strlen(tar_entry->name) > 100) {
-+ tar_entry->name[100] = 0;
-+ }
+--- trunk/libbb/unarchive.c.orig 2006/01/25 00:08:53 13584
++++ trunk/libbb/unarchive.c 2006/02/20 19:28:53 14150
+@@ -120,10 +108,14 @@
+ linkname = NULL;
+ } else
+ #endif
+- if (tar.formated.prefix[0] == 0) {
+- file_header->name = strdup(tar.formated.name);
+- } else {
+- file_header->name = concat_path_file(tar.formated.prefix, tar.formated.name);
++ {
++ file_header->name = strndup(tar.formated.name,100);
+
- // tar_entry->name = xstrdup(tar.formated.name);
++ if (tar.formated.prefix[0]) {
++ char *temp = file_header->name;
++ file_header->name = concat_path_file(tar.formated.prefix, temp);
++ free(temp);
++ }
+ }
- /*
+ file_header->uid = strtol(tar.formated.uid, NULL, 8);
diff --git a/packages/opkg/opkg-native_svn.bb b/packages/opkg/opkg-native_svn.bb
index 82c74e0b86..78a9e8cefc 100644
--- a/packages/opkg/opkg-native_svn.bb
+++ b/packages/opkg/opkg-native_svn.bb
@@ -1,7 +1,7 @@
require opkg.inc
DEPENDS = "curl-native"
-PR = "r3"
+PR = "r4"
target_libdir := "${libdir}"
diff --git a/packages/opkg/opkg-nogpg-nocurl_svn.bb b/packages/opkg/opkg-nogpg-nocurl_svn.bb
index fe2d09da11..082ec68b47 100644
--- a/packages/opkg/opkg-nogpg-nocurl_svn.bb
+++ b/packages/opkg/opkg-nogpg-nocurl_svn.bb
@@ -12,7 +12,7 @@ SRC_URI += " \
file://opkg_wget_nogpg_04_default_tmpdir.patch;patch=1 \
file://opkg_install_err.patch;patch=1;maxrev=198 \
"
-PR = "r6"
+PR = "r7"
SRCREV = "${SRCREV_pn-opkg}"
diff --git a/packages/opkg/opkg-nogpg_svn.bb b/packages/opkg/opkg-nogpg_svn.bb
index a9297d7645..a377bda8a2 100644
--- a/packages/opkg/opkg-nogpg_svn.bb
+++ b/packages/opkg/opkg-nogpg_svn.bb
@@ -3,7 +3,7 @@ require opkg_svn.bb
DEPENDS = "curl"
PROVIDES += "opkg"
-PR = "r3"
+PR = "r4"
SRCREV = "${SRCREV_pn-opkg}"
diff --git a/packages/opkg/opkg-sdk_svn.bb b/packages/opkg/opkg-sdk_svn.bb
index d9b3727d82..f6b01dca0d 100644
--- a/packages/opkg/opkg-sdk_svn.bb
+++ b/packages/opkg/opkg-sdk_svn.bb
@@ -1,7 +1,7 @@
require opkg.inc
DEPENDS = "curl-sdk"
-PR = "r3"
+PR = "r4"
target_libdir := "${libdir}"
inherit sdk
diff --git a/packages/opkg/opkg_svn.bb b/packages/opkg/opkg_svn.bb
index a4728970ce..f3c3fcf77b 100644
--- a/packages/opkg/opkg_svn.bb
+++ b/packages/opkg/opkg_svn.bb
@@ -1,6 +1,6 @@
require opkg.inc
-PR = "r2"
+PR = "r3"
PACKAGES =+ "libopkg-dev libopkg"