Changeset 234

Timestamp:

08/08/08 15:52:07 (4 months ago)

Author:

slawrence

Message:

Replace rpmify script with a make file for creating selinux policy and clip rpms.
Update make files and clip spec file to install files in the correct locations (not /usr/share/clip).
No longer use the installer.in script for post rpm install changes, everything is installed by the rpm now.
Update policy spec files to obey the checkpolicy version number for BuildRequires?. A commented out if/else was breaking things.
Update README with build steps and dependencies.
Add make file for building selinux toolchain rpms.

Files:

• trunk/RHEL5.2/Makefile (modified) (2 diffs)
• trunk/RHEL5.2/README (modified) (1 diff)
• trunk/RHEL5.2/RPM/clip.spec (modified) (3 diffs)
• trunk/RHEL5.2/build (added)
• trunk/RHEL5.2/build/Makefile (added)
• trunk/RHEL5.2/conf/audit/Makefile (modified) (1 diff)
• trunk/RHEL5.2/conf/pam/Makefile (modified) (1 diff)
• trunk/RHEL5.2/refpolicy/conf/selinux-policy-modular.spec (modified) (2 diffs)
• trunk/RHEL5.2/refpolicy/conf/selinux-policy-monolithic.spec (modified) (2 diffs)
• trunk/RHEL5.2/rpmify (deleted)
• trunk/RHEL5.2/scripts/Makefile (modified) (2 diffs)
• trunk/RHEL5.2/scripts/wrappers/scripts (modified) (1 diff)
• trunk/RHEL5.2/selinux-usr/Makefile (added)

trunk/RHEL5.2/Makefile

