rpms/libsemanage/devel libsemanage-rhat.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libsemanage.spec, 1.1, 1.2 sources, 1.2, 1.3

[fedora-cvs-commits redhat com]

Author: dwalsh

Update of /cvs/dist/rpms/libsemanage/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18543

Modified Files:
	.cvsignore libsemanage.spec sources 
Added Files:
	libsemanage-rhat.patch 
Log Message:
* Thu Jul 7 2005 Dan Walsh <dwalsh redhat com> 1.0-1
- Update from NSA
	* Merged errno fix from Joshua Brindle (Tresys).
	* Merged fix for semod_build_modules_list leak on error path
	  from Serge Hallyn (IBM).  Bug found by Coverity.
	* Merged several fixes from Serge Hallyn (IBM).  Bugs found by
	  Coverity.
	* Fixed several other bugs and warnings.
	* Merged patch to move module read/write code from libsemanage
	  to libsepol from Jason Tang (Tresys).	
	* Merged relay records patch from Ivan Gyurdiev.
	* Merged key extract patch from Ivan Gyurdiev.


libsemanage-rhat.patch:
 Makefile   |    4 ++--
 semod.conf |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE libsemanage-rhat.patch ---
--- libsemanage-1.1.4/src/semod.conf~	2005-08-30 09:24:00.000000000 -0400
+++ libsemanage-1.1.4/src/semod.conf	2005-08-30 09:47:12.000000000 -0400
@@ -16,10 +16,10 @@
 #  License along with this library; if not, write to the Free Software
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# Specify how libsemod will interact with the module store.  The three
+# Specify how libsemanage will interact with the module store.  The three
 # options are:
 #
-#  "direct"     - libsemod will write directly to the store.
+#  "direct"     - libsemanage will write directly to the store.
 #  /foo/bar     - Write by way of a policy server, whose named socket
 #                 is at /foo/bar.  The path must begin with a '/'.
 #  foo.com:4242 - Establish a TCP connection to a remote policy server
@@ -44,7 +44,7 @@
 #args = -b $@
 #[end]
 
-# In addition to loading a policy libsemod will validate file contexts
+# In addition to loading a policy libsemanage will validate file contexts
 # by calling the setfiles utility.  As above, "$@" will be replaced
 # with the policy filename.  In addition "$<" will be replaced with
 # the file contexts filename.
--- libsemanage-1.1.4/src/Makefile~	2005-08-30 09:24:00.000000000 -0400
+++ libsemanage-1.1.4/src/Makefile	2005-08-30 09:39:56.000000000 -0400
@@ -4,7 +4,7 @@
 SHLIBDIR ?= $(DESTDIR)/lib
 INCLUDEDIR ?= $(PREFIX)/include
 
-DEFAULT_SEMOD_CONF_LOCATION=$(PREFIX)/share/semod/semod.conf
+DEFAULT_SEMOD_CONF_LOCATION=/etc/selinux/semod.conf
 
 LEX = flex
 LFLAGS = -s
@@ -40,7 +40,7 @@
 install: all
 	test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
 	install -m 644 $(LIBA) $(LIBDIR)
-	install -m 644 -D semod.conf $(DEFAULT_SEMOD_CONF_LOCATION)
+	install -m 644 -D semod.conf $(DESTDIR)/$(DEFAULT_SEMOD_CONF_LOCATION)
 
 clean: 
 	rm -f $(OBJS) $(LIBA) conf-scan.c conf-parse.c conf-parse.h


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jul 2005 18:05:59 -0000	1.2
+++ .cvsignore	30 Aug 2005 13:46:52 -0000	1.3
@@ -1 +1,2 @@
 libsemanage-1.0.tgz
+libsemanage-1.1.4.tgz


Index: libsemanage.spec
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libsemanage.spec	28 Jul 2005 18:05:59 -0000	1.1
+++ libsemanage.spec	30 Aug 2005 13:46:52 -0000	1.2
@@ -1,10 +1,11 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.0
+Version: 1.1.4
 Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
+Patch: libsemanage-rhat.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-buildroot
 Provides: libsemanage.so
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch  -p1 -b .rhat
 
 %build
 make CFLAGS="%{optflags}"
@@ -60,10 +62,21 @@
 
 %files
 %defattr(-,root,root)
-%config(noreplace) /usr/share/semod/semod.conf
+%config(noreplace) /etc/selinux/semod.conf
 
 %changelog
 * Thu Jul 7 2005 Dan Walsh <dwalsh redhat com> 1.0-1
+- Update from NSA
+	* Merged errno fix from Joshua Brindle (Tresys).
+	* Merged fix for semod_build_modules_list leak on error path
+	  from Serge Hallyn (IBM).  Bug found by Coverity.
+	* Merged several fixes from Serge Hallyn (IBM).  Bugs found by
+	  Coverity.
+	* Fixed several other bugs and warnings.
+	* Merged patch to move module read/write code from libsemanage
+	  to libsepol from Jason Tang (Tresys).	
+	* Merged relay records patch from Ivan Gyurdiev.
+	* Merged key extract patch from Ivan Gyurdiev.
 
 - Initial version
 - Created by Stephen Smalley <sds epoch ncsc mil> 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jul 2005 18:05:59 -0000	1.2
+++ sources	30 Aug 2005 13:46:52 -0000	1.3
@@ -1 +1 @@
-3ed4c2b4ed85eb00b1e7670ecdb8ca3c  libsemanage-1.0.tgz
+8b23484ef885b373eeb517c2b0db038c  libsemanage-1.1.4.tgz