rpms/gcl/F-12 gcl-2.6.8-plt.patch, 1.1, 1.2 gcl-2.6.8-selinux.patch, 1.2, 1.3 gcl.spec, 1.40, 1.41

[Jerry James]

Author: jjames

Update of /cvs/pkgs/rpms/gcl/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6958/F-12

Modified Files:
	gcl-2.6.8-plt.patch gcl-2.6.8-selinux.patch gcl.spec 
Log Message:
* Tue Oct 20 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.6.20090701cvs
- Update SELinux policy for confined users (bz 529757)


gcl-2.6.8-plt.patch:
 makefile |    2 +-
 plt.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: gcl-2.6.8-plt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-12/gcl-2.6.8-plt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gcl-2.6.8-plt.patch	11 Aug 2009 21:28:46 -0000	1.1
+++ gcl-2.6.8-plt.patch	20 Oct 2009 22:11:46 -0000	1.2
@@ -18,7 +18,7 @@ diff -dur gcl-2.6.8.ORIG/o/plt.c gcl-2.6
      if (!memchr(b,10,sizeof(b)-1))
        FEerror("plt buffer too small", 0);
 -    if (memcmp(b," .plt",4) && !i)
-+    if ((memcmp(b," .plt",4) || memcmp(b," .iplt",5)) && !i)
++    if ((memcmp(b," .plt",5) || memcmp(b," .iplt",6)) && !i)
        continue;
      if (*b=='\r' || *b=='\n') {
        i=0;

gcl-2.6.8-selinux.patch:
 clcs/makefile     |    6 ++
 makefile          |    3 +
 selinux/gcl.fc    |    5 +
 selinux/gcl.if    |  146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 selinux/gcl.te    |   45 ++++++++++++++++
 unixport/makefile |    6 ++
 6 files changed, 211 insertions(+)

Index: gcl-2.6.8-selinux.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-12/gcl-2.6.8-selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gcl-2.6.8-selinux.patch	6 Oct 2009 14:33:28 -0000	1.2
+++ gcl-2.6.8-selinux.patch	20 Oct 2009 22:11:47 -0000	1.3
@@ -1,6 +1,6 @@
 diff -durN gcl-2.6.8.ORIG/clcs/makefile gcl-2.6.8/clcs/makefile
 --- gcl-2.6.8.ORIG/clcs/makefile	2005-05-06 15:56:55.000000000 -0600
-+++ gcl-2.6.8/clcs/makefile	2009-10-06 08:16:02.062488470 -0600
++++ gcl-2.6.8/clcs/makefile	2009-10-20 16:00:21.608387999 -0600
 @@ -9,6 +9,9 @@
  
  saved_clcs_gcl: ../unixport/saved_pcl_gcl
@@ -23,7 +23,7 @@ diff -durN gcl-2.6.8.ORIG/clcs/makefile 
  	rm -f *.o *.fn saved_full_gcl$(EXE) saved_full_gcl cmpinclude.h *.c *.h *.data saved_clcs_gcl
 diff -durN gcl-2.6.8.ORIG/makefile gcl-2.6.8/makefile
 --- gcl-2.6.8.ORIG/makefile	2007-11-30 09:59:33.000000000 -0700
-+++ gcl-2.6.8/makefile	2009-10-06 08:16:02.063488196 -0600
++++ gcl-2.6.8/makefile	2009-10-20 16:00:21.609347326 -0600
 @@ -187,6 +187,9 @@
  	if gcc --version | grep -i mingw >/dev/null 2>&1 ; then if grep -i oncrpc makedefs >/dev/null 2>&1 ; then cp /mingw/bin/oncrpc.dll $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR); fi ; fi
  	cd $(DESTDIR)$(INSTALL_LIB_DIR)/$(PORTDIR) && \
@@ -36,16 +36,16 @@ diff -durN gcl-2.6.8.ORIG/makefile gcl-2
  	if [ -e "unixport/rsym$(EXE)" ] ; then cp unixport/rsym$(EXE) $(DESTDIR)$(INSTALL_LIB_DIR)/unixport/ ; fi
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.fc gcl-2.6.8/selinux/gcl.fc
 --- gcl-2.6.8.ORIG/selinux/gcl.fc	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.fc	2009-10-06 08:17:02.445600007 -0600
