net-analyzer/openvas-scanner: Correct pidfile location

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

8 files changed, 142 insertions, 25 deletions

diff --git a/net-analyzer/openvas-scanner/ChangeLog b/net-analyzer/openvas-scanner/ChangeLog
index 594bf1cc3493..8a37a7defbb6 100644
--- a/net-analyzer/openvas-scanner/ChangeLog
+++ b/net-analyzer/openvas-scanner/ChangeLog
@@ -1,6 +1,14 @@
 # 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.9 2014/09/29 18:39:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/openvas-scanner/ChangeLog,v 1.10 2014/09/30 16:03:10 jlec Exp $
+
+*openvas-scanner-4.0.3-r2 (30 Sep 2014)
+
+  30 Sep 2014; Justin Lecher <jlec@gentoo.org>
+  +openvas-scanner-4.0.3-r2.ebuild, +files/openvas-scanner-4.0.3-run.patch,
+  files/openvassd.init, files/openvassd.service, files/openvassd.tmpfiles.d,
+  files/openvassd-daemon.conf:
+  Correct pidfile location
 
 *openvas-scanner-5.0_beta2 (29 Sep 2014)
 
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index 37769c3b9f32..6c664dbe0182 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -5,13 +5,14 @@ AUX openvas-nvt-sync-cron 759 SHA256 ac19149e09420b34d56bf75ec349b59e4dc20978125
 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 openvas-scanner-4.0.3-run.patch 1048 SHA256 eb29b53c02de879eabb419299a4d4cc30e54fc7c8377a824e8949b84022b2322 SHA512 f0ed922142cdb172426c770e610cd446d26237b28df4f224fa295fab19a28abfc651e90a3622689e2e576d483a267bbdc33d770a9c6502dd228d78bde04b6233 WHIRLPOOL 887f6fa5352a031f50259d4b91836d708b46d760b78d2c376650ce2c59b2706ceec61b07ce908bd9802e55476f00ef9a29e33fee46db21a0ba64756662772195
 AUX openvassd 471 SHA256 79b3f885c714c1b4b38b8d1f15834ac002fa6358b2f099305596c10cd3f3f73e SHA512 fd712182e6c3528efc73f1fa38c21b1ba3e90e93c02379de984ec65257d4612f31f65222db1d7b6e90e5a6939b3a59b4b7b904cfd9a6cc8eee10db5c57210bc6 WHIRLPOOL 85929120099a69ed8748574c6b9d698199fb1d30b26543c779e2afa6fc109b03eaf7ce069feb73cc0ecad10026e1454a770f265cfcc085e69917e8a277459426
-AUX openvassd-daemon.conf 779 SHA256 b0cc0f26b25f5e8199d5dbd92bc5397b7f3ddd90a78122374dc84eff858f2256 SHA512 42b244106e84d2080ba6c2641e985fe4b74d0c5f693259384685422f8bc3bfae93bd0993197e5c4036a9ba2885a1ee7b0897100dc878ac248e9e7bf6b5b213a6 WHIRLPOOL 9416e1acdbecaa3379c7ffd17b4fca68981754e8d3711c42ef9ed05cc161c538709005db2c5bc21c9f1850efc2697676ac2c7e4e2bf008386af39a8af75bf429
+AUX openvassd-daemon.conf 821 SHA256 c7695226d0d3513a1096797ecd6afa0c6da68610a622c0bbc9b941dd55ba6800 SHA512 fd8344f9c37c872868e44608a593bc7843163177b726eef31047b7357e3b5949e4c2d54be1acf8fe6642ba63a6e225e4f9c3650a9861b30174d66fd7341aefc3 WHIRLPOOL ab1192bf2f2a31bc02f1bdcc260f1a5cf61428b8e1f680bf2b4436142c1e129335a510cbf43cc4bf331c68805fc40c62d2f22dc83f907c40d589c5b6fb0a962e
 AUX openvassd.conf 3295 SHA256 c01dc363c4423dfa791690b6cef50df8ff46af02bbf008ac07575351ab94e0b3 SHA512 0d203cd2dfcf0b77ce8d2546235de16f23ea71c7e601db557fcd67e9c8dc460029494f1a146daadb44101ae194d7fa4d511a488bb69094e5470de9e10acf008b WHIRLPOOL dc5fa7ca7e6035a69e4390cf86abe529415f7390dabdef58a2c9f36789a0311ed24dd219f2287fc49b0287cd0cd15442d32aa516043f2cb3422236d91dc9bd47
