From 41ade9163306135cfa758c1fbc1b6bf2a2634280 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 02:11:34 +0000 Subject: [PATCH 1/3] Initialize branch F-13 for netlabel_tools --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 26e989b0cead7e891b246861c9a80a5b21de6842 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Wed, 16 Jun 2010 11:59:05 +0000 Subject: [PATCH 2/3] make initscript LSB compliant (#522818) show version of netlabelctl and libnetlabel in help (#602577) --- netlabel | 2 +- netlabel_tools-0.17-new-hdrs.patch | 17 ++++++++++++----- netlabel_tools.spec | 8 ++++++-- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/netlabel b/netlabel index b0f0a55..668c2aa 100755 --- a/netlabel +++ b/netlabel @@ -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 diff --git a/netlabel_tools-0.17-new-hdrs.patch b/netlabel_tools-0.17-new-hdrs.patch index 911053c..27221c5 100644 --- a/netlabel_tools-0.17-new-hdrs.patch +++ b/netlabel_tools-0.17-new-hdrs.patch @@ -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; \ diff --git a/netlabel_tools.spec b/netlabel_tools.spec index c71b2ac..a99dc33 100644 --- a/netlabel_tools.spec +++ b/netlabel_tools.spec @@ -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 - 0.19-7 +- make initscript LSB compliant (#522818) +- show version of netlabelctl and libnetlabel in help (#602577) + * Wed Sep 23 2009 Peter Vrabec 0.19-6 - make initscript LSB compliant (#522818) From 262f94d9d78c817a508011f6f622ca16d1e11bde Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 04:18:40 +0000 Subject: [PATCH 3/3] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a716296..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: netlabel_tools -# $Id: Makefile,v 1.1 2006/09/01 18:37:54 james Exp $ -NAME := netlabel_tools -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13