++++ gcl-2.6.8/selinux/gcl.fc	2009-10-20 16:00:52.173119081 -0600
 @@ -0,0 +1,5 @@
 +/usr/lib64/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
 +/usr/lib/gcl-[^/]+/unixport/saved_.*	--	gen_context(system_u:object_r:gcl_exec_t,s0)
-+/usr/lib/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
-+/usr/lib64/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object:r:gcl_exec_t,s0)
++/usr/lib/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object_r:gcl_exec_t,s0)
++/usr/lib64/maxima/[^/]+/binary-gcl	--	gen_context(system_u:object_r:gcl_exec_t,s0)
 +
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.if gcl-2.6.8/selinux/gcl.if
 --- gcl-2.6.8.ORIG/selinux/gcl.if	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.if	2009-10-06 08:16:02.064488944 -0600
++++ gcl-2.6.8/selinux/gcl.if	2009-10-20 16:00:21.622010253 -0600
 @@ -0,0 +1,146 @@
 +
 +## <summary>policy for gcl</summary>
@@ -195,9 +195,9 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.if
 +')
 diff -durN gcl-2.6.8.ORIG/selinux/gcl.te gcl-2.6.8/selinux/gcl.te
 --- gcl-2.6.8.ORIG/selinux/gcl.te	1969-12-31 17:00:00.000000000 -0700
-+++ gcl-2.6.8/selinux/gcl.te	2009-10-06 08:17:51.669426472 -0600
-@@ -0,0 +1,44 @@
-+policy_module(gcl,1.0.0)
++++ gcl-2.6.8/selinux/gcl.te	2009-10-20 15:52:31.702057692 -0600
+@@ -0,0 +1,45 @@
++policy_module(gcl,1.0.1)
 +
 +########################################
 +#
@@ -225,10 +225,11 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.te
 +
 +## The GCL memory management and executable dumping routines manipulate memory
 +## in various (usually forbidden) ways.
-+allow gcl_t self:memprotect mmap_zero;
 +allow gcl_t self:process { execmem execheap };
 +
-+unconfined_domain(gcl_t)
++optional_policy(`
++	unconfined_domain(gcl_t)
++')
 +
 +optional_policy(`
 +	gen_require(`
@@ -243,7 +244,7 @@ diff -durN gcl-2.6.8.ORIG/selinux/gcl.te
 +')
 diff -durN gcl-2.6.8.ORIG/unixport/makefile gcl-2.6.8/unixport/makefile
 --- gcl-2.6.8.ORIG/unixport/makefile	2006-08-23 12:14:22.000000000 -0600
-+++ gcl-2.6.8/unixport/makefile	2009-10-06 08:16:02.065488296 -0600
++++ gcl-2.6.8/unixport/makefile	2009-10-20 16:00:21.622998021 -0600
 @@ -118,6 +118,9 @@
  	cp init_$*.lsp foo
  	echo " (in-package \"USER\")(system:save-system \"$@\")" >>foo


Index: gcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcl/F-12/gcl.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- gcl.spec	13 Oct 2009 15:37:49 -0000	1.40
+++ gcl.spec	20 Oct 2009 22:11:47 -0000	1.41
@@ -28,7 +28,7 @@
 
 Name:           gcl
 Version:        2.6.8
-Release:        0.5.%{alphatag}%{?dist}
+Release:        0.6.%{alphatag}%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -365,6 +365,9 @@ fi
 
 
 %changelog
+* Tue Oct 20 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.6.20090701cvs
+- Update SELinux policy for confined users (bz 529757)
+
 * Tue Sep  6 2009 Jerry James <loganjerry at gmail.com> - 2.6.8-0.5.20090701cvs
 - Update SELinux files to give compiled maxima files the right context
 - Drop SELinux compatibility kludge for early F-11 selinux-policy packages