181 lines
6.2 KiB
Diff
181 lines
6.2 KiB
Diff
--- setools-1.4.1/libseuser/seuser_db.c.rhat 2004-07-07 16:37:39.000000000 -0400
|
|
+++ setools-1.4.1/libseuser/seuser_db.c 2004-07-08 12:15:29.906712667 -0400
|
|
@@ -17,8 +17,15 @@
|
|
#include <pwd.h>
|
|
#include <sys/types.h>
|
|
#include <unistd.h>
|
|
+#include <limits.h>
|
|
#include "seuser_db.h"
|
|
|
|
+/*
|
|
+ defined in selinux/selinux.h
|
|
+ but conflicts with policy.h
|
|
+*/
|
|
+extern char *selinux_file_context_path(void);
|
|
+
|
|
/* apol lib */
|
|
#include "../libapol/policy.h"
|
|
#include "../libapol/policy-io.h"
|
|
@@ -789,8 +796,10 @@
|
|
}
|
|
free(full_config);
|
|
|
|
-
|
|
- db->policy_conf = get_config_var("policy.conf", fp);
|
|
+ /* db->policy_conf = get_config_var("policy.conf", fp);*/
|
|
+ db->policy_conf = malloc(PATH_MAX);
|
|
+ snprintf(db->policy_conf, PATH_MAX, "%s/src/policy/policy.conf",
|
|
+ selinux_policy_root());
|
|
if(db->policy_conf == NULL) {
|
|
fclose(fp);
|
|
free_conf_info(db);
|
|
@@ -805,7 +814,9 @@
|
|
return 4;
|
|
}
|
|
|
|
- db->policy_dir = get_config_var("policy_dir", fp);
|
|
+ /* db->policy_dir = get_config_var("policy_dir", fp);*/
|
|
+ db->policy_dir = malloc(PATH_MAX);
|
|
+ snprintf(db->policy_dir, PATH_MAX, "%s/src/policy", selinux_policy_root());
|
|
if(db->policy_dir == NULL) {
|
|
fclose(fp);
|
|
free_conf_info(db);
|
|
@@ -820,7 +831,9 @@
|
|
return 6;
|
|
}
|
|
|
|
- db->user_file = get_config_var("user_file", fp);
|
|
+ /* db->user_file = get_config_var("user_file", fp);*/
|
|
+ db->user_file = malloc(PATH_MAX);
|
|
+ snprintf(db->user_file, PATH_MAX, "%s/src/policy/users", selinux_policy_root());
|
|
if(db->user_file == NULL) {
|
|
fclose(fp);
|
|
free_conf_info(db);
|
|
@@ -829,7 +842,8 @@
|
|
}
|
|
/* users file may not exist which is ok, so we won't check read access. */
|
|
|
|
- db->file_contexts_file = get_config_var("file_contexts_file", fp);
|
|
+ /* db->file_contexts_file = get_config_var("file_contexts_file", fp);*/
|
|
+ db->file_contexts_file = strdup(selinux_file_context_path());
|
|
if(db->file_contexts_file == NULL) {
|
|
fclose(fp);
|
|
free_conf_info(db);
|
|
--- setools-1.4.1/libseuser/Makefile.rhat 2004-07-07 16:37:38.000000000 -0400
|
|
+++ setools-1.4.1/libseuser/Makefile 2004-07-08 12:02:22.124320696 -0400
|
|
@@ -19,7 +19,7 @@
|
|
$(CC) $(LDFLAGS) -shared -o $(LIBSO) $(LIB-OBJ) -Wl,-soname,$(SONAME)
|
|
|
|
libseuser.a: $(LIB-OBJ)
|
|
- ar cr $@ $(LIB-OBJ)
|
|
+ ar cr $@ $(LIB-OBJ) -lselinux
|
|
|
|
libseuser-tcl.a: $(LIB-OBJ-TCL)
|
|
ar cr $@ $(LIB-OBJ-TCL)
|
|
--- setools-1.4.1/apol/Makefile.rhat 2004-07-07 16:37:38.000000000 -0400
|
|
+++ setools-1.4.1/apol/Makefile 2004-07-08 12:02:22.125320586 -0400
|
|
@@ -17,7 +17,7 @@
|
|
CFLAGS += -DSTARTUP_SCRIPT='"$(APOL_STARTUP_SCRIPT)"'
|
|
|
|
apol: $(GUI-OBJ) apol.tcl
|
|
- $(CC) $(TCL_LIBINC) -o $@ $(GUI-OBJ) $(LINKFLAGS) $(TCL_LIBS)
|
|
+ $(CC) $(TCL_LIBINC) -o $@ $(GUI-OBJ) $(LINKFLAGS) $(TCL_LIBS) -lselinux
|
|
|
|
|
|
apol.tcl: $(TCL-FILES)
|
|
@@ -54,6 +54,7 @@
|
|
done \
|
|
fi
|
|
install -m 644 apol.tcl $(APOL_HELP_FILES) $(APOL_PERM_MAPS) $(INSTALL_LIBDIR)
|
|
+ install -m 644 $(APOL_HELP_FILES) $(APOL_PERM_MAPS) ${INSTALL_HELPDIR}
|
|
cd $(INSTALL_LIBDIR); ln -sf $(APOL_DFLT_PMAP) apol_perm_mapping
|
|
|
|
clean:
|
|
--- setools-1.4.1/awish/Makefile.rhat 2004-07-07 16:37:39.000000000 -0400
|
|
+++ setools-1.4.1/awish/Makefile 2004-07-08 12:02:22.125320586 -0400
|
|
@@ -4,7 +4,7 @@
|
|
AWISH_OBJ = awish.o $(LIBSEUSER-TCL) $(LIBAPOL-TCL)
|
|
|
|
awish: $(AWISH_OBJ)
|
|
- $(CC) $(TCL_LIBINC) -o $@ $(AWISH_OBJ) $(LINKFLAGS) $(TCL_LIBS)
|
|
+ $(CC) $(TCL_LIBINC) -o $@ $(AWISH_OBJ) $(LINKFLAGS) $(TCL_LIBS) -lselinux
|
|
|
|
|
|
%.o: %.c
|
|
--- setools-1.4.1/Makefile.rhat 2004-07-08 12:18:16.143697579 -0400
|
|
+++ setools-1.4.1/Makefile 2004-07-08 12:19:05.458057985 -0400
|
|
@@ -25,8 +25,8 @@
|
|
# File location defaults; used in various places in code
|
|
# Change these if you want different defaults
|
|
SELINUX_DIR = $(DESTDIR)/selinux
|
|
-SELINUX_POLICY_DIR = $(DESTDIR)/etc/security/selinux
|
|
-POLICY_INSTALL_DIR = $(DESTDIR)$(SELINUX_POLICY_DIR)
|
|
+SELINUX_POLICY_DIR = $(DESTDIR)/etc/selinux/strict/
|
|
+POLICY_INSTALL_DIR = $(DESTDIR)$(SELINUX_POLICY_DIR)/policy
|
|
POLICY_SRC_DIR = $(DESTDIR)$(SELINUX_POLICY_DIR)/src/policy
|
|
POLICY_SRC_FILE = $(POLICY_SRC_DIR)/policy.conf
|
|
DEFAULT_LOG_FILE = /var/log/messages
|
|
@@ -224,7 +224,7 @@
|
|
|
|
install-nogui: $(INSTALL_LIBDIR) install-seuser install-secmds
|
|
|
|
-install: install-apol install-seuserx install-sepcut install-awish install-secmds install-seaudit
|
|
+install: install-apol install-seuserx install-sepcut install-awish install-secmds install-seaudit install-bwidget install-docs
|
|
|
|
# Install the libraries
|
|
install-libseuser:
|
|
--- setools-1.4.1/packages/Makefile.rhat 2004-07-07 16:37:38.000000000 -0400
|
|
+++ setools-1.4.1/packages/Makefile 2004-07-08 12:02:22.127320366 -0400
|
|
@@ -4,9 +4,10 @@
|
|
|
|
# INSTALL_PATH is set based upon your current
|
|
# version of tcl using the tcl_vars script.
|
|
-INSTALL_PATH=$(shell env tclsh ../tcl_vars tcl_library)
|
|
+INSTALL_PATH=$(DESTDIR)/$(shell env tclsh ../tcl_vars tcl_library)
|
|
|
|
install:
|
|
+ mkdir -p $(INSTALL_PATH)
|
|
tar -zxvf BWidget-1.4.1.tar.gz
|
|
mv BWidget-1.4.1 $(INSTALL_PATH)
|
|
|
|
@@ -19,4 +20,4 @@
|
|
clean:
|
|
rm -rf BWidget-1.4.1/
|
|
|
|
-bare: clean
|
|
\ No newline at end of file
|
|
+bare: clean
|
|
--- setools-1.4.1/seuser/Makefile.rhat 2004-07-07 16:37:39.000000000 -0400
|
|
+++ setools-1.4.1/seuser/Makefile 2004-07-08 12:02:22.128320256 -0400
|
|
@@ -22,10 +22,10 @@
|
|
SHELL = /bin/sh
|
|
|
|
seuser: $(CMD-OBJ)
|
|
- $(CC) -o $@ $(CMD-OBJ) $(LINKFLAGS) $(LIBS)
|
|
+ $(CC) -o $@ $(CMD-OBJ) $(LINKFLAGS) $(LIBS) -lselinux
|
|
|
|
seuserx: $(GUI-OBJ) se_user.tcl
|
|
- $(CC) $(GUI_CFLAGS) $(TCL_LIBINC) -o $@ $(GUI-OBJ) $(LINKFLAGS) $(TCL_LIBS)
|
|
+ $(CC) $(GUI_CFLAGS) $(TCL_LIBINC) -o $@ $(GUI-OBJ) $(LINKFLAGS) $(TCL_LIBS) -lselinux
|
|
|
|
se_user.tcl: $(TCL-FILES)
|
|
cat $(TCL-FILES) | \
|
|
--- setools-1.4.1/docs-src/Makefile.rhat 2004-07-07 16:37:39.000000000 -0400
|
|
+++ setools-1.4.1/docs-src/Makefile 2004-07-08 12:21:10.492761493 -0400
|
|
@@ -55,3 +55,15 @@
|
|
for file in $(TOP-DOCS); do \
|
|
rm -f ../$$file; \
|
|
done
|
|
+
|
|
+install:
|
|
+ mkdir -p ${INSTALL_HELPDIR}
|
|
+ for file in KNOWN-BUGS README; do \
|
|
+ cat $$file.in | sed -e 's/RELEASE_VERSION/$(shell cat ../VERSION)/g' | \
|
|
+ sed -e 's/MOD_DATE/$(shell date '+%B %d, %G')/g' > ${INSTALL_HELPDIR}/$$file; \
|
|
+ done
|
|
+ install -m 644 ../seaudit/seaudit_help.txt ${INSTALL_HELPDIR}
|
|
+ install -m 644 ../seuser/seuser_help.txt ${INSTALL_HELPDIR}
|
|
+ install -m 644 ../sepct/sepcut_help.txt ${INSTALL_HELPDIR}
|
|
+ install -m 644 ../apol/*.txt ${INSTALL_HELPDIR}
|
|
+
|