diff --git a/netlabel_tools.spec b/netlabel_tools.spec index f29e3e9..e386caf 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -1,17 +1,16 @@ Summary: Tools to manage the Linux NetLabel subsystem Name: netlabel_tools Version: 0.30.0 -Release: 21%{?dist} -License: GPL-2.0-only -URL: https://github.com/netlabel/netlabel_tools +Release: 5%{?dist} +License: GPLv2 +Group: System Environment/Daemons Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz -Patch0: rhbz1683434.patch +URL: https://github.com/netlabel/netlabel_tools -Requires: libnl3 +Requires: kernel libnl3 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -BuildRequires: make BuildRequires: gcc BuildRequires: kernel-headers BuildRequires: libnl3-devel @@ -26,7 +25,7 @@ package provides the necessary user space tools to query and configure the kernel subsystem. %prep -%autosetup -p 1 +%setup -q %build %configure @@ -66,55 +65,6 @@ make V=1 DESTDIR="%{buildroot}" install %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 0.30.0-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 0.30.0-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 0.30.0-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 0.30.0-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.30.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 0.30.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 0.30.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 0.30.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.30.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0.30.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.30.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.30.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 0.30.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Aug 02 2019 Paul Moore - 0.30.0-8 -- Applied upstream patch to improve netlabel-config error reporting (rhbz #1683434) -- Removed the kernel dependency (rhbz #1733605) - -* Thu Jul 25 2019 Fedora Release Engineering - 0.30.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.30.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Fri Jul 13 2018 Fedora Release Engineering - 0.30.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/rhbz1683434.patch b/rhbz1683434.patch deleted file mode 100644 index d8aeae1..0000000 --- a/rhbz1683434.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 578a65904ff6426c01d81826873d27d0af35f355 Mon Sep 17 00:00:00 2001 -From: Paul Moore -Date: Sun, 17 Mar 2019 17:13:55 -0400 -Subject: [PATCH] netlabel_config: better error reporting on load - -Signed-off-by: Paul Moore ---- - netlabelctl/netlabel-config | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/netlabelctl/netlabel-config b/netlabelctl/netlabel-config -index 717d795..15c74f7 100755 ---- a/netlabelctl/netlabel-config -+++ b/netlabelctl/netlabel-config -@@ -114,15 +114,21 @@ function nlbl_reset() { - # load the NetLabel configuration from the configuration file - function nlbl_load() { - local ret_rc=0 -+ local line_num=0 - local line - while read line; do -+ line_num=$(($line_num + 1)) - # skip comments and blank lines - echo "$line" | egrep '^#|^$' >& /dev/null && continue - - # perform the configuration -- netlabelctl $line >& /dev/null -+ output=$(netlabelctl $line 2>&1) - rc=$? -- [[ $rc -ne 0 ]] && ret_rc=1 -+ if [[ $rc -ne 0 ]]; then -+ ret_rc=1 -+ echo "error: line $line_num \"$line\"" -+ echo "$output" -+ fi - done < "$CFG_FILE" - - return $ret_rc