1.1.0 update

Package-Manager: portage-2.2.10/cvs/Linux x86_64

3 files changed, 240 insertions, 2 deletions

diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index ac76f9995ada..0b3b8ccbda83 100644
--- a/app-emulation/docker/ChangeLog
+++ b/app-emulation/docker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/docker
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.24 2014/06/29 02:00:39 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.25 2014/07/04 04:00:48 gregkh Exp $
+
+*docker-1.1.0 (04 Jul 2014)
+
+  04 Jul 2014; Greg Kroah-Hartman <gregkh@gentoo.org> +docker-1.1.0.ebuild:
+  1.1.0 update
 
 *docker-1.0.1 (29 Jun 2014)
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index d823a46f8e17..266cb4cbcfac 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -15,6 +15,7 @@ DIST docker-0.9.0.zip 3028848 SHA256 583759783fb48dc30615b3d2bad8a0e21f69c8759c1
 DIST docker-0.9.1.zip 3033807 SHA256 1ba631959aca1a07ab38204743784b5bd591319f0b4591f553f3fcb969bddc81 SHA512 8e34857f3ee75e65d65ef0f4c4bc4326919cc9d126cc839526a7d5d7781f64e388d607e02eb25aef974db0e87c219c7b112ca75cdcc6e86fa389c1598729b23c WHIRLPOOL 6893c313c2855fed31a696d29b8eed1ab1b64cdd280561bad8510bce1e77f3651cb771c867b18b831c5f1cc4f288ac0382b46c0ab5d9fc2af86d34ddd1cb5eda
 DIST docker-1.0.0.zip 8216390 SHA256 7552e1e02ed25c328c1c70820951fba144715bb3e2633d874f5635238745470c SHA512 4a39c84cbf6a62d930b5e0e6005fb5bc84c954789319edd6a199788e1185a014f570977cd728190e447196c70ca3710d1a4b049f9ec8099dbb6f7df26896b426 WHIRLPOOL a9dc0d0d9bec1465316c37280070740cb78f671b6610ac25605bd0f88823eed3e68443e020f2b77d3ca18f12e5d89887a95f0970d56b875c85988bc86afb801d
 DIST docker-1.0.1.zip 7048834 SHA256 5c60bafffd446cc2171d4126abe5a8092dcbdea4e844e9a0118a8fc211898646 SHA512 ab4161caaf6f92cd80d694bb8cde96efd9667752a084838744eda5194f242eb95f56d1e08a6b91f6eb54f539b0e625100f047d2092fb0cf0795c4e503115969c WHIRLPOOL 8718ad79827a1c514cd9fd9f2718389f0cd1ab2c5960847b478311e69ca9288cd07df8e92c139ab0a17911803ee2a9e6b1020542139425300dcad49f8bcfd343
+DIST docker-1.1.0.zip 7083014 SHA256 5b3d4652946e8228ec6c0c7d7702b886f5c8f221a565e48eb2c08e88673c4627 SHA512 8c5360133f7632d04b8d773c492b2cc2ac49d55b6d4a7a878695049c458fec593c91b93b221485267fea299042398084134cb8db72301302c3bb376cd7ed3563 WHIRLPOOL 6a14f2557ffe9cccd986a2cf0abe176c29563db9e7e953ca5e05d7f57cf90ed33a572596c559db9e85aecc8a7a99b0ac885b4d0c1d476aee8207888b475c43bf
 EBUILD docker-0.10.0.ebuild 5358 SHA256 1212edaf2c347152f842d9d2b7a390ea60b43a05e5bb5430fafa520c734caf5f SHA512 c3f2e08ac2f2b958d9aaad173fac98b0c8f0109da1127cb44d1b2be3520b311b564612cd939d2896dcc2b02eff6058c4a37233525f3e878d954b7fc5a42c6d6f WHIRLPOOL 0455a41b0e8ec53eca3dbd568ecce66e42e793660f71ee9f72071c3c8a57c93b5fe3af17f2a6a0228b1d50130a71baf0b11b5184dcb3c52c4ec7e8b81534f1f9
 EBUILD docker-0.11.1.ebuild 5432 SHA256 776e8fd2b7c23986dd50b77f18e473897924e8459a9eff5250ebabe0aca3a37a SHA512 074b98fe11d07688df57df5269ad0433b3d18e1639ac7b7b63ec40abec348170b42700d3dcb5295d16b4a7775948fa1c62300348669828509b877b96a3ed528d WHIRLPOOL 96e7d8675b3c03c4590e07ec81de08bd0960ed852df73be56e0618781374be88bf071921a19c1ceac557c2a5285e94996e5219b2949b5a9ba348991b778dd071
 EBUILD docker-0.7.1-r1.ebuild 4523 SHA256 58a8f31b2764c0e75fd053a76914bfc7c1c97c0826a4f0796459da27a8175ba3 SHA512 ac6203f6155cdc1194842a90d6b3f6d2cebc4c463de677b97cee405f0cd2aeaea02c233d006c222641c0afa78ba90e5c20c4057d9a1d22f47a683237a611ae31 WHIRLPOOL d2bc58fab76fe2a211aa5301ad9a5d058c42918de3a2729d11cbeb569a4a9044d3af0e6d6e772bf2b0d85220311b5ecc8725d5a833188d9790f01d1872c805a9
