Merge branch 'debian/latest' into ubuntu/jammy
This commit is contained in:
commit
6c9d8101fd
|
@ -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
|
|
@ -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
|
||||
|
||||
* Rebuild for jammy.
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
/opt/oarc/bpq/bpq32.cfg
|
|
@ -1 +1,2 @@
|
|||
usr/sbin
|
||||
opt/oarc/bpq
|
||||
|
|
|
@ -1 +1 @@
|
|||
debian/templates/bpq32.cfg opt/oarc/bpq
|
||||
debian/templates/bpq32.cfg etc/
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
/opt/oarc/bpq/bpq32.cfg /etc/bpq32.cfg
|
|
@ -2,7 +2,7 @@
|
|||
After=network.target
|
||||
|
||||
[Service]
|
||||
ExecStart=/opt/oarc/bpq/linbpq
|
||||
ExecStart=/usr/sbin/linbpq -c /etc -d /opt/oarc/bpq -l /opt/oarc/bpq
|
||||
WorkingDirectory=/opt/oarc/bpq
|
||||
Restart=always
|
||||
User=linbpq
|
||||
|
|
|
@ -8,8 +8,8 @@
|
|||
+# setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq
|
||||
+
|
||||
+install:
|
||||
+ install -b -m 755 -D -d debian/linbpq/opt/oarc/bpq
|
||||
+ install -b -m 755 -s -p linbpq debian/linbpq/opt/oarc/bpq
|
||||
+ install -b -m 755 -D -d debian/linbpq/usr/sbin
|
||||
+ install -b -m 755 -s -p linbpq debian/linbpq/usr/sbin
|
||||
|
||||
-include *.d
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ if [ "$1" = configure ]; then
|
|||
# which allows us to install our binaries without the setuid
|
||||
# bit.
|
||||
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
|
||||
echo "Setcap failed on /usr/sbin/linbpq, Features may be limited" >&2
|
||||
fi
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue