From e1907f7cb7657838feb340e7d87fdf5fd03f4f20 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mar 24 2010 19:55:26 +0000 Subject: Set errno=EINVAL for invalid contexts from Dan Walsh. --- diff --git a/.cvsignore b/.cvsignore index b2a8829..74df3f6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -177,3 +177,4 @@ libselinux-2.0.90.tgz libselinux-2.0.91.tgz libselinux-2.0.92.tgz libselinux-2.0.93.tgz +libselinux-2.0.94.tgz diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch index 6bb9404..91dc55e 100644 --- a/libselinux-rhat.patch +++ b/libselinux-rhat.patch @@ -1,23 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man3/is_selinux_enabled.3 libselinux-2.0.92/man/man3/is_selinux_enabled.3 ---- nsalibselinux/man/man3/is_selinux_enabled.3 2009-03-06 14:41:45.000000000 -0500 -+++ libselinux-2.0.92/man/man3/is_selinux_enabled.3 2010-03-07 07:40:57.000000000 -0500 -@@ -1,4 +1,4 @@ --.TH "is_selinux_enabled" "3" "1 January 2004" "russell@coker.com.au" "SELinux API documentation" -+.TH "is_selinux_enabled" "3" "7 Mar 2010" "russell@coker.com.au" "SELinux API documentation" - .SH "NAME" - is_selinux_enabled \- check whether SELinux is enabled - -@@ -14,6 +14,7 @@ - .SH "DESCRIPTION" - .B is_selinux_enabled - returns 1 if SELinux is running or 0 if it is not. -+On error, \-1 is returned. - - .B is_selinux_mls_enabled - returns 1 if SELinux is running in MLS mode or 0 if it is not. -diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.92/man/man8/selinuxconlist.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.93/man/man8/selinuxconlist.8 --- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.92/man/man8/selinuxconlist.8 2010-03-07 07:38:19.000000000 -0500 ++++ libselinux-2.0.93/man/man8/selinuxconlist.8 2010-03-16 12:33:32.000000000 -0400 @@ -0,0 +1,18 @@ +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -37,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.92/man/man8/selinuxdefcon.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.93/man/man8/selinuxdefcon.8 --- nsalibselinux/man/man8/selinuxdefcon.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.92/man/man8/selinuxdefcon.8 2010-03-07 07:38:19.000000000 -0500 ++++ libselinux-2.0.93/man/man8/selinuxdefcon.8 2010-03-16 12:33:32.000000000 -0400 @@ -0,0 +1,24 @@ +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -65,9 +48,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.92/src/callbacks.c +diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.93/src/callbacks.c --- nsalibselinux/src/callbacks.c 2009-04-08 09:06:23.000000000 -0400 -+++ libselinux-2.0.92/src/callbacks.c 2010-03-07 07:38:19.000000000 -0500 ++++ libselinux-2.0.93/src/callbacks.c 2010-03-16 12:33:32.000000000 -0400 @@ -16,6 +16,7 @@ { int rc; @@ -76,9 +59,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.92/src/matchpathcon.c +diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.93/src/matchpathcon.c --- nsalibselinux/src/matchpathcon.c 2009-03-06 14:41:45.000000000 -0500 -+++ libselinux-2.0.92/src/matchpathcon.c 2010-03-07 07:38:19.000000000 -0500 ++++ libselinux-2.0.93/src/matchpathcon.c 2010-03-16 12:33:32.000000000 -0400 @@ -2,6 +2,7 @@ #include #include diff --git a/libselinux.spec b/libselinux.spec index 135f1a8..449cb07 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -4,7 +4,7 @@ Summary: SELinux library and simple utilities Name: libselinux -Version: 2.0.93 +Version: 2.0.94 Release: 1%{?dist} License: Public Domain Group: System Environment/Libraries @@ -166,6 +166,9 @@ exit 0 %{ruby_sitearch}/selinux.so %changelog +* Wed Mar 24 2010 Dan Walsh - 2.0.94-1 + * Set errno=EINVAL for invalid contexts from Dan Walsh. + * Sun Mar 16 2010 Dan Walsh - 2.0.93-1 - Update to upstream * Show strerror for security_getenforce() by Colin Waters. diff --git a/sources b/sources index ede1fba..5e7f1a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -879f5579860dea05f12e7ed2fa523a38 libselinux-2.0.93.tgz +f814c71fca5a85ebfeb81b57afed59db libselinux-2.0.94.tgz