diff options
author | Chris PeBenito <pebenito@gentoo.org> | 2003-10-29 04:18:33 +0000 |
---|---|---|
committer | Chris PeBenito <pebenito@gentoo.org> | 2003-10-29 04:18:33 +0000 |
commit | 12988a1109ae0a09e64806965cc7f752690a4456 (patch) | |
tree | 09d4ecc3ed036f35e4c48efbe261dfc7022cfb8f /sys-apps | |
parent | add fix to compile with gcc2.95 (diff) | |
download | historical-12988a1109ae0a09e64806965cc7f752690a4456.tar.gz historical-12988a1109ae0a09e64806965cc7f752690a4456.tar.bz2 historical-12988a1109ae0a09e64806965cc7f752690a4456.zip |
remove selinux-small files
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/selinux-small/files/digest-selinux-small-2003040709-r3 | 2 | ||||
-rw-r--r-- | sys-apps/selinux-small/files/digest-selinux-small-2003071106 | 1 | ||||
-rw-r--r-- | sys-apps/selinux-small/files/newrole | 30 | ||||
-rw-r--r-- | sys-apps/selinux-small/files/open_init_pty | 11 | ||||
-rw-r--r-- | sys-apps/selinux-small/files/rlpkg | 67 | ||||
-rw-r--r-- | sys-apps/selinux-small/files/run_init | 30 | ||||
-rw-r--r-- | sys-apps/selinux-small/files/scmpd | 21 | ||||
-rw-r--r-- | sys-apps/selinux-small/files/selinux-small-2003040709-bison.diff | 12 | ||||
-rw-r--r-- | sys-apps/selinux-small/files/selinux-small-2003040709-setfiles.diff | 120 | ||||
-rw-r--r-- | sys-apps/selinux-small/files/selinux-small-2003071106-gentoo.diff | 259 |
10 files changed, 0 insertions, 553 deletions
diff --git a/sys-apps/selinux-small/files/digest-selinux-small-2003040709-r3 b/sys-apps/selinux-small/files/digest-selinux-small-2003040709-r3 deleted file mode 100644 index be96298ad944..000000000000 --- a/sys-apps/selinux-small/files/digest-selinux-small-2003040709-r3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 f2a8e506d952ceb4a30970a646e9a227 selinux-small-2003040709.tgz 571597 -MD5 98d24820cf82cce8d826b88ff2617eb6 selinux-small_2003040709-5.diff.gz 62300 diff --git a/sys-apps/selinux-small/files/digest-selinux-small-2003071106 b/sys-apps/selinux-small/files/digest-selinux-small-2003071106 deleted file mode 100644 index 133531908901..000000000000 --- a/sys-apps/selinux-small/files/digest-selinux-small-2003071106 +++ /dev/null @@ -1 +0,0 @@ -MD5 76b7cd5e53242c83fc19cad82564583d selinux-small-2003071106.tgz 632599 diff --git a/sys-apps/selinux-small/files/newrole b/sys-apps/selinux-small/files/newrole deleted file mode 100644 index 12dc3c21b326..000000000000 --- a/sys-apps/selinux-small/files/newrole +++ /dev/null @@ -1,30 +0,0 @@ -#%PAM-1.0 - - -# If you want to restrict users begin allowed to su even more, -# create /etc/security/suauth.allow (or to that matter) that is only -# writable by root, and add users that are allowed to su to that -# file, one per line. -#auth required /lib/security/pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow - -# Uncomment this to allow users in the wheel group to su without -# entering a passwd. -#auth sufficient /lib/security/pam_wheel.so use_uid trust - -# Alternatively to above, you can implement a list of users that do -# not need to supply a passwd with a list. -#auth sufficient /lib/security/pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass - -# Comment this to allow any user, even those not in the 'wheel' -# group to su -auth required /lib/security/pam_wheel.so use_uid - -auth required /lib/security/pam_stack.so service=system-auth - -account required /lib/security/pam_stack.so service=system-auth - -password required /lib/security/pam_stack.so service=system-auth - -session required /lib/security/pam_stack.so service=system-auth -session optional /lib/security/pam_xauth.so - diff --git a/sys-apps/selinux-small/files/open_init_pty b/sys-apps/selinux-small/files/open_init_pty deleted file mode 100644 index 77c5850f8d7d..000000000000 --- a/sys-apps/selinux-small/files/open_init_pty +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/python2.2 -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/files/open_init_pty,v 1.1 2003/06/13 16:49:23 pebenito Exp $ - -# by Chris PeBenito <pebenito@gentoo.org> -# replacement for expect script written by Russell Coker - -import sys,pexpect -runinfo = pexpect.run( sys.argv[1], sys.argv[2:] ) -print runinfo diff --git a/sys-apps/selinux-small/files/rlpkg b/sys-apps/selinux-small/files/rlpkg deleted file mode 100644 index 86ed3ce0965a..000000000000 --- a/sys-apps/selinux-small/files/rlpkg +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/files/rlpkg,v 1.3 2003/07/04 01:41:04 pebenito Exp $ - -# Author: Chris PeBenito <pebenito@gentoo.org> -# this probably isnt the cleanest script, but it works. -# -# TODO: -# -maybe add a -l function to list the package's files + contexts -# -more informative messages, -h for help - -. /sbin/functions.sh -PROG=`basename ${0}` - -if [ -z ${1} ]; then - echo "The Gentoo Linux package relabeler" - echo - echo "Usage: ${PROG} <pkg1> [<pkg2> ...]" - echo - echo "${PROG} relabels gentoo packages based on their CONTENTS file." - echo "Any files associated with a package, but not in the contents" - echo "will not be relabeled, so be careful! When in doubt, a full" - echo "relabel should be done." - exit 1; -fi - -while [ ${#} -gt 0 ]; do - build="${build} `find /var/db/pkg -iname CONTENTS | cut -d/ -f5,6 | grep ${1} | sort`" - shift -done - -if [ "${build}" == " " ]; then - echo "No matching packages found." - exit 1 -fi - -[ -z ${POLICYDIR} ] && POLICYDIR="/etc/security/selinux/src/policy" - -# make sure the policydir exists -if [ ! -d ${POLICYDIR} ]; then - eerror "The policy directory doesnt exist!" - echo - ewarn "Set the policy dir: export POLICYDIR=\"/etc/security/selinux/src/mypolicy\"" - ewarn "or set it by using an env variable." - exit 1 -fi - -einfo "Using file contexts from the policy in ${POLICYDIR}." - -# generate file_contexts as needed -ebegin "Regenerating file contexts" -[ -f ${POLICYDIR}/file_contexts/file_contexts ] && rm -f ${POLICYDIR}/file_contexts/file_contexts -make -C ${POLICYDIR} file_contexts/file_contexts &> /dev/null - -# do a test relabel to make sure file contexts work (doesnt change any labels) -echo "/etc/passwd" | setfiles ${POLICYDIR}/file_contexts/file_contexts -sqn -ret=$? -eend $ret - -[ $ret == "0" ] || exit $ret - -for i in ${build}; do - ebegin "Relabeling: ${i}" - awk '{ print $2 }' < /var/db/pkg/${i}/CONTENTS | setfiles ${POLICYDIR}/file_contexts/file_contexts -sq &> /dev/null - eend $? -done diff --git a/sys-apps/selinux-small/files/run_init b/sys-apps/selinux-small/files/run_init deleted file mode 100644 index 12dc3c21b326..000000000000 --- a/sys-apps/selinux-small/files/run_init +++ /dev/null @@ -1,30 +0,0 @@ -#%PAM-1.0 - - -# If you want to restrict users begin allowed to su even more, -# create /etc/security/suauth.allow (or to that matter) that is only -# writable by root, and add users that are allowed to su to that -# file, one per line. -#auth required /lib/security/pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow - -# Uncomment this to allow users in the wheel group to su without -# entering a passwd. -#auth sufficient /lib/security/pam_wheel.so use_uid trust - -# Alternatively to above, you can implement a list of users that do -# not need to supply a passwd with a list. -#auth sufficient /lib/security/pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass - -# Comment this to allow any user, even those not in the 'wheel' -# group to su -auth required /lib/security/pam_wheel.so use_uid - -auth required /lib/security/pam_stack.so service=system-auth - -account required /lib/security/pam_stack.so service=system-auth - -password required /lib/security/pam_stack.so service=system-auth - -session required /lib/security/pam_stack.so service=system-auth -session optional /lib/security/pam_xauth.so - diff --git a/sys-apps/selinux-small/files/scmpd b/sys-apps/selinux-small/files/scmpd deleted file mode 100644 index fdf45236c31f..000000000000 --- a/sys-apps/selinux-small/files/scmpd +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/selinux-small/files/scmpd,v 1.1 2003/06/13 16:49:23 pebenito Exp $ - -depend() { - need net -} - -start () { - ebegin "Staring scmpd" - start-stop-daemon --start --quiet --pidfile /var/run/scmpd.pid \ - --startas /usr/sbin/scmpd - eend $? -} - -stop () { - eend "Stopping scmpd" - start-stop-daemon --stop --quiet --pidfile /var/run/scmpd.pid - eend $? -} diff --git a/sys-apps/selinux-small/files/selinux-small-2003040709-bison.diff b/sys-apps/selinux-small/files/selinux-small-2003040709-bison.diff deleted file mode 100644 index ed2a256e7015..000000000000 --- a/sys-apps/selinux-small/files/selinux-small-2003040709-bison.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN selinux/module/checkpolicy/Makefile selinux-patched/module/checkpolicy/Makefile ---- selinux/module/checkpolicy/Makefile 2002-09-23 12:10:02.000000000 -0400 -+++ selinux-patched/module/checkpolicy/Makefile 2003-03-20 14:26:01.000000000 -0500 -@@ -17,6 +17,8 @@ - OPTIONS = - endif - -+YACC = bison -y -+ - CFLAGS = -g $(OPTIONS) -I$(LSMDIR)/include -Wall -O2 -pipe -include $(MODDIR)/ss/global.h -I$(MODDIR)/include -I$(MODDIR)/ss - - OBJS = ebitmap.o queue.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o y.tab.o lex.yy.o checkpolicy.o diff --git a/sys-apps/selinux-small/files/selinux-small-2003040709-setfiles.diff b/sys-apps/selinux-small/files/selinux-small-2003040709-setfiles.diff deleted file mode 100644 index 846b88739a38..000000000000 --- a/sys-apps/selinux-small/files/selinux-small-2003040709-setfiles.diff +++ /dev/null @@ -1,120 +0,0 @@ ---- setfiles.c.orig 2003-04-04 07:29:44.000000000 -0600 -+++ setfiles.c 2003-05-10 23:42:39.000000000 -0500 -@@ -89,6 +89,10 @@ - static int use_inum = 0; - - static int quiet = 0; -+ -+static char *rootpath = NULL; -+static int rootpathlen = 0; -+ - #define QPRINTF(args...) do { if (!quiet) printf(args); } while (0) - - /* -@@ -283,15 +287,27 @@ - int match(const char *name, struct stat *sb, security_id_t *out_sid) - { - int i, ret; -+ const char *fullname = name; -+ -+ /* fullname will be the real file that gets labeled -+ * name will be what is matched in the policy */ -+ if (NULL != rootpath) { -+ if (0 != strncmp(rootpath, name, rootpathlen)) { -+ fprintf(stderr, "%s: %s is not located in %s\n", -+ progname, name, rootpath); -+ return -1; -+ } -+ name += rootpathlen; -+ } - - if (flask_enabled) { -- ret = lstat_secure(name, sb, out_sid); -+ ret = lstat_secure(fullname, sb, out_sid); - } else { -- ret = lstat(name, sb); -+ ret = lstat(fullname, sb); - } - if (ret) { - fprintf(stderr, "%s: unable to stat file %s\n", progname, -- name); -+ fullname); - return -1; - } - -@@ -564,6 +580,23 @@ - return 0; - } - -+void set_rootpath(const char *arg) -+{ -+ int len; -+ -+ rootpath = strdup(arg); -+ if (NULL == rootpath) { -+ fprintf(stderr, "%s: insufficient memory for rootpath\n", -+ progname); -+ exit(1); -+ } -+ -+ /* trim trailing /, if present */ -+ len = strlen(rootpath); -+ while ('/' == rootpath[len - 1]) -+ rootpath[--len] = 0; -+ rootpathlen = len; -+} - - int main(int argc, char **argv) - { -@@ -577,7 +610,7 @@ - struct stat sb; - - /* Process any options. */ -- while ((opt = getopt(argc, argv, "dinqsvRW")) > 0) { -+ while ((opt = getopt(argc, argv, "dinqsvrRW")) > 0) { - switch (opt) { - case 'd': - debug = 1; -@@ -604,6 +637,20 @@ - case 'i': - use_inum = 1; - break; -+ case 'r': -+ if (optind + 1 >= argc) { -+ fprintf(stderr, "usage: %s -r rootpath\n", -+ argv[0]); -+ exit(1); -+ } -+ if (NULL != rootpath) { -+ fprintf(stderr, -+ "%s: only one -r can be specified\n", -+ argv[0]); -+ exit(1); -+ } -+ set_rootpath(argv[optind++]); -+ break; - } - } - -@@ -675,7 +722,7 @@ - } else { - if (optind > (argc - 2)) { - fprintf(stderr, -- "usage: %s [-dnqvRW] spec_file pathname...\n", -+ "usage: %s [-dnqvrRW] spec_file pathname...\n", - argv[0]); - exit(1); - } -@@ -919,7 +966,11 @@ - } - else for (; optind < argc; optind++) - { -- -+ if (NULL != rootpath) { -+ QPRINTF("%s: labeling files, pretending %s is /\n", -+ argv[0], rootpath); -+ } -+ - if (flask_enabled) { - QPRINTF("%s: labeling files under %s\n", argv[0], - argv[optind]); diff --git a/sys-apps/selinux-small/files/selinux-small-2003071106-gentoo.diff b/sys-apps/selinux-small/files/selinux-small-2003071106-gentoo.diff deleted file mode 100644 index 844bbdbc9882..000000000000 --- a/sys-apps/selinux-small/files/selinux-small-2003071106-gentoo.diff +++ /dev/null @@ -1,259 +0,0 @@ -diff -urN selinux.orig/devfsd/devfsd-conflet selinux/devfsd/devfsd-conflet ---- selinux.orig/devfsd/devfsd-conflet 2002-07-17 17:00:40.000000000 -0500 -+++ selinux/devfsd/devfsd-conflet 2003-07-13 15:00:48.000000000 -0500 -@@ -1,23 +1,7 @@ --REGISTER ^(kmem|mem|port) CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:memory_device_t --REGISTER ^u?random CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:random_device_t --REGISTER ^tty CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:devtty_t --REGISTER /disc$ CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:fixed_disk_device_t --REGISTER /part[0-9]+$ CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:fixed_disk_device_t --REGISTER ^[mr]d/[0-9]+$ CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:fixed_disk_device_t -+REGISTER ^nb[^/]+$ CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:fixed_disk_device_t - REGISTER [0-9]/cd$ CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:removable_device_t --REGISTER ^floppy/ CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:removable_device_t --REGISTER ^misc/rtc CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:clock_device_t - REGISTER ^initctl CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:initctl_t --REGISTER ^printers/ CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:printer_t --REGISTER ^input/(mouse|mice|event) CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:mouse_device_t --REGISTER ^misc/psaux CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:mouse_device_t - REGISTER ^gpmctl CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:gpmctl_t --REGISTER ^ptmx CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:ptmx_t --REGISTER ^sound/ CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:sound_device_t --REGISTER ^agpgart CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:agp_device_t - REGISTER ^dri CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:dri_device_t --REGISTER ^misc/apm_bios CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:apm_bios_t --REGISTER ^ppp$ CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:ppp_device_t --REGISTER ^fb/.*$ CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:framebuf_device_t -- -- -+REGISTER ^sound/.* CFUNCTION devfsd-se.so set_sid $devname system_u:object_r:sound_device_t -+REGISTER ^pts/.* IGNORE -diff -urN selinux.orig/devfsd/devfsd-se.c selinux/devfsd/devfsd-se.c ---- selinux.orig/devfsd/devfsd-se.c 2002-04-19 15:32:37.000000000 -0500 -+++ selinux/devfsd/devfsd-se.c 2003-07-13 15:00:48.000000000 -0500 -@@ -19,7 +19,7 @@ - { - security_id_t sid; - struct stat buf; -- const char * const initial_context = "system_u:object_r:devfs_t"; -+ const char * const initial_context = "system_u:object_r:device_t"; - const char * const no_context = "system_u:object_r:unlabeled_t"; - - if(is_flask_enabled()) -diff -urN selinux.orig/libsecure/Makefile selinux/libsecure/Makefile ---- selinux.orig/libsecure/Makefile 2002-10-28 14:16:20.000000000 -0600 -+++ selinux/libsecure/Makefile 2003-07-13 15:00:48.000000000 -0500 -@@ -1,6 +1,6 @@ - all: -- $(MAKE) -C src -- $(MAKE) -C test -+ $(MAKE) -C src SE_INC=$(SE_INC) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" -+ $(MAKE) -C test SE_INC=$(SE_INC) EXTRA_CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)" - - install: - $(MAKE) -C include install -diff -urN selinux.orig/libsecure/src/Makefile selinux/libsecure/src/Makefile ---- selinux.orig/libsecure/src/Makefile 2003-04-22 08:24:05.000000000 -0500 -+++ selinux/libsecure/src/Makefile 2003-07-13 15:03:38.000000000 -0500 -@@ -2,7 +2,7 @@ - LIBDIR=$(PREFIX)/lib - TARGET=libsecure.a - OBJS= $(patsubst %.c,%.o,$(wildcard *.c)) --CFLAGS = -I../include -I$(PREFIX)/include -+CFLAGS = -I../include -I$(SE_INC) $(EXTRA_CFLAGS) - - ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) - OBJS+= $(patsubst %.c,%.o,$(wildcard arch/$(ARCH)/*.c)) -diff -urN selinux.orig/libsecure/test/Makefile selinux/libsecure/test/Makefile ---- selinux.orig/libsecure/test/Makefile 2003-04-22 08:24:05.000000000 -0500 -+++ selinux/libsecure/test/Makefile 2003-07-13 15:05:48.000000000 -0500 -@@ -3,14 +3,14 @@ - BINDIR=$(PREFIX)/bin - LDFLAGS=-L../src - LDLIBS=-lsecure --CFLAGS=-I../include -I$(PREFIX)/include -+CFLAGS=-I../include -I$(SE_INC) $(EXTRA_CFLAGS) - - ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) - TARGETS+= $(patsubst %.c,%,$(wildcard arch/$(ARCH)/*.c)) - - # Only install the programs that are useful to users - # and that are not redundant with the modified utilities. --UTILS=avc_enforcing avc_toggle load_policy context_to_sid sid_to_context list_sids chsid lchsid chsidfs -+UTILS=avc_enforcing avc_toggle load_policy context_to_sid sid_to_context list_sids chsid lchsid chsidfs get_user_sids - # Add 'exec_s' if you do not have 'runas'. - # Add 'getsecsid' if you do not have the modified 'id'. - # Add 'lstat_s' and 'stat_s' if you do not have the modified 'stat'. -diff -urN selinux.orig/libsecure/test/arch/i386/stat64_s.c selinux/libsecure/test/arch/i386/stat64_s.c ---- selinux.orig/libsecure/test/arch/i386/stat64_s.c 2002-03-13 13:39:21.000000000 -0600 -+++ selinux/libsecure/test/arch/i386/stat64_s.c 2003-07-13 16:20:33.000000000 -0500 -@@ -49,6 +49,7 @@ - } - - printf("Context: %s\n", context); -+ free(context); - } - - exit(0); -diff -urN selinux.orig/libsecure/test/getsecsid.c selinux/libsecure/test/getsecsid.c ---- selinux.orig/libsecure/test/getsecsid.c 2001-07-18 15:38:06.000000000 -0500 -+++ selinux/libsecure/test/getsecsid.c 2003-07-13 16:20:33.000000000 -0500 -@@ -51,6 +51,6 @@ - } - - printf("Context: %s\n", scontext); -- -+ free(scontext); - exit(0); - } -diff -urN selinux.orig/libsecure/test/lstat_s.c selinux/libsecure/test/lstat_s.c ---- selinux.orig/libsecure/test/lstat_s.c 2001-07-18 15:38:06.000000000 -0500 -+++ selinux/libsecure/test/lstat_s.c 2003-07-13 16:20:33.000000000 -0500 -@@ -48,6 +48,7 @@ - } - - printf("Context: %s\n", context); -+ free(context); - } - - exit(0); -diff -urN selinux.orig/libsecure/test/sid_to_context.c selinux/libsecure/test/sid_to_context.c ---- selinux.orig/libsecure/test/sid_to_context.c 2001-07-18 15:38:06.000000000 -0500 -+++ selinux/libsecure/test/sid_to_context.c 2003-07-13 16:20:33.000000000 -0500 -@@ -43,5 +43,6 @@ - } - - printf("%s\n", buf); -+ free(buf); - exit(0); - } -diff -urN selinux.orig/libsecure/test/stat_s.c selinux/libsecure/test/stat_s.c ---- selinux.orig/libsecure/test/stat_s.c 2001-07-18 15:38:06.000000000 -0500 -+++ selinux/libsecure/test/stat_s.c 2003-07-13 16:20:33.000000000 -0500 -@@ -48,6 +48,7 @@ - } - - printf("Context: %s\n", context); -+ free(context); - } - - exit(0); -diff -urN selinux.orig/libsecure/test/statfs_s.c selinux/libsecure/test/statfs_s.c ---- selinux.orig/libsecure/test/statfs_s.c 2001-07-18 15:38:06.000000000 -0500 -+++ selinux/libsecure/test/statfs_s.c 2003-07-13 16:20:33.000000000 -0500 -@@ -48,6 +48,7 @@ - } - - printf("Context: %s\n", context); -+ free(context); - } - - exit(0); -diff -urN selinux.orig/module/Makefile selinux/module/Makefile ---- selinux.orig/module/Makefile 2003-04-22 08:24:05.000000000 -0500 -+++ selinux/module/Makefile 2003-07-13 15:00:48.000000000 -0500 -@@ -6,7 +6,7 @@ - FLASKDIR=$(PREFIX)/flask - INCDIR=$(PREFIX)/include - --ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) -+ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/parisc.*/hppa/) - - # Build the checkpolicy program. - all: -diff -urN selinux.orig/module/checkpolicy/Makefile selinux/module/checkpolicy/Makefile ---- selinux.orig/module/checkpolicy/Makefile 2003-04-22 08:24:06.000000000 -0500 -+++ selinux/module/checkpolicy/Makefile 2003-07-13 15:00:48.000000000 -0500 -@@ -17,7 +17,9 @@ - OPTIONS = - endif - --CFLAGS = -g $(OPTIONS) -I$(LSMDIR)/include -Wall -O2 -pipe -include $(MODDIR)/ss/global.h -I$(MODDIR)/include -I$(MODDIR)/ss -+YACC = bison -y -+ -+CFLAGS = $(OPTIONS) -I$(LSMDIR)/include -Wall -O2 -pipe -include $(MODDIR)/ss/global.h -I$(MODDIR)/include -I$(MODDIR)/ss - - OBJS = ebitmap.o queue.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o y.tab.o lex.yy.o checkpolicy.o - -@@ -28,7 +30,7 @@ - LIBS=-lfl - - checkpolicy: $(OBJS) -- $(CC) -o $@ $^ $(LIBS) -+ $(CC) -o $@ $^ $(LIBS) $(LDFLAGS) - - %.o: $(MODDIR)/ss/%.c - $(CC) $(CFLAGS) -o $@ -c $< -diff -urN selinux.orig/utils/newrole/Makefile selinux/utils/newrole/Makefile ---- selinux.orig/utils/newrole/Makefile 2003-04-22 08:24:07.000000000 -0500 -+++ selinux/utils/newrole/Makefile 2003-07-13 15:15:17.000000000 -0500 -@@ -36,7 +36,7 @@ - # End Release flags - - LDFLAGS += -L$(LIBDIR) --LIBS += $(LIBDIR)/libsecure.a -+LIBS += ../../libsecure/src/libsecure.a - - PROGS = newrole - -diff -urN selinux.orig/utils/run_init/Makefile selinux/utils/run_init/Makefile ---- selinux.orig/utils/run_init/Makefile 2003-04-22 08:24:07.000000000 -0500 -+++ selinux/utils/run_init/Makefile 2003-07-13 15:22:16.000000000 -0500 -@@ -37,7 +37,7 @@ - # End Release flags - - LDFLAGS += -L$(LIBDIR) --LIBS += $(LIBDIR)/libsecure.a -+LIBS += ../../libsecure/src/libsecure.a - - PROGS = run_init - -diff -urN selinux.orig/utils/run_init/run_init.c selinux/utils/run_init/run_init.c ---- selinux.orig/utils/run_init/run_init.c 2002-11-26 11:32:36.000000000 -0600 -+++ selinux/utils/run_init/run_init.c 2003-07-13 15:00:48.000000000 -0500 -@@ -386,7 +386,7 @@ - exit(-1); - } - -- if ( execvp_secure(argv[1], sid, argv + 1) ) { -+ if ( execvp_secure("/usr/sbin/open_init_pty", sid, argv) ) { - perror("execvp_secure"); - exit(-1); - } -diff -urN selinux.orig/utils/spasswd/Makefile selinux/utils/spasswd/Makefile ---- selinux.orig/utils/spasswd/Makefile 2003-06-06 09:23:36.000000000 -0500 -+++ selinux/utils/spasswd/Makefile 2003-07-13 15:00:48.000000000 -0500 -@@ -14,12 +14,13 @@ - GROUPDEL=/usr/sbin/groupdel - GROUPMOD=/usr/sbin/groupmod - VIPW=/usr/sbin/vipw -+VIGR=/usr/sbin/vigr - - CFLAGS += -Wall -g -I$(INCDIR) - LDFLAGS += -static -L$(LIBDIR) - LIBS += -lsecure - --PROGS = spasswd sadminpasswd suseradd suserdel svipw schfn schsh sgpasswd susermod \ -+PROGS = spasswd sadminpasswd suseradd suserdel svipw svigr schfn schsh sgpasswd susermod \ - sgroupadd sgroupdel sgroupmod - - all: $(PROGS) -@@ -42,6 +43,9 @@ - svipw.o: spasswd.c - $(CC) $(CFLAGS) -DADMIN_USE -DPASSWD=\"$(VIPW)\" -c -o $@ $< - -+svigr.o: spasswd.c -+ $(CC) $(CFLAGS) -DADMIN_USE -DPASSWD=\"$(VIGR)\" -c -o $@ $< -+ - schfn.o: spasswd.c - $(CC) $(CFLAGS) -DPASSWD=\"$(CHFN)\" -c -o $@ $< - -@@ -64,7 +68,7 @@ - $(CC) $(CFLAGS) -DADMIN_USE -DPASSWD=\"$(GROUPMOD)\" -c -o $@ $< - - install: all -- test -d $(BINDIR) || install -m 755 -o root -g root $(BINDIR) -+ test -d $(BINDIR) || install -m 755 -d -o root -g root $(BINDIR) - install -m 555 -o root -g root $(PROGS) $(BINDIR) - - clean: |