-AUX openvassd.init 280 SHA256 aaf618af9f3933716711a754f009717a87391325d3098357ddc02ea9d29d899d SHA512 e4cfe24165287ab0e1c64e1c5a982ba6776ed7bf375662f64f1b73157c29f5e0bd31b0ca531fceb35e8c61971c521bd15170e61284cf0b87069dcf4f8a836830 WHIRLPOOL 9eff803a24d3add333c76ef95916993aa5b34d237ea4d8c3f1cc9fe2b9b7e919a668afd71c01d01aa84ad88a3b31827277b033ee40a438f17c0e2e5edf41f5a6
+AUX openvassd.init 437 SHA256 54581b20d14f392ca7e62f633db6d9a66919ff535c1ff307f4a8f064e0969091 SHA512 0375beecf7e3f133846263399aeb565eddc5984b0237f4f080595643ef36319c2726b1605c698d2b6d30b57b0fc9d4b6f4b9603e50bd4780d5d2d4dc9189b4ae WHIRLPOOL 0482c64d8a1c7333dea44402d8c0a98556238d8a7a5d56bb7f6bebe65f1631578e189e4e24b2390b5d1afb7c792be6847561786d5bef49007378d6379a42a740
 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
+AUX openvassd.service 353 SHA256 7a629d5ad040524f92bce13843d0ed953165809b48c3115ae566ba440117ef3e SHA512 418ca16f7cbfd5a2e7aff031810c9166743738eaa8b38ded7eb763796364c77dd4d19a09705a2da81df1b4591e2a0f7beed5d075c75a205133148903ec23f8f4 WHIRLPOOL da895ae0ad80959b146dfdd3c9be37177baf02bf99353b9e87850095aaa35b72e6c509ec7bfa12be888aa3b2139f5283c898f820a3d0e553ad5d564636808460
+AUX openvassd.tmpfiles.d 28 SHA256 7a0bd6c5fe5ddaa05f65a1be880474a541aece839b3ccf631781d081fe437a22 SHA512 b5d98625495353d32bdcaecf5499e2cbe3a8b1a84b067018b61f2ce6e110b0e3a14a061e8791c08891a7058976555a2c7971b48c90f690605129deb457b7b754 WHIRLPOOL 0039e8292a1678fb3fe05e38df312b8cc5d1349bbed9ccee893e59688ccef9e6a874efc3ec7baeab844b6cece6e1bb3f95c023eb71dd5d6d24f0bb3b312cf4d3
 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
 DIST openvas-scanner-4.0.1.tar.gz 214457 SHA256 7ac1849e4b06c1454a9f852e5c30c4c557e39474800038b71e76d4c5ab748671 SHA512 97b476e27e8fcce7060f8b9b0606ac232705e3dd1c4f380f679eeed31f7465d1031593ea08103d897f334efc7f8f3edc3da8142d9762b62a6d09d8c5f2033433 WHIRLPOOL e5794eae32df024f1f1f4e07673132747225482b41ea32fc223dd3379321966493549630ea9c2a69be3337f7187418363a36897ce9df6f8c3a08443bcf4510b9
@@ -21,25 +22,26 @@ EBUILD openvas-scanner-3.2.4.ebuild 1246 SHA256 0c84f5d32574405b54f2e75b88f799ac
 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-r1.ebuild 1625 SHA256 744dc2bf554812864402146f33bac3c44f0696860b065a4e5b4c5886e19532ce SHA512 97d2de8de390385d4291c36e217121c3c12f1671b65ae0575bbddeabd8ccd649cd3256604f2ae2d81c15402c16fe2e1aa97265c4e44151126c31048892f43695 WHIRLPOOL 46a08c733720d7a820cc986cbcd5e69ac13960bdbb0b120a2f109f2f842a05bf94f66e8f220893b6e8f68d3d34e011ea6cf0507da1424e607b630f4462f8ec4f
