diff options
| author | Mike Westerhof <mwester@dls.net> | 2008-06-17 03:50:03 +0000 |
|---|---|---|
| committer | Mike Westerhof <mwester@dls.net> | 2008-06-17 03:50:03 +0000 |
| commit | 5c84e19f276babb5fdf1ad9096ee43645955b32f (patch) | |
| tree | 7a7d92fc75dbf805eb06e9627b30a2cdcbe07bc1 /packages | |
| parent | e4e8ef0d402f6a7632500f1f055f2e7734c2c89a (diff) | |
ipkg-utils: fix ipk (ar) file processing to handle odd-length data blocks.
Closes bug #4350.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/ipkg-utils/ipkg-utils/arfile_even_alignment.patch | 11 | ||||
| -rw-r--r-- | packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/packages/ipkg-utils/ipkg-utils/arfile_even_alignment.patch b/packages/ipkg-utils/ipkg-utils/arfile_even_alignment.patch new file mode 100644 index 0000000000..3ab133fb15 --- /dev/null +++ b/packages/ipkg-utils/ipkg-utils/arfile_even_alignment.patch @@ -0,0 +1,11 @@ +--- ipkg-utils/arfile.py.orig 2008-06-11 21:07:01.000000000 -0500 ++++ ipkg-utils/arfile.py 2008-06-14 19:56:04.000000000 -0500 +@@ -86,6 +86,8 @@ + return FileSection(self.f, self.f.tell(), size) + + # Skip data and loop ++ if size % 2: ++ size = size + 1 + data = self.f.seek(size, 1) + # print hex(f.tell()) + diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb index f64e644bd3..707a005c5c 100644 --- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb @@ -5,12 +5,13 @@ LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS = "python" SRCDATE = "20050404" -PR = "r20" +PR = "r20.1" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ file://ipkg-utils-fix.patch;patch=1 \ file://ipkg-py-sane-vercompare.patch;patch=1 \ file://ipkg-py-tarfile.patch;patch=1 \ + file://arfile_even_alignment.patch;patch=1 \ file://ipkg-make-index-track-stamps.patch;patch=1 \ file://fields_tweaks.patch;patch=1 " |