rpms/setools/devel .cvsignore, 1.14, 1.15 setools-rhat.patch, 1.19, 1.20 setools.spec, 1.48, 1.49 sources, 1.15, 1.16 setools-1.4.1-selinux-usr-2004081908.patch.gz, 1.2, NONE setools-1.4.1.patch, 1.1, NONE setools-1.5.1-badtcl.patch, 1.1, NONE setools-1.5.1-malloc.patch, 1.1, NONE

Tue Jan 31 21:25:28 UTC 2006

Author: dwalsh

Update of /cvs/dist/rpms/setools/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15199

Modified Files:
	.cvsignore setools-rhat.patch setools.spec sources 
Removed Files:
	setools-1.4.1-selinux-usr-2004081908.patch.gz 
	setools-1.4.1.patch setools-1.5.1-badtcl.patch 
	setools-1.5.1-malloc.patch 
Log Message:
* Tue Jan 31 2006 Dan Walsh <dwalsh at redhat.com> 2.3-1
- Update from upstream
  * apol:
	added new MLS components tab for sensitivities, 
	levels, and categories.
	Changed users tab to support ranges and default 
	levels.
	added range transition tab for searching range
	Transition rules.
	added new tab for network context components.
	added new tab for file system context components.
  * libapol:
	added binpol support for MLS, network contexts, 
	and file system contexts.
  * seinfo:
	added command line options for MLS components.
	added command line options for network contexts
	and file system contexts.
  * sesearch:
	added command line option for searching for rules
	by conditional boolean name.
  * seaudit:
	added new column in the log view for the 'comm' 
	field found in auditd log files.
	added filters for the 'comm' field and 'message'
	field.
  * manpages:
	added manpages for all tools.	



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15

--- .cvsignore	3 Nov 2005 21:51:53 -0000	1.14
+++ .cvsignore	31 Jan 2006 21:25:24 -0000	1.15
@@ -7,3 +7,4 @@
 setools-2.1.2.tar.bz2
 setools-2.1.3.tar.bz2
 setools-2.2.tar.bz2
+setools-2.3.tar.bz2

setools-rhat.patch:
 Makefile        |    4 ++--
 apol/Makefile   |    2 +-
 sediff/Makefile |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

Index: setools-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/setools-rhat.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- setools-rhat.patch	14 Dec 2005 14:47:13 -0000	1.19
+++ setools-rhat.patch	31 Jan 2006 21:25:24 -0000	1.20
@@ -1,19 +1,6 @@
---- setools-2.2/seaudit/Makefile.rhat	2005-10-28 18:12:32.000000000 -0400
-+++ setools-2.2/seaudit/Makefile	2005-12-14 09:34:28.000000000 -0500
-@@ -60,8 +60,8 @@
- 	$(CC) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_FLAGS) $(INCLUDE) -c $<
- 
- install: seaudit seaudit-report
--	install -m 755 seaudit $(BINDIR)
--	install -m 755 seaudit-report $(BINDIR)
-+	install -m 755 seaudit $(SBINDIR)
-+	install -m 755 seaudit-report $(SBINDIR)
- 	install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR)
- 	install -m 644 seaudit_help.txt $(INSTALL_LIBDIR)
- 	install -m 444 dot_seaudit $(INSTALL_LIBDIR)
---- setools-2.2/apol/Makefile.rhat	2005-10-28 18:12:32.000000000 -0400
-+++ setools-2.2/apol/Makefile	2005-12-14 09:34:28.000000000 -0500
-@@ -80,7 +80,7 @@
+--- setools-2.3/apol/Makefile.rhat	2006-01-23 10:58:42.000000000 -0500
++++ setools-2.3/apol/Makefile	2006-01-31 16:15:53.000000000 -0500
+@@ -85,7 +85,7 @@
  	$(MAKE) -C .. libsefs
  
  install: apol apol.tcl
@@ -22,51 +9,35 @@
  	@if [ -n $(INSTALL_LIBDIR) ]; then \
  		for file in $(TCL-FILES); do \
  			if [ -f $(INSTALL_LIBDIR)/$$file ]; then \
-@@ -89,6 +89,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:
---- setools-2.2/Makefile.rhat	2005-10-28 18:12:32.000000000 -0400
-+++ setools-2.2/Makefile	2005-12-14 09:34:28.000000000 -0500
-@@ -10,7 +10,7 @@
- LIBS			= -lfl -lm
+--- setools-2.3/Makefile.rhat	2006-01-23 10:58:42.000000000 -0500
++++ setools-2.3/Makefile	2006-01-31 16:18:43.000000000 -0500
+@@ -12,7 +12,7 @@
+ PREFIX		?= $(DESTDIR)/usr
  
