dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-seedit-2.1.0-beta6.7.tar.gz

.gitignore

@@ -0,0 +1,2 @@
+seedit-2.1.0.tar.gz
+seedit-2.1.1.tar.gz

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 <dir>* is described, add dummy permission to dummy domain. */
+     label_child_dir(filename);
+   }
+-  
++
++  free(path);
+   return 0;
+ 
+ }

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 <dir>* 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

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

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: seedit
-# $Id$
-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
-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)

seedit.spec

@@ -1,6 +1,6 @@
-%define betatag beta6.7
-%define buildnum 15
+%define buildnum 2
 %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
@@ -9,23 +9,27 @@
 #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}
+Version: 2.1.1
+Release: %{buildnum}%{?dist}.1
 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
+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
+Provides: seedit-converter = %{version}-%{release}
 
 %description
 SELinux Policy Editor(SEEdit) is a tool to make SELinux easy.
@@ -38,6 +42,7 @@ Command line utils is included in seedit package.
 
 %prep
 %setup -q
+%patch -p0
 
 %build
 pushd core
@@ -49,18 +54,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 +94,13 @@ 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
+%{_datadir}/%{name}/seedit-load.conf
 
 %package policy
 Summary: SELinux Policy Editor: Sample simplified policy
@@ -116,12 +124,15 @@ 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
 
 %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 +145,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 +171,32 @@ X based GUI for SELinux Policy Editor
 
 
 %changelog
+* Wed Apr 18 2007 Yuichi Nakamura<ynakam@hitachisoft.jp> 2.1.1-2
+ - Fixed install bug
+* Thu Apr 12 2007 Yuichi Nakamura<ynakam@hitachisoft.jp> 2.1.1-1
+ - Merged bug fix until 2.1.0-5
+ - Other bug fixes
+* Fri Feb 16 2007 Yuichi Nakamura<ynakam@hitachisoft.jp> 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<ynakam@hitachisoft.jp> 2.1.0-4
+ - Fixed bug, seedit-converter did not work when "//" is included in path
+
+* Fri Feb 9 2007 Yuichi Nakamura<ynakam@hitachisoft.jp> 2.1.0-3
+ - Fixed build failure
+
+* Fri Feb 9 2007 Yuichi Nakamura<ynakam@hitachisoft.jp> 2.1.0-2
+ - Fixed build failure
+
+* Tue Feb 6 2007 Yuichi Nakamura<ynakam@hitachisoft.jp> 2.1.0-1
+ - Fixed bug in RBAC
+ - Fixed installer for Asianux
+
+* Wed Jan 31 2007 Yuichi Nakamura<ynakam@hitachisoft.jp> 2.1.0-0.16.beta7
+ - Fixed for CentOS4, package build failed.
+
 * Sat Jan 27 2007 Yuichi Nakamura<ynakam@hitachisoft.jp> 2.1.0-0.15.beta6.7
  - Fixed Requires
  - Fixed makefiles to preserve timestamps.

sources

@@ -1 +1,2 @@
-61eec5bb305ac6100db50f03a3867f59  seedit-2.1.0-beta6.7.tar.gz
+7c1577a48ae95d4d1d425121f4c3980b  seedit-2.1.0.tar.gz
+a380b9e2cb67c5d89fd28bdca63b330a  seedit-2.1.1.tar.gz