From 3c82894dddf5bd3d7ec0fedbdf893fb8fc8b99f9 Mon Sep 17 00:00:00 2001
From: Erik Larsson <who+github@cnackers.org>
Date: Thu, 20 Aug 2020 22:27:05 +0200
Subject: [PATCH] testing/bird: change permissions for bird.conf and make
 config path configurable

---
 testing/bird/APKBUILD   | 4 ++--
 testing/bird/bird.initd | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testing/bird/APKBUILD b/testing/bird/APKBUILD
index 363bc57f277..924297c14da 100644
--- a/testing/bird/APKBUILD
+++ b/testing/bird/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Francesco Zanini <francesco@zanini.me>
 pkgname=bird
 pkgver=2.0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="BIRD Internet Routing Daemon"
 url="https://bird.network.cz/"
 arch="all"
@@ -41,4 +41,4 @@ package() {
 
 sha512sums="48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35  bird-2.0.7.tar.gz
 e0a9bab1bb84ab4efbf51c4c015bf35196d146560f737979d3a17c44dc2397d9578e61a3bba0c58f3cdbb108074f17288bf536db5d8d4dce87c91f1be3dc6282  bird-make-test-bsprintf.patch
-4558f36e20d7b274e9e3affedc7bcb68389a2b18a8d95fe214405333db161010f07688524caec7175e44e170334bb480ddba53dadb24ee8c4957ab2539b7018e  bird.initd"
+8d2f6c95d9ce218dd1e3cbc847b8c39584cdb336b2ba1484294e1f3894e5b03b0966a098b5820c2980ef486c04460cbdc71fefe915dc458c459dbd8e8e6a618f  bird.initd"
diff --git a/testing/bird/bird.initd b/testing/bird/bird.initd
index 3f7e8929b20..8d6a76c82de 100644
--- a/testing/bird/bird.initd
+++ b/testing/bird/bird.initd
@@ -11,7 +11,7 @@ pidfile="/run/bird/${RC_SVCNAME}.pid"
 command="/usr/sbin/${RC_SVCNAME}"
 retry=15
 
-CONF_FILE="/etc/${RC_SVCNAME}.conf"
+: ${CONF_FILE:="/etc/${RC_SVCNAME}.conf"}
 SOCK="/run/${RC_SVCNAME}.ctl"
 
 client_args="-s ${SOCK}"
@@ -28,7 +28,7 @@ start_pre() {
 	# Used to store bird's PID file, which iscreated after privilege drop.
 	checkpath --directory --owner bird:bird --mode 0775 /run/bird
 	# Ensure permissions on configuration file are correct for upgrades.
-	checkpath --file --owner bird:bird --mode 0660 /etc/bird.conf
+	checkpath --file --owner root:bird --mode 0640 ${CONF_FILE}
 }
 
 check_run() {