0.11.1 version bump

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

4 files changed, 245 insertions, 3 deletions

diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index e835b92c81c7..80cd3273de55 100644
--- a/app-emulation/docker/ChangeLog
+++ b/app-emulation/docker/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2014/04/09 05:55:23 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.20 2014/05/09 02:39:45 gregkh Exp $
+
+*docker-0.11.1 (09 May 2014)
+
+  09 May 2014; Greg Kroah-Hartman <gregkh@gentoo.org> +docker-0.11.1.ebuild,
+  metadata.xml:
+  0.11.1 version bump
 
 *docker-0.10.0 (09 Apr 2014)
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 436dd1a8b37e..b063ddddcc3e 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -2,6 +2,7 @@ AUX docker-r2.confd 581 SHA256 94e1c07b09701f3b0b1c4f6f917206da3b32f8d7e961c3850
 AUX docker-r2.initd 1767 SHA256 0cb83137cf3d37aadf450dd30ec9e0ceca3d865867f7fe64a43a1d5f42d2ecf8 SHA512 1250f8b16ded27877cf2759fca1d69f37ce308d4d5e5a29438210e847894617fa088260b0cfd87e1ee65ed26a4293d98c79462c1ccc93aac14203fbfed4b69a2 WHIRLPOOL 272f04feb587a0f91079f41ad90868f99c28a21a5ec35876f38dbbd342a53796dd4ec822fa2cd3506f22485b6a0147d24da2e7ab89da7875f84e3e9fab50c3c8
 AUX docker.service 249 SHA256 ddf23c8bd07303a87f7e76881b14c023c54835feba575998d6f5a9a7ec8a0a0a SHA512 d7564489486b3547cb79057fa44cb3eb0aa6c50ec47eca12579748170d62ab435395d173fdf39fcec8e86f4778db7413b7fa0ab85dbbd2fc1636164d4aad8b37 WHIRLPOOL 553f8a93a5d7cb6cc037a2004e19efa06520eba363e12574a5d251d10b23d9f24d1a023eb9915968a9bb661bddb577163948fb180a85ca9c916cac5c6680b1df
 DIST docker-0.10.0.zip 3126572 SHA256 d01491fcd53d94c06028876b65827eb69d9f5fe65b3e4f7a49e0f2a0b520767a SHA512 2d9019d9f363656b8735b5de06af51b3a79edd1db10ceac3b35655d98877edb5fa84ae51050ba6da66d35f906feec2d3cb98e4a5e595952dcccdbbe4d22b61d7 WHIRLPOOL 961c810d0f3162e6ecc4c3fe33e353b46478af46474c633d4a0f2f686cc60ebe23a7156edd17bd6a91e0b0b11938bfb9cf07ab344d710ffebaf749754c484614
+DIST docker-0.11.1.zip 5057294 SHA256 b11458add04e0d50dece28e4919cc32cbc38e08f67aac160ba7f19868e55b1af SHA512 b9cbed8baa6556c5712ea8fdfedf731607e3997563161f744bace89638a14687077f459ad2b75f0fe12107dde57fb6f1b56a5deb83e2884c82fcf01857562655 WHIRLPOOL 4882cac043eec1e25e74643d377cf6334cb85ea6e0bd8d08c7a14c18479eced726b376fcdd434b32a894620b2a9b7f76d2c056d87ccb97ab58df95b424f49ca2
 DIST docker-0.7.1.zip 2622521 SHA256 e54eb97726dc6cf16171e60f955f45d214d325b1cd3632b095e485854ce24938 SHA512 22275f81b45e49d8f6e3e376398eca981bb8e8d4a9b80ec83f96129607a49fc79adab742d1daf4f33a1200c7eb693ea428770ad64ababd5b11e531072f7d95d9 WHIRLPOOL 6b6bb001014f15ae78e3647ec16dd03cf069348df9016a7592dcf80fc0f0c9ccdfd0a3d95a5377f5de792c534a789f6b5e21379d41221c48fc06b13debc71581
 DIST docker-0.7.2.zip 2621055 SHA256 34e8e324768fb67c48b308fbed22fcb6f016d4ca1fec6a127e1d14c0a3beaa07 SHA512 86835ae0e15cb09d9f878b622610e42c80fd6d61808738ed8e77c46315e7d6f6ee5fb81adff72929bccb10adf46c34f10876b78f20e658d2473b0187c9b10827 WHIRLPOOL e75776644348620eac3e8e5110c11a4e077a6df22924f29f0ca407a46308175dadb50f7ff46c0127b8be38389e58563ca735018a80376d61c20137c9bd18facc
 DIST docker-0.7.3.zip 2659554 SHA256 216a469acd2f11d1c0bf1a2ca07272e6f4614970bb4b0c3b32ecc691474e741b SHA512 43aeffd8d876b09721a6772a8a37b09e74661bd76b183c3ee17ef684185da1d1c83a320df3283ca53b96c77383ba5f59802835928d67df5629224f9263cf2b66 WHIRLPOOL 315e2d7b3e2dfb53d853d9b9da52b579062b70ed791d2f54dc9a4840118ea52590c6e2da12a2012b355786a70f390dfcf606f056555947e3ea93dbd11ca7b522
