diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2017-02-16 17:36:47 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-04-08 14:31:27 +0200 |
| commit | 5aa97e35dec1783c98d0f28502b2d16879ffc8ee (patch) | |
| tree | 3bcf69f7cbc2c6b7574e8b4ce8de9dc41331e470 /package/system/opkg/patches/012-strip-trailing-conffiles-whitespace.patch | |
| parent | 7099bb19b50d74d3a400aa3a60e0b7ba0157bc1e (diff) | |
| download | mtk-20170518-5aa97e35dec1783c98d0f28502b2d16879ffc8ee.zip mtk-20170518-5aa97e35dec1783c98d0f28502b2d16879ffc8ee.tar.gz mtk-20170518-5aa97e35dec1783c98d0f28502b2d16879ffc8ee.tar.bz2 | |
opkg: switch to LEDE fork (#120, #551, #571)
Cherry-pick the following commits from master to bump opkg in LEDE 17.01:
b65dc04712 opkg: switch to own fork to improve memory usage
55ffc38004 opkg: re-enable usign support
19720a6f03 opkg: fix handling conffiles in status lists
9e4555f58d opkg: fix stray printf() (#551)
ebf846b005 opkg: mark as essential (FS#571)
aedd5d5cb0 opkg: fix several package installation bugs
48ae44d033 opkg: gracefully handle missing $PATH, fix build warnings
1449b52f02 opkg: backport upstream fixes, code cleanups
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/system/opkg/patches/012-strip-trailing-conffiles-whitespace.patch')
| -rw-r--r-- | package/system/opkg/patches/012-strip-trailing-conffiles-whitespace.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/package/system/opkg/patches/012-strip-trailing-conffiles-whitespace.patch b/package/system/opkg/patches/012-strip-trailing-conffiles-whitespace.patch deleted file mode 100644 index a47ae77..0000000 --- a/package/system/opkg/patches/012-strip-trailing-conffiles-whitespace.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/libopkg/opkg_install.c -+++ b/libopkg/opkg_install.c -@@ -274,6 +274,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) { -@@ -282,6 +283,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. */ |