opkg: fix bug that occured with file names of exactly 100 chars in the tar file

diff --git a/packages/opkg/files/opkg_unarchive.patch b/packages/opkg/files/opkg_unarchive.patch
new file mode 100644 (file)
index 0000000..9e5ccfb
--- /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 57c6e61fb065bc86a7a893e981060325ad64ede2..82c74e0b86a62810b1975129315dff133943618f 100644 (file)
--- 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 4daa58f274e0aaaafd418852f9b4f0289154a7b0..71133cb3d67b370dc578f980b7f66085eb341afd 100644 (file)
--- 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 f58df2fb18160f752dd308b3258780e4064afc2e..a9297d7645708698bf614829726f75fa8ca3bca6 100644 (file)
--- 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 c28fe975910cae1c53e52e67df0770ab208936fe..d9b3727d82db857c52d8c3094a51ad5790f82250 100644 (file)
--- 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 b586e70ab91f3180e573c2a73a8bfb833643252c..bd16f92e2067943a3e48e72b02503a2b9e297611 100644 (file)
--- 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 4cf1c5caab5054b5e617b758b06526e616fa0c9f..a4728970cee0f4b51572c9f0f3e33533660729d2 100644 (file)
--- 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"