gentoo auto-resync : 12:03:2023 - 12:12:26

3 files changed, 10 insertions, 8 deletions

diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 5514e2c91b02..c4ab62713bb3 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -2,13 +2,13 @@ AUX bird-2.0.12-musl-tests.patch 1451 BLAKE2B a2ce47b4931e922237a51e72db693d9906
 AUX bird-2.0.7-gcc10.patch 460 BLAKE2B fda9c1ce155d1d4842fec83ede52847fe895ea406cf3d6b715ea2bea01843604cfd6c2957f6d64847d8d73f21a9d952f8af07d78e7261c585643b7c33727f107 SHA512 84a187e4dc0c48efb9b8e0248dae90669c93abbc2d26b58a1f197420100a69806f80650ac90e064947984d7b1a2f9c5598ffd021a97bee10420b4c61d9cf75c0
 AUX bird-2.0.9-musl-tests.patch 893 BLAKE2B 8f96a4bb10f646503193744fc70bfbb4246a5ae1f66dd65732a528b7477d3cd7363743b2e6075a015fedd10f4a047aeab0155113baabd4176479c55315ca0f1e SHA512 c45bdc10c9bc2537610479af3c438b9d0c99879d253bd82574af272dfc8d72a4309838546eedbc56b8ae12e655f64b306a9b0a0903a6531036b1174a4137483c
 AUX confd-bird-2 231 BLAKE2B 9be6c9b94ede8233e6b249d6543b236f3bba2f065bd3bd811c4db37d1bbe66b4d196a11d5c85742d45cb800c895d9517c10b33217811b9499c191a4a03aa2359 SHA512 5531e581f1535d8e0db316c1f151282ca7dcab68cf49c91264105a9f1751e7bfbe5eef6c52c6a3a76c74cf5810e2ecd912cb2845f55b7dd960823b05f086def8
-AUX initd-bird-2 1433 BLAKE2B d89a6d48e36736f8dc8d21df7213f5edc0702f2a4e64f5321a8a4b0b3e1501755553f35e4f6270be707a50538defb806658dee00453835bcac86a633c60fb8c7 SHA512 bd3eec06701c86eaa7c89e75a963656be6081415f93f7844bba272e3f1feccbd90081ea0b711ac51c6d7c1e337e8325a27879b336f20204ad225d0c7dafa3b68
+AUX initd-bird-2 1436 BLAKE2B d899c6844f1b9386dc9dd7667a046e82856ecdfb76e1a0b33263cd310a09289a50e26d53d8f6c774116a2d9e6b3b425cbd0a50cd8fcc7bde42953e143dca9efc SHA512 1c93d337f20aa4d0d5ca8b49b78ed22648ef548a62445dea294751e2c99918847add0a420d476b95bc8407aa8e0a8d30b5b6dabc86a0e001fe34886423b8f49e
 DIST bird-2.0.10.tar.gz 1276546 BLAKE2B 21e1dde7d38d836c761eb13067b6aacdfc66211ca75f4ae72948f2c3a9519ac45af410f764c638e9a7314c51873675621feabc730e0604a42c00f054b0db1017 SHA512 607f9c96bbf55b7622a8c49126ad568ce9a220520801a13e89be63eee65a76c575a8095485e5bbd867d1306fed87c8394a82fe88d76307eaa40ee5902842d158
 DIST bird-2.0.11.tar.gz 1301502 BLAKE2B 0761bd50b3b0338ecf2a6325f61f90db9f92324ed814de2ec6b360c6f5a7e12d6ae4ae9b73a11ddede0e6c8fd1d15bea1b62076c38c937ae281f10a8bc2d1cbf SHA512 aaab11b4faf7d0c0afc3c4e3480f24ab6e0037b209aee969192eea57bef698073da5fa9155ef43d999ed91cbe3cd87acb95aa08fa03f2525c5c7653a0589dcf6
 DIST bird-2.0.12.tar.gz 1307984 BLAKE2B ca00574bb8e508255afb90e0d65f4e1763880699cff9877731d072efc48944b9f9ac77b35bb7ffd7b780e8e8b1c2eacdc38ee273353817c53723e7972fb5f0d6 SHA512 b5e1235210e500511955c009456710dd12d6ea747825806a6d35a9de5f2f984d9a45fa541d45dd5e353f87f4d61bf1d4612cb6058769e905e4ef6b414ab4212f
 DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
 EBUILD bird-2.0.10.ebuild 1359 BLAKE2B 9d037a74c870d0c9daaee21c598f4031fe74c8323377185e41812d7c739263a3a17af8d68c683966d233dd010282bba51457b0992f65ba1b8616d7d92a0bbe0f SHA512 d5ab491a00bb8d34ffc7b0516578d39d726be86027d9e9653acdfde8af3612fa8139813ed9aa91fa00b56e5fdd3a455f5fc481e583de3d6e6f232c328fb29a53
 EBUILD bird-2.0.11.ebuild 1360 BLAKE2B b84cfa7708e24f0d1d2d2b383714df5093aae20cf23aeb4a0524a49be34f2883ec1f47013aded7968a39e419faffe6286fb85dde37a441323f0f75e0047f5d93 SHA512 722738cd2bca7f54ca449516bb0a8d5950fd9ed55ad2d2b2b37ce7fa0307826c4a5bca670fd91e14eb1322067ab71f78cdd7af726b384e1b56dc05ce930cc402
