From dc4e52a1effbf69146abe5088f920bed82e0253a Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Wed, 8 Apr 2020 22:35:28 +0200
Subject: bareos: 19.2.6-11 -> 19.2.6-12

---
 bareos/PKGBUILD                          | 4 ++--
 bareos/check-if-bareos-backup-is-running | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'bareos')

diff --git a/bareos/PKGBUILD b/bareos/PKGBUILD
index 62b2a8f4..6daef95a 100644
--- a/bareos/PKGBUILD
+++ b/bareos/PKGBUILD
@@ -24,7 +24,7 @@ pkgname=("${pkgbase}-common"
          "${pkgbase}-storage-python-plugin")
 
 pkgver=19.2.6
-pkgrel=11
+pkgrel=12
 arch=(x86_64 i486 i686 pentium4 armv6h armv7h aarch64)
 groups=('bareos')
 pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
@@ -42,7 +42,7 @@ source=("$pkgbase-$pkgver.tar.gz::https://github.com/$pkgbase/$pkgbase/archive/R
 'check-if-bareos-backup-is-running')
 sha512sums=('e91f9470b206a9f8e707fb8cb72497e240b85cdb94b5ef1d6262db7b71ba05ba8a4909aeb66df8cf86f6d0c70d35207ed7e865a202e7552cae7d410d04259137'
             '724ca4e04ff4dfb3e56890a06ffb777cac8e1aeafb6142a347fa542aedcdf6604b280f2d55da3c3d7bbcf996cdd0f6184ca324e9195f3f4db090b17337f1df3a'
-            'ca42a61be735dbe112f4197c6c2db99a143aadeae9a890a75a6092d0e092b76af0964e671e98171c0c853461063ba6f53fa6b91eef619bfd78ddc24698c70e19')
+            '0235763891f368c13931f0fc43e3ae2d7ec796b7ef35896b6b9c048345d539308abe4a9bafda4e95221a89231d2f373ac3cfc2098d572d4068a1c068d27452f6')
 
 prepare() {
   cd "${srcdir}/${pkgbase}-Release-${pkgver}"
diff --git a/bareos/check-if-bareos-backup-is-running b/bareos/check-if-bareos-backup-is-running
index bb513e65..bc3d2e10 100755
--- a/bareos/check-if-bareos-backup-is-running
+++ b/bareos/check-if-bareos-backup-is-running
@@ -6,7 +6,10 @@ if [ $# -ne 0 ]; then
 fi
 
 if cat /proc/net/tcp* \
-| awk '{print $3}' \
+| awk '{print $2 " " $3}' \
+| grep -vw '\(000000000000000000000000\)\?00000000:0000' \
+| tr ' ' '\n' \
+| grep -F : \
 | cut -d: -f2 \
 | grep -qxiF '238F'; then
   >&2 echo 'bareos-fd is connected to bareos-sd'
-- 
cgit v1.2.3-54-g00ecf