sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

ipkg: Fix a problem with paths lengths triggering the use of GNU tar extensions and ipkg not understanding them 

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@596 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2006-08-08 12:18:53 +00:00
parent ee105762c6
commit b161186a4e
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
meta/packages/ipkg/files/fix_tar_extension.patch Normal file
View File

@ -0,0 +1,37 @@
Index: C/libbb/unarchive.c
===================================================================
--- C.orig/libbb/unarchive.c 2005-02-05 16:58:19.000000000 -0500
+++ C/libbb/unarchive.c 2006-08-08 08:10:14.268431408 -0400
@@ -28,7 +28,7 @@
#include "libbb.h"
#define CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY 1
-// #define CONFIG_FEATURE_TAR_GNU_EXTENSIONS
+#define CONFIG_FEATURE_TAR_GNU_EXTENSIONS 1
#ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS
static char *longname = NULL;
@@ -657,7 +657,10 @@
# ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS
case 'L': {
longname = xmalloc(tar_entry->size + 1);
- archive_xread_all((int) tar_stream, longname, tar_entry->size);
+ if(fread(longname, tar_entry->size, 1, tar_stream) != 1) {
+ error_msg("Short read in gnu extension");
+ return(NULL);
+ }
longname[tar_entry->size] = '\0';
archive_offset += tar_entry->size;
@@ -665,7 +668,10 @@
}
case 'K': {
linkname = xmalloc(tar_entry->size + 1);
- archive_xread_all((int) tar_stream, longname, tar_entry->size);
+ if(fread(linkname, tar_entry->size, 1, tar_stream) != 1) {
+ error_msg("Short read in gnu extension");
+ return(NULL);
+ }
linkname[tar_entry->size] = '\0';
archive_offset += tar_entry->size;

1
meta/packages/ipkg/ipkg.inc
View File

@ -10,6 +10,7 @@ FILES_libipkg = "${libdir}"
AUTO_LIBNAME_PKGS = "libipkg"
SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
file://fix_tar_extension.patch;patch=1 \
file://terse.patch;patch=1"
S = "${WORKDIR}/ipkg/C"

2
meta/packages/ipkg/ipkg_0.99.154.bb
View File

@ -1,2 +1,2 @@
include ipkg.inc
PR = "r3"
PR = "r4"