rpms/denyhosts/devel denyhosts-2.6-selinux.patch, NONE, 1.1 denyhosts.spec, 1.56, 1.57

[Jason ティビツ]

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14385

Modified Files:
	denyhosts.spec 
Added Files:
	denyhosts-2.6-selinux.patch 
Log Message:
* Wed Mar 04 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-18
- Add patch to keep proper file context on the hosts.deny file.


denyhosts-2.6-selinux.patch:

--- NEW FILE denyhosts-2.6-selinux.patch ---
--- DenyHosts-2.6/DenyHosts/denyfileutil.py.orig	2009-03-04 19:21:28.000000000 -0600
+++ DenyHosts-2.6/DenyHosts/denyfileutil.py	2009-03-04 19:23:45.000000000 -0600
@@ -8,6 +8,7 @@
 from util import parse_host
 import plugin
 from purgecounter import PurgeCounter
+import selinux
 
 debug = logging.getLogger("denyfileutil").debug
 info = logging.getLogger("denyfileutil").info
@@ -166,6 +167,10 @@
         try:
             fp = open(self.temp_file, "w")
             os.chmod(self.temp_file, 0644)
+            # Fedora patch - create the temp file with the proper context, so
+            # we don't hose the context on the hosts.deny file.
+            if selinux.is_seliux_enabled():
+                selinux.restorecon(self.temp_file)
             offset = 0
             num_lines = len(data)
             while offset < num_lines:


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- denyhosts.spec	24 Feb 2009 11:26:47 -0000	1.56
+++ denyhosts.spec	5 Mar 2009 01:36:18 -0000	1.57
@@ -1,6 +1,6 @@
 Name:       denyhosts
 Version:    2.6
-Release:    17%{?dist}
+Release:    18%{?dist}
 Summary:    A script to help thwart ssh server attacks
 
 Group:      Applications/System
@@ -19,13 +19,15 @@
 Patch2:     denyhosts-2.6-daemon-control.patch
 Patch3:     denyhosts-2.6-defconffile.patch
 Patch4:     denyhosts-2.6-commandlinesync.patch
+Patch5:     denyhosts-2.6-selinux.patch
 # Patch10 is a security fix
 Patch10:    denyhosts-2.6-regex.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
 BuildRequires:  python-devel
-Requires:       openssh-server
+# libselinux-python is necessary due to Patch5.
+Requires:       openssh-server libselinux-python
 
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
@@ -163,6 +165,9 @@
 
 
 %changelog
+* Wed Mar 04 2009 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-18
+- Add patch to keep proper file context on the hosts.deny file.
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild