gentoo resync : 17.10.2017

4 files changed, 24 insertions, 4 deletions

diff --git a/net-misc/bopm/Manifest b/net-misc/bopm/Manifest
index 87e26a6d22df..6ac95e44970e 100644
--- a/net-misc/bopm/Manifest
+++ b/net-misc/bopm/Manifest
@@ -1,11 +1,12 @@
 AUX bopm-3.1.3-autotools.patch 7563 SHA256 9b63f8f82dbb3e57b42ffcfecac8e41a4da9137acd9432ad0dd81d3974166786 SHA512 1a44edcc1c9bf154e3d5763bb8e7937050781623d2311bd404efbea96c9949e9bc1472d5c22ab598152195a933146585a3efaaf28a5e7fb369e471167e571d8c WHIRLPOOL 062690bedf89bd3f805ef94b943b1f4733dd10b5fd2f4833275fa6d0153f69d3d93022300765b418aaf2304534c7810ab53eef39d3c847cc853b17031ee3338b
+AUX bopm-3.1.3-quarantine-bad-pid-file.patch 472 SHA256 8973230f87eebcd34b7041e8818cd79b35fe2d2da8b723b35227c8e4434dc86f SHA512 a255fa27d3dcc1c4ef547ba28af58e4e25f4e94b36c10b954274e49a7dbc776a1da5772afcd1b91f918e704c60de5bc3d451f8b9073123ed3f32aaa8ccc7948c WHIRLPOOL 9ce249c0f1447a3e95266e55364128d1a4d1c18918ced6aff55e5097809ee6771872234e21f66eed2c260c792adfabcd8ddcbdfad73b0d444b327929447eba7d
 AUX bopm-3.1.3-remove-njabl.patch 816 SHA256 566c8c9866dd449a8d88051a2671dca54327783434f37f12eb0ed0d8203bd8a7 SHA512 d74ccfa25c5f70b852647e90e8d9a80d8d848cf0e488004fc8dc0fdc196271659c7b53d47bfa79321f159ec374ecb7626b98b91de82aa62649c3a3c449c4aef3 WHIRLPOOL 348885b0b18cde0e1b77ac4310c57aa1ca40ae5cc9190f0bfddaa6c599362c7a9d3fdc455424d83c2533278b571321b5e8a4b1f4f1e90884badd621921460207
 AUX bopm.conf.d 158 SHA256 2c788cdc23767b1dc2209e4290c1404635ae7875a9370d40a9f0274f3b8ce9a7 SHA512 f47dbcc6c46b9bc4269ebfa0015e3827360f8e78f2485a3217a5b4775d2890b31fb0d6bb56815547aa91208c412079f81bff8c086a0f947ef48171fee1caeb6d WHIRLPOOL 3c97959f0bbca02cac8e9c46730ec84d067fdde2d08b535ac3fea770a51753ad9766dbca281df9a4e4c82204d677d0d8a26bd0a31ac118251510ecd565df9cfe
 AUX bopm.conf.d-r1 221 SHA256 888a8abb73ef3ba977edac00f525c08681c7bd2ad963ec36788e3837312e0684 SHA512 6070b84b90a905be88cf8ac64c67bf057be4c369e9129c877f643e4154c81699ac7084c5377c22afb673e44c696b890d1dc16e653e6bcaa46368a93a09414ec2 WHIRLPOOL 6b2d0a06e0973b9028418866ae72794a13ed56cb74357cd98553f44568b8a61c801b4f947e115bf933799ce4ed669499de9bf2bc763a661d307458da67d32493
 AUX bopm.init.d 450 SHA256 9bdc44a21aa9894488f4a4557c359347a53cdc5a34942107b8cb5a0496e6cf4f SHA512 14f310b94d66d904b83b475210b5b78730a0d7776b725a46c01f3da1a62599fffd964231133e9f4514d49c770bb406e94ce748cf7d67d2b6a3b174c71b8d0e6e WHIRLPOOL 99e51d73eaafae588b6d9cac402572052dbf0b21d442f00525ceedc40f8a5257ef1b50403894ac20341b5d12d9271687d95d29d5148dc68ab851eb98a268497a
