rpms/policycoreutils
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

policycoreutils-2.5-0.99.rc1.1.fc24

Browse Source 
Update to upstream rc1 release 2016-01-07
This commit is contained in:
Petr Lautrbach 2016-01-08 23:25:39 +01:00
parent a69630b7b6
commit a97a5f63af
4 changed files with 1729 additions and 7833 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
make-rhat-patches.sh
View File

@ -1,13 +1,14 @@
#!/bin/bash #!/bin/bash
POLICYCOREUTILS_VERSION=2.4 POLICYCOREUTILS_VERSION=2.5-rc1
SEPOLGEN_VERSION=1.2.2 SEPOLGEN_VERSION=1.2.3-rc1
BRANCH=master REPO=https://github.com/fedora-selinux/selinux
BRANCH=master-rc
REBASEDIR=`mktemp -d rebase.XXXXXX` REBASEDIR=`mktemp -d rebase.XXXXXX`
pushd $REBASEDIR pushd $REBASEDIR
git clone git@github.com:fedora-selinux/selinux.git git clone $REPO
pushd selinux; git checkout $BRANCH; COMMIT=`git rev-parse --verify HEAD`; popd pushd selinux; git checkout $BRANCH; COMMIT=`git rev-parse --verify HEAD`; popd
# prepare policycoreutils-rhat.patch # prepare policycoreutils-rhat.patch
@ -37,4 +38,4 @@ popd
popd popd
# echo rm -rf $REBASEDIR # echo rm -rf $REBASEDIR
echo policycoreutils-rhat.patch and sepolgen-rhat.patch created from https://github.com/fedora-selinux/selinux/commit/$COMMIT echo policycoreutils-rhat.patch and sepolgen-rhat.patch created from $REPO/$COMMIT

6464
policycoreutils-rhat.patch
View File

File diff suppressed because it is too large Load Diff

47
policycoreutils.spec
View File

