SELinux userspace 2.9-rc1 release candidate

2019-01-30 09:53:09 +01:00 · 2019-01-30 09:53:09 +01:00 · f0805e3a76
commit f0805e3a76
parent 1530db6627
4 changed files with 77 additions and 142 deletions
--- a/.gitignore
+++ b/.gitignore
@ -209,3 +209,4 @@ libselinux-2.0.96.tgz
 /libselinux-2.8-rc2.tar.gz
 /libselinux-2.8-rc3.tar.gz
 /libselinux-2.8.tar.gz
+/libselinux-2.9-rc1.tar.gz
--- a/libselinux-fedora.patch
+++ b/libselinux-fedora.patch
@ -1,54 +1,7 @@
-diff --git libselinux-2.8/man/man3/selinux_boolean_sub.3 libselinux-2.8/man/man3/selinux_boolean_sub.3
-index 308c268..a29a38d 100644
--- libselinux-2.8/man/man3/selinux_boolean_sub.3
-+++ libselinux-2.8/man/man3/selinux_boolean_sub.3
-@@ -1,6 +1,6 @@
- .TH "selinux_boolean_sub" "3" "11 June 2012" "dwalsh@redhat.com" "SELinux API documentation"
- .SH "NAME"
-selinux_boolean_sub \-
-+selinux_boolean_sub \- Search the translated name for a boolean_name record
- .
- .SH "SYNOPSIS"
- .B #include <selinux/selinux.h>
-@@ -12,7 +12,7 @@ selinux_boolean_sub \-
- searches the
- .I \%/etc/selinux/{POLICYTYPE}/booleans.subs_dist
- file
-for a maching boolean_name record.  If the record exists the boolean substitution name is returned.  If not
-+for a matching boolean_name record.  If the record exists the boolean substitution name is returned.  If not
- .BR \%selinux_boolean_sub ()
- returns the original
- .IR \%boolean_name .
-diff --git libselinux-2.8/man/man3/selinux_restorecon_xattr.3 libselinux-2.8/man/man3/selinux_restorecon_xattr.3
-index 7280c95..516d266 100644
--- libselinux-2.8/man/man3/selinux_restorecon_xattr.3
-+++ libselinux-2.8/man/man3/selinux_restorecon_xattr.3
-@@ -119,7 +119,7 @@ By default
- .BR selinux_restorecon_xattr (3)
- will use the default set of specfiles described in
- .BR files_contexts (5)
-to calculate the initial SHA1 digest to be used for comparision.
-+to calculate the initial SHA1 digest to be used for comparison.
- To change this default behavior
- .BR selabel_open (3)
- must be called specifying the required
-diff --git libselinux-2.8/man/man5/selabel_file.5 libselinux-2.8/man/man5/selabel_file.5
-index e738824..e97bd82 100644
--- libselinux-2.8/man/man5/selabel_file.5
-+++ libselinux-2.8/man/man5/selabel_file.5
-@@ -92,7 +92,7 @@ The optional local and distribution substitution files that perform any path ali
- .RE
- .sp
- The default file context series of files are:
-.RS
-+.RS 6
- .I /etc/selinux/{SELINUXTYPE}/contexts/files/file_contexts
- .br
- .I  /etc/selinux/{SELINUXTYPE}/contexts/files/file_contexts.local
-diff --git libselinux-2.8/man/man8/selinux.8 libselinux-2.8/man/man8/selinux.8
+diff --git libselinux-2.9-rc1/man/man8/selinux.8 libselinux-2.9-rc1/man/man8/selinux.8
 index e37aee6..bf23b65 100644
--- libselinux-2.8/man/man8/selinux.8
-+++ libselinux-2.8/man/man8/selinux.8
+--- libselinux-2.9-rc1/man/man8/selinux.8
+++ libselinux-2.9-rc1/man/man8/selinux.8
@@ -91,11 +91,13 @@ This manual page was written by Dan Walsh <dwalsh@redhat.com>.
 .BR sepolicy (8),
 .BR system-config-selinux (8),
@ -64,23 +17,10 @@ index e37aee6..bf23b65 100644
 
 Every confined service on the system has a man page in the following format:
 .br
