net-analyzer/openvas-scanner: Import fedora patches

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

12 files changed, 324 insertions, 41 deletions

diff --git a/net-analyzer/openvas-scanner/ChangeLog b/net-analyzer/openvas-scanner/ChangeLog
index 204b03de6e96..c4afdf6a06ea 100644
--- a/net-analyzer/openvas-scanner/ChangeLog
+++ b/net-analyzer/openvas-scanner/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-analyzer/openvas-scanner
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/ChangeLog,v 1.6 2014/09/28 15:40:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/ChangeLog,v 1.7 2014/09/28 18:12:28 jlec Exp $
+
+*openvas-scanner-4.0.3-r1 (28 Sep 2014)
+
+  28 Sep 2014; Justin Lecher <jlec@gentoo.org> -openvas-scanner-4.0.3.ebuild,
+  +openvas-scanner-4.0.3-r1.ebuild,
+  +files/openvas-scanner-4.0.3-bsdsource.patch,
+  +files/openvas-scanner-4.0.3-mkcertclient.patch,
+  +files/openvas-scanner-4.0.3-rulesdir.patch, +files/openvas-nvt-sync-cron,
+  +files/openvassd.conf, files/openvassd.init, +files/openvassd.logrotate,
+  files/openvassd.service, +files/openvassd-daemon.conf:
+  Import fedora patches
 
 *openvas-scanner-4.0.3 (28 Sep 2014)
 
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index b0901aac236d..fa8bce709a9e 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -1,9 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX openvas-nvt-sync-cron 759 SHA256 ac19149e09420b34d56bf75ec349b59e4dc20978125e5cb290686209b47d088a SHA512 88f299141e66e9d95f565307bd121c56c005f412dcdb64e105d9d4252cfb43e218f1de7b40b500d71b415d2aa437468ce1e935dec32cda8c5efc4f733978b0dc WHIRLPOOL 7dc1a707443229630ad90951d8c41681b8ae360c892eec39ab9d003582baf8250fdca3eb1b48c4d19eb24e118b5bc96ae6769d6d2937fa1d4f66ea9691455fa1
+AUX openvas-scanner-4.0.3-bsdsource.patch 740 SHA256 887b7b337a0b95ccc4ac5466b62c6b2380aed7583c870db21e52228577a79eba SHA512 a4489fd24d709dce0e0099adcf8c25754e9c4826d648172eb33b21a4d4ff3e412d60ee8ed5dd1dbdf0df2bfb6e824be973120ca27fc9281d2079d44b996e4d5f WHIRLPOOL 2b60454994775ab53035d5b0bd0f26907ecb5cb7949c3f8f05cd7c8f355f1fa3e56b5738168a51f7c5647a2fbd95c4a33615f771ae9c825bf55f9251ce93a55d
+AUX openvas-scanner-4.0.3-mkcertclient.patch 1350 SHA256 55cfdbbdb2b714b27395acef329c831caf868e65635c628d197b5c1e13a83026 SHA512 972eda6fe3a7b7ba195fd9198d6b63add4e0af5ff9e34e423afac945d5dd497bd65f993d7ceda3848741cb954c5517e263533867e2da7d37bcc8905e926b4f72 WHIRLPOOL 9177c9d57a9288c07b13973450e5d92ebb61c374eb321da1b28f30dd90bb3ce73773b8e9570133d7973658135d1511d6de40dcf5c106a69732d3b79f802a2093
+AUX openvas-scanner-4.0.3-rulesdir.patch 607 SHA256 52ba77377d4ad1f1dcccf5362e2b4aa1c28e0c473ac5e8a07f9c2b1ef6ffebd7 SHA512 81002d66e103bb3d0d087a2037f0431739d5d664ada3e6b9bdc9d31e67159d7da0664d43e83501bf9dd01b6887bff14b02a883e261f3273ed42a27dd4ee53fa5 WHIRLPOOL 881bf021ae4099233531dedd37d7a85c0947e32ec837ad6bbc4277095c17771e8b61230aadb65b332c64cd797e32088951e947778acbfc1408632cf20ac99244
 AUX openvassd 471 SHA256 79b3f885c714c1b4b38b8d1f15834ac002fa6358b2f099305596c10cd3f3f73e SHA512 fd712182e6c3528efc73f1fa38c21b1ba3e90e93c02379de984ec65257d4612f31f65222db1d7b6e90e5a6939b3a59b4b7b904cfd9a6cc8eee10db5c57210bc6 WHIRLPOOL 85929120099a69ed8748574c6b9d698199fb1d30b26543c779e2afa6fc109b03eaf7ce069feb73cc0ecad10026e1454a770f265cfcc085e69917e8a277459426
