gentoo resync : 10.11.2017

3 files changed, 16 insertions, 1 deletions

diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 93f08632dcfe..fa46a096eafe 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1,3 +1,4 @@
+AUX sshguard-2.1.0-conf.patch 408 SHA256 cc90305ecd2fffc289ada3756bf331133b6addee043b5e69de5238da70240cab SHA512 5edfbf3a6955d86233de10665bea527a2e8ebaaeb505d16073c861fa2883b32d0c655f5d4c99145af63df95612129dcd25ffae3710c8615709768bdcff9ef5bc WHIRLPOOL 9ff1a84016139072a3d1cd91e07dff94f7ed0f922b0a7d09be6026f0a156611d588def89a32284f94fbee0e8fdd96e5cfe92813e0ff3cd33818703d8e0e7270a
 AUX sshguard.confd 634 SHA256 ee121f8c4c045ba1cfa67a173040358b1ea5c0561427d64dbd1092a24f068519 SHA512 72b2a9c995bcb604516525f8190eaf35fa57e18274f83a8d00fd5b223b598c0c4ffd8b7ce89b1139c89380e5a7181c8024a6041375c445edb29c8f8b49abee50 WHIRLPOOL ff935afd4a3611610136ce117562ac6b4137a1c69b27117c51e944de5a091844de842c64e990123ccd13c8b775a8c70a6b8b9b12b93c66114a7649f90ab2394f
 AUX sshguard.initd 572 SHA256 759ef54c0f54a27023020ff8da7811b38459a194d7d75d15ea88f7609b2a013c SHA512 0a38cdc6121c6f981bccfd75648843f16b724d412648773f1838e8c67a6c7231df756da8ac1c3651a18b5a271337c07ab97a3314d3a81904bf3c2c68dd00f9f7 WHIRLPOOL 855f2823d38a80c208e754e249a31b31d00a019d7adb976216720a3fb98e48e15d829466c96afcae3da1ef4872af2cc94e1305cbde2ef3dc333027cf99ea480a
 DIST sshguard-1.7.1.tar.gz 832220 SHA256 2e527589c9b33219222d827dff63974229d044de945729aa47271c4a29aaa195 SHA512 205f45f0f1260ebf2a1efabe5b4391b23c219f37df096383d87c220e7392cf58827a4e509be65287bac5b2af49fa0fc390775e1472cff4fb28f2323821f00fd1 WHIRLPOOL 2810c8c77d623dd21baace30bcd4c20efe1f7544e0db3a8abe84ca823e4cc391ecde072d56e63e10c2a490d1417e18fcd9cae16692ac72fffbf216a23036798e
@@ -7,7 +8,7 @@ DIST sshguard-2.1.0.tar.gz 1117466 SHA256 21252a4834ad8408df384ee4ddf468624aa9de
 EBUILD sshguard-1.7.1.ebuild 1226 SHA256 ceb2f79d92f976569c597fa0be6afd77e23d2403d30abf0c5f23e723c624e5fb SHA512 c0e4e5219c2e95e07d83cdb8b2d9fc9efdc666b74eca4de0adea96fe50539da23d5e143d81dfc2c71e738fd5ba182309c0b51530bafe19b6ee6fc2c96d063973 WHIRLPOOL c1308912e922af560269eeded9c6b267a3cb7e5788b0254060b0ac120afa0d500f036994728368fbfd0ee0b0efad122a58a6aad819ef9f6191603c126cd449ee
 EBUILD sshguard-2.0.0.ebuild 891 SHA256 2e34ac923f39347d82ee0b280d8bf60ead891ed38bc4bd14e1244a094fed7f16 SHA512 9fe8e23d3ff513956d40835a93e97f008ffdecd989a4602bf2069505bda63df62fd854756e90a1ab04536943a5832416ad74e6dcea765be2780a910f04b42965 WHIRLPOOL 61fcebccc60c97fed4f6a57642895227bae7cd9a247870c6481c2791acbd156393121907801ee9467044ccef2a4e33616269870315115493c9dc730db3834923
 EBUILD sshguard-2.0.99.ebuild 710 SHA256 113d4ea05bb7ae32cf23826be1524f1e7d6779d503e83c2c5480bdc6b879400c SHA512 c378de845ef6b78eac17757bea66c67ea73d244abaacb8674a52e1c6297761cc7b65d2b35ba92e5f8ac5faa5c24e07b7f4c2be9f009a172546501bb05f88a268 WHIRLPOOL 32eb71ce76377241aa736b7ea0dda8fe76e13c9dee8456c9450326cc3327b32fbe293a6ec2f589cca3a33eb71b09fda53a23dbd72c7050cf7e68020d735cca96
