From 9ffe7055f49bf9592da6a704e65410e7a1a84216 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Nov 07 2008 14:08:36 +0000 Subject: - Update to Upstream Correct message types in AVC log messages. Make matchpathcon -V pass mode from Dan Walsh. Add man page for selinux_file_context_cmp from Dan Walsh. --- diff --git a/.cvsignore b/.cvsignore index 41c168e..8399084 100644 --- a/.cvsignore +++ b/.cvsignore @@ -157,3 +157,5 @@ libselinux-2.0.69.tgz libselinux-2.0.70.tgz libselinux-2.0.71.tgz libselinux-2.0.73.tgz +libselinux-2.0.74.tgz +libselinux-2.0.75.tgz diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch index 94d8da7..b5bbe2b 100644 --- a/libselinux-rhat.patch +++ b/libselinux-rhat.patch @@ -1,44 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/matchpathcon.3 libselinux-2.0.71/man/man3/matchpathcon.3 ---- nsalibselinux/man/man3/matchpathcon.3 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.71/man/man3/matchpathcon.3 2008-09-26 10:21:43.000000000 -0400 -@@ -18,6 +18,11 @@ - - .BI "void set_matchpathcon_flags(unsigned int " flags ");" - -+.BI "int selinux_file_context_cmp(const security_context_t a, -+ const security_context_t b);" -+ -+.BI "int selinux_file_context_verify(const char *path, mode_t mode);" -+ - .SH "DESCRIPTION" - .B matchpathcon_init - loads the file contexts configuration specified by -@@ -111,6 +116,12 @@ - .B MATCHPATHCON_BASEONLY - flag is set, then only the base file contexts configuration file - will be processed, not any dynamically generated entries or local customizations. -+.sp -+.B selinux_file_context_cmp -+compares two file contexts to see if their differences are "significant", the function runs the strcmp function ignoring the user componant of the file context. -+.sp -+.B selinux_file_context_verify -+compares the file context on disk to the system default. - - .sp - .SH "RETURN VALUE" -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_file_context_cmp.3 libselinux-2.0.71/man/man3/selinux_file_context_cmp.3 ---- nsalibselinux/man/man3/selinux_file_context_cmp.3 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.71/man/man3/selinux_file_context_cmp.3 2008-09-26 10:21:43.000000000 -0400 -@@ -0,0 +1 @@ -+.so man3/matchpathcon.3 -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/selinux_file_context_verify.3 libselinux-2.0.71/man/man3/selinux_file_context_verify.3 ---- nsalibselinux/man/man3/selinux_file_context_verify.3 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.71/man/man3/selinux_file_context_verify.3 2008-09-26 10:21:43.000000000 -0400 -@@ -0,0 +1 @@ -+.so man3/matchpathcon.3 -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.71/man/man8/selinuxconlist.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.73/man/man8/selinuxconlist.8 --- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.71/man/man8/selinuxconlist.8 2008-09-26 10:21:43.000000000 -0400 ++++ libselinux-2.0.73/man/man8/selinuxconlist.8 2008-10-28 13:13:54.000000000 -0400 @@ -0,0 +1,18 @@ +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -58,9 +20,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 lib + +.SH "SEE ALSO" +secon(8), selinuxdefcon(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.71/man/man8/selinuxdefcon.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.73/man/man8/selinuxdefcon.8 --- nsalibselinux/man/man8/selinuxdefcon.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.71/man/man8/selinuxdefcon.8 2008-09-26 10:21:43.000000000 -0400 ++++ libselinux-2.0.73/man/man8/selinuxdefcon.8 2008-10-28 13:13:54.000000000 -0400 @@ -0,0 +1,19 @@ +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -81,9 +43,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libs + +.SH "SEE ALSO" +secon(8), selinuxconlist(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.71/src/callbacks.c +diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.73/src/callbacks.c --- nsalibselinux/src/callbacks.c 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.71/src/callbacks.c 2008-09-26 10:21:43.000000000 -0400 ++++ libselinux-2.0.73/src/callbacks.c 2008-10-28 13:13:54.000000000 -0400 @@ -16,6 +16,7 @@ { int rc; @@ -92,9 +54,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2. va_start(ap, fmt); rc = vfprintf(stderr, fmt, ap); va_end(ap); -diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.71/src/matchpathcon.c +diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.73/src/matchpathcon.c --- nsalibselinux/src/matchpathcon.c 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.71/src/matchpathcon.c 2008-09-26 10:21:43.000000000 -0400 ++++ libselinux-2.0.73/src/matchpathcon.c 2008-10-28 13:13:54.000000000 -0400 @@ -2,6 +2,7 @@ #include #include @@ -112,21 +74,3 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux va_end(ap); } -diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.71/utils/matchpathcon.c ---- nsalibselinux/utils/matchpathcon.c 2008-08-28 09:34:24.000000000 -0400 -+++ libselinux-2.0.71/utils/matchpathcon.c 2008-09-26 10:21:43.000000000 -0400 -@@ -106,12 +106,12 @@ - - if (verify) { - if (quiet) { -- if (selinux_file_context_verify(argv[i], 0)) -+ if (selinux_file_context_verify(argv[i], mode)) - continue; - else - exit(1); - } -- if (selinux_file_context_verify(argv[i], 0)) { -+ if (selinux_file_context_verify(argv[i], mode)) { - printf("%s verified.\n", argv[i]); - } else { - security_context_t con; diff --git a/libselinux.spec b/libselinux.spec index 2c1ffd5..2fa77cc 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -4,7 +4,7 @@ Summary: SELinux library and simple utilities Name: libselinux -Version: 2.0.73 +Version: 2.0.75 Release: 1%{?dist} License: Public Domain Group: System Environment/Libraries @@ -163,6 +163,12 @@ exit 0 %{ruby_sitearch}/selinux.so %changelog +* Fri Nov 7 2008 Dan Walsh - 2.0.75-1 +- Update to Upstream + * Correct message types in AVC log messages. + * Make matchpathcon -V pass mode from Dan Walsh. + * Add man page for selinux_file_context_cmp from Dan Walsh. + * Tue Sep 30 2008 Dan Walsh - 2.0.73-1 - Update to Upstream * New man pages from Dan Walsh. diff --git a/sources b/sources index b64c7d8..c86fedb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3fb779dd1d9e06190f37dc26f31c7ff7 libselinux-2.0.73.tgz +6dff8b7e9f0bc373b01bcfa67f23a0ce libselinux-2.0.75.tgz