+EBUILD openvas-scanner-4.0.3-r2.ebuild 1751 SHA256 ff11700381b9e699878212764e9356668834ce985d477f5e59eed75a89b7dcb3 SHA512 5750449cd454490446f654e7b3d41033089b5fe75b2a203db2e4057a60f79acd726c5f85cc9eef6c23fdb364fc9e74bd226dc1fd3d6e6caedbb88378647f086b WHIRLPOOL 6b01683257518ceebbc4fa86169b4423ad57a6c50271e1f513e8c897030b0c673ed1379807f6fb96dec72b66337657dbc88f955320614cc3d8af7cec7992bf86
 EBUILD openvas-scanner-5.0_beta2.ebuild 1671 SHA256 5d9bdb107abe7d21369e0a8a031aadccd6d2417d0bf0bcb0ccec971962953d31 SHA512 8ac1ceba1066e71b598e897237c46c7a553f92668d289b03dba3d1e715c1a423b588604f360ee4b2a7e3fb0f131536a85771137c59c08d53c4f882221e22e804 WHIRLPOOL 1c2b2111c2c864298991d6ec6312a128a14a2f8cc54f5ce4a2834a5c8b082d98df4b286351afc8548cbdc7e4949e1ce310812b35410ca9ef7b9c519726e2720b
