diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2014-12-12 18:53:23 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2014-12-12 18:53:23 +0000 |
| commit | ce893f0d1fc6e12936abf2d01a7b82188b988ea0 (patch) | |
| tree | acf33f9aabaefbe39da62702997ae6814e47a50d /app-emulation/docker | |
| parent | fix references to upstream issues (diff) | |
| download | gentoo-2-ce893f0d1fc6e12936abf2d01a7b82188b988ea0.tar.gz gentoo-2-ce893f0d1fc6e12936abf2d01a7b82188b988ea0.tar.bz2 gentoo-2-ce893f0d1fc6e12936abf2d01a7b82188b988ea0.zip | |
Version bump, drop vulnerable versions wrt #532344
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x5D21B852895192F9)
Diffstat (limited to 'app-emulation/docker')
| -rw-r--r-- | app-emulation/docker/ChangeLog | 8 | ||||
| -rw-r--r-- | app-emulation/docker/docker-1.4.0.ebuild (renamed from app-emulation/docker/docker-1.3.2.ebuild) | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog index 43a169987f50..1b964fe4d197 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.33 2014/11/26 16:13:29 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/ChangeLog,v 1.34 2014/12/12 18:53:23 xarthisius Exp $ + +*docker-1.4.0 (12 Dec 2014) + + 12 Dec 2014; Kacper Kowalik <xarthisius@gentoo.org> +docker-1.4.0.ebuild, + -docker-1.3.2.ebuild: + Version bump, drop vulnerable versions wrt #532344 26 Nov 2014; Kacper Kowalik <xarthisius@gentoo.org> docker-1.3.2.ebuild: Update with ebuild from Tianon's overlay diff --git a/app-emulation/docker/docker-1.3.2.ebuild b/app-emulation/docker/docker-1.4.0.ebuild index cc543b19692f..f1ac898190db 100644 --- a/app-emulation/docker/docker-1.3.2.ebuild +++ b/app-emulation/docker/docker-1.4.0.ebuild @@ -1,6 +1,6 @@ # 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.3.2.ebuild,v 1.2 2014/11/26 16:13:29 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-1.4.0.ebuild,v 1.1 2014/12/12 18:53:23 xarthisius Exp $ EAPI=5 @@ -15,12 +15,12 @@ if [[ ${PV} == *9999 ]]; then inherit git-2 else SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - DOCKER_GITCOMMIT="39fa2fa" + DOCKER_GITCOMMIT="4595d4f" KEYWORDS="~amd64" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" fi -inherit bash-completion-r1 linux-info systemd udev user +inherit bash-completion-r1 linux-info multilib systemd udev user LICENSE="Apache-2.0" SLOT="0" @@ -145,7 +145,7 @@ src_compile() { # 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" + export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" # if we're building from a zip, we need the GITCOMMIT value [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT |