gentoo resync : 22.01.2021

5 files changed, 3 insertions, 215 deletions

diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 2d6ab791e62f..78813c663cd0 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1,16 +1,12 @@
 AUX greenbone-certdata-sync.conf 64 BLAKE2B e485a0f69df180834b2e2bd00da13dd86b9faa32215d2dba28f725436c0c907f2c23bb5bdca741195d400d4d8df3679362eb614aafdd7d89304c00180f2843ed SHA512 17df9386fc1dccf2fbe3b8d1fd499171f6681b61afe7b4c11ff9debc008798b31d1d02d59463031482d94e10833f0e71bde27cbbe422f23738c77b7c6ada79d2
 AUX greenbone-nvt-sync.conf 62 BLAKE2B cac8a82e44394f509aa325d940db0e67ab6cedeb0536f3f184064cef05c8cac5ee9d6c69181b7f2344d352fb28b732b454039d97b7ffe44a3d31c20fefebd3b6 SHA512 964779adc39cbed191bccf02ccc408a263860002d2dbddee755cf0d015336814b0b3c83f88a02cc0c5959657be5c49eb94380cd6ba15844e4b6088e49cd7a3f0
 AUX greenbone-scapdata-sync.conf 64 BLAKE2B 8bfa8fde583762aeb76d90d16694bc6344e23bbc0c607ff493a8e03ff02ee6534c5464fae5d6595a23e6014287b9dc66de7e5164358780ac68a7c1cd83a04309 SHA512 37dbbd3f92f8baee8e89c274d820e03cba5ed5469a826f118897035c2f7719a915a71a6069eb6bf7f9a72e798b7837af9a6f25709215683d9d264292b5ccad66
-AUX gvmd-8.0.1-sbin.patch 2224 BLAKE2B 84e13415d01e3ce996af11f3ffde68a803c8db0a25b9a13986fde763739be95c95a547078a0a65a4cdeb2256c2daf9ed022381ba75e681198071364d2bf40320 SHA512 3cf3d8d12650f6905eef7c5b2b73fef9e228c13330d85916ed52bbad2911dc186c81e25650fd0381e0c878d2712df063cd42f18ceb9e6c9afac908bc9a2d7980
-AUX gvmd-8.0.1-tmplock.patch 746 BLAKE2B afba3139cd18734d9d9b89b05e7e5a3120c44b5099463cfa74f26142c2a779f75e473b0742e21d86171b5026af0d834bbedb2fb61edb3d1b83711898c0b6fcf9 SHA512 d5b12df500cef0c598aba6d0489ec18d6882ad0c111dce970ae4268af79df9b0aba66a5c9148b91af0e579aa82afb397bab1daced11b6f0ab2918472181800b2
 AUX gvmd-9.0.1-glibc_siglist.patch 3599 BLAKE2B 91844507e01a3a7faa017ae98ae066b856993bfeaef7404fa884add53ccb8954eb7c3eebb74a1de1a01a6ec61960347595ba9418e9a2b814598288d488a92a03 SHA512 c3fb56954c55181cbfc52828a0d87703e237b945e5c5239b3dd429910d8a65ceef41b2ee7a7df522c8e9da9e86cd07fc383fb62fdccd73ab9380ae139fea2a7f
 AUX gvmd-daemon.conf 813 BLAKE2B b4d73d6a5cc17325f56b250bf1e63fab808bf7e36a0b357641de87d54a3238fd68cf34cba08ce606827e3441e042c514cfc4ce73ff88b70cd4dea080dd68eb97 SHA512 1fcce48ed1d53489f4509138b3570790574003931289e65ab0f767a51da1e5d6c8d33c44da8d967f6c0442f0bee500bf46554a49b113fe0bc933dffd3fb121eb
 AUX gvmd-startpre.sh 223 BLAKE2B 2b12ff7077464d089591e53c631c3b38f4d9351d98326ef65f50ef0501f165bc8393af86c21a3e9663464526dcd2b435eb1a89ba3a05946cb862f959d3efe5d7 SHA512 d532037beb7b05037c136c5b7d7bcea65d166d11c4eb3c580fdabd4a99b110d230b67f633a9661674d3186c09baaf50089b222c7c17e57b4c0a234a4470af531
 AUX gvmd.init 614 BLAKE2B e5c4bd192941b98f6e42dd1644a61b6d1fa6651c8932a7f85d3680f07272b2acabca91d0723c6b9057734fb41916ec52021161b9ff9a1512fbed04299a2d9941 SHA512 8eb0daf424fa9346674757f1d3f94a4708df9748d5e6c5a1b1ab8233651462bf1a93eda7899963484a7cdf2396eba30603ddb079bc4ae2855bc49097ea88f82d
 AUX gvmd.logrotate 325 BLAKE2B 4df59e6d9484b9e60d54cb3633ffc9888ad8550bb1d1f23123da21b1269125cd7354426b97ce42e06bf547d23788cefaac5ef51f7aa83d6cc34076bce4ab7339 SHA512 e1eeef173bfab7c750efcc7faa42cf7a1cfb9e6b137716063f273bc709c1346f11262dadbdb0c49822d885dc00177d8ccb91c0491ddc33cfee0a3827f11908f6
 AUX gvmd.service 505 BLAKE2B 32736b0f8f45b87e1e2c6f578d6f6b891b3642dab3bba6c56657ac61c0c55f81f8bf809c5d6508945972dcaf31b4e75729c7686409a2ebaea4b7a132d8d557d9 SHA512 ea9132367ee28814ed6e36c0b1fb1ce4700e5735d77e0889947618aba511c3adbc968167b4968d1fa28bd41959575a49b8b2ddb9b116957c729f51ece33dfd98
