From 42b316f75672c7cba0ff8c72ba4ad36033b03695 Mon Sep 17 00:00:00 2001
From: Nicolas Iooss <nicolas.iooss@m4x.org>
Date: Sat, 27 Aug 2016 17:08:57 +0200
Subject: [PATCH] Make Travis-CI build without using sudo

This makes migrating to container-based infrastructure much easier (all
that is needed is adding "sudo: false" in the file).

Moreover installing the toolchain in a user directory fixes issues when
using the Trusty Beta environment: this toolchain broke the
already-installed Ubuntu packages (with for example policy version
issues between setfiles and checkpolicy). As the packaged tools (version
2.2) are much slower than the latest toolchain release on Trusty, it is
better to keep using the latest release.

As libcap-ng-dev package is not (yet? [1]) whitelisted in Travis-CI
container infrastructure, drop this package and do not build
policycoreutils/sandbox. Do not build policycoreutils/restorecond too as
it requires glib to be installed.

While at it, set the language as "generic" instead of "python".

[1] https://github.com/travis-ci/apt-package-whitelist/issues/1096

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
---
 .travis.yml | 43 +++++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e06ad19fb..de201f47b 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
 # Derived from Nicolas Iooss: https://github.com/fishilico/selinux-refpolicy-patched/blob/travis-upstream/.travis.yml
 
-language: python
-python:
- - "2.7"
+language: generic
 
 env:
   - TYPE=standard DISTRO=redhat MONOLITHIC=y SYSTEMD=y
@@ -24,14 +22,30 @@ env:
   - TYPE=mls DISTRO=gentoo MONOLITHIC=y SYSTEMD=n
   - TYPE=mls DISTRO=gentoo MONOLITHIC=n SYSTEMD=n
 
-before_install:
+# Uncomment to use Travis-CI container infrastructure (https://docs.travis-ci.com/user/ci-environment/)
+#sudo: false
+
+# Uncomment these two lines to use Travis-CI Trusty Beta environment
+#sudo: required
+#dist: trusty
+
+addons:
+  apt:
+    packages:
+    # Install SELinux userspace utilities dependencies
+    - bison
+    - flex
+    - gettext
+    - libaudit-dev
+    - libbz2-dev
+    - libustr-dev
+    - libpcre3-dev
+    - swig
+
+install:
   - lsb_release -a
   - bison -V
   - flex -V
-  - sudo apt-get update -qq
-
-  # Install SELinux userspace utilities dependencies
-  - sudo apt-get install -qq libaudit-dev libcap-ng-dev libustr-dev libpcre3-dev swig
 
   # Download current SELinux userspace tools and libraries
   - curl -sS -L https://github.com/SELinuxProject/selinux/archive/20160223.tar.gz | tar xz
@@ -47,10 +61,19 @@ before_install:
   # Drop sepolicy to break setools dependence (sepolicy isn't used anyway)
   - sed -i -e 's/sepolicy//' selinux-src/policycoreutils/Makefile
 
-  # Compile and install SELinux toolchain
+  # Drop restorecond to break glib dependence
+  - sed -i -e 's/ restorecond//' selinux-src/policycoreutils/Makefile
+
+  # Drop sandbox to break libcap-ng dependence
+  - sed -i -e 's/ sandbox//' selinux-src/policycoreutils/Makefile
+
+  # Compile and install SELinux toolchain into ~/selinux
   # On Ubuntu 12.04, default CFLAGS make the build fail in libsepol/cil with:
   #    error: declaration of 'index' shadows a global declarationo
-  - sudo make CFLAGS="-O2 -pipe -fPIC -Wall" -C selinux-src install
+  - make "DESTDIR=$HOME/selinux" CFLAGS="-O2 -pipe -fPIC -Wall -I$HOME/selinux/usr/include" -C selinux-src install
+
+  # Use TEST_TOOLCHAIN variable to tell refpolicy Makefile about the installed location
+  - export TEST_TOOLCHAIN="$HOME/selinux"
 
   # Drop build.conf settings to listen to env vars
   - sed -r -i -e '/(MONOLITHIC|TYPE|DISTRO|SYSTEMD)/d' build.conf