-EBUILD sshguard-2.1.0.ebuild 710 SHA256 113d4ea05bb7ae32cf23826be1524f1e7d6779d503e83c2c5480bdc6b879400c SHA512 c378de845ef6b78eac17757bea66c67ea73d244abaacb8674a52e1c6297761cc7b65d2b35ba92e5f8ac5faa5c24e07b7f4c2be9f009a172546501bb05f88a268 WHIRLPOOL 32eb71ce76377241aa736b7ea0dda8fe76e13c9dee8456c9450326cc3327b32fbe293a6ec2f589cca3a33eb71b09fda53a23dbd72c7050cf7e68020d735cca96
+EBUILD sshguard-2.1.0-r1.ebuild 760 SHA256 22ad2afe3778547f3a2214e10e91870bb8a69e24cb57ca6d5762eaca0409b7f9 SHA512 6d2c3063f88b19ee48baf89d200fe5e14e229b3c5ba5536137c8fe764d3d136e27723631c7db634fdd30706e53cb8119770d8fa7a22866876be892a5c60cfd6c WHIRLPOOL 3c64c7df7c4f736519513bf0652995fce31d87106dced4dda0caedbdc2baa64acc1f7f7bd18f3b6a2adb259feacbcb1fc459ad3dd1861889cb11966387bac4a0
 MISC ChangeLog 4254 SHA256 eaa6f2711106460318d556aef3f7f0e62dc82f10177d193f60f3a400e4ba94ca SHA512 ef97796e890fab12c8b03707a42d76759457dd1350ecbd772f40e66f39f5b1a643958fa20c8c0c2324b630ecd6ebb3ef890aad477a0457b77fd6e29172a1b296 WHIRLPOOL 109df28dadc52bdbf8d5d3d6fbbee7a0c5e34b936331a0a22284f7367ba063bb6705d65044413e40a8b87ca3568e96f73484376372d5713cabd62c928dcb6ea8
 MISC ChangeLog-2015 3411 SHA256 0b12c834f0a95041a023e9e36432da480f9ca49dd19d105865cc8d02517ed16a SHA512 5bd3f8a5f63a0dc036f5320243bb07d96953bc03d9a2ff51820778a817612f2ab9e07e59db9f2e76d68db5cdce39dfa93cb90955db18caa06a9d96407b914edd WHIRLPOOL 19d9a00d8dcfc869cf49618f20b1debb59c3cd967cbb1b8591749f5d97669084589d8af2a68a2302e7abcea8ae85526785e4ce5e0de843fa098437d7ae212de1
 MISC metadata.xml 467 SHA256 b423370fb24f542610016f009bfab7cbd668b4211c9fb0e88e4c14302f4c9993 SHA512 3d936c9b01370bdee03cf23d2ff8632eabc3352054b1b7797baa6e8f1496adc35e79ae286a63bc9a9d6ae5f1e920300f417c08f637ad78e0c40711f2e51dc7b9 WHIRLPOOL 138db6422139317a253113f2cce164cfe6d91c330ed0f6963ddd5b620fdd5b0941454276e511f9f2c8f49c1d50ec6904b15db43a67bbdcbd3a185822888780cb
diff --git a/app-admin/sshguard/files/sshguard-2.1.0-conf.patch b/app-admin/sshguard/files/sshguard-2.1.0-conf.patch
new file mode 100644
index 000000000000..8874cc48904d
--- /dev/null
+++ b/app-admin/sshguard/files/sshguard-2.1.0-conf.patch
@@ -0,0 +1,11 @@
+--- a/examples/sshguard.conf.sample
++++ b/examples/sshguard.conf.sample
+@@ -6,7 +6,7 @@
+ 
+ #### REQUIRED CONFIGURATION ####
+ # Full path to backend executable (required, no default)
+-#BACKEND="/usr/local/libexec/sshg-fw-iptables"
++#BACKEND="/usr/libexec/sshg-fw-iptables"
+ 
+ # Space-separated list of log files to monitor. (optional, no default)
+ #FILES="/var/log/auth.log /var/log/authlog /var/log/maillog"
diff --git a/app-admin/sshguard/sshguard-2.1.0.ebuild b/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
index 1e45c36ba086..e4aaf2332fd2 100644
--- a/app-admin/sshguard/sshguard-2.1.0.ebuild
+++ b/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
@@ -25,6 +25,9 @@ DOCS=(
 	examples/sshguard.service
 	examples/whitelistfile.example
 )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-conf.patch
+)
 
 src_install() {
 	default