From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3F949138CC4 for ; Sun, 29 Mar 2015 09:59:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39573E08C8; Sun, 29 Mar 2015 09:59:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8DFB6E08C8 for ; Sun, 29 Mar 2015 09:59:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8AABA340C10 for ; Sun, 29 Mar 2015 09:59:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1258D14C48 for ; Sun, 29 Mar 2015 09:59:39 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1427622925.68026ee4a044cb3664ff3ea64d534104928d78b8.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: / X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: .travis.yml X-VCS-Directories: / X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 68026ee4a044cb3664ff3ea64d534104928d78b8 X-VCS-Branch: master Date: Sun, 29 Mar 2015 09:59:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ba7daa10-8efd-489c-92a2-a1dd1932a6c5 X-Archives-Hash: b61e0344e84a23ccca4a25b2c8d76db7 commit: 68026ee4a044cb3664ff3ea64d534104928d78b8 Author: Jason Zaman perfinion com> AuthorDate: Wed Mar 25 16:37:18 2015 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sun Mar 29 09:55:25 2015 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=68026ee4 update travis file to newer userland (much faster) .travis.yml | 105 +++++++++++++++--------------------------------------------- 1 file changed, 26 insertions(+), 79 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce213a3..41c4a1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# Originally by Nicolas Iooss from: https://github.com/fishilico/selinux-refpolicy-patched/blob/travis-upstream/.travis.yml +# Derived from Nicolas Iooss: https://github.com/fishilico/selinux-refpolicy-patched/blob/travis-upstream/.travis.yml language: python python: @@ -8,105 +8,52 @@ python: # echo " - TYPE=$T DISTRO=$D DIRECT_INITRC=$I MONOLITHIC=$M" ; done ; done ; done ; done env: - TYPE=standard DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n - - TYPE=mls DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n + - TYPE=mls DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n + - TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n + - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n + - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n -# Install SELinux userspace utilities dependencies before_install: -# Show OS version information - lsb_release -a + - bison -V + - flex -V - sudo apt-get update -qq - - sudo apt-get install -qq libaudit-dev libcap-ng-dev libustr-dev swig - -# Compile and install a newer version of SELinux userspace utilities -install: - # Setup the directory where SELinux utilities will be installed - - export DESTDIR="$HOME/selinux-project" - - mkdir "$DESTDIR" - - export PATH="$DESTDIR/usr/bin:$DESTDIR/usr/sbin:$DESTDIR/bin:$DESTDIR/sbin:$PATH" - - export LD_LIBRARY_PATH="$DESTDIR/usr/lib:$DESTDIR/lib:$LD_LIBRARY_PATH" - - # On Ubuntu 12.04, default CFLAGS make the build fail in libsepol/cil with: - # error: declaration of 'index' shadows a global declarationo - # So define our own CFLAGS - - export CFLAGS="-O2 -pipe -fPIC -Wall" - # Download SELinux userspace tools and libraries - - wget https://github.com/SELinuxProject/selinux/archive/20140826-rc6.tar.gz - - tar -xzf 20140826-rc6.tar.gz - - mv selinux-20140826-rc6 selinux-src + # Install SELinux userspace utilities dependencies + - sudo apt-get install -qq libaudit-dev libcap-ng-dev libustr-dev libpcre3-dev swig - # Download setools - - wget https://github.com/TresysTechnology/setools3/archive/setools-3.3.8.tar.gz - - tar -xzf setools-3.3.8.tar.gz - - mv setools3-setools-3.3.8 setools-src +install: + # Download current SELinux userspace tools and libraries + - curl -sS -L https://github.com/SELinuxProject/selinux/archive/20150202.tar.gz | tar xz + - mv selinux-20150202 selinux-src # Ubuntu 12.04 coreutils is too old to provide "ln --relative" :( - sed 's/ln -sf --relative /ln -sf /' -i selinux-src/libsepol/src/Makefile - sed 's/ln -sf --relative /ln -sf /' -i selinux-src/libselinux/src/Makefile - # Compile and install SELinux libraries first - - make -C selinux-src/libsepol install - - make -C selinux-src/libselinux install - - make -C selinux-src/libsemanage install - - # Now that the libraries are installed, use them to compile the tools - - export CFLAGS="$CFLAGS -I$DESTDIR/usr/include" - - export LDFLAGS="$LDFLAGS -L$DESTDIR/usr/lib" + # Drop sepolicy to break setools dependence (sepolicy isn't used anyway) + - sed -i -e 's/sepolicy//' selinux-src/policycoreutils/Makefile - # Compile and install setools - - cd setools-src - - aclocal && autoreconf -if && automake - - ./configure - --prefix="$DESTDIR/usr" - --disable-gui --disable-swig-tcl - --disable-bwidget-check --disable-selinux-check - --with-sepol-devel="$DESTDIR/usr" - --with-selinux-devel="$DESTDIR/usr" - - make -C libqpol DESTDIR= install - - make -C libapol DESTDIR= install - - cd .. - - # Compile and install SELinux tools - - export LIBDIR="$DESTDIR/usr/lib" - - export LIBEXECDIR="$DESTDIR/usr/lib" - - export SHLIBDIR="$DESTDIR/usr/lib" - - export SEMODULE_PATH="$DESTDIR/usr/bin" - - make -C selinux-src/sepolgen install - - make -C selinux-src/checkpolicy install - - make -C selinux-src/policycoreutils install + # Compile and install SELinux toolchain + # 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 - # Use the newly-built toolchain - - export TEST_TOOLCHAIN="$DESTDIR" + # Drop build.conf settings to listen to env vars + - sed -r -i -e '/(DIRECT_INITRC|MONOLITHIC|TYPE|DISTRO)/d' build.conf -# XXX: not sure whether the definition in make command line are useful or whether the env definitions are enough -# Use a heartbeat loop to produce output while compiling the policy, which takes quite a long time. script: + - echo $TYPE $DISTRO $DIRECT_INITRC $MONOLITHIC - make bare - - make TYPE="$TYPE" MONOLITHIC="$MONOLITHIC" conf - -# - if [ "$MONOLITHIC" = y ]; then -# ( for A in $(seq 8) ; do sleep 300 ; echo "Heartbeat $((A*5)) minutes" ; done ) & -# make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=y ; -# fi -# - if [ "$MONOLITHIC" = y ]; then make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=y file_contexts ; fi -# - if [ "$MONOLITHIC" = y ]; then setfiles -c policy.$(checkpolicy -V | cut -d' ' -f1) file_contexts ; fi -# - if [ "$MONOLITHIC" = n ]; then make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=n base ; fi -# - if [ "$MONOLITHIC" = n ]; then make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=n modules ; fi -# - if [ "$MONOLITHIC" = n ]; then -# ( for A in $(seq 8) ; do sleep 300 ; echo "Heartbeat $((A*5)) minutes" ; done ) & -# make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=n validate ; -# fi - - - make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=n base - - make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=n modules - - ( for A in $(seq 8) ; do sleep 300 ; echo "Heartbeat $((A*5)) minutes" ; done ) & - make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=n validate + - make conf + - make + - make validate -# Only build travis branches branches: only: - /^travis-.*/ + - master notifications: email: false From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 45B93138CC4 for ; Sun, 29 Mar 2015 10:01:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C214E08CA; Sun, 29 Mar 2015 10:01:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9906EE08CA for ; Sun, 29 Mar 2015 10:01:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BFDF9340C10 for ; Sun, 29 Mar 2015 10:01:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17E8014C49 for ; Sun, 29 Mar 2015 10:01:27 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1427622925.68026ee4a044cb3664ff3ea64d534104928d78b8.perfinion@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:next commit in: / X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: .travis.yml X-VCS-Directories: / X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 68026ee4a044cb3664ff3ea64d534104928d78b8 X-VCS-Branch: next Date: Sun, 29 Mar 2015 10:01:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8dd0ed53-a068-481a-9108-1e990098de32 X-Archives-Hash: d82ca6e87cc27199eb92f44ab866e009 Message-ID: <20150329100127.9xQXBq_TqHZP9OcA9MCvC27xifPnV964jxED0KJ_F-c@z> commit: 68026ee4a044cb3664ff3ea64d534104928d78b8 Author: Jason Zaman perfinion com> AuthorDate: Wed Mar 25 16:37:18 2015 +0000 Commit: Jason Zaman gentoo org> CommitDate: Sun Mar 29 09:55:25 2015 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=68026ee4 update travis file to newer userland (much faster) .travis.yml | 105 +++++++++++++++--------------------------------------------- 1 file changed, 26 insertions(+), 79 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce213a3..41c4a1f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# Originally by Nicolas Iooss from: https://github.com/fishilico/selinux-refpolicy-patched/blob/travis-upstream/.travis.yml +# Derived from Nicolas Iooss: https://github.com/fishilico/selinux-refpolicy-patched/blob/travis-upstream/.travis.yml language: python python: @@ -8,105 +8,52 @@ python: # echo " - TYPE=$T DISTRO=$D DIRECT_INITRC=$I MONOLITHIC=$M" ; done ; done ; done ; done env: - TYPE=standard DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n - - TYPE=mls DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n + - TYPE=mls DISTRO=gentoo DIRECT_INITRC=n MONOLITHIC=n + - TYPE=standard DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n + - TYPE=mcs DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n + - TYPE=mls DISTRO=gentoo DIRECT_INITRC=y MONOLITHIC=n -# Install SELinux userspace utilities dependencies before_install: -# Show OS version information - lsb_release -a + - bison -V + - flex -V - sudo apt-get update -qq - - sudo apt-get install -qq libaudit-dev libcap-ng-dev libustr-dev swig - -# Compile and install a newer version of SELinux userspace utilities -install: - # Setup the directory where SELinux utilities will be installed - - export DESTDIR="$HOME/selinux-project" - - mkdir "$DESTDIR" - - export PATH="$DESTDIR/usr/bin:$DESTDIR/usr/sbin:$DESTDIR/bin:$DESTDIR/sbin:$PATH" - - export LD_LIBRARY_PATH="$DESTDIR/usr/lib:$DESTDIR/lib:$LD_LIBRARY_PATH" - - # On Ubuntu 12.04, default CFLAGS make the build fail in libsepol/cil with: - # error: declaration of 'index' shadows a global declarationo - # So define our own CFLAGS - - export CFLAGS="-O2 -pipe -fPIC -Wall" - # Download SELinux userspace tools and libraries - - wget https://github.com/SELinuxProject/selinux/archive/20140826-rc6.tar.gz - - tar -xzf 20140826-rc6.tar.gz - - mv selinux-20140826-rc6 selinux-src + # Install SELinux userspace utilities dependencies + - sudo apt-get install -qq libaudit-dev libcap-ng-dev libustr-dev libpcre3-dev swig - # Download setools - - wget https://github.com/TresysTechnology/setools3/archive/setools-3.3.8.tar.gz - - tar -xzf setools-3.3.8.tar.gz - - mv setools3-setools-3.3.8 setools-src +install: + # Download current SELinux userspace tools and libraries + - curl -sS -L https://github.com/SELinuxProject/selinux/archive/20150202.tar.gz | tar xz + - mv selinux-20150202 selinux-src # Ubuntu 12.04 coreutils is too old to provide "ln --relative" :( - sed 's/ln -sf --relative /ln -sf /' -i selinux-src/libsepol/src/Makefile - sed 's/ln -sf --relative /ln -sf /' -i selinux-src/libselinux/src/Makefile - # Compile and install SELinux libraries first - - make -C selinux-src/libsepol install - - make -C selinux-src/libselinux install - - make -C selinux-src/libsemanage install - - # Now that the libraries are installed, use them to compile the tools - - export CFLAGS="$CFLAGS -I$DESTDIR/usr/include" - - export LDFLAGS="$LDFLAGS -L$DESTDIR/usr/lib" + # Drop sepolicy to break setools dependence (sepolicy isn't used anyway) + - sed -i -e 's/sepolicy//' selinux-src/policycoreutils/Makefile - # Compile and install setools - - cd setools-src - - aclocal && autoreconf -if && automake - - ./configure - --prefix="$DESTDIR/usr" - --disable-gui --disable-swig-tcl - --disable-bwidget-check --disable-selinux-check - --with-sepol-devel="$DESTDIR/usr" - --with-selinux-devel="$DESTDIR/usr" - - make -C libqpol DESTDIR= install - - make -C libapol DESTDIR= install - - cd .. - - # Compile and install SELinux tools - - export LIBDIR="$DESTDIR/usr/lib" - - export LIBEXECDIR="$DESTDIR/usr/lib" - - export SHLIBDIR="$DESTDIR/usr/lib" - - export SEMODULE_PATH="$DESTDIR/usr/bin" - - make -C selinux-src/sepolgen install - - make -C selinux-src/checkpolicy install - - make -C selinux-src/policycoreutils install + # Compile and install SELinux toolchain + # 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 - # Use the newly-built toolchain - - export TEST_TOOLCHAIN="$DESTDIR" + # Drop build.conf settings to listen to env vars + - sed -r -i -e '/(DIRECT_INITRC|MONOLITHIC|TYPE|DISTRO)/d' build.conf -# XXX: not sure whether the definition in make command line are useful or whether the env definitions are enough -# Use a heartbeat loop to produce output while compiling the policy, which takes quite a long time. script: + - echo $TYPE $DISTRO $DIRECT_INITRC $MONOLITHIC - make bare - - make TYPE="$TYPE" MONOLITHIC="$MONOLITHIC" conf - -# - if [ "$MONOLITHIC" = y ]; then -# ( for A in $(seq 8) ; do sleep 300 ; echo "Heartbeat $((A*5)) minutes" ; done ) & -# make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=y ; -# fi -# - if [ "$MONOLITHIC" = y ]; then make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=y file_contexts ; fi -# - if [ "$MONOLITHIC" = y ]; then setfiles -c policy.$(checkpolicy -V | cut -d' ' -f1) file_contexts ; fi -# - if [ "$MONOLITHIC" = n ]; then make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=n base ; fi -# - if [ "$MONOLITHIC" = n ]; then make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=n modules ; fi -# - if [ "$MONOLITHIC" = n ]; then -# ( for A in $(seq 8) ; do sleep 300 ; echo "Heartbeat $((A*5)) minutes" ; done ) & -# make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=n validate ; -# fi - - - make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=n base - - make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=n modules - - ( for A in $(seq 8) ; do sleep 300 ; echo "Heartbeat $((A*5)) minutes" ; done ) & - make TYPE="$TYPE" DISTRO="$DISTRO" DIRECT_INITRC="$DIRECT_INITRC" MONOLITHIC=n validate + - make conf + - make + - make validate -# Only build travis branches branches: only: - /^travis-.*/ + - master notifications: email: false