From 7f6faac3947dd90a552a6a369a79a9bdf662a5ba Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 21 Jul 2010 18:26:07 +0000 Subject: [PATCH] [package] opkg: strip trailing whitespaces from entries in conffiles control files, fixes conffile md5 calculation against ipkg-build generated archives SVN-Revision: 22338 --- ...-strip-trailing-conffiles-whitespace.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch 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. */ -- 2.30.2