@@ -13,6 +14,7 @@ DIST docker-0.8.1.zip 2791663 SHA256 7ed55a58fee3830695afffb702f99c691ee426ba4f5
 DIST docker-0.9.0.zip 3028848 SHA256 583759783fb48dc30615b3d2bad8a0e21f69c8759c13ec48a8316b26f5105da7 SHA512 666feff73b5ff2c9c9175b7873e3827ab1956c523be5fceed1e175029fe35cbf7ab1783bd4494d4f1917a9b9c2928c58d88e37b10db804ccd1a97e8fa447f00a WHIRLPOOL 17b8dde7693bc7da3215d27d2e6f337f7bbb29c71c12926911d7affed5f9ba8e5938cdcdf89a7123db3037b4cd6f6d0bf00f0cc32106bc9e9c6072a9019ca593
 DIST docker-0.9.1.zip 3033807 SHA256 1ba631959aca1a07ab38204743784b5bd591319f0b4591f553f3fcb969bddc81 SHA512 8e34857f3ee75e65d65ef0f4c4bc4326919cc9d126cc839526a7d5d7781f64e388d607e02eb25aef974db0e87c219c7b112ca75cdcc6e86fa389c1598729b23c WHIRLPOOL 6893c313c2855fed31a696d29b8eed1ab1b64cdd280561bad8510bce1e77f3651cb771c867b18b831c5f1cc4f288ac0382b46c0ab5d9fc2af86d34ddd1cb5eda
 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.0.ebuild 3846 SHA256 3fe946e872d4dea18334587f756069ecd533be6dbd1bf59c49db34222bd8e44e SHA512 736266d54c92c34e487392aa46477d2298ce96159205f00786bffdf107a3b1b5a88da4e5ae0ddca8fc29d4ebb09dcc4d06d635273dcf72ffceddfc79d9462fe7 WHIRLPOOL 3d0a2596129c1ae2f5af007cf0caa13e9a0b949bf30344fa0eb7f63ab820d9c4ac505830573dd14925d4c010d571455012690475239ad7efb92850b0c125f715
 EBUILD docker-0.7.1-r1.ebuild 4523 SHA256 58a8f31b2764c0e75fd053a76914bfc7c1c97c0826a4f0796459da27a8175ba3 SHA512 ac6203f6155cdc1194842a90d6b3f6d2cebc4c463de677b97cee405f0cd2aeaea02c233d006c222641c0afa78ba90e5c20c4057d9a1d22f47a683237a611ae31 WHIRLPOOL d2bc58fab76fe2a211aa5301ad9a5d058c42918de3a2729d11cbeb569a4a9044d3af0e6d6e772bf2b0d85220311b5ecc8725d5a833188d9790f01d1872c805a9
 EBUILD docker-0.7.1.ebuild 4549 SHA256 3007b1f620f4c7d5c649d05792fc5bb07ac7ebec180fcc8940b754dececdbcc4 SHA512 5686cc8a7ba30f25a06d272a9fdd82fe86e898803c8a6e5c1102578d4affedcf02086e857da9fbd58bc657097c0dcf9b88318e6ed468a27279c26986ad0ca9f3 WHIRLPOOL 7dbfd5df66690940deaae3c39594005cfbdafab5df3d2f9fa350c88f07c7b463facf2ce9d4af616817bdf78db6fb335c628f9e701a10e254f8ce0a033ac5e97f
@@ -25,5 +27,5 @@ EBUILD docker-0.8.0.ebuild 4508 SHA256 2c55a4012fbdc4516d09b38ee2819fbc3449ea1f6
 EBUILD docker-0.8.1.ebuild 4252 SHA256 d0d421eb8fdffb8abfacd64a85b0d313f2bc97e0c7e787a928cf8a363daf716f SHA512 c4a257e44ea04c93a719f6eda555abd64f1692b4f04bc52e59115c82c84a739a080f0eb2f5bd09f97cb7ce143b93102580933b4a595902e439ebcbfaaea02849 WHIRLPOOL 2a9c5fa20f1ee8e9ed8b153c96b3ee462b215b86eb119dfdcfee2e6ec0d73c6226f3f56da2f5986ab59cbbb2d09d77dcc921d7934b914af36e180d9b9cfbbf42
 EBUILD docker-0.9.0.ebuild 4935 SHA256 e373e971d144effaa68a3b3a518c18e1a706e67dce4a3d63432abc01d99fb488 SHA512 f340cda8c601da094012f9db19d741d5bd07599e69d0e3e2ac3ba6e863d89d72c6ff62cc9befb8ed5cf6e1b81472a74f3d2a367e52097332d820a60685d3c551 WHIRLPOOL 032fccf7f1e1dae1f14b67a38f370a54fa44323382647b1a2d5393bbb1cc4d82fdc0b3716aa474e153d67378be908b653b288be6f3650758e803939b1ce221b0
 EBUILD docker-0.9.1.ebuild 4901 SHA256 8b1b8027f2ad4bb14c4604aa99f655a01e54f788a39c33c5efcb65ced4166d91 SHA512 d84dc9c8af1d055f2125de726c2a6ccbde1c20ec1d23fc84f315e43c695ba92aac2cad27605a3527472b7c1e4b491f485b0416ec58752c1df82a5b1dc761563d WHIRLPOOL 073458d66e848c554100106b25e44dc05e9017c6f1ab682aaea7f9f94c8feab8977017e4ec319aa636ccd5522c693308c18ba1f3a5f522bb27d20e283efff3ec
