Version bump, drop vulnerable versions wrt #532344

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x5D21B852895192F9

diff --git a/app-emulation/docker/ChangeLog b/app-emulation/docker/ChangeLog
index 43a169987f504b72371badbc902830d5479ec463..1b964fe4d19761ac1d325d95377464474ec847b4 100644 (file)
--- 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/Manifest b/app-emulation/docker/Manifest
index bbf8f769c0c483c6a266ef5db09b4c9f338d78ce..75ca25a0416407ef6b87bc63f160c7146970690c 100644 (file)
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -4,24 +4,24 @@ 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.3.2.tar.gz 5876533 SHA256 9e81c0ef309fbe3298ba1a9b0f2783ee88d7f412cb03b6605c6d8bb497a452fb SHA512 78f67d39ac50ff60597cdb36c35fee32797296ac0f0e98203a863a243a493329ccd95f958eb3ab959d549ccdfd9cd0040e3897bc3856c3d02914ddabc9f79eb0 WHIRLPOOL 204dbc60c8cf48f1e97bcb2699ca5e2ed705bf3805c09e14f661bda99559f85f6a69b3a07a77a60a9a634b85d978be65490a08e99df0f18a711064f226759482
-EBUILD docker-1.3.2.ebuild 6584 SHA256 e1f1d1640c2fb9b4bbd261505f632a36b84ddfc33b7167e8a24f71245e4b9693 SHA512 709db6b89e8f31545c80bec62c6bb0aca3ef969ab32b98130fd7f05eb4b2f48720e90ec212dee5a14876770a4870fec4c8ab3c8bce964861de0cbe52b5e6c988 WHIRLPOOL 1772b2cf771486c4f806f1ac7ddec9482c1c354aa268f31c63850d96bedf32fc2b1cfbbc2194e1384427498d5dc428049a86f02b44ac0faca028045aa57d4ccf
-MISC ChangeLog 5161 SHA256 dc751281a4e19f06c43c4170e170f4e266b158a3f1d45bcb33c52f4b99cd2c19 SHA512 d4e9f124c4c998ba15a33cef3dc002b68fc16cc7c1d4622d01fb63431ed22e7db3f236f4a35410f576668d5c506f64d683ecb45d46020193fe13174d6362fb48 WHIRLPOOL 0874838ff7859c5cbf50a1ba46d8c630cd029931e1855bca41efbdff254823171b4f72cb3b305088986aea54a584944885c970ff3145339bc6707e3a949064c2
+DIST docker-1.4.0.tar.gz 6053302 SHA256 3fe1c317a1685de896690986a1e0d175ff0baaa9b893bf7d58737df632e19967 SHA512 7eeaae011d0439aca8af9f6db6541f6a50250de600cbc9c080d9506c57179438a7b8cce5495ccf16a59ce7e1fcde174e00d458b494b94fc2d3bcb086d3805aa5 WHIRLPOOL ab340cc34687dd11f5be4b5eac6c4cc4d8b910bb0dfce13bc3aef138c0954db7de6f310ea33c0eb5d0dae8251dd37b4612ad8219ba9ded05971e23fa8f19b45c
+EBUILD docker-1.4.0.ebuild 6603 SHA256 13b37a1327e93a694b50ddc209edbc818bda86a2c65ad51d072e12e523822a1a SHA512 f7ba30458f86042878568917aedd201a8c6d422d7b2a724b3d62065ff022c77a51b7e7928ef3c097f8db95b43eeca38e2e749221b2bfaefb6508c5912c4cf3e7 WHIRLPOOL 2887ec3570c347f5b90010aac072090fdddac33a7ee10d9b3438029267c7621377262983b80d9fb5244be49474bbccfabf893171ae5a4a9dad88808e09e559e4
+MISC ChangeLog 5344 SHA256 fc37fe350c042c34aad03ebd013bd693d8bf7504471ed1c2569e8f3dc066857b SHA512 19a7fb2e124f7d7f47397bf3a384b85fef8a155a5b7ecc94728bfd2cad41c553acf0fa929892a3f2a39aa740065d15c5c13df81b88a9545b6f5ddc7a18b9785a WHIRLPOOL f73f7b68e11fda145bf16a0743c0aafbec99ae73fb5bca4928805e9b8ab65b3bfcdf87a4bd79a13651f7a7fbdadeb35d7726d921b3694007300420edb861483d
 MISC metadata.xml 1277 SHA256 e5d0394aa0f0ba5f133ccbbfe92c28111a5ad888d46a53ade9625ef0155c7d9b SHA512 f910edcabda2011dd1ca107848663c97a17fbb0f84391376abd5e26111662e8bb172c9d0b77a57b82fc5b35181a543a8f869823d0ae7b9d3deaaa75c18d03f10 WHIRLPOOL cbfeb224f2205c91fa288d18086dce87d61d25481f0c10e09a8b77e9950162d647fa8c3cd7793c2fad19c3c2a0be55fad29a9002eeacf02a6a10a48d68e846c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUdfwsAAoJEF0huFKJUZL52HkQAJ1zrPSXC9JrzjnLI/hgg/6I
