From 695d13c83c60f49aa600eb2ae9f5b950f00baed5 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 9 Oct 2023 07:13:50 +0000 Subject: [PATCH] sys-apps/kbd: Sync with Gentoo It's from Gentoo commit 68508019cec4a5622ffab2825ea9e8f6cdd42a84. --- ...kbd-2.6.3-no-redefine-fortify-source.patch | 45 +++++++++ .../sys-apps/kbd/kbd-2.6.3-r1.ebuild | 96 +++++++++++++++++++ 2 files changed, 141 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.6.3-r1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch new file mode 100644 index 0000000000..2edd547d1e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch @@ -0,0 +1,45 @@ +https://github.com/legionus/kbd/pull/103 + +From 3392e2038dee97361d7438512653736d72a02109 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 4 Oct 2023 14:47:33 +0100 +Subject: [PATCH] Use `AX_ADD_FORTIFY_SOURCE` to avoid redefining + `_FORTIFY_SOURCE` + +Some distributions are now setting -D_FORTIFY_SOURCE=3 by default in their +toolchains rather than _F_S=2. By forcing _F_S=2, this causes both a warning +and a downgrade in the effective protection. + +Use the autoconf-archive macro for this purpose (AX_ADD_FORTIFY_SOURCE) +to add the fortification at the highest supported level if the compiler doesn't +already default to it. + +Bug: https://bugs.gentoo.org/892834 +Signed-off-by: Sam James +--- + configure.ac | 5 +- + m4/ax_add_fortify_source.m4 | 119 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 122 insertions(+), 2 deletions(-) + create mode 100644 m4/ax_add_fortify_source.m4 + +diff --git a/configure.ac b/configure.ac +index 66023ff8..7fdbe7d6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -63,13 +63,14 @@ strspn strstr strtol strtoul setpgrp malloc realloc]) + + AC_SEARCH_LIBS([timer_create], [rt]) + ++AX_ADD_FORTIFY_SOURCE ++ + # Optimization level + CC_O_LEVEL="-O2" +-FORTIFY_SOURCE="-D_FORTIFY_SOURCE=2" + + if test "$enable_code_coverage" = yes; then + CC_O_LEVEL="-O0" +- FORTIFY_SOURCE= ++ FORTIFY_SOURCE="-U_FORTIFY_SOURCE" + fi + + case "$GCC,$ac_cv_prog_cc_g" in diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.6.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.6.3-r1.ebuild new file mode 100644 index 0000000000..0bacea6493 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/kbd/kbd-2.6.3-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git" + EGIT_BRANCH="master" + inherit git-r3 +else + if [[ $(ver_cut 3) -lt 90 ]] ; then + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + else + SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + fi +fi + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="https://kbd-project.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls selinux pam test" +RESTRICT="!test? ( test )" + +# Testsuite's Makefile.am calls missing(!) +# ... but this seems to be consistent with the autoconf docs? +# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html +QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" + +DEPEND=" + app-alternatives/gzip + pam? ( + !app-misc/vlock + sys-libs/pam + ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-loadkeys ) +" +# autoconf-archive for F_S patch +BDEPEND=" + sys-devel/autoconf-archive + virtual/pkgconfig + test? ( dev-libs/check ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.3-no-redefine-fortify-source.patch +) + +src_prepare() { + default + + # Rename conflicting keymaps to have unique names, bug #293228 + # See also https://github.com/legionus/kbd/issues/76. + pushd "${S}"/data/keymaps/i386 &> /dev/null || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die + popd &> /dev/null || die + + #if [[ ${PV} == 9999 ]] || [[ $(ver_cut 3) -ge 90 ]] ; then + # eautoreconf + #fi + + # Always do it for now for the F_S patch + eautoreconf +} + +src_configure() { + local myeconfargs=( + --disable-werror + + $(use_enable nls) + $(use_enable pam vlock) + $(use_enable test tests) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + docinto html + dodoc docs/doc/*.html + + # USE="test" installs .la files + find "${ED}" -type f -name "*.la" -delete || die +}