diff options
author | Chris PeBenito <pebenito@gentoo.org> | 2003-10-07 18:22:45 +0000 |
---|---|---|
committer | Chris PeBenito <pebenito@gentoo.org> | 2003-10-07 18:22:45 +0000 |
commit | 0a8cc21093cdce65b2353fcb0f42628e5832eb1e (patch) | |
tree | c9e6a247ef32263ec549f4be7a2eb7c3388c6576 /sys-apps/policycoreutils/files | |
parent | 2.0.49-r9 is _not_ happy on amd64. remove the ~amd64 flag. (diff) | |
download | gentoo-2-0a8cc21093cdce65b2353fcb0f42628e5832eb1e.tar.gz gentoo-2-0a8cc21093cdce65b2353fcb0f42628e5832eb1e.tar.bz2 gentoo-2-0a8cc21093cdce65b2353fcb0f42628e5832eb1e.zip |
mark stable
Diffstat (limited to 'sys-apps/policycoreutils/files')
3 files changed, 0 insertions, 160 deletions
diff --git a/sys-apps/policycoreutils/files/digest-policycoreutils-1.1-r1 b/sys-apps/policycoreutils/files/digest-policycoreutils-1.1-r1 deleted file mode 100644 index 1d1d16f0ec17..000000000000 --- a/sys-apps/policycoreutils/files/digest-policycoreutils-1.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 c7b6ef63f76ef16ad9548f55d58dc148 policycoreutils-1.1.tgz 22695 diff --git a/sys-apps/policycoreutils/files/policycoreutils-1.0-gentoo.diff b/sys-apps/policycoreutils/files/policycoreutils-1.0-gentoo.diff deleted file mode 100644 index 7bc7a8d8a99d..000000000000 --- a/sys-apps/policycoreutils/files/policycoreutils-1.0-gentoo.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff -urN policycoreutils-1.0.orig/load_policy/Makefile policycoreutils-1.0/load_policy/Makefile ---- policycoreutils-1.0.orig/load_policy/Makefile 2003-07-07 07:55:00.000000000 -0500 -+++ policycoreutils-1.0/load_policy/Makefile 2003-08-03 20:51:09.000000000 -0500 -@@ -2,7 +2,7 @@ - PREFIX ?= ${DESTDIR}/usr - SBINDIR ?= $(PREFIX)/sbin - --CFLAGS = -Wall -+CFLAGS = -Wall $(EXTRA_CFLAGS) - LDLIBS += -lselinux - - # Build static so that we can put it on an initrd. -diff -urN policycoreutils-1.0.orig/newrole/Makefile policycoreutils-1.0/newrole/Makefile ---- policycoreutils-1.0.orig/newrole/Makefile 2003-07-07 07:55:01.000000000 -0500 -+++ policycoreutils-1.0/newrole/Makefile 2003-08-03 20:51:27.000000000 -0500 -@@ -4,7 +4,7 @@ - MANDIR ?= $(PREFIX)/share/man - ETCDIR ?= $(DESTDIR)/etc - --CFLAGS = -Wall -+CFLAGS = -Wall $(EXTRA_CFLAGS) - override CFLAGS += -DUSE_PAM - LDLIBS += -lselinux -lattr -ldl -lpam -lpam_misc - -diff -urN policycoreutils-1.0.orig/run_init/Makefile policycoreutils-1.0/run_init/Makefile ---- policycoreutils-1.0.orig/run_init/Makefile 2003-07-07 07:55:02.000000000 -0500 -+++ policycoreutils-1.0/run_init/Makefile 2003-08-03 20:54:09.000000000 -0500 -@@ -4,7 +4,7 @@ - MANDIR ?= $(PREFIX)/share/man - ETCDIR ?= $(DESTDIR)/etc - --CFLAGS = -Wall -+CFLAGS = -Wall $(EXTRA_CFLAGS) - override CFLAGS += -DUSE_PAM - LDLIBS += -lselinux -lattr -ldl -lpam -lpam_misc - -diff -urN policycoreutils-1.0.orig/setfiles/Makefile policycoreutils-1.0/setfiles/Makefile ---- policycoreutils-1.0.orig/setfiles/Makefile 2003-07-07 07:55:03.000000000 -0500 -+++ policycoreutils-1.0/setfiles/Makefile 2003-08-03 20:54:38.000000000 -0500 -@@ -3,7 +3,7 @@ - SBINDIR ?= $(PREFIX)/sbin - MANDIR = $(PREFIX)/share/man - --CFLAGS = -Wall -+CFLAGS = -Wall $(EXTRA_CFLAGS) - override CFLAGS += -D_FILE_OFFSET_BITS=64 - LDLIBS += -lselinux -lattr - diff --git a/sys-apps/policycoreutils/files/policycoreutils-1.1-setfiles.diff b/sys-apps/policycoreutils/files/policycoreutils-1.1-setfiles.diff deleted file mode 100644 index 15bf5eecd9b3..000000000000 --- a/sys-apps/policycoreutils/files/policycoreutils-1.1-setfiles.diff +++ /dev/null @@ -1,111 +0,0 @@ -diff -ur policycoreutils-1.1.orig/setfiles/setfiles.c policycoreutils-1.1/setfiles/setfiles.c ---- policycoreutils-1.1.orig/setfiles/setfiles.c 2003-07-14 15:00:06.000000000 -0500 -+++ policycoreutils-1.1/setfiles/setfiles.c 2003-08-17 13:22:20.000000000 -0500 -@@ -17,6 +17,7 @@ - * -d Show what specification matched each file. - * -n Do not change any file labels. - * -q Be quiet (suppress non-error output). -+ * -r Use an alternate root path - * -s Use stdin for a list of files instead of searching a partition. - * -v Show changes in file labels. - * -W Warn about entries that have no matching file. -@@ -78,6 +79,8 @@ - static int use_stdin = 0; - static int verbose = 0; - static int warn_no_match = 0; -+static char *rootpath = NULL; -+static int rootpathlen = 0; - - /* - * Program name and error message buffer. -@@ -267,11 +270,23 @@ - int match(const char *name, struct stat *sb) - { - int i, ret; -+ const char *fullname = name; - -- ret = lstat(name, sb); -+ /* 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; -+ } -+ -+ ret = lstat(fullname, sb); - if (ret) { - fprintf(stderr, "%s: unable to stat file %s\n", progname, -- name); -+ fullname); - return -1; - } - -@@ -511,6 +526,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) - { -@@ -521,7 +553,7 @@ - int opt, items, len, lineno, pass, nerr, regerr, i; - - /* Process any options. */ -- while ((opt = getopt(argc, argv, "dnpqsvxW")) > 0) { -+ while ((opt = getopt(argc, argv, "dnpqrsvxW")) > 0) { - switch (opt) { - case 'd': - debug = 1; -@@ -532,6 +564,20 @@ - case 'q': - quiet = 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; - case 's': - use_stdin = 1; - add_assoc = 0; -@@ -789,6 +835,10 @@ - } - else for (; optind < argc; optind++) - { -+ if (NULL != rootpath) { -+ QPRINTF("%s: labeling files, pretending %s is /\n", -+ argv[0], rootpath); -+ } - - QPRINTF("%s: labeling files under %s\n", argv[0], - argv[optind]); |