[packages/iputils] Up to 20210722 (new versioning scheme without leading 's').

[arekm]

commit 85d62f0fb8812f23ccbea7760cdcefc2eb98ed26
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date:   Thu Dec 2 10:23:12 2021 +0100

    Up to 20210722 (new versioning scheme without leading 's').

 iputils-libcap.patch | 31 -------------------------------
 iputils.spec         | 11 +++--------
 2 files changed, 3 insertions(+), 39 deletions(-)
---
diff --git a/iputils.spec b/iputils.spec
index 79a07ad..8fc27ef 100644
--- a/iputils.spec
+++ b/iputils.spec
@@ -4,16 +4,13 @@ Summary(pl.UTF-8):    Użytki przeznaczone dla pracy z siecią 
IPv4/IPv6
 Summary(ru.UTF-8):     Набор базовых сетевых утилит (ping, tracepath etc.)
 Summary(uk.UTF-8):     Набір базових мережевих утиліт (ping, tracepath etc.)
 Name:          iputils
-Version:       s20190709
+Version:       20210722
 Release:       1
 Epoch:         2
 License:       BSD
 Group:         Networking/Admin
-#Source0Download: https://github.com/iputils/iputils/releases
-#TODO:         
https://github.com/iputils/iputils/archive/%{version}/%{name}-%{version}.tar.gz
-Source0:       https://github.com/iputils/iputils/archive/%{version}.tar.gz
-# Source0-md5: d8d1d5af83aeae946ae909ddc0041cca
-Patch0:                %{name}-libcap.patch
+Source0:       
https://github.com/iputils/iputils/archive/refs/tags/%{version}.tar.gz
+# Source0-md5: dcce050011bf496079bcdf4a2eea20e8
 URL:           https://github.com/iputils/iputils
 BuildRequires: docbook-dtd31-sgml
 BuildRequires: docbook-style-xsl
@@ -88,7 +85,6 @@ pakiety ARP z użyciem podanego adresu źródłowego.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %meson build \
@@ -97,7 +93,6 @@ pakiety ARP z użyciem podanego adresu źródłowego.
        -DUSE_CAP=true \
        -DUSE_GETTEXT=true \
        -DUSE_IDN=true \
-       -DUSE_CRYPTO=gcrypt \
        -DBUILD_ARPING=true \
        -DBUILD_CLOCKDIFF=true \
        -DBUILD_PING=true \
diff --git a/iputils-libcap.patch b/iputils-libcap.patch
deleted file mode 100644
index 1eea353..0000000
--- a/iputils-libcap.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- iputils-s20190709/ninfod/ninfod.c.orig     2019-07-09 22:55:49.000000000 
+0200
-+++ iputils-s20190709/ninfod/ninfod.c  2020-03-22 19:07:16.416656926 +0100
-@@ -454,7 +454,7 @@
- /* --------- */
- #ifdef HAVE_LIBCAP
- static const cap_value_t cap_net_raw = CAP_NET_RAW;
--static const cap_value_t cap_setuid =  CAP_SETUID; 
-+static const cap_value_t cap_setuid_val =  CAP_SETUID; 
- static cap_flag_value_t cap_ok;
- #else
- static uid_t euid;
-@@ -486,7 +486,7 @@
- 
-       cap_get_flag(cap_cur_p, CAP_SETUID, CAP_PERMITTED, &cap_ok);
-       if (cap_ok != CAP_CLEAR)
--              cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET);
-+              cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid_val, CAP_SET);
- 
-       if (cap_set_proc(cap_p) < 0) {
-               DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno));
-@@ -519,8 +519,8 @@
- 
-       /* setuid / setuid */
-       if (cap_ok != CAP_CLEAR) {
--              cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid, CAP_SET);
--              cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid, CAP_SET);
-+              cap_set_flag(cap_p, CAP_PERMITTED, 1, &cap_setuid_val, CAP_SET);
-+              cap_set_flag(cap_p, CAP_EFFECTIVE, 1, &cap_setuid_val, CAP_SET);
- 
-               if (cap_set_proc(cap_p) < 0) {
-                       DEBUG(LOG_ERR, "cap_set_proc: %s\n", strerror(errno));
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iputils.git/commitdiff/85d62f0fb8812f23ccbea7760cdcefc2eb98ed26

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit