qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 15:54:04 +02:00
Code

[package] opkg: strip trailing whitespaces from entries in conffiles control files, fixes conffile md5 calculation against ipkg-build generated archives

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22338 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-07-21 18:26:07 +00:00
parent 361bd76f7e
commit 47de1665b1
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch Normal file
View File

@ -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. */