rpms/libselinux/devel .cvsignore, 1.149, 1.150 libselinux-rhat.patch, 1.127, 1.128 libselinux.spec, 1.285, 1.286 sources, 1.151, 1.152

[Daniel J Walsh (dwalsh)]

Author: dwalsh

Update of /cvs/extras/rpms/libselinux/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1818

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/.cvsignore,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- .cvsignore	13 Sep 2007 12:29:38 -0000	1.149
+++ .cvsignore	18 Sep 2007 20:44:47 -0000	1.150
@@ -128,3 +128,4 @@
 libselinux-2.0.30.tgz
 libselinux-2.0.31.tgz
 libselinux-2.0.33.tgz
+libselinux-2.0.34.tgz

libselinux-rhat.patch:

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux-rhat.patch,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- libselinux-rhat.patch	18 Sep 2007 15:37:42 -0000	1.127
+++ libselinux-rhat.patch	18 Sep 2007 20:44:47 -0000	1.128
@@ -1,6 +1,6 @@
 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
-+++ libselinux-2.0.33/src/matchpathcon.c	2007-09-18 11:28:07.000000000 -0400
+--- nsalibselinux/src/matchpathcon.c	2007-09-18 16:27:25.000000000 -0400
++++ libselinux-2.0.33/src/matchpathcon.c	2007-09-18 15:45:42.000000000 -0400
 @@ -2,6 +2,7 @@
  #include <string.h>
  #include <errno.h>
@@ -9,17 +9,41 @@
  #include "selinux_internal.h"
  #include "label_internal.h"
  #include "callbacks.h"
-@@ -55,10 +56,12 @@
- #endif
-     default_printf(const char *fmt, ...)
+@@ -57,7 +58,7 @@
  {
-+	char buf[BUFSIZ];
  	va_list ap;
  	va_start(ap, fmt);
 -	vfprintf(stderr, fmt, ap);
-+	vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
++	vsyslog(LOG_ERR, fmt, 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));


Index: libselinux.spec
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/libselinux.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- libselinux.spec	18 Sep 2007 15:37:42 -0000	1.285
+++ libselinux.spec	18 Sep 2007 20:44:47 -0000	1.286
@@ -1,8 +1,8 @@
-%define libsepolver 2.0.1-1
+%define libsepolver 2.0.10-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.0.33
-Release: 2%{?dist}
+Version: 2.0.34
+Release: 1%{?dist}
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -124,6 +124,10 @@
 
 %changelog
 
+* Tue Sep 18 2007 Dan Walsh <dwalsh at 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 at redhat.com> - 2.0.33-2
 - Change matchpatcon to use syslog instead of syserror
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libselinux/devel/sources,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- sources	13 Sep 2007 12:29:38 -0000	1.151
+++ sources	18 Sep 2007 20:44:47 -0000	1.152
@@ -1 +1 @@
-0f6bba5799228f0a11e155a6807f63b7  libselinux-2.0.33.tgz
+e6f14fafbeab0fb9c9662d79eca4ac1e  libselinux-2.0.34.tgz