-AUX openvassd.init 499 SHA256 a57b6affc042f70a2fd5015038f2fde8f7ab25fb031d28a10937684a76ca53a7 SHA512 97e29a0ea0849690c5f3792cfdf45e48126cc78f65a4a7b786456366ccef133f67ddae372dd64be8d10fef23b024b7a9720a2039ad243ee9ca663e59ed5ca3d4 WHIRLPOOL 1a3ac636cd65ac9d47a00096fd4db4bd71df1b593c002e6cb45774c4de84358812b5feb6d026aea94c0d7d5a4cf40ce4f2611dda0c418b091ffcfca2e6c39eaf
-AUX openvassd.service 100 SHA256 b0c1fe753eaa797610eea41c7b1326ce9ab0866cf3ef48f3edfe68126c99884d SHA512 e956c10d43019a44c4a21f05eb30a1a72e83b4a423891eb654195c27b258a8f1eef7a351f37da56a95335b3d3925decc6afe778ffb6a5d10d7c3f50c5b3cac40 WHIRLPOOL ed27c131d1e9c22d172c722b8cf23f705841efe990095b74daac31fcbe1362425615321c5e5ba8fa415a95c1ff16618080decb73efacbe5b9ea053ba73356e03
+AUX openvassd-daemon.conf 779 SHA256 b0cc0f26b25f5e8199d5dbd92bc5397b7f3ddd90a78122374dc84eff858f2256 SHA512 42b244106e84d2080ba6c2641e985fe4b74d0c5f693259384685422f8bc3bfae93bd0993197e5c4036a9ba2885a1ee7b0897100dc878ac248e9e7bf6b5b213a6 WHIRLPOOL 9416e1acdbecaa3379c7ffd17b4fca68981754e8d3711c42ef9ed05cc161c538709005db2c5bc21c9f1850efc2697676ac2c7e4e2bf008386af39a8af75bf429
+AUX openvassd.conf 3295 SHA256 c01dc363c4423dfa791690b6cef50df8ff46af02bbf008ac07575351ab94e0b3 SHA512 0d203cd2dfcf0b77ce8d2546235de16f23ea71c7e601db557fcd67e9c8dc460029494f1a146daadb44101ae194d7fa4d511a488bb69094e5470de9e10acf008b WHIRLPOOL dc5fa7ca7e6035a69e4390cf86abe529415f7390dabdef58a2c9f36789a0311ed24dd219f2287fc49b0287cd0cd15442d32aa516043f2cb3422236d91dc9bd47
+AUX openvassd.init 280 SHA256 aaf618af9f3933716711a754f009717a87391325d3098357ddc02ea9d29d899d SHA512 e4cfe24165287ab0e1c64e1c5a982ba6776ed7bf375662f64f1b73157c29f5e0bd31b0ca531fceb35e8c61971c521bd15170e61284cf0b87069dcf4f8a836830 WHIRLPOOL 9eff803a24d3add333c76ef95916993aa5b34d237ea4d8c3f1cc9fe2b9b7e919a668afd71c01d01aa84ad88a3b31827277b033ee40a438f17c0e2e5edf41f5a6
+AUX openvassd.logrotate 209 SHA256 c4623fe22f777e722915b6a4cf19030fa54a1fb18fe2ee074e3fb2a2fe6b81ed SHA512 5934a31ef4b7267fd741c41bb97fe2e1e42735d2324cce07145de1942efae3f5e42e8652ec0c3482dd53477be420a58124eae943f254105547abf065febb9046 WHIRLPOOL bcc32a513941f034bec581cd9b96c2f5ccf9c355c6ed46b58437b7391d197c82a43c4d6d063964ce1953fb868c8828e66ea2ff7b1b60610e14e91865553312d4
+AUX openvassd.service 325 SHA256 f9e734f1f7db81d8b1b536c15ade06e131d9ed9aae696d74dc6f7d201b5b0f8c SHA512 de5f4d5ceadb8dfe1959bf1f5a1ba87fd37a7481a338c7162a304a7ecdd34d77908eec0935ed1e418a18e4a0ff7321546f36ba53b14d673183d467d6d9101432 WHIRLPOOL 65b0b139036972f15a61f1dd52384368940d617f06a45ef42aef355a86cf0cedf60933c46e55212dd399e34500d5c5ad71759be3fc64c27750df5b8bcbfd9dcd
 AUX openvassd.tmpfiles.d 23 SHA256 271a5f3184c1795f3d3fdcca2cad51180e24334cada104f3aab02281125bc479 SHA512 0ca7726f5f30465eb73b41cba1fd6f377af441793520f25ffb04a09920f8468ab0f2702be52110b452be2847359a8079b8cd9a955fcea1bb78b3a748e34c9b44 WHIRLPOOL 223f2e7cb2a25464d113c5dae3addac3463c6015de04b643b3bf9b1ba8901ae5c7cffff2af2a70887c6a5279c54b2dc4b33b4fcd223c5b9decca821fb41a9305
 DIST openvas-scanner-3.2.4.tar.gz 228199 SHA256 ac26e085476709183c8512a1fecdcd4ca242c44572892e2ab0ea7ea2da78351c SHA512 bd3cb4ac46fd02558a5a9434914fea569295f7054e10b9e13258e481518ad7c1d03f3e7dcbce1b6338f10872f87fbdacd8c88185d39953928c2124b9913f7440 WHIRLPOOL c200d5ddfc348cbeb24f23812870b3be1dd9a389c8a63bb356d78128a4db6ff4160f44f49c71c164e393b40c056f9c64e32c0f68bae94385536d4e589061c46b
 DIST openvas-scanner-3.4.0.tar.gz 234786 SHA256 a9cf0d9e22d2dcd6aae7990364421cbac4309ed45748bb12e70245ba942e6112 SHA512 2aac1ddb8223f84d4d404cd14fe07b2a70b1f204548c65bc3fa951cc97021e2010512570b6292d312eb0eaea8f6910c7629b08709aef9e93722b6f985ac159ae WHIRLPOOL d119ec23979aa8474afffe28ef08eace566d1ab89f0173bd9556dd7290c4573fd52dc59720be1e29f606eac3cb5289f77527defa1102b6829ffcb93ae967e08b