@@ -30,5 +31,6 @@ EBUILD docker-0.9.0.ebuild 4935 SHA256 e373e971d144effaa68a3b3a518c18e1a706e67dc
 EBUILD docker-0.9.1.ebuild 4901 SHA256 8b1b8027f2ad4bb14c4604aa99f655a01e54f788a39c33c5efcb65ced4166d91 SHA512 d84dc9c8af1d055f2125de726c2a6ccbde1c20ec1d23fc84f315e43c695ba92aac2cad27605a3527472b7c1e4b491f485b0416ec58752c1df82a5b1dc761563d WHIRLPOOL 073458d66e848c554100106b25e44dc05e9017c6f1ab682aaea7f9f94c8feab8977017e4ec319aa636ccd5522c693308c18ba1f3a5f522bb27d20e283efff3ec
 EBUILD docker-1.0.0.ebuild 5499 SHA256 66beece464a9b6968e9751aedcc5ba3f6ffa2ceff620271171e3c95e15ae515f SHA512 3dbd29e3479f0556503c78256c1d67604ddb32b8fdff7225fcd56bfbfe366d45ec3efae4c605378507eae1db6152e50d69e0c73d3aa637e0c71f26f29aebcfb7 WHIRLPOOL ed9b897ce0136363f5ceacc7e12361fbce09c16ddd951d8db206c7d5c92f2fd9e97096563b92f5389689da243bf47b65ee21defd1e559911f7a530e30016ee97
 EBUILD docker-1.0.1.ebuild 5499 SHA256 3fbcda53bbd56c917ca73b88ca92b560496a06912f7789d96d4566043d5d1a7f SHA512 7daf287d251f7e419e376a5bd6b37c2bf8cacd3681bff66a2711a7de337699344148f7fe4ea9fbcc396ebcfe7f05cb82f65e8197d2520d603bed2aad41cac63b WHIRLPOOL 7d87926894e90cb04f5b2bc6ef49a78e6daa5e6e166a7dd446939b6c1374a7b8f664622925b63003684f92b6e99ba9a2ee766e74ad44fbda02902122b2845eed
-MISC ChangeLog 3648 SHA256 c53c33116e5dd949bbfaff2712281cfac61204f51b295c168dc05b07fc9fca84 SHA512 082b8b8971fb4ea2d1218fe43735fa42aec6c8d73cea03c1b17b1aee13771a1548e9cd129cec049bf2783a6dc4c772836aa735c212c285b1acf726ee14b0410d WHIRLPOOL fb9206ebd11e7c6e3d583a59dcb6940d4c567a2c55b373726412f073ff1a4f0ef9a1fee5514008529aeb67993941261e6e8f043680377fa54157e11b147e2647
+EBUILD docker-1.1.0.ebuild 5397 SHA256 c7044ce0eda118de74e83a72d05196d56fda50902a55fd274a54466f9453d88e SHA512 30299be8cadd7c3cd6c02ffbc60fb026ac3e6025c5d5db8d4d8446ae67181ac7911cb1800b96645bbbee85316d8083aafc99284771698c9cc614004c32ef5eaf WHIRLPOOL f8ec8f9bcb7ca132f8e0661c451e6cad44de77aa164de596bafc362f6ad9e1c9e0d0534b64c5ffc749f75543d4d80eec870cd00a64601071bbf85de913a45904
+MISC ChangeLog 3769 SHA256 85366ad64c5ba6a791306db561f5ca86c949091687e0bafc4c4e83d636a21379 SHA512 70d03b631941d1e5e86a1be183320fea805b21568cfe67b3d1f9039f764250d083ee2acb8e6514a0b64a629d3c7abfb10e55ca47131b7c2f090ee7a4fd95c31b WHIRLPOOL 4cf13aa628a1d101a5002ec0bf5192158e274f681e0fa8bae7eda4e0c0a757291517be939c2ee0d3807b9b8b4f4f62ee2a16228156ce11c8e58c890f52566ea3
 MISC metadata.xml 1179 SHA256 dbc759ab11f70bb6406d176f3e0c81136589d74d2b7543a1541903db59f1030b SHA512 fe0081a73acccc0cdc46b74f2cd992839e795de3fddab527c67c64759c9722c898119e63a27849f873d894c346ab507f8a127a18ffc8f23848d911e967930982 WHIRLPOOL e8898cddccc2406f8d1883bcdaeadded42c422c6c3679b856b2961afeb35b8282c6425d02d0b32d0afaffab7965b2d1298a31f955327e1146d736ee92010aa7d
