new upstream release.

(Portage version: 2.0.53)

3 files changed, 1 insertions, 56 deletions

diff --git a/sys-libs/libselinux/files/digest-libselinux-1.22-r1 b/sys-libs/libselinux/files/digest-libselinux-1.22-r1
deleted file mode 100644
index cc35c44f474d..000000000000
--- a/sys-libs/libselinux/files/digest-libselinux-1.22-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 43b7640652d1fd85e6ab3df9b873ddd3 libselinux-1.22.tgz 81142
diff --git a/sys-libs/libselinux/files/digest-libselinux-1.28 b/sys-libs/libselinux/files/digest-libselinux-1.28
new file mode 100644
index 000000000000..c05515454d17
--- /dev/null
+++ b/sys-libs/libselinux/files/digest-libselinux-1.28
@@ -0,0 +1 @@
+MD5 7e121e125b52913237df458ff610e983 libselinux-1.28.tgz 109236
diff --git a/sys-libs/libselinux/files/libselinux-1.22.diff b/sys-libs/libselinux/files/libselinux-1.22.diff
deleted file mode 100644
index b6040c971c99..000000000000
--- a/sys-libs/libselinux/files/libselinux-1.22.diff
+++ /dev/null
@@ -1,55 +0,0 @@
---- libselinux-1.22.orig/src/matchpathcon.c	2005-04-04 15:01:14.000000000 +0200
-+++ libselinux-1.22/src/matchpathcon.c	2005-04-04 15:01:23.000000000 +0200
-@@ -29,7 +29,10 @@
- 
- void set_matchpathcon_printf(void (*f)(const char *fmt, ...))
- {
--	myprintf = f;
-+	if (f)
-+		myprintf = f;
-+	else
-+		myprintf = &default_printf;
- }
- 
- static int default_invalidcon(const char *path, unsigned lineno, char *context)
-@@ -45,7 +48,10 @@
- 
- void set_matchpathcon_invalidcon(int (*f)(const char *p, unsigned l, char *c))
- {
--	myinvalidcon = f;
-+	if (f)
-+		myinvalidcon = f;
-+	else
-+		myinvalidcon = &default_invalidcon;
- }
- 
- /*
-@@ -324,6 +324,9 @@
- 	file_spec_t *fl, *tmp;
- 	int h;
- 
-+	if (!fl_head)
-+		return;
-+
- 	for (h = 0; h < HASH_BUCKETS; h++) {
- 		fl = fl_head[h].next;
- 		while (fl) {
-diff -rNu libselinux-1.22.orig/utils/getconlist.c libselinux-1.22/utils/getconlist.c
---- libselinux-1.22.orig/utils/getconlist.c	2004-11-01 15:21:46.000000000 +0100
-+++ libselinux-1.22/utils/getconlist.c	2005-03-29 13:13:13.000000000 +0200
-@@ -38,10 +38,12 @@
- 
- 	/* Get the list and print it */
- 	ret = get_ordered_context_list(argv[1], cur_context, &list);
--	for (i = 0; list[i]; i++)
--		puts (list[i]);
-+	if(ret != -1) {
-+		for (i = 0; list[i]; i++)
-+			puts (list[i]);
-+		freeconary(list);
-+	}
- 
--	freeconary(list);
- 	free(usercon);
- 
- 	return 0;