summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYixun Lan <dlan@gentoo.org>2014-11-19 06:37:54 +0000
committerYixun Lan <dlan@gentoo.org>2014-11-19 06:37:54 +0000
commit2cb47643bc7badce31632eb122f37fd79e1c41c1 (patch)
tree2475c5c29562d36aba0841f49eea7c0aa67f5ee2 /app-emulation
parentversion bump, bug 529692, thanks Harold Naparst for reporting (diff)
downloadhistorical-2cb47643bc7badce31632eb122f37fd79e1c41c1.tar.gz
historical-2cb47643bc7badce31632eb122f37fd79e1c41c1.tar.bz2
historical-2cb47643bc7badce31632eb122f37fd79e1c41c1.zip
clean vulnerable versions due to security bug 529670, proxy for maintainer
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xAABEFD55
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/docker/ChangeLog6
-rw-r--r--app-emulation/docker/Manifest30
-rw-r--r--app-emulation/docker/docker-1.0.0.ebuild232
-rw-r--r--app-emulation/docker/docker-1.0.1.ebuild232
-rw-r--r--app-emulation/docker/docker-1.1.0.ebuild231
-rw-r--r--app-emulation/docker/docker-1.2.0.ebuild229
6 files changed, 6 insertions, 954 deletions
diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index f56185fbd2a9..538de8c98b69 100644
--- a/app-emulation/docker/ChangeLog
+++ b/app-emulation/docker/ChangeLog
@@ -1,6 +1,10 @@
# 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.29 2014/10/31 16:22:48 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.30 2014/11/19 06:36:46 dlan Exp $
+
+ 19 Nov 2014; Yixun Lan <dlan@gentoo.org> -docker-1.0.0.ebuild,
+ -docker-1.0.1.ebuild, -docker-1.1.0.ebuild, -docker-1.2.0.ebuild:
+ clean vulnerable versions due to security bug 529670, proxy for maintainer
*docker-1.3.1 (31 Oct 2014)
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index c125c75b1801..2be3d9e50bfb 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,35 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX docker-r2.confd 581 SHA256 94e1c07b09701f3b0b1c4f6f917206da3b32f8d7e961c3850c4391ebd59df0b4 SHA512 5838270ff9ce7b9a562b2449ba5f4ad72db956dd03f6a1b006c8019ff43fea1c4ae1e2a4818fb092b6096cff6bd9ce539b05b7940412c55b3bb3e30c356da944 WHIRLPOOL a8e3759b6c86855afa7e784d50a7926fc888d50ec03dc2d9dcd70c3f2dd11caf6670196d91f383cab1d603f32a968bed4b3a0668ec1a38d41dc1142ec92235cc
AUX docker-r2.initd 1767 SHA256 0cb83137cf3d37aadf450dd30ec9e0ceca3d865867f7fe64a43a1d5f42d2ecf8 SHA512 1250f8b16ded27877cf2759fca1d69f37ce308d4d5e5a29438210e847894617fa088260b0cfd87e1ee65ed26a4293d98c79462c1ccc93aac14203fbfed4b69a2 WHIRLPOOL 272f04feb587a0f91079f41ad90868f99c28a21a5ec35876f38dbbd342a53796dd4ec822fa2cd3506f22485b6a0147d24da2e7ab89da7875f84e3e9fab50c3c8
AUX docker.service 249 SHA256 ddf23c8bd07303a87f7e76881b14c023c54835feba575998d6f5a9a7ec8a0a0a SHA512 d7564489486b3547cb79057fa44cb3eb0aa6c50ec47eca12579748170d62ab435395d173fdf39fcec8e86f4778db7413b7fa0ab85dbbd2fc1636164d4aad8b37 WHIRLPOOL 553f8a93a5d7cb6cc037a2004e19efa06520eba363e12574a5d251d10b23d9f24d1a023eb9915968a9bb661bddb577163948fb180a85ca9c916cac5c6680b1df
-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
-DIST docker-1.2.0.zip 7519710 SHA256 97485720bb43347eb5464d1650cf97cb8da9ace1022cf30c203f1bdbfaab0ce4 SHA512 7892cc9f887cec047969450f8576b9d11189cc920993dc39aea1fdcf4cd8611101ae06cc2d95eece5a71854183d2caf3ecd89feb1174c12d59c8a780506bf9ff WHIRLPOOL 0335bd98e2d2c9d8d919b49b78c8fd28195d878cbec0bf5626ff289d1eba8f9830b91ab378cd9f88bf9bb83ac2535b81754ba4c9fa744af47d9e213015d86a39
DIST docker-1.3.1.tar.gz 5869113 SHA256 5eb5578945438dce485c2628a3df47a6f6ca8fff7366f1ec8335b37955f82f70 SHA512 358825e84b4b1ba98f603d831a6afd917068e1689761ee051681d38c8fa95e06a0b1ccea8c2b6e155d5efa4de063153e36675407dcd80bf818e53c2e3bee0a93 WHIRLPOOL ff9eaa3a378fe42bb1ffc71fac74ee13cb9f1ecb151f5da83f56db23b418f7af6e1e45c1a53c5edde7e312d956a23b7eae086e540ffb21c9a15d12ab68fc7ea9
-EBUILD docker-1.0.0.ebuild 5499 SHA256 205d4dd1e364d99e2aa2bbb2025628b28ad26fa6826b87f0946c70730cb34c94 SHA512 7101df5972d78c43adaebd5d31064eedac88018978aa95bb5bbda964caee9afbf54fb6f76c780b60f7eae11c98fd3be189e4a5ff276270acf976d7767bcfa3d2 WHIRLPOOL 5222683446129c85135fbae201744a11a6ec098916ef078dafec85cfcd224eac6857c939e1676c01b86b78fca0c131c09880011beee51557744b899325fbdd81
-EBUILD docker-1.0.1.ebuild 5499 SHA256 743c71f541e903afa38bfa73b8ac0d80ad437444d78a549a549d2b4111dc8e90 SHA512 ceaa51edd2b59308e2998a575419ececf6d3d69d875d6542aa0bcb3572d5c80502d947234280dadc19619f8916899ecf6dddc84ca04bca0c12a042cabe1bc57c WHIRLPOOL b0fc022f043a1b226a6da425327a1f2548a663b8d1dc33c660985affb6a83b14e1b933de373546497f7d6fbd3c5797704cd186d16787ad22fa1fb4a4ffd6b76b
-EBUILD docker-1.1.0.ebuild 5397 SHA256 ee678f6545b140323445ca8dca40c79e74014302f6637d2371e194150e27a563 SHA512 09cf71046c265aa61f009c7ef2c53cb6fa4af3fdbb2ac9f5434bff0d30b2f4fadff01383e74efa3e03488b9b8e6093f5aa4970b155520dfeedb23ea297bda402 WHIRLPOOL e6082379d117e604c5ed91c6c3f414f47d4f6038257cb82e5a908899ca720cdb3cca37bb5a31b5caea27702ca1aa5800f50a55917ef8d1a48d0f7160e1ad863d
-EBUILD docker-1.2.0.ebuild 6310 SHA256 d9422a10bcc308982768fde5b2f241dca410ff4e3b9deddbddea214751615061 SHA512 8fe679c9cbc401c1260c8afaae8be8facc23da71976718317412e432c5eea0b76d7651cf856534c10a5b1e081caf550c0cebcadd72d1744f860c60dab825da92 WHIRLPOOL 34091ec86d83a38fb744c7d18dcdb5be1fe0e87731487ace5a8c3aa6d49a1d143cf5c4d1969281c88975b1f651d310e2f6873d92270fc70d1b3619504e3c2ed9
EBUILD docker-1.3.1.ebuild 6310 SHA256 7e3c36a8add8ed0f8773c1e394ee660e418f5372196a102fb3fc166b673988ed SHA512 97dba0c0507ee043f219fd39e40457efd324cc18a8d100dd221afb5fc21a956930dc2ffbe6a89b5b24d3b65d9f625210b330371da8f3c852a1da5637131fbed9 WHIRLPOOL 5c418b4ca8cd2ad56fbf0ffed7050322eac42efc61b149bb164e2927e668d5094a06129503e7497f53f376a8c277d61f4dcc16fd5d6e6811c7ff785d8153a22d
-MISC ChangeLog 4561 SHA256 d1184e8aa9dcdb773ce6fae55bda16657cdc717a80a156f577625f713cd240b5 SHA512 83548acc5ce3e3a7cc905e367303041f8a7ec69bcb4bc49135e07c92fc637154216f96e970d4d6b94f6c574ccc0c42c77b03979705342320ab55d2341427d3aa WHIRLPOOL c3f954ae3ef71ecfaa496c6a1347c5fd9df9a0b4b09105f9dd5bce717280ef8acd9a4c33b93db26dc0219e933a6f8adffffd3b00e231919b77cdb8128ac3b7fe
+MISC ChangeLog 4766 SHA256 09d5af7c3e9db753e53c6c4bd434ab22a1e9fc03a960ecfe2e27968a5990846f SHA512 a7ebc1a44ebf0bc5a52d14d4d8b4424e4d0bdacc515b93cb457edfe06d6449478ec31e7b0c4063f02a6ace4207217c9f51322a4d1642e47714cecdbfd3b0ca06 WHIRLPOOL c7d908ce20f0909526131aed30ce593f77a9a72ce755cb01bf817a8f5652afa3a5f7d59c49def89958619d0c5e591baedfc532af06a246adfa651ffb19c1fa68
MISC metadata.xml 1179 SHA256 dbc759ab11f70bb6406d176f3e0c81136589d74d2b7543a1541903db59f1030b SHA512 fe0081a73acccc0cdc46b74f2cd992839e795de3fddab527c67c64759c9722c898119e63a27849f873d894c346ab507f8a127a18ffc8f23848d911e967930982 WHIRLPOOL e8898cddccc2406f8d1883bcdaeadded42c422c6c3679b856b2961afeb35b8282c6425d02d0b32d0afaffab7965b2d1298a31f955327e1146d736ee92010aa7d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUU7dcAAoJEF0huFKJUZL5SyMQAIv8yD5YHjAhwDDPBc8sBfb6
-vIHs7seouDtv4pK5G7mO8AASxCGy1Mk3ctPvA+8INkQW+AEiuRPbRQa/Jg69axvy
-GuNcZk4RfPP4/dgRCmgZXfvZPC1927q11KZ/OnwdPt1nub3Kmypg3cLRaO0f2eLc
-7gJ20NerfX0HKWPqeeDt+7S97zu8ioaUBAcyVLL9reHCv0oD/mjk803AfLgzNo29
-HX+iJ58CIuNovrJp960KnswYtoTKmdmhQvJr9cxQtdtAwwBVuwcTgYha/WUoAxm/
-HbsDP2Q7WTRmv9+oTEYN/0iHpBRCai2SsDAXl/uE3pQ/4LgOsA0Fcy5hGHhSJIA1
-Yo6cwqSJSKvovcNAQNCHPsw9Y5qISVc15I7enMoWBb37PT00cFa0rVsUOueTTmBy
-z7b3lsAY5Itb2dLy2/ghHD7fRIWpU/DXAy/lHlOgqcMZypSPAcqlnN7njIIp3OUI
-4vXfEIxChvdGY/ycQPJES/ROB97ft20Vdffspp0FyzTUKmESp8Daqnze8bjkAFne
-DEqegg+Yu10nhK79jQGDbPYJp+LnNJglOKGXl2dI4u+6K7St8Vwlpk3HyXLQh7zo
-1tfDFLu3VPAxngoNMk9q18A0qpsk1kegMjRVlu1afNnKw+Y3Dnd6DPKXixLfrR1o
-kKDQsg3QySpTZ/yi3KyI
-=ON2A
------END PGP SIGNATURE-----
diff --git a/app-emulation/docker/docker-1.0.0.ebuild b/app-emulation/docker/docker-1.0.0.ebuild
deleted file mode 100644
index 77870bc36581..000000000000
--- a/app-emulation/docker/docker-1.0.0.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# 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.0.0.ebuild,v 1.2 2014/08/06 06:44:36 patrick 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="63fe64c"
- 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-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 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
- 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 ""
-}
diff --git a/app-emulation/docker/docker-1.0.1.ebuild b/app-emulation/docker/docker-1.0.1.ebuild
deleted file mode 100644
index 09c643a66da5..000000000000
--- a/app-emulation/docker/docker-1.0.1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# 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.0.1.ebuild,v 1.2 2014/08/06 06:44:36 patrick 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="990021a"
- 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-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 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
- 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 ""
-}
diff --git a/app-emulation/docker/docker-1.1.0.ebuild b/app-emulation/docker/docker-1.1.0.ebuild
deleted file mode 100644
index f87923cd0c67..000000000000
--- a/app-emulation/docker/docker-1.1.0.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# 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.2 2014/08/06 06:44:36 patrick 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 ""
-}
diff --git a/app-emulation/docker/docker-1.2.0.ebuild b/app-emulation/docker/docker-1.2.0.ebuild
deleted file mode 100644
index 5076ae2efc95..000000000000
--- a/app-emulation/docker/docker-1.2.0.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# 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.2.0.ebuild,v 1.1 2014/09/09 19:06:36 gregkh Exp $
-
-EAPI=5
-
-DESCRIPTION="Docker complements kernel namespacing with a high-level API which operates at the process level"
-HOMEPAGE="https://www.docker.com"
-
-GITHUB_URI="github.com/docker/docker"
-
-if [[ ${PV} == *9999 ]]; then
- SRC_URI=""
- EGIT_REPO_URI="git://${GITHUB_URI}.git"
- inherit git-2
-else
- SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip"
- DOCKER_GITCOMMIT="fa7b24f"
- 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"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
- NAMESPACES NET_NS PID_NS IPC_NS UTS_NS
- DEVPTS_MULTIPLE_INSTANCES
- CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED
- MACVLAN VETH BRIDGE
- NF_NAT_IPV4 IP_NF_TARGET_MASQUERADE
- NETFILTER_XT_MATCH_ADDRTYPE NETFILTER_XT_MATCH_CONNTRACK
- NF_NAT NF_NAT_NEEDED
-
- ~MEMCG_SWAP
- ~RESOURCE_COUNTERS
- ~CGROUP_PERF
-"
-
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-
-pkg_setup() {
- if kernel_is lt 3 8; then
- eerror ""
- eerror "Using Docker with kernels older than 3.8 is unstable and unsupported."
- eerror " - http://docs.docker.com/installation/binaries/#check-kernel-dependencies"
- die 'Kernel is too old - need 3.8 or above'
- fi
-
- # for where these kernel versions come from, see:
- # https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
- if ! {
- kernel_is ge 3 16 \
- || { kernel_is 3 15 && kernel_is ge 3 15 5; } \
- || { kernel_is 3 14 && kernel_is ge 3 14 12; } \
- || { kernel_is 3 12 && kernel_is ge 3 12 25; }
- }; then
- ewarn ""
- ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
- ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
- ewarn ""
- ewarn "See also https://github.com/docker/docker/issues/2960"
- fi
-
- if use aufs; then
- CONFIG_CHECK+="
- ~AUFS_FS
- "
- # TODO there must be a way to detect "sys-kernel/aufs-sources" so we don't warn "sys-fs/aufs3" users about this
- # an even better solution would be to check if the current kernel sources include CONFIG_AUFS_FS as an option, but that sounds hairy and error-prone
- 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
-
- linux-info_pkg_setup
-}
-
-src_prepare() {
- default
-
- # allow user patches (use sparingly - upstream won't support them)
- epatch_user
-}
-
-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 'dynbinary failed'
-
- # TODO get go-md2man and then include 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,socket}
-
- 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 " usermod -aG docker youruser"
- elog ""
-}