- Add additional swig objects

Merged wrap char*** for user_get_roles patch from Joshua Brindle.
Merged remove defrole from sepol patch from Ivan Gyurdiev.
Merged swig wrappers for modifying users and seusers from Joshua Brindle.

.cvsignore

@@ -34,3 +34,4 @@ libsemanage-1.3.51.tgz
 libsemanage-1.3.52.tgz
 libsemanage-1.3.53.tgz
 libsemanage-1.3.56.tgz
+libsemanage-1.3.59.tgz

libsemanage-rhat.patch

@@ -1,121 +1,27 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-1.1.6/src/Makefile
---- nsalibsemanage/src/Makefile	2005-09-01 12:19:45.000000000 -0400
-+++ libsemanage-1.1.6/src/Makefile	2005-09-06 16:15:37.000000000 -0400
-@@ -4,7 +4,7 @@
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-1.3.56/src/Makefile
+--- nsalibsemanage/src/Makefile	2005-11-16 15:27:51.000000000 -0500
++++ libsemanage-1.3.56/src/Makefile	2005-11-28 14:47:34.000000000 -0500
+@@ -3,10 +3,9 @@
+ LIBDIR ?= $(PREFIX)/lib
  SHLIBDIR ?= $(DESTDIR)/lib
  INCLUDEDIR ?= $(PREFIX)/include
+-PYINC ?= /usr/include/python2.4
+-PYLIB ?= /usr/lib/python2.4
+ PYLIBVER ?= python2.4
+-PYTHONLIBDIR ?= $(LIBDIR)/python2.4
++PYINC ?= /usr/include/${PYLIBVER}
++PYLIBDIR ?= $(LIBDIR)/${PYLIBVER}
  
--DEFAULT_SEMOD_CONF_LOCATION=/usr/share/semod/semod.conf
-+DEFAULT_SEMOD_CONF_LOCATION=/usr/share/semanage/semanage.conf
+ DEFAULT_SEMANAGE_CONF_LOCATION=$(DESTDIR)/etc/selinux/semanage.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 $(DESTDIR)/$(DEFAULT_SEMOD_CONF_LOCATION)
-+	install -m 644 -D semanage.conf $(DESTDIR)/$(DEFAULT_SEMOD_CONF_LOCATION)
+@@ -85,8 +82,8 @@
+ 	cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET)
+ 
+ install-pywrap: pywrap 
+-	test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages
+-	install -m 755 $(SWIGFILES) $(PYTHONLIBDIR)/site-packages
++	test -d $(PYLIBDIR)/site-packages || install -m 755 -d $(PYLIBDIR)/site-packages
++	install -m 755 $(SWIGFILES) $(PYLIBDIR)/site-packages
  
  clean: 
