From 9a44e1df850eb66c7f9a122fa69db247eaf6f0701b2a668c11ce2cf9600ca36f Mon Sep 17 00:00:00 2001 From: Johannes Segitz Date: Thu, 30 Jul 2015 12:06:49 +0000 Subject: [PATCH] Accepting request 319563 from home:jsegitz:branches:security:SELinux - Update to version 2.3 * Get rid of security_context_t and fix const declarations. * Refactor rpm_execcon() into a new setexecfilecon() from Guillem Jover. - fixed selinux-ready to work with initrd files created by dracut (bsc#940006) OBS-URL: https://build.opensuse.org/request/show/319563 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/libselinux?expand=0&rev=83 --- libselinux-bindings.changes | 7 +++++++ libselinux-bindings.spec | 2 +- libselinux.changes | 5 +++++ libselinux.spec | 2 +- selinux-ready | 2 ++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/libselinux-bindings.changes b/libselinux-bindings.changes index 533efff..b935b1b 100644 --- a/libselinux-bindings.changes +++ b/libselinux-bindings.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun May 18 00:15:17 UTC 2014 - crrodriguez@opensuse.org + +- Update to version 2.3 +* Get rid of security_context_t and fix const declarations. +* Refactor rpm_execcon() into a new setexecfilecon() from Guillem Jover. + ------------------------------------------------------------------- Wed May 27 11:53:54 UTC 2015 - dimstar@opensuse.org diff --git a/libselinux-bindings.spec b/libselinux-bindings.spec index 26506d7..fa7992d 100644 --- a/libselinux-bindings.spec +++ b/libselinux-bindings.spec @@ -1,7 +1,7 @@ # # spec file for package libselinux-bindings # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/libselinux.changes b/libselinux.changes index 496afd0..f38ca7b 100644 --- a/libselinux.changes +++ b/libselinux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 30 12:00:27 UTC 2015 - jsegitz@novell.com + +- fixed selinux-ready to work with initrd files created by dracut (bsc#940006) + ------------------------------------------------------------------- Mon Sep 8 08:25:11 UTC 2014 - jsegitz@suse.com diff --git a/libselinux.spec b/libselinux.spec index fc7d615..1f14a69 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -1,7 +1,7 @@ # # spec file for package libselinux # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/selinux-ready b/selinux-ready index 667c95e..163489b 100644 --- a/selinux-ready +++ b/selinux-ready @@ -113,6 +113,8 @@ check_mkinitrd() case $INITRD_FORMAT in 'XZ' ) xz -d -c $TD/$INITRD | cpio -i --force-local --no-absolute-filenames 2>/dev/null ;; + 'ASCII' ) + /usr/lib/dracut/skipcpio $TD/$INITRD | xz -d | cpio -i --force-local --no-absolute-filenames 2>/dev/null ;; 'gzip' ) gzip -d -c $TD/$INITRD | cpio -i --force-local --no-absolute-filenames 2>/dev/null ;; * )