mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

opkg: ignore empty fields in package lists

Browse Source 
This is to work around issues with package list generators creating
empty fields in some environments.

Based on a patch by Paul Selkrik <pselkrik@isc.org>
Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 38390
This commit is contained in:
Steven Barth 2013-10-14 08:09:58 +00:00
parent 232a654833
commit cde419ebfc
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/system/opkg/Makefile
View File

@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/version.mk
PKG_NAME:=opkg
PKG_REV:=618
PKG_VERSION:=$(PKG_REV)
PKG_RELEASE:=5
PKG_RELEASE:=6
PKG_SOURCE_PROTO:=svn
PKG_SOURCE_VERSION:=$(PKG_REV)

16
package/system/opkg/patches/080-suppress-blank-package-fields.patch Normal file
View File

@ -0,0 +1,16 @@
--- a/libopkg/parse_util.c
+++ b/libopkg/parse_util.c
@@ -35,7 +35,12 @@ is_field(const char *type, const char *l
char *
parse_simple(const char *type, const char *line)
{
- return trim_xstrdup(line + strlen(type) + 1);
+ char *field = trim_xstrdup(line + strlen(type) + 1);
+ if (strlen(field) == 0) {
+ free(field);
+ return NULL;
+ }
+ return field;
}
/*