rpms/denyhosts/devel denyhosts-2.2-daemon-control.patch, NONE, 1.1 README.fedora, 1.3, 1.4 denyhosts.cron, 1.5, 1.6 denyhosts.spec, 1.28, 1.29 denyhosts-2.0-daemon-control.patch, 1.1, NONE

Jason Tibbitts (tibbs) fedora-extras-commits at redhat.com
Fri Mar 31 02:59:33 UTC 2006


Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9459

Modified Files:
	README.fedora denyhosts.cron denyhosts.spec 
Added Files:
	denyhosts-2.2-daemon-control.patch 
Removed Files:
	denyhosts-2.0-daemon-control.patch 
Log Message:
* Thu Mar 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-3
- Switch from $RPM_BUILD_ROOT to %{buildroot} (looks cleaner).
- Rename the main executable from denyhosts.py to denyhosts.


denyhosts-2.2-daemon-control.patch:

--- NEW FILE denyhosts-2.2-daemon-control.patch ---
--- daemon-control-dist.daemon-control	2006-02-07 21:37:51.000000000 -0600
+++ daemon-control-dist	2006-03-30 19:49:23.200435174 -0600
@@ -11,9 +11,9 @@
 #### Edit these to suit your configuration ####
 ###############################################
 
-DENYHOSTS_BIN   = "/usr/bin/denyhosts.py"
+DENYHOSTS_BIN   = "/usr/bin/denyhosts"
 DENYHOSTS_LOCK  = "/var/lock/subsys/denyhosts"
-DENYHOSTS_CFG   = "/usr/share/denyhosts/denyhosts.cfg"
+DENYHOSTS_CFG   = "/etc/denyhosts.conf"
 
 
 ###############################################
@@ -35,7 +35,7 @@
     print "Usage: %s {start [args...] | stop | restart [args...] | status | debug | condrestart [args...] }" % sys.argv[0]
     print
     print "For a list of valid 'args' refer to:"
-    print "$ denyhosts.py --help"
+    print "$ denyhosts --help"
     print
     sys.exit(0) 
 


Index: README.fedora
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/README.fedora,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README.fedora	20 Nov 2005 17:21:49 -0000	1.3
+++ README.fedora	31 Mar 2006 02:59:32 -0000	1.4
@@ -29,7 +29,7 @@
 If you want to incorporate an old logfile (in this example,
 /var/log/secure.1) , you can run
 
-  denyhosts.py -c /etc/denyhosts.conf /var/log/secure.1
+  denyhosts -c /etc/denyhosts.conf /var/log/secure.1
 
 DenyHosts can also handle logs compressed with gzip or bzip2.
 


Index: denyhosts.cron
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.cron,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- denyhosts.cron	16 Aug 2005 03:30:56 -0000	1.5
+++ denyhosts.cron	31 Mar 2006 02:59:32 -0000	1.6
@@ -4,9 +4,9 @@
 # "service" and set it to run at boot if necessary.)
 #
 # Run denyhosts occasionally; adjust the time span to your liking
-#*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf
+#*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts -c /etc/denyhosts.conf
 #
 # Automatically purge old entries early in the morning.  Note that you must
 # edit /etc/denyhosts.conf and set PURGE_DENY to something reasonable, as the
 # default value purge time is set very high.
-#0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf --purge
+#0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts -c /etc/denyhosts.conf --purge


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- denyhosts.spec	30 Mar 2006 16:36:17 -0000	1.28
+++ denyhosts.spec	31 Mar 2006 02:59:32 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        2.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -15,7 +15,7 @@
 Source6:	README.fedora
 Patch0:		denyhosts-2.2-config.patch
 Patch1:		denyhosts-2.1-setup.patch
-Patch2:		denyhosts-2.0-daemon-control.patch
+Patch2:		denyhosts-2.2-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -37,9 +37,9 @@
 
 %prep
 %setup -q -n DenyHosts-%{version}
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
+%patch0 -p0 -b .config
+%patch1 -p0 -b .setup
+%patch2 -p0 -b .daemon-control
 
 cp %{SOURCE6} .
 
@@ -53,40 +53,41 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root=%{buildroot}
 
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_initrddir}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-
-install -d -m 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts
-install -d $RPM_BUILD_ROOT%{_localstatedir}/log
-
-install -p -m 600 denyhosts.cfg-dist $RPM_BUILD_ROOT%{_sysconfdir}/denyhosts.conf
-install -p -m 755 daemon-control-dist $RPM_BUILD_ROOT%{_bindir}/denyhosts-control
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/denyhosts
-install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/denyhosts
-install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/allowed-hosts
-install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/denyhosts
-install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/denyhosts
+install -d %{buildroot}/%{_bindir}
+install -d %{buildroot}/%{_initrddir}
+install -d %{buildroot}/%{_sysconfdir}/cron.d
+install -d %{buildroot}/%{_sysconfdir}/logrotate.d
+install -d %{buildroot}/%{_sysconfdir}/sysconfig
+
+install -d -m 700 %{buildroot}/%{_localstatedir}/lib/denyhosts
+install -d %{buildroot}/%{_localstatedir}/log
+
+install -p -m 600 denyhosts.cfg-dist %{buildroot}/%{_sysconfdir}/denyhosts.conf
+install -p -m 755 daemon-control-dist %{buildroot}/%{_bindir}/denyhosts-control
+install -p -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/cron.d/denyhosts
+install -p -m 755 %{SOURCE2} %{buildroot}/%{_initrddir}/denyhosts
+install -p -m 644 %{SOURCE3} %{buildroot}/%{_localstatedir}/lib/denyhosts/allowed-hosts
+install -p -m 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sysconfig/denyhosts
+install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/denyhosts
 
-touch $RPM_BUILD_ROOT%{_localstatedir}/log/denyhosts
+touch %{buildroot}/%{_localstatedir}/log/denyhosts
 
 for i in allowed-warned-hosts hosts hosts-restricted hosts-root \
          hosts-valid offset suspicious-logins sync-hosts \
          users-hosts users-invalid users-valid; do
-  touch $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/$i
+  touch %{buildroot}/%{_localstatedir}/lib/denyhosts/$i
 done
 
-rm -f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc
-
+# RPM will byte-compile this for us if we leave the .py extension.  It
+# looks cleaner without it, so we'll rename it.
+mv %{buildroot}/%{_bindir}/denyhosts.py %{buildroot}/%{_bindir}/denyhosts
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 # Note that we do not automaticaly run --migrate, because we can't be
@@ -110,7 +111,8 @@
 %doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt
 %doc README.fedora README.txt setup.py README.contrib
 
-%{_bindir}/denyhosts.py
+%{_bindir}/denyhosts
+
 %{_bindir}/denyhosts-control
 %{_datadir}/denyhosts
 %{python_sitelib}/DenyHosts/*.py
@@ -142,6 +144,10 @@
 
 
 %changelog
+* Thu Mar 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-3
+- Switch from $RPM_BUILD_ROOT to %{buildroot} (looks cleaner).
+- Rename the main executable from denyhosts.py to denyhosts.
+
 * Wed Mar 29 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-2
 - Specfile cleanups.
 - Add hostname to default report subject.


--- denyhosts-2.0-daemon-control.patch DELETED ---




More information about the fedora-extras-commits mailing list