From 35630bb4ed52c783db5348c9930d8997994a070ce704fd7e43f947ee5eb781d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Mon, 2 Mar 2015 13:56:03 +0000
Subject: [PATCH] Accepting request 287858 from home:jsegitz:branches:Apache

- Patched get_module_list to ensure proper SELinux context for
  sysconfig.d/loadmodule.conf

OBS-URL: https://build.opensuse.org/request/show/287858
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=439
---
 apache2.changes | 6 ++++++
 get_module_list | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/apache2.changes b/apache2.changes
index 482913b..7060c81 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 26 08:17:42 UTC 2015 - jsegitz@novell.com
+
+- Patched get_module_list to ensure proper SELinux context for
+  sysconfig.d/loadmodule.conf
+
 -------------------------------------------------------------------
 Wed Feb 25 21:02:59 UTC 2015 - tchvatal@suse.com
 
diff --git a/get_module_list b/get_module_list
index 11066f8..9aac6ea 100644
--- a/get_module_list
+++ b/get_module_list
@@ -105,7 +105,12 @@ done
 echo >&3 -e "#\n"
 exec 3<&-
 chmod 644 $TMPFILE
-mv $TMPFILE $sysconfdir/sysconfig.d/loadmodule.conf
+if ! mv -Z $TMPFILE $sysconfdir/sysconfig.d/loadmodule.conf 2>/dev/null; then
+  mv $TMPFILE $sysconfdir/sysconfig.d/loadmodule.conf
+  if selinuxenabled; then
+    restorecon $sysconfdir/sysconfig.d/loadmodule.conf
+  fi
+fi
 #echo -n ". "