rpms/libselinux/F-12 .cvsignore, 1.188, 1.189 libselinux-rhat.patch, 1.199, 1.200 libselinux.spec, 1.379, 1.380
Daniel J Walsh
dwalsh at fedoraproject.org
Mon Jan 18 21:45:06 UTC 2010
Author: dwalsh
Update of /cvs/extras/rpms/libselinux/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21550
Modified Files:
.cvsignore libselinux-rhat.patch libselinux.spec
Log Message:
* Mon Jan 18 2010 Dan Walsh <dwalsh at redhat.com> - 2.0.90-3
- Fix man page for selinuxdefcon
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-12/.cvsignore,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -p -r1.188 -r1.189
--- .cvsignore 28 Sep 2009 20:33:24 -0000 1.188
+++ .cvsignore 18 Jan 2010 21:45:06 -0000 1.189
@@ -171,3 +171,6 @@ libselinux-2.0.84.tgz
libselinux-2.0.85.tgz
libselinux-2.0.86.tgz
libselinux-2.0.87.tgz
+libselinux-2.0.88.tgz
+libselinux-2.0.89.tgz
+libselinux-2.0.90.tgz
libselinux-rhat.patch:
man/man8/selinuxconlist.8 | 18 ++++++++++++++++++
man/man8/selinuxdefcon.8 | 24 ++++++++++++++++++++++++
src/callbacks.c | 1 +
src/init.c | 4 +++-
src/matchpathcon.c | 3 ++-
5 files changed, 48 insertions(+), 2 deletions(-)
Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-12/libselinux-rhat.patch,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- libselinux-rhat.patch 28 Sep 2009 20:33:24 -0000 1.199
+++ libselinux-rhat.patch 18 Jan 2010 21:45:06 -0000 1.200
@@ -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.90/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.90/man/man8/selinuxconlist.8 2010-01-04 17:14:21.000000000 -0500
@@ -0,0 +1,18 @@
+.TH "selinuxconlist" "1" "7 May 2008" "dwalsh at redhat.com" "SELinux Command Line documentation"
+.SH "NAME"
@@ -20,32 +20,37 @@ diff --exclude-from=exclude -N -u -r nsa
+
+.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.90/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.90/man/man8/selinuxdefcon.8 2010-01-18 11:06:24.000000000 -0500
+@@ -0,0 +1,24 @@
+.TH "selinuxdefcon" "1" "7 May 2008" "dwalsh at 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]
++.B selinuxdefcon [-l level] user fromcon
+
+.SH "DESCRIPTION"
-+.B seconlist
-+reports the default context for the specified user from current context or specified context
++.B selinuxdefcon
++reports the default context for the specified user from the 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 <dwalsh at redhat.com>.
+
+.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.90/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.90/src/callbacks.c 2010-01-04 17:14:21.000000000 -0500
@@ -16,6 +16,7 @@
{
int rc;
@@ -54,9 +59,24 @@ diff --exclude-from=exclude -N -u -r nsa
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/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
+@@ -59,8 +59,10 @@
+ }
+ fclose(fp);
+
+- if (!exists)
++ if (!exists) {
++ free(buf);
+ return;
++ }
+
+ /* 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/matchpathcon.c libselinux-2.0.90/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.90/src/matchpathcon.c 2010-01-04 17:14:21.000000000 -0500
@@ -2,6 +2,7 @@
#include <string.h>
#include <errno.h>
Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/F-12/libselinux.spec,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -p -r1.379 -r1.380
--- libselinux.spec 4 Jan 2010 22:20:19 -0000 1.379
+++ libselinux.spec 18 Jan 2010 21:45:06 -0000 1.380
@@ -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,6 +166,9 @@ exit 0
%{ruby_sitearch}/selinux.so
%changelog
+* Mon Jan 18 2010 Dan Walsh <dwalsh at redhat.com> - 2.0.90-3
+- Fix man page for selinuxdefcon
+
* Mon Jan 4 2010 Dan Walsh <dwalsh at redhat.com> - 2.0.90-2
- Free memory on disabled selinux boxes
More information about the scm-commits
mailing list