-AUX bopm.init.d-r1 362 SHA256 c5b70bffec57c178765f7c40a13d2cb057629ca2e9bf5d82c8f9b8c0b8142abb SHA512 33665898874ad63bbbe9e204952b25d8619013b4599c0566352ffb70a7b02dee9756bb4db5bf171925634ab1c0a237a350e2cb1663e075b0ac56d81e3823bea7 WHIRLPOOL 3e9281cac2084e497cc3369c9134021d23a9394b8ee5a9bc7631d6d01c97ce8e304cf83d8921a717f14a1c62d3890194fb4e32284d87338028401c91287a08a9
+AUX bopm.init.d-r2 435 SHA256 a6e6340a4020bd30d360f68f02c3caee447f87f1b505947a74bfa630aae84ec5 SHA512 ba5dab8f556108a7e273788a8483443c250f8b8c24d17f522b795b8383d2f257babd9543921f038461f16c34e6103e526c63c8c5d2e00be80f5f8ab0fd8040d3 WHIRLPOOL 23d5334de09954888adc31bffdcacf6d9cb3878dd1de143a50089306be447f61712c5260d804c1f1256733b08da05ff2dae6d2eed412c4cfea2062ca157bc8d3
 DIST bopm-3.1.3.tar.gz 819273 SHA256 6062e80e57785b7f992f71c1d1b4c99c12ea0f20bd7c4d2c0fe2c1f57fdcbf59 SHA512 974c243e4fb7e184d3aa570dda2d919cea33df71215746d156b37b7fa3d6f45cd5448c847a7321d4ca22356fffa372f5486e6c3cd958698e173d79731f8ef8af WHIRLPOOL 57e91221e5af5d6eb009aec1bffdbaa1360b0cef4146eb432a971bade1c668195fd50167989acf3ab63ff13197cfd3d933bb96c09069413098ca65d73b2d8820
-EBUILD bopm-3.1.3-r3.ebuild 1333 SHA256 854b43702bef9ff8b2e52dca025a268b9b02923891c13d47685d9ea06176eb96 SHA512 6cae1524c733299bc1a9d9fd7244c5f10ac750408b477faaa8367ccdb084aae5cdcbb395c6ab38f84614da2f4930074b2b91b55a67e812f9f803ccded314d3d5 WHIRLPOOL 858179d32f35c3f1c014f1da9998b818bcaec60c2cdb4e3b3e542a9a037c103a94457a706818a8a2f54f32e12b44a4ae0acb16c19d27d2ddead8c04255b2fff0
+EBUILD bopm-3.1.3-r4.ebuild 1383 SHA256 d06a1344fcc858ddfa7605dd8f72cd5518d2a9174ca57243dfa02ca6aedf17c2 SHA512 2ce8f45a7538aeeab3cfb7e0c9561002a6a217002a388531e79ac0443a7efca1cdd9dd9856f6ae2c5956abefc445f1f56952fdaa026026c75941e8d7bc0f3489 WHIRLPOOL f873b29381ef4dcf56819b1db8250b01f6381f8b073948849dd5c77ca6b2a61ec5f7a981c9deca26898a9d78a524ad10dee2a67ee3eb287b1a93af854273c62a
 MISC ChangeLog 4797 SHA256 5f6cd07aff0857bffd6319f95604e27489474c559ccf816d1f4958363158357f SHA512 8a1d72556ac841848a5bd4c0d68b538fc94d38b57ae672455f04dda41b92fc822e41143fe5347d679644e13f5b26aecb9097e008a3271d26de29af93bcb1c2e0 WHIRLPOOL 3025d3b7546e1aa8ac364098881edfff70045a23240e28b21bab22f21d1d21d859e27d255e5b2a42ea79ec342521b4c4a8af7e28f936771df8d0cdfd65555bb5
 MISC ChangeLog-2015 1347 SHA256 1a0faa6b2fcc9173020c14cd7f5f4a4dede4d66f439fd8ee4e2ab08d18ead2df SHA512 8ffd0ebc09f14fa60e7a12eb050223b08e00b0e7235863c1cf499c58df4273f31176d57f9ec076b6ff7dfd72e4b8ddd816a0e41eb7075a69c70d6afa8c99c6f0 WHIRLPOOL a247afe91fcf47df177700c7ba88968d48557a28eb51fd102cdb7b4f023b453b6823d144f3864bfe3ecafb5e4df54e3286e912e13f1ff70dad8d0f49d285bc3f
 MISC metadata.xml 440 SHA256 757426a5e58d5c01767736972bb5a3532d3d4b01acea35eb32245c0b7558fbb6 SHA512 f55f7dd218a0d3998a847750bad43fc58e947c292f0c31f8a89b5d05bdd2accb8f132b734787f2b4c8802752561dca7ddac07dfea3eaf16a15116ece2301d797 WHIRLPOOL 841904b80c1f0787f1cd0682724935fcf041b0cb70b37f26b7bd01b79beb7f22a061ce132cdd3b99ef4630a56c183f0e33a83f34beefe05331b4fb2375333cff