@ -1,24 +1,24 @@
%global libauditver 2.1.3-4 %global libauditver 2.1.3-4
%global libsepolver 2.4-1 %global libsepolver 2.5-0
%global libsemanagever 2.4-1 %global libsemanagever 2.5-0
%global libselinuxver 2.4-1 %global libselinuxver 2.5-0
%global sepolgenver 1.2.2 %global sepolgenver 1.2.3
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.4 Version: 2.5
Release: 20%{?dist} Release: 0.99.rc1.1%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Base Group: System Environment/Base
# https://github.com/SELinuxProject/selinux/wiki/Releases # https://github.com/SELinuxProject/selinux/wiki/Releases
Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/policycoreutils-2.4.tar.gz Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160107/policycoreutils-2.5-rc1.tar.gz
Source1:https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/sepolgen-1.2.2.tar.gz Source1:https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160107/sepolgen-1.2.3-rc1.tar.gz
URL: http://www.selinuxproject.org URL: http://www.selinuxproject.org
Source2: policycoreutils_man_ru2.tar.bz2 Source2: policycoreutils_man_ru2.tar.bz2
Source3: system-config-selinux.png Source3: system-config-selinux.png
Source4: sepolicy-icons.tgz Source4: sepolicy-icons.tgz
# use make-rhat-patches.sh to create following patches from https://github.com/fedora-selinux/selinux/ # use make-rhat-patches.sh to create following patches from https://github.com/fedora-selinux/selinux/
# HEAD https://github.com/fedora-selinux/selinux/commit/3f154b2e8e2978ba65afbd224f4bbd64e2374a36 # HEAD https://github.com/fedora-selinux/selinux/83082eb446cfcb052d9971a483830014e5257d92
Patch: policycoreutils-rhat.patch Patch: policycoreutils-rhat.patch
Patch1: sepolgen-rhat.patch Patch1: sepolgen-rhat.patch
Patch100: policycoreutils-fix-semanage-python3.patch Patch100: policycoreutils-fix-semanage-python3.patch
@ -29,7 +29,7 @@ Provides: /sbin/restorecon
BuildRequires: pam-devel libcgroup-devel libsepol-static >= %{libsepolver} libsemanage-static >= %{libsemanagever} libselinux-devel >= %{libselinuxver} libcap-devel audit-libs-devel >= %{libauditver} gettext BuildRequires: pam-devel libcgroup-devel libsepol-static >= %{libsepolver} libsemanage-static >= %{libsemanagever} libselinux-devel >= %{libselinuxver} libcap-devel audit-libs-devel >= %{libauditver} gettext
BuildRequires: desktop-file-utils dbus-devel dbus-glib-devel BuildRequires: desktop-file-utils dbus-devel dbus-glib-devel
BuildRequires: python-devel python3-devel setools-devel >= 3.3.7-14 BuildRequires: python-devel python3-devel setools-devel >= 3.3.8-8.99
Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed
Requires: libsepol >= %{libsepolver} coreutils libselinux-utils >= %{libselinuxver} Requires: libsepol >= %{libsepolver} coreutils libselinux-utils >= %{libselinuxver}
@ -53,19 +53,21 @@ to switch roles.
# create selinux/ directory and extract %{SOURCE0} there # create selinux/ directory and extract %{SOURCE0} there
%setup -q -c -n selinux %setup -q -c -n selinux
%patch -p1 -b .policycoreutils-rhat %patch -p1 -b .policycoreutils-rhat
pushd policycoreutils-%{version} pushd policycoreutils-2.5-rc1
%patch100 -p2 -b .semanage-python3 %patch100 -p2 -b .semanage-python3
popd popd
cp %{SOURCE3} policycoreutils-%{version}/gui/ cp %{SOURCE3} policycoreutils-2.5-rc1/gui/
tar -xvf %{SOURCE4} -C policycoreutils-%{version}/ tar -xvf %{SOURCE4} -C policycoreutils-2.5-rc1/
# extract {%SOURCE1} in selinux/ directory # extract {%SOURCE1} in selinux/ directory
%setup -T -D -a 1 -n selinux %setup -T -D -a 1 -n selinux
%patch1 -p1 -b .sepolgen-rhat %patch1 -p1 -b .sepolgen-rhat
grep -l -r -E '^#! */usr/bin/python' | xargs -n 1 sed -i 's/\(^#! *\/usr\/bin\/python\)/\13/g'
%build %build
make -C policycoreutils-%{version} LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SEMODULE_PATH="/usr/sbin" all make -C policycoreutils-2.5-rc1 LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SEMODULE_PATH="/usr/sbin" all
make -C sepolgen-%{sepolgenver} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all make -C sepolgen-1.2.3-rc1 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags} -fPIE" LDFLAGS="-pie -Wl,-z,relro" all
%install %install
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
@ -75,14 +77,14 @@ mkdir -p %{buildroot}%{_mandir}/man5
mkdir -p %{buildroot}%{_mandir}/man8 mkdir -p %{buildroot}%{_mandir}/man8
%{__mkdir} -p %{buildroot}/%{_usr}/share/doc/%{name}/ %{__mkdir} -p %{buildroot}/%{_usr}/share/doc/%{name}/
make -C policycoreutils-%{version} LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" SEMODULE_PATH="/usr/sbin" install make -C policycoreutils-2.5-rc1 LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" SEMODULE_PATH="/usr/sbin" install
make -C policycoreutils-%{version} PYTHON=python3 LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" SEMODULE_PATH="/usr/sbin" install make -C policycoreutils-2.5-rc1 PYTHON=python3 LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" SEMODULE_PATH="/usr/sbin" install
# Systemd # Systemd
rm -rf %{buildroot}/%{_sysconfdir}/rc.d/init.d/restorecond rm -rf %{buildroot}/%{_sysconfdir}/rc.d/init.d/restorecond
make -C sepolgen-%{sepolgenver} DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" install make -C sepolgen-1.2.3-rc1 DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" install
make -C sepolgen-%{sepolgenver} PYTHON=python3 DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" install make -C sepolgen-1.2.3-rc1 PYTHON=python3 DESTDIR="%{buildroot}" SBINDIR="%{buildroot}%{_sbindir}" LIBDIR="%{buildroot}%{_libdir}" install
tar -jxf %{SOURCE2} -C %{buildroot}/ tar -jxf %{SOURCE2} -C %{buildroot}/
rm -f %{buildroot}/usr/share/man/ru/man8/genhomedircon.8.gz rm -f %{buildroot}/usr/share/man/ru/man8/genhomedircon.8.gz
@ -371,7 +373,7 @@ fi
%{_mandir}/ru/man1/secon.1* %{_mandir}/ru/man1/secon.1*
%{_mandir}/man8/genhomedircon.8* %{_mandir}/man8/genhomedircon.8*
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license policycoreutils-%{version}/COPYING %license policycoreutils-2.5-rc1/COPYING
%doc %{_usr}/share/doc/%{name} %doc %{_usr}/share/doc/%{name}
%package restorecond %package restorecond
@ -392,7 +394,7 @@ The policycoreutils-restorecond package contains the restorecond service.
%{_mandir}/man8/restorecond.8* %{_mandir}/man8/restorecond.8*
%{_mandir}/ru/man8/restorecond.8* %{_mandir}/ru/man8/restorecond.8*
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license policycoreutils-%{version}/COPYING %license policycoreutils-2.5-rc1/COPYING
%post restorecond %post restorecond
%systemd_post restorecond.service %systemd_post restorecond.service
@ -404,6 +406,9 @@ The policycoreutils-restorecond package contains the restorecond service.
%systemd_postun_with_restart restorecond.service %systemd_postun_with_restart restorecond.service
%changelog %changelog
* Fri Jan 08 2016 Petr Lautrbach <plautrba@redhat.com> 2.5-0.99.rc1.1
- Update to upstream rc1 release 2016-01-07
* Mon Dec 14 2015 Petr Lautrbach <plautrba@redhat.com> - 2.4-20 * Mon Dec 14 2015 Petr Lautrbach <plautrba@redhat.com> - 2.4-20
- Fix 'semanage permissive -l' subcommand (#1286325) - Fix 'semanage permissive -l' subcommand (#1286325)
- Several 'sepolicy gui' fixes (#1281309,#1281309,#1282382) - Several 'sepolicy gui' fixes (#1281309,#1281309,#1282382)

2552
sepolgen-rhat.patch
View File

File diff suppressed because it is too large Load Diff