[arch-commits] Commit in fping/trunk (3 files)

[Christian Hesse]

    Date: Tuesday, March 22, 2022 @ 11:03:00
  Author: eworm
Revision: 440550

upgpkg: fping 5.1-2: apply upstream commits (FS#74192)

Added:
  fping/trunk/0001-fix-unprivileged-ping-broken-in-v5.1-fixes-248.patch
  fping/trunk/0002-fix-socket4-vs-socket6-typo-249-thanks-sfan5.patch
Modified:
  fping/trunk/PKGBUILD

-----------------------------------------------------------+
 0001-fix-unprivileged-ping-broken-in-v5.1-fixes-248.patch |   27 ++++++++++++
 0002-fix-socket4-vs-socket6-typo-249-thanks-sfan5.patch   |   22 +++++++++
 PKGBUILD                                                  |   20 +++++++-
 3 files changed, 65 insertions(+), 4 deletions(-)

Added: 0001-fix-unprivileged-ping-broken-in-v5.1-fixes-248.patch
===================================================================
--- 0001-fix-unprivileged-ping-broken-in-v5.1-fixes-248.patch	                        (rev 0)
+++ 0001-fix-unprivileged-ping-broken-in-v5.1-fixes-248.patch	2022-03-22 11:03:00 UTC (rev 440550)
@@ -0,0 +1,27 @@
+From e975a4339b24716fb57bed234b0a1176f2bf3451 Mon Sep 17 00:00:00 2001
+From: David Schweikert <david at schweikert.ch>
+Date: Sun, 13 Feb 2022 17:45:57 +0100
+Subject: [PATCH] fix unprivileged ping broken in v5.1 (fixes #248)
+
+---
+ src/fping.c                |  4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/fping.c b/src/fping.c
+index e26b216..0bd2b70 100644
+--- a/src/fping.c
++++ b/src/fping.c
+@@ -1104,11 +1104,11 @@ int main(int argc, char** argv)
+         exit(num_noaddress ? 2 : 1);
+     }
+ 
+-    if (src_addr_set && socket4 >= 0) {
++    if (socket4 >= 0 && (src_addr_set || socktype4 == SOCK_DGRAM)) {
+         socket_set_src_addr_ipv4(socket4, &src_addr, (socktype4 == SOCK_DGRAM) ? &ident4 : NULL);
+     }
+ #ifdef IPV6
+-    if (src_addr6_set && socket6 >= 0) {
++    if (socket6 >= 0 && (src_addr6_set || socktype4 == SOCK_DGRAM)) {
+         socket_set_src_addr_ipv6(socket6, &src_addr6, (socktype6 == SOCK_DGRAM) ? &ident6 : NULL);
+     }
+ #endif

Added: 0002-fix-socket4-vs-socket6-typo-249-thanks-sfan5.patch
===================================================================
--- 0002-fix-socket4-vs-socket6-typo-249-thanks-sfan5.patch	                        (rev 0)
+++ 0002-fix-socket4-vs-socket6-typo-249-thanks-sfan5.patch	2022-03-22 11:03:00 UTC (rev 440550)
@@ -0,0 +1,22 @@
+From ab1ed993badc1a6978b95c9d17a5e8b56fff4598 Mon Sep 17 00:00:00 2001
+From: David Schweikert <david at schweikert.ch>
+Date: Sat, 5 Mar 2022 16:58:47 +0100
+Subject: [PATCH] fix socket4 vs socket6 typo (#249, thanks @sfan5)
+
+---
+ src/fping.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fping.c b/src/fping.c
+index 0bd2b70..af16061 100644
+--- a/src/fping.c
++++ b/src/fping.c
+@@ -1108,7 +1108,7 @@ int main(int argc, char** argv)
+         socket_set_src_addr_ipv4(socket4, &src_addr, (socktype4 == SOCK_DGRAM) ? &ident4 : NULL);
+     }
+ #ifdef IPV6
+-    if (socket6 >= 0 && (src_addr6_set || socktype4 == SOCK_DGRAM)) {
++    if (socket6 >= 0 && (src_addr6_set || socktype6 == SOCK_DGRAM)) {
+         socket_set_src_addr_ipv6(socket6, &src_addr6, (socktype6 == SOCK_DGRAM) ? &ident6 : NULL);
+     }
+ #endif

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-22 10:38:34 UTC (rev 440549)
+++ PKGBUILD	2022-03-22 11:03:00 UTC (rev 440550)
@@ -4,7 +4,7 @@
 
 pkgname=fping
 pkgver=5.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Utility to ping multiple hosts at once'
 url='https://www.fping.org/'
 arch=('x86_64')
@@ -12,12 +12,24 @@
 depends=('glibc')
 install=${pkgname}.install
 validpgpkeys=('8D1E89B8FBA920A5A609F2615A11A22BC5A1F734') # David Schweikert <david at schweikert.ch>
-source=(https://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz{,.asc})
+source=("https://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        '0001-fix-unprivileged-ping-broken-in-v5.1-fixes-248.patch'
+        '0002-fix-socket4-vs-socket6-typo-249-thanks-sfan5.patch')
 sha512sums=('1a208da8dcd99093d0512af5d85ba5e7b5743ec97993d24c1fe612bb58d93090ac1ba0952f648aa075f16d390a77c4be65e394ae56dbede2a6914e0e8c68e2bd'
-            'SKIP')
+            'SKIP'
+            'f9847470d63ba0e40fc5ce77c0689fcd858ded55ed0727308f55cbb6648b93da4bf05a35414a67054a1eb406ba8c8b29e044b6269506c8f5a70ae991e6c43152'
+            'c098fc5d4e1ac7aa504cc1d92a78c05650f76d43380f0a7c719b5a717721cb327134d7fb62a6d06ba829daeda477e705b0b9f3f944742e9cf90ece5091111b96')
 b2sums=('2fb344e650b5a359fb8780f2c599455d39405ae823edf695ee4385aa2661dc5811e088bafa1b9f53846ee90c0afa959a92832381a03346d1fda048eb4e7ee098'
-        'SKIP')
+        'SKIP'
+        '593299e217cf34b6d8ddb8b8ac8ac8bc96f417f14188c78277f0afd37538b7e525d1a235129d10f14b6e16a69afde3a48e179883459b586a17c7314483de4824'
+        'b3f4e4248e27b027ad07c9d1650fb93e6f672729d3bf02b1c89e3f75ecd9471a0e2b9663bc5473dcbc9ead6e10e1b4415d94599c9064762872e2116936446676')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 < ../0001-fix-unprivileged-ping-broken-in-v5.1-fixes-248.patch
+  patch -Np1 < ../0002-fix-socket4-vs-socket6-typo-249-thanks-sfan5.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure \