From ada5254783988ac2ef3b673ee1d16cdbbd68fb99 Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Thu, 7 Nov 2024 11:09:13 +0000 Subject: [PATCH 1/3] configure: Don't use <<<, busybox doesn't support it Signed-off-by: Quentin Armitage --- configure.ac | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index d225f608c0..464cb95596 100644 --- a/configure.ac +++ b/configure.ac @@ -431,10 +431,10 @@ ENABLE_LOG_FILE_APPEND=No # Ensure we don't override FORTIFY_SOURCE ADD_FORTIFY_SOURCE=1 -grep -q -- "-D *_FORTIFY_SOURCE=" <<<$CPPFLAGS +echo $CPPFLAGS | grep -q -- "-D *_FORTIFY_SOURCE=" AS_IF([test $? -eq 0], [ - FORTIFY_SOURCE=$(<<<$CPPFLAGS $SED -e "s/.*-D *_FORTIFY_SOURCE=//" -e "s/ .*//") + FORTIFY_SOURCE=$(echo $CPPFLAGS | $SED -e "s/.*-D *_FORTIFY_SOURCE=//" -e "s/ .*//") ADD_FORTIFY_SOURCE=0 ],[FORTIFY_SOURCE=2]) @@ -715,7 +715,7 @@ for field in t tv.tv_sec tv.tv_usec ts.tv_sec ts.tv_nsec; do if [[ $field = t ]]; then name=time_t else - name=$(<<<$field $SED -e "s/\.tv//") + name=$(echo $field | $SED -e "s/\.tv//") fi AC_DEFINE_UNQUOTED([PRI_$name], [ "$len$sign" ]) ], []) @@ -2766,7 +2766,7 @@ AS_IF([test .${with_iproute_usr_dir} = . && test .${with_iproute_etc_dir} = . ], AS_IF([test $? = 0], [ IPROUTE_DIRS=$(man ip route | tr " \t" "\n\n" | $SED -e "s/[[\.,;:?\!]]*//g" | grep "/rt_tables$" | $SED -e "s:/rt_tables$::") - set $(<<<$IPROUTE_DIRS sort -u) + set $(echo $IPROUTE_DIRS | sort -u) second_route=$2 set $IPROUTE_DIRS AS_IF([test .$second_route = .], @@ -2783,9 +2783,9 @@ AS_IF([test .${with_iproute_usr_dir} = . && test .${with_iproute_etc_dir} = . ], # try finding the paths in the executable set $(strings $(type -p ip) | grep /rt_tables | $SED -e "s:/rt_tables::") for i in $1 $2; do - grep -q /etc <<<$i + echo $i | grep -q /etc AS_IF([test $? -eq 0], [iproute_etc_dir=$i]) - grep -q /usr <<<$i + echo $i | grep -q /usr AS_IF([test $? -eq 0], [iproute_usr_dir=$i]) done ]) From f129c588f7c8a66e595d8ae96a43d585018e79cd Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Thu, 7 Nov 2024 11:09:43 +0000 Subject: [PATCH 2/3] vrrp: Don't include if not needed The musl headers do not allow including both and since they both define struct ethhdr. It is likely that we do not need to include at all since with both glibc and musl including is sufficient, but removing is for another day. Signed-off-by: Quentin Armitage --- keepalived/vrrp/vrrp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c index 96b2c4c8f9..4b06e387ac 100644 --- a/keepalived/vrrp/vrrp.c +++ b/keepalived/vrrp/vrrp.c @@ -40,8 +40,10 @@ #include #include #include -#include #include +#if !defined ETH_HLEN || !defined ETH_ZLEN +#include /* This may not be needed at all - try removing and see if any issues raised */ +#endif #ifdef _NETWORK_TIMESTAMP_ #include #endif From f4fc3e8df48054537311ea1e8aa503067267a0e1 Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Thu, 7 Nov 2024 11:18:43 +0000 Subject: [PATCH 3/3] doc: Add Oracle Linux ver 8 to README.kernel_versions Oracle Linux 7 goes EOL in under two months. Signed-off-by: Quentin Armitage --- README.kernel_versions | 1 + 1 file changed, 1 insertion(+) diff --git a/README.kernel_versions b/README.kernel_versions index ad4be9272b..12408ca384 100644 --- a/README.kernel_versions +++ b/README.kernel_versions @@ -35,6 +35,7 @@ SUSE 15 SP5 5.14.21 26-01-25 https://en.wikipedia.org/wiki/SUSE_Linux_Enter SUSE 15 SP6 6.4.0 A service pack is supported for 6 months after release of next service pack (approx annual) Manjaro Rolling 4.19.322 https://en.wikipedia.org/wiki/Manjaro and https://manjaristas.org/branch_compare?q=%23kernels Oracle 7 3.10 31-12-24 https://en.wikipedia.org/wiki/Oracle_Linux +Oracle 8 4.18 31-07-29 https://en.wikipedia.org/wiki/Oracle_Linux =============================================================================