rpms/denyhosts/FC-3 denyhosts-2.2-config.patch, NONE, 1.1 denyhosts-2.2-daemon-control.patch, NONE, 1.1 denyhosts-2.3-setup.patch, NONE, 1.1 denyhosts.init, 1.2, 1.3 denyhosts.spec, 1.10, 1.11 sources, 1.10, 1.11 denyhosts-1.1.4-config.patch, 1.1, NONE denyhosts-2.0-daemon-control.patch, 1.1, NONE denyhosts-2.1-setup.patch, 1.1, NONE
Jason Tibbitts (tibbs)
fedora-extras-commits at redhat.com
Mon Jun 19 17:38:39 UTC 2006
- Previous message: rpms/denyhosts/FC-5 denyhosts-2.2-config.patch, NONE, 1.1 denyhosts-2.2-daemon-control.patch, NONE, 1.1 denyhosts-2.3-setup.patch, NONE, 1.1 denyhosts.init, 1.5, 1.6 denyhosts.spec, 1.27, 1.28 sources, 1.17, 1.18 denyhosts-1.1.4-config.patch, 1.1, NONE denyhosts-2.0-daemon-control.patch, 1.1, NONE denyhosts-2.1-setup.patch, 1.1, NONE
- Next message: krbVmodule README, 1.1, 1.2 krb5module.c, 1.20, 1.21 krb5module.h, 1.3, 1.4 python-krbV.spec.in, 1.1, 1.2
- 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-serv18757
Modified Files:
denyhosts.init denyhosts.spec sources
Added Files:
denyhosts-2.2-config.patch denyhosts-2.2-daemon-control.patch
denyhosts-2.3-setup.patch
Removed Files:
denyhosts-1.1.4-config.patch
denyhosts-2.0-daemon-control.patch denyhosts-2.1-setup.patch
Log Message:
* Tue Apr 4 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.3
- Update to version 2.3.
* Fri Mar 31 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-6
- More reversion of the name change.
* Fri Mar 31 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-5
- Revert renaming of the denyhosts.py script
* Fri Mar 31 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-4
- Fix permissions on plugins.
* 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.
* Tue Mar 14 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-1
- Update to 2.2.
denyhosts-2.2-config.patch:
--- NEW FILE denyhosts-2.2-config.patch ---
--- denyhosts.cfg-dist.orig 2006-03-13 15:15:24.000000000 -0600
+++ denyhosts.cfg-dist 2006-03-29 21:53:36.198459392 -0600
@@ -46,13 +46,18 @@
# 'y' = years
#
# never purge:
-PURGE_DENY =
+#PURGE_DENY =
#
# purge entries older than 1 week
#PURGE_DENY = 1w
#
# purge entries older than 5 days
#PURGE_DENY = 5d
+#
+# For the default Fedora Extras install, we want timestamping but no
+# expiration (at least by default) so this is deliberately set high.
+# Adjust to taste.
+PURGE_DENY = 4w
#######################################################################
@@ -126,7 +131,7 @@
# Note: it is recommended that you use an absolute pathname
# for this value (eg. /home/foo/denyhosts/data)
#
-WORK_DIR = /usr/share/denyhosts/data
+WORK_DIR = /var/lib/denyhosts
#
#######################################################################
@@ -189,7 +194,7 @@
# match your email address. If you do not want to receive these reports
# leave this field blank (or run with the --noemail option)
#
-ADMIN_EMAIL =
+ADMIN_EMAIL = root
#
#######################################################################
@@ -228,7 +233,7 @@
#
# SMTP_SUBJECT: you can specify the "Subject:" of messages sent
# by DenyHosts when it reports thwarted abuse attempts
-SMTP_SUBJECT = DenyHosts Report
+SMTP_SUBJECT = DenyHosts Report from $[HOSTNAME]
#
######################################################################
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-31 11:14:51.816095607 -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.3-setup.patch:
--- NEW FILE denyhosts-2.3-setup.patch ---
--- setup.py.setup 2006-04-04 18:52:16.000000000 -0500
+++ setup.py 2006-04-04 23:30:20.775631417 -0500
@@ -23,16 +23,10 @@
scripts=['denyhosts.py'],
package_dir={'DenyHosts': 'DenyHosts'},
packages=["DenyHosts"],
- data_files=[(libpath, glob("denyhosts.cfg-dist")),
- (libpath, glob("setup.py")),
- (libpath, glob("denyhosts.pyc")),
- (libpath, glob("denyhosts.pyo")),
- (libpath, glob("daemon-control-dist")),
- (libpath, glob("CHANGELOG.txt")),
- (libpath, glob("README.txt")),
+ data_files=[
(scriptspath, glob("scripts/*")),
(pluginspath, glob("plugins/*")),
- (libpath, glob("LICENSE.txt"))],
+ ],
license="GPL v2",
##extra_path='denyhosts',
long_description="""
Index: denyhosts.init
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- denyhosts.init 18 Aug 2005 00:21:43 -0000 1.2
+++ denyhosts.init 5 Apr 2006 04:55:18 -0000 1.3
@@ -15,6 +15,11 @@
# source function library
. /etc/rc.d/init.d/functions
+# Make sure HOSTNAME is in the environment so denyhosts can
+# use it in report subjects
+HOSTNAME=$(hostname)
+export HOSTNAME
+
CONTROL=/usr/bin/denyhosts-control
CRONLOCK=/var/lock/subsys/denyhosts.init
LOCKFILE=/var/lock/subsys/denyhosts
Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- denyhosts.spec 28 Feb 2006 16:06:25 -0000 1.10
+++ denyhosts.spec 5 Apr 2006 04:55:18 -0000 1.11
@@ -1,6 +1,6 @@
Name: denyhosts
-Version: 2.1
-release: 2.1%{?dist}
+Version: 2.3
+Release: 1%{?dist}
Summary: A script to help thwart ssh server attacks
Group: Applications/System
@@ -13,11 +13,11 @@
Source4: denyhosts.sysconfig
Source5: denyhosts.logrotate
Source6: README.fedora
-Patch0: denyhosts-1.1.4-config.patch
-Patch1: denyhosts-2.1-setup.patch
-Patch2: denyhosts-2.0-daemon-control.patch
+Patch0: denyhosts-2.2-config.patch
+Patch1: denyhosts-2.3-setup.patch
+Patch2: denyhosts-2.2-daemon-control.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArchitectures: noarch
+BuildArch: noarch
BuildRequires: python-devel
Requires: openssh-server
@@ -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} .
@@ -47,46 +47,52 @@
# can include it as documentation.
mv plugins/README.contrib .
+# And the permissions are off as well
+chmod +x plugins/*
+
%build
%{__python} setup.py build
%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
+# FC-4 and earlier won't create these automatically; create them here
+# so that the %exclude below doesn't fail
+touch %{buildroot}/%{_bindir}/denyhosts.pyc
+touch %{buildroot}/%{_bindir}/denyhosts.pyo
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
# Note that we do not automaticaly run --migrate, because we can't be
@@ -111,6 +117,8 @@
%doc README.fedora README.txt setup.py README.contrib
%{_bindir}/denyhosts.py
+%exclude %{_bindir}/denyhosts.py[co]
+
%{_bindir}/denyhosts-control
%{_datadir}/denyhosts
%{python_sitelib}/DenyHosts/*.py
@@ -142,8 +150,28 @@
%changelog
-* Tue Feb 28 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.1-2.1
-- Flubbed the commit; bumping for rebuild.
+* Tue Apr 4 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.3
+- Update to version 2.3.
+
+* Fri Mar 31 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-6
+- More reversion of the name change.
+
+* Fri Mar 31 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-5
+- Revert renaming of the denyhosts.py script
+
+* Fri Mar 31 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-4
+- Fix permissions on plugins.
+
+* 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.
+
+* Tue Mar 14 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-1
+- Update to 2.2.
* Tue Feb 28 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.1-2
- Add some additional ghosted files.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 28 Feb 2006 15:58:22 -0000 1.10
+++ sources 5 Apr 2006 04:55:18 -0000 1.11
@@ -1 +1 @@
-1c40bda86884901f125bfbce3d8c35cb DenyHosts-2.1.tar.gz
+a175dec03a67aff65c5471105d5a2786 DenyHosts-2.3.tar.gz
--- denyhosts-1.1.4-config.patch DELETED ---
--- denyhosts-2.0-daemon-control.patch DELETED ---
--- denyhosts-2.1-setup.patch DELETED ---
- Previous message: rpms/denyhosts/FC-5 denyhosts-2.2-config.patch, NONE, 1.1 denyhosts-2.2-daemon-control.patch, NONE, 1.1 denyhosts-2.3-setup.patch, NONE, 1.1 denyhosts.init, 1.5, 1.6 denyhosts.spec, 1.27, 1.28 sources, 1.17, 1.18 denyhosts-1.1.4-config.patch, 1.1, NONE denyhosts-2.0-daemon-control.patch, 1.1, NONE denyhosts-2.1-setup.patch, 1.1, NONE
- Next message: krbVmodule README, 1.1, 1.2 krb5module.c, 1.20, 1.21 krb5module.h, 1.3, 1.4 python-krbV.spec.in, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list