diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/Manifest new file mode 100644 index 0000000000..6ace68cc1f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/Manifest @@ -0,0 +1 @@ +DIST open-vm-tools-10.3.0-8931395.tar.gz 4638881 SHA256 ca5bcd62a969803015bb4ca8e2610c376487be6b6b95e7500f6684d65813b161 SHA512 627056db94b79aa7782324ed1a71e7f0c2420f0a0d76d3e65b84035b1350e29757a1412cbf195ef3d79fae37ddd6f17c6892ea2c64dbfa331854ded016965604 WHIRLPOOL fa28fdf8534dba1acd7cc5b6d3b5344e42dd85c5ed037dfdf140e37167aae5a72284f04352ab4b3f42e6a63bdd4390e217f40fabbd82bcb0d2e411b4bf365adb diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-10.2.5-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-10.3.0-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-10.2.5-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch rename to sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/files/open-vm-tools-10.3.0-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/metadata.xml index 021bf9a90f..9e8e61bb81 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/metadata.xml @@ -1,11 +1,14 @@ - vmware - + floppym@gentoo.org Mike Gilbert + + vmware@gentoo.org + Gentoo VMware Project + The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools. They are a set of guest operating system @@ -13,14 +16,21 @@ of virtual machines. + Build Common Agent Framework + Build deploypkg plugin + Enable support for nicinfo Generate API documentation - Build vmblock-fuse in favor of FUSE based blocking mechanism for DnD - Enable grabbitmqproxy + Enable vmblock-fuse/vmhgfs-fuse + Build grabbitmqproxy plugin + Compile with Gtkmm and sigc++ (Recommended) + Enable multimon (Requires X) Force shared libraries to be built as PIC - Enable vgauth + Build the linux/unix resolutionkms module + Build vgauth + Build vgauth with xml-security-c instead of xmlsec1 + Build vgauth with xmlsec1 instead of xml-security-c vmware/open-vm-tools - open-vm-tools diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-10.3.0.ebuild similarity index 83% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-10.3.0.ebuild index 99e8b2bdbc..c1dc61fe9e 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/open-vm-tools/open-vm-tools-10.3.0.ebuild @@ -1,26 +1,22 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 +inherit autotools flag-o-matic multilib toolchain-funcs -inherit autotools-utils flag-o-matic git-2 multilib toolchain-funcs - -DESCRIPTION="VMware tools for distribution via /usr/share/oem" +DESCRIPTION="Opensourced tools for VMware guests" HOMEPAGE="https://github.com/vmware/open-vm-tools" +MY_P="${P}-8931395" +SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz" -EGIT_REPO_URI="https://github.com/vmware/open-vm-tools" -EGIT_COMMIT="380a3d9747999e8bcbcbcd03b1402b702770db79" -EGIT_SOURCEDIR="${WORKDIR}" - -LICENSE="LGPL-2" +LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 ~x86" IUSE="+dnet +pic +deploypkg" # TODO: pam DEPEND="dev-libs/glib:2 + net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) dnet? ( dev-libs/libdnet )" @@ -31,18 +27,16 @@ DEPEND="dev-libs/glib:2 RDEPEND="dnet? ( dev-libs/libdnet ) deploypkg? ( dev-libs/libmspack )" -S="${WORKDIR}/${PN}" +S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${P}-0001-configure-Add-options-for-fuse-hgfs-and-udev.patch" ) -#pkg_setup() { -# enewgroup vmware -#} - src_prepare() { - autotools-utils_src_prepare + eapply -p2 "${PATCHES[@]}" + eapply_user + eautoreconf } # Override configure's use of pkg-config to ensure ${SYSROOT} is respected. diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-10.2.5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-10.3.0.ebuild similarity index 94% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-10.2.5.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-10.3.0.ebuild index 3cdbaef9d3..8a79b678d1 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-10.2.5.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-vmware/oem-vmware-10.3.0.ebuild @@ -13,7 +13,7 @@ KEYWORDS="amd64" IUSE="" DEPEND=" - app-emulation/open-vm-tools + ~app-emulation/open-vm-tools-${PV} " RDEPEND="${DEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r36.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r37.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r36.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r37.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild index 43f8adb9fa..c52e4e65af 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild @@ -35,6 +35,7 @@ DEPEND=" dev-util/patchelf dev-vcs/repo net-dns/bind-tools + net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/open-vm-tools-10.2.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/open-vm-tools-10.2.5 deleted file mode 100644 index 096ba4566e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/open-vm-tools-10.2.5 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test unpack -DEPEND=dev-libs/glib:2 deploypkg? ( dev-libs/libmspack ) dnet? ( dev-libs/libdnet ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/git -DESCRIPTION=VMware tools for distribution via /usr/share/oem -EAPI=5 -HOMEPAGE=https://github.com/vmware/open-vm-tools -IUSE=+dnet +pic +deploypkg -KEYWORDS=amd64 ~x86 -LICENSE=LGPL-2 -RDEPEND=dnet? ( dev-libs/libdnet ) deploypkg? ( dev-libs/libmspack ) -SLOT=0 -_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-2 45ff482316b52b3f96ff6b7309b77f03 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=97a739060234fb57b8b6b4f1a11eac51 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/open-vm-tools-10.3.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/open-vm-tools-10.3.0 new file mode 100644 index 0000000000..cb8bc741b2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-emulation/open-vm-tools-10.3.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare +DEPEND=dev-libs/glib:2 net-libs/libtirpc deploypkg? ( dev-libs/libmspack ) dnet? ( dev-libs/libdnet ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Opensourced tools for VMware guests +EAPI=6 +HOMEPAGE=https://github.com/vmware/open-vm-tools +IUSE=+dnet +pic +deploypkg +KEYWORDS=amd64 ~x86 +LICENSE=LGPL-2.1 +RDEPEND=dnet? ( dev-libs/libdnet ) deploypkg? ( dev-libs/libmspack ) +SLOT=0 +SRC_URI=https://github.com/vmware/open-vm-tools/releases/download/stable-10.3.0/open-vm-tools-10.3.0-8931395.tar.gz +_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_md5_=fc6f862531c98b39c79e5f49e2475a62 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vmware-10.2.5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vmware-10.3.0 similarity index 59% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vmware-10.2.5 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vmware-10.3.0 index c3aad04e88..61dbbd0a92 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vmware-10.2.5 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/oem-vmware-10.3.0 @@ -1,10 +1,10 @@ DEFINED_PHASES=install prepare -DEPEND=app-emulation/open-vm-tools +DEPEND=~app-emulation/open-vm-tools-10.3.0 DESCRIPTION=OEM suite for VMware EAPI=5 HOMEPAGE=https://github.com/coreos/coreos-overlay/tree/master/coreos-base KEYWORDS=amd64 LICENSE=Apache-2.0 -RDEPEND=app-emulation/open-vm-tools +RDEPEND=~app-emulation/open-vm-tools-10.3.0 SLOT=0 -_md5_=b10b48b7139062c15549fea0d4888fc5 +_md5_=a702025b812e6ed3667bc7f24c842298 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1 index 63ea99cde9..903a7bfd6d 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1 @@ -1,10 +1,10 @@ DEFINED_PHASES=- -DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 +DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 DESCRIPTION=Meta ebuild for everything that needs to be in the SDK. EAPI=5 HOMEPAGE=http://coreos.com/docs/sdk/ KEYWORDS=amd64 LICENSE=GPL-2 -RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 +RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 SLOT=0 -_md5_=120edd76662fb0b47c058a5862b7540d +_md5_=0e7604f9f7c86a9f4a697d1bb78b74b1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r36 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r37 similarity index 62% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r36 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r37 index 63ea99cde9..903a7bfd6d 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r36 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-devel/sdk-depends-0.0.1-r37 @@ -1,10 +1,10 @@ DEFINED_PHASES=- -DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 +DEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 DESCRIPTION=Meta ebuild for everything that needs to be in the SDK. EAPI=5 HOMEPAGE=http://coreos.com/docs/sdk/ KEYWORDS=amd64 LICENSE=GPL-2 -RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 +RDEPEND=app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk app-misc/jq app-shells/bash-completion coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/mantle coreos-devel/kola-data dev-libs/gobject-introspection dev-libs/nss dev-python/setuptools dev-util/boost-build dev-util/cargo dev-util/checkbashisms dev-util/patchelf dev-vcs/repo net-dns/bind-tools net-libs/rpcsvc-proto net-misc/curl sys-apps/debianutils sys-apps/iproute2 sys-apps/iucode_tool sys-apps/seismograph sys-boot/grub sys-boot/shim sys-firmware/edk2 sys-fs/btrfs-progs sys-fs/cryptsetup >=sys-apps/checkpolicy-2.0.21 >=sys-apps/policycoreutils-2.0.82 sys-devel/m4 sys-devel/autoconf:2.1 SLOT=0 -_md5_=120edd76662fb0b47c058a5862b7540d +_md5_=0e7604f9f7c86a9f4a697d1bb78b74b1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-fs/nfs-utils-1.3.2-r11 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-fs/nfs-utils-1.3.2-r11 deleted file mode 100644 index 45626dfc1a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-fs/nfs-utils-1.3.2-r11 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare -DEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs >=net-nds/rpcbind-0.2.0-r1 net-libs/libtirpc libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( dev-libs/libevent >=net-libs/libnfsidmap-0.21-r1 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 >=sys-apps/keyutils-1.5.9 ) ) nfsv41? ( sys-fs/lvm2 ) uuid? ( sys-apps/util-linux ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig -DESCRIPTION=NFS client and server daemons -EAPI=5 -HOMEPAGE=http://linux-nfs.org/ -IUSE=caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid -KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -LICENSE=GPL-2 -RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs >=net-nds/rpcbind-0.2.0-r1 net-libs/libtirpc libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( dev-libs/libevent >=net-libs/libnfsidmap-0.21-r1 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 >=sys-apps/keyutils-1.5.9 ) ) nfsv41? ( sys-fs/lvm2 ) uuid? ( sys-apps/util-linux ) !net-nds/portmap !=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) net-libs/rpcsvc-proto virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig +DESCRIPTION=NFS client and server daemons +EAPI=6 +HOMEPAGE=http://linux-nfs.org/ +IUSE=caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid +KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 +LICENSE=GPL-2 +RDEPEND=net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-libs/e2fsprogs-libs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap ) libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( dev-libs/libevent:= >=sys-apps/keyutils-1.5.9 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap !net-nds/portmap !=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig -DESCRIPTION=NFSv4 ID <-> name mapping library -EAPI=2 -HOMEPAGE=http://www.citi.umich.edu/projects/nfsv4/linux/ -IUSE=ldap static-libs -KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -LICENSE=BSD -RDEPEND=ldap? ( net-nds/openldap ) !=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-arch/xz-utils >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] -DESCRIPTION=Transport Independent RPC library (SunRPC replacement) -EAPI=5 -HOMEPAGE=http://libtirpc.sourceforge.net/ -IUSE=ipv6 kerberos static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -LICENSE=GPL-2 -RDEPEND=kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) -SLOT=0/3 -SRC_URI=mirror://sourceforge/libtirpc/libtirpc-1.0.1.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz -_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=7ffc695d6ee4e7640746870fd7836c12 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1 new file mode 100644 index 0000000000..4979473593 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/libtirpc-1.0.2-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-arch/xz-utils >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Transport Independent RPC library (SunRPC replacement) +EAPI=5 +HOMEPAGE=http://libtirpc.sourceforge.net/ +IUSE=ipv6 kerberos static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux +LICENSE=GPL-2 +RDEPEND=kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +SLOT=0/3 +SRC_URI=mirror://sourceforge/libtirpc/libtirpc-1.0.2.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz +_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf +_md5_=a2ba2d5955efcd965c20df9c95257ffb diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1 new file mode 100644 index 0000000000..c987df4b16 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install prepare +DEPEND=>=app-portage/elt-patches-20170422 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=rpcsvc protocol definitions from glibc +EAPI=6 +HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto +KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 +LICENSE=LGPL-2.1+ BSD +RDEPEND=! rpcsvc-proto-1.3.1.tar.gz +_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 +_md5_=c284466948308c510033e6084c256ca6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-4.07-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-4.07-r3 similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-4.07-r2 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-4.07-r3 index 34484c930e..e23c9ed1e6 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-4.07-r2 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-boot/syslinux-4.07-r3 @@ -1,8 +1,8 @@ DEFINED_PHASES=compile install unpack DEPEND=sys-apps/util-linux sys-fs/mtools perl? ( dev-lang/perl dev-perl/Crypt-PasswdMD5 virtual/perl-Digest-SHA ) dev-lang/nasm virtual/os-headers DESCRIPTION=SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders -EAPI=5 -HOMEPAGE=http://syslinux.zytor.com/ +EAPI=6 +HOMEPAGE=https://syslinux.zytor.com/ IUSE=custom-cflags +perl KEYWORDS=-* amd64 x86 LICENSE=GPL-2 @@ -10,4 +10,4 @@ RDEPEND=sys-apps/util-linux sys-fs/mtools perl? ( dev-lang/perl dev-perl/Crypt-P SLOT=0 SRC_URI=mirror://kernel/linux/utils/boot/syslinux/4.xx/syslinux-4.07.tar.bz2 _eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=39570a5c6abbf0b7ebc82be6b26bed6e +_md5_=181cd46b5e15bdbb1b5358343561cd28 diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/Manifest b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/Manifest index 8893833699..1c3cfc61e7 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/Manifest @@ -1 +1 @@ -DIST nfs-utils-1.3.2.tar.bz2 789540 SHA256 5b9c72eef260b86a84619771e11bb013b99431e6b7ff0bbdc03fee90dba591f7 SHA512 65633db58bbc5b6bff6acab412dc085affc61e0a6e0aef72d630e67d05a8d08012dced81178a4c7af65c967c25b48161f8d887d261fdf5ce505b719dbdab757c WHIRLPOOL eee615f032987aee71adf04a3ad5f5b8f79dc4487f1be1a7fb87c42918a12ef9397ba990b02d4adb02265706df9f1e3ef409c141491759c65b8037693b9b06c9 +DIST nfs-utils-2.3.1.tar.bz2 854899 BLAKE2B f9541b9dc103d978f21d57d8ba0c14a3b30f6ba874b112239d014076c1c72b6654e8e02b4bfea686e658dac84d1e896b872bc2054591275ef1713ae4e7b7d005 SHA512 de3e70f8656bc5b5aa98262685a9e80929c6314234d9bbb74d4c7efcb7a8b2640d48d2100850b403157ebefc8f0eb48598b48238fae795f64c7a0e9a8bff93e3 diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch deleted file mode 100644 index 393f70b87a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 17a3e5bffb7110d46de1bf42b64b90713ff5ea50 Mon Sep 17 00:00:00 2001 -From: Chris Mayo -Date: Sun, 1 Feb 2015 12:03:46 -0500 -Subject: [PATCH] statd: Fix test for foreground mode - -daemon_init parameter has the opposite sense -to code removed in commit 7addf9d - -Signed-off-by: Chris Mayo -Signed-off-by: Steve Dickson ---- - utils/statd/statd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/statd/statd.c b/utils/statd/statd.c -index 60ce6d1..2b7a167 100644 ---- a/utils/statd/statd.c -+++ b/utils/statd/statd.c -@@ -393,7 +393,7 @@ int main (int argc, char **argv) - simulator (--argc, ++argv); /* simulator() does exit() */ - #endif - -- daemon_init(!(run_mode & MODE_NODAEMON)); -+ daemon_init((run_mode & MODE_NODAEMON)); - - if (run_mode & MODE_LOG_STDERR) { - xlog_syslog(0); --- -2.2.2 - diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-rpcbind-after.patch b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-rpcbind-after.patch deleted file mode 100644 index eeecd278cc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-1.3.2-rpcbind-after.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fixed in 2.2.1 commit 907426b00bdcd69d9a56ac1870990e8ae8c6fe9f -use rpcbind.target instead of .socket (as the upstream commit uses) -because the future versions of nfs-server.service activate the socket -while ours activate the service. - -diff --git a/systemd/nfs-mountd.service b/systemd/nfs-mountd.service -index d908afe..587112b 100644 ---- a/systemd/nfs-mountd.service -+++ b/systemd/nfs-mountd.service -@@ -3,6 +3,7 @@ Description=NFS Mount Daemon - Requires=proc-fs-nfsd.mount - After=proc-fs-nfsd.mount - After=network.target -+After=rpcbind.target - BindsTo=nfs-server.service - - Wants=nfs-config.service - diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch new file mode 100644 index 0000000000..77c902f272 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils-2.3.1-svcgssd_undefined_reference.patch @@ -0,0 +1,40 @@ +From 1451d7585bf1c622658ccc04abac7e79ffe40263 Mon Sep 17 00:00:00 2001 +From: Justin Mitchell +Date: Mon, 8 Jan 2018 09:14:11 -0500 +Subject: [PATCH] svcgssd: Update svcgssd so that it builds + +Since a15bd948 the --enable-svcgss option no longer builds +as svcgssd references functions which were changed at that time. +Fix those, and other function changes since then. + +Signed-off-by: Justin Mitchell +Signed-off-by: Steve Dickson +--- + utils/gssd/svcgssd.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/utils/gssd/svcgssd.c b/utils/gssd/svcgssd.c +index 3514ae1..23f0c0b 100644 +--- a/utils/gssd/svcgssd.c ++++ b/utils/gssd/svcgssd.c +@@ -63,6 +63,8 @@ + #include "err_util.h" + #include "conffile.h" + ++struct state_paths etab; ++ + void + sig_die(int signal) + { +@@ -101,7 +103,7 @@ main(int argc, char *argv[]) + char *principal = NULL; + char *s; + +- conf_init(NFS_CONFFILE); ++ conf_init_file(NFS_CONFFILE); + + s = conf_get_str("svcgssd", "principal"); + if (!s) +-- +1.8.3.1 + diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils.conf b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils.conf index 8a0f12dbd0..02737e2f51 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils.conf +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/files/nfs-utils.conf @@ -3,5 +3,7 @@ d /var/lib/nfs/v4recovery d /var/lib/nfs/v4root C /var/lib/nfs/etab - - - - /usr/lib64/nfs/etab C /var/lib/nfs/rmtab - - - - /usr/lib64/nfs/rmtab +C /var/lib/nfs/sm - - - - /usr/lib64/nfs/sm +C /var/lib/nfs/sm.bak - - - - /usr/lib64/nfs/sm.bak C /var/lib/nfs/state - - - - /usr/lib64/nfs/state C /var/lib/nfs/xtab - - - - /usr/lib64/nfs/xtab diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/metadata.xml index d89ebcfd96..45351e4463 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/metadata.xml @@ -1,9 +1,14 @@ - net-fs + + base-system@gentoo.org + Gentoo Base System + NFS client and server daemons + Enable NFS junction support in nfsref + Add ldap support Link mount.nfs with libmount Enable nfsdcld NFSv4 clientid tracking daemon Enable support for newer nfsidmap helper diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r11.ebuild deleted file mode 100644 index 36550f3e98..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-1.3.2-r11.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils flag-o-matic multilib autotools systemd - -DESCRIPTION="NFS client and server daemons" -HOMEPAGE="http://linux-nfs.org/" -SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" -REQUIRED_USE="kerberos? ( nfsv4 )" -RESTRICT="test" #315573 - -# kth-krb doesn't provide the right include -# files, and nfs-utils doesn't build against heimdal either, -# so don't depend on virtual/krb. -# (04 Feb 2005 agriffis) -DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers ) - caps? ( sys-libs/libcap ) - sys-libs/e2fsprogs-libs - >=net-nds/rpcbind-0.2.0-r1 - net-libs/libtirpc - libmount? ( sys-apps/util-linux ) - nfsdcld? ( >=dev-db/sqlite-3.3 ) - nfsv4? ( - dev-libs/libevent - >=net-libs/libnfsidmap-0.21-r1 - kerberos? ( - >=net-libs/libtirpc-0.2.4-r1[kerberos] - app-crypt/mit-krb5 - ) - nfsidmap? ( - >=net-libs/libnfsidmap-0.24 - >=sys-apps/keyutils-1.5.9 - ) - ) - nfsv41? ( - sys-fs/lvm2 - ) - uuid? ( sys-apps/util-linux )" -RDEPEND="${DEPEND_COMMON} - !net-nds/portmap - ! id_resolver.conf - doins id_resolver.conf - fi - - systemd_dotmpfilesd "${FILESDIR}"/nfs-utils.conf - systemd_dounit systemd/*.{mount,service,target} - if ! use nfsv4 || ! use kerberos ; then - rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die - fi - if ! use nfsv41 ; then - rm "${D}$(systemd_get_unitdir)"/nfs-blkmap.* || die - fi - rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die - sed -i -r \ - -e "/^EnvironmentFile=/d" \ - -e '/^(After|Wants)=nfs-config.service$/d' \ - -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \ - "${D}$(systemd_get_unitdir)"/* || die - - # maintain compatibility with the old gentoo systemd unit names, since nfs-utils has units upstream now. - dosym nfs-server.service "$(systemd_get_unitdir)"/nfsd.service - dosym nfs-idmapd.service "$(systemd_get_unitdir)"/rpc-idmapd.service - dosym nfs-mountd.service "$(systemd_get_unitdir)"/rpc-mountd.service -} - -pkg_postinst() { - # Install default xtab and friends if there's none existing. In - # src_install we put them in /usr/lib/nfs for safe-keeping, but - # the daemons actually use the files in /var/lib/nfs. #30486 - local f - mkdir -p "${EROOT}"/var/lib/nfs #368505 - for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do - [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue - einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs" - cp -pPR "${f}" "${EROOT}"/var/lib/nfs/ - done - - if systemd_is_booted; then - if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then - ewarn "We have switched to upstream systemd unit files. Since" - ewarn "they got renamed, you should probably enable the new ones." - ewarn "You can run 'equery files nfs-utils | grep systemd'" - ewarn "to know what services you need to enable now." - fi - else - ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient." - ewarn "If you were using nfsmount, please add nfsclient and netmount to the" - ewarn "same runlevel as nfsmount." - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild new file mode 100644 index 0000000000..2164415198 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-fs/nfs-utils/nfs-utils-2.3.1-r3.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic multilib systemd + +DESCRIPTION="NFS client and server daemons" +HOMEPAGE="http://linux-nfs.org/" + +if [[ "${PV}" = *_rc* ]] ; then + inherit versionator + MY_PV="$(replace_all_version_separators -)" + SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${PN}-${MY_PV}" +else + SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="caps ipv6 kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid" +REQUIRED_USE="kerberos? ( nfsv4 )" +RESTRICT="test" #315573 + +# kth-krb doesn't provide the right include +# files, and nfs-utils doesn't build against heimdal either, +# so don't depend on virtual/krb. +# (04 Feb 2005 agriffis) +DEPEND_COMMON=" + net-libs/libtirpc:= + >=net-nds/rpcbind-0.2.4 + sys-libs/e2fsprogs-libs + caps? ( sys-libs/libcap ) + ldap? ( net-nds/openldap ) + libmount? ( sys-apps/util-linux ) + nfsdcld? ( >=dev-db/sqlite-3.3 ) + nfsv4? ( + dev-libs/libevent:= + >=sys-apps/keyutils-1.5.9 + kerberos? ( + >=net-libs/libtirpc-0.2.4-r1[kerberos] + app-crypt/mit-krb5 + ) + ) + nfsv41? ( + sys-fs/lvm2 + ) + tcpd? ( sys-apps/tcp-wrappers ) + uuid? ( sys-apps/util-linux )" +RDEPEND="${DEPEND_COMMON} + !net-libs/libnfsidmap + !net-nds/portmap + ! id_resolver.conf + doins id_resolver.conf + fi + + systemd_dotmpfilesd "${FILESDIR}"/nfs-utils.conf + + # Provide an empty xtab for compatibility with the old tmpfiles config. + touch "${ED%/}"/usr/$(get_libdir)/nfs/xtab + + # Maintain compatibility with the old gentoo systemd unit names, since nfs-utils has units upstream now. + dosym nfs-server.service "$(systemd_get_systemunitdir)"/nfsd.service + dosym nfs-idmapd.service "$(systemd_get_systemunitdir)"/rpc-idmapd.service + dosym nfs-mountd.service "$(systemd_get_systemunitdir)"/rpc-mountd.service +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/Manifest b/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/Manifest deleted file mode 100644 index 88ad93b4b7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libnfsidmap-0.24.tar.gz 328720 SHA256 59501432e683336d7a290da13767e92afb5b86f42ea4254041225fe218e8dd47 SHA512 1283a4af1bcf3c6f941ab294acc0b2b4bd9ca947f2d3c2e866717478ba2e7a2190a5467b71d7e9136c5c83de564c4892f9e3304323ae17e3988af2e40c43982b WHIRLPOOL 7f9e81dec91429c09b24325bdf077d800b608bb87eeeb5d4334fa3dbbd50a4acf482162716c19c5f5175e48bf129dbf4611c1d6be933097753eeaab834192bae diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch deleted file mode 100644 index 0d5d367b95..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/files/libnfsidmap-0.19-getgrouplist.patch +++ /dev/null @@ -1,115 +0,0 @@ -http://bugs.gentoo.org/169909 - ---- libnfsidmap-0.19/configure.in -+++ libnfsidmap-0.19/configure.in -@@ -38,7 +38,7 @@ - - # Checks for library functions. - AC_FUNC_MALLOC --AC_CHECK_FUNCS([strchr strdup]) -+AC_CHECK_FUNCS([strchr strdup getgrouplist]) - - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT(libnfsidmap.pc) ---- libnfsidmap-0.19/nss.c -+++ libnfsidmap-0.19/nss.c -@@ -49,6 +49,8 @@ - #include "cfg.h" - #include - -+#include "getgrouplist.c" -+ - /* - * NSS Translation Methods - * ---- libnfsidmap-0.19/getgrouplist.c -+++ libnfsidmap-0.19/getgrouplist.c -@@ -0,0 +1,88 @@ -+/* -+ * getgrouplist.c -+ * -+ * if system does not provide the non-standard getgrouplist, we will emulate -+ * it via POSIX standard functions -+ * -+ * Copyright (c) 1991, 1993 -+ * The Regents of the University of California. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+#include -+#include -+#include -+#include -+ -+#ifndef HAVE_GETGROUPLIST -+static -+int -+getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) -+{ -+ const struct group *grp; -+ int i, maxgroups, ngroups, ret; -+ -+ ret = 0; -+ ngroups = 0; -+ maxgroups = *grpcnt; -+ /* -+ * When installing primary group, duplicate it; -+ * the first element of groups is the effective gid -+ * and will be overwritten when a setgid file is executed. -+ */ -+ groups[ngroups++] = agroup; -+ if (maxgroups > 1) -+ groups[ngroups++] = agroup; -+ /* -+ * Scan the group file to find additional groups. -+ */ -+ setgrent(); -+ while ((grp = getgrent()) != NULL) { -+ for (i = 0; i < ngroups; i++) { -+ if (grp->gr_gid == groups[i]) -+ goto skip; -+ } -+ for (i = 0; grp->gr_mem[i]; i++) { -+ if (!strcmp(grp->gr_mem[i], uname)) { -+ if (ngroups >= maxgroups) { -+ ret = -1; -+ break; -+ } -+ groups[ngroups++] = grp->gr_gid; -+ break; -+ } -+ } -+skip: -+ ; -+ } -+ endgrent(); -+ *grpcnt = ngroups; -+ return (ret); -+} -+#endif diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch deleted file mode 100644 index 6ef12d44e4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch +++ /dev/null @@ -1,22 +0,0 @@ -for toupper and such - ---- a/nss.c -+++ b/nss.c -@@ -34,6 +34,7 @@ - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include - #include - #include - #include ---- a/libnfsidmap.c -+++ b/libnfsidmap.c -@@ -37,6 +37,7 @@ - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include - #include - #include - #include diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/files/tmpfiles.d/libnfsidmap.conf b/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/files/tmpfiles.d/libnfsidmap.conf deleted file mode 100644 index 673f85fa1a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/files/tmpfiles.d/libnfsidmap.conf +++ /dev/null @@ -1,2 +0,0 @@ -L /etc/idmapd.conf - - - - ../usr/share/libnfsidmap/idmapd.conf - diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/libnfsidmap-0.24-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/libnfsidmap-0.24-r1.ebuild deleted file mode 100644 index 597d0423d5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libnfsidmap/libnfsidmap-0.24-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfsidmap/libnfsidmap-0.24.ebuild,v 1.8 2014/01/18 04:50:16 vapier Exp $ - -EAPI="2" - -inherit autotools eutils systemd - -DESCRIPTION="NFSv4 ID <-> name mapping library" -HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/" -SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="ldap static-libs" - -DEPEND="ldap? ( net-nds/openldap )" -RDEPEND="${DEPEND} - ! - - -net-fs - diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/Manifest b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/Manifest index 3dfc0a5f55..16e60b3458 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/Manifest @@ -1,2 +1,2 @@ -DIST libtirpc-1.0.1.tar.bz2 495125 SHA256 5156974f31be7ccbc8ab1de37c4739af6d9d42c87b1d5caf4835dda75fcbb89e SHA512 c9b449e737bc2bd3d56e31e8352f312e89a7ec2a11b73b5ac314e7d82d3b644c611e422b623912453b67b668f86a6de7bb7f18c9495dd15de8e2798ec2ff41c8 WHIRLPOOL cce6a4e69bd634b40d66594a81c23d2044b63eec16d6c96d6fcfaa7f2ca41fb9af99c8e2b964ec12be82682afa4090b218d7e14399fdfc9b32df6c2234bc3c9e -DIST libtirpc-glibc-nfs.tar.xz 8948 SHA256 2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba WHIRLPOOL 06bcf3fd4e424a86071e5c4ddeb89aa571c862e765aae9382d9f9a55ab72cd1c623490555c1a9bd3380a2d04ecb10fb47a75a7dddf449d4368a1a01617226858 +DIST libtirpc-1.0.2.tar.bz2 509601 BLAKE2B 7ccf23ca200e2027a66a3105d9b3d0612ac66a08498931f66526a291be6ddef8e7df533af4d44a0e4a1178edd6d51ae39ca50c2536b9b1be7179e7f17cfd165e SHA512 6c819019a8e81d8263d3c509b2eee59ba1ef092222c5a0a8d28f004c711afa252097eca7e6b0b919b2d780883dfd9ee7a363df4cee7fd2c9159a065257637cec +DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.1-CVE-2017-8779.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.1-CVE-2017-8779.patch deleted file mode 100644 index 91a50fad64..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.1-CVE-2017-8779.patch +++ /dev/null @@ -1,255 +0,0 @@ -diff --git a/src/rpc_generic.c b/src/rpc_generic.c -index 2f09a8f..589cbd5 100644 ---- a/src/rpc_generic.c -+++ b/src/rpc_generic.c -@@ -615,6 +615,9 @@ __rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf) - - switch (af) { - case AF_INET: -+ if (nbuf->len < sizeof(*sin)) { -+ return NULL; -+ } - sin = nbuf->buf; - if (inet_ntop(af, &sin->sin_addr, namebuf, sizeof namebuf) - == NULL) -@@ -626,6 +629,9 @@ __rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf) - break; - #ifdef INET6 - case AF_INET6: -+ if (nbuf->len < sizeof(*sin6)) { -+ return NULL; -+ } - sin6 = nbuf->buf; - if (inet_ntop(af, &sin6->sin6_addr, namebuf6, sizeof namebuf6) - == NULL) -@@ -667,6 +673,8 @@ __rpc_uaddr2taddr_af(int af, const char *uaddr) - - port = 0; - sin = NULL; -+ if (uaddr == NULL) -+ return NULL; - addrstr = strdup(uaddr); - if (addrstr == NULL) - return NULL; -diff --git a/src/rpcb_prot.c b/src/rpcb_prot.c -index 43fd385..a923c8e 100644 ---- a/src/rpcb_prot.c -+++ b/src/rpcb_prot.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include "rpc_com.h" - - bool_t - xdr_rpcb(xdrs, objp) -@@ -53,13 +54,13 @@ xdr_rpcb(xdrs, objp) - if (!xdr_u_int32_t(xdrs, &objp->r_vers)) { - return (FALSE); - } -- if (!xdr_string(xdrs, &objp->r_netid, (u_int)~0)) { -+ if (!xdr_string(xdrs, &objp->r_netid, RPC_MAXDATASIZE)) { - return (FALSE); - } -- if (!xdr_string(xdrs, &objp->r_addr, (u_int)~0)) { -+ if (!xdr_string(xdrs, &objp->r_addr, RPC_MAXDATASIZE)) { - return (FALSE); - } -- if (!xdr_string(xdrs, &objp->r_owner, (u_int)~0)) { -+ if (!xdr_string(xdrs, &objp->r_owner, RPC_MAXDATASIZE)) { - return (FALSE); - } - return (TRUE); -@@ -159,19 +160,19 @@ xdr_rpcb_entry(xdrs, objp) - XDR *xdrs; - rpcb_entry *objp; - { -- if (!xdr_string(xdrs, &objp->r_maddr, (u_int)~0)) { -+ if (!xdr_string(xdrs, &objp->r_maddr, RPC_MAXDATASIZE)) { - return (FALSE); - } -- if (!xdr_string(xdrs, &objp->r_nc_netid, (u_int)~0)) { -+ if (!xdr_string(xdrs, &objp->r_nc_netid, RPC_MAXDATASIZE)) { - return (FALSE); - } - if (!xdr_u_int32_t(xdrs, &objp->r_nc_semantics)) { - return (FALSE); - } -- if (!xdr_string(xdrs, &objp->r_nc_protofmly, (u_int)~0)) { -+ if (!xdr_string(xdrs, &objp->r_nc_protofmly, RPC_MAXDATASIZE)) { - return (FALSE); - } -- if (!xdr_string(xdrs, &objp->r_nc_proto, (u_int)~0)) { -+ if (!xdr_string(xdrs, &objp->r_nc_proto, RPC_MAXDATASIZE)) { - return (FALSE); - } - return (TRUE); -@@ -292,7 +293,7 @@ xdr_rpcb_rmtcallres(xdrs, p) - bool_t dummy; - struct r_rpcb_rmtcallres *objp = (struct r_rpcb_rmtcallres *)(void *)p; - -- if (!xdr_string(xdrs, &objp->addr, (u_int)~0)) { -+ if (!xdr_string(xdrs, &objp->addr, RPC_MAXDATASIZE)) { - return (FALSE); - } - if (!xdr_u_int(xdrs, &objp->results.results_len)) { -@@ -312,6 +313,11 @@ xdr_netbuf(xdrs, objp) - if (!xdr_u_int32_t(xdrs, (u_int32_t *) &objp->maxlen)) { - return (FALSE); - } -+ -+ if (objp->maxlen > RPC_MAXDATASIZE) { -+ return (FALSE); -+ } -+ - dummy = xdr_bytes(xdrs, (char **)&(objp->buf), - (u_int *)&(objp->len), objp->maxlen); - return (dummy); -diff --git a/src/rpcb_st_xdr.c b/src/rpcb_st_xdr.c -index 08db745..28e6a48 100644 ---- a/src/rpcb_st_xdr.c -+++ b/src/rpcb_st_xdr.c -@@ -37,6 +37,7 @@ - - - #include -+#include "rpc_com.h" - - /* Link list of all the stats about getport and getaddr */ - -@@ -58,7 +59,7 @@ xdr_rpcbs_addrlist(xdrs, objp) - if (!xdr_int(xdrs, &objp->failure)) { - return (FALSE); - } -- if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) { -+ if (!xdr_string(xdrs, &objp->netid, RPC_MAXDATASIZE)) { - return (FALSE); - } - -@@ -109,7 +110,7 @@ xdr_rpcbs_rmtcalllist(xdrs, objp) - IXDR_PUT_INT32(buf, objp->failure); - IXDR_PUT_INT32(buf, objp->indirect); - } -- if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) { -+ if (!xdr_string(xdrs, &objp->netid, RPC_MAXDATASIZE)) { - return (FALSE); - } - if (!xdr_pointer(xdrs, (char **)&objp->next, -@@ -147,7 +148,7 @@ xdr_rpcbs_rmtcalllist(xdrs, objp) - objp->failure = (int)IXDR_GET_INT32(buf); - objp->indirect = (int)IXDR_GET_INT32(buf); - } -- if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) { -+ if (!xdr_string(xdrs, &objp->netid, RPC_MAXDATASIZE)) { - return (FALSE); - } - if (!xdr_pointer(xdrs, (char **)&objp->next, -@@ -175,7 +176,7 @@ xdr_rpcbs_rmtcalllist(xdrs, objp) - if (!xdr_int(xdrs, &objp->indirect)) { - return (FALSE); - } -- if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) { -+ if (!xdr_string(xdrs, &objp->netid, RPC_MAXDATASIZE)) { - return (FALSE); - } - if (!xdr_pointer(xdrs, (char **)&objp->next, -diff --git a/src/xdr.c b/src/xdr.c -index f3fb9ad..b9a1558 100644 ---- a/src/xdr.c -+++ b/src/xdr.c -@@ -42,8 +42,10 @@ - #include - #include - -+#include - #include - #include -+#include - - typedef quad_t longlong_t; /* ANSI long long type */ - typedef u_quad_t u_longlong_t; /* ANSI unsigned long long type */ -@@ -53,7 +55,6 @@ typedef u_quad_t u_longlong_t; /* ANSI unsigned long long type */ - */ - #define XDR_FALSE ((long) 0) - #define XDR_TRUE ((long) 1) --#define LASTUNSIGNED ((u_int) 0-1) - - /* - * for unit alignment -@@ -629,6 +630,7 @@ xdr_bytes(xdrs, cpp, sizep, maxsize) - { - char *sp = *cpp; /* sp is the actual string pointer */ - u_int nodesize; -+ bool_t ret, allocated = FALSE; - - /* - * first deal with the length since xdr bytes are counted -@@ -652,6 +654,7 @@ xdr_bytes(xdrs, cpp, sizep, maxsize) - } - if (sp == NULL) { - *cpp = sp = mem_alloc(nodesize); -+ allocated = TRUE; - } - if (sp == NULL) { - warnx("xdr_bytes: out of memory"); -@@ -660,7 +663,14 @@ xdr_bytes(xdrs, cpp, sizep, maxsize) - /* FALLTHROUGH */ - - case XDR_ENCODE: -- return (xdr_opaque(xdrs, sp, nodesize)); -+ ret = xdr_opaque(xdrs, sp, nodesize); -+ if ((xdrs->x_op == XDR_DECODE) && (ret == FALSE)) { -+ if (allocated == TRUE) { -+ free(sp); -+ *cpp = NULL; -+ } -+ } -+ return (ret); - - case XDR_FREE: - if (sp != NULL) { -@@ -754,6 +764,7 @@ xdr_string(xdrs, cpp, maxsize) - char *sp = *cpp; /* sp is the actual string pointer */ - u_int size; - u_int nodesize; -+ bool_t ret, allocated = FALSE; - - /* - * first deal with the length since xdr strings are counted-strings -@@ -793,8 +804,10 @@ xdr_string(xdrs, cpp, maxsize) - switch (xdrs->x_op) { - - case XDR_DECODE: -- if (sp == NULL) -+ if (sp == NULL) { - *cpp = sp = mem_alloc(nodesize); -+ allocated = TRUE; -+ } - if (sp == NULL) { - warnx("xdr_string: out of memory"); - return (FALSE); -@@ -803,7 +816,14 @@ xdr_string(xdrs, cpp, maxsize) - /* FALLTHROUGH */ - - case XDR_ENCODE: -- return (xdr_opaque(xdrs, sp, size)); -+ ret = xdr_opaque(xdrs, sp, size); -+ if ((xdrs->x_op == XDR_DECODE) && (ret == FALSE)) { -+ if (allocated == TRUE) { -+ free(sp); -+ *cpp = NULL; -+ } -+ } -+ return (ret); - - case XDR_FREE: - mem_free(sp, nodesize); -@@ -823,7 +843,7 @@ xdr_wrapstring(xdrs, cpp) - XDR *xdrs; - char **cpp; - { -- return xdr_string(xdrs, cpp, LASTUNSIGNED); -+ return xdr_string(xdrs, cpp, RPC_MAXDATASIZE); - } - - /* diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch new file mode 100644 index 0000000000..91619b7ac9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bcopy-to-memmove.patch @@ -0,0 +1,49 @@ +diff -Naurp libtirpc-1.0.2.orig/src/auth_time.c libtirpc-1.0.2/src/auth_time.c +--- libtirpc-1.0.2.orig/src/auth_time.c 2017-07-05 11:02:23.000000000 -0400 ++++ libtirpc-1.0.2/src/auth_time.c 2017-07-30 17:48:31.361420071 -0400 +@@ -104,7 +104,7 @@ static int uaddr_to_sockaddr(uaddr, sin) + p_bytes[1] = (unsigned char)a[5] & 0x000000FF; + + sin->sin_family = AF_INET; /* always */ +- bcopy((char *)&p_bytes, (char *)&sin->sin_port, 2); ++ memmove((char *)&sin->sin_port, (char *)&p_bytes, 2); + + return (0); + } +diff -Naurp libtirpc-1.0.2.orig/src/crypt_client.c libtirpc-1.0.2/src/crypt_client.c +--- libtirpc-1.0.2.orig/src/crypt_client.c 2017-07-05 11:02:23.000000000 -0400 ++++ libtirpc-1.0.2/src/crypt_client.c 2017-07-30 17:49:57.911419445 -0400 +@@ -75,8 +75,8 @@ _des_crypt_call(buf, len, dparms) + des_crypt_1_arg.desbuf.desbuf_val = buf; + des_crypt_1_arg.des_dir = dparms->des_dir; + des_crypt_1_arg.des_mode = dparms->des_mode; +- bcopy(dparms->des_ivec, des_crypt_1_arg.des_ivec, 8); +- bcopy(dparms->des_key, des_crypt_1_arg.des_key, 8); ++ memmove(des_crypt_1_arg.des_ivec, dparms->des_ivec, 8); ++ memmove(des_crypt_1_arg.des_key, dparms->des_key, 8); + + result_1 = des_crypt_1(&des_crypt_1_arg, clnt); + if (result_1 == (desresp *) NULL) { +@@ -88,8 +88,8 @@ _des_crypt_call(buf, len, dparms) + + if (result_1->stat == DESERR_NONE || + result_1->stat == DESERR_NOHWDEVICE) { +- bcopy(result_1->desbuf.desbuf_val, buf, len); +- bcopy(result_1->des_ivec, dparms->des_ivec, 8); ++ memmove(buf, result_1->desbuf.desbuf_val, len); ++ memmove(dparms->des_ivec, result_1->des_ivec, 8); + } + + clnt_freeres(clnt, (xdrproc_t)xdr_desresp, result_1); +diff -Naurp libtirpc-1.0.2.orig/src/svc_auth_des.c libtirpc-1.0.2/src/svc_auth_des.c +--- libtirpc-1.0.2.orig/src/svc_auth_des.c 2017-07-05 11:02:23.000000000 -0400 ++++ libtirpc-1.0.2/src/svc_auth_des.c 2017-07-30 17:50:36.591419165 -0400 +@@ -145,7 +145,7 @@ _svcauth_des(rqst, msg) + return (AUTH_BADCRED); + } + cred->adc_fullname.name = area->area_netname; +- bcopy((char *)ixdr, cred->adc_fullname.name, ++ memmove(cred->adc_fullname.name, (char *)ixdr, + (u_int)namelen); + cred->adc_fullname.name[namelen] = 0; + ixdr += (RNDUP(namelen) / BYTES_PER_XDR_UNIT); diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bzero-to-memset.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bzero-to-memset.patch new file mode 100644 index 0000000000..64b516ed82 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-bzero-to-memset.patch @@ -0,0 +1,36 @@ +diff -Naurp libtirpc-1.0.2.orig/src/auth_time.c libtirpc-1.0.2/src/auth_time.c +--- libtirpc-1.0.2.orig/src/auth_time.c 2017-07-05 11:02:23.000000000 -0400 ++++ libtirpc-1.0.2/src/auth_time.c 2017-07-30 17:46:39.481420880 -0400 +@@ -317,7 +317,7 @@ __rpc_get_time_offset(td, srv, thost, ua + sprintf(ipuaddr, "%d.%d.%d.%d.0.111", a1, a2, a3, a4); + useua = &ipuaddr[0]; + +- bzero((char *)&sin, sizeof(sin)); ++ memset((char *)&sin, 0, sizeof(sin)); + if (uaddr_to_sockaddr(useua, &sin)) { + msg("unable to translate uaddr to sockaddr."); + if (needfree) +diff -Naurp libtirpc-1.0.2.orig/src/des_impl.c libtirpc-1.0.2/src/des_impl.c +--- libtirpc-1.0.2.orig/src/des_impl.c 2017-07-05 11:02:23.000000000 -0400 ++++ libtirpc-1.0.2/src/des_impl.c 2017-07-30 17:46:49.581420807 -0400 +@@ -588,7 +588,7 @@ _des_crypt (char *buf, unsigned len, str + } + tin0 = tin1 = tout0 = tout1 = xor0 = xor1 = 0; + tbuf[0] = tbuf[1] = 0; +- __bzero (schedule, sizeof (schedule)); ++ memset (schedule, 0, sizeof (schedule)); + + return (1); + } +diff -Naurp libtirpc-1.0.2.orig/src/svc_auth_des.c libtirpc-1.0.2/src/svc_auth_des.c +--- libtirpc-1.0.2.orig/src/svc_auth_des.c 2017-07-05 11:02:23.000000000 -0400 ++++ libtirpc-1.0.2/src/svc_auth_des.c 2017-07-30 17:46:58.771420741 -0400 +@@ -356,7 +356,7 @@ cache_init() + + authdes_cache = (struct cache_entry *) + mem_alloc(sizeof(struct cache_entry) * AUTHDES_CACHESZ); +- bzero((char *)authdes_cache, ++ memset((char *)authdes_cache, 0, + sizeof(struct cache_entry) * AUTHDES_CACHESZ); + + authdes_lru = (short *)mem_alloc(sizeof(short) * AUTHDES_CACHESZ); diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch new file mode 100644 index 0000000000..174f4e3471 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-exports.patch @@ -0,0 +1,17 @@ +See +https://bugs.alpinelinux.org/issues/7041 +https://git.alpinelinux.org/cgit/aports/commit/?id=9edb53cea056101c4963a04b747bf102de23f919 +(just hit this myself when building libnsl) +... dilfridge + +--- a/src/libtirpc.map ++++ b/src/libtirpc.map +@@ -298,7 +298,7 @@ + key_gendes; + key_get_conv; + key_setsecret; +- key_secret_is_set; ++ key_secretkey_is_set; + key_setnet; + netname2host; + netname2user; diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch new file mode 100644 index 0000000000..6d583e6149 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/files/libtirpc-1.0.2-glibc-2.26.patch @@ -0,0 +1,12 @@ +diff --git a/src/xdr_sizeof.c b/src/xdr_sizeof.c +index d23fbd1..79d6707 100644 +--- a/src/xdr_sizeof.c ++++ b/src/xdr_sizeof.c +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include "un-namespace.h" + + /* ARGSUSED */ diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild similarity index 71% rename from sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.0.1-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild index 761e14edaf..881e4b158b 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.0.1-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/libtirpc/libtirpc-1.0.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI="5" -inherit multilib-minimal toolchain-funcs eutils +inherit autotools multilib-minimal toolchain-funcs eutils DESCRIPTION="Transport Independent RPC library (SunRPC replacement)" HOMEPAGE="http://libtirpc.sourceforge.net/" @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0/3" # subslot matches SONAME major -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="ipv6 kerberos static-libs" RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )" @@ -21,16 +21,20 @@ DEPEND="${RDEPEND} >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" PATCHES=( - "${FILESDIR}/${P}-CVE-2017-8779.patch" + "${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch" + "${FILESDIR}/${PN}-1.0.2-bzero-to-memset.patch" + "${FILESDIR}/${PN}-1.0.2-glibc-2.26.patch" + "${FILESDIR}/${PN}-1.0.2-exports.patch" ) src_prepare() { cp -r "${WORKDIR}"/tirpc "${S}"/ || die epatch "${PATCHES[@]}" epatch_user + eautoreconf - # set netconfig path to /usr so nfs works in CoreOS PXE/ISO booted systems. - sed -ie "s,/etc,/usr/share/tirpc," "${S}/tirpc/netconfig.h" || die + # COREOS: Set netconfig path to /usr so NFS works in PXE/ISO-booted systems. + sed -i -e "s,/etc,/usr/share/tirpc," "${S}/tirpc/netconfig.h" || die } multilib_src_configure() { diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/Manifest b/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/Manifest new file mode 100644 index 0000000000..33b4e5b8c1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/Manifest @@ -0,0 +1 @@ +DIST rpcsvc-proto-1.3.1.tar.gz 59174 BLAKE2B d50d958cfad79142d686ae6312cdaa6044f1322bc794dbc95c1b78d088396c5adda292c83d150f3502df859c23d4e370894283ae210e5fe9aa1d0e8ed05553d0 SHA512 d687665ed51fd6fd66ab638813c5020f0c8b8491625b91937ac4b5ee4dd2357eae8e2909394e7651494e7aea77a6279ae907ba6354682ba446de7088b55f54ea diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch b/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch new file mode 100644 index 0000000000..5d77786a71 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/files/rpcsvc-proto-1.3.1-old-preprocessor.patch @@ -0,0 +1,31 @@ +From ce0ed4f45918f9230db435ee3b733090fa4f9620 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Tue, 27 Mar 2018 12:08:30 +0200 +Subject: [PATCH] Remove historic _RPC_THREAD_SAFE_ preprocessor conditional + +When the code was imported from glibc, the -D_RPC_THREAD_SAFE_ +build flag was missed. +--- + rpcgen/rpc_main.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/rpcgen/rpc_main.c b/rpcgen/rpc_main.c +index 94bd818..1b26e52 100644 +--- a/rpcgen/rpc_main.c ++++ b/rpcgen/rpc_main.c +@@ -1346,15 +1346,6 @@ parseargs (int argc, const char *argv[], struct commandline *cmd) + cmd->Scflag = flag['C']; + cmd->makefileflag = flag['M']; + +-#ifndef _RPC_THREAD_SAFE_ +- if (mtflag || newstyle) +- { +- /* glibc doesn't support these flags. */ +- f_print (stderr, +- _("This implementation doesn't support newstyle or MT-safe code!\n")); +- return (0); +- } +-#endif + if (tirpcflag) + { + pmflag = inetdflag ? 0 : 1; /* pmflag or inetdflag is always TRUE */ diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/metadata.xml new file mode 100644 index 0000000000..bcf493eae9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/metadata.xml @@ -0,0 +1,12 @@ + + + + + toolchain@gentoo.org + Gentoo Toolchain Project + + + base-system@gentoo.org + Gentoo Base System Project + + diff --git a/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild new file mode 100644 index 0000000000..bb3a5b3dea --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="rpcsvc protocol definitions from glibc" +HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto" +SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="LGPL-2.1+ BSD" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86" +IUSE="" + +RDEPEND="! - + chithanh@gentoo.org - Chí-Thanh Christopher Nguyễn -base-system + + base-system@gentoo.org + Gentoo Base System + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.07-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.07-r3.ebuild similarity index 71% rename from sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.07-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.07-r3.ebuild index 222570d273..5b1907b153 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.07-r2.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-boot/syslinux/syslinux-4.07-r3.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-4.07.ebuild,v 1.4 2013/09/23 11:56:54 jlec Exp $ -EAPI=5 +EAPI=6 inherit eutils toolchain-funcs DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders" -HOMEPAGE="http://syslinux.zytor.com/" +HOMEPAGE="https://syslinux.zytor.com/" SRC_URI="mirror://kernel/linux/utils/boot/syslinux/${PV:0:1}.xx/${P/_/-}.tar.bz2" LICENSE="GPL-2" @@ -28,12 +27,20 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P/_/-} +# This ebuild is a departure from the old way of rebuilding everything in syslinux +# This departure is necessary since hpa doesn't support the rebuilding of anything other +# than the installers. + +# removed all the unpack/patching stuff since we aren't rebuilding the core stuff anymore + src_unpack() { unpack ${A} cd "${S}" # Fix building on hardened epatch "${FILESDIR}"/${PN}-4.05-nopie.patch + rm -f gethostip #bug 137081 + # Don't prestrip or override user LDFLAGS, bug #305783 local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \ sample/Makefile utils/Makefile" @@ -63,13 +70,16 @@ src_unpack() { || die "sed remove perl failed" rm man/{lss16toppm.1,ppmtolss16.1,syslinux2ansi.1} || die fi + + # COREOS: Define the major/minor macros with newer glibc versions. + sed -i -e '/vfs/a#include ' extlinux/main.c } src_compile() { - emake CC=$(tc-getCC) installer + emake CC="$(tc-getCC)" installer || die } src_install() { - emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install - dodoc README NEWS doc/*.txt + emake INSTALLSUBDIRS=utils INSTALLROOT="${D}" MANDIR=/usr/share/man install || die + dodoc README NEWS doc/*.txt || die }