From de078cb3d501fa8937ea67b1116db1518e46bcac Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 18 Jan 2010 21:59:45 +0000 Subject: [PATCH] - Fix man page for selinuxdefcon --- libselinux-rhat.patch | 23 ++++++++++++++++++----- libselinux.spec | 7 +++++-- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch index d74c6c8..fe3fa11 100644 --- a/libselinux-rhat.patch +++ b/libselinux-rhat.patch @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.90/man/man8/selinuxconlist.8 --- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.90/man/man8/selinuxconlist.8 2010-01-04 17:14:21.000000000 -0500 ++++ libselinux-2.0.90/man/man8/selinuxconlist.8 2010-01-18 16:52:28.000000000 -0500 @@ -0,0 +1,18 @@ +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -22,7 +22,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 lib +secon(8), selinuxdefcon(8) diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.90/man/man8/selinuxdefcon.8 --- nsalibselinux/man/man8/selinuxdefcon.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.90/man/man8/selinuxdefcon.8 2010-01-18 11:06:24.000000000 -0500 ++++ libselinux-2.0.90/man/man8/selinuxdefcon.8 2010-01-18 16:52:28.000000000 -0500 @@ -0,0 +1,24 @@ +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -50,7 +50,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libs +secon(8), selinuxconlist(8) diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.90/src/callbacks.c --- nsalibselinux/src/callbacks.c 2009-04-08 09:06:23.000000000 -0400 -+++ libselinux-2.0.90/src/callbacks.c 2010-01-04 17:14:21.000000000 -0500 ++++ libselinux-2.0.90/src/callbacks.c 2010-01-18 16:52:28.000000000 -0500 @@ -16,6 +16,7 @@ { int rc; @@ -61,7 +61,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2. va_end(ap); diff --exclude-from=exclude -N -u -r nsalibselinux/src/init.c libselinux-2.0.90/src/init.c --- nsalibselinux/src/init.c 2009-07-14 11:16:03.000000000 -0400 -+++ libselinux-2.0.90/src/init.c 2010-01-15 11:25:24.000000000 -0500 ++++ libselinux-2.0.90/src/init.c 2010-01-18 16:52:28.000000000 -0500 @@ -59,8 +59,10 @@ } fclose(fp); @@ -74,9 +74,22 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/init.c libselinux-2.0.90/ /* At this point, the usual spot doesn't have an selinuxfs so * we look around for it */ +diff --exclude-from=exclude -N -u -r nsalibselinux/src/label_file.c libselinux-2.0.90/src/label_file.c +--- nsalibselinux/src/label_file.c 2009-05-18 13:53:14.000000000 -0400 ++++ libselinux-2.0.90/src/label_file.c 2010-01-18 16:53:54.000000000 -0500 +@@ -20,6 +20,9 @@ + #include "callbacks.h" + #include "label_internal.h" + ++#include ++#include ++ + /* + * Internals, mostly moved over from matchpathcon.c + */ diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.90/src/matchpathcon.c --- nsalibselinux/src/matchpathcon.c 2009-03-06 14:41:45.000000000 -0500 -+++ libselinux-2.0.90/src/matchpathcon.c 2010-01-04 17:14:21.000000000 -0500 ++++ libselinux-2.0.90/src/matchpathcon.c 2010-01-18 16:52:28.000000000 -0500 @@ -2,6 +2,7 @@ #include #include diff --git a/libselinux.spec b/libselinux.spec index 84bb883..1662b21 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -5,7 +5,7 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 2.0.90 -Release: 2%{?dist} +Release: 3%{?dist} License: Public Domain Group: System Environment/Libraries Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz @@ -166,7 +166,10 @@ exit 0 %{ruby_sitearch}/selinux.so %changelog -* Mon Jam 4 2010 Dan Walsh - 2.0.90-2 +* Mon Jan 18 2010 Dan Walsh - 2.0.90-3 +- Fix man page for selinuxdefcon + +* Mon Jan 4 2010 Dan Walsh - 2.0.90-2 - Free memory on disabled selinux boxes * Tue Dec 1 2009 Dan Walsh - 2.0.90-1