...
 
Commits (5)
......@@ -12,7 +12,7 @@
# PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="BIRD Internet Routing Daemon (IPv4)"
DESC="BIRD Internet Routing Daemon"
NAME=bird
DAEMON=/usr/sbin/$NAME
BIRD_ARGS=""
......
[Unit]
Description=BIRD Internet Routing Daemon (IPv4)
Description=BIRD Internet Routing Daemon
After=network.target
[Service]
......
usr/lib/bird/
usr/sbin
usr/share/bird/
usr/share/doc/bird/examples/
etc/bird2/bird.conf /usr/share/doc/bird2/examples/
etc/bird2/envvars
usr/lib/bird2/prepare-environment
etc/bird/bird.conf /usr/share/doc/bird2/examples/
debian/envvars /etc/bird/
debian/prepare-environment /usr/lib/bird/
usr/sbin/bird
usr/sbin/birdc
usr/sbin/birdcl
......@@ -3,16 +3,16 @@ set -e
if [ "$1" = "configure" ]; then
if ! getent passwd bird2 > /dev/null; then
adduser --quiet --system --group --no-create-home --home /run/bird2 bird2
if ! getent passwd bird > /dev/null; then
adduser --quiet --system --group --no-create-home --home /run/bird bird
fi
dpkg-statoverride --list /etc/bird2 > /dev/null || dpkg-statoverride --update --add bird2 bird2 0750 /etc/bird2
dpkg-statoverride --list /etc/bird > /dev/null || dpkg-statoverride --update --add bird bird 0750 /etc/bird
for conf in bird.conf; do
UCF_FORCE_CONFFOLD=yes ucf /usr/share/bird2/$conf /etc/bird2/$conf
ucfr bird2 /etc/bird2/$conf
dpkg-statoverride --list /etc/bird2/$conf > /dev/null || dpkg-statoverride --update --add bird2 bird2 0640 /etc/bird2/$conf
ucf /usr/share/doc/bird2/examples/$conf /etc/bird/$conf
ucfr -f bird2 /etc/bird/$conf
dpkg-statoverride --list /etc/bird/$conf > /dev/null || dpkg-statoverride --update --add bird bird 0640 /etc/bird/$conf
done
fi
......
......@@ -3,23 +3,22 @@ set -e
if test "$1" = "purge"; then
dpkg-statoverride --remove /etc/bird2 >/dev/null 2>/dev/null || true
# Check if there is no collision of ownership of /etc/bird/bird.conf
if ! which ucf ucfr >/dev/null || ucfr bird2 /etc/bird/bird.conf 2>/dev/null; then
dpkg-statoverride --remove /etc/bird >/dev/null 2>/dev/null || true
dpkg-statoverride --remove /etc/bird/bird.conf >/dev/null 2>/dev/null || true
for conf in bird.conf; do
dpkg-statoverride --remove /etc/bird2/$conf >/dev/null 2>/dev/null || true
for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do
rm -f /etc/bird2/$conf$ext
rm -f /etc/bird/bird.conf$ext
done
rm -f /etc/bird2/$conf
if which ucf >/dev/null; then
ucf --purge /etc/bird2/$conf
rm -f /etc/bird/bird.conf
if which ucf ucfr >/dev/null; then
ucf --purge /etc/bird/bird.conf
ucfr --purge bird2 /etc/bird/bird.conf
fi
if which ucfr >/dev/null; then
ucfr --purge bird2 /etc/bird2/$conf
fi
done
deluser --quiet bird2 > /dev/null || true
deluser --quiet bird > /dev/null || true
fi
fi
#DEBHELPER#
......
......@@ -23,7 +23,7 @@ Homepage: https://bird.network.cz/
Package: bird2
Architecture: kfreebsd-any linux-any
Pre-Depends: init-system-helpers (>= 1.58~),
Pre-Depends: init-system-helpers (>= 1.56~),
${misc:Pre-Depends}
Depends: adduser,
lsb-base,
......
......@@ -9,8 +9,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk
COMMON_FLAGS= --prefix=/usr --sysconfdir=/etc/bird2 --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --localstatedir=/var --runstatedir=/run/bird2 \
COMMON_FLAGS= --prefix=/usr --sysconfdir=/etc/bird --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --localstatedir=/var --runstatedir=/run/bird \
--docdir=\$${prefix}/share/bird2 \
--enable-client
......@@ -29,14 +29,13 @@ override_dh_auto_build:
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
install -d -m 755 debian/tmp/etc/bird2
install -m 644 debian/envvars debian/tmp/etc/bird2/
install -d -m 755 debian/tmp/usr/lib/bird2
install -m 755 debian/prepare-environment debian/tmp/usr/lib/bird2/
override_dh_installinit:
dh_installinit --name=bird --restart-after-upgrade
override_dh_installsystemd:
dh_installsystemd --name=bird --restart-after-upgrade
DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
XP = xsltproc -''-nonet -''-param man.charmap.use.subset "0"
......@@ -50,8 +49,5 @@ override_dh_clean:
dh_clean
-rm -f bird.8 birdc.8
override_dh_installsystemd:
dh_installsystemd --restart-after-upgrade
override_dh_missing:
dh_missing --fail-missing