diff --git a/net-misc/bopm/bopm-3.1.3-r3.ebuild b/net-misc/bopm/bopm-3.1.3-r4.ebuild
index 5e306a502712..5c2096926f29 100644
--- a/net-misc/bopm/bopm-3.1.3-r3.ebuild
+++ b/net-misc/bopm/bopm-3.1.3-r4.ebuild
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${P}-remove-njabl.patch
 	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-quarantine-bad-pid-file.patch
 )
 
 pkg_setup() {
@@ -52,7 +53,7 @@ src_install() {
 	# If anybody wants libopm, please install net-libs/libopm
 	rm -r "${ED}"usr/$(get_libdir) "${ED}"usr/include || die
 
-	newinitd "${FILESDIR}"/bopm.init.d-r1 ${PN}
+	newinitd "${FILESDIR}"/bopm.init.d-r2 ${PN}
 	newconfd "${FILESDIR}"/bopm.conf.d-r1 ${PN}
 
 	dodir /var/log/bopm
diff --git a/net-misc/bopm/files/bopm-3.1.3-quarantine-bad-pid-file.patch b/net-misc/bopm/files/bopm-3.1.3-quarantine-bad-pid-file.patch
new file mode 100644
index 000000000000..fedcd0980a04
--- /dev/null
+++ b/net-misc/bopm/files/bopm-3.1.3-quarantine-bad-pid-file.patch
@@ -0,0 +1,16 @@
+Bopm writes its own pid file, but this is handled by the init script via
+openrc-run.
+---
+diff --git a/bopm.conf.sample b/bopm.conf.sample
+index e26dc17..fa5ce1d 100644
+--- a/bopm.conf.sample
++++ b/bopm.conf.sample
+@@ -9,7 +9,7 @@ options {
+ 	 * Full path and filename for storing the process ID of the running
+ 	 * BOPM.
+ 	 */
+-	pidfile = "/run/bopm/bopm.pid";
++	pidfile = "/run/bopm/junk/bopm.pid";
+ 
+ 	/*
+ 	 * How many seconds to store the IP address of hosts which are
diff --git a/net-misc/bopm/files/bopm.init.d-r1 b/net-misc/bopm/files/bopm.init.d-r2
index 6a292f800be2..de6d959b9f74 100644
--- a/net-misc/bopm/files/bopm.init.d-r1
+++ b/net-misc/bopm/files/bopm.init.d-r2
@@ -12,5 +12,7 @@ depend() {
 }
 
 start_pre() {
-	checkpath -o ${BOPM_UID} -d "$(dirname "${PIDFILE}")"
+	checkpath -o 0:0 -d /run/bopm
+	checkpath -o ${BOPM_UID} -d /run/bopm/junk
+	checkpath -o ${BOPM_UID} -f /run/bopm/junk/bopm.pid
 }