-MISC ChangeLog 3051 SHA256 0215457bed78d72bab277cb8f47bd65a318c88b09b94918470d4b7b47f699ef4 SHA512 248ff39796cb4dd5d43897f42d51a655f4eaccb48e060f167c82b722e1817c18e6690153e5126463780f8e03f8bbb11bdb0ae999299fa8b99be25fabeabdeaa0 WHIRLPOOL 0d5a6529aab3601d2ed3b922399390dc8187956e53c16229383975b680ee3cc182908acd364d74a0de42be5d522b66f4aec73f0c8e097bf2651357f0148b1784
-MISC metadata.xml 1059 SHA256 dd02a2ec51defa2d00012b2b80a7e604c086a4cf7c5a2677ebe00fab82c95db6 SHA512 b1c6441955610b4fe171de2953b892ff701b87c28e1610c82074b7cb9ddbae0015d696dd324a33ffb3b57b3b91acf4d5825aa4aa828d3870ad6c25cf55598ec9 WHIRLPOOL 284d67abb80b4217501ff851af2a57d9ded5df4d9087d842cdbe33946faebf76dd24c53341ed1fe973112a51992469f4141ac2d9a76339d6a6be294c5c65d4ee
+MISC ChangeLog 3197 SHA256 0e0604894ce6a1a082f7e67dd519b6b6a8bc5c06093c95bdd545553d1747de70 SHA512 36184cea6d59ec02b69d2db0425df4e9f7da0bb8b812322cdc5b82bd79b36a725fe71de34a6a2022f8b13135ad4859cd1e30317a8aeee98b2ac38bf0bbb64d9c WHIRLPOOL 48ca7608a2f9f548806b6245b23bfa33eede8968bb0d66fbf0efa9083c6aedf6fcd81ca8212516843ce646c1f3affe14fe61a292ec6f63bcf4637fdc391c68dc
+MISC metadata.xml 1147 SHA256 6a2e229f9808b760f6d87c0f8489ffd044ed8abf13d286a483d31db1e5d4ce5b SHA512 e4c5bb1ac1ac1938adf070821f6ab3e92072eed58b778e120ff3940c0def90f742a5b4096984018b9536d068ed66f5929e9d5d563a7272fa946ace6950b9ac9a WHIRLPOOL 5ce47b61316f24951452661687306c35ee525c9cb9b5416f099095b8e3d27f7fa5395a9a30d2b47401f345dc771b2edc9ba3b82bc44976df78ed17b1364e6d84
diff --git a/app-emulation/docker/docker-0.11.1.ebuild b/app-emulation/docker/docker-0.11.1.ebuild
new file mode 100644
index 000000000000..7daca6aec288
--- /dev/null
+++ b/app-emulation/docker/docker-0.11.1.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-0.11.1.ebuild,v 1.1 2014/05/09 02:39:45 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="fb99f99"
+	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"
+
+# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper
+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-0.8
+	)
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	aufs? (
+		|| (
+			sys-fs/aufs3
+			sys-kernel/aufs-sources
+		)
+	)
+"
+
+RESTRICT="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_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 contrib/man/md/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
+		insinto /usr/share/${PN}/contrib
+		doins -r 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 ""
+}
diff --git a/app-emulation/docker/metadata.xml b/app-emulation/docker/metadata.xml
index 3f05271217dc..43b980a7daf7 100644
--- a/app-emulation/docker/metadata.xml
+++ b/app-emulation/docker/metadata.xml
@@ -21,6 +21,9 @@
 			Enables dependencies for the "btrfs" graph driver, including
 			necessary kernel flags.
 		</flag>
+		<flag name="contrib">
+			Install additional contrib scripts and components.
+		</flag>
 		<flag name="device-mapper">
 			Enables dependencies for the "devicemapper" graph driver, including
 			necessary kernel flags.