From 4ed79e352131d655d844e74ba497390598d1d703 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Nov 23 2009 18:32:48 +0000 Subject: - Fix selinuxdefcon man page --- diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch index 43bf2aa..72c90e6 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.86/man/man8/selinuxconlist.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxconlist.8 libselinux-2.0.89/man/man8/selinuxconlist.8 --- nsalibselinux/man/man8/selinuxconlist.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.86/man/man8/selinuxconlist.8 2009-09-15 15:20:59.000000000 -0400 ++++ libselinux-2.0.89/man/man8/selinuxconlist.8 2009-11-23 13:26:01.000000000 -0500 @@ -0,0 +1,18 @@ +.TH "selinuxconlist" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation" +.SH "NAME" @@ -20,32 +20,37 @@ 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.86/man/man8/selinuxdefcon.8 +diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinuxdefcon.8 libselinux-2.0.89/man/man8/selinuxdefcon.8 --- nsalibselinux/man/man8/selinuxdefcon.8 1969-12-31 19:00:00.000000000 -0500 -+++ libselinux-2.0.86/man/man8/selinuxdefcon.8 2009-09-15 15:20:59.000000000 -0400 -@@ -0,0 +1,19 @@ ++++ libselinux-2.0.89/man/man8/selinuxdefcon.8 2009-11-23 13:30:18.000000000 -0500 +@@ -0,0 +1,24 @@ +.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh@redhat.com" "SELinux Command Line documentation" +.SH "NAME" -+selinuxdefcon \- list default SELinux context for user ++selinuxdefcon \- report default SELinux context for user + +.SH "SYNOPSIS" +.B selinuxdefcon [-l level] user [fromcon] + +.SH "DESCRIPTION" -+.B seconlist ++.B selinuxdefcon +reports the default context for the specified user from current context or specified context + +.B \-l level +mcs/mls level + ++.SH EXAMPLE ++# selinuxdefcon jsmith system_u:system_r:sshd_t:s0 ++.br ++unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 ++ +.SH AUTHOR +This manual page was written by Dan Walsh . + +.SH "SEE ALSO" +secon(8), selinuxconlist(8) -diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.86/src/callbacks.c +diff --exclude-from=exclude -N -u -r nsalibselinux/src/callbacks.c libselinux-2.0.89/src/callbacks.c --- nsalibselinux/src/callbacks.c 2009-04-08 09:06:23.000000000 -0400 -+++ libselinux-2.0.86/src/callbacks.c 2009-09-15 15:20:59.000000000 -0400 ++++ libselinux-2.0.89/src/callbacks.c 2009-11-23 13:26:01.000000000 -0500 @@ -16,6 +16,7 @@ { int rc; @@ -54,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.86/src/matchpathcon.c +diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.89/src/matchpathcon.c --- nsalibselinux/src/matchpathcon.c 2009-03-06 14:41:45.000000000 -0500 -+++ libselinux-2.0.86/src/matchpathcon.c 2009-09-15 15:20:59.000000000 -0400 ++++ libselinux-2.0.89/src/matchpathcon.c 2009-11-23 13:26:01.000000000 -0500 @@ -2,6 +2,7 @@ #include #include diff --git a/libselinux.spec b/libselinux.spec index 5492bc1..e04a657 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -5,7 +5,7 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 2.0.89 -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Libraries Source: http://www.nsa.gov/research/selinux/%{name}-%{version}.tgz @@ -166,6 +166,9 @@ exit 0 %{ruby_sitearch}/selinux.so %changelog +* Mon Nov 2 2009 Dan Walsh - 2.0.89-2 +- Fix selinuxdefcon man page + * Mon Nov 2 2009 Dan Walsh - 2.0.89-1 - Update to upstream * Add pkgconfig file from Eamon Walsh.