| 1 |
commit: 01209e75c466880f12ca47cb6a3bd8d73a51f849 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 28 15:45:33 2016 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 28 15:45:33 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01209e75 |
| 7 |
|
| 8 |
app-emulation/docker: sync live ebuild |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
app-emulation/docker/docker-9999.ebuild | 13 +++++++++---- |
| 13 |
1 file changed, 9 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild |
| 16 |
index c4c359b..9f78ea5 100644 |
| 17 |
--- a/app-emulation/docker/docker-9999.ebuild |
| 18 |
+++ b/app-emulation/docker/docker-9999.ebuild |
| 19 |
@@ -73,9 +73,11 @@ CONFIG_CHECK=" |
| 20 |
~DEVPTS_MULTIPLE_INSTANCES |
| 21 |
~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG |
| 22 |
~KEYS ~MACVLAN ~VETH ~BRIDGE ~BRIDGE_NETFILTER |
| 23 |
- ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE |
| 24 |
- ~IP_VS |
| 25 |
+ ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_MANGLE ~IP_NF_TARGET_MASQUERADE |
| 26 |
+ ~IP_VS ~IP_VS_RR |
| 27 |
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK |
| 28 |
+ ~NETFILTER_XT_MATCH_IVPS |
| 29 |
+ ~NETFILTER_XT_MARK ~NETFILTER_XT_TARGET_REDIRECT |
| 30 |
~NF_NAT ~NF_NAT_NEEDED |
| 31 |
|
| 32 |
~POSIX_MQUEUE |
| 33 |
@@ -194,8 +196,11 @@ src_compile() { |
| 34 |
grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' |
| 35 |
|
| 36 |
sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ |
| 37 |
- -i hack/make/dynbinary || die |
| 38 |
- grep -q -- '-fno-PIC' hack/make/dynbinary || die 'hardened sed failed' |
| 39 |
+ -i hack/make/dynbinary-client || die |
| 40 |
+ sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ |
| 41 |
+ -i hack/make/dynbinary-daemon || die |
| 42 |
+ grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' |
| 43 |
+ grep -q -- '-fno-PIC' hack/make/dynbinary-client || die 'hardened sed failed' |
| 44 |
fi |
| 45 |
|
| 46 |
# let's set up some optional features :) |
Archives