[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/

[William Hubbs]

commit:     01209e75c466880f12ca47cb6a3bd8d73a51f849
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 15:45:33 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 15:45:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01209e75

app-emulation/docker: sync live ebuild

Package-Manager: portage-2.2.28

 app-emulation/docker/docker-9999.ebuild | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app-emulation/docker/docker-9999.ebuild 
b/app-emulation/docker/docker-9999.ebuild
index c4c359b..9f78ea5 100644
--- a/app-emulation/docker/docker-9999.ebuild
+++ b/app-emulation/docker/docker-9999.ebuild
@@ -73,9 +73,11 @@ CONFIG_CHECK="
        ~DEVPTS_MULTIPLE_INSTANCES
        ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED 
~CPUSETS ~MEMCG
        ~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER
-       ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
-       ~IP_VS
+       ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_TARGET_MASQUERADE
+       ~IP_VS ~IP_VS_RR
        ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
+       ~NETFILTER_XT_MATCH_IVPS
+       ~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_REDIRECT
        ~NF_NAT ~NF_NAT_NEEDED
 
        ~POSIX_MQUEUE
@@ -194,8 +196,11 @@ src_compile() {
                grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
 
                sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-                       -i hack/make/dynbinary || die
-               grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed 
failed'
+                       -i hack/make/dynbinary-client || die
+               sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+                       -i hack/make/dynbinary-daemon || die
+               grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 
'hardened sed failed'
+               grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 
'hardened sed failed'
        fi
 
        # let's set up some optional features :)