From a7fa5b8401156539d891e40723fbc8c59ce4e0c3 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 12:16:23 +0000 Subject: [PATCH] auto-import changelog data from setools-1.3-2.src.rpm Fri Apr 16 2004 Dan Walsh 1.3-1 - Fix doc location Fri Apr 16 2004 Dan Walsh 1.3-1 - Latest from TRESYS Tue Apr 13 2004 Dan Walsh 1.2.1-8 - fix location of policy.conf file Tue Apr 06 2004 Dan Walsh 1.2.1-7 - Obsolete setools-devel Tue Apr 06 2004 Dan Walsh 1.2.1-6 - Fix location of Tue Apr 06 2004 Dan Walsh 1.2.1-5 - Remove devel libraries - Fix installdir for lib64 Sat Apr 03 2004 Dan Walsh 1.2.1-4 - Add usr_t file read to policy Thu Mar 25 2004 Dan Walsh 1.2.1-3 - Use tcl8.4 --- .cvsignore | 2 +- setools-rhat.patch | 172 +++++++++++++++++++++++++++++---------------- setools.spec | 79 +++++++++++---------- sources | 2 +- 4 files changed, 154 insertions(+), 101 deletions(-) diff --git a/.cvsignore b/.cvsignore index 700c339..8b3c825 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -setools-1.2.1.tgz +setools-1.3.tgz diff --git a/setools-rhat.patch b/setools-rhat.patch index d41610d..525cf9d 100644 --- a/setools-rhat.patch +++ b/setools-rhat.patch @@ -1,83 +1,84 @@ ---- setools-1.1.1/libapol/Makefile.rhat 2003-11-05 09:55:44.000000000 -0500 -+++ setools-1.1.1/libapol/Makefile 2004-01-09 15:08:43.599401736 -0500 -@@ -1,5 +1,7 @@ - # libapol and lipapol-tcl +--- setools-1.3/policy/seuser.te.rhat 2004-04-15 18:50:22.000000000 -0400 ++++ setools-1.3/policy/seuser.te 2004-04-16 08:11:13.510100184 -0400 +@@ -54,7 +54,7 @@ + allow seuser_t locale_t:dir { search}; + allow seuser_t { var_run_t var_t}:dir search; -+LIBDIR = $(DESTDIR)/usr/lib -+INCLUDEDIR = $(DESTDIR)/usr/include/selinux/apol - LIB-OBJ = policy.o policy-query.o policy-io.o queue.o util.o clone.o - LIB-OBJ += y.tab.o lex.yy.o avl-util.o policy-avl.o render.o analysis.o - LIB-OBJ += perm-map.o cond.o -@@ -30,6 +32,10 @@ - ../lib: - mkdir -p $@ +-allow seuser_t usr_t:dir { search }; ++r_dir_file(seuser_t, usr_t) + allow seuser_t shlib_t:file { read getattr execute}; + allow seuser_t shlib_t:lnk_file { read }; + allow seuser_t shlib_t:dir {search}; +--- setools-1.3/secmds/Makefile.rhat 2004-04-15 18:50:22.000000000 -0400 ++++ setools-1.3/secmds/Makefile 2004-04-16 08:30:10.564241680 -0400 +@@ -42,7 +42,7 @@ -+install: libapol -+ install -m 644 ../lib/libapol.a $(LIBDIR) -+ install -m 644 *.h $(INCLUDEDIR) -+ - clean: - rm -f *.o core y.tab.c y.tab.h lex.yy.c *~ + install: $(SE_CMDS) + install -m 755 $(SE_CMDS) $(BINDIR); +- chcon system_u:object_r:setfiles_exec_t $(BINDIR)/replcon ++# chcon system_u:object_r:setfiles_exec_t $(BINDIR)/replcon ---- setools-1.1.1/libseuser/Makefile.rhat 2003-12-29 12:27:01.000000000 -0500 -+++ setools-1.1.1/libseuser/Makefile 2004-01-09 15:10:51.634505763 -0500 -@@ -1,5 +1,8 @@ - # libseuser and libseuser-tcl - -+LIBDIR = $(DESTDIR)/usr/lib -+INCLUDEDIR = $(DESTDIR)/usr/include/selinux/apol -+ - LIB-OBJ = seuser_db.o - LIB-OBJ-TCL = $(LIB-OBJ) seuser_tcl.o - -@@ -9,6 +12,10 @@ + %.o: %.c + $(CC) $(CFLAGS) $(INCLUDE) -c $< +--- setools-1.3/libseuser/Makefile.rhat 2004-04-15 18:50:22.000000000 -0400 ++++ setools-1.3/libseuser/Makefile 2004-04-16 08:11:13.523098208 -0400 +@@ -11,6 +11,10 @@ libseuser-tcl: ../lib/libseuser-tcl.a +install: libseuser libseuser-tcl -+ install -m 644 ../lib/libseuser.a $(LIBDIR) ++ install -m 644 ../lib/libseuser.a $(INSTALL_LIBDIR) + install -m 644 *.h $(INCLUDEDIR) + ../lib/libseuser.a: ../lib $(LIB-OBJ) ar cr $@ $(LIB-OBJ) ---- setools-1.1.1/packages/Makefile.rhat 2003-12-08 16:04:19.000000000 -0500 -+++ setools-1.1.1/packages/Makefile 2004-01-09 15:08:43.628398362 -0500 -@@ -3,10 +3,11 @@ +@@ -20,7 +24,7 @@ + %.o: %.c + $(CC) $(CFLAGS) -c $< + +- ++ + ../lib: + mkdir -p $@ + +--- setools-1.3/packages/Makefile.rhat 2004-04-15 18:50:22.000000000 -0400 ++++ setools-1.3/packages/Makefile 2004-04-16 08:48:43.045118880 -0400 +@@ -3,11 +3,13 @@ # by Kevin Carr kcarr@tresys.com # Make sure INSTALL_PATH is set properly for your system! -INSTALL_PATH=/usr/share/tcl8.3/ -+INSTALL_PATH=$(DESTDIR)/usr/share/tcl8.3/ ++TCLVER = $(shell env tclsh ../tcl_vars version) ++INSTALL_PATH=$(DESTDIR)/usr/share/tcl$(TCLVER)/ install: +- tar -zxvf BWidget-1.4.1.tar.gz + mkdir -p $(INSTALL_PATH) - tar -zxvf BWidget-1.4.1.tar.gz ++ tar -zxf BWidget-1.4.1.tar.gz mv BWidget-1.4.1 $(INSTALL_PATH) -@@ -20,4 +21,4 @@ + remove: +@@ -20,4 +22,4 @@ rm -rf BWidget-1.4.1/ bare: - clean \ No newline at end of file + clean ---- setools-1.1.1/Makefile.rhat 2003-12-30 10:58:17.000000000 -0500 -+++ setools-1.1.1/Makefile 2004-01-09 15:12:51.410570671 -0500 -@@ -4,10 +4,9 @@ - MAKE = make +--- setools-1.3/Makefile.rhat 2004-04-15 18:50:22.000000000 -0400 ++++ setools-1.3/Makefile 2004-04-16 08:44:10.811504680 -0400 +@@ -21,7 +21,7 @@ + # File location defaults; used in various places in code + # Change these if you want different defaults + POLICY_SRC_DIR = $(DESTDIR)/etc/security/selinux/src +-POLICY_SRC_FILE = $(POLICY_SRC_DIR)/policy.conf ++POLICY_SRC_FILE = $(POLICY_SRC_DIR)/policy/policy.conf + DEFAULT_LOG_FILE = /var/log/messages - LIBS = -lfl -lm --TCLVER = 8.3 - TCL_INCLUDE = -I/usr/include - TCL_LIBINC = -L/usr/lib --TCL_LIBS = -ltk$(TCLVER) -ltcl$(TCLVER) -ldl $(LIBS) -+TCL_LIBS = -ltk -ltcl -ldl $(LIBS) - - LINKFLAGS = - CC = gcc -@@ -85,6 +84,8 @@ + # Compile options +@@ -83,6 +83,8 @@ @echo " install-seuserx: build and install seuser and seuserx (selinux required)" @echo " install-secmds: build and install command line tools (selinux not required)" @echo " install-seaudit: build and install seaudit (selinux not required)" @@ -86,32 +87,83 @@ @echo " " @echo " all: build everything, but don't install" @echo " all-nogui: only build non-GUI tools and libraries" -@@ -147,6 +148,15 @@ - install-awish: $(INSTALL_LIBDIR) - cd awish; $(MAKE) install +@@ -116,7 +118,7 @@ + echo "Could not build awish."; \ + echo "Tcl library is not built or not in expected location(s)."; \ + fi +- ++ + seuser: selinux_tool + cd seuser; $(MAKE) seuser + +@@ -137,9 +139,9 @@ + + secmds: selinux_tool + cd secmds; $(MAKE) all +- ++ + libapol: selinux_tool +- cd libapol; $(MAKE) libapol ++ cd libapol; $(MAKE) libapol + + libapol-tcl: selinux_tool + cd libapol; +@@ -186,6 +188,15 @@ + echo "Tcl library is not built or not in expected location(s)."; \ + fi +install-libseuser: + cd libseuser; $(MAKE) install + +install-libapol: -+ cd libapol; $(MAKE) install ++ cd libapol; $(MAKE) install INSTALL_HELPDIR=$(INSTALL_HELPDIR) + +install-libraries: install-libseuser install-libapol + cd libseuser; $(MAKE) install + # installs both GUI and non-GUI versions install-seuserx: $(INSTALL_LIBDIR) - cd seuser; $(MAKE) install -@@ -166,8 +176,11 @@ - + cd seuser; +@@ -211,8 +222,14 @@ + install-nogui: $(INSTALL_LIBDIR) install-seuser install-secmds +install-bwidget: + cd packages; make ++ ++install-docs: docs ++ install -m 755 -d $(INSTALL_HELPDIR) ++ cd docs-src; $(MAKE) install INSTALL_HELPDIR=$(INSTALL_HELPDIR) -install: install-apol install-seuserx install-sepcut install-awish install-secmds install-seaudit -+ -+install: install-apol install-seuser install-seuserx install-sepcut install-awish install-secmds install-seaudit install-bwidget install-libraries ++install: install-apol install-seuserx install-sepcut install-awish install-secmds install-seaudit install-bwidget install-docs # Next four targets are to support installation as part of a system # install. These targets are deprecated. +--- setools-1.3/docs-src/Makefile.rhat 2004-04-15 18:50:22.000000000 -0400 ++++ setools-1.3/docs-src/Makefile 2004-04-16 08:11:13.549094256 -0400 +@@ -55,3 +55,14 @@ + for file in $(TOP-DOCS); do \ + rm -f ../$$file; \ + done ++ ++install: ++ for file in KNOWN-BUGS README; do \ ++ cat $$file.in | sed -e 's/RELEASE_VERSION/$(shell cat ../VERSION)/g' | \ ++ sed -e 's/MOD_DATE/$(shell date '+%B %d, %G')/g' > ${INSTALL_HELPDIR}/$$file; \ ++ done ++ install -m 644 ../seaudit/seaudit_help.txt ${INSTALL_HELPDIR} ++ install -m 644 ../seuser/seuser_help.txt ${INSTALL_HELPDIR} ++ install -m 644 ../sepct/sepcut_help.txt ${INSTALL_HELPDIR} ++ install -m 644 ../apol/*.txt ${INSTALL_HELPDIR} ++ +--- setools-1.3/apol/Makefile.rhat 2004-04-15 18:50:22.000000000 -0400 ++++ setools-1.3/apol/Makefile 2004-04-16 08:11:13.562092280 -0400 +@@ -55,6 +55,7 @@ + done \ + fi + install -m 644 apol.tcl $(APOL_HELP_FILES) $(APOL_PERM_MAPS) $(INSTALL_LIBDIR) ++ install -m 644 $(APOL_HELP_FILES) $(APOL_PERM_MAPS) ${INSTALL_HELPDIR} + cd $(INSTALL_LIBDIR); ln -sf $(APOL_DFLT_PMAP) apol_perm_mapping + + clean: diff --git a/setools.spec b/setools.spec index 05d6966..4f30bad 100644 --- a/setools.spec +++ b/setools.spec @@ -1,16 +1,16 @@ Summary: SELinux tools for managing policy Name: setools -Version: 1.2.1 -Release: 2.1 +Version: 1.3 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.tresys.com/Downloads/selinux-tools/setools-%{version}.tgz -#Source1: seuser.te Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-buildroot Requires: checkpolicy, policycoreutils, policy, policy-sources Buildrequires: tk-devel tcl-devel Patch0: setools-rhat.patch +Obsoletes: setools-devel %description Security-enhanced Linux is a patch of the Linux kernel and a number of @@ -44,13 +44,13 @@ Summary: Graphical tools for handling SETools Group: System Environment/Base Requires: %name -%package devel -Summary: Libraries used for manipulation of policy by SETools -Group: System Environment/Base -Requires: %name +#%package devel +#Summary: Libraries used for manipulation of policy by SETools +#Group: System Environment/Base +#Requires: %name -%description devel -setools libraries used for manipulation and investigation of policy. +#%description devel +#setools libraries used for manipulation and investigation of policy. %description gui Security-enhanced Linux is a patch of the Linux kernel and a number of @@ -85,18 +85,19 @@ tools. %patch0 -p1 -b .rhat %build -make INSTALL_LIBDIR='%{_libdir}/apol' \ - LIBDIR=%{_libdir} all +make LIBDIR=%{_libdir} all %install rm -rf ${RPM_BUILD_ROOT} mkdir -p $RPM_BUILD_ROOT/%_bindir mkdir -p $RPM_BUILD_ROOT/%_libdir mkdir -p $RPM_BUILD_ROOT/usr/include/selinux/apol -make INSTALL_LIBDIR=$RPM_BUILD_ROOT'%{_libdir}/apol' LIBDIR=$RPM_BUILD_ROOT%{_libdir} \ - DESTDIR="${RPM_BUILD_ROOT}" install +mkdir -p $RPM_BUILD_ROOT/usr/share/doc/setools-%{version} +make DESTDIR="${RPM_BUILD_ROOT}" INSTALL_HELPDIR=$RPM_BUILD_ROOT/usr/share/doc/setools-%{version} install rm -f ${RPM_BUILD_ROOT}/etc/security/selinux/src/policy/domains/program/seuser.te rm -f ${RPM_BUILD_ROOT}/etc/security/selinux/src/policy/file_contexts/program/seuser.fc +rm -f ${RPM_BUILD_ROOT}/usr/bin/findcon +rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon %clean rm -rf ${RPM_BUILD_ROOT} @@ -107,13 +108,7 @@ rm -rf ${RPM_BUILD_ROOT} %_bindir/seuserx %_bindir/awish %_bindir/seaudit -/usr/share/tcl8.3/BWidget-1.4.1/* - -%files devel -%defattr(-,root,root) -%_libdir/libseuser.a -%_libdir/libapol.a -/usr/include/selinux/apol/* +/usr/share/tcl8.4/BWidget-1.4.1/* %files %defattr(-,root,root) @@ -124,27 +119,33 @@ rm -rf ${RPM_BUILD_ROOT} %_bindir/sepcut %_bindir/seinfo %_bindir/sesearch -%_libdir/apol/* -#/etc/security/selinux/src/policy/domains/program/seuser.te -#/etc/security/selinux/src/policy/file_contexts/program/seuser.fc - -%post -#if test -x /usr/bin/selinuxenabled && `/usr/bin/selinuxenabled`; then -# cd /etc/security/selinux/src/policy -# make install -# make reload -# chcon system_u:object_r:policy_src_t /etc/security/selinux/src/policy/domains/program/seuser.te -# chcon system_u:object_r:policy_src_t /etc/security/selinux/src/policy/file_contexts/program/seuser.fc -# chcon system_u:object_r:seuser_exec_t /usr/bin/seuser -# chcon system_u:object_r:seuser_conf_t /usr/lib/apol/seuser.conf -#fi - -%postun -#cd /etc/security/selinux/src/policy -#make install -#make reload +/usr/share/setools/* +/usr/share/doc/setools-%{version}/* %changelog +* Fri Apr 16 2004 Dan Walsh 1.3-1 +- Fix doc location + +* Fri Apr 16 2004 Dan Walsh 1.3-1 +- Latest from TRESYS + +* Tue Apr 13 2004 Dan Walsh 1.2.1-8 +- fix location of policy.conf file + +* Tue Apr 6 2004 Dan Walsh 1.2.1-7 +- Obsolete setools-devel +* Tue Apr 6 2004 Dan Walsh 1.2.1-6 +- Fix location of +* Tue Apr 6 2004 Dan Walsh 1.2.1-5 +- Remove devel libraries +- Fix installdir for lib64 + +* Sat Apr 3 2004 Dan Walsh 1.2.1-4 +- Add usr_t file read to policy + +* Thu Mar 25 2004 Dan Walsh 1.2.1-3 +- Use tcl8.4 + * Tue Mar 02 2004 Elliot Lee - rebuilt diff --git a/sources b/sources index 9ad976c..9433001 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dfcdad721490ea89ed030c15485cdbf7 setools-1.2.1.tgz +a6bfde73c1e9a05d4a1cc7c53768fc8c setools-1.3.tgz