-EBUILD bird-2.0.12.ebuild 1767 BLAKE2B bd69b839b47e09d90283f371136c759201a4284eb9c1fb74fb3f4f1a8ddad804d64c92be0bfb8794bccac5529e281c533d0bb14d2cc5f7fa0cff7acbeac2de88 SHA512 94b424e9a3ec93e1cd7d2befa5a0ed78f87a26418e033e29c40d42d0d8f8a2978503ff455505178a7ed00cfdc627bccf624e983b067e3b71f2201acbc014f320
+EBUILD bird-2.0.12-r1.ebuild 1767 BLAKE2B bd69b839b47e09d90283f371136c759201a4284eb9c1fb74fb3f4f1a8ddad804d64c92be0bfb8794bccac5529e281c533d0bb14d2cc5f7fa0cff7acbeac2de88 SHA512 94b424e9a3ec93e1cd7d2befa5a0ed78f87a26418e033e29c40d42d0d8f8a2978503ff455505178a7ed00cfdc627bccf624e983b067e3b71f2201acbc014f320
 EBUILD bird-2.0.7.ebuild 808 BLAKE2B 7ce2db0fee210a80a196f111b8690e0b347cf9224255b41479b2a831058cc0fb931b7c1ef13f7e347f654b5222d73faafec8d0126c4b02a396866406d0752751 SHA512 f9b5fc2788d6b53ac9f317bf6ae91a864dbea79e42338d87c1c8bde4558109ab948f3ef9e37d92d663e3740db3e39b96102b418f63bd32fdbfd2569127f8780f
 MISC metadata.xml 582 BLAKE2B f2fca917d013e377c042ad09e99a53bda1bd27673e27dc17ed683aec7b691e40e405fef758a3243f6d53804f23ab495ccc7692712d9d941d2517d141b33c0a50 SHA512 0d03e6149698726621a62436740e83b6fcd6c6951d201eead7453ea0b565dcd72d6d54f961e40b1598a1d0b499a5166d84c4208de5c0a6b4134e3d32f84d9eae
diff --git a/net-misc/bird/bird-2.0.12.ebuild b/net-misc/bird/bird-2.0.12-r1.ebuild
index 043f67e052c9..043f67e052c9 100644
--- a/net-misc/bird/bird-2.0.12.ebuild
+++ b/net-misc/bird/bird-2.0.12-r1.ebuild
diff --git a/net-misc/bird/files/initd-bird-2 b/net-misc/bird/files/initd-bird-2
index 3b759df883d8..fc4908990c20 100644
--- a/net-misc/bird/files/initd-bird-2
+++ b/net-misc/bird/files/initd-bird-2
@@ -5,13 +5,12 @@
 
 extra_started_commands="reload"
 
-pidfile="/run/${RC_SVCNAME}.pid"
+pidfile="/run/${RC_SVCNAME}/${RC_SVCNAME}.pid"
 command="/usr/sbin/${RC_SVCNAME}"
 retry=15
-start_stop_daemon_args="--make-pidfile"
 
 CONF_FILE="/etc/${RC_SVCNAME}.conf"
-SOCK="/run/${RC_SVCNAME}.ctl"
+SOCK="/run/${RC_SVCNAME}/${RC_SVCNAME}.ctl"
 
 if [ ${BIRD_GROUP} ]; then
 	BIRD_OPTS="${BIRD_OPTS} -g ${BIRD_GROUP}"
@@ -22,10 +21,9 @@ fi
 
 client_args="-s ${SOCK}"
 command_args="${client_args} -c ${CONF_FILE} -P ${pidfile} ${BIRD_OPTS}"
-client_args="${client_args} -r"
 
 depend() {
-	need net
+	use net
 	use logger
 }
 
@@ -52,8 +50,12 @@ reload() {
 	eend $?
 }
 
+start_pre() {
+	checkpath -d -m 0755 -o bird:bird "/run/${RC_SVCNAME}"
+}
+
 start_post() {
-	checkpath -f -m 0655 -o bird:bird "${pidfile}"
+	ln -sf "${SOCK}" /run
 }
 
 stop_pre() {