gentoo resync : 24.12.2018

3 files changed, 5 insertions, 71 deletions

diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest
index d825887a7c65..21b73b83547b 100644
--- a/net-analyzer/nessus-agent-bin/Manifest
+++ b/net-analyzer/nessus-agent-bin/Manifest
@@ -1,8 +1,6 @@
 AUX nessusagent.initd 563 BLAKE2B 63820368c95dc2358ff73843e239a084e21cea48bd4dfd170e486f0c702e7ec6be1581478f7c37dd12868dd3648dfd8f44b8ff47c85fdab0276a0c84b78eb7d1 SHA512 acc9a64e1cbff1119876f186aa6c40d6f5772c55a919914c410fed9e0974d2ce8fe5b965248aeae590ae5dd551ab530c59dad42c6f793d995193f9b8f9d89718
-DIST NessusAgent-6.11.2-es7.x86_64.rpm 15539504 BLAKE2B 1e03c2716200d88d600d2085adcbad6038a9b1aff1d4c80c291ba2609102fa34af43fabdceece545de9496f515252fcefd3ff6c8e13511635c7a6aa25bb146a3 SHA512 4ce8c8bf1ca8137712a796ddf5a39f139287789a6b966241b0f5831ee69bccdff5519c8fb821a043d00c5014f456a0f941e0d2de278383a49ddd73a0f6c18a2a
-DIST NessusAgent-7.0.0-es7.x86_64.rpm 15595940 BLAKE2B a5796aca8efd3a0fa5191437bd055cae817a7a498cf6149d757f28acf268814652295f92b4cf5351b71175e1b498b59fe18e77a2cfaa7e253a53aa889b6677cd SHA512 10cce476f8ba822b0e5fc1dc7f47f3a531b0ac48553e769f18b14641bc1e323be3940e6712e7a2c4286f8b874cbf7dd02f85fd283da109a30864be875bedbfd9
 DIST NessusAgent-7.1.1-es7.x86_64.rpm 15646432 BLAKE2B 5c78ab227f309fd0b86b504ca18cb767b768785111517faebee44c56d226a2189d34ceacaae000907b89e977192bc8a058236499b865a593fb5754f46f6521ee SHA512 5f1340f26ae11378ddc1efc4d2f153111e592955ec648f740ffa538d5e437332f5c79ab92a737ebbb318786ef28ab5177c8cc73ebde909529c050b64df2ee8a1
-EBUILD nessus-agent-bin-6.11.2.ebuild 1953 BLAKE2B 245026dc56e78152af282fce40624191a681db4db51f86dff68bdf6dbcfecb3288d8984ffadc40d4dc56096c1e91acc5a8a324b93aa7d7b3f2173e59741f3c58 SHA512 e88f677a4a2b371712ca487bc67a377708b5c9dd8c8d2aed9c6f77fac056c3a6118d204348beee8241faa7d305fbfcc79014eaaae2cda06ff5ac824a316d5d7c
-EBUILD nessus-agent-bin-7.0.0.ebuild 1953 BLAKE2B 245026dc56e78152af282fce40624191a681db4db51f86dff68bdf6dbcfecb3288d8984ffadc40d4dc56096c1e91acc5a8a324b93aa7d7b3f2173e59741f3c58 SHA512 e88f677a4a2b371712ca487bc67a377708b5c9dd8c8d2aed9c6f77fac056c3a6118d204348beee8241faa7d305fbfcc79014eaaae2cda06ff5ac824a316d5d7c
+DIST NessusAgent-7.1.2-es7.x86_64.rpm 15663484 BLAKE2B 6b7290a39984acfc95ec0b75c8f9e6b04ecdfe630fe792f32ffb539676bad73a7db02789dcbfb6dae3d40c1e9eef1065282c20ca9a3c51b29fe0540f70cc82bc SHA512 64aff80fd5115b0f261e0156c83a67b47a7f68d7d1e8803be87a54cecaf6be1f03bf213ee68a0ffae9a2b2ad35ea7766445444ed132c077f46127cd5772f7a39
 EBUILD nessus-agent-bin-7.1.1.ebuild 1953 BLAKE2B 9bd08652ac2e2ef1497e287a04b6705020ce2872fd688c1251ac39897d821d6b2ffb9a390e41f12edaf19e2c3f9f986ecba8512f1e78bfb99196a3755ac18c4e SHA512 d94c80cea575a349cf7a27f8d9783bdbde29f6e33052c1b6b83fc4a58b5984e65053c9ab3193118e42039bccec7ae256825a9853af0dde6261cc077ef706b2d9
+EBUILD nessus-agent-bin-7.1.2.ebuild 1958 BLAKE2B 8f62b408a8fbe4ab8839336cd7ac93e7be1544dc32a0dbd419cca1ddd97894218b88e413afd9d4fc624dd896181ce889a856f9079cb2df58e503e0f8416219a7 SHA512 94e71f56bc55f560c3b372fcf20a3aa73ccfc8441aecbfb3e54aa25701c34542d40171f2bddc93815abb5414500dc17921705a570cb00c9a646ed39714e1abe6
 MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.0.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.0.0.ebuild
deleted file mode 100644
index f7e50ca245a6..000000000000
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.0.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rpm pax-utils systemd
-
-MY_P="NessusAgent-${PV}-es7"
-
-DESCRIPTION="A remote security scanner for Linux - agent component"
-HOMEPAGE="https://www.tenable.com/"
-SRC_URI="${MY_P}.x86_64.rpm"
-
-LICENSE="GPL-2 Nessus-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-QA_PREBUILT="opt/nessus_agent/bin/nasl
-	opt/nessus_agent/bin/nessus-mkrand
-	opt/nessus_agent/lib/nessus/libjemalloc.so.${PV}
-	opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so
-	opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc
-	opt/nessus_agent/sbin/nessus-check-signature
-	opt/nessus_agent/sbin/nessus-service
-	opt/nessus_agent/sbin/nessuscli
-	opt/nessus_agent/sbin/nessusd"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please download ${A} from ${HOMEPAGE}/agent-download"
-	einfo "The archive should then be placed into ${DISTDIR}."
-}
-
-src_install() {
-	# Using doins -r would strip executable bits from all binaries
-	cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files"
-
-	pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd
-
-	# Make sure these originally empty directories do not vanish,
-	# Nessus will not run properly without them
-	keepdir /opt/nessus_agent/com/nessus/CA
-	keepdir /opt/nessus_agent/etc/nessus
-	keepdir /opt/nessus_agent/var/nessus/logs
-	keepdir /opt/nessus_agent/var/nessus/tmp
-	keepdir /opt/nessus_agent/var/nessus/users
-
-	newinitd "${FILESDIR}"/nessusagent.initd nessusagent
-	systemd_dounit usr/lib/systemd/system/nessusagent.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "In order to link the agent to Tenable.io or an instance of Nessus Manager,"
-		elog "obtain an appropriate linking key and run"
-		elog ""
-		elog "  /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]"
-		elog ""
-		elog "This can be done before the agent is started."
-	fi
-}
diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.11.2.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.1.2.ebuild
index f7e50ca245a6..fe50f423bbb1 100644
--- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-6.11.2.ebuild
+++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit rpm pax-utils systemd
 
@@ -30,7 +30,7 @@ QA_PREBUILT="opt/nessus_agent/bin/nasl
 S="${WORKDIR}"
 
 pkg_nofetch() {
-	einfo "Please download ${A} from ${HOMEPAGE}/agent-download"
+	einfo "Please download ${A} from ${HOMEPAGE}/download/nessus-agents"
 	einfo "The archive should then be placed into ${DISTDIR}."
 }