4 files changed, 55 insertions, 47 deletions
diff --git a/system/runc/README b/system/runc/README
index ad58f04eafb3..b2cca2a1f587 100644
--- a/system/runc/README
+++ b/system/runc/README
@@ -1,16 +1,9 @@
-runC is a CLI tool for spawning and running containers according to the OCP
-specification. The code can be found on Github.
-
-Embeddable
-
-Containers are started as a child process of runC and can be embedded into
-various other systems without having to run a Docker daemon.
-
-Battle Hardened
-
-runC is built on libcontainer, the same container technology powering millions
-of Docker Engine installations.
-
-Compatible with Docker
+runC is a CLI tool for spawning and running containers according to the
+OCI specification.  Containers are started as a child process of runC
+and can be embedded into various other systems without having to run a
+daemon.  runC is built on libcontainer, the same container technology
+powering millions of Docker Engine installations.  runC does not force
+you to have a particular workflow or deployment setup, it only requires
+a root filesystem and configuration.
 
 Docker images can be run with runC.
diff --git a/system/runc/runc.SlackBuild b/system/runc/runc.SlackBuild
index ad776fd62791..6d1d2ffd16cc 100644
--- a/system/runc/runc.SlackBuild
+++ b/system/runc/runc.SlackBuild
@@ -2,15 +2,33 @@
 
 # Slackware build script for runc
 
-# Written by Asaf Ohayon <asaf@sysbind.co.il>
+# Copyright 2016 Asaf Ohayon <asaf@sysbind.co.il>
+# Copyright 2017 Audrius Kažukauskas <audrius@neutrino.lt>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=runc
-VERSION=${VERSION:-1.0.0_rc1}
-SRCVER=$(echo $VERSION | tr _ -)
+VERSION=${VERSION:-1.0.0_rc2_a01dafd}
+GITHASH=${GITHASH:-a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -24,33 +42,30 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVER
-tar xvf $CWD/v${SRCVER} || tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM-$SRCVER
+rm -rf $PRGNAM-$GITHASH
+tar xvf $CWD/$PRGNAM-$GITHASH.tar.gz
+cd $PRGNAM-$GITHASH
 chown -R root:root .
-# the have symlinks in their testdata that goes outside the context of this build
-find -L . ! -type l \
+find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o ! -type l \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-unset GOPATH
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-source /etc/profile.d/go.sh
+# Do not try to get git commit hash, there is no git repo available.
+sed -i 's/^COMMIT/# COMMIT/' Makefile
 
-make
-mkdir -p  ${PKG}/usr/bin
-mv runc ${PKG}/usr/bin/docker-runc
+make COMMIT="$GITHASH"
+make install BINDIR=$PKG/usr/bin
+make install-bash PREFIX=$PKG/usr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a MAINTAINERS LICENSE README.md NOTICE VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE MAINTAINERS NOTICE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/runc/runc.info b/system/runc/runc.info
index ba6618d2de50..a123d4e134f2 100644
--- a/system/runc/runc.info
+++ b/system/runc/runc.info
@@ -1,10 +1,10 @@
 PRGNAM="runc"
-VERSION="1.0.0_rc1"
-HOMEPAGE="https://runc.io"
+VERSION="1.0.0_rc2_a01dafd"
+HOMEPAGE="https://runc.io/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://codeload.github.com/opencontainers/runc/tar.gz/v1.0.0-rc1"
-MD5SUM_x86_64="aa1dcbfe78af882209c34184c25ea487"	
+DOWNLOAD_x86_64="https://github.com/opencontainers/runc/archive/a01dafd/runc-a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70.tar.gz"
+MD5SUM_x86_64="6813769675472f20f06c64d61628897a"
 REQUIRES="google-go-lang libseccomp"
-MAINTAINER="Asaf Ohayon"
-EMAIL="asaf@sysbind.co.il"
+MAINTAINER="Audrius Kažukauskas"
+EMAIL="audrius@neutrino.lt"
diff --git a/system/runc/slack-desc b/system/runc/slack-desc
index 10cceebfb55a..1d9634db7c85 100644
--- a/system/runc/slack-desc
+++ b/system/runc/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
     |-----handy-ruler------------------------------------------------------|
-runc: runc (lightweight portable containers)
+runc: runc (a CLI tool for spawning and running containers)
 runc:
-runc: runc is a CLI tool for spawning and running containers according to
-runc: the OCP specification. runc is an open-source project to easily
-runc: create lightweight, portable, self-sufficient containers from any
-runc: application. The same container that a developer builds and tests on
-runc: a laptop can run at scale, in production, on VMs, bare metal,
-runc: OpenStack clusters, public clouds and more.
+runc: runC is a CLI tool for spawning and running containers according to
+runc: the OCI specification.  Containers are started as a child process of
+runc: runC and can be embedded into various other systems without having to
+runc: run a daemon.  runC is built on libcontainer, the same container
+runc: technology powering millions of Docker Engine installations.  runC
+runc: does not force you to have a particular workflow or deployment setup
+runc: it only requires a root filesystem and configuration.
 runc:
 runc: Homepage: https://runc.io/
-runc: