Compare commits
No commits in common. "c8" and "c9" have entirely different histories.
38
SOURCES/rhbz1683434.patch
Normal file
38
SOURCES/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
|
||||||
@ -1,16 +1,18 @@
|
|||||||
Summary: Tools to manage the Linux NetLabel subsystem
|
Summary: Tools to manage the Linux NetLabel subsystem
|
||||||
Name: netlabel_tools
|
Name: netlabel_tools
|
||||||
Version: 0.30.0
|
Version: 0.30.0
|
||||||
Release: 3%{?dist}
|
Release: 13%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: System Environment/Daemons
|
|
||||||
Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz
|
|
||||||
URL: https://github.com/netlabel/netlabel_tools
|
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(post): systemd
|
||||||
Requires(preun): systemd
|
Requires(preun): systemd
|
||||||
Requires(postun): systemd
|
Requires(postun): systemd
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: gcc
|
||||||
BuildRequires: kernel-headers
|
BuildRequires: kernel-headers
|
||||||
BuildRequires: libnl3-devel
|
BuildRequires: libnl3-devel
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -25,6 +27,7 @@ kernel subsystem.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
@ -64,6 +67,38 @@ make V=1 DESTDIR="%{buildroot}" install
|
|||||||
%attr(0644,root,root) %config(noreplace) /etc/netlabel.rules
|
%attr(0644,root,root) %config(noreplace) /etc/netlabel.rules
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.30.0-13
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.30.0-12
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-3
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user