From 8eaffc9c117e68a32f8dff9814e9ece70d3efea3 Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Fri, 9 Feb 2007 04:35:01 +0000 Subject: [PATCH 01/28] Updated for 2.1.0 --- seedit.spec | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/seedit.spec b/seedit.spec index d6a4e38..3fb00fc 100644 --- a/seedit.spec +++ b/seedit.spec @@ -1,5 +1,4 @@ -%define betatag beta6.7 -%define buildnum 15 +%define buildnum 1 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxconf %{_sysconfdir}/selinux/config @@ -9,23 +8,26 @@ #Whether SELinux supports modular policy, after FC5 "y" %define modular y #Whether pam supports include syntax, after FC5 "y" -%define pam_include_support y +%define pam_include_support y +#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 Name: seedit Version: 2.1.0 -Release: 0.%{buildnum}.%{betatag}%{?dist} +Release: %{buildnum}%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPL URL: http://seedit.sourceforge.net/ -Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}-%{betatag}.tar.gz +Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}.tar.gz Source1: seedit-gui.desktop Source2: seedit-gui.png 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 +Provides: seedit-converter %description SELinux Policy Editor(SEEdit) is a tool to make SELinux easy. @@ -49,18 +51,22 @@ popd rm -rf %{buildroot} pushd core -make install DESTDIR=%{buildroot} PYTHON_SITELIB=%{buildroot}/%{python_sitelib} CUSTOMIZABLE_TYPES=%{customizable_types} MODULAR=%{modular} +make install DESTDIR=%{buildroot} PYTHON_SITELIB=%{buildroot}/%{python_sitelib} CUSTOMIZABLE_TYPES=%{customizable_types} MODULAR=%{modular} AUDIT_OBJ_TYPE_SUPPORT=%{audit_obj_type_support} popd pushd policy -make install DESTDIR=%{buildroot} DISTRO=%{sample_policy_type} SELINUXTYPE=seedit MODULAR=%{modular} AUDITRULES=%{auditrules} +make install DESTDIR=%{buildroot} DISTRO=%{sample_policy_type} SELINUXTYPE=seedit MODULAR=%{modular} AUDITRULES=%{auditrules} popd pushd gui make install DESTDIR=%{buildroot} PYTHON_SITELIB=%{buildroot}/%{python_sitelib} PAM_INCLUDE_SUPPORT=%{pam_include_support} +#For Asianux2 +#AX2 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications +#AX2 install -p -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications desktop-file-install --vendor "" --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} + mkdir -p %{buildroot}%{_datadir}/pixmaps install -p -m 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/seedit-gui.png popd @@ -85,14 +91,14 @@ rm -rf %{buildroot} %{_bindir}/seedit-unconfined %{_bindir}/seedit-template %dir %{python_sitelib}/%{name} -%{python_sitelib}/%{name}/*.py -%{python_sitelib}/%{name}/*.pyo -%{python_sitelib}/%{name}/*.pyc +%{python_sitelib}/%{name}/*.* %dir %{_datadir}/%{name} %{_datadir}/%{name}/Makefile %{_datadir}/%{name}/macros %{_datadir}/%{name}/base_policy %dir %{_datadir}/%{name}/sepolicy +%dir %{_sysconfdir}/%{name} +%{_sysconfdir}/%{name}/seedit-load.conf %package policy Summary: SELinux Policy Editor: Sample simplified policy @@ -121,7 +127,7 @@ fi %files policy %defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/policy %config(noreplace) %{_sysconfdir}/selinux/%{name} %{_datadir}/%{name}/initialize/ %{_sbindir}/seedit-init @@ -134,7 +140,8 @@ Group: System Environment/Base Requires: usermode Requires: pygtk2 Requires: pam >= 0.80-9 -BuildRequires: desktop-file-utils, gettext +BuildRequires: desktop-file-utils +BuildRequires: gettext Requires: %{name} = %{version}-%{release}, %{name}-policy = %{version}-%{release} %description gui @@ -159,6 +166,13 @@ X based GUI for SELinux Policy Editor %changelog +* Tue Feb 6 2007 Yuichi Nakamura 2.1.0-1 + - Fixed bug in RBAC + - Fixed installer for Asianux + +* Wed Jan 31 2007 Yuichi Nakamura 2.1.0-0.16.beta7 + - Fixed for CentOS4, package build failed. + * Sat Jan 27 2007 Yuichi Nakamura 2.1.0-0.15.beta6.7 - Fixed Requires - Fixed makefiles to preserve timestamps. From 1ce599f08080efcfc8c24d5e284d4c1358d4f803 Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Fri, 9 Feb 2007 05:30:40 +0000 Subject: [PATCH 02/28] Uploaded 2.1.0 --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0a2f524..8c6b065 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -seedit-2.1.0-beta6.7.tar.gz +seedit-2.1.0.tar.gz diff --git a/sources b/sources index 2b1a057..323589f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -61eec5bb305ac6100db50f03a3867f59 seedit-2.1.0-beta6.7.tar.gz +7c1577a48ae95d4d1d425121f4c3980b seedit-2.1.0.tar.gz From e5c9459629dc9f70311b74e20812dc9193146440 Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Fri, 9 Feb 2007 05:38:41 +0000 Subject: [PATCH 03/28] Fixed build failure --- seedit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/seedit.spec b/seedit.spec index 3fb00fc..4f9a535 100644 --- a/seedit.spec +++ b/seedit.spec @@ -1,4 +1,4 @@ -%define buildnum 1 +%define buildnum 2 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxconf %{_sysconfdir}/selinux/config @@ -166,6 +166,9 @@ X based GUI for SELinux Policy Editor %changelog +* Fri Feb 9 2007 Yuichi Nakamura 2.1.0-2 + - Fixed build failure + * Tue Feb 6 2007 Yuichi Nakamura 2.1.0-1 - Fixed bug in RBAC - Fixed installer for Asianux From 9bab0c08d42f0e1ceb3fbcec5373936d34defd6f Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Tue, 13 Feb 2007 04:43:19 +0000 Subject: [PATCH 04/28] increment release due to mistake in tag --- seedit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/seedit.spec b/seedit.spec index 4f9a535..ffec2ab 100644 --- a/seedit.spec +++ b/seedit.spec @@ -1,4 +1,4 @@ -%define buildnum 2 +%define buildnum 3 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxconf %{_sysconfdir}/selinux/config @@ -166,6 +166,9 @@ X based GUI for SELinux Policy Editor %changelog +* Fri Feb 9 2007 Yuichi Nakamura 2.1.0-3 + - Fixed build failure + * Fri Feb 9 2007 Yuichi Nakamura 2.1.0-2 - Fixed build failure From 48083bc657031a11b932c8448382b367b96207a3 Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Thu, 15 Feb 2007 02:32:41 +0000 Subject: [PATCH 05/28] Update for bug fix, 2.1.0-4 --- 2.1.0-4.patch | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ seedit.spec | 7 ++++- 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 2.1.0-4.patch diff --git a/2.1.0-4.patch b/2.1.0-4.patch new file mode 100644 index 0000000..54b1fdb --- /dev/null +++ b/2.1.0-4.patch @@ -0,0 +1,72 @@ +Index: Changelog +=================================================================== +--- Changelog (リビジョン 644) ++++ Changelog (作業コピー) +@@ -1,3 +1,7 @@ ++*2007/02/14 ++ - Fixed bug ++ -- seedit-converter did not work when "//" is included in path ++ + *2007/02/05 + - Fixed installhelper-include.sh for asianux 2 + - Add seedit-load.conf to customize obj_type filed of audit +Index: core/converter/action.c +=================================================================== +--- core/converter/action.c (リビジョン 644) ++++ core/converter/action.c (作業コピー) +@@ -516,12 +516,42 @@ + + } + ++/*replace '//' with '/' */ ++char *remove_slash(char *path) { ++ char *buf; ++ char *result; ++ int len; ++ int i; ++ int j; ++ result = strdup(path); ++ len = strlen(path); ++ buf = (char *)my_malloc(sizeof(char) * (len + 1)); ++ memset(buf, 0, sizeof(char) * (len + 1)); ++ ++ j = 0; ++ for (i=0; i < len; i++) { ++ if(path[i] == '/') { ++ if (i > 0 && path[i-1] == '/'){ ++ /*do nothing*/ ++ } else { ++ buf[j] = path[i]; ++ j++; ++ } ++ } else { ++ buf[j] = path[i]; ++ j++; ++ } ++ } ++ memcpy(result,buf,len+1); ++ free(buf); ++ return result; ++} ++ + int register_file_rule(char *path){ + char **dir_list; +- char *filename; +- ++ char *filename; + int state; +- ++ path = remove_slash(path); + state = get_file_state(path); + filename = get_filename(path, state); + add_file_user_list(filename); +@@ -540,7 +570,8 @@ + /* when allow * is described, add dummy permission to dummy domain. */ + label_child_dir(filename); + } +- ++ ++ free(path); + return 0; + + } diff --git a/seedit.spec b/seedit.spec index ffec2ab..bcf6d71 100644 --- a/seedit.spec +++ b/seedit.spec @@ -1,4 +1,4 @@ -%define buildnum 3 +%define buildnum 4 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxconf %{_sysconfdir}/selinux/config @@ -24,6 +24,7 @@ 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 +Patch0: 2.1.0-4.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 @@ -40,6 +41,7 @@ Command line utils is included in seedit package. %prep %setup -q +%patch0 -p0 %build pushd core @@ -166,6 +168,9 @@ X based GUI for SELinux Policy Editor %changelog +* Thu Feb 15 2007 Yuichi Nakamura 2.1.0-4 + - Fixed bug, seedit-converter did not work when "//" is included in path + * Fri Feb 9 2007 Yuichi Nakamura 2.1.0-3 - Fixed build failure From f3dce911552f20a8faffaf6a9c1a8fb428e30072 Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Thu, 15 Feb 2007 03:42:53 +0000 Subject: [PATCH 06/28] Update for 2.1.0-5 --- 2.1.0-5.patch | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++ seedit.spec | 18 +++++++--- 2 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 2.1.0-5.patch diff --git a/2.1.0-5.patch b/2.1.0-5.patch new file mode 100644 index 0000000..af9f09d --- /dev/null +++ b/2.1.0-5.patch @@ -0,0 +1,98 @@ +Index: Changelog +=================================================================== +--- Changelog (リビジョン 644) ++++ Changelog (作業コピー) +@@ -1,3 +1,7 @@ ++*2007/02/14 ++ - Fixed bug ++ -- seedit-converter did not work when "//" is included in path ++ + *2007/02/05 + - Fixed installhelper-include.sh for asianux 2 + - Add seedit-load.conf to customize obj_type filed of audit +Index: core/converter/action.c +=================================================================== +--- core/converter/action.c (リビジョン 644) ++++ core/converter/action.c (作業コピー) +@@ -516,12 +516,42 @@ + + } + ++/*replace '//' with '/' */ ++char *remove_slash(char *path) { ++ char *buf; ++ char *result; ++ int len; ++ int i; ++ int j; ++ result = strdup(path); ++ len = strlen(path); ++ buf = (char *)my_malloc(sizeof(char) * (len + 1)); ++ memset(buf, 0, sizeof(char) * (len + 1)); ++ ++ j = 0; ++ for (i=0; i < len; i++) { ++ if(path[i] == '/') { ++ if (i > 0 && path[i-1] == '/'){ ++ /*do nothing*/ ++ } else { ++ buf[j] = path[i]; ++ j++; ++ } ++ } else { ++ buf[j] = path[i]; ++ j++; ++ } ++ } ++ memcpy(result,buf,len+1); ++ free(buf); ++ return result; ++} ++ + int register_file_rule(char *path){ + char **dir_list; +- char *filename; +- ++ char *filename; + int state; +- ++ path = remove_slash(path); + state = get_file_state(path); + filename = get_filename(path, state); + add_file_user_list(filename); +@@ -540,7 +570,8 @@ + /* when allow * is described, add dummy permission to dummy domain. */ + label_child_dir(filename); + } +- ++ ++ free(path); + return 0; + + } +Index: core/utils/seedit-load.py +=================================================================== +--- core/utils/seedit-load.py (リビジョン 644) ++++ core/utils/seedit-load.py (作業コピー) +@@ -24,7 +24,7 @@ + import string + import gettext + +-gSeeditLoadConf="/etc/seedit/seedit-load.conf" ++gSeeditLoadConf="/usr/share/seedit/seedit-load.conf" + gMakeFlags="CONFDIR=/etc/seedit/policy OUTDIR=/usr/share/seedit/sepolicy BASEPOLICYDIR=/usr/share/seedit/base_policy MACRODIR=/usr/share/seedit/macros" + gAuditCtl="/sbin/auditctl" + +Index: core/config/Makefile +=================================================================== +--- core/config/Makefile (リビジョン 644) ++++ core/config/Makefile (作業コピー) +@@ -63,7 +63,7 @@ + mkdir -p $(BUILD_ROOT_DIR)/sepolicy + mkdir -p $(SEEDITCONFROOT) + mkdir -p $(sysconfdir)/seedit +- install -p -m 0644 seedit-load.conf $(sysconfdir)/seedit ++ install -p -m 0644 seedit-load.conf $(SEEDITCONFROOT) + cp -p -r base_policy $(SEEDITCONFROOT) + cp -p -r macros $(SEEDITCONFROOT) + mv $(SEEDITCONFROOT)/base_policy/spdl_spec.xml.expand $(SEEDITCONFROOT)/base_policy/spdl_spec.xml diff --git a/seedit.spec b/seedit.spec index bcf6d71..ac2ff2d 100644 --- a/seedit.spec +++ b/seedit.spec @@ -1,5 +1,6 @@ -%define buildnum 4 +%define buildnum 5 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') +%define selinuxenabled /usr/sbin/selinuxenabled %define selinuxconf %{_sysconfdir}/selinux/config %define auditrules %{_sysconfdir}/audit/audit.rules @@ -24,11 +25,11 @@ 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 -Patch0: 2.1.0-4.patch +Patch0: 2.1.0-5.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 -Provides: seedit-converter +Provides: seedit-converter = %{version}-%{release} %description SELinux Policy Editor(SEEdit) is a tool to make SELinux easy. @@ -99,8 +100,7 @@ rm -rf %{buildroot} %{_datadir}/%{name}/macros %{_datadir}/%{name}/base_policy %dir %{_datadir}/%{name}/sepolicy -%dir %{_sysconfdir}/%{name} -%{_sysconfdir}/%{name}/seedit-load.conf +%{_datadir}/%{name}/seedit-load.conf %package policy Summary: SELinux Policy Editor: Sample simplified policy @@ -124,6 +124,9 @@ fi %postun policy if [ $1 = 0 ]; then sed -i 's/^SELINUXTYPE=.*/SELINUXTYPE=targeted/g' %{_sysconfdir}/selinux/config + if [ %{selinuxenabled} ]; then + sed -i 's/^SELINUX=.*/SELINUX=permissive/g' %{_sysconfdir}/selinux/config + fi touch /.autorelabel fi @@ -168,6 +171,11 @@ X based GUI for SELinux Policy Editor %changelog +* Thu Feb 15 2007 Yuichi Nakamura 2.1.0-5 + - SELINUX= is set permissive when uninstall, +because relabel fails in enforcing mode. + - Modified path to seedit-load.conf + * Thu Feb 15 2007 Yuichi Nakamura 2.1.0-4 - Fixed bug, seedit-converter did not work when "//" is included in path From 387f1f4dd546bd9f559bfd65db03972d90d1b196 Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Thu, 12 Apr 2007 07:36:47 +0000 Subject: [PATCH 07/28] Updated to 2.1.1 --- seedit.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/seedit.spec b/seedit.spec index ac2ff2d..a28d1ad 100644 --- a/seedit.spec +++ b/seedit.spec @@ -1,4 +1,4 @@ -%define buildnum 5 +%define buildnum 1 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxenabled /usr/sbin/selinuxenabled @@ -16,7 +16,7 @@ %define sample_policy_type fc6 Name: seedit -Version: 2.1.0 +Version: 2.1.1 Release: %{buildnum}%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base @@ -25,7 +25,6 @@ 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 -Patch0: 2.1.0-5.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 @@ -42,7 +41,6 @@ Command line utils is included in seedit package. %prep %setup -q -%patch0 -p0 %build pushd core @@ -171,7 +169,11 @@ X based GUI for SELinux Policy Editor %changelog -* Thu Feb 15 2007 Yuichi Nakamura 2.1.0-5 +* Thu Apr 12 2007 Yuichi Nakamura 2.1.1-1 + - Merged bug fix until 2.1.0-5 + - Other bug fixes + +* Fri Feb 16 2007 Yuichi Nakamura 2.1.0-5 - SELINUX= is set permissive when uninstall, because relabel fails in enforcing mode. - Modified path to seedit-load.conf From 02f55d2167abed749daed11cdd0fa4e2473e81e2 Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Thu, 12 Apr 2007 07:52:40 +0000 Subject: [PATCH 08/28] Fixed build error --- seedit.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/seedit.spec b/seedit.spec index a28d1ad..e5f6004 100644 --- a/seedit.spec +++ b/seedit.spec @@ -17,7 +17,7 @@ Name: seedit Version: 2.1.1 -Release: %{buildnum}%{?dist} +Release: %{buildnum}%{?dist}.2 Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPL diff --git a/sources b/sources index 323589f..13ccf28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c1577a48ae95d4d1d425121f4c3980b seedit-2.1.0.tar.gz +a380b9e2cb67c5d89fd28bdca63b330a seedit-2.1.1.tar.gz From a92f7d04ab39ae352bea971f1b3858d5fa6b19e4 Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Thu, 12 Apr 2007 08:06:37 +0000 Subject: [PATCH 09/28] Uploaded source --- .cvsignore | 1 + seedit.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index 8c6b065..61eeb27 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ seedit-2.1.0.tar.gz +seedit-2.1.1.tar.gz diff --git a/seedit.spec b/seedit.spec index e5f6004..b7ff988 100644 --- a/seedit.spec +++ b/seedit.spec @@ -17,7 +17,7 @@ Name: seedit Version: 2.1.1 -Release: %{buildnum}%{?dist}.2 +Release: %{buildnum}%{?dist}.3 Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPL From d38918f21a05bcbc377564297feb32e1bffab70a Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Thu, 19 Apr 2007 04:36:48 +0000 Subject: [PATCH 10/28] Fixed install bug, test for devel --- 2.1.1-2.patch | 10 ++++++++++ seedit.spec | 8 +++++--- 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 2.1.1-2.patch diff --git a/2.1.1-2.patch b/2.1.1-2.patch new file mode 100644 index 0000000..6a3485c --- /dev/null +++ b/2.1.1-2.patch @@ -0,0 +1,10 @@ +Index: core/config/base_policy/types.te +=================================================================== +--- core/config/base_policy/types.te (revision 660) ++++ core/config/base_policy/types.te (working copy) +@@ -1,4 +1,4 @@ +-h # SELinux Policy Editor, a simple editor for SELinux policies ++# SELinux Policy Editor, a simple editor for SELinux policies + # Copyright (C) 2006 Yuichi Nakamura + + ## minimum types used in converter diff --git a/seedit.spec b/seedit.spec index b7ff988..f5dfad8 100644 --- a/seedit.spec +++ b/seedit.spec @@ -1,4 +1,4 @@ -%define buildnum 1 +%define buildnum 2 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxenabled /usr/sbin/selinuxenabled @@ -17,7 +17,7 @@ Name: seedit Version: 2.1.1 -Release: %{buildnum}%{?dist}.3 +Release: %{buildnum}%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPL @@ -41,6 +41,7 @@ Command line utils is included in seedit package. %prep %setup -q +%patch -p0 %build pushd core @@ -169,10 +170,11 @@ X based GUI for SELinux Policy Editor %changelog +* Wed Apr 18 2007 Yuichi Nakamura 2.1.1-2 + - Fixed install bug * Thu Apr 12 2007 Yuichi Nakamura 2.1.1-1 - Merged bug fix until 2.1.0-5 - Other bug fixes - * Fri Feb 16 2007 Yuichi Nakamura 2.1.0-5 - SELINUX= is set permissive when uninstall, because relabel fails in enforcing mode. From de6947b726dbcb59d762b26be98eed058bf7ee8e Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Thu, 19 Apr 2007 04:49:33 +0000 Subject: [PATCH 11/28] add patch --- seedit.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/seedit.spec b/seedit.spec index f5dfad8..c9ee973 100644 --- a/seedit.spec +++ b/seedit.spec @@ -25,6 +25,7 @@ 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 From 7cab539cc3058489500ad9482bdcb03ad6fabd00 Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Thu, 19 Apr 2007 04:50:35 +0000 Subject: [PATCH 12/28] pumped sub build num --- seedit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seedit.spec b/seedit.spec index c9ee973..ccd7c29 100644 --- a/seedit.spec +++ b/seedit.spec @@ -17,7 +17,7 @@ Name: seedit Version: 2.1.1 -Release: %{buildnum}%{?dist} +Release: %{buildnum}%{?dist}.1 Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPL From b7c4cb2f42b5b9c672f5359a364ecf2164e159b0 Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Fri, 15 Jun 2007 14:14:33 +0000 Subject: [PATCH 13/28] to fix build system error --- seedit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seedit.spec b/seedit.spec index ccd7c29..6e8dc7c 100644 --- a/seedit.spec +++ b/seedit.spec @@ -17,7 +17,7 @@ Name: seedit Version: 2.1.1 -Release: %{buildnum}%{?dist}.1 +Release: %{buildnum}%{?dist}.2 Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPL From e3c00226c0a944791c5c78b21d0c7a5101969f45 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 28 Aug 2007 17:46:18 +0000 Subject: [PATCH 14/28] - Rebuild for ppc32 selinux issue. --- seedit.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/seedit.spec b/seedit.spec index 6e8dc7c..fb082e8 100644 --- a/seedit.spec +++ b/seedit.spec @@ -1,4 +1,3 @@ -%define buildnum 2 %define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') %define selinuxenabled /usr/sbin/selinuxenabled @@ -17,7 +16,7 @@ Name: seedit Version: 2.1.1 -Release: %{buildnum}%{?dist}.2 +Release: 3%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPL @@ -171,6 +170,9 @@ X based GUI for SELinux Policy Editor %changelog +* Tue Aug 28 2007 Jesse Keating 2.1.1-3 +- Rebuild for ppc32 selinux issue. + * Wed Apr 18 2007 Yuichi Nakamura 2.1.1-2 - Fixed install bug * Thu Apr 12 2007 Yuichi Nakamura 2.1.1-1 From 27a99eedd69074a6e42499b0b4803cf5d1fe2586 Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Wed, 31 Oct 2007 14:40:09 +0000 Subject: [PATCH 15/28] seedit: update devel for 2.2.0. --- seedit.spec | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) 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. From 5eb7c18bde09cdc2838b62f90417d8207609e391 Mon Sep 17 00:00:00 2001 From: Yuichi Nakamura Date: Wed, 31 Oct 2007 14:53:35 +0000 Subject: [PATCH 16/28] Upload seedit-2.2.0.tar.gz --- .cvsignore | 3 +-- sources | 2 +- 2 files changed, 2 insertions(+), 3 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/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 06a49ebdcfe46d081f9f7517d870fa505d1f70da Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 20 Feb 2008 08:39:26 +0000 Subject: [PATCH 17/28] - Autorebuild for GCC 4.3 --- seedit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/seedit.spec b/seedit.spec index b14d006..3d851ab 100644 --- a/seedit.spec +++ b/seedit.spec @@ -16,7 +16,7 @@ Name: seedit Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPL @@ -170,6 +170,9 @@ X based GUI for SELinux Policy Editor %changelog +* Wed Feb 20 2008 Fedora Release Engineering - 2.2.0-2 +- Autorebuild for GCC 4.3 + * Tue Oct 30 2007 Yuichi Nakamura 2.2.0-1 - Version 2.2.0, works on F8. - Removed libsepol from requires and buildrequires. From c04ec770662bdc9ec0c57f436e78c6209d71b11b Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 4 Sep 2008 17:00:04 +0000 Subject: [PATCH 18/28] fix license tag --- seedit.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/seedit.spec b/seedit.spec index 3d851ab..271545d 100644 --- a/seedit.spec +++ b/seedit.spec @@ -16,10 +16,10 @@ Name: seedit Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base -License: GPL +License: GPLv2+ URL: http://seedit.sourceforge.net/ Source0: http://osdn.dl.sourceforge.jp/selpe/23577/%{name}-%{version}.tar.gz Source1: seedit-gui.desktop @@ -170,6 +170,9 @@ X based GUI for SELinux Policy Editor %changelog +* Thu Sep 4 2008 Tom "spot" Callaway - 2.2.0-3 +- fix license tag + * Wed Feb 20 2008 Fedora Release Engineering - 2.2.0-2 - Autorebuild for GCC 4.3 From 45dc2e57759086a56d91ad1c97d4dbe38db55d86 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Sat, 29 Nov 2008 17:21:10 +0000 Subject: [PATCH 19/28] Rebuild for Python 2.6 --- seedit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/seedit.spec b/seedit.spec index 271545d..49d2139 100644 --- a/seedit.spec +++ b/seedit.spec @@ -16,7 +16,7 @@ Name: seedit Version: 2.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPLv2+ @@ -170,6 +170,9 @@ X based GUI for SELinux Policy Editor %changelog +* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.2.0-4 +- Rebuild for Python 2.6 + * Thu Sep 4 2008 Tom "spot" Callaway - 2.2.0-3 - fix license tag From f577cf7641beef6242d1e0d4fb69a7cb3b08704c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 00:24:12 +0000 Subject: [PATCH 20/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- seedit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/seedit.spec b/seedit.spec index 49d2139..a1e3f5f 100644 --- a/seedit.spec +++ b/seedit.spec @@ -16,7 +16,7 @@ Name: seedit Version: 2.2.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPLv2+ @@ -170,6 +170,9 @@ X based GUI for SELinux Policy Editor %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 2.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.2.0-4 - Rebuild for Python 2.6 From 4a031f3b231fa7469e120c5cd8926b18da1876dd Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Mon, 15 Jun 2009 09:57:21 +0000 Subject: [PATCH 21/28] - Include unowned directory /etc/seedit in seedit-policy pkg (#474601). --- seedit.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/seedit.spec b/seedit.spec index a1e3f5f..f27f82d 100644 --- a/seedit.spec +++ b/seedit.spec @@ -16,7 +16,7 @@ Name: seedit Version: 2.2.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPLv2+ @@ -131,6 +131,7 @@ fi %files policy %defattr(-,root,root,-) +%dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/policy %config(noreplace) %{_sysconfdir}/selinux/%{name} %{_datadir}/%{name}/initialize/ @@ -170,6 +171,9 @@ X based GUI for SELinux Policy Editor %changelog +* Mon Jun 15 2009 Michael Schwendt - 2.2.0-6 +- Include unowned directory /etc/seedit in seedit-policy pkg (#474601). + * Wed Feb 25 2009 Fedora Release Engineering - 2.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 92ecfa7620c73c96941f719a02e1596d633ef24e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 04:07:51 +0000 Subject: [PATCH 22/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- seedit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/seedit.spec b/seedit.spec index f27f82d..4a66826 100644 --- a/seedit.spec +++ b/seedit.spec @@ -16,7 +16,7 @@ Name: seedit Version: 2.2.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPLv2+ @@ -171,6 +171,9 @@ X based GUI for SELinux Policy Editor %changelog +* Sun Jul 26 2009 Fedora Release Engineering - 2.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Jun 15 2009 Michael Schwendt - 2.2.0-6 - Include unowned directory /etc/seedit in seedit-policy pkg (#474601). From 4c90ad164711a941af30c49f85cd3f52d4ccb997 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:15:28 +0000 Subject: [PATCH 23/28] 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 8f9d4d2f22ae0654f99368b2f360732f5a160c24 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 06:28:37 +0000 Subject: [PATCH 24/28] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- seedit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/seedit.spec b/seedit.spec index 4a66826..9d0a837 100644 --- a/seedit.spec +++ b/seedit.spec @@ -16,7 +16,7 @@ Name: seedit Version: 2.2.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPLv2+ @@ -171,6 +171,9 @@ X based GUI for SELinux Policy Editor %changelog +* Thu Jul 22 2010 David Malcolm - 2.2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Sun Jul 26 2009 Fedora Release Engineering - 2.2.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From f45d6cbf9e61cf119395414cd3449620f35fd63a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:20:35 +0000 Subject: [PATCH 25/28] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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) From d9e78e9eecc5d081691774041d6262fd3b55a879 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 07:04:05 -0600 Subject: [PATCH 26/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- seedit.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/seedit.spec b/seedit.spec index 9d0a837..c454a0f 100644 --- a/seedit.spec +++ b/seedit.spec @@ -16,7 +16,7 @@ Name: seedit Version: 2.2.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPLv2+ @@ -171,6 +171,9 @@ X based GUI for SELinux Policy Editor %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 2.2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Jul 22 2010 David Malcolm - 2.2.0-8 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From face1cfa08f91739b569d200b6c20a425c2c3312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Mon, 27 Jun 2011 12:28:14 +0200 Subject: [PATCH 27/28] BR: flex-static (Fix FTBS BZ#716200). Add sed-hacks to work-around various Makefile defects. --- seedit.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/seedit.spec b/seedit.spec index c454a0f..41f6ae1 100644 --- a/seedit.spec +++ b/seedit.spec @@ -16,7 +16,7 @@ Name: seedit Version: 2.2.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: SELinux Policy Editor:Core component Group: System Environment/Base License: GPLv2+ @@ -26,6 +26,7 @@ Source1: seedit-gui.desktop Source2: seedit-gui.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{betatag}-root-%(%{__id_u} -n) BuildRequires: libselinux-devel >= 1.19, byacc, flex +BuildRequires: flex-static Requires: checkpolicy, m4, audit, libselinux >= 1.19 Provides: seedit-converter = %{version}-%{release} @@ -41,6 +42,10 @@ Command line utils is included in seedit package. %prep %setup -q #%patch -p0 +# Hack around various Makefile defects +sed -i -e 's, -I$(INCLUDEDIR),,' core/converter/Makefile core/lib/Makefile +sed -i -e 's,^LDPATH,# LDPATH,' core/converter/Makefile core/xml/Makefile +sed -i -e 's, -L$(prefix)/lib,,' core/restorecon/Makefile %build pushd core @@ -171,6 +176,10 @@ X based GUI for SELinux Policy Editor %changelog +* Mon Jun 27 2011 Ralf Corsépius - 2.2.0-10 +- BR: flex-static (Fix FTBS BZ#716200). +- Add sed-hacks to work-around various Makefile defects. + * Wed Feb 09 2011 Fedora Release Engineering - 2.2.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 63cdf86ba9f6be762dff9363b61492c9bb57dcaf Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 25 Jul 2011 18:15:20 -0400 Subject: [PATCH 28/28] Retire seedit. --- 2.1.0-4.patch | 72 ----------- 2.1.0-5.patch | 98 --------------- 2.1.1-2.patch | 10 -- dead.package | 1 + seedit-gui.desktop | 13 -- seedit-gui.png | Bin 1363 -> 0 bytes seedit.spec | 296 --------------------------------------------- sources | 1 - 8 files changed, 1 insertion(+), 490 deletions(-) delete mode 100644 2.1.0-4.patch delete mode 100644 2.1.0-5.patch delete mode 100644 2.1.1-2.patch create mode 100644 dead.package delete mode 100644 seedit-gui.desktop delete mode 100644 seedit-gui.png delete mode 100644 seedit.spec delete mode 100644 sources diff --git a/2.1.0-4.patch b/2.1.0-4.patch deleted file mode 100644 index 54b1fdb..0000000 --- a/2.1.0-4.patch +++ /dev/null @@ -1,72 +0,0 @@ -Index: Changelog -=================================================================== ---- Changelog (リビジョン 644) -+++ Changelog (作業コピー) -@@ -1,3 +1,7 @@ -+*2007/02/14 -+ - Fixed bug -+ -- seedit-converter did not work when "//" is included in path -+ - *2007/02/05 - - Fixed installhelper-include.sh for asianux 2 - - Add seedit-load.conf to customize obj_type filed of audit -Index: core/converter/action.c -=================================================================== ---- core/converter/action.c (リビジョン 644) -+++ core/converter/action.c (作業コピー) -@@ -516,12 +516,42 @@ - - } - -+/*replace '//' with '/' */ -+char *remove_slash(char *path) { -+ char *buf; -+ char *result; -+ int len; -+ int i; -+ int j; -+ result = strdup(path); -+ len = strlen(path); -+ buf = (char *)my_malloc(sizeof(char) * (len + 1)); -+ memset(buf, 0, sizeof(char) * (len + 1)); -+ -+ j = 0; -+ for (i=0; i < len; i++) { -+ if(path[i] == '/') { -+ if (i > 0 && path[i-1] == '/'){ -+ /*do nothing*/ -+ } else { -+ buf[j] = path[i]; -+ j++; -+ } -+ } else { -+ buf[j] = path[i]; -+ j++; -+ } -+ } -+ memcpy(result,buf,len+1); -+ free(buf); -+ return result; -+} -+ - int register_file_rule(char *path){ - char **dir_list; -- char *filename; -- -+ char *filename; - int state; -- -+ path = remove_slash(path); - state = get_file_state(path); - filename = get_filename(path, state); - add_file_user_list(filename); -@@ -540,7 +570,8 @@ - /* when allow * is described, add dummy permission to dummy domain. */ - label_child_dir(filename); - } -- -+ -+ free(path); - return 0; - - } diff --git a/2.1.0-5.patch b/2.1.0-5.patch deleted file mode 100644 index af9f09d..0000000 --- a/2.1.0-5.patch +++ /dev/null @@ -1,98 +0,0 @@ -Index: Changelog -=================================================================== ---- Changelog (リビジョン 644) -+++ Changelog (作業コピー) -@@ -1,3 +1,7 @@ -+*2007/02/14 -+ - Fixed bug -+ -- seedit-converter did not work when "//" is included in path -+ - *2007/02/05 - - Fixed installhelper-include.sh for asianux 2 - - Add seedit-load.conf to customize obj_type filed of audit -Index: core/converter/action.c -=================================================================== ---- core/converter/action.c (リビジョン 644) -+++ core/converter/action.c (作業コピー) -@@ -516,12 +516,42 @@ - - } - -+/*replace '//' with '/' */ -+char *remove_slash(char *path) { -+ char *buf; -+ char *result; -+ int len; -+ int i; -+ int j; -+ result = strdup(path); -+ len = strlen(path); -+ buf = (char *)my_malloc(sizeof(char) * (len + 1)); -+ memset(buf, 0, sizeof(char) * (len + 1)); -+ -+ j = 0; -+ for (i=0; i < len; i++) { -+ if(path[i] == '/') { -+ if (i > 0 && path[i-1] == '/'){ -+ /*do nothing*/ -+ } else { -+ buf[j] = path[i]; -+ j++; -+ } -+ } else { -+ buf[j] = path[i]; -+ j++; -+ } -+ } -+ memcpy(result,buf,len+1); -+ free(buf); -+ return result; -+} -+ - int register_file_rule(char *path){ - char **dir_list; -- char *filename; -- -+ char *filename; - int state; -- -+ path = remove_slash(path); - state = get_file_state(path); - filename = get_filename(path, state); - add_file_user_list(filename); -@@ -540,7 +570,8 @@ - /* when allow * is described, add dummy permission to dummy domain. */ - label_child_dir(filename); - } -- -+ -+ free(path); - return 0; - - } -Index: core/utils/seedit-load.py -=================================================================== ---- core/utils/seedit-load.py (リビジョン 644) -+++ core/utils/seedit-load.py (作業コピー) -@@ -24,7 +24,7 @@ - import string - import gettext - --gSeeditLoadConf="/etc/seedit/seedit-load.conf" -+gSeeditLoadConf="/usr/share/seedit/seedit-load.conf" - gMakeFlags="CONFDIR=/etc/seedit/policy OUTDIR=/usr/share/seedit/sepolicy BASEPOLICYDIR=/usr/share/seedit/base_policy MACRODIR=/usr/share/seedit/macros" - gAuditCtl="/sbin/auditctl" - -Index: core/config/Makefile -=================================================================== ---- core/config/Makefile (リビジョン 644) -+++ core/config/Makefile (作業コピー) -@@ -63,7 +63,7 @@ - mkdir -p $(BUILD_ROOT_DIR)/sepolicy - mkdir -p $(SEEDITCONFROOT) - mkdir -p $(sysconfdir)/seedit -- install -p -m 0644 seedit-load.conf $(sysconfdir)/seedit -+ install -p -m 0644 seedit-load.conf $(SEEDITCONFROOT) - cp -p -r base_policy $(SEEDITCONFROOT) - cp -p -r macros $(SEEDITCONFROOT) - mv $(SEEDITCONFROOT)/base_policy/spdl_spec.xml.expand $(SEEDITCONFROOT)/base_policy/spdl_spec.xml diff --git a/2.1.1-2.patch b/2.1.1-2.patch deleted file mode 100644 index 6a3485c..0000000 --- a/2.1.1-2.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: core/config/base_policy/types.te -=================================================================== ---- core/config/base_policy/types.te (revision 660) -+++ core/config/base_policy/types.te (working copy) -@@ -1,4 +1,4 @@ --h # SELinux Policy Editor, a simple editor for SELinux policies -+# SELinux Policy Editor, a simple editor for SELinux policies - # Copyright (C) 2006 Yuichi Nakamura - - ## minimum types used in converter diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..6c90bdc --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package was retired on 2011-07-25 due to it being unable to build this package for multiple releases (FTBFS). diff --git a/seedit-gui.desktop b/seedit-gui.desktop deleted file mode 100644 index b91b90f..0000000 --- a/seedit-gui.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Name=SELinux Policy Editor -GenericName=SELinux Policy Editor -Comment=A tool to make SELinux easy -Comment[ja]=SELinuxを簡単に使うためのツールです -Icon=seedit-gui.png -Exec=/usr/bin/seedit-gui -Type=Application -Terminal=false -Encoding=UTF-8 -Categories=System;Security -X-Desktop-File-Install-Version=0.2 -StartupNotify=true diff --git a/seedit-gui.png b/seedit-gui.png deleted file mode 100644 index e498601658f52e1562140d295e7b80d7df14b6eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1363 zcmV-Z1+4msP)UFWod3@ataDmXlZjGX>DO= zWgvH9b0A}KWnpw>WFU2OX>MmAM`>+vE+9u~ZEzrIb0B7NWo009Z)S9NVRB_43Sn~~ zWMyV)Ze?U3VtF8RXk{Qqa%E*8Q*UN;cVTj6AVzO>Ze(F}X>V>IVQyp~X>%Z9c4293 zVPb4$3TAI|AY^ZMZftL1WFTR5AZT=Sa5^t9cXxL#XK8J4E^l&YMp_mN000CMNklj4LfKR?LKg$3rlGA+P)fzN=?6he3w=3{+Fy=MVjzy_4}{+|Gv_tECMy1IQ04Go($O)LpB!O2ImX8D5~>{&t6<_f)_s5gj$>mMvN-uPk!91| z%BRtw9ykN!09T*I`?@Bj-6_Y$RSL(l5mAVES60)#sT%0Iw@RT9q~xT)y@SrC0ZO^J zw#Bh;I=L|v$8VJK@zK5pRxAti`N@l1AG%AxuOmu6^HAmd;E4e0%m92lqzFnne!meU?bo65OJRYi6)=(~M3&T#{x5Xu5&l?_(s9V)*tr zl`BF#w`DzBH?Bmy(k7xnq?9`4dZ}Z60F+BzWIfG0xAIwQ7x848%^Ozo_Ra|5P#GW` z|E`x{nE@W)i{=gZ4Bz|!g2vtPG%s$8uzN=>+36`xcmKh$wo82V;Z6V!y%FV^s--x^ z9Bw{CA)li>^aPM#&YLXC;mrA7PMy7sW92{`c5GTrCR@NM7Ewx}Yzx=15XZuC9F%e~ z0_F47Kxfa(+j-~Eary@1RD{d8KA7PBSGM9W52EV^Uw;29ivmVT1J|Xcv6AXFOXsP9 z>kZFHuw^tFq9HQ|8% zE>J0tZ%7Y?<;tDEGxlj)@w-=X)oeXE04xQh# V=>IE?jdTD2002ovPDHLkV1h*4T`2$n diff --git a/seedit.spec b/seedit.spec deleted file mode 100644 index 41f6ae1..0000000 --- a/seedit.spec +++ /dev/null @@ -1,296 +0,0 @@ -%define python_sitelib %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') -%define selinuxenabled /usr/sbin/selinuxenabled - -%define selinuxconf %{_sysconfdir}/selinux/config -%define auditrules %{_sysconfdir}/audit/audit.rules -#Whether SELinux supports customizable_types, after FC5 "y" -%define customizable_types y -#Whether SELinux supports modular policy, after FC5 "y" -%define modular y -#Whether pam supports include syntax, after FC5 "y" -%define pam_include_support y -#Whether audit support obj_type field, after FC6 "y" -%define audit_obj_type_support y -#Version of sample policy file -%define sample_policy_type f8 - -Name: seedit -Version: 2.2.0 -Release: 10%{?dist} -Summary: SELinux Policy Editor:Core component -Group: System Environment/Base -License: GPLv2+ -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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{betatag}-root-%(%{__id_u} -n) -BuildRequires: libselinux-devel >= 1.19, byacc, flex -BuildRequires: flex-static -Requires: checkpolicy, m4, audit, libselinux >= 1.19 -Provides: seedit-converter = %{version}-%{release} - -%description -SELinux Policy Editor(SEEdit) is a tool to make SELinux easy. -SEEdit is composed of Simplified Policy, command line utils and GUI. -The main feature is Simplified Policy. -Simplified Policy is written in Simplified Policy Description Language(SPDL). -SPDL hides detail of SELinux. -For detail, visit http://seedit.sourceforge.net/. -Command line utils is included in seedit package. - -%prep -%setup -q -#%patch -p0 -# Hack around various Makefile defects -sed -i -e 's, -I$(INCLUDEDIR),,' core/converter/Makefile core/lib/Makefile -sed -i -e 's,^LDPATH,# LDPATH,' core/converter/Makefile core/xml/Makefile -sed -i -e 's, -L$(prefix)/lib,,' core/restorecon/Makefile - -%build -pushd core -make clean -make %{?_smp_mflags} CFLAGS="%{optflags}" CUSTOMIZABLE_TYPES=%{customizable_types} MODULAR=%{modular} -popd - -%install -rm -rf %{buildroot} - -pushd core -make install DESTDIR=%{buildroot} PYTHON_SITELIB=%{buildroot}/%{python_sitelib} CUSTOMIZABLE_TYPES=%{customizable_types} MODULAR=%{modular} AUDIT_OBJ_TYPE_SUPPORT=%{audit_obj_type_support} -popd - -pushd policy -make install DESTDIR=%{buildroot} DISTRO=%{sample_policy_type} SELINUXTYPE=seedit MODULAR=%{modular} AUDITRULES=%{auditrules} -popd - -pushd gui -make install DESTDIR=%{buildroot} PYTHON_SITELIB=%{buildroot}/%{python_sitelib} PAM_INCLUDE_SUPPORT=%{pam_include_support} - -#For Asianux2 -#AX2 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications -#AX2 install -p -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications -desktop-file-install --vendor "" --dir ${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} - - -mkdir -p %{buildroot}%{_datadir}/pixmaps -install -p -m 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/seedit-gui.png -popd - -#touch ghost files -touch ${RPM_BUILD_ROOT}%{_datadir}/%{name}/sepolicy/need-rbac-init -touch ${RPM_BUILD_ROOT}%{_datadir}/%{name}/sepolicy/need-init - -%find_lang %{name} - -%clean -rm -rf %{buildroot} - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc README Changelog COPYING AUTHORS NEWS TODO -%{_bindir}/seedit-converter -%{_bindir}/audit2spdl -%{_sbindir}/seedit-rbac -%{_sbindir}/seedit-load -%{_sbindir}/seedit-restorecon -%{_bindir}/seedit-unconfined -%{_bindir}/seedit-template -%dir %{python_sitelib}/%{name} -%{python_sitelib}/%{name}/*.* -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/Makefile -%{_datadir}/%{name}/macros -%{_datadir}/%{name}/base_policy -%dir %{_datadir}/%{name}/sepolicy -%{_datadir}/%{name}/seedit-load.conf - -%package policy -Summary: SELinux Policy Editor: Sample simplified policy -Group: System Environment/Base -Requires: %{name} = %{version}-%{release} - -%description policy -Sample simplified policy for SEEdit. - -%post policy -if [ $1 = 1 ]; then - #Mark to initialize SELinux Policy Editor, when new install - touch %{_datadir}/%{name}/sepolicy/need-init -fi - -if [ $1 = 2 ]; then - #Mark to initialize RBAC config when upgrade - touch %{_datadir}/%{name}/sepolicy/need-rbac-init -fi - -%postun policy -if [ $1 = 0 ]; then - sed -i 's/^SELINUXTYPE=.*/SELINUXTYPE=targeted/g' %{_sysconfdir}/selinux/config - 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 - -%files policy -%defattr(-,root,root,-) -%dir %{_sysconfdir}/%{name} -%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 - -%package gui -Summary: GUI for SELinux Policy Editor -Group: System Environment/Base -Requires: usermode -Requires: pygtk2 -BuildRequires: desktop-file-utils -BuildRequires: gettext -Requires: %{name} = %{version}-%{release}, %{name}-policy = %{version}-%{release} - -%description gui -X based GUI for SELinux Policy Editor - -%files gui -f %{name}.lang -%defattr(-,root,root,-) -%{_bindir}/seedit-gui -%{_sbindir}/seedit-gui -%{_sbindir}/seedit-gui-status -%{_sbindir}/seedit-gui-domain-manager -%{_sbindir}/seedit-gui-role-manager -%{_sbindir}/seedit-gui-generate-policy -%{_sbindir}/seedit-gui-edit -%{_sbindir}/seedit-gui-load -%{python_sitelib}/%{name}/ui -%{_datadir}/icons/%{name} -%{_datadir}/applications/seedit-gui.desktop -%config(noreplace) %{_sysconfdir}/security/console.apps/seedit-gui -%config(noreplace) %{_sysconfdir}/pam.d/seedit-gui -%{_datadir}/pixmaps/seedit-gui.png - - -%changelog -* Mon Jun 27 2011 Ralf Corsépius - 2.2.0-10 -- BR: flex-static (Fix FTBS BZ#716200). -- Add sed-hacks to work-around various Makefile defects. - -* Wed Feb 09 2011 Fedora Release Engineering - 2.2.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Jul 22 2010 David Malcolm - 2.2.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Sun Jul 26 2009 Fedora Release Engineering - 2.2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Jun 15 2009 Michael Schwendt - 2.2.0-6 -- Include unowned directory /etc/seedit in seedit-policy pkg (#474601). - -* Wed Feb 25 2009 Fedora Release Engineering - 2.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.2.0-4 -- Rebuild for Python 2.6 - -* Thu Sep 4 2008 Tom "spot" Callaway - 2.2.0-3 -- fix license tag - -* Wed Feb 20 2008 Fedora Release Engineering - 2.2.0-2 -- Autorebuild for GCC 4.3 - -* 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. - -* Wed Apr 18 2007 Yuichi Nakamura 2.1.1-2 - - Fixed install bug -* Thu Apr 12 2007 Yuichi Nakamura 2.1.1-1 - - Merged bug fix until 2.1.0-5 - - Other bug fixes -* Fri Feb 16 2007 Yuichi Nakamura 2.1.0-5 - - SELINUX= is set permissive when uninstall, -because relabel fails in enforcing mode. - - Modified path to seedit-load.conf - -* Thu Feb 15 2007 Yuichi Nakamura 2.1.0-4 - - Fixed bug, seedit-converter did not work when "//" is included in path - -* Fri Feb 9 2007 Yuichi Nakamura 2.1.0-3 - - Fixed build failure - -* Fri Feb 9 2007 Yuichi Nakamura 2.1.0-2 - - Fixed build failure - -* Tue Feb 6 2007 Yuichi Nakamura 2.1.0-1 - - Fixed bug in RBAC - - Fixed installer for Asianux - -* Wed Jan 31 2007 Yuichi Nakamura 2.1.0-0.16.beta7 - - Fixed for CentOS4, package build failed. - -* Sat Jan 27 2007 Yuichi Nakamura 2.1.0-0.15.beta6.7 - - Fixed Requires - - Fixed makefiles to preserve timestamps. - -* Fri Jan 26 2007 Yuichi Nakamura 2.1.0-0.14.beta6.6 - - Fixed spec file, to more fit Fedora Extras. - - Fixed makefiles to preserve timestamps. - -* Thu Jan 25 2007 Yuichi Nakamura 2.1.0-0.13.beta6.5 - - Prepared rbac-on flag. - -* Thu Jan 25 2007 Yuichi Nakamura 2.1.0-0.12.beta6.4 - - Fixed bug in upgrade. - -* Wed Jan 24 2007 Yuichi Nakamura 2.1.0-0.11.beta6.3 - - Fixed bug that seedit-gui does not start. - -* Tue Jan 23 2007 Yuichi Nakamura 2.1.0-0.10.beta6.2 - - Fixed spec file, to more fit Fedora Extras. - -* Thu Jan 18 2007 Yuichi Nakamura 2.1.0-0.9.beta6.2 - - Fixed spec file, Makefiles, to more fit Fedora Extras. - -* Thu Jan 18 2007 Yuichi Nakamura 2.1.0-0.8.beta6.1 - - Cleaned spec file , to fit Fedora Extras. - -* Fri Jan 12 2007 Yuichi Nakamura 2.1.0-0.7.beta6 - - Fixed spec file to use desktop-file-install - - Modified paths to use macros - -* Wed Jan 10 2007 Yuichi Nakamura 2.1.0-0.6.beta6 - - Merged 3 spec files into 1 spec file(seedit.spec). - -* Thu Dec 28 2006 Yuichi Nakamura 2.1.0-0.1.beta5 - Added Generate more policy button. - Fixed bug of audit2spdl module. - -* Fri Nov 10 2006 Yuichi Nakamura 2.1.0-0.1.beta4 - Change of install path, clean ups to submit FE. - Merged icons from Shane M. Coughlan. - -* Tue Sep 26 2006 Yuichi Nakamura 2.0.2 -Merged changes(about lanugage changes) from Shane M. Coughlan. - -* Tue Sep 19 2006 Yuichi Nakamura 2.0.1-1 -Fixed bug for RBAC(default_cotnexts) -seedit-converter generates userhelper_contexts -Fixed bug for Cent OS 4 -Merged clean up about copyright statement from Shane M. Coughlan. - -* Fri Aug 25 2006 Yuichi Nakamura 2.0.0-2 -Fixed bug. rename was integrated into c permission, e is correct. - -* Mon Jul 2 2006 Yuichi Nakamura 2.0.0 -- Initial version - diff --git a/sources b/sources deleted file mode 100644 index 85404a4..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -cc89f85350b062318a1a4f527e206801 seedit-2.2.0.tar.gz