From: Justin Lecher <jlec@gentoo.org>
Date: Sun, 25 Jan 2015 16:36:43 +0000 (+0000)
Subject: net-analyzer/openvas-libraries: Fix build errors in test app, #537518
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cea75a07282a32105f96f46eda60c0b48d5c060a;p=gentoo.git

net-analyzer/openvas-libraries: Fix build errors in test app, #537518

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!
---

diff --git a/net-analyzer/openvas-libraries/ChangeLog b/net-analyzer/openvas-libraries/ChangeLog
index be5a447a5186..9c676a22851c 100644
--- a/net-analyzer/openvas-libraries/ChangeLog
+++ b/net-analyzer/openvas-libraries/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/openvas-libraries
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v 1.29 2014/12/01 16:38:03 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/ChangeLog,v 1.30 2015/01/25 16:36:34 jlec Exp $
+
+  25 Jan 2015; Justin Lecher <jlec@gentoo.org> openvas-libraries-7.0.6.ebuild,
+  +files/openvas-libraries-7.0.6-underlinking.patch:
+  Fix build errors in test app, #537518
 
 *openvas-libraries-8.0_beta4 (01 Dec 2014)
 *openvas-libraries-7.0.6 (01 Dec 2014)
diff --git a/net-analyzer/openvas-libraries/Manifest b/net-analyzer/openvas-libraries/Manifest
index 76ba80a4a887..408d088ab91f 100644
--- a/net-analyzer/openvas-libraries/Manifest
+++ b/net-analyzer/openvas-libraries/Manifest
@@ -4,33 +4,34 @@ Hash: SHA512
 AUX openvas-libraries-7.0.4-bsdsource.patch 1061 SHA256 33c9898330688abfbe7f4938bb615ad9b4ac41f0e763feb4f186412033e45719 SHA512 da8cb0cf874c4f7af09ae4f306df19c2f7faf5a369de934af7585d25f21991e805ee5d68f20f87f717af40e113e80bfc2b430070fdf479465600bf6d1354e41a WHIRLPOOL 8fa4947f2ff2987e7c99e7a3c587bf2912fbe635f0e08eee2ec1c00c08160e5a4f4143437ddfa327281831a51d2a28a9e1d761edf09dc20e8f211d5fc3c0abf8
 AUX openvas-libraries-7.0.4-libssh.patch 664 SHA256 73f8d299f7b8fa3f06f2c02d1588de5d51e34770fc378f11bbcdda739fbb510a SHA512 5306452c48a5db599b74e7a4dcaf28fb1848238fce7c33c8ccdaac18629e5bea2ad82c619620703309b5bb19fca9356da4518a7c3a180e038309f433a0896a40 WHIRLPOOL 62086af319a59f6419f51b78b55e27926a93587903d8ca51556f93376906b6247a8afead91f28aaaadee4cb6b9c55bfe21cc0d91954213a2f50e4f682d97eb9a
 AUX openvas-libraries-7.0.4-run.patch 626 SHA256 92c9c8faffd8d01a7a8a6256c33e10bd023332572d09354ee1f9e0a50589c07e SHA512 94775408c8e9dc85f12eeb84ef1e355411496e5a495f67bed900efc10d93f5ff9a96bb6d28fce1dabfb0fd15bc19f7cc53986dd17fd288677f67c13bb9ff9743 WHIRLPOOL 6b52c6b52173d593e5a4442870866107983137d54bcd6153278bb0450dbcc68cbc3ec30b6f402441168749bb122a7742d024e79592f52d9b4e582ed8e34ad82d
