From 76cba73c47c8694e74377004634daca18f2d9c08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Apr 2018 01:05:40 +0100 Subject: gentoo resync : 14.04.2018 --- app-emulation/Manifest.gz | Bin 19003 -> 19010 bytes app-emulation/diskimage-builder/Manifest | 2 + .../diskimage-builder-2.13.0.ebuild | 37 +++ app-emulation/docker-compose/Manifest | 2 + .../docker-compose/docker-compose-1.21.0.ebuild | 71 +++++ app-emulation/docker-machine-kvm/Manifest | 2 +- .../docker-machine-kvm-0.10.0.ebuild | 4 +- app-emulation/docker-swarm/Manifest | 4 +- .../docker-swarm/docker-swarm-1.2.0.ebuild | 4 +- .../docker-swarm/docker-swarm-1.2.5.ebuild | 4 +- app-emulation/docker/Manifest | 2 + app-emulation/docker/docker-18.04.0.ebuild | 303 +++++++++++++++++++++ app-emulation/free42/Manifest | 2 +- app-emulation/free42/free42-2.0.17.ebuild | 2 +- app-emulation/virtualbox-modules/Manifest | 3 +- .../files/virtualbox-modules-5.2.8-pax-const.patch | 44 +++ .../virtualbox-modules-5.2.8.ebuild | 2 +- app-emulation/virtualbox/Manifest | 4 +- .../files/050_virtualbox-5.2.8-nopie.patch | 147 ++++++++++ .../files/virtualbox-5.2.8-paxmark-bldprogs.patch | 59 ++++ app-emulation/virtualbox/virtualbox-5.2.8.ebuild | 4 +- 21 files changed, 686 insertions(+), 16 deletions(-) create mode 100644 app-emulation/diskimage-builder/diskimage-builder-2.13.0.ebuild create mode 100644 app-emulation/docker-compose/docker-compose-1.21.0.ebuild create mode 100644 app-emulation/docker/docker-18.04.0.ebuild create mode 100644 app-emulation/virtualbox-modules/files/virtualbox-modules-5.2.8-pax-const.patch create mode 100644 app-emulation/virtualbox/files/050_virtualbox-5.2.8-nopie.patch create mode 100644 app-emulation/virtualbox/files/virtualbox-5.2.8-paxmark-bldprogs.patch (limited to 'app-emulation') diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 42acece1a04c..197074e608b9 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest index 015e4e758080..e4ba047b3a1d 100644 --- a/app-emulation/diskimage-builder/Manifest +++ b/app-emulation/diskimage-builder/Manifest @@ -1,7 +1,9 @@ DIST diskimage-builder-2.10.1.tar.gz 338370 BLAKE2B d2417af55924971ac6c8ee803c7c9bf788ecd9a16affe90077eff51a58924c81e82728eef344749b5687cc26ff9e355a7611f4e2a0a5501217344eb9bca2bb00 SHA512 4c9ff1b7182b3c207d769bdcd142f23a6d9e2a8f040694ab75d41284bb96ad07305ae78e486343f22d13d8c8cbef5c66eaaf4638f0fd8f7158cf3520da587e88 DIST diskimage-builder-2.11.0.tar.gz 334400 BLAKE2B 0bb15b83b8fe1d5217197e491c83010b098f00ff13a8abf5da2890cdcb1b2a7cc81c8a5befea9b1c184ce10a35a73068ecc336594f813831584ca0b94b822ddb SHA512 3caa7809552c472e28906587889f1e310855ef4686d1da1adcb1dadb4cf3550ded30f7ec7483d4889f96a9e1d11b19dcb53b0458c75a801a378ac01e8b0d26e5 DIST diskimage-builder-2.12.1.tar.gz 345503 BLAKE2B 6a953144ebbb8333fc39bd5d5769d07b01f7b4a07a4712a15678740245286381a49c23e4e7e61cdb63b456cbd802bde2eb0c18e147b7f550f05f84d04c1419b9 SHA512 5eb2ca42acc2d661d64bb6a5f90c5ec390176fe80a9e6932b576421ff6ab0cb454d13e99abdfabb2bc023a4f1f6ed85c7b306b108ba7ca38b5e959c28d005b1a +DIST diskimage-builder-2.13.0.tar.gz 347967 BLAKE2B c79c10276b9d82af6f0fc9863cfff3f0307f871ffde059b3a449f1b12dea7875624a62b932317d5209a7f01bd87a6d4d923a16115dde84e9fb224d33f1be9123 SHA512 78bfb384964a8a8d3c2db9dc606c0432611620fd38ac78984892366b58938865029d2a611ab736b9f98a610156ea0f9a065028a1f92b4b11fc0fa76f51a97862 EBUILD diskimage-builder-2.10.1.ebuild 1100 BLAKE2B 204c7a4b2bd37127b7f5187b55279195ce48c2b93fbcfc1b15d720648df6b0831121ba6846f08abad4c94f5ae5ab433ebe8cbf53bd35c9a9df00a6241f96fbfb SHA512 34488e929ade8540d8405adf071fb9e81dbffd4ae6efb24fa978fc3c407c739c7381898cc3e2639d8310f39f9af40507a10ed163798151e426a0579cd58a6b9a EBUILD diskimage-builder-2.11.0.ebuild 1100 BLAKE2B 204c7a4b2bd37127b7f5187b55279195ce48c2b93fbcfc1b15d720648df6b0831121ba6846f08abad4c94f5ae5ab433ebe8cbf53bd35c9a9df00a6241f96fbfb SHA512 34488e929ade8540d8405adf071fb9e81dbffd4ae6efb24fa978fc3c407c739c7381898cc3e2639d8310f39f9af40507a10ed163798151e426a0579cd58a6b9a EBUILD diskimage-builder-2.12.1.ebuild 1138 BLAKE2B 5c90ef6e4eaff62dd734d18ae03b18329477e8c4757c631854e038d0aa189f46d96a38e4dc2297c98418e68986aa99f3dc01b97bd3b93ba44f9b4421aeee5dae SHA512 b908a4c30c9e5b5d7adb6ddcff9a539fec366e940a62ef8870f274353e2ba747da9e29d72139794769c7db943b5291a0f0feefeb59e08e65010edd0f1867abc0 +EBUILD diskimage-builder-2.13.0.ebuild 1138 BLAKE2B 5c90ef6e4eaff62dd734d18ae03b18329477e8c4757c631854e038d0aa189f46d96a38e4dc2297c98418e68986aa99f3dc01b97bd3b93ba44f9b4421aeee5dae SHA512 b908a4c30c9e5b5d7adb6ddcff9a539fec366e940a62ef8870f274353e2ba747da9e29d72139794769c7db943b5291a0f0feefeb59e08e65010edd0f1867abc0 MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277 diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.13.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.13.0.ebuild new file mode 100644 index 000000000000..1495264437fd --- /dev/null +++ b/app-emulation/diskimage-builder/diskimage-builder-2.13.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="Golden Disk Image builder." +HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] + !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" +DEPEND="${CDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="${CDEPEND} + >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] + !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] + >=dev-python/networkx-1.10[${PYTHON_USEDEP}] + =dev-python/pyyaml-3.12[${PYTHON_USEDEP}] + >=dev-python/flake8-2.5.4[${PYTHON_USEDEP}] + =dev-python/six-1.10.0[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] + app-emulation/qemu + sys-block/parted + sys-fs/multipath-tools + sys-fs/dosfstools + sys-apps/gptfdisk + !dev-python/dib-utils[${PYTHON_USEDEP}]" diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index 84ef23e051d6..d51945cef578 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -1,7 +1,9 @@ DIST docker-compose-1.18.0.tar.gz 231256 BLAKE2B be9b57dd89a81734b850f61622a924a3ace5ace907c4d1365a18315ddfbe3f1a9a56b222766980d16d5eddbe6818caf94a5833c5cddac082fa230bf290977ee3 SHA512 9cf29d892f6419e9ef639e1b9edddecb47ddb5ba7f97830f732e463ee510ac5464d6d81f58a2bf4ae5e7aee78b3d2d4afd59e6e1b53974899edb3e090bcb991f DIST docker-compose-1.19.0.tar.gz 238307 BLAKE2B 2a7bbcf50c2cc591eba1d59db30cb0341e33e3f1ebe948e0b6762d9bffcdcc72d98e2da19fc549c5fabda192fca69a9d54e016601ddb4f4a94f0dc1c93f99a29 SHA512 f1d522621580a5130378508e6b15ad2e4708e9c5ff713627ca54308ab3e6bf000e21c55bbdf9585b2116e73648fdc773500a5415ab81a72dd2c69c9c07e71581 DIST docker-compose-1.20.1.tar.gz 246159 BLAKE2B 32836f06239d6f1506ecebac48c8b56c58620d0ba309b8469c073ec3b048bf3743afb1ff6f63d2031df4bb316191d9cd32d5cf85a2cb86544254c6054a7dd502 SHA512 faba24ea501c4e4aaf04bddf1d498eaa7702385458ac7a41f6054e9153f9e03e1e6f50aebc5156d6a814d567aedea1d16ff532872a1765bbabbd3c8da47e36e0 +DIST docker-compose-1.21.0.tar.gz 250262 BLAKE2B e27c6a24d9f02a6746e53d42845424d3c2eef0a816106a988a1eb7dfdc7ea39b1025afb6a4bc361bc97af501af554cb4b34ab62c150e500620c3256074d69a44 SHA512 1926abbb67508216312880f3f0ad7a752760f324a0d17548ecefa924f571896a55a7fc5d174f6ef3ede314c488dec8a7edbccdc399eea6d34459cb812cf103ac EBUILD docker-compose-1.18.0.ebuild 2421 BLAKE2B 070e116b0354b3965202ea93698a8846c032b774b2a16154d1be5ced36e963780675cad11fdb43b01baf6997b35b85b87907f32fc56ee5daa1191c1c7265eca0 SHA512 988e42951a910fbd70f9605483240ee7fca1c003adde6b1cb7aeb21cd70ef074b5a919db8bd4a8bd89c6dd158041ece024fcc8dc46e1e2c5d69e1de56d27acc7 EBUILD docker-compose-1.19.0.ebuild 2422 BLAKE2B e1ae8b4b44640361fdc8fca0cdda1ce95340b3cfa564b2d6cf3e0785bf65057ea53e14b773204d1d7c93c142394b3800e78364eaa6cd0ce9372d24135ab73bff SHA512 1b283b87382f6cd0402dfdc4c97cbb16e1c2eb7da645b50bdcadd048054c769ddcf742b7067b686ab1d8288256e713f277d1e97b32c27821bd3c9ce507e4b7ee EBUILD docker-compose-1.20.1.ebuild 2422 BLAKE2B 5f465712c50acb6a47baa4ed2c306a418084f3bd761d5f48e085587610769c15b2c61190693c7ac9e50bef6e3aff7a1cbbfc0311c6090fe50992fc4cb7922a82 SHA512 f6a848ea0ea2cb4ef7d9c1715d6d2b4e4f9fe81af1ea79d3f151d00b00b9d3166f55720257c75138d9f80ea27e6a35fa49c6f26e09461c7c5861fcb2d1f9c52c +EBUILD docker-compose-1.21.0.ebuild 2422 BLAKE2B d63ab5a26c436f3d25d04fd35a94c492392be0a5339197c11c7f163fb1cecea8da010491de89a0902365afdae76160e9a39c37849c0aa38eb29eb8365cc82588 SHA512 ab2fd63ceaf81a4e507bbe6e3552d97bdda89428d3212d915ecd829e10dbe4723a8d2f85954000f48f8a32e2e05e43c4cfeef8688e6b3ae3bbd47ed9f96ec40d MISC metadata.xml 322 BLAKE2B 4d738cf090acd0f720b7805c8dd1a2288a1779dcf4af21ab5aeb4cf81b609d0bd2a18cbe79c165f9c9e60b993a8b864e1e5c61cfa773c57b08aef468d93a0391 SHA512 6ecf808eb20a0f475101524b1f4b29db49d4fce9bc3408b3e806e225e4de7b5f0c7af019809c329969f25dd050ba164a09effccefea0d2ada8e8bcf9790d39f2 diff --git a/app-emulation/docker-compose/docker-compose-1.21.0.ebuild b/app-emulation/docker-compose/docker-compose-1.21.0.ebuild new file mode 100644 index 000000000000..5b03868dc924 --- /dev/null +++ b/app-emulation/docker-compose/docker-compose-1.21.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit bash-completion-r1 distutils-r1 vcs-snapshot + +MY_PV=${PV/_/} + +DESCRIPTION="Multi-container orchestration for Docker" +HOMEPAGE="https://www.docker.com/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +CDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] + =dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] + =dev-python/docker-py-3.2.1[${PYTHON_USEDEP}] + =dev-python/docopt-0.6.1[${PYTHON_USEDEP}] + =dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] + =dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] + !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] + =dev-python/pyyaml-3.10[${PYTHON_USEDEP}] + =dev-python/requests-2.6.1[${PYTHON_USEDEP}] + >=dev-python/six-1.3.0[${PYTHON_USEDEP}] + =dev-python/texttable-0.9[${PYTHON_USEDEP}] + =dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] + =dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' ) + $(python_gen_cond_dep '=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) +" +DEPEND=" + ${CDEPEND} + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) + ) +" +RDEPEND="${CDEPEND}" + +python_test() { + ${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}" +} + +python_install_all() { + newbashcomp contrib/completion/bash/docker-compose ${PN} + + insinto /usr/share/zsh/site-functions + doins contrib/completion/zsh/* + + distutils-r1_python_install_all +} diff --git a/app-emulation/docker-machine-kvm/Manifest b/app-emulation/docker-machine-kvm/Manifest index 4ea1ffc002d9..fc85222ce8b4 100644 --- a/app-emulation/docker-machine-kvm/Manifest +++ b/app-emulation/docker-machine-kvm/Manifest @@ -1,5 +1,5 @@ DIST docker-machine-kvm-0.10.0.tar.gz 12183 BLAKE2B cfc1c8286d23e7bdd3f98c542da5f9507dafd99aa37361265ac2774b910e5c900dca94cc0ac0f827715a390aea09762fd25423fe6e587990c667eda2af6935cf SHA512 d4725531e43814ae2b8c3826ad695cc853177d09aeae9c97aa24b5c0de8732bdef67b12f7218244cf44cdd589bb9878058e587c946e13481ba57cb418c535e9e DIST github.com-docker-machine-v0.10.0.tar.gz 1605832 BLAKE2B d53e3dcd43af3ea9d1dd764ae5a409e1d4339576c35365e7e06a28f4e37ace3998fb8c909a0af8ed7fbfcead7dcde1a4e71d3b78b601a65e59aaa13256199cf7 SHA512 337ed74474b5e55e10ccd7c8bb3b778d06fc2c56c1646678715548ddeb41a0b7320212d498ad96cbdd08137f78013506b569c4e0aa0a2f28169264d64d814f7c DIST github.com-libvirt-libvirt-go-c3209e4ba8b8dda65c85ca0ac04302e55895caf7.tar.gz 100068 BLAKE2B f57c460c6f833d77ea74908bbd0c72b0982b2ce24e47e68e1e509a526b1ba20f224c2492e1fd715431b13696b4110ba404f12b8bbc45deb5911438ce0b2bc6b6 SHA512 7ac5964349c90ac45f627f9c714b04c3ff07428ca2ef7edb1bd173cb7264040ddb49f9df57249a7dbc5f3500c7e1b4011b40faf4b8104f1ef56a1833cb020ab3 -EBUILD docker-machine-kvm-0.10.0.ebuild 913 BLAKE2B 7c0f84d41c1bae20b761d8578c345c06cd1a8e9060c90b540e2d3780ba4f5c055824e9e6c504b849ef8a7eb28d72890fc968485c170857125beaeb943c001dd9 SHA512 7a46bb3ee86721e3b7038a7f2545a18180d68a53f0b6b3bf7d57f5cb5f4ce865ef9c3e994edee428db60ca57a03ac3ffcb4672cbaf22d2b4330a7e04ba5adad6 +EBUILD docker-machine-kvm-0.10.0.ebuild 943 BLAKE2B 91729ba1282eeb300b250045ad87e435431ea1bc570ad1a8295495287704ae146419045117d651af5d27a16fde273cff9f49ed6822ac3359bd1d3d4b202a8887 SHA512 f65da5970ddc2cab7dbb600c8bb517cf19163226a50dfbc1b318953ff5088f97f609b26de8f9aeca49dc11e0c6029f7d8733b16fcf5a0324fe4f3f890eeb34c2 MISC metadata.xml 310 BLAKE2B 4c96bb6f52227dc4839bf6e2f2142940d9840f15bed831a544f1cfab38489ac849ffc52cbda4b70fc95553629d2ed68c5ba6d8f9e7bdc12c03f04425fc19c264 SHA512 c300a073141c91ad01121660ed2aeb85deaac9308b6296fe261a6e9a5b24e676bfd25b7a52289e3e39b2b1885518eb4fd422c8da6ba77dfdfc68272922b06d66 diff --git a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild index aee05fbbadef..b9a0908fcb3c 100644 --- a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild +++ b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ inherit golang-build golang-vcs-snapshot KEYWORDS="~amd64" DESCRIPTION="KVM driver for docker-machine" -HOMEPAGE="http://${EGO_PN}" +HOMEPAGE="https://github.com/dhiltgen/docker-machine-kvm" LICENSE="Apache-2.0" SLOT="0" IUSE="" diff --git a/app-emulation/docker-swarm/Manifest b/app-emulation/docker-swarm/Manifest index adc1ae05a092..19c9b673a1fc 100644 --- a/app-emulation/docker-swarm/Manifest +++ b/app-emulation/docker-swarm/Manifest @@ -4,6 +4,6 @@ DIST gobrake-2.0.8.tar.gz 6392 BLAKE2B ec3eccd5a52442163108c9e8f83e2e7a19ed45438 DIST gogo-protobuf-0.3.tar.gz 2116795 BLAKE2B 6b90ad97648e75724c69bb9b8d3cfb17b919a1121813c09ec463df99c290c117b0e0b87f43b285eb5147a205f2f926c223cc4b4d58205a286af2afa87dbd7f5b SHA512 57e1b1715d4811800da8cf9f2c72d202deae622d89715d7eff2ff0c406a0ea3778c187443abb17b072ae6fe57382844807f103837032759dab5420c860b99fb8 DIST logrus-0.11.0.tar.gz 24165 BLAKE2B 5d71a4b78d5c46e71401a08d9b0228236f74e864d14206bd6450268a3a41d5f2ac7155c39f250b9906ec132fa63ace6e8888f0ec482ed4a0828696326bbba25e SHA512 ee0b813e277cef0533800a966e6e07884b8de64e75c200439979f00986d84f98cfc750f7d4cb2a2b57d6524941fbba0c6211ce37da50d9a8ca99274f81639620 DIST logrus-airbrake-hook-2.1.1.tar.gz 3896 BLAKE2B a41877c8201d39f79fd0fabb7bba8d513c14931ab6a2d59b9dbe5907ce32a67d852f8cd25a2ed058ee95d321e430818d5258b4e047f3b809503da58a96bc8876 SHA512 8559f821731ee086a267f43f6e150e18b24a32a2556c45499b2ec42a85642a0581a862fc827b8b9a1949d003b5e36e69972df92a005111b94e2aa9678c336240 -EBUILD docker-swarm-1.2.0.ebuild 946 BLAKE2B eab83050527f58100dab25e11a0ec5e3360507f6f3bed7dccebb9430e6d1436eb14c88a5096fc2d95edf5c47c324aa4aab55813cefe6314f26de63654e50ce8a SHA512 2cca2506e1638caf79f28f088cb8184fef4fdab87bfc723d29c7a1337a20b942f6e50a7b77d130d1720e2d9b764d360c1644fc39a42008d32648335b1f32144b -EBUILD docker-swarm-1.2.5.ebuild 2144 BLAKE2B b54f6fd7f8ee964719444260852cfbac206459bdc0990a612cdfc094e14de31a525c041dfe5014832382522606df1d907057c5345ad12dab99886e02eab4a2f1 SHA512 47509fe75e4701a012e8224aeef267bcc7da8e6108535a670f74caa81fddba264c789cef95cb89d94aa79395ad139a32ea5cc732221ecd7798831767cbbf77bb +EBUILD docker-swarm-1.2.0.ebuild 941 BLAKE2B 7ec81166468e0be4cdebeecff453ec3808dd2a9760e139074223d85aec2b0cfa0b96b620e9ebeae26e2b011fd8bb38ae10e98eabffa8b35e2075869104d0ebd1 SHA512 809046fb932178783350cd6cb09327960656dab3b67b10d80941cc9a977561546ea9bfdc05b1f577eebc98a8b84157e568a07220a45a12b8367e4c18a203b593 +EBUILD docker-swarm-1.2.5.ebuild 2139 BLAKE2B 575c2840e4a82292373239962ec22630b1b45d6acae433750e1b4e0f4956693cd52734f38015a9f0b86461be55b58739d70326a60f29734b02d0b7e02f64804f SHA512 ab65af5d107c5153c1f50a41be577d3250384d3b50b2ca1a7626c30a58ae918314e1dfb9f9c5a745c125cad5768a8888d3cc9a0bf97f973bc5b5012dc0b7a8d4 MISC metadata.xml 303 BLAKE2B 876c526defdc7c039b7923f9860e3fef8bfc3c835e4cc8a50e54ae3ae535c53a27fea39f17a3fbe46939a330e16e9534ebd6ec64d3141075694c4010bb858ef4 SHA512 b724e0dbde2212d3071b201aca8572059e0756f3be2a056097c84ea802ae4365a9682767725a02e3333f5f5cbd31f8e30a0a2b54b3e32619d75fbaa8400a9c22 diff --git a/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild b/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild index 0def6b786c3f..c0ec9a067395 100644 --- a/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild +++ b/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -16,7 +16,7 @@ fi inherit golang-build DESCRIPTION="A Docker-native clustering system" -HOMEPAGE="https://docs.docker.com/${PN##*-}/" +HOMEPAGE="https://docs.docker.com/swarm" LICENSE="Apache-2.0" SLOT="0" IUSE="" diff --git a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild b/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild index 65a67d8c2b90..10d18218802d 100644 --- a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild +++ b/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://${EGO_PN%/*}/archive/${PV}.tar.gz -> ${P}.tar.gz https://github.com/airbrake/gobrake/archive/v2.0.8.tar.gz -> gobrake-2.0.8.tar.gz https://github.com/Sirupsen/logrus/archive/v0.11.0.tar.gz -> logrus-0.11.0.tar.gz" DESCRIPTION="A Docker-native clustering system" -HOMEPAGE="https://docs.docker.com/${PN##*-}/" +HOMEPAGE="https://docs.docker.com/swarm" LICENSE="Apache-2.0 CC-BY-SA-4.0" SLOT="0" IUSE="" diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index 8b1d402e7ebc..ea4ca13508dd 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -1,7 +1,9 @@ AUX bsc1073877-docker-apparmor-add-signal.patch 715 BLAKE2B cb97ebb2e7104e04264318fec93df80a5f7f9b4cfc84b9f31ea1185d7752e431d714dd901b168c490562688c124aac8d48fef9c1266d7a8fa07aa06de7e40d08 SHA512 936d3948fd3ccadd4a3810bb8fc32e31e7e24b810e87658e5e53560b515454db6b72b0cda3ace78b9267e197e55181c04fbea92a1656f6a282e29f37d2994adc DIST docker-17.12.1.tar.gz 11046888 BLAKE2B f50236826d8b064023e76a6c23a52c307eada73338d25fcc4fd3448a855f91b0f1d3080408bc9e58102467a9605c54c20080773b46851135566b85ce00f7dfb8 SHA512 ca9c28a489c6c65de27cb64e68c783336e2ddca7e7b2d241e9557a43e62e33146afb644aa67fe92afce658522c02fbe0378b3c1318a32628c1a1a046c67a4fb7 DIST docker-18.03.0.tar.gz 12751925 BLAKE2B ea28cb4904673c8bbc71add57c880db8593ba68afd40f60029f0b509bde4a61cd1c59ac8f12fd9d3a99571ffaf597745187bab47b897170c54bf9b05d67c0983 SHA512 6385d720a58275d3e415c89f6953b64fdf96c2297ea7a86baf8f044530bb55fef40479e8a018055b85fce73f30dfb36a9904ff13bc12acc6ec4b565431145dbe +DIST docker-18.04.0.tar.gz 12797074 BLAKE2B b0e646da91f355279a451048da057e5f5a0b74cac7a827a7ba17ddb38dfce2729dd0282f315b214fe513a1d6f2d37f62e3935f7f41fb2fdd1f265b2de5b95516 SHA512 83a8327c714296b769ef258c291d239195459b833c5be635ee29ecbe53597d74f064d398e4b66870e2e30be17c91ea34820fd563b0d089e862b43a4cada4963a EBUILD docker-17.12.1-r1.ebuild 8355 BLAKE2B 2635bafbdc6be0840a83717e862b45045c0c30748c8633b76d2913b6497fbf921a24e85580208055ed22eb92c6fd990e1642cac56e41a7149d614d328b65c670 SHA512 e78bbe39f140d48ca9c49ff7efda41f5d531327ec9be528238aa2929636cc59704dadaa7d689c7c34abcab2c869430f118763878a74cecc0bcf73748cfa2cc69 EBUILD docker-18.03.0-r1.ebuild 8338 BLAKE2B 0f41ecaa377dd1337aabece074c4cf77cd8da9355df76fc6dbf31553bbce8ec03c12af8171f3261627604833032dd727e44e6b554887f2288070d3baa84e2104 SHA512 c62f6d9348c5046c51fd61d60b2f234b92d4e787906a83de9b733aa201e9b43b2f13f638bf299181d10e4a7aa803abacaa77493dbe6d7ae2de627d794734b335 +EBUILD docker-18.04.0.ebuild 8338 BLAKE2B 731e0b173794bc030e41d3f2fb9aea4c4c8be01318bf02fb8fd0749ddb0c0db6240be3dc45880a4beb3f070a01869c4cd0e71913507bd07a882ded1f7bda3805 SHA512 552783e687a8ddbae0a4ef343ba94a3805f44ad642db533c117aaaa944d941dccef955dd8cc4df879d3b19c3b1f7d980e02a1ec167ea943f4b13619f585b9fe4 EBUILD docker-9999.ebuild 8077 BLAKE2B 8b65d3c59a41acd2020f1a43cf79bea2871fb7b911170741eb3c217e9acd4a5a24b2c2e204e3635cac3e392c72bdafc332b25fe0613991e37cb3d7c55700d399 SHA512 1fb9025bd12796909a623a3ebc9da52e4e8fd73d11f60e25907530fcb62039d7dcf580e4e6f22f103cf1a07aee8bfd6975fa11bd0829952d23613d4ae7ade9c4 MISC metadata.xml 1637 BLAKE2B 14c56a84e41ebd76827cf37c27fe21259ca06e00d8c7fe318bd5eca609a77a9e23fc5ea13caba1616e47d17978402f715e6a8bc40643ce0cfb3ee87494ee6858 SHA512 bdaea32036a7f65f7015634d45bdf4f13322f3266cda389b49d2c57ad86e9811731194af5786e312d5ea40dab8b8eb78fc7b79a2ffee186b8eaabae9cc3c7a1b diff --git a/app-emulation/docker/docker-18.04.0.ebuild b/app-emulation/docker/docker-18.04.0.ebuild new file mode 100644 index 000000000000..3ec5efdad6c4 --- /dev/null +++ b/app-emulation/docker/docker-18.04.0.ebuild @@ -0,0 +1,303 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGO_PN="github.com/docker/docker-ce" + +if [[ ${PV} = *9999* ]]; then + # Docker cannot be fetched via "go get", thanks to autogenerated code + EGIT_REPO_URI="https://${EGO_PN}.git" + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" + inherit git-r3 +else + inherit versionator + if [ "$(get_version_component_count)" = 4 ]; then + MY_PV="$(replace_version_separator 3 '-ce-')" + else + MY_PV="$PV-ce" + fi + DOCKER_GITCOMMIT="3d479c0" + EGIT_COMMIT="v${MY_PV}" + SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm" + [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" + inherit golang-vcs-snapshot +fi +inherit bash-completion-r1 golang-base linux-info systemd udev user + +DESCRIPTION="The core functions you need to create Docker images and run Docker containers" +HOMEPAGE="https://dockerproject.org" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="apparmor aufs btrfs +container-init +device-mapper hardened +overlay pkcs11 seccomp" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies +CDEPEND=" + >=dev-db/sqlite-3.7.9:3 + device-mapper? ( + >=sys-fs/lvm2-2.02.89[thin] + ) + seccomp? ( >=sys-libs/libseccomp-2.2.1 ) + apparmor? ( sys-libs/libapparmor ) +" + +DEPEND=" + ${CDEPEND} + + dev-go/go-md2man + + btrfs? ( + >=sys-fs/btrfs-progs-3.16.1 + ) +" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies +RDEPEND=" + ${CDEPEND} + >=net-firewall/iptables-1.4 + sys-process/procps + >=dev-vcs/git-1.7 + >=app-arch/xz-utils-4.9 + dev-libs/libltdl + ~app-emulation/containerd-1.0.3 + ~app-emulation/runc-1.0.0_rc5[apparmor?,seccomp?] + ~app-emulation/docker-proxy-0.8.0_p20180314 + container-init? ( >=sys-process/tini-0.16.1[static] ) +" + +RESTRICT="installsources strip" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +PATCHES=( "${FILESDIR}"/bsc1073877-docker-apparmor-add-signal.patch ) + +# see "contrib/check-config.sh" from upstream's sources +CONFIG_CHECK=" + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG + ~KEYS + ~VETH ~BRIDGE ~BRIDGE_NETFILTER + ~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE + ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS + ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED + ~POSIX_MQUEUE + + ~USER_NS + ~SECCOMP + ~CGROUP_PIDS + ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED + + ~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED + ~CGROUP_PERF + ~CGROUP_HUGETLB + ~NET_CLS_CGROUP + ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED + ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR + + ~VXLAN + ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER + ~IPVLAN + ~MACVLAN ~DUMMY +" + +ERROR_KEYS="CONFIG_KEYS: is mandatory" +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_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" +ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" +ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" +ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" +ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" +ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" + +pkg_setup() { + if kernel_is lt 3 10; then + ewarn "" + ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." + ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" + fi + + if kernel_is le 3 18; then + CONFIG_CHECK+=" + ~RESOURCE_COUNTERS + " + fi + + if kernel_is le 3 13; then + CONFIG_CHECK+=" + ~NETPRIO_CGROUP + " + else + CONFIG_CHECK+=" + ~CGROUP_NET_PRIO + " + fi + + if kernel_is lt 4 5; then + CONFIG_CHECK+=" + ~MEMCG_KMEM + " + ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" + fi + + if kernel_is lt 4 7; then + CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES + " + fi + + if use aufs; then + CONFIG_CHECK+=" + ~AUFS_FS + ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3" + fi + + if use btrfs; then + CONFIG_CHECK+=" + ~BTRFS_FS + ~BTRFS_FS_POSIX_ACL + " + fi + + if use device-mapper; then + CONFIG_CHECK+=" + ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + fi + + if use overlay; then + CONFIG_CHECK+=" + ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL + " + fi + + linux-info_pkg_setup + + # create docker group for the code checking for it in /etc/group + enewgroup docker +} + +src_compile() { + export GOPATH="${WORKDIR}/${P}" + + # 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/$(get_libdir)" + + # if we're building from a tarball, we need the GITCOMMIT value + [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT + + # fake golang layout + ln -s docker-ce/components/engine ../docker || die + ln -s docker-ce/components/cli ../cli || die + + # let's set up some optional features :) + export DOCKER_BUILDTAGS='' + for gd in aufs btrfs device-mapper overlay; do + if ! use $gd; then + DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" + fi + done + + for tag in apparmor pkcs11 seccomp; do + if use $tag; then + DOCKER_BUILDTAGS+=" $tag" + fi + done + + pushd components/engine || die + + if use hardened; then + sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die + grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' + 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' + fi + + # build daemon + VERSION="$(cat ../../VERSION)" \ + ./hack/make.sh dynbinary || die 'dynbinary failed' + + popd || die # components/engine + + pushd components/cli || die + + # build cli + emake \ + LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ + VERSION="$(cat ../../VERSION)" \ + GITCOMMIT="${DOCKER_GITCOMMIT}" \ + DISABLE_WARN_OUTSIDE_CONTAINER=1 \ + dynbinary || die + + # build man pages + go build -o gen-manpages github.com/docker/cli/man || die + ./gen-manpages --root . --target ./man/man1 || die + ./man/md2man-all.sh -q || die + rm gen-manpages || die + # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) + + popd || die # components/cli +} + +src_install() { + dosym containerd /usr/bin/docker-containerd + dosym containerd-shim /usr/bin/docker-containerd-shim + dosym runc /usr/bin/docker-runc + use container-init && dosym tini /usr/bin/docker-init + + pushd components/engine || die + newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd + + 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 + dodoc -r docs/* + + insinto /usr/share/vim/vimfiles + doins -r contrib/syntax/vim/ftdetect + doins -r contrib/syntax/vim/syntax + + # note: intentionally not using "doins" so that we preserve +x bits + dodir /usr/share/${PN}/contrib + cp -R contrib/* "${ED}/usr/share/${PN}/contrib" + popd || die # components/engine + + pushd components/cli || die + + newbin build/docker-* docker + + doman man/man*/* + + dobashcomp contrib/completion/bash/* + insinto /usr/share/zsh/site-functions + doins contrib/completion/zsh/_* + popd || die # components/cli +} + +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 + elog "To use Docker as a non-root user, add yourself to the 'docker' group:" + elog " usermod -aG docker youruser" + elog +} diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index 6178207deb49..b125365424fe 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -4,6 +4,6 @@ DIST free42-nologo-2.0.10.tgz 7389429 BLAKE2B a633a78ed5974e327aafa9d783c04bdcaa DIST free42-nologo-2.0.17.tgz 7389996 BLAKE2B cc7c7bbe43eafc190fe0ce8921e032c2042290fe54a3153ba7568dae315de1356a9ee7f8ded4528788c677537138a5bd5556ad79dbd67ab8e41dd881a258312e SHA512 f73bfb2984fa4301c04d905fde6723583a57a1f663e012f965037067a7259961c0134fecb456118ec4b45956f7c8ccc16f0ec1db62e4cc705dc74ea563225872 DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5 EBUILD free42-2.0.10.ebuild 1058 BLAKE2B 2aea0b1798c337318ea685808d0f2c44f78f7730fd5aebc107b90a42c4b1fa8a9924c34cbd2f1e494087fd5033f6071cf665c63e2289ad1a23568b2210595d1b SHA512 494fec4edfd65644cb55c53d31ab4789f2dd5cc051529fcbc8bc909eaa4a305ad02143b2c04745cdd11be1a0b7dececf2c595907ba883bbb39e7a1929b8f1539 -EBUILD free42-2.0.17.ebuild 1059 BLAKE2B 24d3dc679871c3708019e8f35d5984393e1b9d55030314565c1b38fccdc6ef0fc76e9344c5824e185256c59d8b96207a8b6574d844d34403169cab127c4ee580 SHA512 b6e0cce9b10fbcd9d5eeb35f2dca5cc3cf346d0aafa56e27355eb5fd47268189b8b4585564496f7badaa0647b276b0dbac8f418b0ceaf69a3cf3962ef3565085 +EBUILD free42-2.0.17.ebuild 1058 BLAKE2B 2aea0b1798c337318ea685808d0f2c44f78f7730fd5aebc107b90a42c4b1fa8a9924c34cbd2f1e494087fd5033f6071cf665c63e2289ad1a23568b2210595d1b SHA512 494fec4edfd65644cb55c53d31ab4789f2dd5cc051529fcbc8bc909eaa4a305ad02143b2c04745cdd11be1a0b7dececf2c595907ba883bbb39e7a1929b8f1539 EBUILD free42-2.0.20.ebuild 950 BLAKE2B 9bc7e94b50e067507c33a467b99fd860c88b4d7cc7fddbd949a05b6584bd21f08657c22ff9c7d33cbf1ee5898d830c973d597db94dbd14e5895b1294e0c272c0 SHA512 c5e9ef21556bd9580f304f88c28c76a019cebafc340655152a02febc4e5ae87dbc9f8966e57b589e1e0020ae02166fc9e86fafecd74f3966b6672407c13482be MISC metadata.xml 540 BLAKE2B de6a28fadb4dba9dac7c9aadbbd0972cb9583c8b1aac154ed9247199287c060adbf5df8a0639b7e4ff218da84a5e1c19e855e2c11688124c76c1cc07fca1e393 SHA512 88a7488f445dc2233eecb68e9100751da821c45ddb6c60a18600dabe7278681a3625abd59ed7088bc526d0853529c98bb84fdd76796a5cdd4a5379bd6e17b7cb diff --git a/app-emulation/free42/free42-2.0.17.ebuild b/app-emulation/free42/free42-2.0.17.ebuild index 417714d3504f..5d440a08b23e 100644 --- a/app-emulation/free42/free42-2.0.17.ebuild +++ b/app-emulation/free42/free42-2.0.17.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="alsa" DEPEND="dev-libs/atk diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest index a5f4d32ff4c2..d3a1036e7bbd 100644 --- a/app-emulation/virtualbox-modules/Manifest +++ b/app-emulation/virtualbox-modules/Manifest @@ -1,6 +1,7 @@ AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1ded8e51315f41292f9fcc0adb294e9b235b0c2f1e91f6f728076ab85f687ea1ba2877dc44b511eaceb24e7d6e71a8bbd4 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771 AUX virtualbox-modules-4.1.4-pax-const.patch 1729 BLAKE2B 3cada201a2bfde671c073ad49ddd239f90fa2c5338e698b35226e2ac88b4773549a216daa1caeca432e151f892974950dac5defdf91a87916e037d56d5972f5b SHA512 efca9213ace1076e354e168fa3d92da683b2dc27e5306b60452da74cb7f5a024a92033dd07d3559bca70f972aec86be3f0ed186dd951161096df2bcd9e390abe AUX virtualbox-modules-5.1.30-udp.patch 1239 BLAKE2B d49d96894bae2fdedc2b8a825c849a99ad0cf36a92cc4d89881ce72a0b7ebd53174f39e298c119670654932b790113fe7fbc3a3bae552f2c597cad20a370141f SHA512 f22e6c8edc360e0f97b207ba9a046042ef1898c10c724d9519badef004858720040caef12bffa1ed0f07517ae2d0b831973a0e4ef8ffb239a26faf62706b0618 +AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8cea08a6dbe78f75dd89aa072ac2ac0d745e598e8195ef321eaee53d31bedf52013d94efc046863e65c9fac0d61a507b292b04c7fb9 SHA512 600fd557992efb1fb5db9db64914becd5a86f81a42d70bbc3823533df941881f2289a6ccf630adb8346419499dd48b84ed43c21d0aba183a780daa99fcafddbd AUX virtualbox.conf 38 BLAKE2B 853f2ba0ac1627100241e778fa6c35ff4fc86e8c9c753f8aa23cb053ffacf966c131c5630d1fafd481d7b057acc3e9d6f8f1a22766db5d1cf61fffa38de7c01b SHA512 b61936fff57426d31efa6928eadb572cafe40a65d3e31a0eecb53dc784ba9d0a9e0ad5e419df74418b977f89c17873240c38e2ada95949e5252d879110d6094a DIST vbox-kernel-module-src-5.1.32.tar.xz 626600 BLAKE2B eb3243d62d1a22f41f5ea2307b13a3f5ce17a19edcecb0340f94d34995e557b016195443a53edc9d68a313d064008e5af04c7fff28540ec513c6e9a5955e02e0 SHA512 10ead68e53ae6bd72e39b31d536fc36e0999fe506a6d7fd6a6f9e462d539213ad65deb56e2b926baa5cc4b16fb4071d89e105889e873fda0e4a1f20387a7cd39 DIST vbox-kernel-module-src-5.1.34.tar.xz 627576 BLAKE2B c1bd2af511824e5a74c3b85b73b7bc1664dd3651db3c17bbcba06b5ef8d9ba11c1a5c92bf28f443fb17aee1d057310f20a62c1a4608ce84eb087de61cbe67c25 SHA512 6176036a22d316e15c6560c124cfce9e93c6508a78e189bbe8e431ccf006b74d5f34ea747c9ca307bbd90e0c6fa414056ae0b56a5aa8124c2263de3d0dbf97d1 @@ -9,5 +10,5 @@ DIST vbox-kernel-module-src-5.2.8.tar.xz 636172 BLAKE2B 0a0be16ee830dbf60e9bd8e0 EBUILD virtualbox-modules-5.1.32.ebuild 1585 BLAKE2B 880c04c95561aec23bbb9c2324a5cec2b17bd9fc77555d595560a85c5e3df42383ef00ee8cd488caabcc205eedfb7da3ef6e549b84d3abd248e7fd2c1979a7eb SHA512 5b48e0068a2e4012549465b5989c7563e135c9db4671eca02bccf75277f2aaa9ed74d3f3d58642b92403611729f5d9a259d262a32ebc499cabc976deb2d617b3 EBUILD virtualbox-modules-5.1.34.ebuild 1587 BLAKE2B 234cd56aff2a2cc66f52538709a09205aad5278748ba3ec8004622a34a18a9e2d241d87cc1f50f6dffcc6dc0073327581eebdadf5e77c494ce3402fb3c6cf123 SHA512 dbe458080d79628c642890477282ad14ece9a5e6ef3a67af2d8609d786e8dc732bcb1715e9b7f4e6b8f33e0405c10411911f73cc3076f0c72e23fb2077577583 EBUILD virtualbox-modules-5.2.6.ebuild 1345 BLAKE2B c88b63cbc94e33af18f76bac3ec977eca0fca315e799b584a6337bba8c8116e58264ced4608df2b7e8c2e38823b8bbf9c082eeea085cb21a3aa9a4958566ccbe SHA512 1f239cc64421643fa6dfd28da712f9e352810b6e57d1b2e205534c3be583b405aee622d473be05d38ac5e85588350ada13777897250b50b83a0deee7b0c3dbde -EBUILD virtualbox-modules-5.2.8.ebuild 1345 BLAKE2B c88b63cbc94e33af18f76bac3ec977eca0fca315e799b584a6337bba8c8116e58264ced4608df2b7e8c2e38823b8bbf9c082eeea085cb21a3aa9a4958566ccbe SHA512 1f239cc64421643fa6dfd28da712f9e352810b6e57d1b2e205534c3be583b405aee622d473be05d38ac5e85588350ada13777897250b50b83a0deee7b0c3dbde +EBUILD virtualbox-modules-5.2.8.ebuild 1349 BLAKE2B aedb499c747c2d989090144f652365ad550f578edb98d454c6e34e3efb3d86a780f12c2b09e382c685ce103ac94419432b83e163b64d68ade370898eb4dc2ed8 SHA512 8f377b5f4ab0f8c1ab98b93cfd00480a91033596ba59a604c9af00f857012f432c41a5b097b795182699ae9869eb9090b788dbdb2addbca1f0c0148cb6c09b55 MISC metadata.xml 502 BLAKE2B 043fc7e11b803453d5c193562322ade34ce17f5966c5ba6f557c605174bab43a47fe374684b7f3b10a87d92429c70006abc2759169124c0b29ad28ad4c181b46 SHA512 399c87acfd980b7dc29b42d7eeeead868bc8e9efc085f23aa97507d9da6f4af272e747172c4d5d6c1dfe15dc125193a72a5d6ca47ec82615345e239ff26246e4 diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-5.2.8-pax-const.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.2.8-pax-const.patch new file mode 100644 index 000000000000..6251e33ce59e --- /dev/null +++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-5.2.8-pax-const.patch @@ -0,0 +1,44 @@ +--- vboxdrv/SUPDrvIDC.h ++++ vboxdrv/SUPDrvIDC.h +@@ -160,7 +160,7 @@ typedef struct SUPDRVIDCREQGETSYM + { + /** The symbol address. */ + PFNRT pfnSymbol; +- } Out; ++ } __no_const Out; + } u; + } SUPDRVIDCREQGETSYM; + /** Pointer to a SUPDRV IDC get symbol request. */ +--- vboxnetflt/include/VBox/intnet.h ++++ vboxnetflt/include/VBox/intnet.h +@@ -783,7 +783,7 @@ typedef struct INTNETTRUNKFACTORY + DECLR0CALLBACKMEMBER(int, pfnCreateAndConnect,(struct INTNETTRUNKFACTORY *pIfFactory, const char *pszName, + PINTNETTRUNKSWPORT pSwitchPort, uint32_t fFlags, + PINTNETTRUNKIFPORT *ppIfPort)); +-} INTNETTRUNKFACTORY; ++} __no_const INTNETTRUNKFACTORY; + /** Pointer to the trunk factory. */ + typedef INTNETTRUNKFACTORY *PINTNETTRUNKFACTORY; + +--- vboxnetflt/linux/VBoxNetFlt-linux.c ++++ vboxnetflt/linux/VBoxNetFlt-linux.c +@@ -840,7 +840,7 @@ typedef struct ethtool_ops OVR_OPSTYPE; + + # else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) */ + +-typedef struct net_device_ops OVR_OPSTYPE; ++typedef net_device_ops_no_const OVR_OPSTYPE; + # define OVR_OPS netdev_ops + # define OVR_XMIT pOrgOps->ndo_start_xmit + +--- vboxpci/include/VBox/rawpci.h ++++ vboxpci/include/VBox/rawpci.h +@@ -545,7 +545,7 @@ typedef struct RAWPCIFACTORY + DECLR0CALLBACKMEMBER(void, pfnDeinitVm,(PRAWPCIFACTORY pFactory, + PVM pVM, + PRAWPCIPERVM pVmData)); +-} RAWPCIFACTORY; ++} __no_const RAWPCIFACTORY; + + #define RAWPCIFACTORY_UUID_STR "ea089839-4171-476f-adfb-9e7ab1cbd0fb" + diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild index 91e66b6535c9..81bd3967d83a 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.8.ebuild @@ -39,7 +39,7 @@ pkg_setup() { src_prepare() { if use pax_kernel && kernel_is -ge 3 0 0 ; then - eapply "${FILESDIR}"/${PN}-4.1.4-pax-const.patch + eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch fi default diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index 6c5d56a1e849..7b3d441d13bf 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -1,10 +1,12 @@ AUX 050_virtualbox-5.1.24-nopie.patch 13749 BLAKE2B 5322746908c22f8c2eaaaa187ca10efbae9b81bb7ed13ee50346f622199dec88fa18b445d9a3bdb6a468c692116a4751e0d6facf64c4b952cf9b57ea681e6746 SHA512 85dea736b8e25751e3cad504cba00f667d1de1584ff6d528d3c291de51ab077f266b90c111d139d22e612a4310863b37c29ce91dd9c136f2065eb1464ff6b744 +AUX 050_virtualbox-5.2.8-nopie.patch 13011 BLAKE2B 17e94f0abbf52f5ee33538e63078f4cfc641fd72fc558a0f51dc3de033f2e2a2b4c38bb680847e80b1fed558e6ae287a5e1d8059ae54f59a1409215fb2424900 SHA512 a5af5766b8be4adda6fb1e1901ef18c88c24f59ac311afc58cc6d02555562f934c46159aa956b109342fb9890b1bd4af747d600c34ba8a211feebb8c9fd15715 AUX 10-virtualbox.rules 576 BLAKE2B 11654424fdfe0276df88907476eda6ecdc84c2b2650c1d71a030009849c896ce34168daff8a29366109703f3d6756b40afa64f8a54f4ff6effedea80b4e9fc23 SHA512 12128375244e0fb090674e5a11cc70178f3c6208040830c009284addb91db7dc0a2d3cbd5d1056944782e936a63b0bcef03be0135683646c41d540413805f0ba AUX vboxwebsrv-confd 559 BLAKE2B 979dc91678fac7277c69e482b07f8d46df6b4df92ffb37d5358be33aa08b01808776f95e915377f3b65dc8b89b54141e70f655847aeba4d0bd12cfceb72d8889 SHA512 47af05e5c8f496f9d55cb1240ab55b3c12f655fda14a3e9d904ada18ed6b748f599b2429133772ff4bcd1f363e5afa19ff5873f9e538aebce58eb88253ef4cab AUX vboxwebsrv-initd 646 BLAKE2B d71673a3afea56aea69ab1d795d8b265bb5fc62296e35d6d28caaf600ca65da43006b6d69b58f6a05f7ca0301bafce2d983536db1c98ceb03ca880f5e7632023 SHA512 365bd3a9f5d8edeb921330eebf67b43f60b048d9869f8378fa68543ed6005320b06360590187631176c256d8ce49305b856a2e0c1dc20b42890e020a8c729719 AUX virtualbox-4-config 38 BLAKE2B 8eab341f3264a056a89633fe43dd58f274d0d877602156d97a4dcc6260dd8e446509173742988fa40346e62b1fe9368ff3fc9a97e3316cb919962d9a03340d52 SHA512 5455b70b8ac6f25365bae776b78c3ef5710ae2d5a9e939c7013d72c35f65f178268966ebd291a42666913e45f43c7196f8953331be0b0cc88eba66df39205b08 AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c444637c19ea55ae7f0e34583a048b20ea4049e83ef3714a51e44545c50922b1f2758210145319f9881ca71b7d561d4 SHA512 1ec62f872a19ad76ce7d10ed70ee0503c65e817e123d82c20753e6ae4ac7d2ceb4e236da6be1fe3d63b0b104dd355de2cffd6e9d0ec0603c82fbf89662eeb34b AUX virtualbox-5.1.4-paxmark-bldprogs.patch 2642 BLAKE2B f8c25139dc58f6f2a9def4c3535457013a8f9ab9065d23ab858daede5d32b90a6387a0daab1fa39fad706f809799ba58405c2994c902d224cbf07118fe1af5b9 SHA512 40971ee2a2453cd830b118ee2d1d05468beec60b5c15fc36b2a01c30a454823bfc666149671f03ccbfd82abe1041e50c7d36d670da506cfb9b9faab9edcc83ee +AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16 AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f62f9be99cf87c57c42d118abb42b9436a0a83736d882b34360c9f8e67f9a8adaeffe7e9a3456c4ddc93a7850e53 SHA512 96f9ab8e2a83b5aebbb66916cbca0a7af0e2d69285296fe87869f096149791e0491dec2408f21f7249b68d928eebe396ab710a4ec6b6d6bc9c67120d323effa0 AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171 @@ -17,5 +19,5 @@ DIST virtualbox-5.2.0-patches-01.tar.xz 2460 BLAKE2B d3f973dc7ee0557c360f801c3bf EBUILD virtualbox-5.1.32.ebuild 13944 BLAKE2B 4c0da01774ca4fae3b3ecffdf6739282d268ddcf8b916173c946d1a4977f00dfa012dedeb818f6cfdd28197bd6410bb0cfeb14a5e752643d0c90110b90293b27 SHA512 2e8dc871197657b8783d032188a598e09366850ed6aba92d118f6e5789e443ccecf366c4dd160eaa189cb06919076ec73c1bdbb3045b50a2a7ca0c5e318fc61c EBUILD virtualbox-5.1.34.ebuild 13744 BLAKE2B 106f8f073d45142839343e6f8332cd4c2989096195e7437f34985a3ace51813a36a4b6cbbfeedaad1cc4c4e449d78baeade80291332a69419be7113e93c65675 SHA512 5530ec6aee0f7a9bc83c978a03ca4b63b18e7ed2e58f95bb481f959d666b7c75543604b00dd6912801a9c6d84ec26dd6427e69edfdb08e19018cf0e0a4162ad8 EBUILD virtualbox-5.2.6.ebuild 13935 BLAKE2B 497dec1a702f7789ab816dbb1cdec0761f03d01c56e34fe0ef66c1829c19a6235126d11d90c9b18df3407f73477c51c50af9fbe6d7533e1ffa31a8bdac88a4b3 SHA512 eea3c9e165fe2621e262d7506ff790fffe39c77cf485b678838ff38780ae2bcfa082c961eee4768622b5a2ecd2432e8211e38751223a58797f2d63efc62f4b4f -EBUILD virtualbox-5.2.8.ebuild 13733 BLAKE2B a9633503cbe5c2ca2f981e31282a900c99501d8b4bde8803c75e7ee55d9cd1d00a966751e859c8bacfb7f5e0e9d5efc7d7c20c3fd53259f992c6bd284d5b5eb1 SHA512 509b0dc881655571fd977ee7f6c764d4163f684db1518e510b9fb89567e6f94bcdde9e815971b4de97d8aded6fd4c17f74a6a2efaa77a74966f68951a68ec907 +EBUILD virtualbox-5.2.8.ebuild 13732 BLAKE2B 8ae5d949138ee928a0036289afc1936abca2dce7914fa36639b8df7990d1e7056d0f583319c9c8c0918a8f987e86ae2abb167584c921c8e7e3dc69261855f6cc SHA512 a7f242e2491e6e541981259a1434cbc944ff679d0b897aeb56530e048cb368b18b168fdf2252399c4831d224b99e527c5661ef7606f6d02ab983e8448ea21a62 MISC metadata.xml 886 BLAKE2B b8d7691c820ac4d8b0aa2033037a9229ebf68ba005b5c870e6d14dee4fbb9b5c0992904223caeb869fc265d48c57cd7f486d628cc4018cc018e8e32999175df3 SHA512 954d38fbbf08cce200af437ee3a0167bd39b4554c53b93d8f8961ac16e21a173fe4c4271fa8bf0ce2e354437c066e0ab4133131b03dac6ffcc2c92564584d081 diff --git a/app-emulation/virtualbox/files/050_virtualbox-5.2.8-nopie.patch b/app-emulation/virtualbox/files/050_virtualbox-5.2.8-nopie.patch new file mode 100644 index 000000000000..35bd8e0a705e --- /dev/null +++ b/app-emulation/virtualbox/files/050_virtualbox-5.2.8-nopie.patch @@ -0,0 +1,147 @@ +diff -Naur VirtualBox-5.1.24/Config.kmk VirtualBox-5.1.24/Config.kmk +--- VirtualBox-5.1.24/Config.kmk 2017-07-26 13:55:27.803972185 -0400 ++++ VirtualBox-5.1.24/Config.kmk 2017-07-26 13:53:10.700974328 -0400 +@@ -2601,6 +2601,7 @@ + $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-overlength-strings?= $(call VBOX_GCC_CHECK_CC,-Wno-overlength-strings,)' + $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-overloaded-virtual?= $(call VBOX_GCC_CHECK_CXX,-Wno-overloaded-virtual,)' + $(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-stack-protector ?= $(call VBOX_GCC_CHECK_CC,-fno-stack-protector,)' ++ $(QUIET)$(APPEND) '$@' 'VBOX_GCC_nopie ?= $(call VBOX_GCC_CHECK_CC,-nopie,)' + $(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-dwarf2-cfi-asm ?= $(call VBOX_GCC_CHECK_CC,-fno-dwarf2-cfi-asm,)' + $(QUIET)$(APPEND) '$@' 'VBOX_GCC_m64 ?= $(call VBOX_GCC_CHECK_CC,-m64,)' + $(QUIET)$(APPEND) '$@' 'VBOX_GCC_no-pie ?= $(call VBOX_GCC_CHECK_CC,-no-pie,)' +@@ -3843,8 +3844,8 @@ + + ifeq ($(VBOX_LDR_FMT32),elf) + TEMPLATE_VBoxRc_TOOL = $(VBOX_GCC32_TOOL) +- TEMPLATE_VBoxRc_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK) +- TEMPLATE_VBoxRc_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK) ++ TEMPLATE_VBoxRc_CXXFLAGS = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK) ++ TEMPLATE_VBoxRc_CFLAGS = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK) + ifeq ($(KBUILD_TARGET),solaris) + TEMPLATE_VBoxRc_LDFLAGS = -r + else +@@ -3864,8 +3865,8 @@ + ifeq ($(VBOX_LDR_FMT32),macho) + TEMPLATE_VBoxRc_TOOL = $(VBOX_GCC_TOOL) + TEMPLATE_VBoxRc_DEFS += $(VBOX_DARWIN_DEF_SDK_DEFS) +- TEMPLATE_VBoxRc_CXXFLAGS = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -m32 -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-rtti +- TEMPLATE_VBoxRc_CFLAGS = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -m32 -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing ++ TEMPLATE_VBoxRc_CXXFLAGS = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -m32 -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-rtti ++ TEMPLATE_VBoxRc_CFLAGS = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -m32 -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing + TEMPLATE_VBoxRc_LDFLAGS = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -m32 -nostdlib + #TEMPLATE_VBoxRc_LDFLAGS.release = -Wl,-S ??? + endif +@@ -3903,9 +3904,9 @@ + endif + + ifeq ($(VBOX_LDR_FMT32),elf) +- TEMPLATE_VBoxRcExe_CFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS)) -O0 +- TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS)) -O0 +- TEMPLATE_VBoxRcExe_LDFLAGS = -g ++ TEMPLATE_VBoxRcExe_CFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS)) -O0 $(VBOX_GCC_nopie) ++ TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS)) -O0 $(VBOX_GCC_nopie) ++ TEMPLATE_VBoxRcExe_LDFLAGS = -g $(VBOX_GCC_nopie) + TEMPLATE_VBoxRcExe_LDFLAGS.dbgopt = -g + TEMPLATE_VBoxRcExe_LDFLAGS.strict = -g + TEMPLATE_VBoxRcExe_LDFLAGS.release = -g +@@ -3984,8 +3985,8 @@ + + ifeq ($(VBOX_LDR_FMT),elf) + TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL) +-TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) +-TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK) ++TEMPLATE_VBoxR0_CFLAGS = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) ++TEMPLATE_VBoxR0_CXXFLAGS = -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK) + TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables -ffreestanding + TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fno-asynchronous-unwind-tables + ifeq ($(KBUILD_TARGET),solaris) +@@ -4018,12 +4019,12 @@ + TEMPLATE_VBoxR0_DEFS += $(VBOX_DARWIN_DEF_SDK_DEFS) + TEMPLATE_VBoxR0_CXXFLAGS = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) \ + -fno-common -msoft-float -static -fno-rtti -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \ +- -mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) ++ -mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) + TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2 -mno-sse4a -fno-unwind-tables + TEMPLATE_VBoxR0_CXXFLAGS.x86 = -m32 + TEMPLATE_VBoxR0_CFLAGS = $(VBOX_DARWIN_DEF_SDK_CFLAGS) -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) \ + -fno-common -msoft-float -static -fno-exceptions $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing \ +- -mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) ++ -mno-sse -mno-mmx -mno-sse2 -mno-3dnow $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) + TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2 -mno-sse4a -fno-unwind-tables + TEMPLATE_VBoxR0_CFLAGS.x86 = -m32 + TEMPLATE_VBoxR0_LDFLAGS = $(VBOX_DARWIN_DEF_SDK_LDFLAGS) -nostdlib +@@ -4259,7 +4260,7 @@ + -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \ + -Wimplicit-function-declaration -Werror-implicit-function-declaration \ + -O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \ +- $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ ++ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ + -nostdinc -std=c99 + TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 + TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \ +@@ -4268,7 +4269,7 @@ + TEMPLATE_VBOXR0DRV_CXXFLAGS = -fno-exceptions -fno-rtti \ + $(VBOX_GCC_WARN) -Wpointer-arith -Winline \ + -O2 -fno-strict-aliasing -fno-common -finline-limit=8000 \ +- $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ ++ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ + -nostdinc + TEMPLATE_VBOXR0DRV_CXXFLAGS.x86 = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86) + TEMPLATE_VBOXR0DRV_CXXFLAGS.amd64 = $(TEMPLATE_VBOXR0DRV_CFLAGS.amd64) +@@ -4341,7 +4342,7 @@ + -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \ + -Wimplicit-function-declaration -Werror-implicit-function-declaration \ + -O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \ +- $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ ++ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ + -nostdinc -std=c99 -msoft-float + TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 \ + -mpreferred-stack-boundary=2 -mno-mmx -mno-sse -mno-avx \ +@@ -4353,7 +4354,7 @@ + TEMPLATE_VBOXR0DRV_CXXFLAGS = -fno-exceptions -fno-rtti \ + $(VBOX_GCC_WARN) -Wpointer-arith -Winline \ + -O2 -fno-strict-aliasing -fno-common -finline-limit=8000 \ +- $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ ++ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ + -nostdinc -msoft-float + TEMPLATE_VBOXR0DRV_CXXFLAGS.x86 = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86) + TEMPLATE_VBOXR0DRV_CXXFLAGS.amd64 = $(TEMPLATE_VBOXR0DRV_CFLAGS.amd64) +@@ -4394,7 +4395,7 @@ + TEMPLATE_VBOXR0DRV_LDFLAGS = -shared -no-undefined -dc -dy -lroot -rpath-link /boot/system/develop/lib/x86 --no-add-needed /boot/system/develop/lib/_KERNEL_ --no-add-needed /boot/system/develop/lib/haiku_version_glue.o + TEMPLATE_VBOXR0DRV_CFLAGS = -fno-PIC \ + $(VBOX_GCC_WARN) -Wstrict-prototypes $(VBOX_GCC_Wno-pointer-sign) -Wno-sign-compare \ +- $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration ++ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration + TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -mno-sse -mno-mmx -mno-sse2 -mno-3dnow + TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow + TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \ +@@ -5210,8 +5211,8 @@ + TEMPLATE_VBoxNoCrtGccLib_TOOL = $(VBOX_GCC_TOOL) + TEMPLATE_VBoxNoCrtGccLib_ASTOOL = $(VBOX_ASTOOL) + TEMPLATE_VBoxNoCrtGccLib_ASFLAGS = $(VBOX_ASFLAGS) +- TEMPLATE_VBoxNoCrtGccLib_CFLAGS += $(VBOX_GCC_fno-stack-protector) +- TEMPLATE_VBoxNoCrtGccLib_CXXFLAGS += $(VBOX_GCC_fno-stack-protector) ++ TEMPLATE_VBoxNoCrtGccLib_CFLAGS += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) ++ TEMPLATE_VBoxNoCrtGccLib_CXXFLAGS += $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_nopie) + ifeq ($(KBUILD_TARGET_ARCH),amd64) + # in 64-bit mode we'll build a sys-module (VBoxREM2). + if1of ($(KBUILD_TARGET), darwin solaris) +diff -Naur VirtualBox-5.1.24/src/VBox/Devices/PC/ipxe/Makefile.kmk VirtualBox-5.1.24/src/VBox/Devices/PC/ipxe/Makefile.kmk +--- VirtualBox-5.1.24/src/VBox/Devices/PC/ipxe/Makefile.kmk 2017-07-26 13:55:27.746972186 -0400 ++++ VirtualBox-5.1.24/src/VBox/Devices/PC/ipxe/Makefile.kmk 2017-07-26 13:53:10.641974329 -0400 +@@ -132,6 +132,7 @@ + -W \ + -Wformat-nonliteral \ + $(VBOX_GCC_fno-stack-protector) \ ++ $(VBOX_GCC_nopie) \ + $(VBOX_GCC_fno-dwarf2-cfi-asm) \ + $(VBOX_GCC_Wno-address) + TEMPLATE_iPxe_ASFLAGS = \ +@@ -155,6 +156,7 @@ + -W \ + -Wformat-nonliteral \ + $(VBOX_GCC_fno-stack-protector) \ ++ $(VBOX_GCC_nopie) \ + $(VBOX_GCC_fno-dwarf2-cfi-asm) \ + $(VBOX_GCC_Wno-address) \ + -DASSEMBLY diff --git a/app-emulation/virtualbox/files/virtualbox-5.2.8-paxmark-bldprogs.patch b/app-emulation/virtualbox/files/virtualbox-5.2.8-paxmark-bldprogs.patch new file mode 100644 index 000000000000..7eb1e1793a7f --- /dev/null +++ b/app-emulation/virtualbox/files/virtualbox-5.2.8-paxmark-bldprogs.patch @@ -0,0 +1,59 @@ +2017-02-20 Quentin Minster + + #https://bugs.gentoo.org/show_bug.cgi?id=591582 + * Config.kmk: add paxmark befor VBOX_VBOXTPG get run. + * src/VBox/VMM/Makefile.kmk: add paxmark befor VBOX_VBOXCPP get run. + * src/VBox/Main/Makefile.kmk: add paxmark befor USBIdDatabaseGenerator_1_TARGET get run. + +--- a/Config.kmk ++++ b/Config.kmk 2016-09-21 02:22:28 +@@ -3719,11 +3719,13 @@ + $(if-expr $(intersects $(KBUILD_TARGET_ARCH),$(KBUILD_ARCHES_64)),-64,-32) \ + -h --host-$(VBOX_HC_ARCH_BITS)-bit #-vvv + define TOOL_VBoxTpG_DTRACE_HDR_CMDS ++ $(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)" + $(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)" + endef + TOOL_VBoxTpG_DTRACE_OBJ_NOT_NEEDED := + TOOL_VBoxTpG_DTRACE_OBJ_FLAGS := -G --host-$(VBOX_HC_ARCH_BITS)-bit #-vvv + define TOOL_VBoxTpG_DTRACE_OBJ_CMDS ++ $(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)" + $(QUIET)$(VBOX_VBOXTPG) \ + $(if-expr $(intersects $(bld_trg_arch),$(KBUILD_ARCHES_64)),-64,-32) \ + $(flags) \ +@@ -3738,6 +3740,7 @@ + TOOL_VBoxTpG-Disabled_DTRACE_DEPORD = $(VBOX_VBOXTPG) + TOOL_VBoxTpG-Disabled_DTRACE_HDR_FLAGS := -h + define TOOL_VBoxTpG-Disabled_DTRACE_HDR_CMDS ++ $(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)" + $(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)" + endef + TOOL_VBoxTpG-Disabled_DTRACE_OBJ_NOT_NEEDED := $(KBUILD_OSES) +@@ -3752,6 +3755,7 @@ + TOOL_DTraceAndVBoxTpG_DTRACE_HDR_CMDS = + define TOOL_DTraceAndVBoxTpG_DTRACE_HDR_CMDS + $(TOOL_StandardDTrace_DTRACE_HDR_CMDS) ++ $(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)" + $(QUIET)$(VBOX_VBOXTPG) --generate-wrapper-header --host-$(VBOX_HC_ARCH_BITS)-bit --ring-3-context \ + $(filter-out -C, $(filter-out -h,$(flags))) \ + -o "$(out).tmp" -s "$(source)" +--- a/src/VBox/VMM/Makefile.kmk 2018-04-10 15:26:24.622867735 +0300 ++++ b/src/VBox/VMM/Makefile.kmk 2018-04-10 15:24:35.901998796 +0300 +@@ -896,6 +896,7 @@ + $$(VMMLibDTrace_0_OUTDIR)/$1: $2 $$(VBOX_VBOXCPP) | $$$$(dir $$$$@) + $$(call KB_FN_AUTO_CMD_DEPS_COMMANDS) + $$(QUIET)$$(call MSG_GENERATE,VMMLibDTrace,$$@,$2) ++ $$(QUIET)paxmark.sh -m "$(VBOX_VBOXCPP)" + $$(QUIET)$(VBOX_VBOXCPP) -d \ + -D VBOX_FOR_DTRACE_LIB \ + -D VBOX_FOR_DTRACE_LIB_$(toupper $(KBUILD_TARGET_ARCH)) \ +--- a/src/VBox/Main/Makefile.kmk 2018-04-10 15:26:15.292793067 +0300 ++++ b/src/VBox/Main/Makefile.kmk 2018-04-10 15:25:14.042303341 +0300 +@@ -607,6 +607,7 @@ + $(PATH_SUB_CURRENT)/src-server/usb.ids $(PATH_SUB_CURRENT)/src-server/custom.ids | $$(dir $$@) + $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) + $(call MSG_GENERATE,USBIdDatabase,$@,$(USBIdDatabaseGenerator_1_TARGET)) ++ $(QUIET)paxmark.sh -m "$(USBIdDatabaseGenerator_1_TARGET)" + $(QUIET)$(USBIdDatabaseGenerator_1_TARGET) -o "$@" $(filter %.ids,$^) + + BLDPROGS += USBIdDatabaseGenerator diff --git a/app-emulation/virtualbox/virtualbox-5.2.8.ebuild b/app-emulation/virtualbox/virtualbox-5.2.8.ebuild index 40b4975b1e8c..54d2ee976690 100644 --- a/app-emulation/virtualbox/virtualbox-5.2.8.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.2.8.ebuild @@ -185,12 +185,12 @@ src_prepare() { # Only add nopie patch when we're on hardened if gcc-specs-pie ; then - eapply "${FILESDIR}/050_virtualbox-5.1.24-nopie.patch" + eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch" fi # Only add paxmark patch when we're on pax_kernel if use pax_kernel ; then - eapply "${FILESDIR}"/virtualbox-5.1.4-paxmark-bldprogs.patch + eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch fi eapply "${WORKDIR}/patches" -- cgit v1.2.3