diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-21 18:26:07 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-07-21 18:26:07 +0000 |
| commit | 3ebcb3ca683f60a42676697067625d41c1a84e82 (patch) | |
| tree | b9d2189cc96865215a4d4722ae1a49876fc55141 | |
| parent | 0e1337ea477cefd169447d66c036d518d1f53ee1 (diff) | |
| download | upstream-3ebcb3ca683f60a42676697067625d41c1a84e82.tar.gz upstream-3ebcb3ca683f60a42676697067625d41c1a84e82.tar.bz2 upstream-3ebcb3ca683f60a42676697067625d41c1a84e82.zip | |
opkg: strip trailing whitespaces from entries in conffiles control files, fixes conffile md5 calculation against ipkg-build generated archives
SVN-Revision: 22338
| -rw-r--r-- | package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch | 23 |
1 files changed, 23 insertions, 0 deletions
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 index 0000000000..cd7d47d05a --- /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. */ |