summaryrefslogtreecommitdiffstats
path: root/package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-10-02 03:25:35 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-10-02 03:25:35 +0000
commit8e9dfc063fa1df0a9d74db515e6cba5afef924e4 (patch)
tree05ca2d1dde12e09e54d077f65b5e207f0b9624e4 /package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
parenta2328ecf961363bf3e8b80fb2ad118387909b122 (diff)
downloadmaster-31e0f0ae-8e9dfc063fa1df0a9d74db515e6cba5afef924e4.tar.gz
master-31e0f0ae-8e9dfc063fa1df0a9d74db515e6cba5afef924e4.tar.bz2
master-31e0f0ae-8e9dfc063fa1df0a9d74db515e6cba5afef924e4.zip
opkg: reenable global upgrade, refresh patches
SVN-Revision: 23174
Diffstat (limited to 'package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch')
-rw-r--r--package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch b/package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
index cd7d47d05a..a47ae77cee 100644
--- a/package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
+++ b/package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
@@ -1,6 +1,6 @@
--- a/libopkg/opkg_install.c
+++ b/libopkg/opkg_install.c
-@@ -271,6 +271,7 @@ unpack_pkg_control_files(pkg_t *pkg)
+@@ -274,6 +274,7 @@ unpack_pkg_control_files(pkg_t *pkg)
while (1) {
char *cf_name;
char *cf_name_in_dest;
@@ -8,7 +8,7 @@
cf_name = file_read_line_alloc(conffiles_file);
if (cf_name == NULL) {
-@@ -279,6 +280,12 @@ unpack_pkg_control_files(pkg_t *pkg)
+@@ -282,6 +283,12 @@ unpack_pkg_control_files(pkg_t *pkg)
if (cf_name[0] == '\0') {
continue;
}