@@ -4,7 +4,7 @@

 FROM debian:jessie

-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 ENV GO_VERSION 1.5.1

 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -4,7 +4,7 @@

 FROM debian:stretch

-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 ENV GO_VERSION 1.5.1

 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -4,7 +4,7 @@

 FROM debian:wheezy-backports

-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools/wheezy-backports build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools/wheezy-backports build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 ENV GO_VERSION 1.5.1

 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -56,6 +56,7 @@ for version in "${versions[@]}"; do

 		git # for "git commit" info in "docker -v"

 		libapparmor-dev # for "sys/apparmor.h"

 		libdevmapper-dev # for "libdevmapper.h"

+		libltdl-dev # for pkcs11 "ltdl.h"

 		libsqlite3-dev # for "sqlite3.h"

 	)

 	# packaging for "sd-journal.h" and libraries varies

@@ -4,7 +4,7 @@

 FROM ubuntu:precise

-RUN apt-get update && apt-get install -y apparmor bash-completion  build-essential curl ca-certificates debhelper dh-apparmor  git libapparmor-dev  libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

+RUN apt-get update && apt-get install -y apparmor bash-completion  build-essential curl ca-certificates debhelper dh-apparmor  git libapparmor-dev  libltdl-dev libsqlite3-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 ENV GO_VERSION 1.5.1

 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -4,7 +4,7 @@

 FROM ubuntu:trusty

-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 ENV GO_VERSION 1.5.1

 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -4,7 +4,7 @@

 FROM ubuntu:vivid

-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 ENV GO_VERSION 1.5.1

 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -4,7 +4,7 @@

 FROM ubuntu:wily

-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libsqlite3-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 ENV GO_VERSION 1.5.1

 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -6,7 +6,7 @@ FROM centos:7

 RUN yum groupinstall -y "Development Tools"

 RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs

-RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar

+RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libltdl-devel libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar

 ENV GO_VERSION 1.5.1

 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -5,7 +5,7 @@

 FROM fedora:21

 RUN yum install -y @development-tools fedora-packager

-RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar

+RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libltdl-devel libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar

 ENV GO_VERSION 1.5.1

 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -5,7 +5,7 @@

 FROM fedora:22

 RUN dnf install -y @development-tools fedora-packager

-RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar

+RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libltdl-devel libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar

 ENV GO_VERSION 1.5.1

 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -65,6 +65,7 @@ for version in "${versions[@]}"; do

 		btrfs-progs-devel # for "btrfs/ioctl.h" (and "version.h" if possible)

 		device-mapper-devel # for "libdevmapper.h"

 		glibc-static

+		libltdl-devel # for pkcs11 "ltdl.h"

 		libselinux-devel # for "libselinux.so"

 		selinux-policy

 		selinux-policy-devel

@@ -5,7 +5,7 @@

 FROM opensuse:13.2

 RUN zypper --non-interactive install ca-certificates* curl gzip rpm-build

-RUN zypper --non-interactive install libbtrfs-devel device-mapper-devel glibc-static libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar

+RUN zypper --non-interactive install libbtrfs-devel device-mapper-devel glibc-static libltdl-devel libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar

 ENV GO_VERSION 1.5.1

 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -5,7 +5,7 @@

 FROM oraclelinux:6

 RUN yum groupinstall -y "Development Tools"

-RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar

+RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libltdl-devel libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar

 ENV GO_VERSION 1.5.1

 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -5,7 +5,7 @@

 FROM oraclelinux:7

 RUN yum groupinstall -y "Development Tools"

-RUN yum install -y --enablerepo=ol7_optional_latest btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar

+RUN yum install -y --enablerepo=ol7_optional_latest btrfs-progs-devel device-mapper-devel glibc-static libltdl-devel libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar

 ENV GO_VERSION 1.5.1

 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -53,7 +53,7 @@ echo_docker_as_nonroot() {

 # Check if this is a forked Linux distro

 check_forked() {

-	

+

 	# Check for lsb_release command existence, it usually exists in forked distros

 	if command_exists lsb_release; then

 		# Check if the `-u` option is supported

@@ -12,7 +12,8 @@ Recommends: aufs-tools,

             cgroupfs-mount | cgroup-lite,

             git,

             xz-utils,

-            ${apparmor:Recommends}

+            ${apparmor:Recommends},

+            ${yubico:Recommends}

 Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package

 Description: Docker: the open-source application container engine

  Docker is an open source project to build, ship and run any application as a

@@ -5,6 +5,8 @@ VERSION = $(shell cat VERSION)

 override_dh_gencontrol:

 	# if we're on Ubuntu, we need to Recommends: apparmor

 	echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker-engine.substvars

+	# if we are building experimental we reccomend yubico-piv-tool

+	echo 'yubico:Recommends=$(shell [ "$DOCKER_EXPERIMENTAL" ] && echo "yubico-piv-tool (>= 1.1.0~)")' >> debian/docker-engine.substvars

 	dh_gencontrol

 override_dh_auto_build:

@@ -58,6 +58,13 @@ Requires: device-mapper >= 1.02.90-2

 %global with_selinux 1

 %endif

+%if 0%{?_experimental}

+# yubico-piv-tool conditional

+%if 0%{?fedora} >= 20 || 0%{?centos} >= 7 || 0%{?rhel} >= 7

+Requires: yubico-piv-tool >= 1.1.0

+%endif

+%endif

+

 # start if with_selinux

 %if 0%{?with_selinux}

 # Version of SELinux we were using

@@ -94,7 +94,13 @@ set -e

 			cat >> "$DEST/$version/Dockerfile.build" <<-EOF

 				RUN tar -cz -C /usr/src/${rpmName}/contrib -f /root/rpmbuild/SOURCES/${rpmName}-selinux.tar.gz ${rpmName}-selinux

 				RUN { echo '* $rpmDate $rpmPackager $rpmVersion-$rpmRelease'; echo '* Version: $VERSION'; } >> ${rpmName}-selinux.spec && tail >&2 ${rpmName}-selinux.spec

-				RUN rpmbuild -ba --define '_gitcommit $DOCKER_GITCOMMIT' --define '_release $rpmRelease' --define '_version $rpmVersion' --define '_origversion $VERSION' ${rpmName}-selinux.spec

+				RUN rpmbuild -ba \

+						--define '_gitcommit $DOCKER_GITCOMMIT' \

+						--define '_release $rpmRelease' \

+						--define '_version $rpmVersion' \

+						--define '_origversion $VERSION' \

+						--define '_experimental ${DOCKER_EXPERIMENTAL:-0}' \

+						${rpmName}-selinux.spec

 			EOF

 		fi

 		tempImage="docker-temp/build-rpm:$version"

@@ -58,6 +58,7 @@ To build the Docker daemon, you will additionally need:

   2.02.89 or later

 * btrfs-progs version 3.16.1 or later (unless using an older version is

   absolutely necessary, in which case 3.8 is the minimum)

+* yubico-piv-tool version 1.1.0 or later (for experimental)

 Be sure to also check out Docker's Dockerfile for the most up-to-date list of

 these build-time dependencies.