[spacewalk-config] Rebase to spacewalk-config-1.6.4-1.fc16 in rawhide.

[Miroslav Suchý]

commit d9642e4cc856e4b3327b6f141a28092a4cf8a86d
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Mon Jan 2 16:02:46 2012 +0100

    Rebase to spacewalk-config-1.6.4-1.fc16 in rawhide.

 .gitignore            |    1 +
 sources               |    2 +-
 spacewalk-config.spec |   43 +++++++++++++++++++++++++++++++++++++++----
 3 files changed, 41 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 968f6b1..3015f41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /spacewalk-config-1.2.7.tar.gz
 /spacewalk-config-1.3.1.tar.gz
 /spacewalk-config-1.4.4.tar.gz
+/spacewalk-config-1.6.4.tar.gz
diff --git a/sources b/sources
index b0b153b..f7cd099 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2579d09386fca866d87d729f19ce628a  spacewalk-config-1.4.4.tar.gz
+dc30b49e1331974f7875590ed3847aad  spacewalk-config-1.6.4.tar.gz
diff --git a/spacewalk-config.spec b/spacewalk-config.spec
index a1e267b..d5d08cf 100644
--- a/spacewalk-config.spec
+++ b/spacewalk-config.spec
@@ -1,6 +1,6 @@
 Name: spacewalk-config
 Summary: Spacewalk Configuration
-Version: 1.4.4
+Version: 1.6.4
 Release: 1%{?dist}
 URL: http://fedorahosted.org/spacewalk
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -75,7 +75,12 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/pki/tls/private/spacewalk.key
 %config(noreplace) %{_sysconfdir}/pki/tls/certs/spacewalk.crt
 %config(noreplace) %{_sysconfdir}/satname
-%{_var}/lib/rhn
+%dir %{_var}/lib/rhn
+%dir %{_var}/lib/rhn/rhn-satellite-prep
+%dir %{_var}/lib/rhn/rhn-satellite-prep/etc
+%attr(0750,root,apache) %dir %{_var}/lib/rhn/rhn-satellite-prep/etc/rhn
+%attr(0640,root,apache) %{_var}/lib/rhn/rhn-satellite-prep/etc/rhn/cluster.ini
+%attr(0640,root,apache) %{_var}/lib/rhn/rhn-satellite-prep/etc/rhn/rhn.conf
 %dir %{_prefix}/share/rhn
 %attr(0755,root,root) %{_prefix}/share/rhn/satidmap.pl
 %attr(0755,root,root) %{_prefix}/share/rhn/startup.pl
@@ -93,10 +98,40 @@ if [ -f /etc/init.d/satellite-httpd ] ; then
     %{__perl} -i -ne 'print unless /satellite-httpd\.pid/' /etc/logrotate.d/httpd
 fi
 
-
+# Set the group to allow Apache to access the conf files ...
+chgrp apache /etc/rhn /etc/rhn/rhn.conf /etc/rhn/cluster.ini 2> /dev/null || :
+# ... once we restrict access to some files that were too open in
+# the past.
+chmod o-rwx /etc/rhn/rhn.conf* /etc/rhn/cluster.ini* /etc/sysconfig/rhn/backup-* /var/lib/rhn/rhn-satellite-prep/* 2> /dev/null || :
 
 %changelog
-* Tue Apr 12 2011 Jan Pazdziora 1.4.4-1
+* Fri Nov 04 2011 Milan Zazrivec <mzazrivec at redhat.com> 1.6.4-1
+- 679335 - remove osa-dispatcher login credentials from rhn.conf
+
+* Mon Oct 03 2011 Jan Pazdziora 1.6.3-1
+- 621531 - fixing rhn.conf(5) man page.
+
+* Fri Sep 16 2011 Michael Mraka <michael.mraka at redhat.com> 1.6.2-1
+- 713477 - made session cookies httponly
+
+* Fri Aug 05 2011 Jan Pazdziora 1.6.1-1
+- Make monitoring .cgi live again in the /cgi-bin/ namespace, fixing scout
+  config push.
+
+* Tue Jun 21 2011 Jan Pazdziora 1.5.5-1
+- Silence chgrp/chmod, during first installation.
+
+* Tue May 17 2011 Miroslav Suchý 1.5.4-1
+- migrate .htaccess files to apache core configuration
+
+* Tue May 03 2011 Jan Pazdziora 1.5.3-1
+- We restrict access to some files that were too open in the past (some of them
+  are not tracked by rpm).
+
+* Thu Apr 21 2011 Jan Pazdziora 1.5.2-1
+- Explicitly setting attributes of .../rhn-satellite-prep/etc/rhn.
+
+* Tue Apr 12 2011 Jan Pazdziora 1.5.1-1
 - CVE-2009-0788 / 491365 - no proxying is needed, just rewrite before ajp kicks in.
 
 * Mon Apr 04 2011 Miroslav Suchý 1.4.3-1