From ec0d5bbd7c9ddf720f805fce262cef3bdd6d4984 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 11:15:57 +0000 Subject: [PATCH 1/5] Initialize branch F-8 for seedit --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 4b29afb51f607232330c13ed57d73fee0770888b Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Thu, 1 Nov 2007 15:14:51 +0000 Subject: [PATCH 2/5] Update to seedit-2.2.0 --- .cvsignore | 3 +-- seedit.spec | 21 +++++++++++++-------- sources | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 61eeb27..1118862 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -seedit-2.1.0.tar.gz -seedit-2.1.1.tar.gz +seedit-2.2.0.tar.gz diff --git a/seedit.spec b/seedit.spec index fb082e8..b14d006 100644 --- a/seedit.spec +++ b/seedit.spec @@ -12,11 +12,11 @@ #Whether audit support obj_type field, after FC6 "y" %define audit_obj_type_support y #Version of sample policy file -%define sample_policy_type fc6 +%define sample_policy_type f8 Name: seedit -Version: 2.1.1 -Release: 3%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPL @@ -24,10 +24,9 @@ URL: http://seedit.sourceforge.net/ Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}.tar.gz Source1: seedit-gui.desktop Source2: seedit-gui.png -Patch: 2.1.1-2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{betatag}-root-%(%{__id_u} -n) -BuildRequires: libselinux-devel >= 1.19, libsepol-devel >= 1.1.1, byacc, flex -Requires: checkpolicy, m4, audit, libselinux >= 1.19, libsepol >= 1.1.1 +BuildRequires: libselinux-devel >= 1.19, byacc, flex +Requires: checkpolicy, m4, audit, libselinux >= 1.19 Provides: seedit-converter = %{version}-%{release} %description @@ -41,7 +40,7 @@ Command line utils is included in seedit package. %prep %setup -q -%patch -p0 +#%patch -p0 %build pushd core @@ -126,6 +125,7 @@ if [ $1 = 0 ]; then if [ %{selinuxenabled} ]; then sed -i 's/^SELINUX=.*/SELINUX=permissive/g' %{_sysconfdir}/selinux/config fi + sed -i '/# Added by seedit/,/# End of seedit/ d' %{auditrules} touch /.autorelabel fi @@ -134,6 +134,7 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/policy %config(noreplace) %{_sysconfdir}/selinux/%{name} %{_datadir}/%{name}/initialize/ +%{_datadir}/%{name}/base_policy/dynamic_contexts %{_sbindir}/seedit-init %ghost %{_datadir}/%{name}/sepolicy/need-init %ghost %{_datadir}/%{name}/sepolicy/need-rbac-init @@ -143,7 +144,6 @@ Summary: GUI for SELinux Policy Editor Group: System Environment/Base Requires: usermode Requires: pygtk2 -Requires: pam >= 0.80-9 BuildRequires: desktop-file-utils BuildRequires: gettext Requires: %{name} = %{version}-%{release}, %{name}-policy = %{version}-%{release} @@ -170,6 +170,11 @@ X based GUI for SELinux Policy Editor %changelog +* Tue Oct 30 2007 Yuichi Nakamura 2.2.0-1 +- Version 2.2.0, works on F8. +- Removed libsepol from requires and buildrequires. +- In uninstall time, unneeded rules are removed from audit.rules. + * Tue Aug 28 2007 Jesse Keating 2.1.1-3 - Rebuild for ppc32 selinux issue. diff --git a/sources b/sources index 13ccf28..85404a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a380b9e2cb67c5d89fd28bdca63b330a seedit-2.1.1.tar.gz +cc89f85350b062318a1a4f527e206801 seedit-2.2.0.tar.gz From 754da428cddd2a642ff795f50f589a3fb1036253 Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Thu, 1 Nov 2007 15:21:37 +0000 Subject: [PATCH 3/5] *** empty log message *** --- seedit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seedit.spec b/seedit.spec index b14d006..ef58ca7 100644 --- a/seedit.spec +++ b/seedit.spec @@ -16,7 +16,7 @@ Name: seedit Version: 2.2.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPL From b18a8cda8fa745458e1c17313c26dc61cc9f0b49 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:38:29 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 69a289d..c5e3cf1 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: seedit -# $Id$ +# $Id: Makefile,v 1.1 2007/01/31 13:12:41 ynakam Exp $ NAME := seedit 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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +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)) From e6c4e853d89ee2c432f88735f8210b50c0df160c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:20:26 +0000 Subject: [PATCH 5/5] 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 c5e3cf1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: seedit -# $Id: Makefile,v 1.1 2007/01/31 13:12:41 ynakam Exp $ -NAME := seedit -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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8