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 | a5e5298edc72026d074a12ade3c0c52ac1871981 (patch) | |
| tree | fd13329243191c4819a4faed220ad557a2d899dc /package/opkg | |
| parent | 3d492106cd51187a854d591be3423e4489424ea9 (diff) | |
| download | master-187ad058-a5e5298edc72026d074a12ade3c0c52ac1871981.tar.gz master-187ad058-a5e5298edc72026d074a12ade3c0c52ac1871981.tar.bz2 master-187ad058-a5e5298edc72026d074a12ade3c0c52ac1871981.zip | |
[package] opkg: strip trailing whitespaces from entries in conffiles control files, fixes conffile md5 calculation against ipkg-build generated archives
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22338 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/opkg')
| -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. */ |