-diff --git libselinux-2.8/src/audit2why.c libselinux-2.8/src/audit2why.c
-index 0331fdf..5a1e69a 100644
--- libselinux-2.8/src/audit2why.c
-+++ libselinux-2.8/src/audit2why.c
-@@ -354,7 +354,7 @@ static PyObject *analyze(PyObject *self __attribute__((unused)) , PyObject *args
- 	/* iterate over items of the list, grabbing strings, and parsing
- 	   for numbers */
- 	for (i=0; i<numlines; i++){
-		char *permstr;
-+		const char *permstr;
- 
- 		/* grab the string object from the next element of the list */
- 		strObj = PyList_GetItem(listObj, i); /* Can't fail */
-diff --git libselinux-2.8/src/avc_sidtab.c libselinux-2.8/src/avc_sidtab.c
+diff --git libselinux-2.9-rc1/src/avc_sidtab.c libselinux-2.9-rc1/src/avc_sidtab.c
 index 9669264..c775430 100644
--- libselinux-2.8/src/avc_sidtab.c
-+++ libselinux-2.8/src/avc_sidtab.c
+--- libselinux-2.9-rc1/src/avc_sidtab.c
+++ libselinux-2.9-rc1/src/avc_sidtab.c
@@ -81,6 +81,11 @@ sidtab_context_to_sid(struct sidtab *s,
 	int hvalue, rc = 0;
 	struct sidtab_node *cur;
@ -93,10 +33,10 @@ index 9669264..c775430 100644
 	*sid = NULL;
 	hvalue = sidtab_hash(ctx);
 
-diff --git libselinux-2.8/src/booleans.c libselinux-2.8/src/booleans.c
+diff --git libselinux-2.9-rc1/src/booleans.c libselinux-2.9-rc1/src/booleans.c
 index b3ea362..a6d46fe 100644
--- libselinux-2.8/src/booleans.c
-+++ libselinux-2.8/src/booleans.c
+--- libselinux-2.9-rc1/src/booleans.c
+++ libselinux-2.9-rc1/src/booleans.c
@@ -55,6 +55,7 @@ int security_get_boolean_names(char ***names, int *len)
 	snprintf(path, sizeof path, "%s%s", selinux_mnt, SELINUX_BOOL_DIR);
 	*len = scandir(path, &namelist, &filename_select, alphasort);
@ -105,10 +45,10 @@ index b3ea362..a6d46fe 100644
 		return -1;
 	}
 
-diff --git libselinux-2.8/src/canonicalize_context.c libselinux-2.8/src/canonicalize_context.c
+diff --git libselinux-2.9-rc1/src/canonicalize_context.c libselinux-2.9-rc1/src/canonicalize_context.c
 index ba4c9a2..c815872 100644
--- libselinux-2.8/src/canonicalize_context.c
-+++ libselinux-2.8/src/canonicalize_context.c
+--- libselinux-2.9-rc1/src/canonicalize_context.c
+++ libselinux-2.9-rc1/src/canonicalize_context.c
@@ -17,6 +17,11 @@ int security_canonicalize_context_raw(const char * con,
 	size_t size;
 	int fd, ret;
@ -121,10 +61,10 @@ index ba4c9a2..c815872 100644
 	if (!selinux_mnt) {
 		errno = ENOENT;
 		return -1;
-diff --git libselinux-2.8/src/checkAccess.c libselinux-2.8/src/checkAccess.c
+diff --git libselinux-2.9-rc1/src/checkAccess.c libselinux-2.9-rc1/src/checkAccess.c
 index 8de5747..16bfcfb 100644
--- libselinux-2.8/src/checkAccess.c
-+++ libselinux-2.8/src/checkAccess.c
+--- libselinux-2.9-rc1/src/checkAccess.c
+++ libselinux-2.9-rc1/src/checkAccess.c
@@ -89,8 +89,10 @@ int selinux_check_passwd_access(access_vector_t requested)
 		int retval;
 
@ -137,10 +77,10 @@ index 8de5747..16bfcfb 100644
 
 		retval = security_compute_av_raw(user_context,
 						     user_context,
-diff --git libselinux-2.8/src/check_context.c libselinux-2.8/src/check_context.c
+diff --git libselinux-2.9-rc1/src/check_context.c libselinux-2.9-rc1/src/check_context.c
 index 8a7997f..5be8434 100644
--- libselinux-2.8/src/check_context.c
-+++ libselinux-2.8/src/check_context.c
+--- libselinux-2.9-rc1/src/check_context.c
+++ libselinux-2.9-rc1/src/check_context.c
@@ -14,6 +14,11 @@ int security_check_context_raw(const char * con)
 	char path[PATH_MAX];
 	int fd, ret;
@ -153,10 +93,10 @@ index 8a7997f..5be8434 100644
 	if (!selinux_mnt) {
 		errno = ENOENT;
 		return -1;
-diff --git libselinux-2.8/src/compute_av.c libselinux-2.8/src/compute_av.c
+diff --git libselinux-2.9-rc1/src/compute_av.c libselinux-2.9-rc1/src/compute_av.c
 index 1d05e7b..d9095cc 100644
--- libselinux-2.8/src/compute_av.c
-+++ libselinux-2.8/src/compute_av.c
+--- libselinux-2.9-rc1/src/compute_av.c
+++ libselinux-2.9-rc1/src/compute_av.c
@@ -26,6 +26,11 @@ int security_compute_av_flags_raw(const char * scon,
 		return -1;
 	}
@ -169,10 +109,10 @@ index 1d05e7b..d9095cc 100644
 	snprintf(path, sizeof path, "%s/access", selinux_mnt);
 	fd = open(path, O_RDWR | O_CLOEXEC);
 	if (fd < 0)
-diff --git libselinux-2.8/src/compute_create.c libselinux-2.8/src/compute_create.c
+diff --git libselinux-2.9-rc1/src/compute_create.c libselinux-2.9-rc1/src/compute_create.c
 index 0975aea..3e6a48c 100644
--- libselinux-2.8/src/compute_create.c
-+++ libselinux-2.8/src/compute_create.c
+--- libselinux-2.9-rc1/src/compute_create.c
+++ libselinux-2.9-rc1/src/compute_create.c
@@ -64,6 +64,11 @@ int security_compute_create_name_raw(const char * scon,
 		return -1;
 	}
@ -185,10 +125,10 @@ index 0975aea..3e6a48c 100644
 	snprintf(path, sizeof path, "%s/create", selinux_mnt);
 	fd = open(path, O_RDWR | O_CLOEXEC);
 	if (fd < 0)
-diff --git libselinux-2.8/src/compute_member.c libselinux-2.8/src/compute_member.c
+diff --git libselinux-2.9-rc1/src/compute_member.c libselinux-2.9-rc1/src/compute_member.c
 index 4e2d221..d1dd977 100644
--- libselinux-2.8/src/compute_member.c
-+++ libselinux-2.8/src/compute_member.c
+--- libselinux-2.9-rc1/src/compute_member.c
+++ libselinux-2.9-rc1/src/compute_member.c
@@ -25,6 +25,11 @@ int security_compute_member_raw(const char * scon,
 		return -1;
 	}
@ -201,10 +141,10 @@ index 4e2d221..d1dd977 100644
 	snprintf(path, sizeof path, "%s/member", selinux_mnt);
 	fd = open(path, O_RDWR | O_CLOEXEC);
 	if (fd < 0)
-diff --git libselinux-2.8/src/compute_relabel.c libselinux-2.8/src/compute_relabel.c
+diff --git libselinux-2.9-rc1/src/compute_relabel.c libselinux-2.9-rc1/src/compute_relabel.c
 index 49f77ef..c3db7c0 100644
--- libselinux-2.8/src/compute_relabel.c
-+++ libselinux-2.8/src/compute_relabel.c
+--- libselinux-2.9-rc1/src/compute_relabel.c
+++ libselinux-2.9-rc1/src/compute_relabel.c
@@ -25,6 +25,11 @@ int security_compute_relabel_raw(const char * scon,
 		return -1;
 	}
@ -217,10 +157,10 @@ index 49f77ef..c3db7c0 100644
 	snprintf(path, sizeof path, "%s/relabel", selinux_mnt);
 	fd = open(path, O_RDWR | O_CLOEXEC);
 	if (fd < 0)
-diff --git libselinux-2.8/src/compute_user.c libselinux-2.8/src/compute_user.c
+diff --git libselinux-2.9-rc1/src/compute_user.c libselinux-2.9-rc1/src/compute_user.c
 index 7b88121..401fd10 100644
--- libselinux-2.8/src/compute_user.c
-+++ libselinux-2.8/src/compute_user.c
+--- libselinux-2.9-rc1/src/compute_user.c
+++ libselinux-2.9-rc1/src/compute_user.c
@@ -24,6 +24,11 @@ int security_compute_user_raw(const char * scon,
 		return -1;
 	}
@ -233,10 +173,10 @@ index 7b88121..401fd10 100644
 	snprintf(path, sizeof path, "%s/user", selinux_mnt);
 	fd = open(path, O_RDWR | O_CLOEXEC);
 	if (fd < 0)
-diff --git libselinux-2.8/src/fsetfilecon.c libselinux-2.8/src/fsetfilecon.c
+diff --git libselinux-2.9-rc1/src/fsetfilecon.c libselinux-2.9-rc1/src/fsetfilecon.c
 index 52707d0..0cbe12d 100644
--- libselinux-2.8/src/fsetfilecon.c
-+++ libselinux-2.8/src/fsetfilecon.c
+--- libselinux-2.9-rc1/src/fsetfilecon.c
+++ libselinux-2.9-rc1/src/fsetfilecon.c
@@ -9,8 +9,12 @@
 
 int fsetfilecon_raw(int fd, const char * context)
@ -252,10 +192,10 @@ index 52707d0..0cbe12d 100644
 	if (rc < 0 && errno == ENOTSUP) {
 		char * ccontext = NULL;
 		int err = errno;
-diff --git libselinux-2.8/src/label_db.c libselinux-2.8/src/label_db.c
+diff --git libselinux-2.9-rc1/src/label_db.c libselinux-2.9-rc1/src/label_db.c
 index c46d0a1..fa481e0 100644
--- libselinux-2.8/src/label_db.c
-+++ libselinux-2.8/src/label_db.c
+--- libselinux-2.9-rc1/src/label_db.c
+++ libselinux-2.9-rc1/src/label_db.c
@@ -283,10 +283,12 @@ db_init(const struct selinux_opt *opts, unsigned nopts,
 	}
 	if (fstat(fileno(filp), &sb) < 0) {
@ -277,10 +217,10 @@ index c46d0a1..fa481e0 100644
 
 	return NULL;
 }
-diff --git libselinux-2.8/src/label_file.c libselinux-2.8/src/label_file.c
-index 560d8c3..21c8d36 100644
--- libselinux-2.8/src/label_file.c
-+++ libselinux-2.8/src/label_file.c
+diff --git libselinux-2.9-rc1/src/label_file.c libselinux-2.9-rc1/src/label_file.c
+index dbf51a9..b81fd55 100644
+--- libselinux-2.9-rc1/src/label_file.c
+++ libselinux-2.9-rc1/src/label_file.c
@@ -317,8 +317,10 @@ end_arch_check:
 			goto out;
 		}
@ -293,10 +233,10 @@ index 560d8c3..21c8d36 100644
 
 		if (str_buf[entry_len - 1] != '\0') {
 			free(str_buf);
-diff --git libselinux-2.8/src/load_policy.c libselinux-2.8/src/load_policy.c
+diff --git libselinux-2.9-rc1/src/load_policy.c libselinux-2.9-rc1/src/load_policy.c
 index e9f1264..20052be 100644
--- libselinux-2.8/src/load_policy.c
-+++ libselinux-2.8/src/load_policy.c
+--- libselinux-2.9-rc1/src/load_policy.c
+++ libselinux-2.9-rc1/src/load_policy.c
@@ -262,8 +262,10 @@ checkbool:
 			rc = security_get_boolean_names(&names, &len);
 			if (!rc) {
@ -309,10 +249,10 @@ index e9f1264..20052be 100644
 				for (i = 0; i < len; i++)
 					values[i] =
 						security_get_boolean_active(names[i]);
-diff --git libselinux-2.8/src/lsetfilecon.c libselinux-2.8/src/lsetfilecon.c
+diff --git libselinux-2.9-rc1/src/lsetfilecon.c libselinux-2.9-rc1/src/lsetfilecon.c
 index 1d3b28a..ea6d70b 100644
--- libselinux-2.8/src/lsetfilecon.c
-+++ libselinux-2.8/src/lsetfilecon.c
+--- libselinux-2.9-rc1/src/lsetfilecon.c
+++ libselinux-2.9-rc1/src/lsetfilecon.c
@@ -9,8 +9,13 @@
 
 int lsetfilecon_raw(const char *path, const char * context)
@ -329,10 +269,10 @@ index 1d3b28a..ea6d70b 100644
 	if (rc < 0 && errno == ENOTSUP) {
 		char * ccontext = NULL;
 		int err = errno;
-diff --git libselinux-2.8/src/selinux_config.c libselinux-2.8/src/selinux_config.c
+diff --git libselinux-2.9-rc1/src/selinux_config.c libselinux-2.9-rc1/src/selinux_config.c
 index 292728f..b06cb63 100644
--- libselinux-2.8/src/selinux_config.c
-+++ libselinux-2.8/src/selinux_config.c
+--- libselinux-2.9-rc1/src/selinux_config.c
+++ libselinux-2.9-rc1/src/selinux_config.c
@@ -177,8 +177,7 @@ static void init_selinux_config(void)
 
 			if (!strncasecmp(buf_p, SELINUXTYPETAG,
@ -372,11 +312,11 @@ index 292728f..b06cb63 100644
 		return;
 
 	for (i = 0; i < NEL; i++)
-diff --git libselinux-2.8/src/selinux_restorecon.c libselinux-2.8/src/selinux_restorecon.c
-index ced4115..1e9a978 100644
--- libselinux-2.8/src/selinux_restorecon.c
-+++ libselinux-2.8/src/selinux_restorecon.c
-@@ -350,12 +350,19 @@ static int add_xattr_entry(const char *directory, bool delete_nonmatch,
+diff --git libselinux-2.9-rc1/src/selinux_restorecon.c libselinux-2.9-rc1/src/selinux_restorecon.c
+index 42a48f5..924d953 100644
+--- libselinux-2.9-rc1/src/selinux_restorecon.c
+++ libselinux-2.9-rc1/src/selinux_restorecon.c
+@@ -351,12 +351,19 @@ static int add_xattr_entry(const char *directory, bool delete_nonmatch,
 	new_entry->next = NULL;
 
 	new_entry->directory = strdup(directory);
@ -398,7 +338,7 @@ index ced4115..1e9a978 100644
 
 	new_entry->result = digest_result;
 
-@@ -671,8 +678,8 @@ static int restorecon_sb(const char *pathname, const struct stat *sb,
+@@ -672,8 +679,8 @@ static int restorecon_sb(const char *pathname, const struct stat *sb,
 				selinux_log(SELINUX_INFO,
 				 "%s not reset as customized by admin to %s\n",
 							    pathname, curcon);
@ -408,7 +348,7 @@ index ced4115..1e9a978 100644
 		}
 
 		if (!flags->set_specctx && curcon) {
-@@ -849,6 +856,7 @@ int selinux_restorecon(const char *pathname_orig,
+@@ -850,6 +857,7 @@ int selinux_restorecon(const char *pathname_orig,
 
 	if (lstat(pathname, &sb) < 0) {
 		if (flags.ignore_noent && errno == ENOENT) {
@ -416,19 +356,10 @@ index ced4115..1e9a978 100644
 			free(pathdnamer);
 			free(pathname);
 			return 0;
-@@ -880,7 +888,7 @@ int selinux_restorecon(const char *pathname_orig,
- 		setrestoreconlast = false;
- 
- 	/* Ignore restoreconlast on in-memory filesystems */
-	if (statfs(pathname, &sfsb) == 0) {
-+	if (setrestoreconlast && statfs(pathname, &sfsb) == 0) {
- 		if (sfsb.f_type == RAMFS_MAGIC || sfsb.f_type == TMPFS_MAGIC)
- 			setrestoreconlast = false;
- 	}
-diff --git libselinux-2.8/src/setfilecon.c libselinux-2.8/src/setfilecon.c
+diff --git libselinux-2.9-rc1/src/setfilecon.c libselinux-2.9-rc1/src/setfilecon.c
 index d05969c..3f0200e 100644
--- libselinux-2.8/src/setfilecon.c
-+++ libselinux-2.8/src/setfilecon.c
+--- libselinux-2.9-rc1/src/setfilecon.c
+++ libselinux-2.9-rc1/src/setfilecon.c
@@ -9,8 +9,12 @@
 
 int setfilecon_raw(const char *path, const char * context)
@ -444,10 +375,10 @@ index d05969c..3f0200e 100644
 	if (rc < 0 && errno == ENOTSUP) {
 		char * ccontext = NULL;
 		int err = errno;
-diff --git libselinux-2.8/utils/matchpathcon.c libselinux-2.8/utils/matchpathcon.c
+diff --git libselinux-2.9-rc1/utils/matchpathcon.c libselinux-2.9-rc1/utils/matchpathcon.c
 index 67e4a43..9756d7d 100644
--- libselinux-2.8/utils/matchpathcon.c
-+++ libselinux-2.8/utils/matchpathcon.c
+--- libselinux-2.9-rc1/utils/matchpathcon.c
+++ libselinux-2.9-rc1/utils/matchpathcon.c
@@ -14,7 +14,7 @@
 static __attribute__ ((__noreturn__)) void usage(const char *progname)
 {
--- a/libselinux.spec
+++ b/libselinux.spec
@ -1,20 +1,20 @@
 %define ruby_inc %(pkg-config --cflags ruby)
-%define libsepolver 2.8-3
+%define libsepolver 2.9-0

 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.8
-Release: 8%{?dist}
+Version: 2.9
+Release: 0.rc1.1%{?dist}
 License: Public Domain
 # https://github.com/SELinuxProject/selinux/wiki/Releases
-Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180524/libselinux-2.8.tar.gz
+Source0: https://github.com/SELinuxProject/selinux/releases/download/20190125/libselinux-2.9-rc1.tar.gz
 Source1: selinuxconlist.8
 Source2: selinuxdefcon.8
 Url: https://github.com/SELinuxProject/selinux/wiki
 # download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh
 # run:
-# $ VERSION=2.8 ./make-fedora-selinux-patch.sh libselinux
-# HEAD https://github.com/fedora-selinux/selinux/commit/10767636b5d9b8f3fa3cf3815e860f4ca4fcb247
+# $ VERSION=2.9-rc1 ./make-fedora-selinux-patch.sh libselinux
+# HEAD https://github.com/fedora-selinux/selinux/commit/a69fe203e41c9493e13ffafa51908d17da6fa7a2
 Patch1: libselinux-fedora.patch
 BuildRequires: gcc
 BuildRequires: python2 python2-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig pcre2-devel xz-devel
@ -98,7 +98,7 @@ The libselinux-static package contains the static libraries
 needed for developing SELinux applications. 

 %prep
-%autosetup -p 1 -n libselinux-%{version}
+%autosetup -p 1 -n libselinux-%{version}-rc1

 %build
 export LDFLAGS="%{?__global_ldflags}"
@ -229,6 +229,9 @@ rm -f %{buildroot}%{_mandir}/man8/togglesebool*
 %{ruby_vendorarchdir}/selinux.so

 %changelog
+* Fri Jan 25 2019 Petr Lautrbach <plautrba@redhat.com> - 2.9-0.rc1.1
+- SELinux userspace 2.9-rc1 release
+
 * Tue Jan 22 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.8-8
 - F-30: again rebuild against ruby26

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (libselinux-2.8.tar.gz) = 2f15d08888fbef9b0cf7bf01893b513edc6738974e2d0eab7e3f79cef9be79cf966742b0d2693b5d2ec7defddb5f4d6c6f6280be9d4158ed41f7a18d50b9f019
+SHA512 (libselinux-2.9-rc1.tar.gz) = 15c068b7ad2852a3b6db9a5e192981de8f8257ae4e7f8b57c92755e74c0b5b03ad5489505a84d483fda16b879a20839914eb6a2ee563e37f01f6b3a9ac9c596d