- INCLUDE_DIR		= $(DESTDIR)/usr/include
--SHARED_LIB_INSTALL_DIR 	= $(DESTDIR)/usr/lib
+ INCLUDE_DIR		= $(PREFIX)/include
+-SHARED_LIB_INSTALL_DIR 	= $(PREFIX)/lib
 +SHARED_LIB_INSTALL_DIR 	= $(DESTDIR)$(LIBDIR)
  STATIC_LIB_INSTALL_DIR 	= $(SHARED_LIB_INSTALL_DIR)
- SETOOLS_INCLUDE 	= $(INCLUDE_DIR)/setools
+ #SETOOLS_INCLUDE 	= $(INCLUDE_DIR)/setools-$(SETOOLS_VER)
  TCLVER			= $(shell env tclsh tcl_vars)
-@@ -28,6 +28,7 @@
- # Install directories
- # Binaries go here
- BINDIR			= $(DESTDIR)/usr/bin
-+SBINDIR			= $(DESTDIR)/usr/sbin
- # The code uses the specified path below. If you change this, DO NOT add 
- # a trailing path seperator ("/"). For example, use "/usr/share/setools" 
+@@ -37,7 +37,7 @@
  # instead of "/usr/share/setools/". This probably needs to become more 
-@@ -111,7 +112,7 @@
- export SHARED_LIB_INSTALL_DIR STATIC_LIB_INSTALL_DIR
- export SELINUX_DIR POLICY_INSTALL_DIR POLICY_SRC_DIR DEFAULT_LOG_FILE 
- export POLICY_SRC_DIR POLICY_SRC_FILE
--export BINDIR INSTALL_LIBDIR INSTALL_HELPDIR POLICYINSTALLDIR 
-+export SBINDIR BINDIR INSTALL_LIBDIR INSTALL_HELPDIR POLICYINSTALLDIR 
+ # robust in the future.
+ #
+-INSTALL_LIBDIR		= $(PREFIX)/share/setools-$(SETOOLS_VER)
++INSTALL_LIBDIR		= $(PREFIX)/share/setools
+ # all apps that have a te/fc file need to be listed here
+ POLICYINSTALLDIRS 	= 
+ # Help files here
+--- setools-2.3/sediff/Makefile.rhat	2006-01-23 10:58:42.000000000 -0500
++++ setools-2.3/sediff/Makefile	2006-01-31 16:15:53.000000000 -0500
+@@ -22,7 +22,8 @@
+ 	install -m 644 ../man/sediff.1 $(MANDIR)/man1
  
- # Top Level Targets
- all: all-libs all-nogui all-gui
---- setools-2.2/sediff/Makefile.rhat	2005-10-28 18:12:32.000000000 -0400
-+++ setools-2.2/sediff/Makefile	2005-12-14 09:34:28.000000000 -0500
-@@ -24,7 +24,8 @@
- 	install -m 755 sediff $(BINDIR);
- 	
  install: all
 -	install -m 755 sediff sediffx $(BINDIR);
 +	install -m 755 sediff $(BINDIR);
 +	install -m 755 sediffx $(SBINDIR);
  	install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR)
- 	install -m 644 sediff_help.txt $(INSTALL_LIBDIR)
+ 	install -m 644 sediff_help.txt $(INSTALL_HELPDIR)
  


Index: setools.spec
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/setools.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- setools.spec	16 Dec 2005 23:25:03 -0000	1.48
+++ setools.spec	31 Jan 2006 21:25:24 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: SELinux tools for managing policy
 Name: setools
-Version: 2.2
-Release: 4.1
+Version: 2.3
+Release: 1
 License: GPL
 Group: System Environment/Base
 URL:	http://www.tresys.com/
@@ -100,6 +100,10 @@
 rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon
 rm -f ${RPM_BUILD_ROOT}/usr/bin/searchcon
 rm -f ${RPM_BUILD_ROOT}/usr/bin/indexcon
+rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/searchcon.1
+rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/indexcon.1
+rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/replcon.1
+rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/findcon.1
 install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/apol
 install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit
@@ -149,9 +153,11 @@
 /usr/share/doc/setools-%{version}/flow_assertion_help.txt
 /usr/share/doc/setools-%{version}/iflow_help.txt
 /usr/share/doc/setools-%{version}/obj_perms_help.txt
+/usr/share/doc/setools-2.3/sechecker_help.txt
+/usr/share/doc/setools-2.3/sediff_help.txt
+
 %dir /usr/share/setools
 /usr/share/setools/apol.tcl
-/usr/share/setools/apol_help.txt
 /usr/share/setools/apol_perm_mapping
 /usr/share/setools/apol_perm_mapping_ver12
 /usr/share/setools/apol_perm_mapping_ver15
