commit:     b05fd6b11dc292faad625280ff1af3099346295c
Author:     Chris PeBenito <pebenito <AT> ieee <DOT> org>
AuthorDate: Thu May 31 21:41:59 2018 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 09:21:01 2018 +0000
URL:        
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=b05fd6b1

Switch all remaining Python references to the Python 3 interpreter.

 INSTALL                                     | 2 +-
 Makefile                                    | 2 +-
 Vagrantfile                                 | 1 -
 support/Makefile.devel                      | 2 +-
 support/selinux-policy-refpolicy.spec       | 2 +-
 support/selinux-refpolicy-sources.spec.skel | 6 ++++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/INSTALL b/INSTALL
index c56ae479..013bc23f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,7 +3,7 @@ Reference Policy has the following build requirements:
        * libsemanage 2.6
        * checkpolicy 2.6
        * policycoreutils 2.6
-       * Python >= 2.6
+       * Python >= 3.4
        * GCC
 
 To install Reference Policy sources into /etc/selinux/refpolicy/src/policy:

diff --git a/Makefile b/Makefile
index 89387367..1447f5b1 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ AWK ?= gawk
 GREP ?= egrep
 INSTALL ?= install
 M4 ?= m4 -E -E
-PYTHON ?= python -t -t -E -W error
+PYTHON ?= python3 -t -t -E -W error
 SED ?= sed
 SORT ?= LC_ALL=C sort
 UMASK ?= umask

diff --git a/Vagrantfile b/Vagrantfile
index 129de68a..b01db622 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -36,7 +36,6 @@ Vagrant.configure("2") do |config|
       make \
       kernel-devel \
       selinux-policy-devel \
-      libselinux-python \
       libselinux-python3 \
       >/dev/null
 

diff --git a/support/Makefile.devel b/support/Makefile.devel
index d531dd88..bcca2d98 100644
--- a/support/Makefile.devel
+++ b/support/Makefile.devel
@@ -5,7 +5,7 @@ INSTALL ?= install
 M4 ?= m4
 SED ?= sed
 EINFO ?= echo
-PYTHON ?= python
+PYTHON ?= python3
 CUT ?= cut
 
 NAME ?= $(strip $(shell $(AWK) -F= '/^SELINUXTYPE/{ print $$2 }' 
/etc/selinux/config))

diff --git a/support/selinux-policy-refpolicy.spec 
b/support/selinux-policy-refpolicy.spec
index f06d2e79..83f3a800 100644
--- a/support/selinux-policy-refpolicy.spec
+++ b/support/selinux-policy-refpolicy.spec
@@ -18,7 +18,7 @@ BuildArch: noarch
 # FIXME Need to ensure these have correct versions
 BuildRequires: checkpolicy >= 2.1.8
 BuildRequires: policycoreutils >= 2.1.10
-BuildRequires: python >= 2.6
+BuildRequires: python >= 3.4
 BuildRequires: libsepol >= 2.1.4
 BuildRequires: libsemanage >= 2.0.29
 BuildRequires: m4 make gcc

diff --git a/support/selinux-refpolicy-sources.spec.skel 
b/support/selinux-refpolicy-sources.spec.skel
index 8a6dbe2e..ee7cbd1e 100644
--- a/support/selinux-refpolicy-sources.spec.skel
+++ b/support/selinux-refpolicy-sources.spec.skel
@@ -11,8 +11,10 @@ License: GPL
 Group: System Environment/Base
 PreReq: m4 make policycoreutils kernel gcc
 Requires: checkpolicy >= 1.33.1
-Requires: python make m4
-BuildRequires: make m4 python
+Requires: python >= 3.4
+Requires: make m4
+BuildRequires: make m4
+BuildRequires: python >= 3.4
 Obsoletes: policy-sources
 Source: refpolicy-%{version}.tar.bz2
 Url: http://oss.tresys.com/projects/refpolicy

Reply via email to