38ab1da754
- sepolicy: Fix translated strings with parameters - sepolicy: Support non-MLS policy - sepolicy: Initialize policy.ports as a dict in generate.py - gui/polgengui.py: Use stop_emission_by_name instead of emit_stop_by_name - Minor update for bash completion - semodule_package: fix semodule_unpackage man page - gui/semanagePage: Close "edit" and "add" dialogues when successfull - gui/fcontextPage: Set default object class in addDialog\ - sepolgen: fix typo in PolicyGenerator - build: follow standard semantics for DESTDIR and PREFIX
126 lines
4.4 KiB
Diff
126 lines
4.4 KiB
Diff
diff --git semodule-utils-2.7/Makefile semodule-utils-2.7/Makefile
|
|
index 6bf4aee..e0a6579 100644
|
|
--- semodule-utils-2.7/Makefile
|
|
+++ semodule-utils-2.7/Makefile
|
|
@@ -1,4 +1,4 @@
|
|
-SUBDIRS = semodule_package semodule_link semodule_expand semodule_deps
|
|
+SUBDIRS = semodule_package semodule_link semodule_expand
|
|
|
|
all install relabel clean indent:
|
|
@for subdir in $(SUBDIRS); do \
|
|
diff --git semodule-utils-2.7/semodule_expand/Makefile semodule-utils-2.7/semodule_expand/Makefile
|
|
index 072f213..f1a1c8f 100644
|
|
--- semodule-utils-2.7/semodule_expand/Makefile
|
|
+++ semodule-utils-2.7/semodule_expand/Makefile
|
|
@@ -1,8 +1,6 @@
|
|
# Installation directories.
|
|
-PREFIX ?= $(DESTDIR)/usr
|
|
-INCLUDEDIR ?= $(PREFIX)/include
|
|
+PREFIX ?= /usr
|
|
BINDIR ?= $(PREFIX)/bin
|
|
-LIBDIR ?= $(PREFIX)/lib
|
|
MANDIR ?= $(PREFIX)/share/man
|
|
|
|
CFLAGS ?= -Werror -Wall -W
|
|
@@ -13,10 +11,10 @@ all: semodule_expand
|
|
semodule_expand: semodule_expand.o
|
|
|
|
install: all
|
|
- -mkdir -p $(BINDIR)
|
|
- install -m 755 semodule_expand $(BINDIR)
|
|
- test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8
|
|
- install -m 644 semodule_expand.8 $(MANDIR)/man8/
|
|
+ -mkdir -p $(DESTDIR)$(BINDIR)
|
|
+ install -m 755 semodule_expand $(DESTDIR)$(BINDIR)
|
|
+ test -d $(DESTDIR)$(MANDIR)/man8 || install -m 755 -d $(DESTDIR)$(MANDIR)/man8
|
|
+ install -m 644 semodule_expand.8 $(DESTDIR)$(MANDIR)/man8/
|
|
|
|
relabel:
|
|
|
|
diff --git semodule-utils-2.7/semodule_link/Makefile semodule-utils-2.7/semodule_link/Makefile
|
|
index cc4687b..692cb02 100644
|
|
--- semodule-utils-2.7/semodule_link/Makefile
|
|
+++ semodule-utils-2.7/semodule_link/Makefile
|
|
@@ -1,9 +1,7 @@
|
|
# Installation directories.
|
|
-PREFIX ?= $(DESTDIR)/usr
|
|
-INCLUDEDIR ?= $(PREFIX)/include
|
|
+PREFIX ?= /usr
|
|
BINDIR ?= $(PREFIX)/bin
|
|
MANDIR ?= $(PREFIX)/share/man
|
|
-LIBDIR ?= $(PREFIX)/lib
|
|
|
|
CFLAGS ?= -Werror -Wall -W
|
|
override LDLIBS += -lsepol
|
|
@@ -13,10 +11,10 @@ all: semodule_link
|
|
semodule_link: semodule_link.o
|
|
|
|
install: all
|
|
- -mkdir -p $(BINDIR)
|
|
- install -m 755 semodule_link $(BINDIR)
|
|
- test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8
|
|
- install -m 644 semodule_link.8 $(MANDIR)/man8/
|
|
+ -mkdir -p $(DESTDIR)$(BINDIR)
|
|
+ install -m 755 semodule_link $(DESTDIR)$(BINDIR)
|
|
+ test -d $(DESTDIR)$(MANDIR)/man8 || install -m 755 -d $(DESTDIR)$(MANDIR)/man8
|
|
+ install -m 644 semodule_link.8 $(DESTDIR)$(MANDIR)/man8/
|
|
|
|
relabel:
|
|
|
|
diff --git semodule-utils-2.7/semodule_package/Makefile semodule-utils-2.7/semodule_package/Makefile
|
|
index 96dd7c4..da17026 100644
|
|
--- semodule-utils-2.7/semodule_package/Makefile
|
|
+++ semodule-utils-2.7/semodule_package/Makefile
|
|
@@ -1,8 +1,6 @@
|
|
# Installation directories.
|
|
-PREFIX ?= $(DESTDIR)/usr
|
|
-INCLUDEDIR ?= $(PREFIX)/include
|
|
+PREFIX ?= /usr
|
|
BINDIR ?= $(PREFIX)/bin
|
|
-LIBDIR ?= $(PREFIX)/lib
|
|
MANDIR ?= $(PREFIX)/share/man
|
|
|
|
CFLAGS ?= -Werror -Wall -W
|
|
@@ -13,12 +11,12 @@ all: semodule_package semodule_unpackage
|
|
semodule_package: semodule_package.o
|
|
|
|
install: all
|
|
- -mkdir -p $(BINDIR)
|
|
- install -m 755 semodule_package $(BINDIR)
|
|
- install -m 755 semodule_unpackage $(BINDIR)
|
|
- test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8
|
|
- install -m 644 semodule_package.8 $(MANDIR)/man8/
|
|
- install -m 644 semodule_unpackage.8 $(MANDIR)/man8/
|
|
+ -mkdir -p $(DESTDIR)$(BINDIR)
|
|
+ install -m 755 semodule_package $(DESTDIR)$(BINDIR)
|
|
+ install -m 755 semodule_unpackage $(DESTDIR)$(BINDIR)
|
|
+ test -d $(DESTDIR)$(MANDIR)/man8 || install -m 755 -d $(DESTDIR)$(MANDIR)/man8
|
|
+ install -m 644 semodule_package.8 $(DESTDIR)$(MANDIR)/man8/
|
|
+ install -m 644 semodule_unpackage.8 $(DESTDIR)$(MANDIR)/man8/
|
|
|
|
relabel:
|
|
|
|
diff --git semodule-utils-2.7/semodule_package/semodule_unpackage.8 semodule-utils-2.7/semodule_package/semodule_unpackage.8
|
|
index d6e1be0..5c92bf5 100644
|
|
--- semodule-utils-2.7/semodule_package/semodule_unpackage.8
|
|
+++ semodule-utils-2.7/semodule_package/semodule_unpackage.8
|
|
@@ -1,14 +1,14 @@
|
|
.TH SEMODULE_PACKAGE "8" "Nov 2005" "Security Enhanced Linux" NSA
|
|
.SH NAME
|
|
-semodule_unpackage \- Extract policy module and file context file from an SELinux policy module unpackage.
|
|
+semodule_unpackage \- Extract policy module and file context file from an SELinux policy module package.
|
|
|
|
.SH SYNOPSIS
|
|
-.B semodule_unpackage <module> [<file contexts>]
|
|
+.B semodule_unpackage ppfile modfile [fcfile]
|
|
.br
|
|
.SH DESCRIPTION
|
|
.PP
|
|
-semodule_unpackage is the tool used to extract the SELinux policy module
|
|
- and file context file from an SELinux Policy Package.
|
|
+semodule_unpackage is a tool used to extract SELinux policy module
|
|
+file and file context file from an SELinux Policy Package.
|
|
|
|
.SH EXAMPLE
|
|
.nf
|