3 files changed, 0 insertions, 73 deletions

diff --git a/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c b/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c
deleted file mode 100644
index d48a76bfad3d..000000000000
--- a/ports-mgmt/pkg/files/patch-libpkg__pkg_config.c
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 67751707406b7da5ff85978f755d4e68bab3d38d
-Author: Bryan Drewery <bryan@shatow.net>
-Date:   Wed Sep 24 13:30:29 2014 -0500
-
-    Fix repo override crashing when URL is not defined.
-    
-    Only override URL if one is provided.
-    
-    Issue:	#1024
-
-diff --git libpkg/pkg_config.c libpkg/pkg_config.c
-index ec96883..83e2f5d 100644
---- libpkg/pkg_config.c
-+++ libpkg/pkg_config.c
-@@ -1065,9 +1065,11 @@ pkg_repo_overwrite(struct pkg_repo *r, const char *name, const char *url,
- {
- 
- 	free(r->name);
--	free(r->url);
- 	r->name = strdup(name);
--	r->url = strdup(url);
-+	if (url != NULL) {
-+		free(r->url);
-+		r->url = strdup(url);
-+	}
- 	r->ops = pkg_repo_find_type(type);
- 	HASH_DEL(repos, r);
- 	HASH_ADD_KEYPTR(hh, repos, r->name, strlen(r->name), r);
diff --git a/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c b/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c
deleted file mode 100644
index 9e13a9c28801..000000000000
--- a/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git libpkg/pkg_ports.c libpkg/pkg_ports.c
-index 744ad4a..4308196 100644
---- libpkg/pkg_ports.c
-+++ libpkg/pkg_ports.c
-@@ -1056,7 +1056,8 @@ plist_new(struct pkg *pkg, const char *stage)
- 
- 	p->pkg = pkg;
- 	pkg_get(pkg, PKG_PREFIX, &prefix);
--	strlcpy(p->prefix, prefix, sizeof(p->prefix));
-+	if (prefix != NULL)
-+		strlcpy(p->prefix, prefix, sizeof(p->prefix));
- 	p->slash = p->prefix[strlen(p->prefix) - 1] == '/' ? "" : "/";
- 	p->stage = stage;
- 	p->uname = strdup("root");
diff --git a/ports-mgmt/pkg/files/patch-plist-non-fatal b/ports-mgmt/pkg/files/patch-plist-non-fatal
deleted file mode 100644
index 50edf9dcaacc..000000000000
--- a/ports-mgmt/pkg/files/patch-plist-non-fatal
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git libpkg/pkg_ports.c libpkg/pkg_ports.c
-index 33a29d0..21182b4 100644
---- libpkg/pkg_ports.c
-+++ libpkg/pkg_ports.c
-@@ -1141,7 +1141,7 @@ int
- ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage)
- {
- 	char *line = NULL;
--	int ret = EPKG_OK;
-+	int ret, rc = EPKG_OK;
- 	struct plist *pplist;
- 	FILE *plist_f;
- 	size_t linecap = 0;
-@@ -1162,6 +1162,8 @@ ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage)
- 		if (line[linelen - 1] == '\n')
- 			line[linelen - 1] = '\0';
- 		ret = plist_parse_line(pkg, pplist, line);
-+		if (rc == EPKG_OK)
-+			rc = ret;
- 	}
- 
- 	free(line);
-@@ -1185,7 +1187,7 @@ ports_parse_plist(struct pkg *pkg, const char *plist, const char *stage)
- 
- 	plist_free(pplist);
- 
--	return (ret);
-+	return (rc);
- }
- 
- int