Version bump, also fixes 522842

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

4 files changed, 25 insertions, 68 deletions

diff --git a/app-forensics/lynis/ChangeLog b/app-forensics/lynis/ChangeLog
index aa2199bc2834..8234e449b1b1 100644
--- a/app-forensics/lynis/ChangeLog
+++ b/app-forensics/lynis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-forensics/lynis
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/ChangeLog,v 1.52 2014/08/11 20:39:36 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/ChangeLog,v 1.53 2014/09/30 18:55:39 idl0r Exp $
+
+*lynis-1.6.2 (30 Sep 2014)
+
+  30 Sep 2014; Christian Ruppert <idl0r@gentoo.org> -lynis-1.5.6.ebuild,
+  -lynis-1.5.9.ebuild, +lynis-1.6.2.ebuild:
+  Version bump, also fixes 522842
 
 *lynis-1.5.9 (11 Aug 2014)
 
diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest
index 1dca01c75ad8..40f83a7405f9 100644
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@@ -3,21 +3,19 @@ Hash: SHA256
 
 AUX lynis.cron-new 70 SHA256 852f547d4c2aeb5d592b627f5456868eff97c26aede8fbfd7c996f9be5feb394 SHA512 f90592c9adb6617b367c22912ceb984cca9a64c1bfa092efb50f5f9df48b07f61c7e990b969f3871161d92ff28bdb131175d46b334947980b7ead49dd6ff70c7 WHIRLPOOL e7f9b0d32083b91b6f93b53edb39145bbb1e4302facffc5725e68dc1ed5e00cee2a26297d80ea6eefd0f6a237d9b2c9965d2dbfb062a8dd71e9f9a5dc512b234
 DIST lynis-1.3.0.tar.gz 119797 SHA256 fe265965eb1ce8fac352e0bddea1d5ec6508c319bf88a5f63c2edecf2af6de54 SHA512 a2cf40fbc245e9ed89740026374f3b61110cc1e0282899284699a2271cb4996f30d0a91562d3e2eaf5eb165ab89d0860127ceeb5767aec1d5538b879657a76a8 WHIRLPOOL c19aaaf2f9ccd8141a86b1eeecf129ab83006b50ed428eb1801b58811b441f3c5cfea37d1333cf58fd372b3f40026735bdc2e44ace3de399a27e2e0dd8300fa3
-DIST lynis-1.5.6.tar.gz 150664 SHA256 e74e97acc0d02ba2701034c10231edd9ae527398c25e6f1c669109f614c933ca SHA512 11eeb91d8179d41b27e69efe9c54f9d1e56fa921004af2d60fbaac30764d2aa097de2c402511c5d1e13e9785bdc729891ca98d1f9dcfc7113be8d30d1521454a WHIRLPOOL d50d0989534126f2792ecec97b5911fb5430c878ebae858433ce99f82a86eb348d9be5c83b426bad1083089d9633b15f8d85ee867073038511191a80312e4a2f
-DIST lynis-1.5.9.tar.gz 154084 SHA256 df2e9477f2926984fc559873ae7cbcf63d051af14d6cf3d2cf202daa8d859fbc SHA512 8f5b421ebd3fb5e0527eba563988bd856199dc380b64a907f5b43e0fb1c65101e683697a349408da18d422368524c9d1cca546fea21f5b99d2e1c88588be80d8 WHIRLPOOL e410009f4f13b89161c28cc84ec95c8a82896472731b065d92b809bc2dfc38b26a789c74b005785344eb2ff04648739a2a046ba1f8089fc8ee95408b3b489461
+DIST lynis-1.6.2.tar.gz 166513 SHA256 fdaaabd9e2d159af7677b8012a1ac6e0230e357918707732d7ca9d8b1156c135 SHA512 4b390027a7e1428411947696ccff20e31de623b10fd2eaef4293eefa58fd669da0900e2e13d1341ee8f374a234cd9e969d716112ff311ae0448c638cccf005c0 WHIRLPOOL bbe54fea50434ce721262cd008ac9dac5a50276b9636f7882cc0cf9ea381880e7865106fece016eba05b8f3d5aed5fe69a6391bfa6b1dfcb70ce837797ddd210
 EBUILD lynis-1.3.0.ebuild 1038 SHA256 64062588fefb257de0ca988c3ee5731c135192e2bc3a87aaa2cc126f1faec142 SHA512 a75ec70fa148d1392872f587b9a1b3166da179c148e0b41d8b07ba4bc11ec4997b0738c9d56603b9b1ce5aa74e32ec82966df7d0cd0cb3a17e5bf3b6d305df98 WHIRLPOOL 914776bdb6a8030af1c82092bbeb5a5bf1f9578dc3863c7e22424712cbdaffd2e2647678777a07d2c133d02cc1a2ce3c6c727a681e52c97120f4436cc00773ec
