[backfire] merge r22338

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22339 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch b/package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
new file mode 100644 (file)
index 0000000..cd7d47d
--- /dev/null
+++ b/package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
@@ -0,0 +1,23 @@
+--- a/libopkg/opkg_install.c
++++ b/libopkg/opkg_install.c
+@@ -271,6 +271,7 @@ unpack_pkg_control_files(pkg_t *pkg)
+      while (1) {
+         char *cf_name;
+         char *cf_name_in_dest;
++        int i;
+ 
+         cf_name = file_read_line_alloc(conffiles_file);
+         if (cf_name == NULL) {
+@@ -279,6 +280,12 @@ unpack_pkg_control_files(pkg_t *pkg)
+         if (cf_name[0] == '\0') {
+              continue;
+         }
++        for (i = strlen(cf_name) - 1;
++             (i >= 0) && (cf_name[i] == ' ' || cf_name[i] == '\t');
++             i--
++        ) {
++             cf_name[i] = '\0';
++        }
+ 
+         /* Prepend dest->root_dir to conffile name.
+            Take pains to avoid multiple slashes. */