@@ -12,25 +19,25 @@ DIST openvas-scanner-4.0.3.tar.gz 214589 SHA256 5c564862b17eeecdc474426c65dc9bf5
 EBUILD openvas-scanner-3.2.4.ebuild 1246 SHA256 0c84f5d32574405b54f2e75b88f799ac089155688a01d23680981e90f229c93f SHA512 5eea22ca60e3f5a8c1e4358017ec676ba38c09ce8f5560a783d9aa3d0ca22d8978a88b69e483d47e62d07ac0465f8a7a5d8a33c9d021e2c02d3b60ed7a50146d WHIRLPOOL dc4b8f160f02331cf37c97a5da0f1fffd0dd74cf5f2f4c77351cff645259df53b44f21bd91e676372fbf28780bd36f249929bdc47c779fadfd671edf7942b5a3
 EBUILD openvas-scanner-3.4.0.ebuild 1166 SHA256 4b98a937edd61cb2f8dc3b8191de581b650017b2fa60b84b9d20223f69f9e624 SHA512 bc83e1142702ca8d2fc9159de4314a80e605dda9a848554b77660696743d88495dd8f60b84d3839ebc76dab2a0825691cddcfc42a558ce21be62c92b007e87d9 WHIRLPOOL ff3b5a64bdc4fc75c4d23d07301318576fc67a82f9947d611c37a68c9fc04331ae0fdd0a8668d08f95a09f6b4de955fbc5bf6c257599b11d45b2d1c286245c57
 EBUILD openvas-scanner-4.0.1.ebuild 1165 SHA256 229e52d9f2777853d008987377b143ba939a2f3e07d438d4942e8d1bc0d7694c SHA512 0174b155b58b7ca6d65c6d76627c0b208766669f288c7c50897ba7fe3ea5ef12b88226aac5f7683ad89ed23c5a464b801a37074af6ae4a683677f939af5a25c4 WHIRLPOOL 1c8ce3a234218ab67421ada2949daddd0826ab4a671664e32877f2f3fbd67bc617e368934e5d2a153f192feefa46c87b7a0034afdf7d354d717df3a7cee6ecfc
