rpms/netlabel_tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

make initscript LSB compliant (#522818) show version of netlabelctl and

Browse Source 
libnetlabel in help (#602577)
This commit is contained in:
Peter Vrabec 2010-06-16 11:48:23 +00:00
parent 3d2f787ee2
commit 86cb1e8cfb
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netlabel
View File

@ -75,7 +75,7 @@ status() {
# List rules
/sbin/netlabelctl -p cipsov4 list 2>/dev/null
ret1="$?"
/sbin/netlabelctl -p mgmt list 2>/dev/null
/sbin/netlabelctl -p mgmt protocols 2>/dev/null
ret2="$?"
if [ "$ret1" != "0" -o "$ret2" != "0" ] ; then

17
netlabel_tools-0.17-new-hdrs.patch
View File

@ -1,7 +1,7 @@
diff -up netlabel_tools-0.17/Makefile.orig netlabel_tools-0.17/Makefile
--- netlabel_tools-0.17/Makefile.orig 2006-09-28 18:18:05.000000000 -0400
+++ netlabel_tools-0.17/Makefile 2008-08-11 14:57:31.000000000 -0400
@@ -43,8 +43,9 @@ INSTALL_SBIN_DIR = $(INSTALL_PREFIX)/sbi
diff -up netlabel_tools-0.19/Makefile.new-hdrs netlabel_tools-0.19/Makefile
--- netlabel_tools-0.19/Makefile.new-hdrs 2009-01-05 22:24:24.000000000 +0100
+++ netlabel_tools-0.19/Makefile 2010-06-16 13:36:55.170646610 +0200
@@ -41,8 +41,9 @@ INSTALL_SBIN_DIR = $(INSTALL_PREFIX)/sbi
INSTALL_BIN_DIR = $(INSTALL_PREFIX)/bin
INSTALL_MAN_DIR = $(INSTALL_PREFIX)/share/man
@ -13,7 +13,7 @@ diff -up netlabel_tools-0.17/Makefile.orig netlabel_tools-0.17/Makefile
#
# targets
@@ -72,9 +73,9 @@ install: $(SUBDIRS)
@@ -70,15 +71,15 @@ install: $(SUBDIRS)
@echo "INFO: installing files in $(INSTALL_PREFIX)"
@mkdir -p $(INSTALL_SBIN_DIR)
@mkdir -p $(INSTALL_MAN_DIR)/man8
@ -25,3 +25,10 @@ diff -up netlabel_tools-0.17/Makefile.orig netlabel_tools-0.17/Makefile
$(INSTALL_MAN_DIR)/man8
$(VERSION_HDR): version_info
@echo "INFO: creating the version header file"
@hdr="$(VERSION_HDR)"; \
- . version_info; \
+ . ./version_info; \
echo "/* automatically generated - do not edit */" > $$hdr; \
echo "#ifndef _VERSION_H" >> $$hdr; \
echo "#define _VERSION_H" >> $$hdr; \

8
netlabel_tools.spec
View File

@ -1,7 +1,7 @@
Summary: Tools to manage the Linux NetLabel subsystem
Name: netlabel_tools
Version: 0.19
Release: 6%{?dist}
Release: 7%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://netlabel.sf.net/
@ -24,7 +24,7 @@ configure the kernel subsystem.
%setup -q -n %{name}-%{version}
# Build fixes.
%patch1 -p1
%patch1 -p1 -b .new-hdrs
%build
# Don't use _smp_mflags, it's small and a hand crafted Makefile
@ -51,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT
%attr(0644,root,root) %{_mandir}/man8/*
%changelog
* Wed Jun 16 2010 Peter Vrabec <pvrabec@redhat.com> - 0.19-7
- make initscript LSB compliant (#522818)
- show version of netlabelctl and libnetlabel in help (#602577)
* Wed Sep 23 2009 Peter Vrabec <pvrabec@redhat.com> 0.19-6
- make initscript LSB compliant (#522818)