From 96ff98944cadc2b7ae1b04d377ff6d1c0e955a4c Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 16 Sep 2005 17:43:14 +0000 Subject: [PATCH] - Go back to original libsetrans code --- .cvsignore | 1 + libselinux-rhat.patch | 17 ++++------------- sources | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index e1389a4..f14370c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -46,3 +46,4 @@ libselinux-1.25.5.tgz libselinux-1.25.6.tgz libselinux-1.25.7.tgz libselinux-1.26.tgz +libselinux-1.27.1.tgz diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch index 5905c9c..d62369d 100644 --- a/libselinux-rhat.patch +++ b/libselinux-rhat.patch @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.26/include/selinux/selinux.h --- nsalibselinux/include/selinux/selinux.h 2005-09-01 11:17:40.000000000 -0400 -+++ libselinux-1.26/include/selinux/selinux.h 2005-09-12 17:05:36.000000000 -0400 ++++ libselinux-1.26/include/selinux/selinux.h 2005-09-14 13:47:09.000000000 -0400 @@ -304,6 +304,12 @@ extern int selinux_getenforcemode(int *enforce); @@ -14,19 +14,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h lib selinux_policy_root reads the /etc/selinux/config file and returns the directory path under which the compiled policy file and context configuration files exist. ---- nsalibselinux/src/init.c 2005-09-01 13:21:11.000000000 -0400 -+++ libselinux-1.26/src/init.c 2005-09-12 17:13:20.000000000 -0400 -@@ -8,6 +8,7 @@ - #include - #include - #include -+#include - - #include "dso.h" - #include "policy.h" diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux-1.26/src/matchpathcon.c --- nsalibselinux/src/matchpathcon.c 2005-08-24 09:07:11.000000000 -0400 -+++ libselinux-1.26/src/matchpathcon.c 2005-09-12 17:05:37.000000000 -0400 ++++ libselinux-1.26/src/matchpathcon.c 2005-09-14 13:47:09.000000000 -0400 @@ -25,6 +25,20 @@ va_end(ap); } @@ -106,8 +96,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/matchpathcon.c libselinux goto finish; } +diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-1.26/src/selinux_config.c --- nsalibselinux/src/selinux_config.c 2005-03-17 14:56:21.000000000 -0500 -+++ libselinux-1.26/src/selinux_config.c 2005-09-13 12:46:22.682193000 -0400 ++++ libselinux-1.26/src/selinux_config.c 2005-09-14 13:47:09.000000000 -0400 @@ -85,6 +85,29 @@ static int use_compat_file_path; diff --git a/sources b/sources index 558a01e..01810e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -73e7b7cf0a11594611b2ce8188a0fb22 libselinux-1.26.tgz +71d3d1a3e3b2df41d2ab0fb01be42ebb libselinux-1.27.1.tgz