rpms/denyhosts/FC-3 denyhosts-2.0-daemon-control.patch, NONE, 1.1 denyhosts-2.0-setup.patch, NONE, 1.1 denyhosts.spec, 1.7, 1.8 sources, 1.8, 1.9 denyhosts-0.9.8-setup.patch, 1.1, NONE denyhosts-1.0.0-daemon-control.patch, 1.1, NONE
Jason Tibbitts (tibbs)
fedora-extras-commits at redhat.com
Fri Feb 10 15:21:54 UTC 2006
- Previous message: rpms/denyhosts/FC-4 denyhosts-2.0-daemon-control.patch, NONE, 1.1 denyhosts-2.0-setup.patch, NONE, 1.1 denyhosts.spec, 1.7, 1.8 sources, 1.8, 1.9 denyhosts-0.9.8-setup.patch, 1.1, NONE denyhosts-1.0.0-daemon-control.patch, 1.1, NONE
- Next message: rpms/azureus/devel azureus-no-restart.patch, NONE, 1.1 azureus-no-update-manager-AzureusCoreImpl.patch, NONE, 1.1 azureus-no-update-manager-CorePatchChecker.patch, NONE, 1.1 azureus-no-update-manager-CoreUpdateChecker.patch, NONE, 1.1 azureus-no-update-manager-MainWindow.patch, NONE, 1.1 azureus-no-update-manager-PluginInstallerImpl-2.patch, NONE, 1.1 azureus-no-update-manager-PluginInstallerImpl.patch, NONE, 1.1 azureus-no-update-manager-PluginUpdatePlugin.patch, NONE, 1.1 azureus-no-update-manager-SWTUpdateChecker.patch, NONE, 1.1 azureus-no-update-manager-TableView.patch, NONE, 1.1 azureus-no-update-manager-UpdateMonitor.patch, NONE, 1.1 azureus-no-updates-PluginInitializer.patch, NONE, 1.1 azureus-no-updates-PluginInterfaceImpl.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 azureus.script, 1.6, 1.7 azureus.spec, 1.16, 1.17 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tibbs
Update of /cvs/extras/rpms/denyhosts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4141
Modified Files:
denyhosts.spec sources
Added Files:
denyhosts-2.0-daemon-control.patch denyhosts-2.0-setup.patch
Removed Files:
denyhosts-0.9.8-setup.patch
denyhosts-1.0.0-daemon-control.patch
Log Message:
* Sat Feb 4 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.0-1
- Update to 2.0.
denyhosts-2.0-daemon-control.patch:
--- NEW FILE denyhosts-2.0-daemon-control.patch ---
--- daemon-control-dist.orig 2006-02-03 22:13:05.000000000 -0600
+++ daemon-control-dist 2006-02-04 15:14:02.758336216 -0600
@@ -13,7 +13,7 @@
DENYHOSTS_BIN = "/usr/bin/denyhosts.py"
DENYHOSTS_LOCK = "/var/lock/subsys/denyhosts"
-DENYHOSTS_CFG = "/usr/share/denyhosts/denyhosts.cfg"
+DENYHOSTS_CFG = "/etc/denyhosts.conf"
###############################################
denyhosts-2.0-setup.patch:
--- NEW FILE denyhosts-2.0-setup.patch ---
--- setup.py.orig 2006-01-16 18:02:18.000000000 -0600
+++ setup.py 2006-02-04 15:10:37.104646027 -0600
@@ -22,13 +22,13 @@
package_dir={'DenyHosts': 'DenyHosts'},
packages=["DenyHosts"],
##py_modules=["denyhosts_version"],
- data_files=[(libpath, glob("denyhosts.cfg-dist")),
- (libpath, glob("denyhosts-daemon-initscript")),
- (libpath, glob("setup.py")),
- (libpath, glob("daemon-control-dist")),
- (libpath, glob("CHANGELOG.txt")),
- (libpath, glob("README.txt")),
- (libpath, glob("LICENSE.txt"))],
+# data_files=[(libpath, glob("denyhosts.cfg-dist")),
+# (libpath, glob("denyhosts-daemon-initscript")),
+# (libpath, glob("setup.py")),
+# (libpath, glob("daemon-control-dist")),
+# (libpath, glob("CHANGELOG.txt")),
+# (libpath, glob("README.txt")),
+# (libpath, glob("LICENSE.txt"))],
license="GPL v2",
##extra_path='denyhosts',
long_description="""
Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- denyhosts.spec 14 Jan 2006 17:47:12 -0000 1.7
+++ denyhosts.spec 10 Feb 2006 15:21:54 -0000 1.8
@@ -1,6 +1,6 @@
Name: denyhosts
-Version: 1.1.4
-release: 2%{?dist}
+Version: 2.0
+release: 1%{?dist}
Summary: A script to help thwart ssh server attacks
Group: Applications/System
@@ -14,14 +14,17 @@
Source5: denyhosts.logrotate
Source6: README.fedora
Patch0: denyhosts-1.1.4-config.patch
-Patch1: denyhosts-0.9.8-setup.patch
-Patch2: denyhosts-1.0.0-daemon-control.patch
+Patch1: denyhosts-2.0-setup.patch
+Patch2: denyhosts-2.0-daemon-control.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArchitectures: noarch
BuildRequires: python-devel
Requires: openssh-server
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+
%description
DenyHosts is a Python script that analyzes the sshd server log
messages to determine which hosts are attempting to hack into your
@@ -41,15 +44,14 @@
%build
-python ./setup.py build
+%{__python} setup.py build
%install
rm -rf $RPM_BUILD_ROOT
-python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files
+%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
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
@@ -73,6 +75,8 @@
touch $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/$i
done
+rm -f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -94,10 +98,17 @@
exit 0
-%files -f %{name}.files
+%files
%defattr(-,root,root,-)
%doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt
%doc README.fedora README.txt setup.py
+
+%{_bindir}/denyhosts.py
+%{_bindir}/denyhosts-control
+%{python_sitelib}/DenyHosts/*.py
+%{python_sitelib}/DenyHosts/*.pyc
+%ghost %{python_sitelib}/DenyHosts/*.pyo
+
%config(noreplace) %{_sysconfdir}/denyhosts.conf
%config(noreplace) %{_sysconfdir}/cron.d/denyhosts
%config(noreplace) %{_sysconfdir}/logrotate.d/denyhosts
@@ -116,9 +127,22 @@
%dir %{_localstatedir}/lib/denyhosts
%{_initrddir}/denyhosts
-%{_bindir}/denyhosts-control
+
+
%changelog
+* Sat Feb 4 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.0-1
+- Update to 2.0.
+
+* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-5
+- Redo installation to match current Python packaging guidelines.
+
+* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-4
+- Simplify "[ -f ... ] && rm" to "rm -f".
+
+* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-3
+- Delete stray .pyo and .pyc files that appear for no reason.
+
* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
- Clean up %post script; just call condrestart and don't bother with
the call to --upgrade099.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 14 Jan 2006 17:47:12 -0000 1.8
+++ sources 10 Feb 2006 15:21:54 -0000 1.9
@@ -1 +1 @@
-f4b9beb55cc36ab44fb7fe0c96210734 DenyHosts-1.1.4.tar.gz
+9aa861692f52f6a0cdd3834122f53e04 DenyHosts-2.0.tar.gz
--- denyhosts-0.9.8-setup.patch DELETED ---
--- denyhosts-1.0.0-daemon-control.patch DELETED ---
- Previous message: rpms/denyhosts/FC-4 denyhosts-2.0-daemon-control.patch, NONE, 1.1 denyhosts-2.0-setup.patch, NONE, 1.1 denyhosts.spec, 1.7, 1.8 sources, 1.8, 1.9 denyhosts-0.9.8-setup.patch, 1.1, NONE denyhosts-1.0.0-daemon-control.patch, 1.1, NONE
- Next message: rpms/azureus/devel azureus-no-restart.patch, NONE, 1.1 azureus-no-update-manager-AzureusCoreImpl.patch, NONE, 1.1 azureus-no-update-manager-CorePatchChecker.patch, NONE, 1.1 azureus-no-update-manager-CoreUpdateChecker.patch, NONE, 1.1 azureus-no-update-manager-MainWindow.patch, NONE, 1.1 azureus-no-update-manager-PluginInstallerImpl-2.patch, NONE, 1.1 azureus-no-update-manager-PluginInstallerImpl.patch, NONE, 1.1 azureus-no-update-manager-PluginUpdatePlugin.patch, NONE, 1.1 azureus-no-update-manager-SWTUpdateChecker.patch, NONE, 1.1 azureus-no-update-manager-TableView.patch, NONE, 1.1 azureus-no-update-manager-UpdateMonitor.patch, NONE, 1.1 azureus-no-updates-PluginInitializer.patch, NONE, 1.1 azureus-no-updates-PluginInterfaceImpl.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 azureus.script, 1.6, 1.7 azureus.spec, 1.16, 1.17 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list