rpms/libselinux/FC-5 .cvsignore, 1.102, 1.103 libselinux-rhat.patch, 1.74, 1.75 libselinux.spec, 1.183, 1.184 sources, 1.104, 1.105

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Apr 12 13:33:21 UTC 2006


Author: dwalsh

Update of /cvs/dist/rpms/libselinux/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv17007

Modified Files:
	.cvsignore libselinux-rhat.patch libselinux.spec sources 
Log Message:
* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2
- Fix python bindings for matchpathcon
- Fix booleans man page



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/.cvsignore,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- .cvsignore	20 Mar 2006 20:36:57 -0000	1.102
+++ .cvsignore	12 Apr 2006 13:33:17 -0000	1.103
@@ -76,3 +76,4 @@
 libselinux-1.29.6.tgz
 libselinux-1.29.7.tgz
 libselinux-1.30.tgz
+libselinux-1.30.1.tgz

libselinux-rhat.patch:
 man/man8/booleans.8 |   18 ++++++------------
 src/selinuxswig.i   |    5 +++--
 2 files changed, 9 insertions(+), 14 deletions(-)

Index: libselinux-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux-rhat.patch,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- libselinux-rhat.patch	14 Jan 2006 05:05:18 -0000	1.74
+++ libselinux-rhat.patch	12 Apr 2006 13:33:17 -0000	1.75
@@ -1,36 +1,64 @@
-diff --exclude-from=exclude -N -u -r nsalibselinux/Makefile libselinux-1.29.5/Makefile
---- nsalibselinux/Makefile	2005-02-09 17:04:51.000000000 -0500
-+++ libselinux-1.29.5/Makefile	2006-01-13 23:54:13.000000000 -0500
-@@ -2,12 +2,18 @@
- 	$(MAKE) -C src 
- 	$(MAKE) -C utils
- 
-+pywrap: 
-+	$(MAKE) -C src pywrap
-+
- install: 
- 	$(MAKE) -C include install
- 	$(MAKE) -C src install
- 	$(MAKE) -C utils install
- 	$(MAKE) -C man install
- 
-+install-pywrap: 
-+	$(MAKE) -C src install-pywrap 
-+
- relabel: 
- 	$(MAKE) -C src relabel
- 
-diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-1.29.5/src/Makefile
---- nsalibselinux/src/Makefile	2006-01-04 10:37:34.000000000 -0500
-+++ libselinux-1.29.5/src/Makefile	2006-01-13 23:54:50.000000000 -0500
-@@ -26,7 +26,9 @@
- 
- SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./
- 
--all: $(LIBA) $(LIBSO) $(SWIGSO)
-+all: $(LIBA) $(LIBSO) 
-+
-+pywrap: $(SWIGSO)
- 
- $(LIBA):  $(OBJS)
- 	$(AR) rcs $@ $^
+diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/booleans.8 libselinux-1.30.1/man/man8/booleans.8
+--- nsalibselinux/man/man8/booleans.8	2004-11-02 11:44:38.000000000 -0500
++++ libselinux-1.30.1/man/man8/booleans.8	2006-04-11 15:01:19.000000000 -0400
+@@ -17,17 +17,10 @@
+ value.  
+ 
+ The policy defines a default value for each boolean, typically false.
+-These default values can be overridden at boot-time based on the
+-settings in the
+-.I /etc/selinux/SELINUXTYPE/booleans
+-file, where
+-SELINUXTYPE is the type of policy currently being run on the system as
+-defined in the
+-.I /etc/selinux/config
+-file.  The
++These default values can be overridden.  The
+ .B system-config-securitylevel
+ tool provides an interface for altering
+-the settings in this file.  The
++the settings of booleans.  The
+ .B load_policy(8)
+ program will preserve
+ current boolean settings upon a policy reload by default, or can
+@@ -41,8 +34,11 @@
+ .B setsebool(8)
+ utility or the
+ .B togglesebool
+-utility.  These utilities only change the
++utility.  These utilities change the
+ current boolean value and do not affect the boot-time settings.
++You can use 
++.B setsebool -P 
++to permanantly change the setting of a boolean.
+ 
+ .SH AUTHOR	
+ This manual page was written by Dan Walsh <dwalsh at redhat.com>.
+@@ -51,5 +47,3 @@
+ .SH "SEE ALSO"
+ getsebool(8), setsebool(8), selinux(8), togglesebool(8)
+ 
+-.SH FILES
+-/etc/selinux/SELINUXTYPE/booleans, /etc/selinux/config
+diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.30.1/src/selinuxswig.i
+--- nsalibselinux/src/selinuxswig.i	2006-01-04 10:37:35.000000000 -0500
++++ libselinux-1.30.1/src/selinuxswig.i	2006-04-11 14:55:35.000000000 -0400
+@@ -29,8 +29,9 @@
+ 	$1 = &temp;
+ }
+ %typemap(argout) security_context_t * {
+-	$result = t_output_helper($result, PyString_FromString(*$1));
++	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+ }
++%typedef unsigned mode_t;
+ 
+ extern int is_selinux_enabled(void);
+ extern int is_selinux_mls_enabled(void);
+@@ -114,6 +115,6 @@
+ }
+ 
+ %typemap(argout) char ** {
+-	$result = t_output_helper($result, PyString_FromString(*$1));
++	$result = SWIG_Python_AppendOutput($result, PyString_FromString(*$1));
+ }
+ extern int getseuserbyname(const char *linuxuser, char **seuser, char **level);


Index: libselinux.spec
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/libselinux.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- libselinux.spec	22 Mar 2006 16:30:41 -0000	1.183
+++ libselinux.spec	12 Apr 2006 13:33:18 -0000	1.184
@@ -2,11 +2,12 @@
 %define libsetransver 0.1.20-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30
-Release: 1.fc5
+Version: 1.30.1
+Release: 2
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
+Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver}
 Requires: libsepol >= %{libsepolver}
@@ -50,6 +51,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rhat
 
 %build
 make clean
@@ -109,8 +111,12 @@
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
-* Mon Mar 18 2006 Dan Walsh <dwalsh at redhat.com> 1.30-1.fc5
-- rebuild for FC5
+* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-2
+- Fix python bindings for matchpathcon
+- Fix booleans man page
+
+* Mon Mar 27 2006 Dan Walsh <dwalsh at redhat.com> 1.30.1-1
+	* Merged Makefile PYLIBVER definition patch from Dan Walsh.
 
 * Fri Mar 10 2006 Dan Walsh <dwalsh at redhat.com> 1.30-1
 - Make some fixes so it will build on RHEL4


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libselinux/FC-5/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	20 Mar 2006 20:36:57 -0000	1.104
+++ sources	12 Apr 2006 13:33:18 -0000	1.105
@@ -1 +1 @@
-b0834c79eac17c87c690542b0874cc53  libselinux-1.30.tgz
+16536badc245a1dd8d01539f63ced6c2  libselinux-1.30.1.tgz




More information about the fedora-cvs-commits mailing list