provide logrotate.d entry that works with systemd (bug #508524)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 121 insertions, 9 deletions

diff --git a/app-admin/denyhosts/ChangeLog b/app-admin/denyhosts/ChangeLog
index 963ddec8d36f..40dd2dcc0067 100644
--- a/app-admin/denyhosts/ChangeLog
+++ b/app-admin/denyhosts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/denyhosts
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/denyhosts/ChangeLog,v 1.78 2014/01/09 01:11:32 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/denyhosts/ChangeLog,v 1.79 2014/05/14 23:22:00 ottxor Exp $
+
+*denyhosts-2.6-r10 (14 May 2014)
+
+  14 May 2014; Christoph Junghans <ottxor@gentoo.org> +denyhosts-2.6-r10.ebuild,
+  +files/denyhosts.logrotate-r2:
+  provide logrotate.d entry that works with systemd (bug #508524)
 
   09 Jan 2014; Christoph Junghans <ottxor@gentoo.org> -files/denyhosts.init:
   clean up unneeded files
diff --git a/app-admin/denyhosts/Manifest b/app-admin/denyhosts/Manifest
index bf8a44da6848..5d59c2034c6a 100644
--- a/app-admin/denyhosts/Manifest
+++ b/app-admin/denyhosts/Manifest
@@ -12,19 +12,21 @@ AUX denyhosts-2.6-plugin_deny.patch 1025 SHA256 786a6001f1660193bbe7dc0e8df555db
 AUX denyhosts-2.6-single_config_switch.patch 853 SHA256 be8025ce86c12ace5d8334c5dbac917c7b9f27f15c679d122826a2ad2e79423f SHA512 90daef95d8ff71feed9e14b590ad9178f5455f56101133534f7c024c612ada77510b9374492bd87f9a54cdcab4107579a4fdf2a77abb491dfc736dbe8c5357b5 WHIRLPOOL ee7130951df2180af955ffac7abd7062fed1d11985f59145f880d2b5f7d288d9ecc91b3d9fb4f03f4e8fd9463d16ac1d711de63d772938e58630580d9c508265
 AUX denyhosts.init-r2 763 SHA256 17b51b08a1c070be80c0b811d5e21c4fef70e6532130a731f7580d53b43e0695 SHA512 0ce747ea2bb45d8fa626a0d9055339e92f6f1e30e1f3ed8075db7c9091037999ebaeca2179e3771b3ed58e739c06050dc282eb417c573f45fc641779b86ea2c0 WHIRLPOOL 3a59518443f92d0b2f36cafae8cb892c10441a39b68573e7e0675afe70cee566605dadb6fd19db10e1c6af8f82b0eb83864dcfd346e60ea79292a5fe119880f0
 AUX denyhosts.logrotate 194 SHA256 fa67dda8e6784fcfdc7a9fb93d1d16670c1b25888e3f2d6b98e33052616d646f SHA512 a53304bd655dcce5e7d69486684457d46eeda40aa92291de2ecf8ab15ab7e23ed7b7e0a66974c60c4fc9621fdea8260eabdf267eb8f38180eeb1830cbdc883b2 WHIRLPOOL 705673121f03681d1f787bdb69d176171c575b917201d4d98bbe66754fedc13659923c7da6878bd985537f580d33119000fd5018f298acb915d70876b513e065
+AUX denyhosts.logrotate-r2 272 SHA256 b2d048354fb00d317e554a93a370ec7e3f276061a350a452b8a3f8c903973772 SHA512 43d379b5909937913ca78a11581f577a5d9fe52bb16627441311cdac7281f59a1f05fdb308f722f9c376d2e446111021d225b2033c5fe5f3399ab88771be2569 WHIRLPOOL 041811f4bc12dabeae155d0330a0b02df12887d3fcd98b744c42afb7f8ac274715a68472348d2166eb454fbf9787fb271759430a970b1ce82a3ca42a0500cf43
 AUX denyhosts.service 265 SHA256 706911153d24785d577d376c772a3c4b7682dfd968d2fdc737872c27e5e574f8 SHA512 601b10e999dd2e16cec57035d025a883df77df272c6a72b4d39f2c118d983f308984aa9edd296f334e0e5062e8ca5ea21ba25ef58b606c9c7e4c09ed7b3ad4be WHIRLPOOL cb62ab529918d801567e5f3b7f6eb3d52709d54bd89747d0b1739bc01a87cbbdd066aa56ff8db3ca7e857d217f2672cc2a267d6ee78e314d821287fea3633806
 DIST DenyHosts-2.6.tar.gz 42667 SHA256 5190ead13a7238e3ccf328cb3b71b16716e1c73939909a4f3fa6904ba58ddf7d SHA512 331144348d4930e2fa7a057a779bb7504dfa8ec348660e1a73fcd6a9195258408abb7c77de2bcc96724dfc42afbee918320eebfbc3b380d6ac4ff2d275e89600 WHIRLPOOL a414cd3013508876e63253ffc9c46d12179cca76249ee00cbf66c04c7b88a8578c79bea4d098149081aa83dca115947b10214f3aa8b82bdd78d764032849e27a
+EBUILD denyhosts-2.6-r10.ebuild 2446 SHA256 51c3d43f06227021129c96fcdde563ce3917659dea90ce4256ac03ba3832853e SHA512 18fd91df7237d659759b7a610541fc6fc67a54047cc6df8eecf28a874d53dd139522798cb3b9cb7794be76f0c61f2b37cf6c35b980ac41ea33b149680dcccf8d WHIRLPOOL b5e9c6094d72c9087daf56b0b381a39223e4479934580b3001a1f3652681f0afa9cb5b12d49a860e7c4091ca371f36c47fa6ba08981785da0a59e2018a8f4789
 EBUILD denyhosts-2.6-r9.ebuild 2432 SHA256 2983934acff359fc5e6a053cb3eca670c234b39e416f47fe600274d1332e719f SHA512 18cfba550edea5cbfb2fd4e488ba2d469cb4749ad8e4628c57905d1917628352c2147639bf9e0c749d7d7cb8b21d290e84ee11ac36e25e4b6caa279a4fcc5ef5 WHIRLPOOL 71fcf6576024655a687e3d057eba9be63b1fe770eb563cdd0690d819bbc97f1607a0f975d41aa69f84b515037ab3d61cb0515ed07be3b3c19176d865a7857083
-MISC ChangeLog 11050 SHA256 9dad703a0658cc9f37ac446459eba73ade2f1ccaa172a07b14ff7db293b95581 SHA512 c1e81a9f18f56fa1ebe0030132bbe4938e823befce2281a7dd17a9e151e531a6db98dec325ffb24c70048330622705503ea0b01601492ee5199d2b651e1d8aa4 WHIRLPOOL 82de4510622b210c5f16d91d479f81c691f88f3f75515dcd9131e9d2dfe11e99d08028792ed4e548afb634e7371903ae8f1fc99161c8bb5364eeae7bf218ea7c
+MISC ChangeLog 11265 SHA256 3d3ad9e383841f60da72600ada937678ee7cfeb95dfda9c794d708805beaaf54 SHA512 2775ed41fb042017781b530ed69ea95cca58f55b9dff44acbb301f2977fd6b841d1d541c2e1d3a10b1e5f71001d99438fc3824bfa4454449b4f0ca24a2baf6a3 WHIRLPOOL b1670b98038c804626d88519041d9eb1cb6953569e2b74e892a90ae81e0259cdc5c700fb8046f17f7013346fb490298ad58e23e50cf9cd83d8ac2feca1edbea8
 MISC metadata.xml 344 SHA256 f981a719862f1a42b76aac13285d5ee3676d40e1147685da675d332bade9513d SHA512 70a09d270dde9ae72a39baef85c6b56ffd4f6063b6987aec3d7b31ccd4f618f1d4f1f6cc0c4dc48677ed7647e89627ea3a14ef61fa1d163daabe8efed3ea007a WHIRLPOOL 1b668923c96d3b7d3eec231315bf9453e87334e107cdc7a9c37d0a3ba43b2e9cdbef9b5d0a19176af756089c8da3e0808a390dbd4cd6aa3d537ee02eb5988a01
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSzfdKAAoJEOeBhlrCAAWGgF0IAIjzIxPtr9sSM94TmA4k4t5e
-v5zUMlG42ZUP3J+WWxawgLlgIZlB0lAsvCeOdBp0lb6ANAG4q3zSedfyowjneLF7
-X5OMNoJ2hDbyN4Ofz8EhxmynqWl7N11tOGXUZOrpe5E6UjaW+NOMBkXqYM2Gn+Hl
-78BKSIYfGI8q+mlWmQAXYbCMp3Xk+MISCAsvitlQHvPM0lF1jBgCgAPO6KIYcZwN
-O0BJQnRfyq/yaQ9QNggCxDceCPPFeq0v3iaYfp/Lt/wDHw3pnkEOhAa6DNSKgfWX
-82bTLprJMlRJ3E/dGo6g6PdeT8/OLzthmhwOSby4wk4fsFFsrm6gmXaZZJIRpGo=
-=hO8b
+iQEcBAEBCAAGBQJTc/qeAAoJEOeBhlrCAAWGoyEH/2ithflXBXD8fa8fQCWSlpIC
+quiMtwZucpMFvMnjSaRiIDe+I0e0tfrcHBASQa0WGzfM05RvxktuEtE4KBkjTpzG
+Z8eo0y0qqsxfoIfMdcFU6pX/U5I5S/ew34ZfibOOl/tEboUS8ksjzFY4fZ+sG3+X
+GJfMP0ifMl7SzcimtcXen+iYDtlzQhhQqKvmwMJa2xdKP4/B9mIE2tO0owXmwnkn
+IyYDtJLtx+M97ex3uD6ng30XDpwObCLPHH7GdJJdUlNmwM0h9nyN4GgBhSo0zM7x
+x8apK0hCCpM1+v5cmhdMk8MotAW9HxAy/4jcGMu0LXq0Ys8EvF5GuHeT8xfjq5U=
+=MKa+
 -----END PGP SIGNATURE-----
diff --git a/app-admin/denyhosts/denyhosts-2.6-r10.ebuild b/app-admin/denyhosts/denyhosts-2.6-r10.ebuild
new file mode 100644
index 000000000000..0cd575cef485
--- /dev/null
+++ b/app-admin/denyhosts/denyhosts-2.6-r10.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/denyhosts/denyhosts-2.6-r10.ebuild,v 1.1 2014/05/14 23:22:00 ottxor Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit distutils-r1 eutils readme.gentoo systemd
+
+MY_PN="DenyHosts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
+HOMEPAGE="http://www.denyhosts.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PYTHON_MODNAME="${MY_PN}"
+
+S="${WORKDIR}/${MY_P}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+You can configure DenyHosts to run as a daemon by running:
+# rc-update add denyhosts default
+or:
+# systemctl enable denyhosts.service
+(if you use systemd)
+
+To run DenyHosts as a cronjob instead of a daemon add the following
+to /etc/crontab
+# run DenyHosts every 10 minutes
+*/10  *  * * *    root    /usr/bin/denyhosts.py -c /etc/denyhosts.conf
+
+More information can be found at http://denyhosts.sourceforge.net/faq.html"
+
+src_prepare() {
+	# changes default file installations
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-log-injection-regex.patch
+
+	# Multiple patches from Fedora and Debian
+	epatch "${FILESDIR}"/${P}-daemon-control.patch
+	epatch "${FILESDIR}"/${P}-defconffile.patch
+	epatch "${FILESDIR}"/${P}-foreground_mode.patch
+	epatch "${FILESDIR}"/${P}-hostname.patch
+	epatch "${FILESDIR}"/${P}-plugin_deny.patch
+	epatch "${FILESDIR}"/${P}-single_config_switch.patch
+
+	epatch "${FILESDIR}"/${P}-cve-2013-6890.patch
+
+	sed -i -e 's:DENY_THRESHOLD_VALID = 10:DENY_THRESHOLD_VALID = 5:' \
+		denyhosts.cfg-dist || die "sed failed"
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	dodoc CHANGELOG.txt README.txt PKG-INFO
+	distutils-r1_src_install
+
+	insinto /etc
+	insopts -m0640
+	newins denyhosts.cfg-dist denyhosts.conf
+
+	dodir /etc/logrotate.d
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
+
+	newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	# build system installs docs that we installed above
+	rm -f "${D}"/usr/share/denyhosts/*.txt
+
+	keepdir /var/lib/denyhosts
+}
+
+pkg_postinst() {
+	if [[ ! -f "${ROOT}etc/hosts.deny" ]]; then
+		touch "${ROOT}etc/hosts.deny"
+	fi
+
+	readme.gentoo_print_elog
+}
diff --git a/app-admin/denyhosts/files/denyhosts.logrotate-r2 b/app-admin/denyhosts/files/denyhosts.logrotate-r2
new file mode 100644
index 000000000000..582e72f7a365
--- /dev/null
+++ b/app-admin/denyhosts/files/denyhosts.logrotate-r2
@@ -0,0 +1,10 @@
+/var/log/denyhosts {
+	missingok
+	notifempty
+	create 0640 root root
+	sharedscripts
+	postrotate
+		test -e /run/openrc/softlevel && /etc/init.d/denyhosts restart 1>/dev/null || true
+		test -e /run/systemd/system && systemctl restart denyhosts >/dev/null || true
+	endscript
+}