-EBUILD openvas-scanner-4.0.3.ebuild 1230 SHA256 461e461c662146e1af04f497aa5d37ef9d983e5557de0775b878a224d4427a9a SHA512 2cd52afd24bbd2a58594ee1b1c09e6aecfe4ccf516b76c71ba4eecc09c28f82744a57638da93bce0cb305abb659d4c2ed3ea8bd662208f36252c6a68cef47a76 WHIRLPOOL 5be9cb9c0c722677c7eca266c80355e5626328fcbb607643daace352d0c89790736f944f08dbea8b03f03b6d62bbc91c7a96309121c72e10e49e19a0347003ef
-MISC ChangeLog 1180 SHA256 2080ff7f45c4cc9aacd10b24c81774791dec4e2ae7f04a74e5b815a8b37adfdb SHA512 dd014a0521532fe021f3ba4d945396adeacaf6ff0aa38d455abf6149324a817a9c09faffa3f6f7ff222857cf59aaec177835c34dadbe5287a68033fa6839a4b6 WHIRLPOOL 16ea5340bc3e8dce5a4f20c7bbace8b61fafba955f13aea3e4cc9e62d4ea60819b319fe704bfdb36ea2eb7d8b1e1cdfeb8c32c9e7ca6e26dacd1b32ddcce6ce8
+EBUILD openvas-scanner-4.0.3-r1.ebuild 1625 SHA256 744dc2bf554812864402146f33bac3c44f0696860b065a4e5b4c5886e19532ce SHA512 97d2de8de390385d4291c36e217121c3c12f1671b65ae0575bbddeabd8ccd649cd3256604f2ae2d81c15402c16fe2e1aa97265c4e44151126c31048892f43695 WHIRLPOOL 46a08c733720d7a820cc986cbcd5e69ac13960bdbb0b120a2f109f2f842a05bf94f66e8f220893b6e8f68d3d34e011ea6cf0507da1424e607b630f4462f8ec4f
+MISC ChangeLog 1668 SHA256 344ec09de94455c2ba9c260b07d6a1ec8815a076d45fdcefe461d4b540b451fa SHA512 8fce9bd74bf02c3085b48f9d0429c337b3a22077b31fa4553a148efc9814c0a60b6870dbf08b816a4375da9c799b99221c2dad1361ee304a0fcf1cc8c83426e4 WHIRLPOOL 7782b98b531462f5dbd996f28a1e5e59d2a17709859da8e26099adda7fc9897e259f28ad78036c94031497c87485906991276b9d210b7be80b6f46ce4f5123d5
 MISC metadata.xml 206 SHA256 5ed6f72b0875cf8d913b70843b7e7474d237a6fde6da5d2d0a9fb1b0a6530ed3 SHA512 1129ba77fc749f7d7e57b6d3754f24b6391186ac970ee47bcf761c08b1e5df412f4ae18ba0a0f5fc159f4cc3c7647a8030c0877b06a669e5562af50019dfaf41 WHIRLPOOL aa2e2f263c929e1ef192e131912b5d645b1162aa28f8a297a5998af645e232828ba1ae62b6260e7ad426d2e05519d17154dc993ff48cda3c497585d93bf60d0f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUKCwBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUKE+RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirviIP/13i4qMOl7m8N75f8keXAl+r
