X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Fopkg%2Fpatches%2F012-strip-trailing-conffiles-whitespace.patch;fp=package%2Fopkg%2Fpatches%2F012-strip-trailing-conffiles-whitespace.patch;h=0000000000000000000000000000000000000000;hb=4ebf19b48fafc8d94e14e4ba779969613b241a6a;hp=a47ae77ceea3f4917ddf448e7397cf6935609755;hpb=44b1688e6c7b4f16f7165fbd560e1183aef69090;p=openwrt%2Fstaging%2Fflorian.git

diff --git a/package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch b/package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
deleted file mode 100644
index a47ae77cee..0000000000
--- a/package/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. */