Compare commits
22 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3f562447ac | ||
|
|
b52e1281d7 | ||
|
|
94cf7c4cca | ||
|
|
245b9f42e8 | ||
|
|
95fc1d6f98 | ||
|
|
cd145fae82 | ||
|
|
ee204d0fb2 | ||
|
|
73ea4c2caf | ||
|
|
11537431de | ||
|
|
e0c2ac5e57 | ||
|
|
31a208a708 | ||
|
|
9044598ffe | ||
|
|
7243c03bc0 | ||
|
|
b5c7adca38 | ||
|
|
4d8b8e4f7f | ||
|
|
e42ea25b71 | ||
|
|
3ae0590d59 | ||
|
|
16806cdd84 | ||
|
|
f345f003b9 | ||
|
|
2143061f8f | ||
|
|
5d905c637f | ||
|
|
bb2cfb43db |
2 changed files with 98 additions and 6 deletions
|
|
@ -1,16 +1,18 @@
|
|||
Summary: Tools to manage the Linux NetLabel subsystem
|
||||
Name: netlabel_tools
|
||||
Version: 0.30.0
|
||||
Release: 4%{?dist}
|
||||
License: GPLv2
|
||||
Group: System Environment/Daemons
|
||||
Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||
Release: 21%{?dist}
|
||||
License: GPL-2.0-only
|
||||
URL: https://github.com/netlabel/netlabel_tools
|
||||
Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
||||
Patch0: rhbz1683434.patch
|
||||
|
||||
Requires: kernel libnl3
|
||||
Requires: libnl3
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: kernel-headers
|
||||
BuildRequires: libnl3-devel
|
||||
BuildRequires: doxygen
|
||||
|
|
@ -24,7 +26,7 @@ package provides the necessary user space tools to query and configure the
|
|||
kernel subsystem.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autosetup -p 1
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
|
@ -64,6 +66,58 @@ make V=1 DESTDIR="%{buildroot}" install
|
|||
%attr(0644,root,root) %config(noreplace) /etc/netlabel.rules
|
||||
|
||||
%changelog
|
||||
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Fri Aug 02 2019 Paul Moore <paul@paul-moore.com> - 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 <releng@fedoraproject.org> - 0.30.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
38
rhbz1683434.patch
Normal file
38
rhbz1683434.patch
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
From 578a65904ff6426c01d81826873d27d0af35f355 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Moore <paul@paul-moore.com>
|
||||
Date: Sun, 17 Mar 2019 17:13:55 -0400
|
||||
Subject: [PATCH] netlabel_config: better error reporting on load
|
||||
|
||||
Signed-off-by: Paul Moore <paul@paul-moore.com>
|
||||
---
|
||||
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
|
||||
Loading…
Add table
Add a link
Reference in a new issue