From aa09b7d9542f1fb12e90ef743793aeda478f8129 Mon Sep 17 00:00:00 2001
From: Dan Walsh <dwalsh@redhat.com>
Date: Sep 19 2011 10:52:45 +0000
Subject: Update to upstream

	* utils: matchpathcon: remove duplicate declaration
	* src: matchpathcon: use myprintf not fprintf
	* src: matchpathcon: make sure resolved path starts
	* put libselinux.so.1 in /lib not /usr/lib
	* tree: default make target to all not

---

diff --git a/.gitignore b/.gitignore
index 936d759..52a6ebf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -187,3 +187,4 @@ libselinux-2.0.96.tgz
 /libselinux-2.1.0.tgz
 /libselinux-2.1.4.tgz
 /libselinux-2.1.5.tgz
+/libselinux-2.1.6.tgz
diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index bd18a47..d8d8550 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -165,7 +165,7 @@ index 3b8346d..02f3f98 100644
  					goto finish;
  			}
 diff --git a/libselinux/src/matchpathcon.c b/libselinux/src/matchpathcon.c
-index 9717b14..df83b30 100644
+index 5914afa..df83b30 100644
 --- a/libselinux/src/matchpathcon.c
 +++ b/libselinux/src/matchpathcon.c
 @@ -2,6 +2,7 @@
@@ -185,53 +185,3 @@ index 9717b14..df83b30 100644
  	va_end(ap);
  }
  
-@@ -353,7 +354,7 @@ static int symlink_realpath(const char *name, char *resolved_path)
- 
- 	tmp_path = strdup(name);
- 	if (!tmp_path) {
--		fprintf(stderr, "symlink_realpath(%s) strdup() failed: %s\n",
-+		myprintf("symlink_realpath(%s) strdup() failed: %s\n",
- 			name, strerror(errno));
- 		rc = -1;
- 		goto out;
-@@ -374,21 +375,24 @@ static int symlink_realpath(const char *name, char *resolved_path)
- 	}
- 
- 	if (!p) {
--		fprintf(stderr, "symlink_realpath(%s) realpath() failed: %s\n",
-+		myprintf("symlink_realpath(%s) realpath() failed: %s\n",
- 			name, strerror(errno));
- 		rc = -1;
- 		goto out;
- 	}
- 
- 	len = strlen(p);
--	if (len + strlen(last_component) + 1 > PATH_MAX) {
--		fprintf(stderr, "symlink_realpath(%s) failed: Filename too long \n",
-+	if (len + strlen(last_component) + 2 > PATH_MAX) {
-+		myprintf("symlink_realpath(%s) failed: Filename too long \n",
- 			name);
-+		errno=ENAMETOOLONG;
- 		rc = -1;
- 		goto out;
- 	}
- 
- 	resolved_path += len;
-+	strcpy(resolved_path, "/");
-+	resolved_path += 1;
- 	strcpy(resolved_path, last_component);
- out:
- 	free(tmp_path);
-diff --git a/libselinux/utils/matchpathcon.c b/libselinux/utils/matchpathcon.c
-index 2fa21bc..5f0a4c2 100644
---- a/libselinux/utils/matchpathcon.c
-+++ b/libselinux/utils/matchpathcon.c
-@@ -45,7 +45,7 @@ int printmatchpathcon(char *path, int header, int mode)
- 
- int main(int argc, char **argv)
- {
--	int i, init = 0, rc = 0;
-+	int i, init = 0;
- 	int header = 1, opt;
- 	int verify = 0;
- 	int notrans = 0;
diff --git a/libselinux.spec b/libselinux.spec
index b8adc7f..3b7ae06 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -6,8 +6,8 @@
 
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 2.1.5
-Release: 5%{?dist}
+Version: 2.1.6
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tgz
@@ -231,6 +231,14 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Mon Sep 19 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.6-1
+-Update to upstream
+	* utils: matchpathcon: remove duplicate declaration
+	* src: matchpathcon: use myprintf not fprintf
+	* src: matchpathcon: make sure resolved path starts
+	* put libselinux.so.1 in /lib not /usr/lib
+	* tree: default make target to all not
+
 * Wed Sep 14 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.5-5
 - Switch to use ":" as prefix separator rather then ";"
 
diff --git a/sources b/sources
index e2bc444..e3724b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e0da22061511b669c324bb2c96d2c668  libselinux-2.1.5.tgz
+94fa8daf439f79db14821d4ff7f68f98  libselinux-2.1.6.tgz