-EBUILD lynis-1.5.6.ebuild 1007 SHA256 bed978bad04d3f031eeaacb6c9686aeaa4629c9620bfc0e2955e1ea005ea4a72 SHA512 57be970f3a82cb03405c6e35809470e1feea4acaffbf8feedfdb09fed1474238f11763c4d78b3cd6e5e6862bf59903edb49a6c43f5fbf5f8ef81198c44e0899b WHIRLPOOL 03ffca799e4e3ee9c64b7e418c04a09c10fab0487ddc55551e4489afd06f606d1205e02faa3378a4d67bd893fe1b7aa87478af77f86e5b166c1d852d211efe8c
-EBUILD lynis-1.5.9.ebuild 1007 SHA256 8d5e4aa1fe1e93ddc3509c0f16673b980bc1603bc66f5ee64a08988b88d634f0 SHA512 e11c3b883a73e530220247beb9e750ceaf3f764ad3e4bc9cd91cbdb710fd8e70fb8759a3db243c9a62a35260608d2d6074c43eb2233d326f433fea02d0e0ff45 WHIRLPOOL 0ddface99d8af7e0942d03dec1179bd6ca7b8e8adf246670fbb658bc18c8ed6d7bfd985e9a4ee96e9c351ef991230a5a8d75ad59915843d9c1fdd40d37f5ac2e
-MISC ChangeLog 7387 SHA256 75f4ef5c6364a64299125843593fbfea8c6c6c401579e4a4d37e55e7b9f99a31 SHA512 e8de2388eda781df3685ef5f351ffaa46a9f7e9e43ad1b3805050d9cfd623178a7f42420542a0b8fe03e192c38b68fd6e542baa2122d45a576e6a082759c0370 WHIRLPOOL 3bd6956e70c915dcce6544f663ac52d52ceaff13385604981163361129341e45da6bc487680ead226d111176243277eeb399115bd0326bd14a41541dc69cf32d
+EBUILD lynis-1.6.2.ebuild 1089 SHA256 25f34e46ae473c0972b80ace0fd0cea28fc744e4b4bbdc15fcff01619c271680 SHA512 54347076ffde33bf88684165f79a944077dc434b4583e23f0a1dcb423958d4deaebf8da56720374df1ddd2b048773a65869e17d0ef0eee0db8fae3f8842ecfce WHIRLPOOL d488152909d4ddeca45388e020d6a7600047e08319f46583a538ee7e39f3fbc1e210a2dbed50ada2f3b38fd6be352b46d7944c9d4034fb63c17b0df13862dd82
+MISC ChangeLog 7567 SHA256 fd22163dd2d85e7033d969428c6f669b2a064bf3e885035892f6958179a586c6 SHA512 7a2f61e5646961c9b2660265d16f5562ad47e6a994ac8b2dafd6da2b2cdb9cd7aa85d0c5b089a91f5b5f559d7a38e6741c64a694beaeb10d82be3cf81cb337c1 WHIRLPOOL 13ae75116f862b80f3afc5e0d235b000169f566f2b114c56ac3bc2902bfb8539719d79a1faccdf2bd7f02f9bdf1eca9d0dceb9f4c0bd3a3386ee5b07cf6ee76f
 MISC metadata.xml 254 SHA256 01509f805151143c7aad5241de9ea61ba92f17bf41222ce7e37b650a504131ec SHA512 ae6cd2b19d9070883747fba98a462fb3b0049b69ba98deef52faeef48f298f0b1ffc85a46dcdea753191f36d4361e6b34a62e2bbcdf264defe5d270056fc6895 WHIRLPOOL d38eafc431ab48a08cefa7860b330eb746ad0a570e6fc6c7204b14d9d7044789492862fbc5444727e224d6443b6120e907c47b8c70ed6a8ec96303d05fca15c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT6SoJAAoJEMOx0zmdw4Z1+dEH/3tsPLjb6offepVuB/WQLjOb
