mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-15 17:06:58 +02:00
Merge pull request #2316 from flatcar/krnowak/weekly
Updates for weekly update 2022-12-05
This commit is contained in:
commit
246bc58053
@ -59,7 +59,7 @@ RDEPEND="
|
||||
${DEPEND}
|
||||
"
|
||||
# We only need yacc when the .y files get patched (bash42-005)
|
||||
#BDEPEND="virtual/yacc"
|
||||
#BDEPEND="app-alternatives/yacc"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
|
@ -1,4 +1,10 @@
|
||||
# work around configure test that cannot be cross compiled :(
|
||||
# Work around configure test that cannot be cross compiled :(
|
||||
#
|
||||
# When checking if this is still applicable, try grepping the
|
||||
# configure script for lines with "$cross_compiling", like
|
||||
#
|
||||
# grep -B 20 -F 'when cross compiling' configure
|
||||
|
||||
export krb5_cv_attr_constructor_destructor=yes,yes
|
||||
export ac_cv_func_regcomp=yes
|
||||
export ac_cv_printf_positional=yes
|
||||
|
@ -82,3 +82,6 @@ Modifications made:
|
||||
- Create versionless links (python and python3) to python executable.
|
||||
|
||||
- Remove installed stuff in `/discard`.
|
||||
|
||||
- Replace the dependency on `virtual/awk` with `app-alternatives/awk`.
|
||||
The former is gone in favor of the latter.
|
||||
|
@ -43,7 +43,7 @@ DEPEND="
|
||||
virtual/libintl
|
||||
"
|
||||
BDEPEND="
|
||||
virtual/awk
|
||||
app-alternatives/awk
|
||||
virtual/pkgconfig
|
||||
sys-devel/autoconf-archive
|
||||
verify-sig? ( sec-keys/openpgp-keys-python )
|
||||
|
@ -32,16 +32,19 @@ DEPEND="${COMMON_DEPEND}
|
||||
virtual/os-headers
|
||||
>=sys-kernel/linux-headers-4.4:0
|
||||
"
|
||||
# Flatcar: Rename virtual/yacc to app-alternatives/yacc. The former is
|
||||
# gone in favor of the latter in Gentoo. This modification will be
|
||||
# dropped when we update this ebuild from Gentoo.
|
||||
BDEPEND="${BUILD_DEPEND}
|
||||
app-eselect/eselect-iptables
|
||||
virtual/pkgconfig
|
||||
nftables? (
|
||||
sys-devel/flex
|
||||
virtual/yacc
|
||||
app-alternatives/yacc
|
||||
)
|
||||
"
|
||||
# Flatcar: Drop BUILD_DEPEND, as we would not like to ship
|
||||
# eselect in the final image. Also, drop net-firewall/arptables as we don't
|
||||
# eselect in the final image. Also, drop net-firewall/arptables as we don't
|
||||
# ship arptables
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
nftables? ( net-misc/ethertypes )
|
||||
@ -140,7 +143,7 @@ src_install() {
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Flatcar: Use xtables-nft-multi to use the nft backend instead of legacy backend
|
||||
# Flatcar: Use xtables-nft-multi to use the nft backend instead of legacy backend
|
||||
local default_iptables="xtables-nft-multi"
|
||||
if ! eselect iptables show &>/dev/null; then
|
||||
elog "Current iptables implementation is unset, setting to ${default_iptables}"
|
||||
|
@ -23,3 +23,6 @@ app-editors/nano unicode
|
||||
# libxcrypt -> glibc -> python), and also we need to update gcc to
|
||||
# version 10 or later.
|
||||
sys-libs/glibc -crypt
|
||||
|
||||
# We don't use pip.
|
||||
dev-lang/python ensurepip
|
||||
|
@ -87,7 +87,7 @@ DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
app-arch/xz-utils
|
||||
sys-apps/texinfo
|
||||
virtual/yacc
|
||||
app-alternatives/yacc
|
||||
nls? ( sys-devel/gettext )
|
||||
source-highlight? ( virtual/pkgconfig )
|
||||
test? ( dev-util/dejagnu )
|
||||
|
@ -110,7 +110,7 @@ BDEPEND="
|
||||
!compile-locales? (
|
||||
app-arch/gzip
|
||||
sys-apps/grep
|
||||
virtual/awk
|
||||
app-alternatives/awk
|
||||
)
|
||||
"
|
||||
COMMON_DEPEND="
|
||||
@ -127,14 +127,14 @@ DEPEND="${COMMON_DEPEND}
|
||||
compile-locales? (
|
||||
app-arch/gzip
|
||||
sys-apps/grep
|
||||
virtual/awk
|
||||
app-alternatives/awk
|
||||
)
|
||||
test? ( >=net-dns/libidn2-2.3.0 )
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
app-arch/gzip
|
||||
sys-apps/grep
|
||||
virtual/awk
|
||||
app-alternatives/awk
|
||||
sys-apps/gentoo-functions
|
||||
!<app-misc/pax-utils-${MIN_PAX_UTILS_VER}
|
||||
!<net-misc/openssh-8.1_p1-r2
|
||||
|
@ -19,3 +19,8 @@ for having our fork seem to be:
|
||||
work. A suid binary is strictly less secure than capability
|
||||
override, so in long-term we would prefer to avoid having this
|
||||
hack. On the other hand - this is what we had so far.
|
||||
|
||||
5. We replace the dependency on `virtual/yacc` with
|
||||
`app-alternatives/yacc`. The former was renamed to the latter in
|
||||
Gentoo, so this modification will be gone next time we update this
|
||||
package.
|
||||
|
@ -24,11 +24,11 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
|
||||
IUSE="audit berkdb debug nis selinux"
|
||||
|
||||
BDEPEND="
|
||||
app-alternatives/yacc
|
||||
dev-libs/libxslt
|
||||
sys-devel/flex
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
virtual/yacc
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
|
Loading…
Reference in New Issue
Block a user