SlugOS: opkg-nogpg-nocurl - cherrypick uninitialized err var patch

openembedded · Mar 1, 2009 · 8645ca1 · 8645ca1
1 parent 24b3cbc
commit 8645ca1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/packages/opkg/files/opkg_install_err.patch b/packages/opkg/files/opkg_install_err.patch
@@ -0,0 +1,17 @@
+# This is cherry-picked from svn version 199 from the opkg repo.
+#
+# Commit message:
+#Initial the 'err' valaible in opkg_install_by_name , or it may be used without
+#initialize.
+#
+--- orig/libopkg/opkg_install.c	2009-02-13 23:59:17.000000000 -0600
++++ opkg/libopkg/opkg_install.c	2009-02-28 21:01:59.000000000 -0600
+@@ -139,7 +139,7 @@ int opkg_install_from_file(opkg_conf_t *
+
+ opkg_error_t opkg_install_by_name(opkg_conf_t *conf, const char *pkg_name)
+ {
+-     int cmp, err;
++     int cmp, err = 0;
+      pkg_t *old, *new;
+      char *old_version, *new_version;
+
diff --git a/packages/opkg/opkg-nogpg-nocurl_svn.bb b/packages/opkg/opkg-nogpg-nocurl_svn.bb
@@ -10,8 +10,9 @@ SRC_URI += " \
 	    file://opkg_wget_nogpg_02_use_vfork_system.patch;patch=1 \
 	    file://opkg_wget_nogpg_03_fix_tmpdirs.patch;patch=1 \
 	    file://opkg_wget_nogpg_04_default_tmpdir.patch;patch=1 \
+	    file://opkg_install_err.patch;patch=1;maxrev=198 \
 	   "
-PR = "r5"
+PR = "r6"
 
 SRCREV = "${SRCREV_pn-opkg}"