*** empty log message ***

This commit is contained in:
Daniel J Walsh 2006-02-14 17:11:59 +00:00
parent cb99f70c9e
commit c417f6b886
4 changed files with 20 additions and 15 deletions

View File

@ -39,3 +39,4 @@ serefpolicy-2.2.11.tgz
serefpolicy-2.2.12.tgz serefpolicy-2.2.12.tgz
serefpolicy-2.2.13.tgz serefpolicy-2.2.13.tgz
serefpolicy-2.2.14.tgz serefpolicy-2.2.14.tgz
serefpolicy-2.2.15.tgz

View File

@ -1,5 +1,8 @@
# installation paths
SHAREDIR := $(PREFIX)/share/selinux
HEADERDIR := $(SHAREDIR)/refpolicy/include
-include build.conf include $(HEADERDIR)/build.conf
# executables # executables
PREFIX := /usr PREFIX := /usr
@ -8,6 +11,7 @@ SBINDIR := $(PREFIX)/sbin
CHECKMODULE := $(BINDIR)/checkmodule CHECKMODULE := $(BINDIR)/checkmodule
SEMODULE := $(SBINDIR)/semodule SEMODULE := $(SBINDIR)/semodule
SEMOD_PKG := $(BINDIR)/semodule_package SEMOD_PKG := $(BINDIR)/semodule_package
XMLLINT := $(BINDIR)/xmllint
# helper tools # helper tools
AWK ?= gawk AWK ?= gawk
@ -15,10 +19,12 @@ INSTALL ?= install
M4 ?= m4 M4 ?= m4
SED ?= sed SED ?= sed
EINFO ?= echo EINFO ?= echo
PYTHON ?= python
# set default build options # set default build options if missing
NAME ?= $(shell . /etc/selinux/config; echo $$SELINUXTYPE) NAME ?= $(shell . /etc/selinux/config; echo $$SELINUXTYPE)
MLSENABLED := $(shell cat /selinux/mls) MLSENABLED := $(shell cat /selinux/mls)
MODPKGDIR := $(SHAREDIR)/$(NAME)
ifeq ($(MLSENABLED),1) ifeq ($(MLSENABLED),1)
MCSFLAG=-mcs MCSFLAG=-mcs
@ -27,11 +33,7 @@ endif
TYPE ?= $(NAME)${MCSFLAG} TYPE ?= $(NAME)${MCSFLAG}
DIRECT_INITRC ?= n DIRECT_INITRC ?= n
POLY ?= n POLY ?= n
QUIET ?= y
# installation paths
SHAREDIR := $(PREFIX)/share/selinux
MODPKGDIR := $(SHAREDIR)/$(NAME)
HEADERDIR := $(SHAREDIR)/refpolicy/include
# compile strict policy if requested. # compile strict policy if requested.
ifneq ($(findstring strict,$(TYPE)),) ifneq ($(findstring strict,$(TYPE)),)

View File

@ -5,8 +5,8 @@
%define CHECKPOLICYVER 1.28-3 %define CHECKPOLICYVER 1.28-3
Summary: SELinux policy configuration Summary: SELinux policy configuration
Name: selinux-policy Name: selinux-policy
Version: 2.2.14 Version: 2.2.15
Release: 2 Release: 1
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source: serefpolicy-%{version}.tgz Source: serefpolicy-%{version}.tgz
@ -24,10 +24,9 @@ Source10: booleans-strict.conf
Source11: seusers-strict Source11: seusers-strict
Source12: setrans-strict.conf Source12: setrans-strict.conf
Source13: policygentool Source13: policygentool
Source14: Makefile.devel Source14: users_extra-targeted
Source15: users_extra-targeted Source15: users_extra-strict
Source16: users_extra-strict Source16: users_extra-mls
Source17: users_extra-mls
Url: http://serefpolicy.sourceforge.net Url: http://serefpolicy.sourceforge.net
BuildRoot: %{_tmppath}/serefpolicy-buildroot BuildRoot: %{_tmppath}/serefpolicy-buildroot
@ -179,7 +178,7 @@ make clean
make make
make DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} install-headers install-docs make DESTDIR=$RPM_BUILD_ROOT PKGNAME=%{name}-%{version} install-headers install-docs
install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/ install -m 755 ${RPM_SOURCE_DIR}/policygentool ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/
install -m 755 ${RPM_SOURCE_DIR}/Makefile.devel ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/Makefile ln -sf ./include/Makefile ${RPM_BUILD_ROOT}/usr/share/selinux/refpolicy/Makefile
%clean %clean
%{__rm} -fR $RPM_BUILD_ROOT %{__rm} -fR $RPM_BUILD_ROOT
@ -298,6 +297,9 @@ SELinux Reference policy development files
%changelog %changelog
* Tue Feb 14 2006 Dan Walsh <dwalsh@redhat.com> 2.2.15-1
- Update to upsteam
* Mon Feb 13 2006 Dan Walsh <dwalsh@redhat.com> 2.2.14-2 * Mon Feb 13 2006 Dan Walsh <dwalsh@redhat.com> 2.2.14-2
- Add users_extra files - Add users_extra files

View File

@ -1 +1 @@
7b0c1f6438c0be1d7fce5c8307784e86 serefpolicy-2.2.14.tgz 6018f8b9cf975dadf25e4051d0ed36d4 serefpolicy-2.2.15.tgz