[oe-commits] org.oe.dev ipkg/ipkg-0.99.163/patch-ipkg-localfilename : Addition of patch

[kristoffer commit]

ipkg/ipkg-0.99.163/patch-ipkg-localfilename : Addition of patch
* This patch fixes one of many bugs in ipkg, involving
  localfilename. Submitted by Alexandre Orlov <axorlov at gmail.com>
  from the Jlime dev team. Confirmed working.
* Applied patch to ipkg_0.99.163.bb

Author: kristoffer at openembedded.org
Branch: org.openembedded.dev
Revision: ef3ac8e2e00dd3068a79dfbb7d7c32970c5e587d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ef3ac8e2e00dd3068a79dfbb7d7c32970c5e587d
Files:
1
packages/ipkg/ipkg-0.99.163
packages/ipkg/ipkg-0.99.163/patch-ipkg-localfilename
packages/ipkg/ipkg_0.99.163.bb
Diffs:

#
# mt diff -r77212e456a021803396d11bcad7616c51e5c6d25 -ref3ac8e2e00dd3068a79dfbb7d7c32970c5e587d
#
# 
# 
# add_dir "packages/ipkg/ipkg-0.99.163"
# 
# add_file "packages/ipkg/ipkg-0.99.163/patch-ipkg-localfilename"
#  content [b8750d3bbbdb4b421e0b0850e2b5d86a8adb3ddf]
# 
# patch "packages/ipkg/ipkg_0.99.163.bb"
#  from [3f7c03363e5ff1cf1cc9e64213a34821a0baf199]
#    to [c2ebb13990dffce1ef408abb61a7dc8e3b65bf1a]
# 
============================================================
--- packages/ipkg/ipkg-0.99.163/patch-ipkg-localfilename	b8750d3bbbdb4b421e0b0850e2b5d86a8adb3ddf
+++ packages/ipkg/ipkg-0.99.163/patch-ipkg-localfilename	b8750d3bbbdb4b421e0b0850e2b5d86a8adb3ddf
@@ -0,0 +1,29 @@
+--- ipkg-0.99.163.orig/ipkg_download.c	Thu Apr 20 20:18:29 2006
++++ ipkg-0.99.163/ipkg_download.c	Thu Jan 18 05:54:52 2007
+@@ -108,6 +108,7 @@
+ {
+     int err;
+     char *url;
++    char *filename;
+ 
+     if (pkg->src == NULL) {
+ 	ipkg_message(conf,IPKG_ERROR, "ERROR: Package %s (parent %s) is not available from any configured src.\n",
+@@ -117,11 +118,16 @@
+ 
+     sprintf_alloc(&url, "%s/%s", pkg->src->value, pkg->filename);
+ 
+-    /* XXX: BUG: The pkg->filename might be something like
++    /* The pkg->filename might be something like
+        "../../foo.ipk". While this is correct, and exactly what we
+        want to use to construct url above, here we actually need to
+        use just the filename part, without any directory. */
+-    sprintf_alloc(&pkg->local_filename, "%s/%s", dir, pkg->filename);
++    filename = strrchr(pkg->filename, '/');
++    if(NULL == filename)
++        filename = pkg->filename;
++    else
++        filename++;
++    sprintf_alloc(&pkg->local_filename, "%s/%s", dir, filename);
+ 
+     err = ipkg_download(conf, url, pkg->local_filename);
+     free(url);
============================================================
--- packages/ipkg/ipkg_0.99.163.bb	3f7c03363e5ff1cf1cc9e64213a34821a0baf199
+++ packages/ipkg/ipkg_0.99.163.bb	c2ebb13990dffce1ef408abb61a7dc8e3b65bf1a
@@ -1,12 +1,12 @@ SRC_URI = "http://www.handhelds.org/pub/
 include ipkg.inc
 PR = "r1"
 
 S = "${WORKDIR}/ipkg-${PV}"
 
 SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \
-	file://terse.patch;patch=1"
+	file://terse.patch;patch=1 \
+	file://patch-ipkg-localfilename;patch=0"
 
-
 do_stage() {
 	oe_libinstall -so libipkg ${STAGING_LIBDIR}
 	install -d ${STAGING_INCDIR}/libipkg/