-X8dyHkSBrjEGmhqOQpLnafCIA9Ty9UBt6qDNDICTzsEj0YQmY9BJrLXYj2DC9jKJ
-j6d5exaFzKJHNx6uFtHjC+ESy13puVNT/3caQP04NiBybovhQ1SMkJzo394V0Av1
-Xm4tL2u05SC1dmOTKSP+Auc9CAJNZZGjtr9L1RJQKSjBdSFl5B+pxyjR5J33qOl5
-vEXccqKljHdLkQ137bHmSyQGwlLluMzC2hUT9+/a8ChKCpXmmonsRVkCk+411OE9
-ZebXVgn+IdHpOO5e/NQxbUTR5C9u7lZ7irxVx7b8I7ZF0FjNYu/pkMOv7qZmfoY=
-=nycc
+iQEcBAEBCAAGBQJUKvysAAoJEMOx0zmdw4Z1plkIALvp/oePK7iqUL2BELsimeT2
+gwHY/GtP1LBDMVLD+oylJsf3a2BvL3iwn4Qv+p8tZMe/ldeKKZG0bBu20Sp5X0Sq
+rZHkKnYD/6GHMYv8x3wC1tzRCSn+2+SDugkiniMOIQ6TjhFeCtrJrI4r/VSpyWou
+WVt5PjYiA5Evaiuqc1GJafYY4oVjcRJP26BHn+3HEiFNDZ4JIFkm4t6fcfYDvJs8
+vVCl/K3/xtxdcpiXL7AfSaclPf62+qwnKVGIY2PGfcqffmMK16XG/s0fyRqXqyl7
+F4GHBKW6TPJBOJJ5nCugqd0IHqdf6oiDIuPWp0TLIrVCODte49Z8WeXe/FuTVtY=
+=nPrq
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/lynis/lynis-1.5.9.ebuild b/app-forensics/lynis/lynis-1.5.9.ebuild
deleted file mode 100644
index 216d4a3e4156..000000000000
--- a/app-forensics/lynis/lynis-1.5.9.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.5.9.ebuild,v 1.1 2014/08/11 20:39:36 idl0r Exp $
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Security and system auditing tool"
-HOMEPAGE="http://cisofy.com/lynis/"
-SRC_URI="http://cisofy.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash"
-
-src_prepare() {
-	# Bug 507438
-	epatch_user
-}
-
-src_install() {
-	doman lynis.8
-	dodoc CHANGELOG FAQ README dev/TODO
-
-	# Remove the old one during the next stabilize progress
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/lynis.cron-new lynis
-
-	# stricter default perms - bug 507436
-	diropts -m0750
-	insopts -m0640
-
-	insinto /usr/share/${PN}
-	doins -r db/ include/ plugins/
-
-	dosbin lynis
-
-	insinto /etc/${PN}
-	doins default.prf
-}
-
-pkg_postinst() {
-	einfo
-	einfo "A cron script has been installed to ${ROOT}etc/cron.daily/lynis."
-	einfo
-}
diff --git a/app-forensics/lynis/lynis-1.5.6.ebuild b/app-forensics/lynis/lynis-1.6.2.ebuild
index 863fbd7420b2..d9e50a4466ae 100644
--- a/app-forensics/lynis/lynis-1.5.6.ebuild
+++ b/app-forensics/lynis/lynis-1.6.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.5.6.ebuild,v 1.1 2014/07/06 11:13:40 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/lynis/lynis-1.6.2.ebuild,v 1.1 2014/09/30 18:55:39 idl0r Exp $
 
 EAPI="5"
 
-inherit eutils
+inherit eutils bash-completion-r1
 
 DESCRIPTION="Security and system auditing tool"
 HOMEPAGE="http://cisofy.com/lynis/"
@@ -18,6 +18,8 @@ IUSE=""
 DEPEND=""
 RDEPEND="app-shells/bash"
 
+S="${WORKDIR}/${PN}"
+
 src_prepare() {
 	# Bug 507438
 	epatch_user
@@ -31,9 +33,11 @@ src_install() {
 	exeinto /etc/cron.daily
 	newexe "${FILESDIR}"/lynis.cron-new lynis
 
+	dobashcomp dev/bash_completion.d/lynis
+
 	# stricter default perms - bug 507436
-	diropts -m0750
-	insopts -m0640
+	diropts -m0700
+	insopts -m0600
 
 	insinto /usr/share/${PN}
 	doins -r db/ include/ plugins/