From 39b4a30b46dcb4c1fb557db47ef93a850563401f Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 2 Feb 2022 14:41:40 +0100 Subject: [PATCH 1/8] sys-devel/gcc-config: update to 2.5 Update sys-devel/gcc-config to 2.5, as it is recommended by the new gcc 10. --- .../sys-devel/gcc-config/Manifest | 6 +- ...t_source_functions_sh_from_etc_initd.patch | 47 --------------- .../gcc-config/gcc-config-1.8-r1.ebuild | 51 ---------------- .../gcc-config/gcc-config-1.9.0-r1.ebuild | 49 --------------- .../gcc-config/gcc-config-1.9.1.ebuild | 54 ----------------- .../gcc-config/gcc-config-2.4.ebuild | 52 ++++++++++++++++ .../gcc-config/gcc-config-2.5-r1.ebuild | 60 +++++++++++++++++++ .../gcc-config/gcc-config-9999.ebuild | 54 +++++++++-------- .../sys-devel/gcc-config/metadata.xml | 14 +++-- 9 files changed, 153 insertions(+), 234 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-1.9.1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.4.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/Manifest index 690dbe0321..96afcff2b4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/Manifest @@ -1,4 +1,2 @@ -DIST gcc-config-1.8.tar.xz 15020 BLAKE2B 97debbef946b0c14b4ecc0bc5b2217566b43f21318970b235b2919bd1e1ea41aff66aebb0ed73db2382f8312268327eb6844139bdeae7aba75771c699a5043df SHA512 3b84af2d961a0527834759e047330dbab7bac0ff3d6aae103f14fca2d44bd612bd4a1005649e8b4198036231ed8a8319fb13326b4d2c40474826cf53f7bc0826 -DIST gcc-config-1.9.0.tar.xz 17468 BLAKE2B 3e0b6faff3ac582fc0fed921958ff849ba8b1be5b0c25609790cd56400c05371e47ecd955b7bc79362179a559def94463a3667858a70d6edd283d2c064ff0734 SHA512 658c8ce26fdddd6f3e519310001cdf0f8fb01226df2d575fec81b39c083613ef0675024b79b285fab89a930c4ada7a1aef04433eb21947b4e9c0a9cb12f8fabc -DIST gcc-config-1.9.1.tar.xz 17628 BLAKE2B 8fce87038d9aed625d833327a7e335c311aeb04d44a07a7738def235333a9428664314ddd4da3a1d59d030136734377a838f25ff411b249aba25ea22a88460ee SHA512 6c518c266698277a1ad00a1624fc1ada15ed7096d05a520700c60a27180885169bd2051fb6869e6a958503c8eebc1cd6c211098501c5fe258ee11d96c6a0b069 -DIST gcc-config-2.0.tar.xz 15344 BLAKE2B 323b1e791b831ee610a375fc03532ab89e31b1f74586742c1d37dcea9c7853cf4ebfef875fc2bfa273cfc1555a33b9f04a1e58c850133cddee765dd769bdb189 SHA512 67c8cfc7e031d4a88191c04495c97f46e90e2d3fce4cd1afc29f142fad9414218768d3c6de4bd8bb7d9baa39a20b17bb28a503b0d05d6db2003b767546317a30 +DIST gcc-config-2.4.tar.xz 17552 BLAKE2B 631645a5cc9f3e7ab0ff089960ee3d0b2ecea29aa96f839a03a86985db512bf0d182b67a7b1bb73b95808c04523f32d6b8c122cdfbe8dbf94e7d319a1e49a23c SHA512 852b4aefaccfae1d91c551e226ac28110fa23f9668075c190a5fb9129c86d2f3e4994e96b7a5e8a2801883c5a5b16d9fbf3e9066e6b6a423055fdefa490793c7 +DIST gcc-config-2.5.tar.xz 17664 BLAKE2B fa7133a54d3b49df20d3ae6036a65602c8a0d9e8668e2874a87d080add241a31322a3f4694bff8a5fe61957740603862539c0d9750e446d36beb2fb42ff0ba27 SHA512 20a8d62192faf54101352cfb6ca00503c9b2ab83aefecd94c4c887302a000d78334545a3424603a66a50e5f3ff07b67b16828813407893df5d94051776252b83 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch deleted file mode 100644 index a4b7de2ffc..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/files/gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- gcc-config-1.8/gcc-config -+++ gcc-config-1.8/gcc-config -@@ -15,8 +15,9 @@ - trap ":" INT QUIT TSTP - - argv0=${0##*/} --source /etc/init.d/functions.sh || { -- echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2 -+functions_script="/lib/gentoo/functions.sh" -+source ${functions_script} || { -+ echo "${argv0}: Could not source ${functions_script}!" 1>&2 - exit 1 - } - esyslog() { :; } - -From d45de09450ffb63b138bbb7f78cae43e1101e2ec Mon Sep 17 00:00:00 2001 -From: Ryan Hill -Date: Tue, 12 May 2015 22:09:28 -0600 -Subject: [PATCH] Ignore whitespace when diffing test results. - -The amount of whitespace output by ebegin/eend from gentoo-functions -is dynamic (seems to be dependent on terminal width). Since we can't -predict this we have to ignore all whitespace differences. - -URL: https://bugs.gentoo.org/547586 -Reported-by: tka -Signed-off-by: Ryan Hill ---- - tests/run_tests | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/run_tests b/tests/run_tests -index 2ff7d77..397d667 100755 ---- a/tests/run_tests -+++ b/tests/run_tests -@@ -44,7 +44,7 @@ cmp_log() { - args+=( -e "s|: line [0-9]*: |: |g" ) - sed "${args[@]}" "${exp}" > "${exp}.tmp" - sed "${args[@]}" "${log}" > "${log}.tmp" -- diff -u "${exp}.tmp" "${log}.tmp" > "${log}.diff" -+ diff -uw "${exp}.tmp" "${log}.tmp" > "${log}.diff" - ret=$? - rm "${exp}.tmp" - return ${ret} --- -2.4.4 - diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild deleted file mode 100644 index 49c4dd5584..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils unpacker toolchain-funcs multilib - -DESCRIPTION="utility to manage compilers" -HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/" -SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" - -RDEPEND=">=sys-apps/gentoo-functions-0.10" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.8-dont_source_functions_sh_from_etc_initd.patch" # 504118 -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - emake \ - DESTDIR="${D}" \ - PV="${PV}" \ - SUBLIBDIR="$(get_libdir)" \ - install -} - -pkg_postinst() { - # Scrub eselect-compiler remains - rm -f "${ROOT}"/etc/env.d/05compiler & - - # We not longer use the /usr/include/g++-v3 hacks, as - # it is not needed ... - rm -f "${ROOT}"/usr/include/g++{,-v3} & - - # Do we have a valid multi ver setup ? - local x - for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do - gcc-config ${x} - done - - wait -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild deleted file mode 100644 index 157d0feb2e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-1.9.0-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils toolchain-funcs multilib - -DESCRIPTION="Utility to manage compilers" -HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/" -SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" - -RDEPEND=">=sys-apps/gentoo-functions-0.10" - -src_compile() { - emake CC="$(tc-getCC)" \ - PV="${PV}" \ - SUBLIBDIR="$(get_libdir)" -} - -src_install() { - emake \ - DESTDIR="${D}" \ - PV="${PV}" \ - SUBLIBDIR="$(get_libdir)" \ - install -} - -pkg_postinst() { - # Scrub eselect-compiler remains - rm -f "${ROOT}"/etc/env.d/05compiler & - - # We not longer use the /usr/include/g++-v3 hacks, as - # it is not needed ... - rm -f "${ROOT}"/usr/include/g++{,-v3} & - - # Do we have a valid multi ver setup ? - local x - for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do - gcc-config ${x} - done - - wait -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-1.9.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-1.9.1.ebuild deleted file mode 100644 index de2993cbb3..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-1.9.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git" - inherit git-r3 -else - SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -fi - -DESCRIPTION="Utility to manage compilers" -HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -RDEPEND=">=sys-apps/gentoo-functions-0.10" - -src_compile() { - emake CC="$(tc-getCC)" \ - PV="${PV}" \ - SUBLIBDIR="$(get_libdir)" -} - -src_install() { - emake \ - DESTDIR="${D}" \ - PV="${PV}" \ - SUBLIBDIR="$(get_libdir)" \ - install -} - -pkg_postinst() { - # Scrub eselect-compiler remains - rm -f "${ROOT}"/etc/env.d/05compiler & - - # We not longer use the /usr/include/g++-v3 hacks, as - # it is not needed ... - rm -f "${ROOT}"/usr/include/g++{,-v3} & - - # Do we have a valid multi ver setup ? - local x - for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do - gcc-config ${x} - done - - wait -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.4.ebuild new file mode 100644 index 0000000000..1d9d5647b2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.4.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git" + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +fi + +DESCRIPTION="Utility to manage compilers" +HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+cc-wrappers +native-symlinks" + +RDEPEND=">=sys-apps/gentoo-functions-0.10" + +_emake() { + emake \ + PV="${PVR}" \ + SUBLIBDIR="$(get_libdir)" \ + USE_CC_WRAPPERS="$(usex cc-wrappers)" \ + USE_NATIVE_LINKS="$(usex native-symlinks)" \ + TOOLCHAIN_PREFIX="${CHOST}-" \ + "$@" +} + +src_compile() { + _emake +} + +src_install() { + _emake DESTDIR="${D}" install +} + +pkg_postinst() { + # Do we have a valid multi ver setup ? + local x + for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + gcc-config ${x} + done + + # USE flag change can add or delete files in /usr/bin worth recaching + if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + eselect compiler-shadow update all + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild new file mode 100644 index 0000000000..6d93f7de87 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-2.5-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git" + inherit git-r3 +else + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +fi + +DESCRIPTION="Utility to manage compilers" +HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+cc-wrappers +native-symlinks" + +RDEPEND=">=sys-apps/gentoo-functions-0.10" + +_emake() { + emake \ + PV="${PVR}" \ + SUBLIBDIR="$(get_libdir)" \ + USE_CC_WRAPPERS="$(usex cc-wrappers)" \ + USE_NATIVE_LINKS="$(usex native-symlinks)" \ + TOOLCHAIN_PREFIX="${CHOST}-" \ + "$@" +} + +src_compile() { + _emake +} + +src_install() { + _emake DESTDIR="${D}" install +} + +pkg_postinst() { + # Do we have a valid multi ver setup ? + local x + for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do + gcc-config ${x} + done + + # USE flag change can add or delete files in /usr/bin worth recaching + if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + eselect compiler-shadow update all + fi + + if ! has_version "sys-devel/gcc[gcj(-)]" && [[ -x "${EROOT}"/usr/bin/gcj ]] ; then + # Warn about obsolete /usr/bin/gcj for bug #804178 + ewarn "Obsolete GCJ wrapper found: ${EROOT}/usr/bin/gcj!" + ewarn "Please delete this file unless you know it is needed (e.g. custom gcj install)." + ewarn "If you have no idea what this means, please delete the file:" + ewarn " rm ${EROOT}/usr/bin/gcj" + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-9999.ebuild index de2993cbb3..67c6a7ee63 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/gcc-config-9999.ebuild @@ -1,54 +1,60 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit toolchain-funcs +EAPI=7 if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git" inherit git-r3 else - SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" + SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Utility to manage compilers" HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/" + LICENSE="GPL-2" SLOT="0" -IUSE="" +IUSE="+cc-wrappers +native-symlinks" RDEPEND=">=sys-apps/gentoo-functions-0.10" +_emake() { + emake \ + PV="${PVR}" \ + SUBLIBDIR="$(get_libdir)" \ + USE_CC_WRAPPERS="$(usex cc-wrappers)" \ + USE_NATIVE_LINKS="$(usex native-symlinks)" \ + TOOLCHAIN_PREFIX="${CHOST}-" \ + "$@" +} + src_compile() { - emake CC="$(tc-getCC)" \ - PV="${PV}" \ - SUBLIBDIR="$(get_libdir)" + _emake } src_install() { - emake \ - DESTDIR="${D}" \ - PV="${PV}" \ - SUBLIBDIR="$(get_libdir)" \ - install + _emake DESTDIR="${D}" install } pkg_postinst() { - # Scrub eselect-compiler remains - rm -f "${ROOT}"/etc/env.d/05compiler & - - # We not longer use the /usr/include/g++-v3 hacks, as - # it is not needed ... - rm -f "${ROOT}"/usr/include/g++{,-v3} & - # Do we have a valid multi ver setup ? local x for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do gcc-config ${x} done - wait + # USE flag change can add or delete files in /usr/bin worth recaching + if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + eselect compiler-shadow update all + fi + + if ! has_version "sys-devel/gcc[gcj(-)]" && [[ -x "${EROOT}"/usr/bin/gcj ]] ; then + # Warn about obsolete /usr/bin/gcj for bug #804178 + ewarn "Obsolete GCJ wrapper found: ${EROOT}/usr/bin/gcj!" + ewarn "Please delete this file unless you know it is needed (e.g. custom gcj install)." + ewarn "If you have no idea what this means, please delete the file:" + ewarn " rm ${EROOT}/usr/bin/gcj" + fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/metadata.xml index e396f37559..4dac4d50b5 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gcc-config/metadata.xml @@ -1,8 +1,12 @@ - + - - toolchain@gentoo.org - Gentoo Toolchain Project - + + toolchain@gentoo.org + Gentoo Toolchain Project + + + Install and manage 'cc' and 'f77' wrappers in /usr/bin. Otherwise ignore them. + Install native symlinks like 'gcc' or 'g++' to /usr/bin. Otherwise keep only ${CTARGET}-gcc and friends. + From b386d93a7ecd3d18dcef40da37053e0aa80a82e5 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 2 Feb 2022 16:59:08 +0100 Subject: [PATCH 2/8] sys-fs/squashfs-tools: update to 4.5_p20210914 Update sys-fs/squashfs-tools to 4.5_p20210914, as needed by gcc 10. Without that update, build fails like: ``` .../x86_64-pc-linux-gnu/bin/ld: read_fs.o:(.bss+0x0): multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400be8): first defined here ``` --- .../sys-fs/squashfs-tools/Manifest | 20 +-- .../files/squashfs-tools-4.3-2gb.patch | 30 ----- .../squashfs-tools-4.3-aligned-data.patch | 15 --- .../files/squashfs-tools-4.3-extmatch.patch | 121 ------------------ .../squashfs-tools-4.3-local-cve-fix.patch | 19 --- .../squashfs-tools-4.3-mem-overflow.patch | 35 ----- .../files/squashfs-tools-4.3-musl.patch | 24 ---- .../files/squashfs-tools-4.3-sysmacros.patch | 25 ---- .../files/squashfs-tools-4.3-xattrs.patch | 34 ----- .../sys-fs/squashfs-tools/metadata.xml | 20 ++- .../squashfs-tools-3.2_p2.ebuild | 39 ------ .../squashfs-tools/squashfs-tools-3.4.ebuild | 39 ------ .../squashfs-tools-4.3-r2.ebuild | 75 ----------- .../squashfs-tools-4.5_p20210914.ebuild | 59 +++++++++ .../squashfs-tools/squashfs-tools-9999.ebuild | 67 ---------- 15 files changed, 68 insertions(+), 554 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-2gb.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-extmatch.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-musl.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-xattrs.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/Manifest index 206875ada1..d5e16c1f8c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/Manifest @@ -1,19 +1 @@ -AUX squashfs-tools-4.3-2gb.patch 961 SHA256 cdb9c85c2f733c0db879275d0ee2480f528aa3191f236bbf1ff681c75b14a024 SHA512 c45cad7822964ad4c74ea36fdd833fbfaf9e8e047726fa7a9517392bfa0b04a4de348bf3a511b071ac36d045c40cab0d8efeff054ebcd90b94f8508516b7dd71 WHIRLPOOL d3581d6014ecac4d4fa7a21e62829cb78c6ffa9fe148680d1fa43434bb1adb26c1dfb2f25fe58cfa22d16dbc2a922f7201a1d6bff94fd786456d28f445744e8f -AUX squashfs-tools-4.3-aligned-data.patch 375 SHA256 3030ddfa5ba9d0baea7f5e4761b33dea67fbc4d49c86e475830fc1bfbfddb145 SHA512 566e2ada5e86afc799cb0c52396179bedfbcc49349bc6eb43c048b96215b1638c3765f7c75c6fa35593d5a95a1111df7c29a143ee4a55eaf33a6663e9bfe1b25 WHIRLPOOL 798dda9e91f3c68148e3f974caf62536745c1e22267d8e551903d49c3808a8e5a27ea1ac3787ef556823035d82d68a97974620f1f0871e7c14841c781899d077 -AUX squashfs-tools-4.3-extmatch.patch 3487 SHA256 2ec937250adfd97a72373e91225cead3070d987b4249ee487fd2d6caac74b235 SHA512 e034320ace6b992968d3f6776aeb0b94237619585e7fac195e917622b941bbfbddc62b625409f79fe7a1853ab58f76d6679c28320646b6883eb58183a3adfdea WHIRLPOOL 1f1057e8866666a06d06db99928a283e875720b09bb11e4cd3ce883716f64fcf4742889508cf4a720e37ae31cc5c4b942ef6e99c5bca97ddfd29e1d11a342472 -AUX squashfs-tools-4.3-local-cve-fix.patch 620 SHA256 7edceedead4f5a57dc009afecd0f414d60a3878dc43f8de5224bff391ed32c76 SHA512 8e308217136f8b50bc89b49017ae706978d5c8a42a74deeef268e9aaaf6ae5785926da99711462374dfc98f2f193840b0e016b1845be1f9bad168047e4574367 WHIRLPOOL 6eda9f29a2f5786cc7538bfe26b6ff632b0be6f361f963c7ad39c83608bc62c7e972074be264587d8e65d254812b1b715a57c0dd2ef5eedc9d424c9f53fc54e7 -AUX squashfs-tools-4.3-mem-overflow.patch 981 SHA256 a94f9df3439bef373da31a734e6dad42f5fc5a6d91f2b9d15d30b02f1aac73b3 SHA512 00db6700ab7fbf7f71aa97b45ac9c629dc5e7b1731c3e3eb5c93a0891c1b0f79884df7b6a8672facd9104e9442448ba9657dd10b64d47d89abd1b9ae1969dc2e WHIRLPOOL af0c8a6c4f3218abbc800516cfb58626563ab1967da8b86702ca523f1db22e006b71f93e23bb04b4bef48ae9c463ea1fdaecb4af371353f09b65375050c9fd59 -AUX squashfs-tools-4.3-musl.patch 688 SHA256 f18ebfe8de97702068825be2f92a7363939ccd0b4b0506662021f15b9b5d1c15 SHA512 61fb8eaedc4e649eb8fb362150cf5faef2289cb42514300f63448d164a12c9b21539ae49f6dc0d78fa1e4a3be01b26cb9084cec7f0159fe026fc1caa19df18dd WHIRLPOOL 44c451e0d2dabc9e90379b761f4623cd218740c69c20a9e5460d680243fea80b19d72d1f7645bb7b48b3a8a70bf8bb2277732f39129ca9f7a7b3cd74ba7c67ac -AUX squashfs-tools-4.3-sysmacros.patch 611 SHA256 b44afb79ba6108a657fe6c51cecdf0e9623cbc91234b297478a6c3308cf0eddf SHA512 c21466b2f0aa6d6ae65b3693148274250bc42d8e7ea5142d6d4048d663ff4343dc539822320cf732d88c5bac048766a9771e1d2b739b1176cb9fafa96c4d306a WHIRLPOOL b0e0db62a80dc4c706dfd70ada83042ed5e66ecf881cf2b2055d09b838814571ac174a1f4c7a2a8bfc2ad242d10c717caa2ef03716b484f165d94d0e30f6e1d9 -AUX squashfs-tools-4.3-xattrs.patch 1076 SHA256 f98fb6bee2f46ba57b9ab68dbc1ad15ed5ac8c7592cbdfead36d6642096acada SHA512 3899bb72cabeb296eb12fdd1c2e77e82a4354e58c91c69be918950c7fc88f56fbc0265c915b7363704579b710a69a35312fa9ab3d43236900774ae97efd473a8 WHIRLPOOL b39d57dc7caa7468ea54396416485986c8867af1b2905f3b08266afb66b23484dda41b399fff1d0f80031c5b729c24af4a91908ed1239885fa3ce3368fdbf288 -DIST squashfs-tools_4.3-3.debian.tar.xz 15252 SHA256 1c296cc147e322e7124bf23a3c242ac83f6a986e6d6f64829ad2424b33914fc4 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae WHIRLPOOL 4f5a12a3371f2adced8f3a50b1d25db4420c2ff63856bbe74489e945c4698eb0e327ce677e442678849118f45351d01b14aef075ed78e6c09acb83ce56c99c3d -DIST squashfs3.2-r2.tar.gz 314764 SHA256 8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7 SHA512 983f1fa966c15fb4929eaaf2d88401aac72f6d04e8c5523bd46397bc28928ff13b638e0e96bc09650627449c37f6a654ffa727445f1e9ca13cdc9de4fc43012f WHIRLPOOL 14b22cfc16e5c9bc91a5e02b9d4b64589339162d59613b12c2344acbed34690616a7a0254d9a63f839e96ff4b850f30fd7e1e855aecb76423356f4b1d8582129 -DIST squashfs3.4.tar.gz 352660 SHA256 9ea1a9b3bd4f387ca11b5e96f00f8ae996fb81c4c7ad41f7c7f359917628a339 SHA512 5e126ea468271f54c62d473a04a355169514f2668b4dc0de4138a8ef2a6e633d373454e7b85c1c684b875d9dfc8afb17c05548dd5062d05f847ffef8e624d9fe WHIRLPOOL 7c113f3a66d0d28310302017e5f317d14bb5576e680a8f94e687193a376db92c54920be7d1121637f860cafa802d665ba419115e976b07029ca1f0c51953972d -DIST squashfs4.3.tar.gz 182550 SHA256 0d605512437b1eb800b4736791559295ee5f60177e102e4d4ccd0ee241a5f3f6 SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 WHIRLPOOL c819f416b34cc46a232b8bc385017774603f81b4a865e6b97208004c183ebad5de7d0f726be444f8cb4e1d450abed9340dab730aec0762407f034e99b39bdc06 -EBUILD squashfs-tools-3.2_p2.ebuild 953 SHA256 378ed13f72b193ae57f6e7dfa73e0497dd2dd576e2f02d6bb1d4065a32d75487 SHA512 989198cdeb688add1cd826743ab55b7ff33f0de87bf8338e4d6d14882dc79452ebf54fc393a41365e10efa22da1e0e0643f2ea50f4c4fabc8ab969517845f129 WHIRLPOOL e08b0d35c663be1e1bce2e583422549e53c13a731b25c2b41e0293d60a4e69434abd96f6189331da27947853aedb58006d959f76323ae47a5dccd1aa2fb05576 -EBUILD squashfs-tools-3.4.ebuild 937 SHA256 cc5393a6ac2d6563388f851b5d8960f4406df92193f3c22a1ed869a19e417937 SHA512 ea53dbc7607757087c89d6ce7e1396b0ffaa462534bfaadc13e4400172d242c5089c85d722f4b52e26c35cfeb328c9d2495f9d826e2fdcd24135934de55f924b WHIRLPOOL d18c907a2bf4bb378635dc1b8f8d028fc4e90bb9068c3a9ecc018ae9bf71cddb19fae343092c668594d3b8e5fc1383983d15c926e2717976f4849723762f11fd -EBUILD squashfs-tools-4.3-r2.ebuild 2129 SHA256 79a5da851793eba5b94a5b9bc5dc87f2b430e25659ff3cbabf3115079c23be7d SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec WHIRLPOOL 40caa4996831fd8c3711e16b8adc7a548dd5b7ab4c1c4d71042034949bed640aad1976be9f5ee0943d9768a65385c04183c68318237463861885814dd0956e96 -EBUILD squashfs-tools-9999.ebuild 1649 SHA256 39a6b5ef9618b67ffccf0ec3ce56b0c497ada8269fd70b891da03abf6d1fefaf SHA512 0535d76acba1893795b029dd8f0315fa5d1a96ff5048bffa9cac18a221b3204abcc2173e5ab26e8fad427824bee1aebfedef2d40f1cd8cf3a26c0b9a30972628 WHIRLPOOL 246c8c30868c05566649c9eb818891f6a067161e87ecbc462f4833f5498e81f1cc50800f03f7cc82d67ec89c206d32b7cf0cc29cb7cc3a51a52a4066214ddd55 -MISC ChangeLog 4948 SHA256 048b1ddb2aef544d992020d83546b567bd89ccdbc92b902e6b993a80e60d115f SHA512 6baf9d18b382033117f4a7ca46dfd9196af0c3b6b60d7b3b4073d6aecadacddd2816631fbab7f3ee308abf768fc2e6d5e82ffa4f9517e8c69344c106aff36bee WHIRLPOOL b8ec6c9c0a646c4c5ce8b30080d38168f50c0a7da1fb0c7567efb2eb8e869be6547574d3f24da2d87d5f805bcaaad2ebb75940fe3099f4c19b4f5040692f9be6 -MISC ChangeLog-2015 18760 SHA256 a731f71798d4dcbb59b9001f81a73064961bc450ba3f4e6de3fb790112eaf571 SHA512 58d3ee1c7ed0327c87d8bec39fcb309095adc8c500aa919c74cb461d13e9e745e632fc07207109dbab677ab4ac1862cbe1ec08af74f98cafc92d2a26e9d931be WHIRLPOOL 8188d57e0e1c6b6dcfd5be583571e38ea9db21ded8bb60355e60a2ed8eb34debc72cfaa79fa122e787085ded69a64567269e9ded619d63fdc36852f6b61ff110 -MISC metadata.xml 559 SHA256 5813dae0eff3bfed9a7a40ac785726804d493f175479c1cc10ee3ea566b6eb2d SHA512 2318c516e5e76a6c802563d1e1bf60273dbfd6a6cf0944a41e5287f0c85f1b73761ba050599dfb3b2c86a53da01fc752bb4c74397c404c4ff68eb73dfedf2572 WHIRLPOOL 763a763428e1ca87f7fc653cc7984a88bac9ffb256464e7fe2258f901ab4283819998c560197aa1e558e17a3b3c4bdb480a2b9df696efadd81c4cd00a47cfade +DIST squashfs-tools-4.5_p20210914.tar.gz 252104 BLAKE2B f3e2e281c30464b3c2e9b2a3520979f90ccb83665ac61a2f68513b402d8ef658621fc75c782c2f42da20ddf51f884e2ccc6217df941790fd45b41f3f4e3ec970 SHA512 a814092be787bbcbd4115f87493a63b67caa364ad88fe5a3c82808083343cbcbc22b4617bd5c72d65d8abe2b11eb77853bcc55c11f5cd5dc3edf24bd27cbd135 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-2gb.patch b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-2gb.patch deleted file mode 100644 index 467448f626..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-2gb.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9c1db6d13a51a2e009f0027ef336ce03624eac0d Mon Sep 17 00:00:00 2001 -From: "Guan, Xin" -Date: Sat, 13 Sep 2014 13:15:26 +0200 -Subject: [PATCH] Fix 2GB-limit of the is_fragment(...) function. - -Applies to squashfs-tools 4.3. - -Reported-by: Bruno Wolff III -Signed-off-by: Guan, Xin -Signed-off-by: Phillip Lougher ---- - squashfs-tools/mksquashfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index f1fcff1cc284..d221c35865a0 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -2029,7 +2029,7 @@ struct file_info *duplicate(long long file_size, long long bytes, - - inline int is_fragment(struct inode_info *inode) - { -- int file_size = inode->buf.st_size; -+ off_t file_size = inode->buf.st_size; - - /* - * If this block is to be compressed differently to the --- -2.8.2 - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch deleted file mode 100644 index 024129ffa9..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-aligned-data.patch +++ /dev/null @@ -1,15 +0,0 @@ -the mksquashfs code has an all_zeros func that does: - long *p = (long *) file_buffer->data; - -make sure we force the data field to be aligned so that still works. - ---- a/squashfs-tools/caches-queues-lists.h -+++ b/squashfs-tools/caches-queues-lists.h -@@ -123,6 +123,7 @@ struct file_buffer { - char locked; - char wait_on_unlock; - char noD; -+ long _pad; - char data[0]; - }; - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-extmatch.patch b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-extmatch.patch deleted file mode 100644 index 7ffc062006..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-extmatch.patch +++ /dev/null @@ -1,121 +0,0 @@ -From https://github.com/plougher/squashfs-tools/pull/9 - -From 4280e74de14070869787a9166242f9ce2dafd82e Mon Sep 17 00:00:00 2001 -From: Alexandru Ardelean -Date: Wed, 6 Jan 2016 15:33:43 +0200 -Subject: [PATCH] squashfs-tools: with fnmatch.h compatibility with musl - -musl does not define FNM_EXTMATCH - -Signed-off-by: Alexandru Ardelean ---- - squashfs-tools/action.c | 2 +- - squashfs-tools/fnmatch_compat.h | 32 ++++++++++++++++++++++++++++++++ - squashfs-tools/mksquashfs.c | 2 +- - squashfs-tools/unsquashfs.c | 1 + - squashfs-tools/unsquashfs.h | 1 - - 5 files changed, 35 insertions(+), 3 deletions(-) - create mode 100644 squashfs-tools/fnmatch_compat.h - -diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c -index 35889a4..4b06ccb 100644 ---- a/squashfs-tools/action.c -+++ b/squashfs-tools/action.c -@@ -31,7 +31,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -43,6 +42,7 @@ - #include "mksquashfs.h" - #include "action.h" - #include "error.h" -+#include "fnmatch_compat.h" - - /* - * code to parse actions -diff --git a/squashfs-tools/fnmatch_compat.h b/squashfs-tools/fnmatch_compat.h -new file mode 100644 -index 0000000..7b4afd8 ---- /dev/null -+++ b/squashfs-tools/fnmatch_compat.h -@@ -0,0 +1,32 @@ -+#ifndef FNMATCH_COMPAT -+#define FNMATCH_COMPAT -+/* -+ * Squashfs -+ * -+ * Copyright (c) 2015 -+ * Phillip Lougher -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2, -+ * or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * fnmatch_compat.h -+ */ -+ -+#include -+ -+#ifndef FNM_EXTMATCH -+#define FNM_EXTMATCH 0 -+#endif -+ -+#endif -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index d221c35..4e7cbdd 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -46,7 +46,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -76,6 +75,7 @@ - #include "read_fs.h" - #include "restore.h" - #include "process_fragments.h" -+#include "fnmatch_compat.h" - - int delete = FALSE; - int fd; -diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c -index 1323dd6..2428baa 100644 ---- a/squashfs-tools/unsquashfs.c -+++ b/squashfs-tools/unsquashfs.c -@@ -30,6 +30,7 @@ - #include "xattr.h" - #include "unsquashfs_info.h" - #include "stdarg.h" -+#include "fnmatch_compat.h" - - #include - #include -diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h -index ecd0bb4..0edbd25 100644 ---- a/squashfs-tools/unsquashfs.h -+++ b/squashfs-tools/unsquashfs.h -@@ -40,7 +40,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch deleted file mode 100644 index 7637f67cd5..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-local-cve-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -taken from Fedora - -commit af393379e34c5677f95bbec11645b6c3028195b4 -Author: Bruno Wolff III -Date: Wed Jun 24 14:27:31 2015 -0500 - -Update printf formats to match datatypes after CVE patch - ---- squashfs-tools/unsquash-4.c -+++ squashfs-tools/unsquash-4.c -@@ -35,7 +35,7 @@ - size_t indexes = SQUASHFS_FRAGMENT_INDEXES(sBlk.s.fragments); - long long *fragment_table_index; - -- TRACE("read_fragment_table: %d fragments, reading %d fragment indexes " -+ TRACE("read_fragment_table: %u fragments, reading %zu fragment indexes " - "from 0x%llx\n", sBlk.s.fragments, indexes, - sBlk.s.fragment_table_start); - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch deleted file mode 100644 index a9b000149e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-mem-overflow.patch +++ /dev/null @@ -1,35 +0,0 @@ -taken from Fedora - -From 604b607d8ac91eb8afc0b6e3d917d5c073096103 Mon Sep 17 00:00:00 2001 -From: Phillip Lougher -Date: Wed, 11 Jun 2014 04:51:37 +0100 -Subject: mksquashfs: ensure value does not overflow a signed int in -mem - option - -Signed-off-by: Phillip Lougher - -diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c -index 5370ecf..9676dc8 100644 ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -5193,7 +5193,16 @@ print_compressor_options: - argv[0]); - exit(1); - } -- /* convert from bytes to Mbytes */ -+ -+ /* -+ * convert from bytes to Mbytes, ensuring the value -+ * does not overflow a signed int -+ */ -+ if(number >= (1LL << 51)) { -+ ERROR("%s: -mem invalid mem size\n", argv[0]); -+ exit(1); -+ } -+ - total_mem = number / 1048576; - if(total_mem < (SQUASHFS_LOWMEM / SQUASHFS_TAKE)) { - ERROR("%s: -mem should be %d Mbytes or " --- -cgit v0.10.1 - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-musl.patch b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-musl.patch deleted file mode 100644 index 52b7f48c8e..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-musl.patch +++ /dev/null @@ -1,24 +0,0 @@ -From https://github.com/plougher/squashfs-tools/pull/9 - -From b0ca8a5c98ff73e70b2ab1bc24aa824aa2458287 Mon Sep 17 00:00:00 2001 -From: Alexandru Ardelean -Date: Wed, 6 Jan 2016 15:36:48 +0200 -Subject: [PATCH] pseudo.c: add explicit include - -Signed-off-by: Alexandru Ardelean ---- - squashfs-tools/pseudo.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c -index f85fe60..83bfc97 100644 ---- a/squashfs-tools/pseudo.c -+++ b/squashfs-tools/pseudo.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - - #include "pseudo.h" diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch deleted file mode 100644 index 1430b1a2ee..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-sysmacros.patch +++ /dev/null @@ -1,25 +0,0 @@ -sys/types.h might not always include sys/sysmacros.h for major/minor/makedev - ---- a/squashfs-tools/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -59,6 +59,7 @@ - #else - #include - #include -+#include - #endif - - #include "squashfs_fs.h" ---- a/squashfs-tools/unsquashfs.c -+++ b/squashfs-tools/unsquashfs.c -@@ -38,6 +38,10 @@ - #include - #include - -+#ifdef linux -+#include -+#endif -+ - struct cache *fragment_cache, *data_cache; - struct queue *to_reader, *to_inflate, *to_writer, *from_writer; - pthread_t *thread, *inflator_thread; diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-xattrs.patch b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-xattrs.patch deleted file mode 100644 index 47b0ea5c98..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/files/squashfs-tools-4.3-xattrs.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ffe9e55c4993422ce36213fa86d4fc29c22646ea Mon Sep 17 00:00:00 2001 -From: Wessel Dankers -Date: Fri, 17 Jun 2016 09:46:42 +0800 -Subject: [PATCH] unsquashfs: Correctly set file capabilities - -As posted on https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804194. ---- - squashfs-tools/unsquashfs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c -index 1323dd6..a5f0117 100644 ---- a/squashfs-tools/unsquashfs.c -+++ b/squashfs-tools/unsquashfs.c -@@ -821,8 +821,6 @@ int set_attributes(char *pathname, int mode, uid_t uid, gid_t guid, time_t time, - { - struct utimbuf times = { time, time }; - -- write_xattr(pathname, xattr); -- - if(utime(pathname, ×) == -1) { - ERROR("set_attributes: failed to set time on %s, because %s\n", - pathname, strerror(errno)); -@@ -845,6 +843,8 @@ int set_attributes(char *pathname, int mode, uid_t uid, gid_t guid, time_t time, - return FALSE; - } - -+ write_xattr(pathname, xattr); -+ - return TRUE; - } - --- -2.8.0.rc3.226.g39d4020 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/metadata.xml index 9edcb3d56b..b772b072f2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/metadata.xml @@ -1,15 +1,11 @@ - + - - livecd@gentoo.org - Gentoo LiveCD Project - - - Enable support for XZ ("LZMA2") compression using app-arch/xz-utils - Enable support for LZ4 compression using app-arch/lz4 - - - squashfs - + + mgorny@gentoo.org + Michał Górny + + + squashfs + diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild deleted file mode 100644 index 33c9be8386..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit toolchain-funcs - -MY_PV=${PV/_p/-r} -DESCRIPTION="Tool for creating compressed filesystem type squashfs" -HOMEPAGE="http://squashfs.sourceforge.net/" -SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.0" # squashfs filesystem version -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools - -src_prepare() { - sed -i \ - -e 's:-O2:$(CFLAGS):' \ - -e '/-lz/s:$: $(LDFLAGS):' \ - Makefile || die - - echo "struct dir_info; `grep '^int dir_scan2' mksquashfs.c`;" >> global.h -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - newbin mksquashfs mksquashfs-${SLOT} - newbin unsquashfs unsquashfs-${SLOT} - cd .. - dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.2 -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild deleted file mode 100644 index ef2cd80bfd..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit toolchain-funcs - -MY_PV=${PV/_p/-r} -DESCRIPTION="Tool for creating compressed filesystem type squashfs" -HOMEPAGE="http://squashfs.sourceforge.net/" -SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="3.1" # squashfs filesystem version -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools - -src_prepare() { - sed -i \ - -e 's:-O2:$(CFLAGS):' \ - -e '/-lz/s:$: $(LDFLAGS):' \ - Makefile || die - - sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - newbin mksquashfs mksquashfs-${SLOT} - newbin unsquashfs unsquashfs-${SLOT} - cd .. - dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild deleted file mode 100644 index 8273f5535b..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic toolchain-funcs - -DEB_VER="3" - -DESCRIPTION="Tool for creating compressed filesystem type squashfs" -HOMEPAGE="http://squashfs.sourceforge.net" -SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_VER}.debian.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="debug lz4 lzma lzo static xattr +xz" - -LIB_DEPEND="sys-libs/zlib[static-libs(+)] - !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) - lz4? ( app-arch/lz4[static-libs(+)] ) - lzma? ( app-arch/xz-utils[static-libs(+)] ) - lzo? ( dev-libs/lzo[static-libs(+)] ) - xattr? ( sys-apps/attr[static-libs(+)] ) - xz? ( app-arch/xz-utils[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" - -S="${WORKDIR}/squashfs${PV}/${PN}" - -src_prepare() { - epatch "${WORKDIR}"/debian/patches/*.patch - epatch "${FILESDIR}"/${P}-sysmacros.patch - epatch "${FILESDIR}"/${P}-aligned-data.patch - epatch "${FILESDIR}"/${P}-2gb.patch - epatch "${FILESDIR}"/${P}-local-cve-fix.patch - epatch "${FILESDIR}"/${P}-mem-overflow.patch - epatch "${FILESDIR}"/${P}-xattrs.patch - epatch "${FILESDIR}"/${P}-extmatch.patch - epatch "${FILESDIR}"/${P}-musl.patch -} - -use10() { usex $1 1 0 ; } - -src_configure() { - # restore GNU89 inline semantics to - # emit function symbols, bug 595290 - append-cflags -std=gnu89 - - # set up make command line variables in EMAKE_SQUASHFS_CONF - EMAKE_SQUASHFS_CONF=( - LZMA_XZ_SUPPORT=$(use10 lzma) - LZO_SUPPORT=$(use10 lzo) - LZ4_SUPPORT=$(use10 lz4) - XATTR_SUPPORT=$(use10 xattr) - XZ_SUPPORT=$(use10 xz) - ) - - tc-export CC - use debug && append-cppflags -DSQUASHFS_TRACE - use static && append-ldflags -static -} - -src_compile() { - emake "${EMAKE_SQUASHFS_CONF[@]}" -} - -src_install() { - dobin mksquashfs unsquashfs - cd .. - dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/* - doman "${WORKDIR}"/debian/manpages/*.[0-9] -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild new file mode 100644 index 0000000000..fdbb671496 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit flag-o-matic toolchain-funcs + +MY_COMMIT="19fcc9365dcdb2c22d232d42d11012940df64b7c" +MY_P=${P/_p/-git.} +DESCRIPTION="tools to create and extract Squashfs filesystems" +HOMEPAGE="https://github.com/plougher/squashfs-tools/" +SRC_URI="https://github.com/plougher/squashfs-tools/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${PN}-${MY_COMMIT} + +#SRC_URI=" +# https://github.com/plougher/squashfs-tools/archive/${PV/_p/-git.}.tar.gz +# -> ${MY_P}.tar.gz" +#S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +IUSE="debug lz4 lzma lzo xattr zstd" + +RDEPEND=" + sys-libs/zlib + lz4? ( app-arch/lz4 ) + lzma? ( app-arch/xz-utils ) + lzo? ( dev-libs/lzo ) + xattr? ( sys-apps/attr ) + zstd? ( app-arch/zstd ) +" +DEPEND=${RDEPEND} + +use10() { usex "${1}" 1 0; } + +src_configure() { + # set up make command line variables in EMAKE_SQUASHFS_CONF + EMAKE_SQUASHFS_CONF=( + LZMA_XZ_SUPPORT=$(use10 lzma) + LZO_SUPPORT=$(use10 lzo) + LZ4_SUPPORT=$(use10 lz4) + XATTR_SUPPORT=$(use10 xattr) + XZ_SUPPORT=$(use10 lzma) + ZSTD_SUPPORT=$(use10 zstd) + ) + + tc-export CC + use debug && append-cppflags -DSQUASHFS_TRACE +} + +src_compile() { + emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools +} + +src_install() { + dobin squashfs-tools/{mksquashfs,unsquashfs} + dodoc ACKNOWLEDGEMENTS CHANGES README* + dodoc -r RELEASE-READMEs +} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild deleted file mode 100644 index b2c2c5a392..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils git-r3 toolchain-funcs flag-o-matic - -DEB_VER="3" - -DESCRIPTION="Tool for creating compressed filesystem type squashfs" -HOMEPAGE="http://squashfs.sourceforge.net" -EGIT_REPO_URI=" - https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="debug lz4 lzma lzo static xattr +xz" - -LIB_DEPEND="sys-libs/zlib[static-libs(+)] - !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) ) - lz4? ( app-arch/lz4[static-libs(+)] ) - lzma? ( app-arch/xz-utils[static-libs(+)] ) - lzo? ( dev-libs/lzo[static-libs(+)] ) - xattr? ( sys-apps/attr[static-libs(+)] ) - xz? ( app-arch/xz-utils[static-libs(+)] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.3-sysmacros.patch - "${FILESDIR}"/${PN}-4.3-aligned-data.patch - "${FILESDIR}"/${PN}-4.3-xattrs.patch -) - -use10() { usex $1 1 0 ; } - -src_configure() { - cd "${WORKDIR}"/${P}/${PN} || die - - # set up make command line variables in EMAKE_SQUASHFS_CONF - EMAKE_SQUASHFS_CONF=( - LZMA_XZ_SUPPORT=$(use10 lzma) - LZO_SUPPORT=$(use10 lzo) - LZ4_SUPPORT=$(use10 lz4) - XATTR_SUPPORT=$(use10 xattr) - XZ_SUPPORT=$(use10 xz) - ) - - tc-export CC - use debug && append-cppflags -DSQUASHFS_TRACE - use static && append-ldflags -static -} - -src_compile() { - cd "${WORKDIR}"/${P}/${PN} || die - emake "${EMAKE_SQUASHFS_CONF[@]}" -} - -src_install() { - cd "${WORKDIR}"/${P}/${PN} || die - dobin mksquashfs unsquashfs - cd .. || die - dodoc CHANGES README RELEASE-README RELEASE-READMEs/* -} From 6fe0a4ccd48d2fcf7da242e8b638c6f7af05b563 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 2 Feb 2022 17:00:20 +0100 Subject: [PATCH 3/8] sys-power/iasl: update to 20200717 Update sys-power/iasl to 20200717, as needed by gcc 10. Without that update, build fails like: ``` .../x86_64-pc-linux-gnu/bin/ld: obj/aslcompilerparse.o:(.bss+0x8): multiple definition of `AslCompilerlval'; obj/aslcompilerlex.o:(.bss+0x8): first defined here .../x86_64-pc-linux-gnu/bin/ld: obj/prparserlex.o:(.bss+0x0): multiple definition of `LexBuffer'; obj/dtparserlex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status ``` --- .../portage-stable/sys-power/iasl/Manifest | 12 +- .../iasl/files/iasl-20140214-nostrip.patch | 11 -- .../iasl/files/iasl-20140828-locale.patch | 17 --- .../iasl/files/iasl-20200326-Makefile.patch | 106 +++++++++++++++ .../sys-power/iasl/iasl-20161222.ebuild | 127 ------------------ .../sys-power/iasl/iasl-20171215.ebuild | 127 ------------------ ...l-20180810.ebuild => iasl-20200326.ebuild} | 45 +++---- ...l-20160729.ebuild => iasl-20200717.ebuild} | 57 ++++---- .../sys-power/iasl/metadata.xml | 2 +- 9 files changed, 161 insertions(+), 343 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20140214-nostrip.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20140828-locale.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20200326-Makefile.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20161222.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20171215.ebuild rename sdk_container/src/third_party/portage-stable/sys-power/iasl/{iasl-20180810.ebuild => iasl-20200326.ebuild} (81%) rename sdk_container/src/third_party/portage-stable/sys-power/iasl/{iasl-20160729.ebuild => iasl-20200717.ebuild} (78%) diff --git a/sdk_container/src/third_party/portage-stable/sys-power/iasl/Manifest b/sdk_container/src/third_party/portage-stable/sys-power/iasl/Manifest index 63891496a2..111d98ac5c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-power/iasl/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-power/iasl/Manifest @@ -1,8 +1,4 @@ -DIST acpica-unix-20160729.tar.gz 1556095 BLAKE2B 2785d343d7aa0e3cce83d762bb70f8a7e76221da5d0e803eac3253b4a26dcaf852e114eadf811f387c7c040aeeb794de8cae37c47d8c29968f8cd0a0d76ed4b6 SHA512 37b0439b03e8d811c8b14d0c7c89471989227fb78b462f585c6290431afecc5b258073e568dde8dc982fa959ebce4b4d51589ea997f0066e66d4785ce185ccf2 -DIST acpica-unix-20161222.tar.gz 1580428 BLAKE2B dcf44d1a19b51e43ad1a74b2ba5b4bfadeb83eca584ff5a5062aff9cc4b0a65153b1590d993b7bca602e35da747683d230ea56c380afbec3308fb83fdb03908a SHA512 ff733d210b3b013970d3f3a0bea45f346ca5cf78dd61b583d30114a69c80e8272af304d14248aa34e775e19bca1c2ddbbed1b4ba5e8ba660b28621a8ca45ae31 -DIST acpica-unix-20171215.tar.gz 1769116 BLAKE2B f15c1202244ce5f489d80240e6c89f7fda38a3c74cf0773c4530e265876f931502571e3086aabae0082654a2085f3d6e5eeed324fd892c199a91a8837fdb19e2 SHA512 4cd3755fe28344de3259dad5209a58c9548216ecaf50a830165a0ee8993af57d4b63836904faafd5f97b1651051ee2f17a908395e0a048bab20b13395fe0d3ff -DIST acpica-unix-20180810.tar.gz 1797634 BLAKE2B 66b1c53874a7fa898fb042d0aac6001e623bb056ef17de46fc5a8e3ee5667178c47b5d8ecec194ebd8d2b0bdf947b5c85a1874c5d11a9ba3307a85418856ebdb SHA512 f37d8e0f1393b87cbfd9c6607104b05f85386583e4e5a5bcdbd2f049c122592a53e7cd56fe7da75e93bf3a424921fbc9291e7a39e06de80e6403abe042f869cd -DIST acpitests-unix-20160729.tar.gz 1829061 BLAKE2B 8dacb39c477ff8ba8b68a3f061b74e90a128a90eb287b9febd57d6871ff0878dfe2eaf616d9881af2b0bca6c8db57d48711ad9009c6ceb1ceba321bed182a51c SHA512 bf6073092a0dfb208f1d4b13ff3a3c5335be8e1326b1e58acd41def1a402ab0d843600f616019d1dde6593db8c53c6876bd9d489360fe98c6a7bee95d9215600 -DIST acpitests-unix-20161222.tar.gz 1759278 BLAKE2B cb1b3ea882135e9ee87c4337df4710ac2e613b89f2606306c3ce68af049735f999ae6a37b1f75c112f0fb5f8bc5af6897bf18715f657c8dcac82a37637da2a57 SHA512 ff0435f40564a94ceb3bc6cfc11ac859a5467b650004238092d7f3e2f7d596e7eb2fb9d3c56f0860c8324d38fcbedf3c6f4bc3f0569f1148462b824c7c025408 -DIST acpitests-unix-20171215.tar.gz 2034932 BLAKE2B c36aaf6a8a7aadf54651f95486af918926b664069ed961993c3ee8a062a646a7bd4e40adeebe82a101a5997080b90762fa016724ed4be31af56086eb3c3b3ab9 SHA512 b405e87f18b15bd01540d32c021a7b900139abd7e698b55786ccbaf8536c5068087a8ba1e7adbb69e0954cdc6b347e9a88428f1e8f889e0e9eb3a472c11235f9 -DIST acpitests-unix-20180810.tar.gz 2093850 BLAKE2B 519ce7807026dc11617ed9c34f294600ddae77a57a1fb76220da50da1bee56975373d583d51dfcdd81c8ccba3d5e735167b831bdb4669ab9cb2a1d9753d9261d SHA512 36c2527e8d670ccfb9a537b4944cfb8432c9638c1427e3c59f614c2ca43a66089228ecb74392301a07f266870e2d79bf0e2c671c6c7af06a4683bf97ac01ba54 +DIST acpica-unix-20200326.tar.gz 1850373 BLAKE2B 4b0c8548ff4b99fb774eb4301687368da2149bfaf68e02c638eecf890fc89974dadd75acc844233ecde8cfac2b98d75df79df2bb1bd6993dc8d502b3156c1012 SHA512 253ea7fc2bb540dd0cfa55552648c33562f39efb9a9b8cbab751ad7f4fea9bd3800eb241afb30313140e2008889b62b82b4427624e087a275353d81555403e76 +DIST acpica-unix-20200717.tar.gz 1847795 BLAKE2B 84af34884bbea39aed9ea7ec86f20a27f3dd10fa68456b5f12de2bdecf9f205c43b4b4e5dcfb55325571a5682794cdc2e0c5a83c646036a15cc90f81223aefff SHA512 16de55b97a3b478dd2dd44fcbe51b871c7cc6174d337939b873bcbc871bee10487a796aa86abaa7b54ff6b75279cdbf9ec48e19f6baaea4290daf1ad56bdbc46 +DIST acpitests-unix-20200326.tar.gz 2212897 BLAKE2B d88d3d900ac06d165c4a50cddd65495b75db345009b10e76d9f38197ba42efe3ea396ec9828bef62da1fd96ac331d95623c03194e08b00037ff1234321fcf0d3 SHA512 332b4ed016cee48662a5f4572e6d170461f02ee1386109a3970fbe8d104f2a2b14c19235ea43ae9b26e8faf9ef9597cb3d2148e498741361aca62978d0b62189 +DIST acpitests-unix-20200717.tar.gz 2212717 BLAKE2B 939e8022c5ecb7c5e862767f89c0b0de6146e23014dc0100d7dee0f3502e7adcbba72a468c828f804317e75d3a80ba5864c5497a7695f70be0bc1e3dcc69b4e6 SHA512 02c6674cbb2d98f783f25c71b1f391713de6fb3b56e5b57de9a7ccba0927453be4db8aea513e6e7ad491fcf3a0b2c14fefe8a2b82877a2ae01ea1d7832d36844 diff --git a/sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20140214-nostrip.patch b/sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20140214-nostrip.patch deleted file mode 100644 index 0bb82df38c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20140214-nostrip.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- acpica-unix-20140214/generate/unix/Makefile.config -+++ acpica-unix-20140214/generate/unix/Makefile.config -@@ -52,7 +52,7 @@ - INSTALLFLAGS ?= -f - else - INSTALL = install --INSTALLFLAGS ?= -m 555 -s -+INSTALLFLAGS ?= -m 555 - endif - - INSTALLPROG = \ diff --git a/sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20140828-locale.patch b/sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20140828-locale.patch deleted file mode 100644 index c8e278f757..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20140828-locale.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- acpica-unix-20140828/generate/unix/Makefile.config -+++ acpica-unix-20140828/generate/unix/Makefile.config -@@ -225,12 +225,12 @@ - #YACC= byacc - #YFLAGS += - # --YACC= bison -+YACC= LC_ALL=C bison - YFLAGS += -y - - MACROPROC= m4 - MFLAGS= -P -I$(ASL_COMPILER) - --LEX= flex -+LEX= LC_ALL=C flex - LFLAGS += -i -s - diff --git a/sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20200326-Makefile.patch b/sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20200326-Makefile.patch new file mode 100644 index 0000000000..4848c80ec6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-power/iasl/files/iasl-20200326-Makefile.patch @@ -0,0 +1,106 @@ +--- a/generate/unix/acpiexec/Makefile ++++ b/generate/unix/acpiexec/Makefile +@@ -256,12 +256,12 @@ + endif + + ifneq ($(ACPI_HOST),_QNX) +-LDFLAGS += -lpthread ++LIBS += -lpthread + endif + + ifneq ($(ACPI_HOST),_APPLE) + ifneq ($(ACPI_HOST),_QNX) +-LDFLAGS += -lrt ++LIBS += -lrt + endif + endif + +--- a/generate/unix/Makefile.config ++++ b/generate/unix/Makefile.config +@@ -35,15 +35,14 @@ + .SUFFIXES : + PROGS = acpibin acpidump acpiexamples acpiexec acpihelp acpinames acpisrc acpixtract iasl + ACPI_HOST ?= _CYGWIN +-CC ?= gcc + + # + # Common defines + # + OBJDIR = obj + BINDIR = bin +-COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $< +-LINKPROG = $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) $(OPT_LDFLAGS) ++COMPILEOBJ = $(CC) -c $(CFLAGS) $(CPPFLAGS) $(OPT_CFLAGS) -o $@ $< ++LINKPROG = $(CC) $(LDFLAGS) $(OBJECTS) -o $(PROG) $(LIBS) + PREFIX ?= /usr + INSTALLDIR = $(PREFIX)/bin + UNAME_S := $(shell uname -s) +@@ -76,7 +75,7 @@ + INSTALLFLAGS ?= -f + else + INSTALL = install +-INSTALLFLAGS ?= -m 555 -s ++INSTALLFLAGS ?= -m 555 + endif + + INSTALLPROG = \ +@@ -161,26 +160,18 @@ + # + ifeq ($(M32),TRUE) + CFLAGS +=-m32 +-LDFLAGS +=-m32 ++LIBS +=-m32 + endif + + # + # Optionally disable optimizations. Optimization causes problems on + # some compilers such as gcc 4.4 + # +-ifneq ($(NOOPT),TRUE) +-OPT_CFLAGS += -O2 +-else +-OPT_CFLAGS += -O0 +-endif + + # + # Optionally disable fortify source. This option can cause + # compile errors in toolchains where it is already defined. + # +-ifneq ($(NOFORTIFY),TRUE) +-OPT_CFLAGS += -D_FORTIFY_SOURCE=2 +-endif + + CFLAGS += \ + -D$(ACPI_HOST)\ +@@ -272,12 +263,12 @@ + #YACC= byacc + #YFLAGS += + # +-YACC= bison ++YACC= LC_ALL=C bison + YFLAGS += -y + + MACROPROC= m4 + MFLAGS= -P -I$(ASL_COMPILER) + +-LEX= flex ++LEX= LC_ALL=C flex + LFLAGS += -i -s + DLFLAGS += -i +--- a/generate/unix/Makefile.rules ++++ b/generate/unix/Makefile.rules +@@ -12,12 +12,12 @@ + + $(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS) + @echo "- Link" $(PROG) +- @$(LINKPROG) ++ $(LINKPROG) + $(RENAMEPROG) + + $(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS) + @echo $(PROG) $< +- @$(COMPILEOBJ) ++ $(COMPILEOBJ) + + clean : + @rm -f $(PROG) $(PROG).exe $(OBJECTS) $(OBJDIR)/*.o $(INTERMEDIATES) $(MISC) diff --git a/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20161222.ebuild b/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20161222.ebuild deleted file mode 100644 index 7bc182a44c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20161222.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic eutils - -MY_PN=acpica-unix -MY_P=${MY_PN}-${PV} -MY_TESTS_P=${MY_PN/ca/tests}-${PV} -DESCRIPTION="Intel ACPI Source Language (ASL) compiler" -HOMEPAGE="https://www.acpica.org/downloads/" -SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz - test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )" - -LICENSE="iASL" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="test" - -DEPEND="sys-devel/bison - sys-devel/flex" -RDEPEND="" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - if use test && has test ${FEATURES}; then - ewarn 'You have selected USE="test". This will install the test results' - ewarn "into /usr/share/${PF}/, compressed as a tarball." - ewarn 'The tests themselves will only rarely die, but the test results' - ewarn 'are interesting for arch testing. The tests may take quite some' - ewarn 'time to complete.' - fi -} - -PATCHES=( - "${FILESDIR}/${PN}-20140828-locale.patch" - "${FILESDIR}/${PN}-20140214-nostrip.patch" -) - -src_prepare() { - default - - find "${S}" -type f -name 'Makefile*' -print0 | \ - xargs -0 -I '{}' \ - sed -r -e 's:-\::g' -i '{}' \ - || die - - # BITS is tied to ARCH - please set appropriately if you add new keywords - if [[ $ARCH == @(amd64|amd64-fbsd) ]] ; then - export BITS=64 - else - export BITS=32 - fi -} - -src_configure() { - : -} - -src_compile() { - cd generate/unix || die - emake BITS=${BITS} -} - -src_test() { - aslts_test - #The aapits test currently fails, missing include probably. - #aapits_test -} - -src_install() { - cd generate/unix || die - emake install DESTDIR="${D}" BITS=${BITS} - default_src_install - #local bin - #for bin in $(<"${T}"/binlist) ; do - # dobin "${T}"/${bin} - #done - dodoc "${S}"/changes.txt - newdoc "${S}"/source/compiler/readme.txt compiler-readme.txt - newdoc "${S}"/generate/unix/readme.txt unix-readme.txt - newdoc "${S}"/generate/lint/readme.txt lint-readme.txt - newdoc "${S}"/source/compiler/new_table.txt compiler-new_table.txt - - if use test && has test ${FEATURES}; then - tb="${T}"/testresults.tar.bz2 - export ASLTSDIR="$(<"${T}"/asltdir)" - ebegin "Creating Test Tarball" - tar -cjf "${tb}" -C "${ASLTSDIR}"/tmp/RESULTS . || die "tar failed" - eend $? - dodir /usr/share/${PF} - insinto /usr/share/${PF} - doins ${tb} - fi - -} - -aslts_test() { - export ASL="${S}"/generate/unix/bin/iasl \ - acpiexec="${S}"/generate/unix/bin/acpiexec \ - ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts - export PATH="${PATH}:${ASLTSDIR}/bin" - echo "$ASLTSDIR" >"${T}"/asltdir - cd "${ASLTSDIR}" || die - edos2unix $(find . -type 'f') - make install || die "make install aslts test failed" - chmod +x $(find bin/ ! -regex 'ERROR_OPCODES|HOW_TO_USE|README' ) || die "chmod bin +x failed" - - #The below Do commands runs the tests twice and then dies if the results aren't - #Identical. - Do 1 || die "failed Do 1" - Do 2 || die "failed Do 2" -} - -aapits_test() { - mv "${WORKDIR}/${MY_TESTS_P}/tests/aapits" "${S}/tools/" || die "mv failed" - cd "${S}/tools/aapits" || die "cannot find ${S}/tools/aapits" - edos2unix $(find . -type 'f') - chmod +x $(find bin/ | sed -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed" - make || die "make in aapits failed" - cd asl || die "cd asl failed" - make || die "make in asl failed" - cd ../bin || die - ./aapitsrun || die "aapitsrun failed" -} diff --git a/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20171215.ebuild b/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20171215.ebuild deleted file mode 100644 index 7bc182a44c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20171215.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic eutils - -MY_PN=acpica-unix -MY_P=${MY_PN}-${PV} -MY_TESTS_P=${MY_PN/ca/tests}-${PV} -DESCRIPTION="Intel ACPI Source Language (ASL) compiler" -HOMEPAGE="https://www.acpica.org/downloads/" -SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz - test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )" - -LICENSE="iASL" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="test" - -DEPEND="sys-devel/bison - sys-devel/flex" -RDEPEND="" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - if use test && has test ${FEATURES}; then - ewarn 'You have selected USE="test". This will install the test results' - ewarn "into /usr/share/${PF}/, compressed as a tarball." - ewarn 'The tests themselves will only rarely die, but the test results' - ewarn 'are interesting for arch testing. The tests may take quite some' - ewarn 'time to complete.' - fi -} - -PATCHES=( - "${FILESDIR}/${PN}-20140828-locale.patch" - "${FILESDIR}/${PN}-20140214-nostrip.patch" -) - -src_prepare() { - default - - find "${S}" -type f -name 'Makefile*' -print0 | \ - xargs -0 -I '{}' \ - sed -r -e 's:-\::g' -i '{}' \ - || die - - # BITS is tied to ARCH - please set appropriately if you add new keywords - if [[ $ARCH == @(amd64|amd64-fbsd) ]] ; then - export BITS=64 - else - export BITS=32 - fi -} - -src_configure() { - : -} - -src_compile() { - cd generate/unix || die - emake BITS=${BITS} -} - -src_test() { - aslts_test - #The aapits test currently fails, missing include probably. - #aapits_test -} - -src_install() { - cd generate/unix || die - emake install DESTDIR="${D}" BITS=${BITS} - default_src_install - #local bin - #for bin in $(<"${T}"/binlist) ; do - # dobin "${T}"/${bin} - #done - dodoc "${S}"/changes.txt - newdoc "${S}"/source/compiler/readme.txt compiler-readme.txt - newdoc "${S}"/generate/unix/readme.txt unix-readme.txt - newdoc "${S}"/generate/lint/readme.txt lint-readme.txt - newdoc "${S}"/source/compiler/new_table.txt compiler-new_table.txt - - if use test && has test ${FEATURES}; then - tb="${T}"/testresults.tar.bz2 - export ASLTSDIR="$(<"${T}"/asltdir)" - ebegin "Creating Test Tarball" - tar -cjf "${tb}" -C "${ASLTSDIR}"/tmp/RESULTS . || die "tar failed" - eend $? - dodir /usr/share/${PF} - insinto /usr/share/${PF} - doins ${tb} - fi - -} - -aslts_test() { - export ASL="${S}"/generate/unix/bin/iasl \ - acpiexec="${S}"/generate/unix/bin/acpiexec \ - ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts - export PATH="${PATH}:${ASLTSDIR}/bin" - echo "$ASLTSDIR" >"${T}"/asltdir - cd "${ASLTSDIR}" || die - edos2unix $(find . -type 'f') - make install || die "make install aslts test failed" - chmod +x $(find bin/ ! -regex 'ERROR_OPCODES|HOW_TO_USE|README' ) || die "chmod bin +x failed" - - #The below Do commands runs the tests twice and then dies if the results aren't - #Identical. - Do 1 || die "failed Do 1" - Do 2 || die "failed Do 2" -} - -aapits_test() { - mv "${WORKDIR}/${MY_TESTS_P}/tests/aapits" "${S}/tools/" || die "mv failed" - cd "${S}/tools/aapits" || die "cannot find ${S}/tools/aapits" - edos2unix $(find . -type 'f') - chmod +x $(find bin/ | sed -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed" - make || die "make in aapits failed" - cd asl || die "cd asl failed" - make || die "make in asl failed" - cd ../bin || die - ./aapitsrun || die "aapitsrun failed" -} diff --git a/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20180810.ebuild b/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20200326.ebuild similarity index 81% rename from sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20180810.ebuild rename to sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20200326.ebuild index b96e7473a7..089ecaca72 100644 --- a/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20180810.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20200326.ebuild @@ -1,29 +1,34 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit toolchain-funcs flag-o-matic +inherit edos2unix toolchain-funcs MY_PN=acpica-unix MY_P="${MY_PN}-${PV}" MY_TESTS_P="${MY_PN/ca/tests}-${PV}" + DESCRIPTION="Intel ACPI Source Language (ASL) compiler" HOMEPAGE="https://www.acpica.org/downloads/" -SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz +SRC_URI=" + http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )" LICENSE="iASL" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="amd64 ~arm64 ppc ppc64 x86" IUSE="test" +RESTRICT="!test? ( test )" -DEPEND="sys-devel/bison +BDEPEND=" + sys-devel/bison sys-devel/flex" -RDEPEND="" S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}"/${PN}-20200326-Makefile.patch ) + pkg_setup() { if use test && has test ${FEATURES}; then ewarn 'You have selected USE="test". This will install the test results' @@ -34,34 +39,29 @@ pkg_setup() { fi } -PATCHES=( - "${FILESDIR}/${PN}-20140828-locale.patch" - "${FILESDIR}/${PN}-20140214-nostrip.patch" -) - src_prepare() { default find "${S}" -type f -name 'Makefile*' -print0 | \ xargs -0 -I '{}' \ - sed -r -e 's:-\::g' -i '{}' \ + sed -r -e 's:-\::g' -e "s:/usr:${EPREFIX}/usr:g" \ + -i '{}' \ || die +} + +src_configure() { + tc-export CC # BITS is tied to ARCH - please set appropriately if you add new keywords - if [[ $ARCH == @(amd64|amd64-fbsd) ]] ; then + if [[ $ARCH == @(amd64) ]] ; then export BITS=64 else export BITS=32 fi } -src_configure() { - : -} - src_compile() { - cd generate/unix || die - emake BITS=${BITS} + emake -C generate/unix BITS="${BITS}" } src_test() { @@ -90,15 +90,14 @@ src_install() { ebegin "Creating Test Tarball" tar -cjf "${tb}" -C "${ASLTSDIR}"/tmp/RESULTS . || die "tar failed" eend $? - dodir /usr/share/${PF} insinto /usr/share/${PF} doins ${tb} fi - } aslts_test() { - export ASL="${S}"/generate/unix/bin/iasl \ + export ASL="${S}"/generate/unix/bin/iasl \ + acpibin="${S}"/generate/unix/bin/acpibin \ acpiexec="${S}"/generate/unix/bin/acpiexec \ ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts export PATH="${PATH}:${ASLTSDIR}/bin" @@ -118,7 +117,7 @@ aapits_test() { mv "${WORKDIR}/${MY_TESTS_P}/tests/aapits" "${S}/tools/" || die "mv failed" cd "${S}/tools/aapits" || die "cannot find ${S}/tools/aapits" edos2unix $(find . -type 'f') - chmod +x $(find bin/ | sed -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed" + chmod +x $(find bin/ | sed -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed" make || die "make in aapits failed" cd asl || die "cd asl failed" make || die "make in asl failed" diff --git a/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20160729.ebuild b/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20200717.ebuild similarity index 78% rename from sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20160729.ebuild rename to sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20200717.ebuild index 9749052dfc..4deced324f 100644 --- a/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20160729.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-power/iasl/iasl-20200717.ebuild @@ -1,28 +1,33 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit toolchain-funcs flag-o-matic eutils +inherit edos2unix toolchain-funcs MY_PN=acpica-unix -MY_P=${MY_PN}-${PV} -MY_TESTS_P=${MY_PN/ca/tests}-${PV} +MY_P="${MY_PN}-${PV}" +MY_TESTS_P="${MY_PN/ca/tests}-${PV}" + DESCRIPTION="Intel ACPI Source Language (ASL) compiler" HOMEPAGE="https://www.acpica.org/downloads/" -SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz +SRC_URI=" + http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )" LICENSE="iASL" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" IUSE="test" +RESTRICT="!test? ( test )" -DEPEND="sys-devel/bison +BDEPEND=" + sys-devel/bison sys-devel/flex" -RDEPEND="" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}"/${PN}-20200326-Makefile.patch ) pkg_setup() { if use test && has test ${FEATURES}; then @@ -34,46 +39,41 @@ pkg_setup() { fi } -PATCHES=( - "${FILESDIR}/${PN}-20140828-locale.patch" - "${FILESDIR}/${PN}-20140214-nostrip.patch" -) - src_prepare() { default find "${S}" -type f -name 'Makefile*' -print0 | \ xargs -0 -I '{}' \ - sed -r -e 's:-\::g' -i '{}' \ + sed -r -e 's:-\::g' -e "s:/usr:${EPREFIX}/usr:g" \ + -i '{}' \ || die +} + +src_configure() { + tc-export CC # BITS is tied to ARCH - please set appropriately if you add new keywords - if [[ $ARCH == @(amd64|amd64-fbsd) ]] ; then + if [[ $ARCH == @(amd64) ]] ; then export BITS=64 else export BITS=32 fi } -src_configure() { - : -} - src_compile() { - cd generate/unix || die - emake BITS=${BITS} + emake -C generate/unix BITS="${BITS}" } src_test() { aslts_test - #aapits_test #The aapits test currently fails, missing include probably. + #aapits_test } src_install() { cd generate/unix || die emake install DESTDIR="${D}" BITS=${BITS} - default_src_install + default #local bin #for bin in $(<"${T}"/binlist) ; do # dobin "${T}"/${bin} @@ -90,15 +90,14 @@ src_install() { ebegin "Creating Test Tarball" tar -cjf "${tb}" -C "${ASLTSDIR}"/tmp/RESULTS . || die "tar failed" eend $? - dodir /usr/share/${PF} insinto /usr/share/${PF} doins ${tb} fi - } aslts_test() { - export ASL="${S}"/generate/unix/bin/iasl \ + export ASL="${S}"/generate/unix/bin/iasl \ + acpibin="${S}"/generate/unix/bin/acpibin \ acpiexec="${S}"/generate/unix/bin/acpiexec \ ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts export PATH="${PATH}:${ASLTSDIR}/bin" @@ -118,7 +117,7 @@ aapits_test() { mv "${WORKDIR}/${MY_TESTS_P}/tests/aapits" "${S}/tools/" || die "mv failed" cd "${S}/tools/aapits" || die "cannot find ${S}/tools/aapits" edos2unix $(find . -type 'f') - chmod +x $(find bin/ | sed -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed" + chmod +x $(find bin/ | sed -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed" make || die "make in aapits failed" cd asl || die "cd asl failed" make || die "make in asl failed" diff --git a/sdk_container/src/third_party/portage-stable/sys-power/iasl/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-power/iasl/metadata.xml index 167335954d..5834830942 100644 --- a/sdk_container/src/third_party/portage-stable/sys-power/iasl/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-power/iasl/metadata.xml @@ -1,5 +1,5 @@ - + robbat2@gentoo.org From 97396c4c1932000bb8409193090b25374d9dda0e Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 3 Feb 2022 09:11:23 +0100 Subject: [PATCH 4/8] sys-apps/kexec-tools: update to 2.0.22 Update sys-apps/kexec-tools to 2.0.22, as needed by gcc 10. Without that update, build fails like: ``` /usr/libexec/gcc/x86_64-cros-linux-gnu/ld: kexec/arch/x86_64/kexec-bzImage64.o:.../kexec/arch/x86_64/kexec-bzImage64.c:45: multiple definition of `bzImage_support_efi_boot'; kexec/arch/i386/kexec-bzImage.o:.../kexec/arch/i386/kexec-bzImage.c:43: first defined here ``` --- .../sys-apps/kexec-tools/Manifest | 5 +- .../{kexec.init-2.0.13-r1 => kexec-r2.init} | 30 +++-- ...rela-relocation-R_X86_64_PLT32-error.patch | 38 ------ .../kexec-tools/kexec-tools-2.0.14.ebuild | 76 ----------- .../kexec-tools/kexec-tools-2.0.16.ebuild | 82 ------------ .../kexec-tools/kexec-tools-2.0.17-r1.ebuild | 86 ------------ .../kexec-tools/kexec-tools-2.0.17.ebuild | 85 ------------ .../kexec-tools/kexec-tools-2.0.22.ebuild | 124 ++++++++++++++++++ .../kexec-tools/kexec-tools-2.0.23.ebuild | 124 ++++++++++++++++++ .../kexec-tools/kexec-tools-9999.ebuild | 57 ++++++-- .../sys-apps/kexec-tools/metadata.xml | 2 +- 11 files changed, 321 insertions(+), 388 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/files/{kexec.init-2.0.13-r1 => kexec-r2.init} (83%) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.17.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/Manifest index 0327fc4ca1..b076113444 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/Manifest @@ -1,3 +1,2 @@ -DIST kexec-tools-2.0.14.tar.xz 283640 BLAKE2B f84b5485904c0d4bbe5f7fdae391a4fb0b2a7436e078f23de649e79aaa7dfcdeff99139230a299bf2b9b0554ac13fa833e31211682c92f07cd6b8072907e35aa SHA512 8c1f9d1f4bb69a621961d45091f9c8349535ae69b80168423663685b44d89e1b9324d5cd11c83e86d805a3371f4f1600b0def551c52efb3c6cf020e9c11c273f -DIST kexec-tools-2.0.16.tar.xz 287888 BLAKE2B 7e7bbe11dc2792be3cab6318c12b6866bf6b373fb7bf2d7601ef68a39dd5882aceab7c8905ce0d9b0af1da2072b3f3d2677bd9e006676c484e1d6506ac7036fa SHA512 f2f06e7702fef20c8d7d6aabe1b264e2e2689e5c38cc00dbc2186dd7fa0479edb2dc9e307dd2ad7f03db47015e966e577f11576172604ef01c1bcca471fe2c24 -DIST kexec-tools-2.0.17.tar.xz 290612 BLAKE2B 57ec5b5ed33a5c5bbe433099d6e80663717c8a086bdb8b95f4a1d81fd7e546619c0064698454dc79f489313f98696ee6dee4cafbc8b1b93db5c7909cdf7a6234 SHA512 e0f254ca2b26fa02cb61ba9a0735423b26bac2693fbd920eaf7cc2822c298de958bd65f7c37947ca1f6811a3752a58f7cf8aa903494f0109ea76b7159a037fa6 +DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B 977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7 SHA512 7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba +DIST kexec-tools-2.0.23.tar.xz 304024 BLAKE2B 0150985093dc0012d3870c127ac5eab81d4cc839c0a79ff20224d1a409462a194d7e304f54ed8f0952e4d325dbff11bcbe1565b2c57c45c212302810dc06ed62 SHA512 b6e3b967cacc31c434b185d25da4d53c822ae4bbcec26ef9d6cb171f294fdcc80913d381e686a0a41e025187835f4dc088052ff88efe75a021d7624c8b1a1ed8 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/files/kexec-r2.init similarity index 83% rename from sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 rename to sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/files/kexec-r2.init index 5415b3bc85..0578f51aea 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/files/kexec-r2.init @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Set up some defaults. @@ -14,16 +14,16 @@ depend() { auto_prefix_bootpath() { # Only auto-add prefix to relative paths. case $1 in - */*) echo "$1";; - *) echo "${BOOTPART}/$1" ;; + */*) echo "$1";; + *) echo "${BOOTPART}/$1" ;; esac } get_genkernel_arch() { case $1 in - x86_64) echo "amd64" ;; - i[3456]86) echo "x86" ;; - *) echo "$1" ;; + x86_64) echo "amd64" ;; + i[3456]86) echo "x86" ;; + *) echo "$1" ;; esac } @@ -34,12 +34,15 @@ image_path() { return fi - local x kver="$(uname -r)" karch="$(uname -m)" + local x kver="$(uname -r)" karch="$(uname -m)" local gkarch="$(get_genkernel_arch $karch)" for x in \ "bzImage" \ + "vmlinux" \ "vmlinuz" \ + "kernel" \ "bzImage-${kver}" \ + "vmlinux-${kver}" \ "vmlinuz-${kver}" \ "kernel-genkernel-${karch}-${kver}" \ "kernel-genkernel-${gkarch}-${kver}" \ @@ -65,6 +68,7 @@ initrd_path() { local gkarch="$(get_genkernel_arch $karch)" for x in \ "initrd" \ + "initramfs" \ "initrd.img-${kver}" \ "initrd-${kver}.img" \ "initrd-${kver}" \ @@ -115,12 +119,22 @@ load_image() { fi fi + local is_rootpart_autodetected=no if [ -z "${ROOTPART}" ]; then ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")" + is_rootpart_autodetected=yes fi + local is_reusing_cmdline=no if [ -z "${KPARAM}" ]; then kparamopt="--reuse-cmdline" + is_reusing_cmdline=yes + fi + + if ! yesno "${is_rootpart_autodetected}" || ! yesno "${is_reusing_cmdline}"; then + # Only append root when explicit set in config or + # if we aren't re-using kernel cmdline + KPARAM="${KPARAM:+"${KPARAM} "}root=${ROOTPART}" fi if [ -n "${initrd}" ]; then @@ -133,7 +147,7 @@ load_image() { ebegin "Using kernel image ${img}${msg} for kexec" kexec ${KEXEC_OPT_ARGS} ${kparamopt} \ - -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt} + -l "${img}" ${KPARAM:+--append="${KPARAM}"} ${initrdopt} local ret=$? ${mounted} && umount "${BOOTPART}" diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch deleted file mode 100644 index 5d691b34be..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/files/kexec-tools-2.0.17-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b9de21ef51a7ceab7122a707c188602eae22c4ee Mon Sep 17 00:00:00 2001 -From: Chris Clayton -Date: Mon, 20 Aug 2018 12:00:31 +0100 -Subject: kexec: fix for "Unhandled rela relocation: R_X86_64_PLT32" error - -In response to a change in binutils, commit b21ebf2fb4c -(x86: Treat R_X86_64_PLT32 as R_X86_64_PC32) was applied to -the linux kernel during the 4.16 development cycle and has -since been backported to earlier stable kernel series. The -change results in the failure message in $SUBJECT when -rebooting via kexec. - -Fix this by replicating the change in kexec. - -Signed-off-by: Chris Clayton -Acked-by: Baoquan He -Tested-by: Bhupesh Sharma -Acked-by: Bhupesh Sharma -Signed-off-by: Simon Horman ---- - kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -index 7fdde73..db85b44 100644 ---- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -+++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -@@ -79,6 +79,7 @@ void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), - goto overflow; - break; - case R_X86_64_PC32: -+ case R_X86_64_PLT32: - *(uint32_t *)location = value - address; - break; - default: --- -cgit 1.2-0.3.lf.el7 - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild deleted file mode 100644 index bfab356b9b..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.14.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" - AUTOTOOLS_AUTORECONF=true -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 x86" -fi - -inherit autotools-utils linux-info systemd - -DESCRIPTION="Load another kernel from the currently executing Linux kernel" -HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="booke lzma xen zlib" - -REQUIRED_USE="lzma? ( zlib )" - -DEPEND=" - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~KEXEC" - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch - "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch -) - -pkg_setup() { - # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) - export ASFLAGS="${CCASFLAGS}" -} - -src_configure() { - local myeconfargs=( - $(use_with booke) - $(use_with lzma) - $(use_with xen) - $(use_with zlib) - ) - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - dodoc "${FILESDIR}"/README.Gentoo - - newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec - newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec - - insinto /etc - doins "${FILESDIR}"/kexec.conf - - insinto /etc/kernel/postinst.d - doins "${FILESDIR}"/90_kexec - - systemd_dounit "${FILESDIR}"/kexec.service -} - -pkg_postinst() { - if systemd_is_booted || has_version sys-apps/systemd; then - elog "For systemd support the new config file is" - elog " /etc/kexec.conf" - elog "Please adopt it to your needs as there is no autoconfig anymore" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild deleted file mode 100644 index a35048aca5..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.16.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" - AUTOTOOLS_AUTORECONF=true -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" -fi - -inherit flag-o-matic libtool linux-info systemd - -DESCRIPTION="Load another kernel from the currently executing Linux kernel" -HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="booke lzma xen zlib" - -REQUIRED_USE="lzma? ( zlib )" - -DEPEND=" - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~KEXEC" - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch - "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch -) - -pkg_setup() { - # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) - export ASFLAGS="${CCASFLAGS}" -} - -src_prepare() { - default - elibtoolize - filter-flags '-mindirect-branch=thunk*' -} - -src_configure() { - local myeconfargs=( - $(use_with booke) - $(use_with lzma) - $(use_with xen) - $(use_with zlib) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - dodoc "${FILESDIR}"/README.Gentoo - - newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec - newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec - - insinto /etc - doins "${FILESDIR}"/kexec.conf - - insinto /etc/kernel/postinst.d - doins "${FILESDIR}"/90_kexec - - systemd_dounit "${FILESDIR}"/kexec.service -} - -pkg_postinst() { - if systemd_is_booted || has_version sys-apps/systemd; then - elog "For systemd support the new config file is" - elog " /etc/kexec.conf" - elog "Please adopt it to your needs as there is no autoconfig anymore" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild deleted file mode 100644 index 6c326cbbfd..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.17-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 x86" -fi - -inherit flag-o-matic libtool linux-info systemd - -DESCRIPTION="Load another kernel from the currently executing Linux kernel" -HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="booke lzma xen zlib" - -REQUIRED_USE="lzma? ( zlib )" - -DEPEND=" - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~KEXEC" - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch - "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch - "${FILESDIR}"/${P}-fix-unhandled-rela-relocation-R_X86_64_PLT32-error.patch -) - -pkg_setup() { - # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) - export ASFLAGS="${CCASFLAGS}" -} - -src_prepare() { - default - if [[ ${PV} == "9999" ]] ; then - eautoreconf - else - elibtoolize - fi - filter-flags '-mindirect-branch=thunk*' -} - -src_configure() { - local myeconfargs=( - $(use_with booke) - $(use_with lzma) - $(use_with xen) - $(use_with zlib) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - dodoc "${FILESDIR}"/README.Gentoo - - newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec - newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec - - insinto /etc - doins "${FILESDIR}"/kexec.conf - - insinto /etc/kernel/postinst.d - doins "${FILESDIR}"/90_kexec - - systemd_dounit "${FILESDIR}"/kexec.service -} - -pkg_postinst() { - if systemd_is_booted || has_version sys-apps/systemd; then - elog "For systemd support the new config file is" - elog " /etc/kexec.conf" - elog "Please adopt it to your needs as there is no autoconfig anymore" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.17.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.17.ebuild deleted file mode 100644 index 08e61a61b6..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.17.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" -fi - -inherit flag-o-matic libtool linux-info systemd - -DESCRIPTION="Load another kernel from the currently executing Linux kernel" -HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="booke lzma xen zlib" - -REQUIRED_USE="lzma? ( zlib )" - -DEPEND=" - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND}" - -CONFIG_CHECK="~KEXEC" - -PATCHES=( - "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch - "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch -) - -pkg_setup() { - # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) - export ASFLAGS="${CCASFLAGS}" -} - -src_prepare() { - default - if [[ ${PV} == "9999" ]] ; then - eautoreconf - else - elibtoolize - fi - filter-flags '-mindirect-branch=thunk*' -} - -src_configure() { - local myeconfargs=( - $(use_with booke) - $(use_with lzma) - $(use_with xen) - $(use_with zlib) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - dodoc "${FILESDIR}"/README.Gentoo - - newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec - newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec - - insinto /etc - doins "${FILESDIR}"/kexec.conf - - insinto /etc/kernel/postinst.d - doins "${FILESDIR}"/90_kexec - - systemd_dounit "${FILESDIR}"/kexec.service -} - -pkg_postinst() { - if systemd_is_booted || has_version sys-apps/systemd; then - elog "For systemd support the new config file is" - elog " /etc/kexec.conf" - elog "Please adopt it to your needs as there is no autoconfig anymore" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild new file mode 100644 index 0000000000..897b98a24b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.22.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit libtool linux-info systemd + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 autotools + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz" + [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="amd64 ~arm64 ~ppc64 x86" +fi + +DESCRIPTION="Load another kernel from the currently executing Linux kernel" +HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="booke lzma xen zlib" + +REQUIRED_USE="lzma? ( zlib )" + +DEPEND=" + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${P/_/-}" + +CONFIG_CHECK="~KEXEC" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch + "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch +) + +pkg_setup() { + # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) + export ASFLAGS="${CCASFLAGS}" +} + +src_prepare() { + default + + # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely. + sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die + + if [[ "${PV}" == 9999 ]] ; then + eautoreconf + else + elibtoolize + fi +} + +src_configure() { + local myeconfargs=( + $(use_with booke) + $(use_with lzma) + $(use_with xen) + $(use_with zlib) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # Respect CFLAGS for purgatory. + # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable. + # -mfunction-return=thunk and -mindirect-branch=thunk conflict with + # -mcmodel=large which is added by build system. + # Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline. + local flag flags=() + for flag in ${CFLAGS}; do + [[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline" + [[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline" + flags+=("${flag}") + done + local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}" + + default +} + +src_install() { + default + + dodoc "${FILESDIR}"/README.Gentoo + + newinitd "${FILESDIR}"/kexec-r2.init kexec + newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec + + insinto /etc + doins "${FILESDIR}"/kexec.conf + + insinto /etc/kernel/postinst.d + doins "${FILESDIR}"/90_kexec + + systemd_dounit "${FILESDIR}"/kexec.service +} + +pkg_postinst() { + if systemd_is_booted || has_version sys-apps/systemd; then + elog "For systemd support the new config file is" + elog " /etc/kexec.conf" + elog "Please adopt it to your needs as there is no autoconfig anymore" + fi + + local n_root_args=$(grep -o -- '\/dev/null | wc -l) + local has_rootpart_set=no + if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then + if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then + has_rootpart_set=yes + fi + fi + + if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no" ]]; then + ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!" + ewarn "This was probably caused by a previous version of ${PN}." + ewarn "Please reboot system once *without* kexec to avoid boot problems" + ewarn "in case running system and initramfs do not agree on detected" + ewarn "root device name!" + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild new file mode 100644 index 0000000000..0879b84e67 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit libtool linux-info systemd + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 autotools + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz" + [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="Load another kernel from the currently executing Linux kernel" +HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="booke lzma xen zlib" + +REQUIRED_USE="lzma? ( zlib )" + +DEPEND=" + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${P/_/-}" + +CONFIG_CHECK="~KEXEC" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch + "${FILESDIR}"/${PN}-2.0.4-out-of-source.patch +) + +pkg_setup() { + # GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC) + export ASFLAGS="${CCASFLAGS}" +} + +src_prepare() { + default + + # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely. + sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die + + if [[ "${PV}" == 9999 ]] ; then + eautoreconf + else + elibtoolize + fi +} + +src_configure() { + local myeconfargs=( + $(use_with booke) + $(use_with lzma) + $(use_with xen) + $(use_with zlib) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + # Respect CFLAGS for purgatory. + # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable. + # -mfunction-return=thunk and -mindirect-branch=thunk conflict with + # -mcmodel=large which is added by build system. + # Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline. + local flag flags=() + for flag in ${CFLAGS}; do + [[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline" + [[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline" + flags+=("${flag}") + done + local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}" + + default +} + +src_install() { + default + + dodoc "${FILESDIR}"/README.Gentoo + + newinitd "${FILESDIR}"/kexec-r2.init kexec + newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec + + insinto /etc + doins "${FILESDIR}"/kexec.conf + + insinto /etc/kernel/postinst.d + doins "${FILESDIR}"/90_kexec + + systemd_dounit "${FILESDIR}"/kexec.service +} + +pkg_postinst() { + if systemd_is_booted || has_version sys-apps/systemd; then + elog "For systemd support the new config file is" + elog " /etc/kexec.conf" + elog "Please adopt it to your needs as there is no autoconfig anymore" + fi + + local n_root_args=$(grep -o -- '\/dev/null | wc -l) + local has_rootpart_set=no + if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then + if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then + has_rootpart_set=yes + fi + fi + + if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no" ]]; then + ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!" + ewarn "This was probably caused by a previous version of ${PN}." + ewarn "Please reboot system once *without* kexec to avoid boot problems" + ewarn "in case running system and initramfs do not agree on detected" + ewarn "root device name!" + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-9999.ebuild index 08e61a61b6..86b8d9fc97 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/kexec-tools-9999.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit libtool linux-info systemd if [[ ${PV} == "9999" ]] ; then inherit git-r3 autotools EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git" else - SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" + SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz" + [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi -inherit flag-o-matic libtool linux-info systemd - DESCRIPTION="Load another kernel from the currently executing Linux kernel" HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/" @@ -27,6 +28,8 @@ DEPEND=" zlib? ( sys-libs/zlib )" RDEPEND="${DEPEND}" +S="${WORKDIR}/${P/_/-}" + CONFIG_CHECK="~KEXEC" PATCHES=( @@ -41,12 +44,15 @@ pkg_setup() { src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + + # Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely. + sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die + + if [[ "${PV}" == 9999 ]] ; then eautoreconf else elibtoolize fi - filter-flags '-mindirect-branch=thunk*' } src_configure() { @@ -59,12 +65,29 @@ src_configure() { econf "${myeconfargs[@]}" } +src_compile() { + # Respect CFLAGS for purgatory. + # purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable. + # -mfunction-return=thunk and -mindirect-branch=thunk conflict with + # -mcmodel=large which is added by build system. + # Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline. + local flag flags=() + for flag in ${CFLAGS}; do + [[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline" + [[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline" + flags+=("${flag}") + done + local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}" + + default +} + src_install() { default dodoc "${FILESDIR}"/README.Gentoo - newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec + newinitd "${FILESDIR}"/kexec-r2.init kexec newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec insinto /etc @@ -82,4 +105,20 @@ pkg_postinst() { elog " /etc/kexec.conf" elog "Please adopt it to your needs as there is no autoconfig anymore" fi + + local n_root_args=$(grep -o -- '\/dev/null | wc -l) + local has_rootpart_set=no + if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then + if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then + has_rootpart_set=yes + fi + fi + + if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no" ]]; then + ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!" + ewarn "This was probably caused by a previous version of ${PN}." + ewarn "Please reboot system once *without* kexec to avoid boot problems" + ewarn "in case running system and initramfs do not agree on detected" + ewarn "root device name!" + fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/metadata.xml index 2ea57db782..d56b5de4df 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kexec-tools/metadata.xml @@ -1,5 +1,5 @@ - + base-system@gentoo.org From 364764baecbe3877feeebd7480877910ce01b258 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 3 Feb 2022 10:36:13 +0100 Subject: [PATCH 5/8] net-analyzer/netperf: update to 2.7.0-r3 Update net-analyzer/netperf to 2.7.0-r3, as needed by gcc 10. Without that update, build fails like: ``` /usr/libexec/gcc/x86_64-cros-linux-gnu/ld: nettest_omni.o:.../src/nettest_omni.c:455: multiple definition of `loc_nodelay'; nettest_omni.o:.../src/nettest_omni.c:455: multiple definition of `loc_nodelay'; nettest_bsd.o:.../src/nettest_bsd.c:206: first defined here ``` --- .../net-analyzer/netperf/ChangeLog | 79 ----- .../net-analyzer/netperf/ChangeLog-2015 | 290 ------------------ .../net-analyzer/netperf/Manifest | 13 +- .../netperf/files/netperf-2.2-init | 21 -- .../netperf/files/netperf-2.7.0-init | 23 ++ .../netperf/files/netperf-2.7.0-inline.patch | 32 ++ .../netperf/files/netperf-2.7.0-space.patch | 17 + .../net-analyzer/netperf/metadata.xml | 17 +- .../netperf/netperf-2.6.0-r1.ebuild | 63 ---- ...f-2.7.0.ebuild => netperf-2.7.0-r3.ebuild} | 57 ++-- 10 files changed, 124 insertions(+), 488 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog-2015 delete mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.2-init create mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-init create mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-inline.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-space.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0-r1.ebuild rename sdk_container/src/third_party/portage-stable/net-analyzer/netperf/{netperf-2.7.0.ebuild => netperf-2.7.0-r3.ebuild} (54%) diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog deleted file mode 100644 index ce86892601..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog +++ /dev/null @@ -1,79 +0,0 @@ -# ChangeLog for net-analyzer/netperf -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*netperf-2.7.0 (09 Aug 2015) -*netperf-2.6.0-r1 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson +files/netperf-2.2-conf, - +files/netperf-2.2-init, +files/netperf-2.6.0-log-dir.patch, - +files/netperf-2.7.0-includes.patch, +files/netperf-fix-scripts.patch, - +metadata.xml, +netperf-2.6.0-r1.ebuild, +netperf-2.7.0.ebuild: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - - 24 Jan 2016; Michał Górny metadata.xml: - Unify quoting in metadata.xml files for machine processing - - Force unified quoting in all metadata.xml files since lxml does not - preserve original use of single and double quotes. Ensuring unified - quoting before the process allows distinguishing the GLEP 67-related - metadata.xml changes from unrelated quoting changes. - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - - 18 May 2016; Austin English files/netperf-2.2-init: - use #!/sbin/openrc-run instead of #!/sbin/runscript - diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog-2015 deleted file mode 100644 index 14b0d1eb14..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/ChangeLog-2015 +++ /dev/null @@ -1,290 +0,0 @@ -# ChangeLog for net-analyzer/netperf -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.72 2015/07/25 08:26:32 jer Exp $ - -*netperf-2.7.0 (25 Jul 2015) - - 25 Jul 2015; Jeroen Roovers +netperf-2.7.0.ebuild, - +files/netperf-2.7.0-includes.patch: - Version bump. - - 29 Oct 2014; Jeroen Roovers -netperf-2.5.0-r1.ebuild: - Old. - - 29 Oct 2014; Agostino Sarubbo netperf-2.6.0-r1.ebuild: - Stable for sparc, wrt bug #517128 - - 28 Oct 2014; Agostino Sarubbo netperf-2.6.0-r1.ebuild: - Stable for ia64, wrt bug #517128 - - 17 Oct 2014; Tobias Klausmann netperf-2.6.0-r1.ebuild: - Stable on alpha, bug 517128 - - 14 Sep 2014; Agostino Sarubbo netperf-2.6.0-r1.ebuild: - Stable for ppc64, wrt bug #517128 - - 30 Aug 2014; Chema Alonso netperf-2.6.0-r1.ebuild: - Stable for amd64 wrt bug #517128 - - 10 Aug 2014; Sergei Trofimovich netperf-2.5.0-r1.ebuild, - netperf-2.6.0-r1.ebuild: - QA: drop trailing '.' from DESCRIPTION - - 09 Aug 2014; Agostino Sarubbo netperf-2.6.0-r1.ebuild: - Stable for ppc, wrt bug #517128 - - 03 Aug 2014; netperf-2.6.0-r1.ebuild: - arm64, initial support - - 31 Jul 2014; Jeroen Roovers netperf-2.6.0-r1.ebuild: - Stable for HPPA (bug #517128). - - 26 Jul 2014; Pawel Hajdan jr netperf-2.6.0-r1.ebuild: - x86 stable wrt bug #517128 - - 14 Jul 2014; Jeroen Roovers -netperf-2.6.0.ebuild, - netperf-2.6.0-r1.ebuild, +files/netperf-2.6.0-log-dir.patch, - files/netperf-fix-scripts.patch: - EAPI bump. Whitespace. cp must die(). Change sed script into patch. - - 27 Sep 2012; Jeroen Roovers netperf-2.6.0-r1.ebuild, - metadata.xml: - Add USE=demo to enable reporting interim results by Michał Górny (bug - #304651). - -*netperf-2.6.0-r1 (27 Sep 2012) - - 27 Sep 2012; Jeroen Roovers +netperf-2.6.0-r1.ebuild, - metadata.xml: - Add support for SCTP performance tests by K. Sanborn (bug #436398). - - 05 Aug 2012; Jeroen Roovers - -files/netperf-2.4.0-gcc41.patch, -netperf-2.4.4-r1.ebuild, - -netperf-2.4.5-r2.ebuild, -files/netperf-2.4.5-netserver.patch, - -files/netperf-CVE-2007-1444.patch: - Old. - - 05 Aug 2012; Raúl Porcel netperf-2.5.0-r1.ebuild: - alpha/ia64/sparc stable wrt #419221 - - 03 Jul 2012; Jeroen Roovers netperf-2.5.0-r1.ebuild: - Stable for HPPA (bug #419221). - -*netperf-2.6.0 (28 Jun 2012) - - 28 Jun 2012; Jeroen Roovers +netperf-2.6.0.ebuild: - Version bump. - - 13 Jun 2012; Jeff Horelick netperf-2.5.0-r1.ebuild: - marked x86 per bug 419221 - - 07 Jun 2012; Brent Baude netperf-2.5.0-r1.ebuild: - Marking netperf-2.5.0-r1 ppc for bug 419221 - - 05 Jun 2012; Brent Baude netperf-2.5.0-r1.ebuild: - Marking netperf-2.5.0-r1 ppc64 for bug 419221 - - 04 Jun 2012; Agostino Sarubbo netperf-2.5.0-r1.ebuild: - Stable for amd64, wrt bug #419221 - -*netperf-2.5.0-r1 (31 Dec 2011) -*netperf-2.4.5-r2 (31 Dec 2011) -*netperf-2.4.4-r1 (31 Dec 2011) - - 31 Dec 2011; Christian Ruppert -netperf-2.4.4.ebuild, - +netperf-2.4.4-r1.ebuild, -netperf-2.4.5-r1.ebuild, +netperf-2.4.5-r2.ebuild, - -netperf-2.5.0.ebuild, +netperf-2.5.0-r1.ebuild, files/netperf-2.2-init: - Revbump. Don't use deprecated start-stop-daemon options, bug 389975. - - 14 Aug 2011; Fabio Erculiani netperf-2.4.4.ebuild, - netperf-2.4.5-r1.ebuild, netperf-2.5.0.ebuild: - sci-mathematics/snns blocker is no longer required as per bug 248322 - -*netperf-2.5.0 (30 Jul 2011) - - 30 Jul 2011; Jeroen Roovers netperf-2.4.5-r1.ebuild, - +netperf-2.5.0.ebuild: - Version bump. Remove testing cruft. - -*netperf-2.4.5-r1 (01 Dec 2010) - - 01 Dec 2010; Jeroen Roovers -netperf-2.4.5.ebuild, - +netperf-2.4.5-r1.ebuild, +files/netperf-2.4.5-netserver.patch: - Fix buffer overflow, compiler warnings (bug #337422). - - 28 Jun 2010; Guy Martin netperf-2.4.4.ebuild: - hppa stable. - - 24 Jun 2010; Jeroen Roovers netperf-2.4.4.ebuild, - netperf-2.4.5.ebuild: - Marked ~hppa too. - -*netperf-2.4.5 (26 Aug 2009) - - 26 Aug 2009; Jeroen Roovers netperf-2.4.4.ebuild, - +netperf-2.4.5.ebuild: - Version bump. Drop useless MY_P. Block sci-mathematics/snns (bug #248322). - Drop autotools since the gcc41 patch is no longer needed, incidentally fix - maintainer-mode (bug #255896). Drop unused flag-o-matic. Depend on sed. - - 31 Mar 2008; Markus Meier netperf-2.4.4.ebuild: - amd64 stable, bug #209035 - - 11 Feb 2008; Raúl Porcel netperf-2.4.4.ebuild: - alpha/ia64 stable wrt #209035 - - 06 Feb 2008; Ferris McCormick netperf-2.4.4.ebuild: - Sparc stable, Bug #209035 --- appears to work. - - 06 Feb 2008; nixnut netperf-2.4.4.ebuild: - stable on ppc wrt bug #209035 - - 06 Feb 2008; Brent Baude netperf-2.4.4.ebuild: - stable ppc64, bug 209035 - - 05 Feb 2008; Christian Faulhammer netperf-2.4.4.ebuild: - stable x86, bug 209035 - -*netperf-2.4.4 (31 Jan 2008) - - 31 Jan 2008; -files/netperf-2.2alpha.diff, - +files/netperf-CVE-2007-1444.patch, files/netperf-fix-scripts.patch, - -netperf-2.2.4.ebuild, -netperf-2.3.ebuild, -netperf-2.4.2-r1.ebuild, - +netperf-2.4.4.ebuild: - Version bump. Fixed security issue (CVE-2007-1444), bug 170569, reported by - Pierre-Yves Rofes . Patch for vulnerability taken from - bugs.debian.org/413658, thank you Nico Golde for the - fix! Removed old vulnerables ebuidls. - - 16 Jan 2008; Fabian Groffen netperf-2.2.4.ebuild, - netperf-2.3.ebuild, netperf-2.4.2-r1.ebuild: - Dropped ppc-macos keyword, see you in prefix - - 16 Apr 2007; Markus Rothe netperf-2.4.2-r1.ebuild: - Stable on ppc64 - - 22 Mar 2007; Gustavo Zacarias - netperf-2.4.2-r1.ebuild: - Stable on sparc - - 20 Mar 2007; Raúl Porcel netperf-2.4.2-r1.ebuild: - x86 stable - -*netperf-2.4.2-r1 (29 Jan 2007) - - 29 Jan 2007; Gustavo Felisberto ; - -netperf-2.4.2.ebuild, +netperf-2.4.2-r1.ebuild: - Example scripts where not being installed. - -*netperf-2.4.2 (01 Nov 2006) - - 01 Nov 2006; Markus Ullmann netperf-2.2.4.ebuild, - netperf-2.3.ebuild, -netperf-2.4.0_rc2.ebuild, -netperf-2.4.0_rc3.ebuild, - -netperf-2.4.0.ebuild, -netperf-2.4.0-r1.ebuild, +netperf-2.4.2.ebuild: - Version bump and SRC_URI udate wrt bug #152704 thanks to Francisco Javier - for reporting - - 05 Jun 2006; Peter Volkov netperf-2.4.0-r1.ebuild: - Fixed eutils inheritance as we use epatch. - -*netperf-2.4.0-r1 (27 Mar 2006) - - 27 Mar 2006; Markus Ullmann - +files/netperf-2.4.0-gcc41.patch, +netperf-2.4.0-r1.ebuild: - glibc 2.4 / gcc 4.1 compatibility, thanks to Mikko Tiihonen - wrt bug #126334 - -*netperf-2.4.0 (30 May 2005) - - 30 May 2005; Benjamin Smee +netperf-2.4.0.ebuild: - Version bump for bug 94517 - - 19 Apr 2005; Aron Griffis netperf-2.4.0_rc2.ebuild, - netperf-2.4.0_rc3.ebuild: - Remove bogus sed dep and non-functional use_enable ipv6. The 2.4.x stream - does ipv6 detection and doesn't supply an option to explicitly - enable/disable it - -*netperf-2.4.0_rc3 (19 Apr 2005) - - 19 Apr 2005; Aron Griffis +netperf-2.4.0_rc3.ebuild: - Update to 2.4.0_rc3 - - 09 Apr 2005; Markus Rothe netperf-2.3.ebuild: - Stable on ppc64 - -*netperf-2.4.0_rc2 (05 Apr 2005) - - 05 Apr 2005; Aron Griffis netperf-2.3.ebuild, - +netperf-2.4.0_rc2.ebuild: - Version bump, plus mark 2.3 stable on amd64 - - 01 Apr 2005; Aron Griffis netperf-2.3.ebuild: - stable on ia64 - - 19 Mar 2005; Bryan Østergaard netperf-2.3.ebuild: - Stable on alpha. - - 07 Mar 2005; Gustavo Zacarias netperf-2.3.ebuild: - Stable on sparc - - 25 Feb 2005; Aaron Walker netperf-2.3.ebuild: - Marked stable on x86. - -*netperf-2.3 (03 Jan 2005) - - 03 Jan 2005; Martin Holzer +netperf-2.3.ebuild: - Version bumped. Closes 75198 - - 03 Aug 2004; David Holm netperf-2.2.4.ebuild: - Added to ~ppc. - - 26 Jul 2004; Michael Sterrett netperf-2.2.4.ebuild: - fix use invocation - - 25 Jul 2004; Lina Pezzella - Fixed Manifest. - - 23 Jul 2004; Hasan Khalil netperf-2.2.4.ebuild: - Stable on macos. - - 15 Jul 2004; Tom Gall netperf-2.2.4.ebuild: - stable on ppc64, bug #55547 - - 01 Jul 2004; Jon Hood +metadata.xml, - netperf-2.2.4.ebuild, netperf-2.2.ebuild: - change virtual/glibc to virtual/libc, add metadata.xml - - 21 Apr 2004; Aron Griffis netperf-2.2.4.ebuild: - Stable on amd64 - - 11 Mar 2004; Jason Wever netperf-2.2.4.ebuild: - Marked stable on sparc. - - 10 Mar 2004; Aron Griffis netperf-2.2.4.ebuild: - stable on alpha, ia64 and x86 - - 04 Feb 2004; Aron Griffis netperf-2.2.4.ebuild: - Fix NETHOME in the example scripts to point to /usr/bin - -*netperf-2.2.4 (28 Jan 2004) - - 28 Jan 2004; netperf-2.2.4.ebuild, - files/netperf-2.2-conf, files/netperf-2.2-init: - update to netperf-2.2pl4 for bug 19463. Thanks to Jyrki Muukkonen for some - good ideas in this ebuild - - 27 Jan 2004; netperf-2.2.ebuild: - stable on alpha and ia64 - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - -*netperf-2.2 (1 Feb 2002) - - 1 Feb 2002; G.Bevin ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/Manifest b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/Manifest index 880929b255..f378f80376 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/Manifest @@ -1,12 +1 @@ -AUX netperf-2.2-conf 103 SHA256 9dce33f9552ce91ed5dbf57f44bd3d64a83aeb67ed9a41952a6c69601a10e340 SHA512 88a0d19c59a054071f472e62e6afd8c5fe37a77802dedea3adc82df0701f280c0ad8b5410e7fab74302861bc45920d38d576cfea1d8baa01cd5739801acb3b60 WHIRLPOOL 30bb26aab461eb024e80fdbb663ea334f0112d7bb1c6d6d4c83ccd017efab4a945a1ed2f6073a122de7a9e6888a4fd11787744ce8d236f22ab3b88a93ad61eb2 -AUX netperf-2.2-init 434 SHA256 2c0a09d31fc45c53d5362a97fc0f443c574b520d4613dc944fab540699bd6ad4 SHA512 ec09907d7e3bf9c38e6d142dd605c71620b790ece71685a347906fe1de103a6317345ab9181a618a14173380b155ceaa6a629fe3e33b571f038bde9074dfc112 WHIRLPOOL 9cd4f78fde842cbd7f7ab4271fda3b59216520fa459f9d8934d7124210413768c92ea7ad17759dc92523b025244707c7de5f3bbd6c6c6d2e00ca6ed3ba064a1d -AUX netperf-2.6.0-log-dir.patch 261 SHA256 c5449f723cc26e3ebada62d954e5b8dbad3b0996db18401c816fa756905eedbb SHA512 108ab43c36041df5051cb1a130d33e42589c020dac296230a325ee4e1805ea2b3bbcb5cd1438cd4abe4d922ff5536410be9364eaad9044a3181c9acdc7b91bb6 WHIRLPOOL 197919f1204465ad813849ab6b6f4ee24f7fe2f5aaf7072ab6f4159a5713163041dffa6e721a066552b0b7746b353b84255a0aceca478993ee229f37dbbb20fd -AUX netperf-2.7.0-includes.patch 468 SHA256 dcd9ca94d89cf6624d52b9dd8aa7e68d7ac47032ce964049d0faa591731f6270 SHA512 aec77b7a97e83a93d847f0935bd599d7497b3b749bb0cdb722d96cb49535b3eef9b7b9f60388f5cb2de726b4084abd9cd48614d73bc63b34c7bc0fcfffb0fd3f WHIRLPOOL cd740bf0a4a3029f63b44ff0f33e55ae4e7c09a897ff5eb4770269a36c342be7c8c0c77f7a55eb0c277fdc75890a3ca8cd0bc83ad5dcca3b0305f489491ec3c8 -AUX netperf-fix-scripts.patch 819 SHA256 2dd29e6134f769cfff036945ebbb63e6f10338c95a1d5705c374f63c2d81ac30 SHA512 d82b01695c432be2f7312641b5599514bf21ca4586f15406aa087034de8d7b66f000eafd02f685c56062a8639ff4158e01d56835e6b8c53baf46481b0a3d0f1a WHIRLPOOL eaf301c87e6fd04fbeb6bc2eb33f69036f885dfc8025257a0494d15bb201472d8e2e2b806e01f4634c5f52e3dd43c0f8a13d3b8010b84129ccb808c3ea68a2f0 -DIST netperf-2.6.0.tar.bz2 1032953 SHA256 cd8dac710d4273d29f70e8dbd09353a6362ac58a11926e0822233c0cb230323a SHA512 b3921d2e887088b14a8bbe5ace9b1cc0c8b29951eeaa7857ce3f324933397c8ff6b56eeacfe755181ce1a56c982fe431955f6db55bd20f2343324e22ee23c9b3 WHIRLPOOL b602c8660bae59648cbbe9eed47ee9d86b0ae714bc0c2906e80a14d0ce18951f125f3331f90acd776850b04506e37030545084677f6be512477ea37f76d972e7 -DIST netperf-2.7.0.tar.bz2 1024430 SHA256 842af17655835c8be7203808c3393e6cb327a8067f3ed1f1053eb78b4e40375a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad WHIRLPOOL 66c81e418750d67bfa15d6f1e3cd7a3a65f1168ebb080263cf70e0f3fe023a8128bfc559249268ec8e597ef3db5acdf5509861f12f8f49c6b2586e679014e34a -EBUILD netperf-2.6.0-r1.ebuild 1673 SHA256 abd37e1d088733645ae24224eca458ae2acc9d339f0b06b3fc1a53e705aab745 SHA512 5107a19e6917e12e35aeb25f0100240ffd597a29f1a4b39a28b41544d5b7bb82429459363eb4d0869d39ed85d37d75e96ac0fe1fb40ed97a27733f82668e2dae WHIRLPOOL 5a862a5e521bf15664336a6682e387637f14f03a8d953ea0544e9c2809a047ec1bcfc286dcf5bc49cb6d178e96090eb550533f47f85f66156ee7b6a38da2d340 -EBUILD netperf-2.7.0.ebuild 1734 SHA256 670b1dc3bf2c367a74ce472c0357f4ee3c59585f592c359b8c7c3e02d4002c57 SHA512 89e289ea59504e23a86b68a0c6d29ebace56ca7d4da95bd74a579515a51cb79c8eda0d3b5c0fc3d84ffa723854b8f159391a107e675486ca69f1396fa1ff3a5a WHIRLPOOL 16140df86109bc7616004c11421be367c05c86498c8e02b0cc9e53b90dd60ed8e8f551f104e15aaf49107a5d536562771f0316d8a8bad61ce25637348a2deabf -MISC ChangeLog 3176 SHA256 a44374ed71572da9d918a7b3738487c03831f6fac26f1d6aef39cf8e2997cafb SHA512 9680fc4c343cb692c28cc88b22abd62abf318581bd2bea954ea264a9efbd071e63ddcab6ff9fb7acbc24dcdf513f44ddc79a7fc7daa9d32baea6f690f3d44050 WHIRLPOOL 06831f389bb28407d39756418fda39599fa99642b0fc9ba1b70d8ac42d95b32f2a15f688c2853bd62ff0f770ed72f9d7297f5c6941d012e311c46a22a8e35245 -MISC ChangeLog-2015 10406 SHA256 526c3eff24ed9f2f0c19e644def228b125b9e4927c8f1112cdf1680c0fecab69 SHA512 3e7c21a4d2532f6099b7dc4471fb6d1980f3c91448f02798e799a7e82a8843e66c17b8199b79f0386fee5f177a743aef2924b94bd17cc03e31dd4fa323f5569b WHIRLPOOL 3b1dda403052008ea7e1ca1f3adf42667dc29dc5eef255c9389e71ad4892d8cb48d52463893cce0180eff1223316b4c21326594a86add9e7a79a2001e8488574 -MISC metadata.xml 435 SHA256 573c052effa861260f739ba05087f642946a350f846469138db7d003abe4b5e5 SHA512 e5e97976eb62dee72e974ebab4d117a09e6f76d5e9a456b12db4ad59c76fc079cf88f1d3505db535c99ced6037bee2c261463c0f07ac487534797e3347fbcb42 WHIRLPOOL 68df937e76e4c97259d582b16f1f5dc1a6be9f04cfde3a0270490395f666aa3e8f598e0b456fe7497a5d6538f0d519cda144c7ab913f3ba527a7b2b4011607a2 +DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.2-init b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.2-init deleted file mode 100644 index cd2fb35cdd..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.2-init +++ /dev/null @@ -1,21 +0,0 @@ -#!/sbin/openrc-run -# -# init.d script for net-analyzer/netperf's netserver -# - -depend() { - use net -} - -start() { - ebegin 'Starting netperf server (netserver)' - start-stop-daemon --start --quiet --user nobody \ - --exec /usr/sbin/netserver -- ${NETSERVER_ARGS} >/dev/null - eend $? -} - -stop() { - ebegin 'Stopping netperf server (netserver)' - start-stop-daemon --stop --quiet --exec /usr/sbin/netserver - eend $? -} diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-init b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-init new file mode 100644 index 0000000000..3d1bb0c159 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-init @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# +# init.d script for net-analyzer/netperf's netserver +# + +depend() { + use net +} + +start() { + checkpath -o netperf:netperf -d /var/log/netperf + + ebegin 'Starting netperf server (netserver)' + start-stop-daemon --start --user netperf \ + --exec /usr/sbin/netserver -- ${NETSERVER_ARGS} + eend $? +} + +stop() { + ebegin 'Stopping netperf server (netserver)' + start-stop-daemon --stop --quiet --exec /usr/sbin/netserver + eend $? +} diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-inline.patch b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-inline.patch new file mode 100644 index 0000000000..eb89d34f3e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-inline.patch @@ -0,0 +1,32 @@ +# Copyright Seblu 2015 +--- a/src/netlib.c ++++ b/src/netlib.c +@@ -3997,11 +3997,7 @@ + } + } + +-#ifdef WIN32 +-__forceinline void demo_interval_display(double actual_interval) +-#else +- inline void demo_interval_display(double actual_interval) +-#endif ++void demo_interval_display(double actual_interval) + { + static int count = 0; + struct timeval now; +@@ -4060,15 +4056,7 @@ + important compilers have supported such a construct so it should + not be a big deal. raj 2012-01-23 */ + +-#ifdef WIN32 +-/* It would seem that the Microsoft compiler will not inline across +- source files. So there is little point in having an inline +- directive in that situation. Of course that makes me wonder if an +- inline directive has to appear in netlib.h... */ + void demo_interval_tick(uint32_t units) +-#else +- inline void demo_interval_tick(uint32_t units) +-#endif + { + double actual_interval = 0.0; + diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-space.patch b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-space.patch new file mode 100644 index 0000000000..9ad43270b1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/files/netperf-2.7.0-space.patch @@ -0,0 +1,17 @@ +--- a/src/netserver.c ++++ b/src/netserver.c +@@ -165,12 +165,12 @@ + #elif defined(ANDROID) + #define DEBUG_LOG_FILE_DIR "/data/local/tmp/" + #else +-#define DEBUG_LOG_FILE_DIR "/var/log/" ++#define DEBUG_LOG_FILE_DIR "/var/log/netperf/" + #endif + #endif /* DEBUG_LOG_FILE_DIR */ + + #ifndef DEBUG_LOG_FILE +-#define DEBUG_LOG_FILE DEBUG_LOG_FILE_DIR"netserver.debug" ++#define DEBUG_LOG_FILE DEBUG_LOG_FILE_DIR "/netserver.debug" + #endif + + #if !defined(PATH_MAX) diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/metadata.xml b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/metadata.xml index a4f8a9ad47..3e35e2cbd3 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/metadata.xml @@ -1,12 +1,25 @@ - + netmon@gentoo.org Gentoo network monitoring and analysis project + +Netperf is a benchmark that can be used to measure the performance of many +different types of networking. It provides tests for both unidirectional +throughput, and end-to-end latency. The environments currently measureable by +netperf include: + + - TCP and UDP via BSD Sockets for both IPv4 and IPv6 + - DLPI + - Unix Domain Sockets + - SCTP for both IPv4 and IPv6 + Emit interim results during the run. May affect results -Include tests to measure SCTP performance + +cpe:/a:netperf:netperf + diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0-r1.ebuild deleted file mode 100644 index 2aaa038e72..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.6.0-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils flag-o-matic - -DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more" -SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2" -KEYWORDS="alpha amd64 arm64 hppa ia64 ppc ppc64 sparc x86" - -HOMEPAGE="http://www.netperf.org/" -LICENSE="netperf" -SLOT="0" -IUSE="demo sctp" - -DEPEND=">=sys-apps/sed-4" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-fix-scripts.patch \ - "${FILESDIR}"/${P}-log-dir.patch - - # Fixing paths in scripts - sed -i \ - -e 's:^\(NETHOME=\).*:\1"/usr/bin":' \ - doc/examples/sctp_stream_script \ - doc/examples/tcp_range_script \ - doc/examples/tcp_rr_script \ - doc/examples/tcp_stream_script \ - doc/examples/udp_rr_script \ - doc/examples/udp_stream_script \ - || die - - # netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’ - # nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’ - append-cppflags -D_GNU_SOURCE -} - -src_configure() { - econf \ - $(use_enable demo) \ - $(use_enable sctp) -} - -src_install () { - default - - # move netserver into sbin as we had it before 2.4 was released with its - # autoconf goodness - dodir /usr/sbin - mv "${D}"/usr/{bin,sbin}/netserver || die - - # init.d / conf.d - newinitd "${FILESDIR}"/${PN}-2.2-init netperf - newconfd "${FILESDIR}"/${PN}-2.2-conf netperf - - # documentation and example scripts - dodoc AUTHORS ChangeLog NEWS README Release_Notes - dodir /usr/share/doc/${PF}/examples - #Scripts no longer get installed by einstall - cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die -} diff --git a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.7.0.ebuild b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.7.0-r3.ebuild similarity index 54% rename from sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.7.0.ebuild rename to sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.7.0-r3.ebuild index 3a312bbb16..93441fc7cb 100644 --- a/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.7.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-analyzer/netperf/netperf-2.7.0-r3.ebuild @@ -1,27 +1,34 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 -inherit eutils flag-o-matic +EAPI=7 -DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more" +inherit flag-o-matic + +DESCRIPTION="Network performance benchmark" SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86" HOMEPAGE="http://www.netperf.org/" LICENSE="netperf" SLOT="0" IUSE="demo sctp" -DEPEND=">=sys-apps/sed-4" +DEPEND=" + acct-group/netperf + acct-user/netperf +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-fix-scripts.patch + "${FILESDIR}"/${PN}-2.6.0-log-dir.patch + "${FILESDIR}"/${PN}-2.7.0-includes.patch + "${FILESDIR}"/${PN}-2.7.0-space.patch + "${FILESDIR}"/${PN}-2.7.0-inline.patch +) src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-fix-scripts.patch \ - "${FILESDIR}"/${PN}-2.6.0-log-dir.patch \ - "${FILESDIR}"/${PN}-2.7.0-includes.patch - # Fixing paths in scripts sed -i \ -e 's:^\(NETHOME=\).*:\1"/usr/bin":' \ @@ -33,32 +40,40 @@ src_prepare() { doc/examples/udp_stream_script \ || die - # netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’ - # nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’ - append-cppflags -D_GNU_SOURCE + default } src_configure() { + append-cflags -fcommon + + # netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’ + # nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’ + append-cppflags -D_GNU_SOURCE + econf \ $(use_enable demo) \ $(use_enable sctp) } -src_install () { +src_install() { default - # move netserver into sbin as we had it before 2.4 was released with its + # Move netserver into sbin as we had it before 2.4 was released with its # autoconf goodness dodir /usr/sbin - mv "${D}"/usr/{bin,sbin}/netserver || die + mv "${ED}"/usr/{bin,sbin}/netserver || die # init.d / conf.d - newinitd "${FILESDIR}"/${PN}-2.2-init netperf + newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf newconfd "${FILESDIR}"/${PN}-2.2-conf netperf + keepdir /var/log/${PN} + fowners netperf:netperf /var/log/${PN} + fperms 0755 /var/log/${PN} + # documentation and example scripts dodoc AUTHORS ChangeLog NEWS README Release_Notes dodir /usr/share/doc/${PF}/examples - #Scripts no longer get installed by einstall - cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die + # Scripts no longer get installed by einstall + cp doc/examples/*_script "${ED}"/usr/share/doc/${PF}/examples || die } From 110808570e9010f48222628c2bc12d3f92193af2 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 3 Feb 2022 10:38:56 +0100 Subject: [PATCH 6/8] acct-group/netperf: import from Gentoo Import acct-group/netperf from Gentoo, as it is needed by net-analyzer/netperf 2.7.0-r3. --- .../portage-stable/acct-group/netperf/metadata.xml | 8 ++++++++ .../portage-stable/acct-group/netperf/netperf-0.ebuild | 10 ++++++++++ 2 files changed, 18 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/acct-group/netperf/metadata.xml create mode 100644 sdk_container/src/third_party/portage-stable/acct-group/netperf/netperf-0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/acct-group/netperf/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-group/netperf/metadata.xml new file mode 100644 index 0000000000..d5af4bcfaf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/acct-group/netperf/metadata.xml @@ -0,0 +1,8 @@ + + + + + netmon@gentoo.org + Gentoo network monitoring and analysis project + + diff --git a/sdk_container/src/third_party/portage-stable/acct-group/netperf/netperf-0.ebuild b/sdk_container/src/third_party/portage-stable/acct-group/netperf/netperf-0.ebuild new file mode 100644 index 0000000000..f4a3499b16 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/acct-group/netperf/netperf-0.ebuild @@ -0,0 +1,10 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-group + +DESCRIPTION="A group for net-analyzer/netperf" + +ACCT_GROUP_ID="168" From 9ad2ac256744b4552071fafd5c02a42fc019f12e Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 3 Feb 2022 10:40:01 +0100 Subject: [PATCH 7/8] acct-user/netperf: import from Gentoo Import acct-user/netperf from Gentoo, as it is needed by net-analyzer/netperf 2.7.0-r3. --- .../portage-stable/acct-user/netperf/metadata.xml | 8 ++++++++ .../acct-user/netperf/netperf-0.ebuild | 13 +++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/acct-user/netperf/metadata.xml create mode 100644 sdk_container/src/third_party/portage-stable/acct-user/netperf/netperf-0.ebuild diff --git a/sdk_container/src/third_party/portage-stable/acct-user/netperf/metadata.xml b/sdk_container/src/third_party/portage-stable/acct-user/netperf/metadata.xml new file mode 100644 index 0000000000..d5af4bcfaf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/acct-user/netperf/metadata.xml @@ -0,0 +1,8 @@ + + + + + netmon@gentoo.org + Gentoo network monitoring and analysis project + + diff --git a/sdk_container/src/third_party/portage-stable/acct-user/netperf/netperf-0.ebuild b/sdk_container/src/third_party/portage-stable/acct-user/netperf/netperf-0.ebuild new file mode 100644 index 0000000000..479d3788db --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/acct-user/netperf/netperf-0.ebuild @@ -0,0 +1,13 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-user + +DESCRIPTION="A user for net-analyzer/netperf" + +ACCT_USER_GROUPS=( "netperf" ) +ACCT_USER_ID="168" + +acct-user_add_deps From a1f246dd30c405ae728fa7b598bc0da1348ac3cf Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 11 Feb 2022 10:09:57 +0100 Subject: [PATCH 8/8] changelog: add changelog for gcc 10 preparation --- .../changelog/security/2022-02-08-squashfs-tools-4.5.md | 1 + .../portage-stable/changelog/updates/2022-02-08-gcc-prep.md | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/changelog/security/2022-02-08-squashfs-tools-4.5.md create mode 100644 sdk_container/src/third_party/portage-stable/changelog/updates/2022-02-08-gcc-prep.md diff --git a/sdk_container/src/third_party/portage-stable/changelog/security/2022-02-08-squashfs-tools-4.5.md b/sdk_container/src/third_party/portage-stable/changelog/security/2022-02-08-squashfs-tools-4.5.md new file mode 100644 index 0000000000..9475c1e226 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/security/2022-02-08-squashfs-tools-4.5.md @@ -0,0 +1 @@ +- SDK: squashfs-tools ([CVE-2021-40153](https://nvd.nist.gov/vuln/detail/CVE-2021-40153), [CVE-2021-41072](https://nvd.nist.gov/vuln/detail/CVE-2021-41072)) diff --git a/sdk_container/src/third_party/portage-stable/changelog/updates/2022-02-08-gcc-prep.md b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-02-08-gcc-prep.md new file mode 100644 index 0000000000..452d5428f4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-02-08-gcc-prep.md @@ -0,0 +1,5 @@ +- kexec-tools ([2.0.22](https://www.spinics.net/lists/kexec/msg26864.html)) +- SDK: gcc-config ([2.5](https://gitweb.gentoo.org/proj/gcc-config.git/tag/?h=v2.5)) +- SDK: iasl ([20200717](https://www.acpica.org/node/183)) +- SDK: netperf ([2.7.0](https://github.com/HewlettPackard/netperf/blob/netperf-2.7.0/Release_Notes)) +- SDK: squashfs-tools ([4.5_p20210914](https://lore.kernel.org/lkml/CAB3woddJss+ziGp-RjJ-yiax6pc_HLMdxk3Qk5nJdRgjpEYWBg@mail.gmail.com/))