785fc2e
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-1.1.6/src/Makefile
785fc2e
--- nsalibsemanage/src/Makefile	2005-09-01 12:19:45.000000000 -0400
785fc2e
+++ libsemanage-1.1.6/src/Makefile	2005-09-06 16:15:37.000000000 -0400
d9ff1de
@@ -4,7 +4,7 @@
d9ff1de
 SHLIBDIR ?= $(DESTDIR)/lib
d9ff1de
 INCLUDEDIR ?= $(PREFIX)/include
d9ff1de
 
785fc2e
-DEFAULT_SEMOD_CONF_LOCATION=/usr/share/semod/semod.conf
785fc2e
+DEFAULT_SEMOD_CONF_LOCATION=/usr/share/semanage/semanage.conf
d9ff1de
 
d9ff1de
 LEX = flex
d9ff1de
 LFLAGS = -s
785fc2e
@@ -40,7 +40,7 @@
d9ff1de
 install: all
d9ff1de
 	test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
d9ff1de
 	install -m 644 $(LIBA) $(LIBDIR)
785fc2e
-	install -m 644 -D semod.conf $(DESTDIR)/$(DEFAULT_SEMOD_CONF_LOCATION)
785fc2e
+	install -m 644 -D semanage.conf $(DESTDIR)/$(DEFAULT_SEMOD_CONF_LOCATION)
d9ff1de
 
d9ff1de
 clean: 
d9ff1de
 	rm -f $(OBJS) $(LIBA) conf-scan.c conf-parse.c conf-parse.h
785fc2e
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-1.1.6/src/semanage.conf
785fc2e
--- nsalibsemanage/src/semanage.conf	1969-12-31 19:00:00.000000000 -0500
785fc2e
+++ libsemanage-1.1.6/src/semanage.conf	2005-09-06 16:15:20.000000000 -0400
785fc2e
@@ -0,0 +1,96 @@
785fc2e
+# Authors: Jason Tang <jtang@tresys.com>
785fc2e
+#
785fc2e
+# Copyright (C) 2004-2005 Tresys Technology, LLC
785fc2e
+#
785fc2e
+#  This library is free software; you can redistribute it and/or
785fc2e
+#  modify it under the terms of the GNU Lesser General Public
785fc2e
+#  License as published by the Free Software Foundation; either
785fc2e
+#  version 2.1 of the License, or (at your option) any later version.
785fc2e
+#
785fc2e
+#  This library is distributed in the hope that it will be useful,
785fc2e
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
785fc2e
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
785fc2e
+#  Lesser General Public License for more details.
785fc2e
+#
785fc2e
+#  You should have received a copy of the GNU Lesser General Public
785fc2e
+#  License along with this library; if not, write to the Free Software
785fc2e
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
785fc2e
+
785fc2e
+# Specify how libsemanage will interact with the module store.  The three
785fc2e
+# options are:
785fc2e
+#
785fc2e
+#  "direct"     - libsemanage will write directly to the store.
785fc2e
+#  /foo/bar     - Write by way of a policy server, whose named socket
785fc2e
+#                 is at /foo/bar.  The path must begin with a '/'.
785fc2e
+#  foo.com:4242 - Establish a TCP connection to a remote policy server
785fc2e
+#                 at foo.com.  If there is a colon then the remainder
785fc2e
+#                 is interpreted as a port number; otherwise default
785fc2e
+#                 to port 4242.
785fc2e
+module-store = direct
785fc2e
+
785fc2e
+# When generating the final linked and expanded policy, by default
785fc2e
+# semanageule will set the policy version to POLICYDB_VERSION_MAX, as
785fc2e
+# given in <sepol/policydb.h>.  Change this setting if a different
785fc2e
+# version is necessary.
785fc2e
+#policy-version = 19
785fc2e
+
785fc2e
+# After a policy has been created this library will attempt to load it
785fc2e
+# by calling the load_policy utility.  If there are special
785fc2e
+# requirements (e.g., read booleans from a certain file) then add them
785fc2e
+# here.  Below are the default values.  Within 'args', the special
785fc2e
+# sequence "$@" will be replaced with the policy filename.
785fc2e
+#[load_policy]
785fc2e
+#path = /usr/sbin/load_policy
785fc2e
+#args = -b $@
785fc2e
+#[end]
785fc2e
+
785fc2e
+# In addition to loading a policy libsemanage will validate file contexts
785fc2e
+# by calling the setfiles utility.  As above, "$@" will be replaced
785fc2e
+# with the policy filename.  In addition "$<" will be replaced with
785fc2e
+# the file contexts filename.
785fc2e
+#[setfiles]
785fc2e
+#path = /usr/sbin/setfiles
785fc2e
+#args = -q -c $@ $<
785fc2e
+#[end]
785fc2e
+
785fc2e
+# Each program specified within a [verify] block is run during
785fc2e
+# committing.  There are three types of verifies allowed: module,
785fc2e
+# linked, and kernel.  Multiple verifies may exist for a stage; place
785fc2e
+# each program within its own [verify] block.  For each stage the
785fc2e
+# programs are executed in the order given below.  If a program ever
785fc2e
+# returns a non-zero value then the entire commit is aborted.
785fc2e
+#
785fc2e
+# Module verifies are executed for each source module prior to
785fc2e
+# linking.  After they have been linked each link verifier is run
785fc2e
+# against the linked base module.  Finally, each kernel verifier is
785fc2e
+# run against the final expanded kernel policy.  If these verifiers
785fc2e
+# all exit with a return value of 0 then that kernel policy will be
785fc2e
+# loaded.
785fc2e
+#
785fc2e
+# 'path' gives a path the verificaton program.  'args' is any
785fc2e
+# free-form string that supplies command line arguments to the
785fc2e
+# verifier.  Within args single quotes, double quotes, and backslashes
785fc2e
+# are metacharacters handled similarly to bash.  Within 'args', the
785fc2e
+# special sequence "$@" will be replaced with a filename to the entity
785fc2e
+# being checked: source module for module verifiers, linked module for
785fc2e
+# linked, kernel policy for kernel.  The sequence "$<" will be
785fc2e
+# replaced with the previous filename, if applicable.  If an older
785fc2e
+# version does not exist "$<" expands to an empty string.
785fc2e
+#[verify module]
785fc2e
+#path = /usr/bin/some_module_verifier
785fc2e
+#args = -Wall -ansi -pedantic $@ $<
785fc2e
+#[end]
785fc2e
+
785fc2e
+#[verify module]
785fc2e
+#path = /another/module/verify/program
785fc2e
+#args = -With -some_more arguments
785fc2e
+#[end]
785fc2e
+
785fc2e
+#[verify linked]
785fc2e
+#path = /usr/local/bin/some_link_verifier
785fc2e
+#[end]
785fc2e
+
785fc2e
+#[verify kernel]
785fc2e
+#path = /usr/sbin/kernel_verifier
785fc2e
+#args = "some argument" "some other parameter" -k $@
785fc2e
+#[end]