summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-02-11 22:32:06 +0100
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-02-11 22:32:06 +0100
commit4e1b79d2d824ae7e0204251a09e852c24045c54a (patch)
tree42d9d5f69db7836f0982397c5ccf9e131c62e77d
parent2f56f3b3b0e961647c2c3459752028e065ad6ca7 (diff)
opkg: fix bug that occured with file names of exactly 100 chars in the tar file
-rw-r--r--packages/opkg/files/opkg_unarchive.patch13
-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.inc3
-rw-r--r--packages/opkg/opkg_svn.bb2
7 files changed, 20 insertions, 6 deletions
diff --git a/packages/opkg/files/opkg_unarchive.patch b/packages/opkg/files/opkg_unarchive.patch
new file mode 100644
index 0000000000..9e5ccfb714
--- /dev/null
+++ b/packages/opkg/files/opkg_unarchive.patch
@@ -0,0 +1,13 @@
+--- 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;
++ }
++
+ // tar_entry->name = xstrdup(tar.formated.name);
+
+ /*
diff --git a/packages/opkg/opkg-native_svn.bb b/packages/opkg/opkg-native_svn.bb
index 57c6e61fb0..82c74e0b86 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 = "r2"
+PR = "r3"
target_libdir := "${libdir}"
diff --git a/packages/opkg/opkg-nogpg-nocurl_svn.bb b/packages/opkg/opkg-nogpg-nocurl_svn.bb
index 4daa58f274..71133cb3d6 100644
--- a/packages/opkg/opkg-nogpg-nocurl_svn.bb
+++ b/packages/opkg/opkg-nogpg-nocurl_svn.bb
@@ -10,7 +10,7 @@ SRC_URI += " \
file://opkg_wget_nogpg_02_use_vfork_system.patch;patch=1 \
file://opkg_wget_nogpg_03_fix_tmpdirs.patch;patch=1 \
"
-PR = "r3"
+PR = "r4"
SRCREV = "${SRCREV_pn-opkg}"
diff --git a/packages/opkg/opkg-nogpg_svn.bb b/packages/opkg/opkg-nogpg_svn.bb
index f58df2fb18..a9297d7645 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 = "r2"
+PR = "r3"
SRCREV = "${SRCREV_pn-opkg}"
diff --git a/packages/opkg/opkg-sdk_svn.bb b/packages/opkg/opkg-sdk_svn.bb
index c28fe97591..d9b3727d82 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 = "r2"
+PR = "r3"
target_libdir := "${libdir}"
inherit sdk
diff --git a/packages/opkg/opkg.inc b/packages/opkg/opkg.inc
index b586e70ab9..bd16f92e20 100644
--- a/packages/opkg/opkg.inc
+++ b/packages/opkg/opkg.inc
@@ -5,7 +5,8 @@ LICENSE = "GPL"
DEPENDS = "curl gpgme"
PV = "0.1.6+svnr${SRCREV}"
-SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http"
+SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
+ file://opkg_unarchive.patch;patch=1"
S = "${WORKDIR}/trunk"
inherit autotools pkgconfig
diff --git a/packages/opkg/opkg_svn.bb b/packages/opkg/opkg_svn.bb
index 4cf1c5caab..a4728970ce 100644
--- a/packages/opkg/opkg_svn.bb
+++ b/packages/opkg/opkg_svn.bb
@@ -1,6 +1,6 @@
require opkg.inc
-PR = "r1"
+PR = "r2"
PACKAGES =+ "libopkg-dev libopkg"