- 	rm -f $(OBJS) $(LIBA) conf-scan.c conf-parse.c conf-parse.h
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-1.1.6/src/semanage.conf
---- nsalibsemanage/src/semanage.conf	1969-12-31 19:00:00.000000000 -0500
-+++ libsemanage-1.1.6/src/semanage.conf	2005-09-06 16:15:20.000000000 -0400
-@@ -0,0 +1,96 @@
-+# Authors: Jason Tang <jtang@tresys.com>
-+#
-+# Copyright (C) 2004-2005 Tresys Technology, LLC
-+#
-+#  This library is free software; you can redistribute it and/or
-+#  modify it under the terms of the GNU Lesser General Public
-+#  License as published by the Free Software Foundation; either
-+#  version 2.1 of the License, or (at your option) any later version.
-+#
-+#  This library is distributed in the hope that it will be useful,
-+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#  Lesser General Public License for more details.
-+#
-+#  You should have received a copy of the GNU Lesser General Public
-+#  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 libsemanage will interact with the module store.  The three
-+# options are:
-+#
-+#  "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
-+#                 at foo.com.  If there is a colon then the remainder
-+#                 is interpreted as a port number; otherwise default
-+#                 to port 4242.
-+module-store = direct
-+
-+# When generating the final linked and expanded policy, by default
-+# semanageule will set the policy version to POLICYDB_VERSION_MAX, as
-+# given in <sepol/policydb.h>.  Change this setting if a different
-+# version is necessary.
-+#policy-version = 19
-+
-+# After a policy has been created this library will attempt to load it
-+# by calling the load_policy utility.  If there are special
-+# requirements (e.g., read booleans from a certain file) then add them
-+# here.  Below are the default values.  Within 'args', the special
-+# sequence "$@" will be replaced with the policy filename.
-+#[load_policy]
-+#path = /usr/sbin/load_policy
-+#args = -b $@
-+#[end]
-+
-+# 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.
-+#[setfiles]
-+#path = /usr/sbin/setfiles
-+#args = -q -c $@ $<
-+#[end]
-+
-+# Each program specified within a [verify] block is run during
-+# committing.  There are three types of verifies allowed: module,
-+# linked, and kernel.  Multiple verifies may exist for a stage; place
-+# each program within its own [verify] block.  For each stage the
-+# programs are executed in the order given below.  If a program ever
-+# returns a non-zero value then the entire commit is aborted.
-+#
-+# Module verifies are executed for each source module prior to
-+# linking.  After they have been linked each link verifier is run
-+# against the linked base module.  Finally, each kernel verifier is
-+# run against the final expanded kernel policy.  If these verifiers
-+# all exit with a return value of 0 then that kernel policy will be
-+# loaded.
-+#
-+# 'path' gives a path the verificaton program.  'args' is any
-+# free-form string that supplies command line arguments to the
-+# verifier.  Within args single quotes, double quotes, and backslashes
-+# are metacharacters handled similarly to bash.  Within 'args', the
-+# special sequence "$@" will be replaced with a filename to the entity
-+# being checked: source module for module verifiers, linked module for
-+# linked, kernel policy for kernel.  The sequence "$<" will be
-+# replaced with the previous filename, if applicable.  If an older
-+# version does not exist "$<" expands to an empty string.
-+#[verify module]
-+#path = /usr/bin/some_module_verifier
-+#args = -Wall -ansi -pedantic $@ $<
-+#[end]
-+
-+#[verify module]
-+#path = /another/module/verify/program
-+#args = -With -some_more arguments
-+#[end]
-+
-+#[verify linked]
-+#path = /usr/local/bin/some_link_verifier
-+#[end]
-+
-+#[verify kernel]
-+#path = /usr/sbin/kernel_verifier
-+#args = "some argument" "some other parameter" -k $@
-+#[end]
+ 	rm -f $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGSO) $(TARGET) conf-parse.c conf-parse.h conf-scan.c

libsemanage.spec

@@ -1,12 +1,12 @@
-%define libselinuxver 1.27.21-1
+%define libselinuxver 1.27.23-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 1.3.56
-Release: 2
+Version: 1.3.59
+Release: 1
 License: GPL
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
-Patch: libsemanage-swigify.patch
+Patch: libsemanage-rhat.patch
 
 BuildRoot: %{_tmppath}/%{name}-buildroot
 BuildRequires: libselinux-devel >= %{libselinuxver} 
@@ -73,6 +73,12 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_includedir}/semanage/*.h
 
 %changelog
+* Wed Nov 23 2005 Dan Walsh <dwalsh@redhat.com> 1.3.59-1
+- Add additional swig objects
+	* Merged wrap char*** for user_get_roles patch from Joshua Brindle.
+	* Merged remove defrole from sepol patch from Ivan Gyurdiev.
+	* Merged swig wrappers for modifying users and seusers from Joshua Brindle.
+
 * Wed Nov 23 2005 Dan Walsh <dwalsh@redhat.com> 1.3.56-2
 - Add additional swig objects
 

sources

@@ -1 +1 @@
-f0fe5aa112aa31f9dcb1dad9dff7f3cb  libsemanage-1.3.56.tgz
+614b8aab117aeb7ebb4fa2c44057b023  libsemanage-1.3.59.tgz