-DIST gvmd-8.0.1.tar.gz 1495311 BLAKE2B 17419f5fecf7cce07536a5e12f17a61a31d45add185e0e1635515834eca6abd8a6babeb89b8f879ff8cb90b60f3682a19a62403142f4901be3f932b8a44cac68 SHA512 5490b902ad42499657eca9031b396c70a82d3c523985601067e697758f2472d123c4e99b085b963e58888d99224fa2a441a140772c702d7cd60d6424b126bfc8
 DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf
-EBUILD gvmd-8.0.1.ebuild 2896 BLAKE2B b882c80f53ac49d1ed63f9666a124dd16c2f391587de6b23256e4105cab6549973b97dc83f0afdd24506b139059dd0c9cebd943845bc8db895291f78889c681e SHA512 527c8838fed46ee3b851b6edfdf62243e2b64c99dea52e84f345391f124e783266ba21656295b5b9688c1f2cfa2b732fffc7c34c6fdd0a010cf7a39daa17b7b8
-EBUILD gvmd-9.0.1.ebuild 2837 BLAKE2B 2cdae3d6192e4cf4ba8f10a0e6d706d7f0c40173f5271209716e01f050c7e19f16eeefddf66520245db56c2288948a86f42b9d8d565ae6ddb72bc8626785a383 SHA512 9d2c0ff8c0ae32a300f98e5e51e429b253b71fec9f6d6c2a6134b856c86fa650622fead51009588e7b39a95d693058ea0af3be41cbbb5e94ff47ff2a316f9dc3
+EBUILD gvmd-9.0.1.ebuild 2836 BLAKE2B c4273957354ac5cc8b51a6e0b47a00439d866b0fae51ed5f866db2fff0003aaa891fdfe768005ef35f25f554eb750af742308ff37f7f8b0da0a8985119aa25e4 SHA512 28ac31a09bd31c2bebe92baf3f671d9431040cc7037081ac9993f5383085eef074a43ddeebc15920aadf903ef4ccf223fd26df3e116d46a83396d1f44c375d5e
 MISC metadata.xml 1043 BLAKE2B 589df7f1076a8797197ce4446df8030e6529db7abb704d5638059bb6f1b381cf80a609c08812434a2cfa17225b1f9b267a145b9358b2304de1be3dcd7d9b5c7b SHA512 3f0bc3b7bf085c5d86b2ac0c7671658955fb0951104f1fe308826a4100fe3ee56b6cf31a5f34e57ee0d7c4c02ce2d062e6e93b1eea1f2c72bfc70ab500b4d8ed
diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch
deleted file mode 100644
index bf21acb7b01f..000000000000
--- a/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/src/CMakeLists.txt	2019-07-17 17:11:52.000000000 +0300
-+++ b/src/CMakeLists.txt	2019-07-21 22:43:17.299106863 +0300
-@@ -248,12 +248,12 @@
- ## Install
- 
- install (TARGETS ${BINARY_NAME}
--         RUNTIME DESTINATION ${SBINDIR}
-+         RUNTIME DESTINATION ${BINDIR}
-          LIBRARY DESTINATION ${LIBDIR}
-          ARCHIVE DESTINATION ${LIBDIR}/static)
- 
- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gvmd
--         DESTINATION ${SBINDIR})
-+         DESTINATION ${BINDIR})
- 
- if (BACKEND STREQUAL POSTGRESQL)
-   install (TARGETS gvm-pg-server
---- a/CMakeLists.txt	2019-07-22 11:31:13.430827400 +0300
-+++ b/CMakeLists.txt	2019-07-22 11:32:29.034765809 +0300
-@@ -571,17 +571,17 @@
-          PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
- 
- install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-portnames-update
--         DESTINATION ${SBINDIR}
-+         DESTINATION ${BINDIR}
-          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
-                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- 
- install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-scapdata-sync
--         DESTINATION ${SBINDIR}
-+         DESTINATION ${BINDIR}
-          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
-                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- 
- install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-certdata-sync
--         DESTINATION ${SBINDIR}
-+         DESTINATION ${BINDIR}
-          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
-                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- 
-@@ -593,13 +593,13 @@
-                      WORLD_READ WORLD_EXECUTE)
- 
- install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-migrate-to-postgres
--         DESTINATION ${SBINDIR}
-+         DESTINATION ${BINDIR}
-          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
-                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- 
- if (BACKEND STREQUAL SQLITE3)
-   install (FILES ${CMAKE_SOURCE_DIR}/tools/database-statistics-sqlite
--           DESTINATION ${SBINDIR}
-+           DESTINATION ${BINDIR}
-            PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
-                        GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif (BACKEND STREQUAL SQLITE3)
diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch
deleted file mode 100644
index 40b1e0095578..000000000000
--- a/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/tools/greenbone-certdata-sync.in	2019-07-17 17:11:52.000000000 +0300
-+++ b/tools/greenbone-certdata-sync.in	2019-07-22 21:11:36.173099530 +0300
-@@ -494,13 +494,11 @@
- fi
- (
-   flock -n 9
--  date > $LOCK_FILE
-   if [ $? -eq 1 ] ; then
-     log_notice "Sync in progress, exiting."
-     exit 1
-   fi
-   sync_certdata
--  echo -n > $LOCK_FILE
--) 9>$LOCK_FILE
-+)
- 
- exit 0
---- a/tools/greenbone-scapdata-sync.in	2019-07-17 17:11:52.000000000 +0300
-+++ b/tools/greenbone-scapdata-sync.in	2019-07-22 21:12:49.193161531 +0300
-@@ -517,13 +517,11 @@
- fi
- (
-   flock -n 9
--  date > $LOCK_FILE
-   if [ $? -eq 1 ] ; then
-     log_notice "Sync in progress, exiting."
-     exit 1
-   fi
-   sync_scapdata
--  echo -n > $LOCK_FILE
--) 9>$LOCK_FILE
-+)
- 
- exit 0
diff --git a/net-analyzer/gvmd/gvmd-8.0.1.ebuild b/net-analyzer/gvmd/gvmd-8.0.1.ebuild
deleted file mode 100644
index 7289dcd5f82a..000000000000
--- a/net-analyzer/gvmd/gvmd-8.0.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras postgres sqlite"
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	dev-libs/libical
-	>=net-analyzer/gvm-libs-10.0.1
-	net-libs/gnutls:=[tools]
-	extras?   ( app-text/xmlstarlet
-		    dev-texlive/texlive-latexextra )
-	postgres? ( dev-db/postgresql:* )
-	sqlite?   ( dev-db/sqlite:3 )"
-
-RDEPEND="
-	${DEPEND}
-	~net-analyzer/openvas-scanner-6.0.1"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	extras? ( app-doc/doxygen[dot]
-		  app-doc/xmltoman
-		  app-text/htmldoc
-		  dev-libs/libxslt
-	)"
-
-PATCHES=(
-	# Install exec. to /usr/bin instead of /usr/sbin
-	"${FILESDIR}/${P}-sbin.patch"
-	# Fix permissions for user gvm.
-	"${FILESDIR}/${P}-tmplock.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# QA-Fix | Use correct FHS/Gentoo policy paths for 8.0.1
-	sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "$S"/doc/CMakeLists.txt || die
-	sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "$S"/CMakeLists.txt || die
-	# QA-Fix | Remove !CLANG Doxygen warnings for 8.0.1
-	if use extras; then
-		if ! tc-is-clang; then
-		   local f
-		   for f in doc/*.in
-		   do
-			sed -i \
-				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
-				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
-				"${f}" || die "couldn't disable CLANG parsing"
-		   done
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-	)
-	# Add release hardening flags for 8.0.1
-	append-cflags -Wno-nonnull -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
-	append-ldflags -Wl,-z,relro -Wl,-z,now
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use extras; then
-		cmake_build -C "${BUILD_DIR}" doc
-		cmake_build doc-full -C "${BUILD_DIR}" doc
-		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-	cmake_build rebuild_cache
-}
-
-src_install() {
-	cmake_src_install
-
-	dodir /etc/gvm
-	insinto /etc/gvm
-	doins -r "${FILESDIR}"/*sync*
-
-	dodir /etc/gvm/sysconfig
-	insinto /etc/gvm/sysconfig
-	doins "${FILESDIR}/${PN}-daemon.conf"
-
-	exeinto /etc/gvm
-	doexe "${FILESDIR}"/gvmd-startpre.sh
-
-	fowners -R gvm:gvm /etc/gvm
-
-	newinitd "${FILESDIR}/${PN}.init" "${PN}"
-	newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/gvm/gvmd
-	fowners -R gvm:gvm /var/lib/gvm
-}
diff --git a/net-analyzer/gvmd/gvmd-9.0.1.ebuild b/net-analyzer/gvmd/gvmd-9.0.1.ebuild
index b48b9a9102a3..d22d159745dd 100644
--- a/net-analyzer/gvmd/gvmd-9.0.1.ebuild
+++ b/net-analyzer/gvmd/gvmd-9.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,7 +46,7 @@ BDEPEND="
 	test? ( dev-libs/cgreen )"
 
 PATCHES=(
-	# Replace deprecated glibc sys_siglist with strsignal 
+	# Replace deprecated glibc sys_siglist with strsignal
 	"${FILESDIR}/${P}-glibc_siglist.patch"
 )