Merge branch 'debian/latest' into ubuntu/jammy

This commit is contained in:
Dave Hibberd 2023-12-16 14:44:04 +00:00
commit 6c9d8101fd
No known key found for this signature in database
GPG Key ID: 03A1FB7A1904771B
10 changed files with 35 additions and 7 deletions

11
debian/NEWS vendored Normal file
View File

@ -0,0 +1,11 @@
linbpq (6.0.24.22-2) UNRELEASED; urgency=medium
This is quite a big update, with config moving from /opt/oarc/bpq/bpq32.cfg to
/etc/bpq32.cfg. The system shall do this automatically for you, however
computers and their programmers are not perfect.
I strongly recommend at this point backing up your entire
/opt/oarc/bpq/ directory (cp -r /opt/oarc/bpq/ ~/bpq-backup/) before
proceeding with the upgrade
-- Dave Hibberd <d@vehibberd.com> Sat, 16 Dec 2023 13:30:06 +0000

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
linbpq (6.0.24.22-2) unstable; urgency=medium
* Moved config file home, caused chaos
-- Dave Hibberd <d@vehibberd.com> Sat, 16 Dec 2023 14:40:20 +0000
linbpq (6.0.24.22-jammy1) jammy; urgency=medium linbpq (6.0.24.22-jammy1) jammy; urgency=medium
* Rebuild for jammy. * Rebuild for jammy.

1
debian/conffiles vendored
View File

@ -1 +0,0 @@
/opt/oarc/bpq/bpq32.cfg

1
debian/dirs vendored
View File

@ -1 +1,2 @@
usr/sbin
opt/oarc/bpq opt/oarc/bpq

2
debian/install vendored
View File

@ -1 +1 @@
debian/templates/bpq32.cfg opt/oarc/bpq debian/templates/bpq32.cfg etc/

1
debian/linbpq.links vendored
View File

@ -1 +0,0 @@
/opt/oarc/bpq/bpq32.cfg /etc/bpq32.cfg

View File

@ -2,7 +2,7 @@
After=network.target After=network.target
[Service] [Service]
ExecStart=/opt/oarc/bpq/linbpq ExecStart=/usr/sbin/linbpq -c /etc -d /opt/oarc/bpq -l /opt/oarc/bpq
WorkingDirectory=/opt/oarc/bpq WorkingDirectory=/opt/oarc/bpq
Restart=always Restart=always
User=linbpq User=linbpq

View File

@ -8,8 +8,8 @@
+# setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq +# setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq
+ +
+install: +install:
+ install -b -m 755 -D -d debian/linbpq/opt/oarc/bpq + install -b -m 755 -D -d debian/linbpq/usr/sbin
+ install -b -m 755 -s -p linbpq debian/linbpq/opt/oarc/bpq + install -b -m 755 -s -p linbpq debian/linbpq/usr/sbin
-include *.d -include *.d

2
debian/postinst vendored
View File

@ -26,7 +26,7 @@ if [ "$1" = configure ]; then
# which allows us to install our binaries without the setuid # which allows us to install our binaries without the setuid
# bit. # bit.
if command -v setcap > /dev/null; then if command -v setcap > /dev/null; then
setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" /opt/oarc/bpq/linbpq setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" /usr/sbin/linbpq
else else
echo "Setcap failed on /usr/sbin/linbpq, Features may be limited" >&2 echo "Setcap failed on /usr/sbin/linbpq, Features may be limited" >&2
fi fi

12
debian/preinst vendored Normal file
View File

@ -0,0 +1,12 @@
#!/bin/sh
set -e
confile="/etc/bpq32.cfg"
node="/opt/oarc/bpq/bpq32.cfg"
if [ -L $confile ]; then
rm $confile
cp $node $confile
mv $node $node.bak
fi