-MISC ChangeLog 1899 SHA256 fc48f4936481d725686f62b1896d7739f189dcc529958e36d9f80ad6ecf23f1e SHA512 f5bd60e48803e555194942afd1e504b6984d536094a33e82616e89856b6f1210f8956455f9d3a022aa1f625b206fbb8b093a763d1fc053d3f42f4b9ce8631ccd WHIRLPOOL 8aa0ef97119ab91b86f920a8528a4ea075dd4288d6ccf694e654fbb8021daa043a82b17380fa1a77f6992606fd131e90d5e7006288d33f9497f70af2263881eb
+MISC ChangeLog 2200 SHA256 036eda6459b985e05d0fa62a95a0a5273598c2fa4f93779b263f3dba71516d68 SHA512 1b4c8a2db47baf4d8f2d42e32097f603be84ed4e8b8461648b4f427080b0738764e298533bfca4545ba7ef98ab0123b2c6374133b7f036878c014eacc615a3a0 WHIRLPOOL ab6b2a689118781c84107b414342560dd5472eaa568b5e40fe2fc46e00c8e58ad4b54c6bc5219793473c23cf2e775e6ffbc376d94f67db41393e409096a40b81
 MISC metadata.xml 272 SHA256 dcb8ec15610a3eef62f9d23edad84415c2e533cdbd39a2e04bad6228e3fba98f SHA512 693a10453cc5ae8d645ba4f45439931fbe69c5dd1f0710b30a311481ec7d4dd33b6291e1ac0accf8fe27154b31fc33095e965fb2e2afb951d4a773b39ae02767 WHIRLPOOL a05cbbef3e2da2acc698abcc814290cd39484de28ebc321fd72af097cab0cee36a896cfcaed8fa3ab63f6199a18599ef590c08ead21809576103772ba9a8b400
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUKadUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUKtQ/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirL20P/2MydM7E8iw2rsG1zTETnoqf
-mxDIjxYH7nRK2HA9Tp/hcb0Mmc6lBnGEtK7eX4CLLOkF9FT5nE5ll/Cf41KkEtLA
-Pq924TqGGOw1c7gNq+iE9PC+E6EoRQneaufzOOtvqu5VfN03JYo9pIzZPDLhXCDI
-XiOO2Eok9VlU8wr2XSmIrF2yikfcrl7Bl4KBQkGZYR0AZVkTFaa+7M8FeIXY53Qv
-GrdXISxH5VLaJV5wguaLytFr2GwG+/PM7yQa5aZMQvdaXWbMAvsgdJl0iVSji/od
-RjVi2JiaTZUt7Xwl2J11VCZkumYP/hdUawg8eW7JkIdtduAtHwRCLkRBvDHGEgVq
-ufHvM0IVDxrKNH5QOTV9ETtPhGUgLQFNIDzzboNdKNBfO0dRCG72UHfBYub7a52g
-+n6tuiwheeYqG394X35EezuHjSRr12YsTq1jkp0NO408V77WzixV7i5Q8ZQMti0I
-TNA38zyzRXYxG2DwgRseVwVOD/xu2w3GioEFMCV0AkBCb7CVrJ5gCQpzaGpez1//
-NxgFp0gyXZGsLWjG5B8dDrZrEW+XWP6PDhEKifCCNFTEmup8PfN4ulXa/BmOcAEO
-IoZHawM6KHq/IlGj8MOrqx7yEsEpzLB9Ww3ektGmrbF3lvg1KQDV0VWPCw3pDs1i
-TR6VZjTJoDQmBJFpj8zV
-=eC3o
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirKFQQAKND0ousOZP/f++6tEzqe5RA
+LECvcznUAmwaV5xyRbvjAWWY4kjzezTTIpkz6MKDPutl13dnssJnyE7ue1uXsAK1
+uoaD63ql9silrHo//7j2Tie7Dh8UHxALxRaGHXddlqSWEuoyuhUNabfzIJbiQ8uC
+WoUD1xSlU2Dr2lS9jzgqCFZAuun0xZ/bpSJxLgfRpi5gxgnWMJOusW1SxI7gnr/t
+/CWYuBPjdwy8td61AogJzixtaPKJrX5CB5eXSz5VYbi9vDPQRDNOlUQKP31dKxWL
+BrU6jkpGWOPOO9GK/RyrK3mfFxlqiuwnz2kmZx2iIrdyPQ/12nIbHinjnvltpIqc
+3FtaTbpL0F0u55r5xtEmMog/aFj1QvDXbyLH2XkfNUDnlEMp5/ZBhVfSpy/K4dYn
+T2MuVlRlWxbFhHWwMhtrsYNqTlgx7A24WXlkkRGq+iuw5z0HpLz+zcshesgQALd4
+EOjIO7ebH711284F1di/Do+DyP9Bg5Tz9VxjOzCiUT2H1cxhvdNdNlC59OqtSaoK
+6yY9CPxSMnAGsgR/R9w1/JbskNcfxqnaNyIGVE2tk+NE8i/kbaeOrSiujLpdSfH7
+tuMY3VGitj4DubZ6T6QGsHBBPFvJwFNJA3CBYv09748HFFU8pfF+2Xlq6nhWEml4
+rGzrr9J4ogPNxWyIECJV
+=YmKc
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-run.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-run.patch
new file mode 100644
index 000000000000..2bd7e4deb424
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvas-scanner-4.0.3-run.patch
@@ -0,0 +1,30 @@
+ CMakeLists.txt           | 2 +-
+ tools/greenbone-nvt-sync | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c691100..d78ffa6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -155,7 +155,7 @@ set (OPENVAS_DATA_DIR    "${DATADIR}/openvas")
+ set (OPENVAS_STATE_DIR   "${LOCALSTATEDIR}/lib/openvas")
+ set (OPENVAS_LOG_DIR     "${LOCALSTATEDIR}/log/openvas")
+ set (OPENVAS_CACHE_DIR   "${LOCALSTATEDIR}/cache/openvas")
+-set (OPENVAS_PID_DIR     "${LOCALSTATEDIR}/run")
++set (OPENVAS_PID_DIR     "/run")
+ set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas")
+ 
+ set (OPENVAS_NVT_DIR     "${OPENVAS_STATE_DIR}/plugins")
+diff --git a/tools/greenbone-nvt-sync b/tools/greenbone-nvt-sync
+index 50bce8c..d773e4c 100755
+--- a/tools/greenbone-nvt-sync
++++ b/tools/greenbone-nvt-sync
+@@ -78,7 +78,7 @@ SELFTEST_FAIL=0
+ PORT=24
+ 
+ # Directory where pidfiles are located
+-PIDFILEDIR="/var/run"
++PIDFILEDIR="/run"
+ 
+ # If ENABLED is set to 0, the sync script will not perform a synchronization.
+ ENABLED=1
diff --git a/net-analyzer/openvas-scanner/files/openvassd-daemon.conf b/net-analyzer/openvas-scanner/files/openvassd-daemon.conf
index 7260b0ae8f03..628a223a4198 100644
--- a/net-analyzer/openvas-scanner/files/openvassd-daemon.conf
+++ b/net-analyzer/openvas-scanner/files/openvassd-daemon.conf
@@ -7,6 +7,9 @@ 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
 
