From eaa3e6ecb8d9190af7b8cbca4eebaa1cb1c5d5cc Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 07:43:32 +0000 Subject: auto-import changelog data from libselinux-1.13.4-1.src.rpm Wed Jun 16 2004 Dan Walsh 1.13.4-1 - add nlclass patch - Update to latest from NSA --- diff --git a/.cvsignore b/.cvsignore index d8b086e..5b2ecbd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libselinux-1.13.3.tgz +libselinux-1.13.4.tgz diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch deleted file mode 100644 index 51af822..0000000 --- a/libselinux-rhat.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- libselinux-1.13.3/src/selinux_config.c.rhat 2004-06-09 08:08:32.000000000 -0400 -+++ libselinux-1.13.3/src/selinux_config.c 2004-06-12 04:47:42.082544760 -0400 -@@ -34,6 +34,7 @@ - }; - - /* Old layout had fixed locations. */ -+#define SECURITYCONFIG "/etc/sysconfig/selinux" - #define SECURITYDIR "/etc/security" - static char *compat_file_paths[NEL] = { - SECURITYDIR "/selinux/policy", -@@ -52,6 +53,9 @@ - FILE *cfg = fopen(SELINUXCONFIG,"r"); - char buf[4097]; - int len=sizeof(SELINUXTAG)-1; -+ if (!cfg) { -+ cfg = fopen(SECURITYCONFIG,"r"); -+ } - if (cfg) { - while (fgets(buf, 4096, cfg)) { - if (strncmp(buf,SELINUXTAG,len)) -@@ -94,9 +98,10 @@ - cfg = fopen(SELINUXCONFIG,"r"); - if (cfg) { - while (fgets(buf, 4096, cfg)) { -- if (strncmp(buf,SELINUXTYPETAG,len)) -- continue; -- type=buf+len; -+ if (strncmp(buf,SELINUXTYPETAG,len)==0) { -+ type=buf+len; -+ break; -+ } - } - fclose(cfg); - } ---- libselinux-1.13.3/utils/selinuxconfig.c.rhat 2004-06-09 08:08:32.000000000 -0400 -+++ libselinux-1.13.3/utils/selinuxconfig.c 2004-06-12 04:39:11.550157480 -0400 -@@ -6,6 +6,21 @@ - - int main(int argc __attribute__ ((unused)), char **argv) - { -+ int enforce; -+ if (selinux_getenforcemode(&enforce)==0) { -+ switch (enforce) { -+ case 1: -+ printf("selinux state=\"enforcing\"\n"); -+ break; -+ case 0: -+ printf("selinux state=\"permissive\"\n"); -+ break; -+ case -1: -+ printf("selinux state=\"disabled\"\n"); -+ break; -+ } -+ } -+ - printf("policypath=\"%s\"\n", selinux_policy_root()); - printf("default_type_path=\"%s\"\n", selinux_default_type_path()); - printf("default_context_path=\"%s\"\n", selinux_default_context_path()); diff --git a/libselinux.spec b/libselinux.spec index 260dd7f..9e9bf8c 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -1,14 +1,14 @@ Summary: SELinux library and simple utilities Name: libselinux -Version: 1.13.3 -Release: 3 +Version: 1.13.4 +Release: 1 License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libselinux-%{version}.tgz Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-buildroot Provides: libselinux.so -Patch: libselinux-rhat.patch +Patch1: libselinux-nlclass.patch %description Security-enhanced Linux is a patch of the Linux® kernel and a number @@ -36,7 +36,8 @@ needed for developing SELinux applications. %prep %setup -q -%patch -p1 -b .rhat +%patch1 -p1 -b .nlclass + %build make @@ -70,6 +71,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man8/* %changelog +* Wed Jun 16 2004 Dan Walsh 1.13.4-1 +- add nlclass patch +- Update to latest from NSA + * Tue Jun 15 2004 Elliot Lee - rebuilt diff --git a/sources b/sources index c865f92..cd6e09a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d1a67bb52a156714618e97b3116833c libselinux-1.13.3.tgz +dd71e063e32a6ec3325e19b979edecde libselinux-1.13.4.tgz