4 files changed, 56 insertions, 55 deletions
diff --git a/system/containerd/README b/system/containerd/README
index 29bc5fbb2c..a67e40b450 100644
--- a/system/containerd/README
+++ b/system/containerd/README
@@ -1 +1,4 @@
-A daemon to control OCI container runtimes
+Containerd is a daemon to control runC, built for performance and
+density.  Containerd leverages runC's advanced features such as seccomp
+and user namespace support as well as checkpoint and restore for cloning
+and live migration of containers.
diff --git a/system/containerd/containerd.SlackBuild b/system/containerd/containerd.SlackBuild
index 298911d25c..ed538deaed 100644
--- a/system/containerd/containerd.SlackBuild
+++ b/system/containerd/containerd.SlackBuild
@@ -1,10 +1,31 @@
 #!/bin/sh
 
 # Slackware build script for containerd
-# 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=containerd
-VERSION=${VERSION:-0.2.3}
+VERSION=${VERSION:-0.2.3_977c511}
+GITHASH=${GITHASH:-977c511eda0925a723debdc94d09459af49d082a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -21,59 +42,36 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/containerd-${VERSION}.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+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 {} \;
 
-source /etc/profile.d/go.sh
+ln -sfn $TMP/$PRGNAM-$GITHASH vendor/src/github.com/docker/containerd
 
-unset GOPATH
-export GOPATH="${TMP}/${PRGNAM}-${VERSION}"
-mkdir -p src/github.com/docker
-cd src/github.com/docker/
-ln -rsf "${TMP}/${PRGNAM}-${VERSION}" containerd
-cd containerd
-LDFLAGS= make
+make \
+  BUILDTAGS="seccomp" \
+  GIT_COMMIT="$GITHASH" \
+  GOPATH=$TMP/$PRGNAM-$GITHASH:$TMP/$PRGNAM-$GITHASH/vendor
 
-cd src/github.com/docker/containerd/bin
-for file in $(find . -type f -print); do
-    echo ${file}
-    install -Dm755 ${file} ${PKG}/usr/bin/${file}
-    file=$(echo ${file} | sed 's/\.\///g')
-    if [[ "${file}" == "ctr" ]]; then
-        ln -s ${file} ${PKG}/usr/bin/docker-containerd-${file}
-    else
-        ln -s ${file} ${PKG}/usr/bin/docker-${file}
-    fi
-done
+# Install executables.
+mkdir -p $PKG/usr/bin
+install -D -m 0755 bin/containerd $PKG/usr/bin/containerd
+install -D -m 0755 bin/containerd-shim $PKG/usr/bin/containerd-shim
+install -D -m 0755 bin/ctr $PKG/usr/bin/ctr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md LICENSE.code LICENSE.docs NOTICE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/containerd/containerd.info b/system/containerd/containerd.info
index 901e78d511..ecb702ad90 100644
--- a/system/containerd/containerd.info
+++ b/system/containerd/containerd.info
@@ -1,10 +1,10 @@
 PRGNAM="containerd"
-VERSION="0.2.3"
-HOMEPAGE="https://github.com/docker/containerd"
+VERSION="0.2.3_977c511"
+HOMEPAGE="https://containerd.io/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/docker/containerd/archive/v0.2.3.tar.gz"
-MD5SUM_x86_64="aa2979c51960332878038147c420aa7d"
-REQUIRES="google-go-lang runc"
-MAINTAINER="Asaf Ohayon"
-EMAIL="asaf@sysbind.co.il"
+DOWNLOAD_x86_64="https://github.com/docker/containerd/archive/977c511/containerd-977c511eda0925a723debdc94d09459af49d082a.tar.gz"
+MD5SUM_x86_64="e5421e262710ee3196be8c54d52a065c"
+REQUIRES="runc"
+MAINTAINER="Audrius Kažukauskas"
+EMAIL="audrius@neutrino.lt"
diff --git a/system/containerd/slack-desc b/system/containerd/slack-desc
index ac266de253..d84a2a3eee 100644
--- a/system/containerd/slack-desc
+++ b/system/containerd/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-containerd: containerd (manager for applications in linux containers)
+containerd: containerd (a daemon to control runC)
 containerd:
-containerd: Containerd is an open-source project to easily create lightweight,
-containerd: portable, self-sufficient containers from any application. The same
-containerd: container that a developer builds and tests on a laptop can run at
-containerd: scale, in production, on VMs, bare metal, OpenStack clusters, public
-containerd: clouds and more.
+containerd: Containerd is a daemon to control runC, built for performance and
+containerd: density.  Containerd leverages runC's advanced features such as
+containerd: seccomp and user namespace support as well as checkpoint and restore
+containerd: for cloning and live migration of containers.
 containerd:
 containerd: Homepage: https://containerd.io/
 containerd:
 containerd:
+containerd: