From 5242278d813f4b7dd95d6a3c280342fc7ee61a18 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 25 Jul 2005 13:37:45 +0000 Subject: [PATCH] - Fix unitialized variable problem --- libsepol-rhat.patch | 23 +++++++++++------------ libsepol.spec | 7 ++++++- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/libsepol-rhat.patch b/libsepol-rhat.patch index c6df811..204cd07 100644 --- a/libsepol-rhat.patch +++ b/libsepol-rhat.patch @@ -1,12 +1,11 @@ -diff --exclude-from=exclude -N -u -r nsalibsepol/src/genbools.c libsepol-1.5.9/src/genbools.c ---- nsalibsepol/src/genbools.c 2005-05-17 08:07:47.000000000 -0400 -+++ libsepol-1.5.9/src/genbools.c 2005-05-26 10:54:03.000000000 -0400 -@@ -194,7 +194,7 @@ - for (i = 0; i < nel; i++) { - datum = hashtab_search(policydb.p_bools.table, names[i]); - if (!datum) { -- __sepol_debug_printf("%s: unknown boolean %s\n", -+ __sepol_debug_printf("%s: boolean %s no longer in policy\n", - __FUNCTION__, names[i]); - errors++; - continue; +--- libsepol-1.7.5/src/policydb.c~ 2005-07-18 15:05:31.000000000 -0400 ++++ libsepol-1.7.5/src/policydb.c 2005-07-25 09:36:04.000000000 -0400 +@@ -2428,7 +2428,7 @@ + + len = buf[1]; + if (len != strlen(target_str)) { +- printf("security: policydb string length %zu does not match expected length %zu\n", len, strlen(policydb_str)); ++ printf("security: policydb string length %zu does not match expected length %zu\n", len, strlen(target_str)); + return -1; + } + diff --git a/libsepol.spec b/libsepol.spec index d1bf30f..dc4897a 100644 --- a/libsepol.spec +++ b/libsepol.spec @@ -1,10 +1,11 @@ Summary: SELinux binary policy manipulation library Name: libsepol Version: 1.7.5 -Release: 1 +Release: 2 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz +Patch: libsepol-rhat.patch Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-buildroot Provides: libsepol.so @@ -36,6 +37,7 @@ needed for developing applications that manipulate binary policies. %prep %setup -q +%patch -p1 -b .rhat %build make CFLAGS="%{optflags}" @@ -72,6 +74,9 @@ rm -rf ${RPM_BUILD_ROOT} /%{_lib}/libsepol.so.1 %changelog +* Mon Jul 25 2005 Dan Walsh 1.7.5-2 +- Fix unitialized variable problem + * Mon Jul 18 2005 Dan Walsh 1.7.5-1 - Upgrade to latest from NSA * Merged debug support, policydb conversion functions from Ivan Gyurdiev (Red Hat).