diff --git a/app-emulation/docker/docker-1.1.0.ebuild b/app-emulation/docker/docker-1.1.0.ebuild
new file mode 100644
index 000000000000..2a5f8f48fd4d
--- /dev/null
+++ b/app-emulation/docker/docker-1.1.0.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.1.0.ebuild,v 1.1 2014/07/04 04:00:48 gregkh Exp $
+
+EAPI=5
+
+DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level."
+HOMEPAGE="https://www.docker.io/"
+
+GITHUB_URI="github.com/dotcloud/docker"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	EGIT_REPO_URI="git://${GITHUB_URI}.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip"
+	DOCKER_GITCOMMIT="79812e3"
+	KEYWORDS="~amd64"
+	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
+fi
+
+inherit bash-completion-r1 linux-info systemd udev user
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="aufs btrfs +contrib +device-mapper doc lxc vim-syntax zsh-completion"
+
+CDEPEND="
+	>=dev-db/sqlite-3.7.9:3
+	device-mapper? (
+		sys-fs/lvm2[thin]
+	)
+"
+DEPEND="
+	${CDEPEND}
+	>=dev-lang/go-1.2
+	btrfs? (
+		>=sys-fs/btrfs-progs-0.20
+	)
+	dev-vcs/git
+	dev-vcs/mercurial
+"
+RDEPEND="
+	${CDEPEND}
+	!app-emulation/docker-bin
+	>=net-firewall/iptables-1.4
+	lxc? (
+		>=app-emulation/lxc-1.0
+	)
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	aufs? (
+		|| (
+			sys-fs/aufs3
+			sys-kernel/aufs-sources
+		)
+	)
+"
+
+RESTRICT="installsources strip"
+
+pkg_setup() {
+	if kernel_is lt 3 8; then
+		ewarn ""
+		ewarn "Using Docker with kernels older than 3.8 is unstable and unsupported."
+		ewarn ""
+	fi
+
+	# many of these were borrowed from the app-emulation/lxc ebuild
+	CONFIG_CHECK+="
+		~CGROUPS
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_SCHED
+		~CPUSETS
+		~MEMCG_SWAP
+		~RESOURCE_COUNTERS
+
+		~IPC_NS
+		~NAMESPACES
+		~PID_NS
+
+		~DEVPTS_MULTIPLE_INSTANCES
+		~MACVLAN
+		~NET_NS
+		~UTS_NS
+		~VETH
+
+		~!NETPRIO_CGROUP
+		~POSIX_MQUEUE
+
+		~BRIDGE
+		~IP_NF_TARGET_MASQUERADE
+		~NETFILTER_XT_MATCH_ADDRTYPE
+		~NETFILTER_XT_MATCH_CONNTRACK
+		~NF_NAT
+		~NF_NAT_NEEDED
+
+		~!GRKERNSEC_CHROOT_CAPS
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_PIVOT
+	"
+
+	ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
+
+	for c in GRKERNSEC_CHROOT_MOUNT GRKERNSEC_CHROOT_DOUBLE GRKERNSEC_CHROOT_PIVOT GRKERNSEC_CHROOT_CHMOD; do
+		declare "ERROR_$c"="CONFIG_$c: see app-emulation/lxc postinst notes for why some GRSEC features make containers unusuable"
+	done
+
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM
+			~DM_THIN_PROVISIONING
+			~EXT4_FS
+		"
+	fi
+
+	check_extra_config
+}
+
+src_compile() {
+	# if we treat them right, Docker's build scripts will set up a
+	# reasonable GOPATH for us
+	export AUTO_GOPATH=1
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ROOT}/usr/lib"
+
+	# if we're building from a zip, we need the GITCOMMIT value
+	[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
+
+	if gcc-specs-pie; then
+		sed -i "s/EXTLDFLAGS_STATIC='/EXTLDFLAGS_STATIC='-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+
+		sed -i 's/LDFLAGS_STATIC_DOCKER="/LDFLAGS_STATIC_DOCKER="-extldflags -fno-PIC /' hack/make/dynbinary || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed'
+	fi
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	# time to build!
+	./hack/make.sh dynbinary || die
+
+	# TODO pandoc the man pages using docs/man/md2man-all.sh
+}
+
+src_install() {
+	VERSION=$(cat VERSION)
+	newbin bundles/$VERSION/dynbinary/docker-$VERSION docker
+	exeinto /usr/libexec/docker
+	newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.service
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
+	if use doc; then
+		# TODO doman contrib/man/man*/*
+
+		docompress -x /usr/share/doc/${PF}/md
+		docinto md
+		dodoc -r docs/sources/*
+	fi
+
+	dobashcomp contrib/completion/bash/*
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins contrib/completion/zsh/*
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r contrib/syntax/vim/ftdetect
+		doins -r contrib/syntax/vim/syntax
+	fi
+
+	if use contrib; then
+		mkdir -p "${D}/usr/share/${PN}/contrib"
+		cp -R contrib/* "${D}/usr/share/${PN}/contrib"
+	fi
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog ""
+	elog "To use docker, the docker daemon must be running as root. To automatically"
+	elog "start the docker daemon at boot, add docker to the default runlevel:"
+	elog "  rc-update add docker default"
+	elog "Similarly for systemd:"
+	elog "  systemctl enable docker.service"
+	elog ""
+
+	# create docker group if the code checking for it in /etc/group exists
+	enewgroup docker
+
+	elog "To use docker as a non-root user, add yourself to the docker group."
+	elog ""
+}