[denyhosts] Update to 2.10.

[Jason ティビツ]

commit 1c3bbadc5812442ecc6c87d64060a291f0a6a36e
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date:   Mon Mar 2 18:33:32 2015 -0600

    Update to 2.10.

 .gitignore                                         |  3 ++
 ...2.9-config.patch => denyhosts-2.10-config.patch | 27 +++------------
 denyhosts-2.9-foreground.patch                     | 11 -------
 denyhosts-2.9-hostname.patch                       | 20 ------------
 denyhosts-2.9-noetcdir.patch                       | 23 -------------
 denyhosts-2.9-noiptables.patch                     | 11 -------
 denyhosts-2.9-unlock.patch                         | 38 ----------------------
 denyhosts.spec                                     | 16 ++++-----
 sources                                            |  2 +-
 9 files changed, 17 insertions(+), 134 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a9a7d28..e5f6491 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 DenyHosts-2.6.tar.gz
+*.rpm
+*.log
 /v2.9.tar.gz
+/v2.10.tar.gz
diff --git a/denyhosts-2.9-config.patch b/denyhosts-2.10-config.patch
similarity index 70%
rename from denyhosts-2.9-config.patch
rename to denyhosts-2.10-config.patch
index 7952675..1a588d3 100644
--- a/denyhosts-2.9-config.patch
+++ b/denyhosts-2.10-config.patch
@@ -1,5 +1,6 @@
---- denyhosts.conf.orig	2015-02-10 16:00:26.953106516 -0600
-+++ denyhosts.conf	2015-02-10 16:00:56.423384410 -0600
+diff -u denyhosts-2.10-config/denyhosts.conf denyhosts-2.10/denyhosts.conf
+--- denyhosts.conf	2015-02-14 18:19:10.000000000 -0600
++++ denyhosts.conf	2015-02-26 16:48:06.944272953 -0600
 @@ -9,7 +9,7 @@
  # argument
  #
@@ -45,7 +46,7 @@
 -#LOCK_FILE = /var/lock/subsys/denyhosts
 +LOCK_FILE = /var/lock/subsys/denyhosts
  #
- # Debian
+ # Debian or Gentoo
 -LOCK_FILE = /var/run/denyhosts.pid
 +#LOCK_FILE = /var/run/denyhosts.pid
  #
@@ -60,25 +61,7 @@
  #
  ######################################################################
  
-@@ -476,8 +481,17 @@
- #
- #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
-+#
- ######################################################################
- 
-+
-+
- ######################################################################
- #
- # USERDEF_FAILED_ENTRY_REGEX: if set, this value should contain
-@@ -602,6 +616,8 @@
+@@ -602,6 +607,8 @@
  # To disable synchronization (the default), do nothing. 
  #
  # To enable synchronization, you must uncomment the following line:
diff --git a/denyhosts.spec b/denyhosts.spec
index ed88bce..ab46bc3 100644
--- a/denyhosts.spec
+++ b/denyhosts.spec
@@ -1,6 +1,6 @@
 Name:       denyhosts
-Version:    2.9
-Release:    4%{?dist}
+Version:    2.10
+Release:    1%{?dist}
 Summary:    A script to help thwart ssh server attacks
 
 Group:      Applications/System
@@ -13,13 +13,8 @@ Source3:    denyhosts-allowed-hosts
 Source5:    denyhosts.logrotate
 Source6:    README.fedora
 Source10:   denyhosts-restorecon.plugin
-Patch1:     denyhosts-2.9-config.patch
+Patch1:     denyhosts-2.10-config.patch
 Patch2:     denyhosts-2.9-commandlinesync.patch
-Patch3:     denyhosts-2.9-hostname.patch
-Patch4:     denyhosts-2.9-noiptables.patch
-Patch5:     denyhosts-2.9-noetcdir.patch
-Patch6:     denyhosts-2.9-unlock.patch
-Patch7:     denyhosts-2.9-foreground.patch
 BuildArch:  noarch
 
 BuildRequires:  python2-devel systemd-units
@@ -134,6 +129,11 @@ done
 %dir /var/lib/denyhosts
 
 %changelog
+* Thu Feb 26 2015 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.10-1
+- Update to 2.10.
+- Drop loads of upstreamed patches.
+- Use iptables by default.
+
 * Thu Feb 05 2015 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.9-4
 - Add patched implementing --unlock and allowing logging while running in the
   foreground.  Adapt the .service file to use these.
diff --git a/sources b/sources
index a3299ed..4d2cec6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e65615534ba1f5182368e02fc2364b3  v2.9.tar.gz
+43e818f5a3bf7f13d05461456a6a5788  v2.10.tar.gz