-GEw6+dAVHXKH+Goq0f8Ji4MDcHnz4VZqiWKSUJw0ggObA5MjZ+RmvyhyMQhhIkGz
-U6SQHnfSd1hOKkVRF4UFdVh0i46uZhF5cV+vddwYz9KtCRSDmxiIyHnXlKAOHPv7
-UBBDzPj1elH9JPoveWWy+7iEdspEHj6nqmmUXNTwm1XpjzUtsSoXnqArRJl+8S7I
-6gAlDUeRe9+5SuYI32tHQr1ZB1xqfBfjT3tJZHf5DFtpZpicjQk6cV6xeDgsCh/g
-f+5o/4TbrDj+OUkMyJT31puRovEmNHLrb4Z/i7jTP0l3nXlC7W4qQ+42HAOJnfcn
-xMySL/Rpad/SVoabAAZFEUypIARaecLEo5H7WExrmZ+6XHS5Y83aSHiMMprXsuMb
-+7wMmum34wNcYBxsIVVgrVphKIz1zEeaE1/gnR6rB4rxAb+LwBX7qjVpmZIsYcnc
-9QqP4efQlbqIeJvwB3ZG/YDuy/ed0meKjyT8yHR/efP39E+/h33LySAFDoLfTu9i
-emtRiavca1//x0gFRoqAVq3JcPHks8KeDB+BU4TCMQsTmPEuicphR3IPnzatihTF
-iGH1/AboKnAr7zGsbonx0x1ZW7mg48N9esToQV5zzWmEc5X/Dc1NOIo9jgAw6jm9
-z6wn7GfxnA5hOC31P3u+
-=8z+H
+iQIcBAEBCAAGBQJUizmnAAoJEF0huFKJUZL54w0P/1wzb2Z8wFXZvpcyGl6d4DG3
+ph2yk7OAv+rF0Ik0/OaKvJKa0c2eX01/NJUlUtMxEKk+zXH+MFb6oAN1bLrfbQdf
+K5SXfRrlpqUwc/plckHX1OVXZgNY0uF1S6K2uQ3V0lnAVbNjTa59jsdWykMbI25a
+QgKXxVvTP1omFYpGeB+S0nfCfbmD6We4hWKGUA/QuhvshQAnRWTn4tX7nC7wF1dA
+l9yv7KR2cqt0tYcV23krchKnczbUDJzz44HPHfb2Loa0KxzuZ1t9gd6TOvmIPUzq
+nwG6Q6XeaVUv5mHKszkqRb0V67Sq5kmstI+IKf/LGP/WDvYU6BrkHFc6sj1VMvqN
+TVb0D4+xC26V4bQSquUh58vcYJj4hFoUPCgMlrnbfrk8eSkFTS3TOOGQIvWW97Bt
+jHAJ1LkR7GduT1VzFKu7PmDn1371EbeVPY5G/lAf2wduNnD5a0MximvUeEzw0yl6
+15OlOVI0vdZHbxGGLQOB+JqsO/zYdfN/qiQYl8BtIVvUnX4muaVLel7EDbMPa2AB
+6TGZzrKKEichgnEOSb2DecFFaDNswChLWC+F76r1bEQvW9HvFZBpCI93cWzqCPIH
+uVBOQvQD/yQvJb50yvVM7eEdrtxKMr30xvi7TUMDbiMEXsh+7u3VEHdASBq/bJYS
+Vm/OeCVr/oady+2qIkc6
+=QNyu
 -----END PGP SIGNATURE-----

diff --git a/app-emulation/docker/docker-1.3.2.ebuild b/app-emulation/docker/docker-1.4.0.ebuild
similarity index 97%
rename from app-emulation/docker/docker-1.3.2.ebuild
rename to app-emulation/docker/docker-1.4.0.ebuild
index cc543b19692fec6d82efc134861d9dea78d14ff8..f1ac898190db7e0f51da3e7b671b244427d10fb1 100644 (file)
--- 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