-u4rxWjAiyPEVEFFY+KdliFEWTMhPBd7JFTYXIiu7CP0p6p3tX6olRvZ13dvAyw8y
-E7IbRdR2dl87ROI6f+9Zhxw84r1EE1CBQckGmb7jZcRoJx99IX/EL69a/uhzKvqn
-R9mEX+1eEZdqhkAe+IToFJQUR2i9/HrboaijtCHZQL14kPSsH4aTEc4hidsS+kEu
-5O/U4ObadRioZz+RQeBJJqbRwK9TiAHEbTIm8zP59s260+B+IWOvXlDH9N2UEe70
-oa4g+yiZXNNSm/QCxPrKmVG2RuBEwpD2jzvaQe9cJtGVXLrFLAOkRnlosV/3qn1b
-KlNQZk/54GNViah915kMx4yS6q9o0kEY3iXu9kEBWgq1YwocY+WMzq89Y3jsLk95
-InbFw72hpOPAxK+hXe1eeq6poBVe1bBuZNqNSiWzDYeFEjLS8WbbhI2HGSCNfqRn
-HRmUiS0V5jKxPzLz+6pxcufJy4Iehk7eM4Bv9HWZTfzFlokc7v0TmujdeLYhDFgj
-xAlOuK4DB2KLuTsqnB+019ZhksmxHJHXMW/wWTjFWOad6zPSnkWXrsySS3//zjG4
-qVkyk0XICCZ9HkDU2RNK/ZqjSDMsMRv+MiHCalq+DyvJS9I92oF9wiPh/mv4OpXM
-JoJCoFwjVTHnw45z31SR
-=UWtr
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir5T8P/jxAdqV7gw9nG8D39VbNxzCG
+f517LJ3sp2uCdyZBThuFoz3MNsYz9nNwajj0SIG/rlA52/UTu6egmJ1Ke0QuVoLK
+msPKga/YZp3milw1G503cJs3/yo8YMJ5MeKHLn3sqZINWC+SUl9EA5nHqbH/OCd+
+xWce8UMfdPDXMZnxjjdN8E1zWwicnVWm80c3DroJDtIypvTB9KIL/MuYj2WDAPvV
+55FN982KQd3ClZXIpFJmQzvbWKaN3abdCM2nkxUMDkhuvzsrIFZmOMtFCj2M8s7l
+uzxXE37sqOvCUM5hyhP8FtlCjWnY5HXQfJcrpCA4KQp+yNEIyYo7ixF2BhCoLe/P
+GhxVYqVL8edPX3S8a4WA8IHim3P1T/ZX2vPSYY4p32uhzCcsmsa8yYJyBX4b2xSV
+d7U7pY7tCieWYvVs/Fgs7pjadce5l0lK6mxLhlvY/ei3+A0DM6qFMf6wG5Q7b/Ee
+IdQyUHp++YkaARFZbC6eO9gP7yXv0YlK6WGlRTgKu4ygRraynrYCPTLCv/ecroge
+kaAN5ekCuWqojmn584XkUxBEJOvtD+tsTE6bPlChdoRCMXzpNfRFM/DyxioH14wm
+kxmSMWX334ZGDY7c514ZND5eidAlQHBAYC1+VDVFHhKPTVg22HNMCxPsS8gkIIcY
+Cw5nVq0qRD+tQxkctzMb
+=6KPJ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/openvas-scanner/files/openvas-nvt-sync-cron b/net-analyzer/openvas-scanner/files/openvas-nvt-sync-cron
new file mode 100644
index 000000000000..e6a83867f3d9
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvas-nvt-sync-cron
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+if [ -f /etc/openvas/openvassd.conf ]; then
+	. /etc/openvas/openvassd.conf
+fi
+
+if [ "$auto_plugin_update" != "yes" ]; then
+	exit 0
+fi
+
+opts=""
+case "$update_method" in
+	rsync)
+		opts = "$opts --rsync"
+		;;
+	wget)
+		opts = "$opts --wget"
+		;;
+	curl)
+		opts = "$opts --curl"
+		;;
+esac
+
+# Export openvas-nvt-sync's environment variables if they are defined
+[ \! -z "$NVT_DIR" ] && export NVT_DIR
+[ \! -z "$OV_RSYNC_FEED" ] && export OV_RSYNC_FEED
+[ \! -z "$OV_HTTP_FEED" ] && export OV_HTTP_FEED
+
+/usr/sbin/openvas-nvt-sync $opts >& /dev/null
+
+if [ $? -ne 0 ]; then
+	echo "Error updating OpenVAS plugins. Please run openvas-nvt-sync manually."
+	exit 1
+fi
+
+if [ "$notify_openvas_scanner" == "yes" ]; then
+	/etc/init.d/openvas-scanner reloadplugins
+fi
+
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-bsdsource.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-bsdsource.patch
new file mode 100644
index 000000000000..f90b35ed7ec0
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-bsdsource.patch
@@ -0,0 +1,12 @@
+diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.bsdsource/CMakeLists.txt
+--- openvas-scanner-4.0.1/CMakeLists.txt	2014-04-23 16:00:47.000000000 +0200
++++ openvas-scanner-4.0.1.bsdsource/CMakeLists.txt	2014-05-26 16:11:23.018940789 +0200
+@@ -235,7 +235,7 @@
+ set (HARDENING_FLAGS            "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now")
+ 
+ set (CMAKE_C_FLAGS_DEBUG        "${CMAKE_C_FLAGS_DEBUG} -Werror")
+-set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_BSD_SOURCE -D_ISOC99_SOURCE -D_SVID_SOURCE")
++set (CMAKE_C_FLAGS              "${CMAKE_C_FLAGS} ${HARDENING_FLAGS} -Wall -D_DEFAULT_SOURCE -D_ISOC99_SOURCE")
+ 
+ add_subdirectory (src)
+ 
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-mkcertclient.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-mkcertclient.patch
new file mode 100644
index 000000000000..05e92728f182
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-mkcertclient.patch
@@ -0,0 +1,29 @@
+diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.mkcert/CMakeLists.txt
+--- openvas-scanner-4.0.1/CMakeLists.txt	2014-04-23 16:00:47.000000000 +0200
++++ openvas-scanner-4.0.1.mkcert/CMakeLists.txt	2014-05-26 16:04:23.093548608 +0200
+@@ -258,7 +258,6 @@
+ #         DESTINATION ${OPENVAS_SYSCONF_DIR})
+ 
+ install (FILES ${CMAKE_BINARY_DIR}/tools/openvas-mkcert
+-               ${CMAKE_BINARY_DIR}/tools/openvas-mkcert-client
+                ${CMAKE_BINARY_DIR}/tools/openvas-nvt-sync
+          DESTINATION ${SBINDIR}
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+@@ -269,7 +268,15 @@
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ 
+-install (FILES ${CMAKE_BINARY_DIR}/doc/openvassd.8
++install (FILES ${CMAKE_BINARY_DIR}/tools/openvas-mkcert-client
++         DESTINATION ${BINDIR}
++         PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
++                     GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
++
++install (FILES ${CMAKE_SOURCE_DIR}/doc/openvas-mkcert-client.1
++          DESTINATION ${DATADIR}/man/man1 )
++
++install (FILES ${CMAKE_BINARY_DIR}/doc/openvassd.8
+          DESTINATION ${DATADIR}/man/man8 )
+ 
+ install (FILES ${CMAKE_SOURCE_DIR}/doc/openvas-mkcert.8
+Only in openvas-scanner-4.0.1.mkcert/: CMakeLists.txt~
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-rulesdir.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-rulesdir.patch
new file mode 100644
index 000000000000..90f998ffd40c
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-rulesdir.patch
@@ -0,0 +1,15 @@
+diff -ru openvas-scanner-4.0.1/CMakeLists.txt openvas-scanner-4.0.1.rules/CMakeLists.txt
+--- openvas-scanner-4.0.1/CMakeLists.txt	2014-04-23 16:00:47.000000000 +0200
++++ openvas-scanner-4.0.1.rules/CMakeLists.txt	2014-05-26 16:07:37.454116277 +0200
+@@ -171,6 +171,10 @@
+ set (OPENVASSD_DEBUGMSG "${OPENVAS_LOG_DIR}/openvassd.dump")
+ set (OPENVASSD_CONF     "${OPENVAS_SYSCONF_DIR}/openvassd.conf")
+ 
++if (NOT OPENVASSD_RULES)
++  set (OPENVASSD_RULES    "${OPENVAS_DATA_DIR}/openvassd.rules")
++endif (NOT OPENVASSD_RULES)
++
+ set (NVT_TIMEOUT "320")
+ 
+ message ("-- Install prefix: ${CMAKE_INSTALL_PREFIX}")
+
diff --git a/net-analyzer/openvas-scanner/files/openvassd-daemon.conf b/net-analyzer/openvas-scanner/files/openvassd-daemon.conf
new file mode 100644
index 000000000000..7260b0ae8f03
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd-daemon.conf
@@ -0,0 +1,24 @@
+#Listen on given address - by default scanner listens on all addresses
+#SCANNER_LISTEN=--listen=127.0.0.1
+
+#Listen on given port - by default 9391
+SCANNER_PORT=--port=9391
+
+#Send the packets with the source IP of IP1,IP2,IP3....
+#SCANNER_SRCIP=--src-ip=127.0.0.1,192.168.1.2
+
+# Set to yes if plugins should be automatically updated via a cron job
+auto_plugin_update=no
+
+# Notify OpenVAS scanner after update by seding it SIGHUP?
+notify_openvas_scanner=yes
+
+# Method to use to get updates. The default is via rsync
+# Note that only wget and curl support retrieval via proxy
+# update_method=rsync|wget|curl
+
+# Additionaly, you can specify the following variables
+#NVT_DIR		where to extract plugins (absolute path)
+#OV_RSYNC_FEED		URL of rsync feed
+#OV_HTTP_FEED		URL of http feed
+
diff --git a/net-analyzer/openvas-scanner/files/openvassd.conf b/net-analyzer/openvas-scanner/files/openvassd.conf
new file mode 100644
index 000000000000..88f83f4bed97
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd.conf
@@ -0,0 +1,118 @@
+# Configuration file of the OpenVAS Security Scanner
+
+# Every line starting with a '#' is a comment
+
+[Misc]
+
+# Path to the security checks folder:
+plugins_folder = /var/lib/openvas/plugins
+
+# Path to OpenVAS caching folder:
+cache_folder = /var/cache/openvas
+
+# Path to OpenVAS include directories:
+# (multiple entries are separated with colon ':')
+include_folders = /var/lib/openvas/plugins
+
+# Maximum number of simultaneous hosts tested :
+max_hosts = 30
+
+# Maximum number of simultaneous checks against each host tested :
+max_checks = 10
+
+# Niceness. If set to 'yes', openvassd will renice itself to 10.
+be_nice = no
+
+# Log file (or 'syslog') :
+logfile = /var/log/openvas/openvassd.log
+
+# Shall we log every details of the attack ? (disk intensive)
+log_whole_attack = no
+
+# Log the name of the plugins that are loaded by the server ?
+log_plugins_name_at_load = no
+
+# Dump file for debugging output, use `-' for stdout
+dumpfile = /var/log/openvas/openvassd.dump
+
+# Rules file :
+rules = /etc/openvas/openvassd.rules
+
+# CGI paths to check for (cgi-bin:/cgi-aws:/ can do)
+cgi_path = /cgi-bin:/scripts
+
+# Range of the ports the port scanners will scan :
+# 'default' means that OpenVAS will scan ports found in its
+# services file.
+port_range = default
+
+# Optimize the test (recommended) :
+optimize_test = yes
+
+# Optimization :
+# Read timeout for the sockets of the tests :
+checks_read_timeout = 5
+
+# Ports against which two plugins should not be run simultaneously :
+# non_simult_ports = Services/www, 139, Services/finger
+non_simult_ports = 139, 445
+
+# Maximum lifetime of a plugin (in seconds) :
+plugins_timeout = 320
+
+# Safe checks rely on banner grabbing :
+safe_checks = yes
+
+# Automatically activate the plugins that are depended on
+auto_enable_dependencies = yes
+
+# Do not echo data from plugins which have been automatically enabled
+silent_dependencies = no
+
+# Designate hosts by MAC address, not IP address (useful for DHCP networks)
+use_mac_addr = no
+
+
+#--- Knowledge base saving (can be configured by the client) :
+# Save the knowledge base on disk :
+save_knowledge_base = no
+
+# Restore the KB for each test :
+kb_restore = no
+
+# Only test hosts whose KB we do not have :
+only_test_hosts_whose_kb_we_dont_have = no
+
+# Only test hosts whose KB we already have :
+only_test_hosts_whose_kb_we_have = no
+
+# KB test replay :
+kb_dont_replay_scanners = no
+kb_dont_replay_info_gathering = no
+kb_dont_replay_attacks = no
+kb_dont_replay_denials = no
+kb_max_age = 864000
+#--- end of the KB section
+
+
+# If this option is set, OpenVAS will not scan a network incrementally
+# (10.0.0.1, then 10.0.0.2, 10.0.0.3 and so on..) but will attempt to
+# slice the workload throughout the whole network (ie: it will scan
+# 10.0.0.1, then 10.0.0.127, then 10.0.0.2, then 10.0.0.128 and so on...
+slice_network_addresses = no
+
+# Should consider all the NASL scripts as being signed ? (unsafe if set to 'yes')
+nasl_no_signature_check = yes
+
+#Certificates
+cert_file=/var/lib/openvas/CA/servercert.pem
+key_file=/var/lib/openvas/private/CA/serverkey.pem
+ca_file=/var/lib/openvas/CA/cacert.pem
+
+# If you decide to protect your private key with a password,
+# uncomment and change next line
+# pem_password=password
+# If you want to force the use of a client certificate, uncomment next line
+# force_pubkey_auth = yes
+
+#end.
diff --git a/net-analyzer/openvas-scanner/files/openvassd.init b/net-analyzer/openvas-scanner/files/openvassd.init
index 8a7abcc47c4e..b6f4b99f4de9 100644
--- a/net-analyzer/openvas-scanner/files/openvassd.init
+++ b/net-analyzer/openvas-scanner/files/openvassd.init
@@ -3,22 +3,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header:
 
+name="OpenVAS Scanner"
+command="/usr/sbin/openvassd"
+command_args="${SCANNER_LISTEN} ${SCANNER_PORT} ${SCANNER_SRCIP}"
+
 depend() {
 	need net
 }
-
-start() {
-	ebegin "Starting openvassd (scanner)"
-	checkpath -d -q /var/cache/openvassd
-	start-stop-daemon --start --name openvassd \
-		--exec /usr/sbin/openvassd \
-		--pidfile /run/openvassd.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stop openvassd (scanner)"
-	start-stop-daemon --stop --name openvassd \
-		--pidfile /run/openvassd.pid
-	eend $?
-}
diff --git a/net-analyzer/openvas-scanner/files/openvassd.logrotate b/net-analyzer/openvas-scanner/files/openvassd.logrotate
new file mode 100644
index 000000000000..9316ba8d9629
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvassd.logrotate
@@ -0,0 +1,11 @@
+# logrotate for openvas
+/var/log/openvas/openvassd.log {
+        rotate 4
+        weekly
+        compress
+        delaycompress
+        missingok
+	postrotate
+	    /bin/kill -HUP `pidof openvassd`
+	endscript
+}
diff --git a/net-analyzer/openvas-scanner/files/openvassd.service b/net-analyzer/openvas-scanner/files/openvassd.service
index 99c4c3c90b6c..8e21571a3694 100644
--- a/net-analyzer/openvas-scanner/files/openvassd.service
+++ b/net-analyzer/openvas-scanner/files/openvassd.service
@@ -1,6 +1,16 @@
 [Unit]
 Description=OpenVAS Scanner
 After=network.target
+Before=openvasmd.service
 
 [Service]
-ExecStart=/usr/sbin/openvassd -f
+EnvironmentFile=-/etc/openvas/openvassd-daemon.conf
+ExecStart=/usr/sbin/openvassd -f $SCANNER_PORT $SCANNER_LISTEN $SCANNER_SRCIP
+Restart=always
+RestartSec=1
+User=root
+Group=root
+TimeoutSec=1200
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-4.0.3.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r1.ebuild
index cee7676c3ec8..c3eb5f088d92 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-4.0.3.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r1.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/openvas-scanner-4.0.3.ebuild,v 1.1 2014/09/28 15:40:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r1.ebuild,v 1.1 2014/09/28 18:12:28 jlec Exp $
 
 EAPI=5
 
 inherit cmake-utils systemd
 
+MY_PN=openvassd
+
 DESCRIPTION="A remote security scanner for Linux (openvas-scanner)"
 HOMEPAGE="http://www.openvas.org/"
 SRC_URI="http://wald.intevation.org/frs/download.php/1726/${P}.tar.gz"
@@ -23,6 +25,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-util/cmake"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-bsdsource.patch
+	"${FILESDIR}"/${P}-mkcertclient.patch
+	"${FILESDIR}"/${P}-rulesdir.patch
+	)
+
 src_configure() {
 	local mycmakeargs="-DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc"
 	cmake-utils_src_configure
@@ -31,13 +39,24 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 	dodoc ChangeLog CHANGES README
-	newinitd "${FILESDIR}"/openvassd.init openvassd
-	systemd_newtmpfilesd "${FILESDIR}"/openvassd.tmpfiles.d openvassd.conf
-	systemd_dounit "${FILESDIR}"/openvassd.service
+
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+
+	insinto /etc/openvas
+	doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
+	newconfd "${FILESDIR}"/${MY_PN}-daemon.conf ${MY_PN}
+
+	insinto /etc/logrotate.d
+	doins "${FILESDIR}"/${MY_PN}.logrotate
+
+	dodoc "${FILESDIR}"/${MY_PN}.logrotate
+
+	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
 }
 
 pkg_postinst() {
-	elog "To use openvassd, you first need to:"
+	elog "To use ${MY_PN}, you first need to:"
 	elog "1. Call 'openvas-nvt-sync' to download/update plugins"
 	elog "2. Call 'openvas-mkcert' to generate a server certificate"
 }