rpms/libselinux
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Daniel J Walsh 2007-09-18 20:44:47 +00:00
parent 71cd1381ef
commit 0fa749d083
4 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -128,3 +128,4 @@ libselinux-2.0.29.tgz
libselinux-2.0.30.tgz libselinux-2.0.30.tgz
libselinux-2.0.31.tgz libselinux-2.0.31.tgz
libselinux-2.0.33.tgz libselinux-2.0.33.tgz
libselinux-2.0.34.tgz

42
libselinux-rhat.patch
View File

@ -1,6 +1,6 @@
diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.33/src/matchpathcon.c diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-2.0.33/src/matchpathcon.c
--- nsalibselinux/src/matchpathcon.c 2007-08-10 11:58:34.000000000 -0400 --- nsalibselinux/src/matchpathcon.c 2007-09-18 16:27:25.000000000 -0400
+++ libselinux-2.0.33/src/matchpathcon.c 2007-09-18 11:28:07.000000000 -0400 +++ libselinux-2.0.33/src/matchpathcon.c 2007-09-18 15:45:42.000000000 -0400
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
@ -9,17 +9,41 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux
#include "selinux_internal.h" #include "selinux_internal.h"
#include "label_internal.h" #include "label_internal.h"
#include "callbacks.h" #include "callbacks.h"
@@ -55,10 +56,12 @@ @@ -57,7 +58,7 @@
#endif
default_printf(const char *fmt, ...)
{ {
+ char buf[BUFSIZ];
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
- vfprintf(stderr, fmt, ap); - vfprintf(stderr, fmt, ap);
+ vsnprintf(buf, sizeof(buf) - 1, fmt, ap); + vsyslog(LOG_ERR, fmt, ap);
va_end(ap); va_end(ap);
+ syslog(LOG_ERR, buf, strlen(buf));
} }
void diff --exclude-from=exclude -N -u -r nsalibselinux/utils/matchpathcon.c libselinux-2.0.33/utils/matchpathcon.c
--- nsalibselinux/utils/matchpathcon.c 2007-07-16 14:20:45.000000000 -0400
+++ libselinux-2.0.33/utils/matchpathcon.c 2007-09-18 15:50:31.000000000 -0400
@@ -17,10 +17,24 @@
exit(1);
}
+static void
+#ifdef __GNUC__
+ __attribute__ ((format(printf, 1, 2)))
+#endif
+ myprintf(const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+}
+
int printmatchpathcon(char *path, int header, int mode)
{
char *buf;
- int rc = matchpathcon(path, mode, &buf);
+ int rc;
+ set_matchpathcon_printf(myprintf);
+ rc = matchpathcon(path, mode, &buf);
if (rc < 0) {
fprintf(stderr, "matchpathcon(%s) failed: %s\n", path,
strerror(errno));

10
libselinux.spec
View File

@ -1,8 +1,8 @@
%define libsepolver 2.0.1-1 %define libsepolver 2.0.10-1
Summary: SELinux library and simple utilities Summary: SELinux library and simple utilities
Name: libselinux Name: libselinux
Version: 2.0.33 Version: 2.0.34
Release: 2%{?dist} Release: 1%{?dist}
License: Public domain (uncopyrighted) License: Public domain (uncopyrighted)
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@ -124,6 +124,10 @@ exit 0
%changelog %changelog
* Tue Sep 18 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.34-1
- Upgrade to latest from NSA
* Fix selabel option flag setting for 64-bit from Stephen Smalley.
* Tue Sep 18 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.33-2 * Tue Sep 18 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.33-2
- Change matchpatcon to use syslog instead of syserror - Change matchpatcon to use syslog instead of syserror

2
sources
View File

@ -1 +1 @@
0f6bba5799228f0a11e155a6807f63b7 libselinux-2.0.33.tgz e6f14fafbeab0fb9c9662d79eca4ac1e libselinux-2.0.34.tgz