[neon/kde/libksysguard/Neon/unstable] debian: add yaml file rather than patch out setcap

Jonathan Riddell null at kde.org
Tue Apr 27 14:29:19 BST 2021


Git commit 413c9e8f5bfb2e7bd49fc6ea39361a6497711371 by Jonathan Riddell.
Committed on 27/04/2021 at 13:29.
Pushed by jriddell into branch 'Neon/unstable'.

add yaml file rather than patch out setcap

D  +0    -17   debian/patches/no-setcap.diff
D  +0    -1    debian/patches/series
A  +5    -0    debian/setcap.yaml

https://invent.kde.org/neon/kde/libksysguard/commit/413c9e8f5bfb2e7bd49fc6ea39361a6497711371

diff --git a/debian/patches/no-setcap.diff b/debian/patches/no-setcap.diff
deleted file mode 100644
index a676b67..0000000
--- a/debian/patches/no-setcap.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/processcore/plugins/network/helper/CMakeLists.txt b/processcore/plugins/network/helper/CMakeLists.txt
-index b50d11a..079acce 100644
---- a/processcore/plugins/network/helper/CMakeLists.txt
-+++ b/processcore/plugins/network/helper/CMakeLists.txt
-@@ -17,12 +17,3 @@ set_target_properties(ksgrd_network_helper PROPERTIES CXX_STANDARD 14 CXX_STANDA
- target_link_libraries(ksgrd_network_helper pthread)
- 
- install(TARGETS ksgrd_network_helper DESTINATION ${KDE_INSTALL_LIBEXECDIR}/ksysguard)
--
--if (Libcap_FOUND)
--    install(
--        CODE "execute_process(
--        COMMAND ${SETCAP_EXECUTABLE}
--        CAP_NET_RAW=+ep
--        \$ENV{DESTDIR}${KDE_INSTALL_FULL_LIBEXECDIR}/ksysguard/ksgrd_network_helper)"
--    )
--endif()
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6cd597c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-no-setcap.diff
diff --git a/debian/setcap.yaml b/debian/setcap.yaml
new file mode 100644
index 0000000..4ef1805
--- /dev/null
+++ b/debian/setcap.yaml
@@ -0,0 +1,5 @@
+# Whitelisted arguments to setcap.
+# Being whitelisted means they will pass the build without problems.
+# A whitelisted call needs to have a corresponding setcap/setuid call in
+# postinst so it actually gets applied.
+- ["CAP_NET_RAW=+ep", "*/usr/lib/*/libexec/ksysguard/ksgrd_network_helper"]


More information about the Neon-commits mailing list