diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /net-analyzer/gvm-libs | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'net-analyzer/gvm-libs')
| -rw-r--r-- | net-analyzer/gvm-libs/Manifest | 5 | ||||
| -rw-r--r-- | net-analyzer/gvm-libs/files/gvm-libs-11.0.0-gnutls.patch | 22 | ||||
| -rw-r--r-- | net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild (renamed from net-analyzer/gvm-libs/gvm-libs-11.0.0-r1.ebuild) | 15 |
3 files changed, 10 insertions, 32 deletions
diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest index b86728c0883d..ef37ec938af9 100644 --- a/net-analyzer/gvm-libs/Manifest +++ b/net-analyzer/gvm-libs/Manifest @@ -1,7 +1,6 @@ AUX gvm-libs-10.0.1-pid.patch 312 BLAKE2B 805c21d61dfc6bf29cab6c6dd768fe6c9249aa7613ab18f21d347d1aeab58afc4bb75d17cc62687f3fa2270a05f16c883ba5293534e84e045f1d67dc527f8194 SHA512 dc42f495f2e45687ce221ba72fbdde4ca8fec11b4e55a46dd011e0d7169d5b20e1ba4473aa33180c698b655fce25fac2f8c6283fde04137b43c9c16af34eec43 -AUX gvm-libs-11.0.0-gnutls.patch 950 BLAKE2B af0bac65ecc5e131296df3898f7da10c335c7d0433e875e201ab4687438457e5ab58d99d835f38e1a485dc0a36c1122500779ae6adc1c49f4c002f3234ab13a5 SHA512 512825f9cc2f10eb108c899a2b10327fe74d48b77f44c1d2025cee500c07e2470ad0a75adc0bdfb6c7bc36d1c1f6f257d175e40c1451f4accaf96c904bf2dd56 DIST gvm-libs-10.0.1.tar.gz 198483 BLAKE2B 4f4ddc7a3a1b4d45a51868cf03844365a9c4dd07f17ab53957ac4a1452ecba595885abdf01402a78aa784163aaba60b5c452fb9c2b5a11d38c40706e820c22c2 SHA512 961570e8fa8f89f0b462991bff1bf4e512ed6419cff6871c7432899847fb9edcc9f0adb7c280d12ee69fbb5c8e306c9e4366e2cbbb05fc3bae06795dcfb42206 -DIST gvm-libs-11.0.0.tar.gz 207205 BLAKE2B 026b999a48ad524df9305d219dd29f5deb71affb3f5d338ad1178924aa701f2fe698ee4009f4b5a6973de6e590a870871b3b708a2531aaba6e05755cd7f00f97 SHA512 ff981b4ca37b425a8d1f491e90bd1cef4701033886f9fd47dad34540b36fa275d4af8b176e63a07405cc1f29137851b96a6ce80c46ed92f809b089fb0cd928af +DIST gvm-libs-11.0.1.tar.gz 213553 BLAKE2B b7c8ffeca8682fcfe68afe0992632fac18a01fc9b0016fcbaf27c0340b5150337784caac2368a22789073714808ce2c0471efde668e6911dcd0cfceaf862b671 SHA512 159acbe8e24f172398a6396988b87676a214fa15c2985e67845dcad1ebcb92ba5e2a19cee2994dc7cd0cac706992e81e8c6a793e99216aaac87a91c1c72c9a46 EBUILD gvm-libs-10.0.1.ebuild 2274 BLAKE2B 59cf5e18a5a5cdb0fbcfed7ef8772abf9c33e86e1051c12dd3450993e6a4778967197e8bffdeaf7fdb8d4928bdb112889c7f7265cead065dea656e41113ca507 SHA512 0896c4be88d76dd7a08bfd79a5c5b185035779238545c8f0cdbb3ef207b8d537e0c086cba25c6c6a048696bdcb28d4c5362f3b312240c600ade1708436315428 -EBUILD gvm-libs-11.0.0-r1.ebuild 2023 BLAKE2B 01050064d29f8c4bb180836dfd652d4da3f2933c6cc6b78bda81b20017ef09239eb6659dfde4441633f8316bf67438b3569660996fc4a4fe3de5cb8bbbef4087 SHA512 82644656222c78215251417f289d3695a2bb73fa20bfa838411928c8ec7e0dad8aaaec988ce304e8396a7aeefcff877698c2a32b809a64262738bea1ed48dae9 +EBUILD gvm-libs-11.0.1.ebuild 2025 BLAKE2B 5dd6df6ecd1ae6bc3440c79af86a9adcd44c24bee7b1fccb560ae1ef0bde0f0c2bb432b3d6d370b02105e292df901681bc29f740444969fee3f27f9152b97622 SHA512 04d2a392e9f7e684838c7ae0a5159a62378c444559d64ad210b6c124891f991b8fb6af2d4f3f95f79450a807d76f8754c98942a2f8f1577b6ede08f051f487cd MISC metadata.xml 782 BLAKE2B 002fcba6357c321932dc1506bdc826eb848ae9959e1bbbeabb9f3c4348eabd3aedf34df68af834221ed4f7c7f8b5a5ecf69c3ee657706342f9161b810ed68f60 SHA512 33d2c86b3e5bd9261a78ed7bd726d01d677f715c675caee8868adbfe80b408d3f155779faecdf1124a00b3b72167966111bb5ae1c9849725a7de76fa46e5f7b4 diff --git a/net-analyzer/gvm-libs/files/gvm-libs-11.0.0-gnutls.patch b/net-analyzer/gvm-libs/files/gvm-libs-11.0.0-gnutls.patch deleted file mode 100644 index 427647ddcd9c..000000000000 --- a/net-analyzer/gvm-libs/files/gvm-libs-11.0.0-gnutls.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 61205ecc6e28f6a1af799ec40074a61037d9bf31 Mon Sep 17 00:00:00 2001 -From: Juan Jose Nicola <juan.nicola@greenbone.net> -Date: Mon, 28 Oct 2019 14:04:52 +0100 -Subject: [PATCH] Fix missing linking to libgnutls in util/CMakeLists.txt - ---- - util/CMakeLists.txt | 2 +- - 1 files changed, 1 insertions(+), 1 deletion(-) - -diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt -index 2b7f441d..af5e363e 100644 ---- a/util/CMakeLists.txt -+++ b/util/CMakeLists.txt -@@ -158,7 +158,7 @@ if (BUILD_SHARED) - - target_link_libraries (gvm_util_shared LINK_PRIVATE ${GLIB_LDFLAGS} - ${GIO_LDFLAGS} ${GPGME_LDFLAGS} ${ZLIB_LDFLAGS} -- ${RADIUS_LDFLAGS} ${LIBSSH_LDFLAGS} -+ ${RADIUS_LDFLAGS} ${LIBSSH_LDFLAGS} ${GNUTLS_LDFLAGS} - ${GCRYPT_LDFLAGS} ${LDAP_LDFLAGS} ${REDIS_LDFLAGS} - ${UUID_LDFLAGS} ${LINKER_HARDENING_FLAGS}) - endif (BUILD_SHARED) diff --git a/net-analyzer/gvm-libs/gvm-libs-11.0.0-r1.ebuild b/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild index 00bd14e824ab..be84a74a2762 100644 --- a/net-analyzer/gvm-libs/gvm-libs-11.0.0-r1.ebuild +++ b/net-analyzer/gvm-libs/gvm-libs-11.0.1.ebuild @@ -13,7 +13,8 @@ SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar SLOT="0" LICENSE="GPL-2+" KEYWORDS="~amd64 ~x86" -IUSE="extras ldap radius" +IUSE="extras ldap test radius" +RESTRICT="!test? ( test )" DEPEND=" acct-user/gvm @@ -42,12 +43,8 @@ BDEPEND=" app-text/htmldoc dev-perl/CGI dev-perl/SQL-Translator - )" - -PATCHES=( - # patch for missing gnutls linking https://github.com/greenbone/gvm-libs/issues/277 - "${FILESDIR}/${P}-gnutls.patch" -) + ) + test? ( dev-libs/cgreen )" src_prepare() { cmake_src_prepare @@ -71,6 +68,7 @@ src_configure() { "-DLOCALSTATEDIR=${EPREFIX}/var" "-DSYSCONFDIR=${EPREFIX}/etc" "-DGVM_PID_DIR=${EPREFIX}/var/lib/gvm" + "-DBUILD_TESTS=$(usex test)" ) cmake_src_configure } @@ -82,6 +80,9 @@ src_compile() { cmake_build doc-full -C "${BUILD_DIR}" doc fi cmake_build rebuild_cache + if use test; then + cmake_build tests + fi } src_install() { |