+# Extra Arguments
+# SCANNER_EXTRA_ARGS=""
+
 # Set to yes if plugins should be automatically updated via a cron job
 auto_plugin_update=no
 
@@ -21,4 +24,3 @@ notify_openvas_scanner=yes
 #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.init b/net-analyzer/openvas-scanner/files/openvassd.init
index b6f4b99f4de9..f84dc3b7aa9c 100644
--- a/net-analyzer/openvas-scanner/files/openvassd.init
+++ b/net-analyzer/openvas-scanner/files/openvassd.init
@@ -5,8 +5,14 @@
 
 name="OpenVAS Scanner"
 command="/usr/sbin/openvassd"
-command_args="${SCANNER_LISTEN} ${SCANNER_PORT} ${SCANNER_SRCIP}"
+command_args="${SCANNER_LISTEN} ${SCANNER_PORT} ${SCANNER_SRCIP} ${SCANNER_EXTRA_ARGS}"
+pidfile="/run/openvassd.pid"
 
 depend() {
-	need net
+	after bootmisc
+	need localmount net
+}
+
+start_pre() {
+	checkpath --directory --mode 0775 --quiet /var/cache/openvas
 }
diff --git a/net-analyzer/openvas-scanner/files/openvassd.service b/net-analyzer/openvas-scanner/files/openvassd.service
index 8e21571a3694..553b09b5b2fb 100644
--- a/net-analyzer/openvas-scanner/files/openvassd.service
+++ b/net-analyzer/openvas-scanner/files/openvassd.service
@@ -5,7 +5,7 @@ Before=openvasmd.service
 
 [Service]
 EnvironmentFile=-/etc/openvas/openvassd-daemon.conf
-ExecStart=/usr/sbin/openvassd -f $SCANNER_PORT $SCANNER_LISTEN $SCANNER_SRCIP
+ExecStart=/usr/sbin/openvassd -f ${SCANNER_PORT} ${SCANNER_LISTEN} ${SCANNER_SRCIP} ${SCANNER_EXTRA_ARGS}
 Restart=always
 RestartSec=1
 User=root
diff --git a/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d b/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d
index afe58dcbf8f2..18e820caec1b 100644
--- a/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d
+++ b/net-analyzer/openvas-scanner/files/openvassd.tmpfiles.d
@@ -1 +1 @@
-d	/var/cache/openvassd
+d	/var/cache/openvassd 0775
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r2.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r2.ebuild
new file mode 100644
index 000000000000..5b013ba00994
--- /dev/null
+++ b/net-analyzer/openvas-scanner/openvas-scanner-4.0.3-r2.ebuild
@@ -0,0 +1,69 @@
+# 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-r2.ebuild,v 1.1 2014/09/30 16:03:10 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"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="
+	>=net-analyzer/openvas-libraries-7.0.4
+	!net-analyzer/openvas-plugins
+	!net-analyzer/openvas-server"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/cmake"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-bsdsource.patch
+	"${FILESDIR}"/${P}-mkcertclient.patch
+	"${FILESDIR}"/${P}-rulesdir.patch
+	"${FILESDIR}"/${P}-run.patch
+	)
+
+src_prepare() {
+	sed \
+		-e '/^install.*OPENVAS_CACHE_DIR.*/d' \
+		-i CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=( -DLOCALSTATEDIR=/var -DSYSCONFDIR=/etc )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
+
+	insinto /etc/openvas
+	doins "${FILESDIR}"/${MY_PN}.conf "${FILESDIR}"/${MY_PN}-daemon.conf
+	dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${PN}
+
+	insinto /etc/logrotate.d
+	doins "${FILESDIR}"/${MY_PN}.logrotate
+
+	dodoc "${FILESDIR}"/openvas-nvt-sync-cron
+
+	systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
+	systemd_dounit "${FILESDIR}"/${MY_PN}.service
+}
+
+pkg_postinst() {
+	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"
+}