rpms/denyhosts/devel denyhosts-restorecon.plugin, NONE, 1.1 denyhosts-2.6-config.patch, 1.2, 1.3 denyhosts.spec, 1.50, 1.51

[Jason ティビツ]

Author: tibbs

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

Modified Files:
	denyhosts-2.6-config.patch denyhosts.spec 
Added Files:
	denyhosts-restorecon.plugin 
Log Message:
* Mon Sep 22 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-12
- Add plugin to restore file contexts after purging.



--- NEW FILE denyhosts-restorecon.plugin ---
#!/bin/sh
#
# Simple plugin to restore file contexts after the purge operation.
# Jonathan Stanton <jonathan at spreadconcepts.com>
#
/sbin/restorecon /etc/hosts.deny
/sbin/restorecon /etc/hosts.deny.purge.bak


denyhosts-2.6-config.patch:

Index: denyhosts-2.6-config.patch
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts-2.6-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- denyhosts-2.6-config.patch	28 Aug 2008 16:06:38 -0000	1.2
+++ denyhosts-2.6-config.patch	22 Sep 2008 18:26:46 -0000	1.3
@@ -1,7 +1,6 @@
-diff -up ./denyhosts.cfg-dist.orig ./denyhosts.cfg-dist
---- ./denyhosts.cfg-dist.orig	2006-08-20 09:09:57.000000000 -0500
-+++ ./denyhosts.cfg-dist	2008-08-28 11:03:16.000000000 -0500
-@@ -55,13 +55,18 @@ HOSTS_DENY = /etc/hosts.deny
+--- denyhosts.cfg-dist.config	2006-08-20 09:09:57.000000000 -0500
++++ denyhosts.cfg-dist	2008-09-22 10:49:14.000000000 -0500
+@@ -55,13 +55,18 @@
  #            'y' = years
  #
  # never purge:
@@ -21,7 +20,7 @@
  #######################################################################
  
  #######################################################################
-@@ -150,7 +155,7 @@ DENY_THRESHOLD_RESTRICTED = 1
+@@ -150,7 +155,7 @@
  # Note: it is recommended that you use an absolute pathname
  # for this value (eg. /home/foo/denyhosts/data)
  #
@@ -30,7 +29,7 @@
  #
  #######################################################################
  
-@@ -216,7 +221,7 @@ LOCK_FILE = /var/lock/subsys/denyhosts
+@@ -216,7 +221,7 @@
  # Multiple email addresses can be delimited by a comma, eg:
  # ADMIN_EMAIL = foo at bar.com, bar at foo.com, etc at foobar.com
  #
@@ -39,7 +38,7 @@
  #
  #######################################################################
  
-@@ -255,7 +260,7 @@ SMTP_FROM = DenyHosts <nobody at localhost>
+@@ -255,7 +260,7 @@
  #
  # SMTP_SUBJECT: you can specify the "Subject:" of messages sent
  # by DenyHosts when it reports thwarted abuse attempts
@@ -48,3 +47,17 @@
  #
  ######################################################################
  
+@@ -402,6 +407,13 @@
+ #
+ #PLUGIN_PURGE=/usr/bin/true
+ #
++# The following plugin will restore the file contexts on /etc/hosts.deny after
++# denyhosts purges old entries.  This prevents breakage when selinux is set to
++# enforcing mode, but still has a small window where the context is set
++# incorrectly.  The correct place to fix this is in the selinux policy.
++#
++#PLUGIN_PURGE=/usr/share/denyhosts/plugins/restorecon.sh
++#
+ ######################################################################
+ 
+ ######################################################################


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- denyhosts.spec	28 Aug 2008 16:06:38 -0000	1.50
+++ denyhosts.spec	22 Sep 2008 18:26:47 -0000	1.51
@@ -13,6 +13,7 @@
 Source4:    denyhosts.sysconfig
 Source5:    denyhosts.logrotate
 Source6:    README.fedora
+Source10:   denyhosts-restorecon.plugin
 Patch0:     denyhosts-2.6-config.patch
 Patch1:     denyhosts-2.4-setup.patch
 Patch2:     denyhosts-2.6-daemon-control.patch
@@ -87,6 +88,8 @@
 install -p -m 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sysconfig/denyhosts
 install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/denyhosts
 
+install -p -m 755 %{SOURCE10} %{buildroot}/%{_datadir}/denyhosts/plugins/restorecon.sh
+
 touch %{buildroot}/%{_localstatedir}/log/denyhosts
 
 for i in allowed-warned-hosts hosts hosts-restricted hosts-root \
@@ -158,6 +161,9 @@
 
 
 %changelog
+* Mon Sep 22 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-12
+- Add plugin to restore file contexts after purging.
+
 * Thu Aug 28 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-12
 - Fix up patches to apply with --fuzz=0.