+AUX openvas-libraries-7.0.6-underlinking.patch 1348 SHA256 574a8e59866c3e1526ad2c45c4151a417f7342d6951563f3e94c106e95446725 SHA512 0c6eb2ea1b68468a520aa483be0be449e07a82488dc872be9eb343872e33c0d6f6ee4abb4a318e4bf7204b542262c933bf7742c644a4a999615201460030b0df WHIRLPOOL df0d15ca5a3c6f69450ef53318c8a9c34be44e2fd16419c72ee2e92282fc629c1d5958c2c4b80a6205786c2308933612c4325e962c5ce0ed4b15da8b083b9b65
 AUX openvas-libraries-8.0_beta3-underlinking.patch 909 SHA256 bd43e373b89f63b398bc64e2a42877e82a5914d913d6d9a1253f68db787f71f6 SHA512 fadeb419904428a8a0bc8b2a8e48859b5ba9fb24094b00baf56750955ba15fb5fc8e096195690d72c9367adbc9f479c811c425259cdc256db7cdef7255f20823 WHIRLPOOL 71deafe5d549eb7afa2557543a3dc24fe7ff9592008937a7c558659699e27062b73df6f4056e907206abf56ffd952f92bc93b1f181557e8ddd41a8c67d883350
 DIST openvas-libraries-7.0.5.tar.gz 577595 SHA256 2a760b52b991e1df2af9279b53959313b22640da30d123762a06af048485d563 SHA512 a00211b7e42bd37153f26260379fc76e0cde2e613e6d58b478024fcae96bcfa7ae94152012f142eae6a5a014dad751e894ebaf2cda1218f76fb8c5b233d6aa2f WHIRLPOOL 7deffa4f6b9fb02e55b9fe1a437722ac92349936fdbe6ff682fe997e9c2443b5538a1249d5eaea3fd8eb6462b0748a947068218313867f911162f7eaf3e475c0
 DIST openvas-libraries-7.0.6.tar.gz 578028 SHA256 84f0064124e0685004420868b68602527a4d3003db4f20d43a0dd2e3d6b7cfdb SHA512 54cd1dcbb51cfe97317f3fa73bb727746d490af957f7e21bf4128ed763ae412c3cafe8776264000406157c57cd52d166f3dbd9ccef586fb1da5debe3f680e818 WHIRLPOOL b1094c3447cd8af50ec5752507e6d0b8eecb0abe862d18c7d218ad7be0037187e3e9e8c8e13d1a9296e9d2bb9e40f3e4f36549366842596294bbf2a8ac27d281
 DIST openvas-libraries-8.0+beta3.tar.gz 588555 SHA256 363e4e0cfa57968619847a77a97e19a614f25e076ddd6cb6077141fd8c17f7c5 SHA512 710d2337d0dc82eb0502c488c65be953a5ad5e641f7583b4874ffc5e582030fd01de2759381e2c91be330834e9ae03b0ebb9bc880b7c5258b324b9a6c3b1d152 WHIRLPOOL ef250d4ed29dfefdffc7a34952ac890136577376b1e97adc1d285dfa8d5891e24b8342510074765aa54c62af87ba038d7fd85434de76d076a594dc446093f647
 DIST openvas-libraries-8.0+beta4.tar.gz 589073 SHA256 0fc023d72833f27e6a8823d5c2865126527064c502c403fc22c52938a529283b SHA512 31e5e56394b868ec1483052116a631d7323dcd2a7e6e85439d4f241119dcf98fc2775a962b2bca54e8407d89f7562d99f9bfa8197246f345917e7b0cc2eafe37 WHIRLPOOL 6263157189dbe690f314b7e2e90fa29649e975e4743fc77a96f901549d566b3e3948ad64cadb7db74b8c20eeb1e2c4e5e91c958eb6b18e2d49ba5f95914b3feb
 EBUILD openvas-libraries-7.0.5.ebuild 1256 SHA256 a71df8fcf39925a7ab96b8f078ab5df44ce073ea78ee95e507ee658d555cbc31 SHA512 86a38ed2c3d018e4977c6075e904f3741759ffa22d6a5cb7ada590fbc21c7b4f24e441ffe7a5c47b05c01bc27580f3e40ec3a26362a1edea68f3fb4a794d0d9f WHIRLPOOL 4ec010b35f2e76ca8393e9a168ebe65798c20a921a7ae7b6b2dc21bffbfecd64ffd3e1017237b00fd0ed49443d0e644216ba0235df90521dbc091f8300e8e335