@@ -8 +8 @@
-export KSDIR=$(SHAREDIR)/kickstart
-export CONFDIR=$(SHAREDIR)/conf
-SHAREDIR)
+PREFIX)/share
-
-install: $(SUBDIRS)
@@ -15 +15 @@
-        done
-        test -d $(DESTDIR)$(KSDIR) || install -m 755 -d $(DESTDIR)$(KSDIR)
-test -d $(DESTDIR)$(CONFDIR) || install -m 755 -d $(DESTDIR)$(CONF
-install -m 644 kickstart/* $(DESTDIR)$(KS
+install -m 644 kickstart/clip.ks $(DESTDIR)$(KS
+#test -d $(DESTDIR)$(CONFDIR) || install -m 755 -d $(DESTDIR)$(CONF
-

trunk/RHEL5.2/README

@@ -1 @@
-instance
+rpms
-
-1. Run rpmify
-
-
+
-
+* Install the following packages from the RHEL5.2 cd
+        - audit-libs-devel
+        - bison
+        - byacc
+        - flex
+        - libcap-devel
+        - pam-devel
+        - python-devel
+        - swig
+
+* Update the selinux toolchain
+        cd RHEL5.2/selinux-usr
+
+        make libsepol-rpm
+        rpm -Uvh --force rpm/RPMS/$ARCH/{libsepol,libsepol-devel}-1.16.14-1.$ARCH.rpm
+
+        make libselinux-rpm
+        rpm -Uvh --force rpm/RPMS/$ARCH/{libselinux,libselinux-devel,libselinux-python}-1.34.15-1.$ARCH.rpm
+
+        make libsemanage-rpm
+        rpm -Uvh --force rpm/RPMS/$ARCH/{libsemanage,libsemanage-devel}-1.10.9-1.$ARCH.rpm
+
+        make policycoreutils-rpm
+        rpm -Uvh --force rpm/RPMS/$ARCH/{policycoreutils,policycoreutils-newrole}-1.34.16-1.$ARCH.rpm
+
+        make checkpolicy-rpm
+        rpm -Uvh --force rpm/RPMS/$ARCH/checkpolicy-1.34.7-1.$ARCH.rpm
+
+* Install clip and clip selinux policy
+
+        cd RHEL5.2/build
+
+        make clip-rpm selinux-policy-clip-rpm
+
+* RPMs will be located in RHEL5.2/RPM directory
+
+        cd RHEL5.2/RPM
+
+        rpm -Uvh --force clip-2.0-1.$ARCH.rpm
+        rpm -Uvh --force selinux-policy-clip-2.0-3.noarch.rpm
+        
+
+
+== Build Dependencies ==
+
+clip-2.0-1:
+        audit-libs-devel
+        pam-devel
+
+libsepol-1.16.14-1:
+        none
+
+libselinux-1.34.15-1:
+        libsepol-devel > 1.16.14-1
+        swig
+        python-devel
+
+libsemanage-1.10.9-1:
+        libselinux-devel > 1.34.15-1
+        swig
+        libsepol-devel > 1.16.14-1
+        python-devel
+        bison
+        flex
+
+policycoreutils-1.34.16-1:
+        libsepol-devel > 1.16.14-1
+        libsemanage-devel > 1.10.9-1
+        libselinux-devel 1.34.15-1
+        libcap-devel
+        audit-libs-devel
+
+checkpolicy-1.34.7:
+        byacc
+        flex
+        libsepol-devel > 1.16.14-1
+        libselinux-devel
+
+selinux-policy-clip-2.0-3:
+        checkpolicy >= 1.34.7
+

trunk/RHEL5.2/RPM/clip.spec

@@ -7 +7 @@
-Source0: %{name}-%{version}-%{release}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: audit-libs-devel pam-devel
-
-%define debug_package %{nil}
@@ -17 +18 @@
-
-%build
-
-
-
-
+
-pushd .
-cd scripts/wrappers
-./mk_wrappers
-popd
+
+
-%install
-rm -rf $RPM_BUILD_ROOT
@@ -36 +36 @@
-%files
-%defattr(-,root,root,-)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-/%{_lib}/security/pam_tally3.so
-/usr/share/doc/pam_tally3
-/sbin/pam_tally3
-/usr/sbin/xar
+/usr/share/clip/kickstart/clip.ks
+/usr/share/clip/scripts/stig-fix
+%{_mandir}/man8/xar.8.gz
-/var/cache/xar
-
-
-
-
-
-
-
-
-
-
-
+
-
-%post
-/usr/share/clip/installer >> %log_file 2>>%log_file
-
-%changelog
-
+
+
+
+
--removed BuildArch directive
--added pam_tally3 to build section

trunk/RHEL5.2/conf/audit/Makefile

@@ +1 @@
+ARCH=$(shell uname -i)
+
-install:
-
-
+
+
+
+

trunk/RHEL5.2/conf/pam/Makefile

@@ -1 +1 @@
-install:
-
-
-
-
+
+
+
+
+
+
+
+
+
-        install -m 644 security/pam_env.conf $(DESTDIR)$(SYSCONFDIR)/security/pam_env.conf

trunk/RHEL5.2/refpolicy/conf/selinux-policy-modular.spec

@@ -1 +1 @@
-%define POLICYDIR /etc/selinux/%{polname}
-%define FILE_CONTEXT %{POLICYDIR}/contexts/files/file_contexts
-
+
+
-Summary: SELinux policy configuration for %{polname}
-Name: selinux-policy-%{polname}
@@ -12 +13 @@
-Group: System Environment/Base
-
-# for now use the same checkpol versions across build distros
-#%if %(test -f /etc/fedora-release && echo 1 || echo 0) && %(rpm -q --queryformat '%{VERSION}' fedora-release) == 5
-%define CHECKPOL_VERSION 1.30.3-1
-#%else if %(test -f /etc/redhat-release && echo 1 || echo 0) && %(rpm -q --queryformat '%{VERSION}' redhat-release) == 4WS-2
-#%define CHECKPOL_VERSION 1.30.3-1
-#%endif
-
-BuildRoot: %{_tmppath}/%{polname}-buildroot

trunk/RHEL5.2/refpolicy/conf/selinux-policy-monolithic.spec

@@ -1 +1 @@
-%define POLICYDIR /etc/selinux/%{polname}
-%define FILE_CONTEXT %{POLICYDIR}/contexts/files/file_contexts
-
+
+
-Summary: SELinux policy configuration for %{polname}
-Name: selinux-policy-%{polname}
@@ -12 +13 @@
-Group: System Environment/Base
-
-# for now use the same checkpol versions across build distros
-#%if %(test -f /etc/fedora-release && echo 1 || echo 0) && %(rpm -q --queryformat '%{VERSION}' fedora-release) == 5
-%define CHECKPOL_VERSION 1.30.3-1
-#%else if %(test -f /etc/redhat-release && echo 1 || echo 0) && %(rpm -q --queryformat '%{VERSION}' redhat-release) == 4WS-2
-#%define CHECKPOL_VERSION 1.30.3-1
-#%endif
-
-BuildRoot: %{_tmppath}/%{polname}-buildroot

trunk/RHEL5.2/scripts/Makefile

@@ -32 +32 @@
-        install -d -m 755 $(DESTDIR)/var/cache/xar
-
-        # Install wrappers
-        install -m 644 wrappers/scripts $(DESTDIR)$(SHAREDIR)/wrappers 
-        install -m 644 wrappers/wrapper.c $(DESTDIR)$(SHAREDIR)/wrappers
-
-        # Install scripts
-        install -m 700 stig-fix/run-fixes.sh $(DESTDIR)$(SHAREDIR)/scripts/stig-fix 
@@ -43 +39 @@
-        install -m 700 stig-fix/cat4/* $(DESTDIR)$(SHAREDIR)/scripts/stig-fix/cat4 
-
-        # Patch installer 
-        perl -pe s!--BASE--!$(PREFIX)/share! < $(INSTALLER).in > \
-                $(DESTDIR)$(SHAREDIR)/$(INSTALLER)
-
-        # Install wrappers
-        install -m 755 wrappers/protected/* $(DESTDIR)$(BINDIR)/protected

trunk/RHEL5.2/scripts/wrappers/scripts

@@ -2 +2 @@
-/usr/sbin/system-config-network
-/usr/sbin/system-config-network-cmd
-/usr/sbin/system-config-network-druid
-/usr/sbin/system-config-network-tui
-/usr/sbin/sys-unconfig
-/usr/sbin/semanage
-
+-tui
-/usr/sbin/up2date