@@ -162,25 +168,20 @@
 /usr/share/setools/apol_perm_mapping_ver20
 /usr/share/setools/customize_filter_window.glade
 /usr/share/setools/dot_seaudit
-/usr/share/setools/dta_help.txt
 /usr/share/setools/filter_window.glade
-/usr/share/setools/iflow_help.txt
 /usr/share/setools/multifilter_window.glade
-/usr/share/setools/obj_perms_help.txt
 /usr/share/setools/prefer_window.glade
 /usr/share/setools/query_window.glade
 /usr/share/setools/report_window.glade
 /usr/share/setools/seaudit-report.conf
 /usr/share/setools/seaudit-report.css
 /usr/share/setools/seaudit.glade
-/usr/share/setools/seaudit_help.txt
-%attr(755,root,root) %dir /usr/share/setools/sechecker
-%attr(755,root,root) %dir /usr/share/setools/sechecker/profiles
-/usr/share/setools/sechecker/profiles/all-checks.sechecker
-/usr/share/setools/sechecker/profiles/analysis-checks.sechecker
-/usr/share/setools/sechecker/profiles/devel-checks.sechecker
 /usr/share/setools/sediff.glade
-/usr/share/setools/sediff_help.txt
+
+%{_mandir}/man1/apol.1.gz
+%{_mandir}/man1/sediffx.1.gz
+%{_mandir}/man8/seaudit.8.gz
+%{_mandir}/man8/seaudit-report.8.gz
 
 %package devel
 Summary: Development environment for SETools
@@ -192,8 +193,13 @@
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/setools
-%{_libdir}/lib*
+%{_includedir}/libapol
+%{_includedir}/libseaudit
+%{_includedir}/libsefs
+%{_includedir}/selinux/apol
+%{_libdir}/libsefs.a
+%{_libdir}/libapol.a
+%{_libdir}/libseaudit.a
 
 %post devel -p /sbin/ldconfig
 
@@ -208,8 +214,57 @@
 %dir /usr/share/doc/setools-%{version}
 /usr/share/doc/setools-%{version}/KNOWN-BUGS
 /usr/share/doc/setools-%{version}/README
+%{_mandir}/man1/sechecker.1.gz
+%{_mandir}/man1/seinfo.1.gz
+%{_mandir}/man1/sediff.1.gz
+%{_mandir}/man1/sesearch.1.gz
+%attr(755,root,root) %dir /usr/share/setools/sechecker
+%attr(755,root,root) %dir /usr/share/setools/sechecker/profiles
+/usr/share/setools/sechecker/profiles/all-checks.sechecker
+/usr/share/setools/sechecker/profiles/analysis-checks.sechecker
+/usr/share/setools/sechecker/profiles/devel-checks.sechecker
+%{_libdir}/libapol.so
+%{_libdir}/libapol.so.1
+%{_libdir}/libapol.so.2.2.0
+%{_libdir}/libseaudit.so
+%{_libdir}/libseaudit.so.1
+%{_libdir}/libseaudit.so.1.2.6
+%{_libdir}/libsefs.so
+%{_libdir}/libsefs.so.1
+%{_libdir}/libsefs.so.1.2.1
 
 %changelog
+* Tue Jan 31 2006 Dan Walsh <dwalsh at redhat.com> 2.3-1
+- Update from upstream
+  * apol:
+	added new MLS components tab for sensitivities, 
+	levels, and categories.
+	Changed users tab to support ranges and default 
+	levels.
+	added range transition tab for searching range
+	Transition rules.
+	added new tab for network context components.
+	added new tab for file system context components.
+  * libapol:
+	added binpol support for MLS, network contexts, 
+	and file system contexts.
+  * seinfo:
+	added command line options for MLS components.
+	added command line options for network contexts
+	and file system contexts.
+  * sesearch:
+	added command line option for searching for rules
+	by conditional boolean name.
+  * seaudit:
+	added new column in the log view for the 'comm' 
+	field found in auditd log files.
+	added filters for the 'comm' field and 'message'
+	field.
+  * manpages:
+	added manpages for all tools.	
+
+
+
 * Fri Dec 16 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt for new gcj
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/setools/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	3 Nov 2005 21:51:53 -0000	1.15
+++ sources	31 Jan 2006 21:25:24 -0000	1.16
@@ -1 +1 @@
-e3fc1af44bcf8ef0714f48c91509ad95  setools-2.2.tar.bz2
+accd87390ffc48740e3e53a4a1e27649  setools-2.3.tar.bz2


--- setools-1.4.1-selinux-usr-2004081908.patch.gz DELETED ---


--- setools-1.4.1.patch DELETED ---


--- setools-1.5.1-badtcl.patch DELETED ---


--- setools-1.5.1-malloc.patch DELETED ---