-EBUILD openvas-libraries-7.0.6.ebuild 1256 SHA256 2f61ab6035e77e81a14956025a5ba3d5d7ae42072e4b0a1576a7e486e9c5dc3f SHA512 4b7616db3f0ea58a3c94719528a65101c62639ddf9e7ce27f03205c520553cf5a5fed0a59df00e40c36a2b82af78e3ec5b580ec002ec3b3336232a09906ac4b7 WHIRLPOOL 8bf8611ab4ab759f27f2ffeb9fb2b0919f0c66ab661785fe8b24b2ce893c6ae3c6c7c05a40cbdfd6cd4efae221832f5feab2f96a4f64d689ba7b955f0a930b21
+EBUILD openvas-libraries-7.0.6.ebuild 1295 SHA256 bb06db9396e101a226e465eb2a2c68baa3a0eaf968d8d485eb435b5bbc4cfac2 SHA512 71efb8031a567a6eda9a786071a29d848e60c29fb6add6fedd492f3b26598534b9f4434d24d2e3fbe4b40ebb35b42275beb3c3bac75d55cce99e3850f0de690c WHIRLPOOL cc04867caf7b9ef44e7f338986b15ee212c0230611f7c58124f6c7e4cdd00abe3afe50e0ca790e419e819c7f57ae646eb02663c82a342e8e976991405f3761fc
 EBUILD openvas-libraries-8.0_beta3.ebuild 1322 SHA256 dc4a0e2591ed955b6fa268fdca0a75d4f2f7a4a6acaa542f7669dc07a5d471b9 SHA512 a57c33a83f4f0d563990d87a5854cd8f2fd654caa69c0d64de8091db21289404e216ceb646bc22452f2322d50acd44de75ce8e7977770a2b224ac8da484899b9 WHIRLPOOL b33055a30e6cbfa450c794d91c9914e389eff5f3a60b670f4950cd123aae43dd6f27069be33af9374924b1787211018a8645230f2cbb196ac14ba56958fdac4c
 EBUILD openvas-libraries-8.0_beta4.ebuild 1291 SHA256 48b2e28db10c2a8732d94a17e2f264d3ff773de5d8c0bb9bf1a63f5552a75404 SHA512 a44de4ae02d462a02988bd5b16ee2d9552919a587695679806bc966552290660895ce0649819fea6e172bb2943f5dbd8b5bebf4fd98203e20c0bd11b954261ea WHIRLPOOL 5b6f9be19107a8c93ed47202aad62b47f4ad0946ed27ecc60bc6aeb7b9ecf80c7ab578619648c349270b9cbae519db7d88ff75cdf01d58d9b861b3172d7f9ef8
