[oe-commits] Mike Westerhof : SlugOS 5.3 - fix opkg unarchive.c filename length bug.

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.slugos.5.3-beta
Commit: 6b809bb153c1493caa4934b43075b7402d85055d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6b809bb153c1493caa4934b43075b7402d85055d

Author: Mike Westerhof <mwester at dls.net>
Date:   Tue Mar  3 21:20:53 2009 -0600

SlugOS 5.3 - fix opkg unarchive.c filename length bug.

---

 packages/opkg/files/opkg_unarchive.patch |   30 +++++++++++++++++++-----------
 packages/opkg/opkg-native_svn.bb         |    2 +-
 packages/opkg/opkg-nogpg-nocurl_svn.bb   |    2 +-
 packages/opkg/opkg-nogpg_svn.bb          |    2 +-
 packages/opkg/opkg-sdk_svn.bb            |    2 +-
 packages/opkg/opkg_svn.bb                |    2 +-
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/packages/opkg/files/opkg_unarchive.patch b/packages/opkg/files/opkg_unarchive.patch
index 9e5ccfb..a147cc8 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 82c74e0..78a9e8c 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 fe2d09d..082ec68 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 a9297d7..a377bda 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 d9b3727..f6b01dc 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 a472897..f3c3fcf 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"