From 0fa749d0833cb313e9e3b357cb9d3bfe00fc0c03 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Tue, 18 Sep 2007 20:44:47 +0000
Subject: [PATCH] *** empty log message ***

---
 .cvsignore            |  1 +
 libselinux-rhat.patch | 42 +++++++++++++++++++++++++++++++++---------
 libselinux.spec       | 10 +++++++---
 sources               |  2 +-
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 96ce825..63cd808 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -128,3 +128,4 @@ libselinux-2.0.29.tgz
 libselinux-2.0.30.tgz
 libselinux-2.0.31.tgz
 libselinux-2.0.33.tgz
+libselinux-2.0.34.tgz
diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index ddefb7a..231dac0 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -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 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux
  #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));
diff --git a/libselinux.spec b/libselinux.spec
index dec06f9..f52a584 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -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 @@ exit 0
 
 %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
 - Change matchpatcon to use syslog instead of syserror
 
diff --git a/sources b/sources
index 5188caf..ae39ee7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f6bba5799228f0a11e155a6807f63b7  libselinux-2.0.33.tgz
+e6f14fafbeab0fb9c9662d79eca4ac1e  libselinux-2.0.34.tgz