-MISC ChangeLog 5112 SHA256 38b0de52fc7bf9dcd708d57a55e2ce8f52eae82f90eae7d22dd31234b09a9128 SHA512 0182e1bb2fb2a080128f492be24cbc34acef22a59e9c0376fc6e69207f26cf8ebb431355f670b4088009823dc9ff7eabc6eb05d6a1a66f0e792cc8fc4bd518b0 WHIRLPOOL 24b56315c1737ea62c4b378ca9ab7cc45f8a0251ad5d1fbc84386192794afde05d249918daa3ed745b1534b70ad5fa331ef4ee363df46807b9fbe2992633943c
+MISC ChangeLog 5285 SHA256 ad5fef8202f0de7e86835408913f70c4d420cc41e1b22ad15d9756c62b6ad542 SHA512 5c008d3b489333b4eee1c4c7a381b18256fd55772147b22a4010bb35207450123b4141b9a15e0400c3ce448b717d1bac77e83fc97f29cac06c7de0573944898e WHIRLPOOL 5a76ee9778adb005e5255f7407d84e41c207544b585f5ec3085806bf5544e3794c391242454feb19b52bdec5f94b327095cdf9b87410707945b0efa0483153b2
 MISC metadata.xml 272 SHA256 dcb8ec15610a3eef62f9d23edad84415c2e533cdbd39a2e04bad6228e3fba98f SHA512 693a10453cc5ae8d645ba4f45439931fbe69c5dd1f0710b30a311481ec7d4dd33b6291e1ac0accf8fe27154b31fc33095e965fb2e2afb951d4a773b39ae02767 WHIRLPOOL a05cbbef3e2da2acc698abcc814290cd39484de28ebc321fd72af097cab0cee36a896cfcaed8fa3ab63f6199a18599ef590c08ead21809576103772ba9a8b400
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUfJlsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUxRw6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirVroP/A7+XBulZhjkO2OIHUAjQwCx
-g3U9rCHgrKfSbUelJzfLKgxwOVzcmmSMtx33n+/FrrX0bncKGnUUaPzCFeQsKqYJ
-5kaKw93K59bqn044uv/V9Z8+9Ui5GIgVemUWZXA2q5xPFM6Gyjheq6PBMjeSR1Bg
-ORfxk7qZf0xW+WSbuBFeG+Klsu75q859xz3+EF32/LbV03vYVFJrqJrk8upVSzKb
-OgDdsPJ9JgHtnXoNSK8BfSr4xuJb4I72P/E3b96ArVTz03TGsp85QH7PUAULjqsm
-Wv3GfwXFOGniOyO1RsMExItxCPjCYN+66CG2IUSDASjeoML+1Bc3uaG3HrU4R7zg
-0zwImdhQV4SHiHsh/mVyl0BgTRXKGUTMep/GUqD+NOcJRLIxiW/ZP2giOHx5Tw5d
-+LVuU+vt2L0zYHOQCIiC7/uvTX17mVcAszwHJhXvLRGJxNx2TpLZvwrOrFkxhbLW
-on02O0vm9uyY8wI1x5YNbSKe/femCtQGi2UjvzHYlWr0WayCSqA72CU+zlrw/wp4
-z7gez+pBkTfsOLkl5S6pKkBsY0hlFnbvOahMAqI/4fae5DDXTeL58AxBMF0pC4Ka
-JO3qWJ6/fswl9uvu4aqYA0J8K0q2uiCNOoZ4ew92QBIItXMSiempW988tx7dPtaq
-s7nodwQZkxe0S6QK1tJ/
-=TfuG
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir2qsP/2JS0hXbUn91ZmZhs/Uj2Qef
+WZawRZ1n/a/q5OQVwn7Zv5I0qeIlY5anJWF8iFfwp5BL8PBYNZGSK+4ORnXBF5qZ
+MGSwIshAGG+MMm6VZp2DhEn+72HLXDDOGlgrpErI4h4am0/ZmTvohKd13E92tLq3
+qyNHAEj2/aQKbrc7tVFk4cC+pW5A9GhObHRttLRV4zvphEqBH1sIeAynsGuKsSaH
+/zuDG8PghKLMCFs2SRCxNwBnxDn56Sghh0PV/4tZ8W1ufPJ8Hw5ipTg8NyGEy4RM
+FRfSrvN2cmB7CH/Lc8wlFXjnLmZ7swKL0qsoHk5n233u075Otet2T4k2yFg0Zx4C
+lrkS5A5i6jeC3L2+FykwQgddVTnW7P6oQL7+n5aogCWXvXmPdpvV/zPqMkruDqjX
+9ASNGc5JcTKOHqi/HdaDmY5vGwgVj9g7e8IVgeeRxPsAj3Geam8c3eXE2siC+9L4
+A4guPSLza0SoYe1JWWV9mUh36raAASnNwEXl9QCSYx3T5BQwwSlu9uZeLnPvVSai
+0xRvffBLWGn2Y6agg9VkhiMzd1xX+VJY5GcdrQoVFtOg1UV1p3sNNkzMm8AKHXte
+4OyXTyPemBDypqI7WLyJ+j9yhEko18RfcAm1GerPRl0IkB+sKKOHDXPqZHmavnn2
+BVJHSWSq4U1pmvySrdC5
+=n8pP
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.6-underlinking.patch b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.6-underlinking.patch
new file mode 100644
index 000000000000..a9c38159ba06
--- /dev/null
+++ b/net-analyzer/openvas-libraries/files/openvas-libraries-7.0.6-underlinking.patch
@@ -0,0 +1,32 @@
+ base/CMakeLists.txt | 18 ------------------
+ 1 file changed, 18 deletions(-)
+
+diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
+index b798f85..c724473 100644
+--- a/base/CMakeLists.txt
++++ b/base/CMakeLists.txt
+@@ -100,24 +100,6 @@ endif (OPENVAS_PID_DIR)
+ 
+ add_custom_indent_targets (${FILES})
+ 
+-# Link the test-hosts executable
+-if (BUILD_SHARED)
+-  add_executable (test-hosts test-hosts.c)
+-  target_link_libraries (test-hosts openvas_base_shared openvas_misc_shared ${GLIB_LDFLAGS} -lgcrypt
+-    "${GPGME_LDFLAGS}" -lgnutls "${PCAP_LDFLAGS}" -lresolv -lm ${WMI_LIBS}
+-    ${GPGME_LDFLAGS} ${LIBSSH_LDFLAGS} ${KSBA_LDFLAGS} ${WINCMD_LIBS}) 
+-  set_target_properties (test-hosts PROPERTIES COMPILE_FLAGS
+-    "${GLIB_CFLAGS} ${GPGME_CFLAGS} ${LIBSSH_CFLAGS} ${KSBA_CFLAGS}")
+-endif (BUILD_SHARED)
+-if (BUILD_STATIC)
+-  add_executable (test-hosts test-hosts.c)
+-  target_link_libraries (test-hosts openvas_base_static openvas_misc_static ${GLIB_LDFLAGS} -lgcrypt
+-    "${GPGME_LDFLAGS}" -lgnutls "${PCAP_LDFLAGS}" -lresolv -lm ${WMI_LIBS}
+-    ${GPGME_LDFLAGS} ${LIBSSH_LDFLAGS} ${KSBA_LDFLAGS} ${WINCMD_LIBS}) 
+-  set_target_properties (test-hosts PROPERTIES COMPILE_FLAGS
+-    "${GLIB_CFLAGS} ${GPGME_CFLAGS} ${LIBSSH_CFLAGS} ${KSBA_CFLAGS}")
+-endif (BUILD_STATIC)
+-
+ ## Install
+ if (BUILD_STATIC)
+   install (TARGETS openvas_base_static
diff --git a/net-analyzer/openvas-libraries/openvas-libraries-7.0.6.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-7.0.6.ebuild
index 7460dc659eb3..8c8b06613123 100644
--- a/net-analyzer/openvas-libraries/openvas-libraries-7.0.6.ebuild
+++ b/net-analyzer/openvas-libraries/openvas-libraries-7.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.6.ebuild,v 1.1 2014/12/01 16:38:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-libraries/openvas-libraries-7.0.6.ebuild,v 1.2 2015/01/25 16:36:34 jlec Exp $
 
 EAPI=5
 
@@ -37,6 +37,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.4-libssh.patch
 	"${FILESDIR}"/${PN}-7.0.4-bsdsource.patch
 	"${FILESDIR}"/${PN}-7.0.4-run.patch
+	"${FILESDIR}"/${P}-underlinking.patch
 	)
 
 src_prepare() {