8eebf12ed0
- Update to version s20190515 (includes changes s20190324)
* s20190324: 189 commits since s20180629 that include changing build
system from autotools to meson, added rarpd and rdisc systemd service
files, many fixes
* s20190515 bugfix release (6 commits)
- User visible change: arping and clockdiff are moved from /usr/sbin
to /usr/bin (respect upstream path)
- Backport patch 0001-build-sys-doc-Fix-the-dependency-on-xsltproc.patch
(fixing build system)
- Add workaround patch meson-remove-setcap-setuid.sh.patch
- Remove 0001-tracepath-Fix-copying-input-IPv6-address.patch
(included in s20190324 release)
- Refresh old patches (iputils-ping-interrupt.diff, iputils-sec-ping-unblock.diff)
- Changes caused by upstream switching to meson build system (drop sed build dependency)
- Added locales
- Fix typos
OBS-URL: https://build.opensuse.org/request/show/705286
OBS-URL: https://build.opensuse.org/package/show/network:utilities/iputils?expand=0&rev=68
60 lines
1.6 KiB
Diff
60 lines
1.6 KiB
Diff
# patch to workaround error
|
|
# meson.build:242:7: ERROR: add_install_script args must be strings
|
|
# Upstream status: not upstreamable (workaround)
|
|
diff --git a/meson.build b/meson.build
|
|
index 8af9e18..c82597c 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -239,12 +239,6 @@ if build_ping == true
|
|
dependencies : [m_dep, cap_dep, idn_dep, crypto_dep, resolv_dep],
|
|
link_with : [libcommon],
|
|
install: true)
|
|
- meson.add_install_script('build-aux/setcap-setuid.sh',
|
|
- join_paths(get_option('prefix'), get_option('bindir')),
|
|
- 'ping',
|
|
- perm_type,
|
|
- setcap.path()
|
|
- )
|
|
endif
|
|
|
|
if build_tracepath == true
|
|
@@ -259,12 +253,6 @@ if build_traceroute6 == true
|
|
dependencies : [cap_dep, idn_dep],
|
|
link_with : [libcommon],
|
|
install: true)
|
|
- meson.add_install_script('build-aux/setcap-setuid.sh',
|
|
- join_paths(get_option('prefix'), get_option('bindir')),
|
|
- 'traceroute6',
|
|
- perm_type,
|
|
- setcap.path()
|
|
- )
|
|
endif
|
|
|
|
if build_clockdiff == true
|
|
@@ -272,12 +260,6 @@ if build_clockdiff == true
|
|
dependencies : [cap_dep],
|
|
link_with : [libcommon],
|
|
install: true)
|
|
- meson.add_install_script('build-aux/setcap-setuid.sh',
|
|
- join_paths(get_option('prefix'), get_option('bindir')),
|
|
- 'clockdiff',
|
|
- perm_type,
|
|
- setcap.path()
|
|
- )
|
|
endif
|
|
|
|
if build_rinfod == true
|
|
@@ -302,12 +284,6 @@ if build_arping == true
|
|
dependencies : [rt_dep, cap_dep, idn_dep],
|
|
link_with : [libcommon],
|
|
install: true)
|
|
- meson.add_install_script('build-aux/setcap-setuid.sh',
|
|
- join_paths(get_option('prefix'), get_option('bindir')),
|
|
- 'arping',
|
|
- perm_type,
|
|
- setcap.path()
|
|
- )
|
|
endif
|
|
|
|
if build_tftpd == true
|