main/fprobe-ulog: fix nflog patch to not exit prematurely

nfnl_catch() can return stop in certain transient error conditions

(cherry picked from commit 75981f53078a55e53eae0c13dfc46e2de051247b)

2 files changed, 6 insertions, 6 deletions

diff --git a/main/fprobe-ulog/APKBUILD b/main/fprobe-ulog/APKBUILD
index c1684c4c99..d7ffc3e4d2 100644
--- a/main/fprobe-ulog/APKBUILD
+++ b/main/fprobe-ulog/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=fprobe-ulog
 pkgver=1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="netfilter-based tool that collect network traffic"
 url="https://github.com/opoplawski/fprobe-ulog"
 arch="all"
@@ -57,16 +57,16 @@ md5sums="05408501ac17a664fda269a208efa087  fprobe-ulog-1.2.tar.gz
 d791e5d15be8fb59b22f7fa235b9f041  fprobe-ulog.initd
 f1316ad835c1a2b6565b4dc448b022df  fprobe-1.1-pidfile-sanity.patch
 27bfeb6c6cd7089240173a2829054d87  fix-setuser.patch
-daeeac4f76b19e7ec7a579bcbb9b103c  fprobe-nflog.patch"
+d03cd5c60183d89171fcacca5e15205d  fprobe-nflog.patch"
 sha256sums="72a8c13001dd512acff9b85594dd29a435947072e20abefe85c29468a3967121  fprobe-ulog-1.2.tar.gz
 7101091e238f5b0719a66f525f5bdc000ad593f492dd51896e2bd077fcada8f4  fprobe-ulog.confd
 3dfaa0a8e995ac2c3caa49a01ed570f83348fb3348d1a5106af5a80a1fc1f3d0  fprobe-ulog.initd
 660531f8ba574f80835bb26390e47c2541a3c75985656d46a334c38bfaa4e362  fprobe-1.1-pidfile-sanity.patch
 aa4b237750555323de29f6ddbc3f807dc507bd72564043e9dab6316dc3424123  fix-setuser.patch
-5e9dae31daabdc9916ccd3d50c95f41dbd58439b233e445e3accd161d0d29fbb  fprobe-nflog.patch"
+a14c2a65618e07dae11a1e40731a82f7eb06c08fe404dc71b0d75362b4bced70  fprobe-nflog.patch"
 sha512sums="c393c0705bd6c7cee998fccc48dede3568063b5130971f36c08f580c7678cf52fdf446c02cc4df3d5a2ead68cb2d14434e0847bfff27b6a0c5ef5ec7d6f61145  fprobe-ulog-1.2.tar.gz
 388522863b5c77a334ee11bd771717d829448c85755b58088e22558b99a98514ac95ec3122cf3cb1ce7376f40ac0bae6bf1488dbd4ef60170c3ff83824988195  fprobe-ulog.confd
 2c81ab715eea71beac21d4e4261464ed763464398e3fa4979eb8bd1f671d22916dffb64f051714b6460bb422924517979a3630139b478ddd258b2c28b3d73a14  fprobe-ulog.initd
 e8d5103d2c12fffb913b327badf07e6ac3a0ad8b6e39e942c50dc7e472391b345006b7ee7b7d12a4613c351db2b4e88a6fbd17cfa0907c7c9010faeced3ff557  fprobe-1.1-pidfile-sanity.patch
 981f8bf359f7f338a742eb605a09ff95a960231b98b80552d70f1637aea0ec061fddfd8fa004eef971143af52c88e3a8c7dd45605693f9035cb2c63ccfadb1ed  fix-setuser.patch
-dbf186246b25f60a54a822d28e8463f1f4b17812e99ed9e4a76519506b6046ed41494e669ab70f8449923d0e7d43428b9417dc67642059b16fc9457b3dc70d3b  fprobe-nflog.patch"
+832dbdf80a7c9561c8ea10150bfca8968edca2ab7045e2c6cb604ed0269ff6574b14c472971187258ef4acb8e7eda4d8970ea8e7845f406debe00f27855868b1  fprobe-nflog.patch"
diff --git a/main/fprobe-ulog/fprobe-nflog.patch b/main/fprobe-ulog/fprobe-nflog.patch
index 8b66a23433..6e1e76e988 100644
--- a/main/fprobe-ulog/fprobe-nflog.patch
+++ b/main/fprobe-ulog/fprobe-nflog.patch
@@ -475,8 +475,8 @@ diff -ru fprobe-ulog-1.2.orig/src/fprobe-ulog.c fprobe-ulog-1.2/src/fprobe-ulog.
 +
 +void *cap_thread()
 +{
-+       while (nfnl_catch(nflog_nfnlh(nflog_handle)) != NFNL_CB_STOP)
-+               ;
++       while (!killed)
++               nfnl_catch(nflog_nfnlh(nflog_handle));
 +
         return 0;
  }