From 9d8d73f1cbe1cc53700d5215128f77e9c0205132 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Mon, 14 May 2018 19:00:16 +0200 Subject: [PATCH] SELinux userspace 2.8-rc3 release candidate --- .gitignore | 1 + libselinux-fedora.patch | 86 ++++++++++++++++++++--------------------- libselinux.spec | 17 ++++---- sources | 2 +- 4 files changed, 55 insertions(+), 51 deletions(-) diff --git a/.gitignore b/.gitignore index a97e059..45bc76f 100644 --- a/.gitignore +++ b/.gitignore @@ -207,3 +207,4 @@ libselinux-2.0.96.tgz /libselinux-2.7.tar.gz /libselinux-2.8-rc1.tar.gz /libselinux-2.8-rc2.tar.gz +/libselinux-2.8-rc3.tar.gz diff --git a/libselinux-fedora.patch b/libselinux-fedora.patch index 154b97d..3a46792 100644 --- a/libselinux-fedora.patch +++ b/libselinux-fedora.patch @@ -1,7 +1,7 @@ -diff --git libselinux-2.8-rc1/man/man8/selinux.8 libselinux-2.8-rc1/man/man8/selinux.8 +diff --git libselinux-2.8-rc3/man/man8/selinux.8 libselinux-2.8-rc3/man/man8/selinux.8 index e37aee6..bf23b65 100644 ---- libselinux-2.8-rc1/man/man8/selinux.8 -+++ libselinux-2.8-rc1/man/man8/selinux.8 +--- libselinux-2.8-rc3/man/man8/selinux.8 ++++ libselinux-2.8-rc3/man/man8/selinux.8 @@ -91,11 +91,13 @@ This manual page was written by Dan Walsh . .BR sepolicy (8), .BR system-config-selinux (8), @@ -17,10 +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-rc1/src/avc_sidtab.c libselinux-2.8-rc1/src/avc_sidtab.c +diff --git libselinux-2.8-rc3/src/avc_sidtab.c libselinux-2.8-rc3/src/avc_sidtab.c index 9669264..c775430 100644 ---- libselinux-2.8-rc1/src/avc_sidtab.c -+++ libselinux-2.8-rc1/src/avc_sidtab.c +--- libselinux-2.8-rc3/src/avc_sidtab.c ++++ libselinux-2.8-rc3/src/avc_sidtab.c @@ -81,6 +81,11 @@ sidtab_context_to_sid(struct sidtab *s, int hvalue, rc = 0; struct sidtab_node *cur; @@ -33,10 +33,10 @@ index 9669264..c775430 100644 *sid = NULL; hvalue = sidtab_hash(ctx); -diff --git libselinux-2.8-rc1/src/booleans.c libselinux-2.8-rc1/src/booleans.c -index 1da55bf..604c588 100644 ---- libselinux-2.8-rc1/src/booleans.c -+++ libselinux-2.8-rc1/src/booleans.c +diff --git libselinux-2.8-rc3/src/booleans.c libselinux-2.8-rc3/src/booleans.c +index b3ea362..a6d46fe 100644 +--- libselinux-2.8-rc3/src/booleans.c ++++ libselinux-2.8-rc3/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); @@ -45,10 +45,10 @@ index 1da55bf..604c588 100644 return -1; } -diff --git libselinux-2.8-rc1/src/canonicalize_context.c libselinux-2.8-rc1/src/canonicalize_context.c +diff --git libselinux-2.8-rc3/src/canonicalize_context.c libselinux-2.8-rc3/src/canonicalize_context.c index ba4c9a2..c815872 100644 ---- libselinux-2.8-rc1/src/canonicalize_context.c -+++ libselinux-2.8-rc1/src/canonicalize_context.c +--- libselinux-2.8-rc3/src/canonicalize_context.c ++++ libselinux-2.8-rc3/src/canonicalize_context.c @@ -17,6 +17,11 @@ int security_canonicalize_context_raw(const char * con, size_t size; int fd, ret; @@ -61,10 +61,10 @@ index ba4c9a2..c815872 100644 if (!selinux_mnt) { errno = ENOENT; return -1; -diff --git libselinux-2.8-rc1/src/check_context.c libselinux-2.8-rc1/src/check_context.c +diff --git libselinux-2.8-rc3/src/check_context.c libselinux-2.8-rc3/src/check_context.c index 8a7997f..5be8434 100644 ---- libselinux-2.8-rc1/src/check_context.c -+++ libselinux-2.8-rc1/src/check_context.c +--- libselinux-2.8-rc3/src/check_context.c ++++ libselinux-2.8-rc3/src/check_context.c @@ -14,6 +14,11 @@ int security_check_context_raw(const char * con) char path[PATH_MAX]; int fd, ret; @@ -77,10 +77,10 @@ index 8a7997f..5be8434 100644 if (!selinux_mnt) { errno = ENOENT; return -1; -diff --git libselinux-2.8-rc1/src/compute_av.c libselinux-2.8-rc1/src/compute_av.c +diff --git libselinux-2.8-rc3/src/compute_av.c libselinux-2.8-rc3/src/compute_av.c index 1d05e7b..d9095cc 100644 ---- libselinux-2.8-rc1/src/compute_av.c -+++ libselinux-2.8-rc1/src/compute_av.c +--- libselinux-2.8-rc3/src/compute_av.c ++++ libselinux-2.8-rc3/src/compute_av.c @@ -26,6 +26,11 @@ int security_compute_av_flags_raw(const char * scon, return -1; } @@ -93,10 +93,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-rc1/src/compute_create.c libselinux-2.8-rc1/src/compute_create.c +diff --git libselinux-2.8-rc3/src/compute_create.c libselinux-2.8-rc3/src/compute_create.c index 0975aea..3e6a48c 100644 ---- libselinux-2.8-rc1/src/compute_create.c -+++ libselinux-2.8-rc1/src/compute_create.c +--- libselinux-2.8-rc3/src/compute_create.c ++++ libselinux-2.8-rc3/src/compute_create.c @@ -64,6 +64,11 @@ int security_compute_create_name_raw(const char * scon, return -1; } @@ -109,10 +109,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-rc1/src/compute_member.c libselinux-2.8-rc1/src/compute_member.c +diff --git libselinux-2.8-rc3/src/compute_member.c libselinux-2.8-rc3/src/compute_member.c index 4e2d221..d1dd977 100644 ---- libselinux-2.8-rc1/src/compute_member.c -+++ libselinux-2.8-rc1/src/compute_member.c +--- libselinux-2.8-rc3/src/compute_member.c ++++ libselinux-2.8-rc3/src/compute_member.c @@ -25,6 +25,11 @@ int security_compute_member_raw(const char * scon, return -1; } @@ -125,10 +125,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-rc1/src/compute_relabel.c libselinux-2.8-rc1/src/compute_relabel.c +diff --git libselinux-2.8-rc3/src/compute_relabel.c libselinux-2.8-rc3/src/compute_relabel.c index 49f77ef..c3db7c0 100644 ---- libselinux-2.8-rc1/src/compute_relabel.c -+++ libselinux-2.8-rc1/src/compute_relabel.c +--- libselinux-2.8-rc3/src/compute_relabel.c ++++ libselinux-2.8-rc3/src/compute_relabel.c @@ -25,6 +25,11 @@ int security_compute_relabel_raw(const char * scon, return -1; } @@ -141,10 +141,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-rc1/src/compute_user.c libselinux-2.8-rc1/src/compute_user.c +diff --git libselinux-2.8-rc3/src/compute_user.c libselinux-2.8-rc3/src/compute_user.c index 7b88121..401fd10 100644 ---- libselinux-2.8-rc1/src/compute_user.c -+++ libselinux-2.8-rc1/src/compute_user.c +--- libselinux-2.8-rc3/src/compute_user.c ++++ libselinux-2.8-rc3/src/compute_user.c @@ -24,6 +24,11 @@ int security_compute_user_raw(const char * scon, return -1; } @@ -157,10 +157,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-rc1/src/fsetfilecon.c libselinux-2.8-rc1/src/fsetfilecon.c +diff --git libselinux-2.8-rc3/src/fsetfilecon.c libselinux-2.8-rc3/src/fsetfilecon.c index 52707d0..0cbe12d 100644 ---- libselinux-2.8-rc1/src/fsetfilecon.c -+++ libselinux-2.8-rc1/src/fsetfilecon.c +--- libselinux-2.8-rc3/src/fsetfilecon.c ++++ libselinux-2.8-rc3/src/fsetfilecon.c @@ -9,8 +9,12 @@ int fsetfilecon_raw(int fd, const char * context) @@ -176,10 +176,10 @@ index 52707d0..0cbe12d 100644 if (rc < 0 && errno == ENOTSUP) { char * ccontext = NULL; int err = errno; -diff --git libselinux-2.8-rc1/src/lsetfilecon.c libselinux-2.8-rc1/src/lsetfilecon.c +diff --git libselinux-2.8-rc3/src/lsetfilecon.c libselinux-2.8-rc3/src/lsetfilecon.c index 1d3b28a..ea6d70b 100644 ---- libselinux-2.8-rc1/src/lsetfilecon.c -+++ libselinux-2.8-rc1/src/lsetfilecon.c +--- libselinux-2.8-rc3/src/lsetfilecon.c ++++ libselinux-2.8-rc3/src/lsetfilecon.c @@ -9,8 +9,13 @@ int lsetfilecon_raw(const char *path, const char * context) @@ -196,10 +196,10 @@ index 1d3b28a..ea6d70b 100644 if (rc < 0 && errno == ENOTSUP) { char * ccontext = NULL; int err = errno; -diff --git libselinux-2.8-rc1/src/setfilecon.c libselinux-2.8-rc1/src/setfilecon.c +diff --git libselinux-2.8-rc3/src/setfilecon.c libselinux-2.8-rc3/src/setfilecon.c index d05969c..3f0200e 100644 ---- libselinux-2.8-rc1/src/setfilecon.c -+++ libselinux-2.8-rc1/src/setfilecon.c +--- libselinux-2.8-rc3/src/setfilecon.c ++++ libselinux-2.8-rc3/src/setfilecon.c @@ -9,8 +9,12 @@ int setfilecon_raw(const char *path, const char * context) @@ -215,10 +215,10 @@ index d05969c..3f0200e 100644 if (rc < 0 && errno == ENOTSUP) { char * ccontext = NULL; int err = errno; -diff --git libselinux-2.8-rc1/utils/matchpathcon.c libselinux-2.8-rc1/utils/matchpathcon.c +diff --git libselinux-2.8-rc3/utils/matchpathcon.c libselinux-2.8-rc3/utils/matchpathcon.c index 67e4a43..9756d7d 100644 ---- libselinux-2.8-rc1/utils/matchpathcon.c -+++ libselinux-2.8-rc1/utils/matchpathcon.c +--- libselinux-2.8-rc3/utils/matchpathcon.c ++++ libselinux-2.8-rc3/utils/matchpathcon.c @@ -14,7 +14,7 @@ static __attribute__ ((__noreturn__)) void usage(const char *progname) { diff --git a/libselinux.spec b/libselinux.spec index 07a6ef2..9d0aedc 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -6,7 +6,7 @@ %define libsepolver 2.8-0 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%global rcversion rc2 +%global rcversion rc3 Summary: SELinux library and simple utilities Name: libselinux @@ -14,14 +14,14 @@ Version: 2.8 Release: 0%{?rcversion:.%rcversion}.1%{?dist} License: Public Domain # https://github.com/SELinuxProject/selinux/wiki/Releases -Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180426/libselinux-2.8-rc2.tar.gz +Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20180510/libselinux-2.8-rc3.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-rc2 ./make-fedora-selinux-patch.sh libselinux -# HEAD https://github.com/fedora-selinux/selinux/commit/0a28664012ec7383cf5cbdef4ad2dbedf1f70707 +# $ VERSION=2.8-rc3 ./make-fedora-selinux-patch.sh libselinux +# HEAD https://github.com/fedora-selinux/selinux/commit/11eab8523bec5fcded6c336e3112f30f7931cba6 Patch1: libselinux-fedora.patch BuildRequires: gcc BuildRequires: python2 python2-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig pcre2-devel xz-devel @@ -246,13 +246,16 @@ rm -f %{buildroot}%{_mandir}/man8/togglesebool* %{ruby_vendorarchdir}/selinux.so %changelog -* Fri May 4 2018 Petr Lautrbach - 2.8-0.rc2.1 +* Mon May 14 2018 Petr Lautrbach - 2.8-0.rc3.1 +- SELinux userspace 2.8-rc3 release candidate + +* Fri May 4 2018 Petr Lautrbach - 2.8-0.rc2.1 - SELinux userspace 2.8-rc2 release candidate -* Mon Apr 23 2018 Petr Lautrbach - 2.8-0.rc1.1 +* Mon Apr 23 2018 Petr Lautrbach - 2.8-0.rc1.1 - SELinux userspace 2.8-rc1 release candidate -* Wed Mar 21 2018 Petr Lautrbach - 2.7-13 +* Wed Mar 21 2018 Petr Lautrbach - 2.7-13 - build: Replace PYSITEDIR with PYTHONLIBDIR * Tue Mar 13 2018 Petr Lautrbach - 2.7-12 diff --git a/sources b/sources index 0c3f60d..cdd2308 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libselinux-2.8-rc2.tar.gz) = 052b86ba717820b482df056de69ce225090f39974b6fcc06d50d669601339deaeb2b507f7c1a18a614edee036e75a0ee59108742bd97fe78d19dda9afcdadf52 +SHA512 (libselinux-2.8-rc3.tar.gz) = 2b0bf8790fe8d8c87613542fe7618352dd195e2fe75a9d50c15851e48442a18adb59d65b8e9316ad6d044f57f1359d23215696ee5972019a9e4e812bf42fecbe