From 3f06ebd79af7302558723e45fd13ce0eee8ed3cb Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 11 Sep 2017 10:14:07 -0600 Subject: [PATCH 01/72] Update to 1.3.6 (#1481471) --- configure.patch | 562 ------------------------------ fix-checksum-VRRPv3-unicast.patch | 43 +++ fix-conditional-compilation.patch | 26 ++ generate-readme.patch | 249 +++++++++++++ keepalived.spec | 15 +- 5 files changed, 331 insertions(+), 564 deletions(-) delete mode 100644 configure.patch create mode 100644 fix-checksum-VRRPv3-unicast.patch create mode 100644 fix-conditional-compilation.patch create mode 100644 generate-readme.patch diff --git a/configure.patch b/configure.patch deleted file mode 100644 index 015742b..0000000 --- a/configure.patch +++ /dev/null @@ -1,562 +0,0 @@ ---- a/configure.ac 2016-09-11 17:47:25.000000000 +0100 -+++ b/configure.ac 2016-09-16 18:06:48.931414048 +0100 -@@ -154,7 +154,8 @@ - [], [AC_MSG_ERROR([Missing/unusable system header file <$ac_header>])]) - - # check for kernel headers --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - dnl -- needed until Linux 3.1 - dnl -- using AC_CHECK_HEADER causes a horrible error message for the user - NETLINK_EXTRA_INCLUDE= -@@ -176,6 +177,7 @@ - AC_CHECK_HEADERS([linux/if_arp.h], - [], [AC_MSG_ERROR([Missing/unusable <$ac_header>])], - [[#include ]]) -+CPPFLAGS="$SAV_CPPFLAGS" - - # Checks for typedefs, structures, and compiler characteristics. - AC_HEADER_STDBOOL -@@ -303,16 +305,19 @@ - ]) - - if test $NETLINK_VER != None; then -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - AC_CHECK_HEADERS(libnfnetlink/libnfnetlink.h,,AC_MSG_ERROR([ - !!! Please install libnfnetlink headers. !!!])) - if test $NETLINK_VER = 3; then -- CPPFLAGS="$NL3_CFLAGS" -+ CPPFLAGS="$CPPFLAGS $NL3_CFLAGS" - AC_CHECK_HEADERS([netlink/route/link.h netlink/route/link/inet.h], [], [AC_MSG_ERROR([libnl-3 headers missing])]) - fi - - AC_CHECK_HEADERS([linux/rtnetlink.h], [], [AC_MSG_ERROR([Unusable link/rtnetlink.h])], [$NETLINK_EXTRA_INCLUDE]) - AC_CHECK_HEADERS([libnfnetlink/libnfnetlink.h netlink/genl/ctrl.h netlink/genl/genl.h netlink/netlink.h], [], [AC_MSG_ERROR([netlink headers missing])]) -+ -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - - dnl -- Check for the following variables introduced at various times into Linux -@@ -347,7 +352,8 @@ - dnl -- Resolved in libnl3-3.2.26 (release 30/3/2015) - if test $NETLINK_VER = 3; then - AC_MSG_CHECKING([for net/if.h and libnl3/netlink/route/link.h namespace collision]) -- CPPFLAGS="$NL3_CFLAGS" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $NL3_CFLAGS" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - #include -@@ -358,12 +364,14 @@ - AC_DEFINE([_HAVE_IF_H_LINK_H_COLLISION_], [ 1 ], [Define to 1 if and namespace collision]) - add_build_opt([IF_H_LINK_H_COLLISION]) - ]) -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - - dnl ----[Check have IPV4_DEVCONF defines - since Linux 3.11]---- - if test $NETLINK_VER = 3; then - IPV4_DEVCONF=Yes -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - AC_CHECK_DECLS([ - IPV4_DEVCONF_ARP_IGNORE, - IPV4_DEVCONF_ACCEPT_LOCAL, -@@ -375,6 +383,7 @@ - break - ], - [[#include ]]) -+ CPPFLAGS="$SAV_CPPFLAGS" - else - IPV4_DEVCONF=No - fi -@@ -397,20 +406,23 @@ - if test $USE_LIBIPTC = Yes; then - add_pkg_config([--static libiptc], [IPTC]) - LIBS="$IPTC_LIBS" -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - AC_CHECK_LIB(iptc, iptc_init, - [ - add_pkg_config([--static libiptc]) - AC_DEFINE([_HAVE_LIBIPTC_], [ 1 ], [Define to 1 if have iptables libraries]) - ], - [USE_LIBIPTC=No]) -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - - if test $USE_LIBIPTC = Yes; then - add_build_opt([LIBIPTC]) - - dnl ----[Check for ipset libraries]---- -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - if test "${enable_libipset}" != no; then - pkg-config --exists libipset - if test $? -eq 0; then -@@ -478,6 +490,8 @@ - AC_CHECK_DECL([XT_EXTENSION_MAXNAMELEN], [], - [AC_DEFINE([XT_EXTENSION_MAXNAMELEN], [ (XT_FUNCTION_MAXNAMELEN - 1) ], [Define if doesnt define it])], - [#include ]) -+ -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - fi - AM_CONDITIONAL([LIBIPTC], [test $USE_LIBIPTC = Yes]) -@@ -488,7 +502,8 @@ - # Linux 4.5 to 4.5.4 has indirectly including - # and which causes a namespace collision. - AC_MSG_CHECKING([for libiptc/libiptc.h linux/if.h and net/if.h namespace collision]) --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - ]])], -@@ -500,6 +515,7 @@ - AC_DEFINE([_HAVE_LINUX_NET_IF_H_COLLISION_], [ 1 ], [Define to 1 if have libiptc/libiptc.h linux/if.h and net/if.h namespace collision]) - add_build_opt([LINUX_NET_IF_H_COLLISION]) - ]) -+CPPFLAGS="$SAV_CPPFLAGS" - - dnl ----[ Checks for LVS and VRRP support ]---- - IPVS_SYNCD_ATTRIBUTES=No -@@ -518,7 +534,8 @@ - fi - - dnl ----[ IPVS syncd options ]--- -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - IPVS_SYNCD_ATTRIBUTES=Yes - AC_CHECK_DECLS([ - IPVS_DAEMON_ATTR_SYNC_MAXLEN, -@@ -540,7 +557,6 @@ - dnl ----[ IPVS 64-bit stats ]---- - dnl -- Since Linux 4.2 - if test "$enable_lvs_64bit_stats" != "no"; then -- CPPFLAGS="$kernelinc" - IPVS_64BIT_STATS=Yes - AC_CHECK_DECLS([ - IPVS_SVC_ATTR_STATS64, -@@ -555,6 +571,7 @@ - add_build_opt([IPVS_64BIT_STATS]) - fi - fi -+ CPPFLAGS="$SAV_CPPFLAGS" - else - IPVS_SUPPORT=No - fi -@@ -577,7 +594,8 @@ - fi - - dnl ----[ Checks for kernel VMAC support ]---- -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - MACVLAN_SUPPORT=Yes - dnl -- Since Linux 2.6.33 - AC_CHECK_DECLS([ -@@ -594,6 +612,7 @@ - AC_DEFINE([_HAVE_VRRP_VMAC_], [ 1 ], [Define to 1 if have MAC VLAN support]) - add_build_opt([VRRP_VMAC]) - fi -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - AM_CONDITIONAL([WITH_VRRP], [test $VRRP_SUPPORT = Yes]) - AM_CONDITIONAL([VRRP_AUTH], [test $VRRP_AUTH_SUPPORT = Yes]) -@@ -614,7 +633,8 @@ - - dnl ----[ Checks for FIB routing support ]---- - # Introduced in Linux 2.6.19 --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - AC_CHECK_DECL([FRA_SRC], - [ - FIB_ROUTING_SUPPORT=Yes -@@ -626,9 +646,11 @@ - ],[[#include - #include ]]) - AM_CONDITIONAL([FIB_ROUTING], [test $FIB_ROUTING_SUPPORT = Yes]) -+CPPFLAGS="$SAV_CPPFLAGS" - - dnl ----[ Checks for kernel IFLA_INET6_ADDR_GEN_MODE support ]---- --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - if test ${MACVLAN_SUPPORT} = Yes; then - # Introduced in Linux 3.17 - AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE], -@@ -638,6 +660,7 @@ - #include - ]]) - fi -+CPPFLAGS="$SAV_CPPFLAGS" - - dnl ----[ Checks for SNMP support ]---- - SNMP_SUPPORT=No -@@ -662,8 +685,10 @@ - NETSNMP_LIBS="$NETSNMP_LIBS_AGENT $NETSNMP_LIBS_EXT" - NETSNMP_CFLAGS="`${NETSNMP_CONFIG} --base-cflags` -DNETSNMP_NO_INLINE" - -- CFLAGS="${NETSNMP_CFLAGS}" -- LIBS="${NETSNMP_LIBS}" -+ SAV_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS ${NETSNMP_CFLAGS}" -+ SAV_LIBS="$LIBS" -+ LIBS="$LIBS ${NETSNMP_LIBS}" - AC_MSG_CHECKING([whether C compiler supports flag "${NETSNMP_CFLAGS} ${NETSNMP_LIBS}" from Net-SNMP]) - AC_LINK_IFELSE([AC_LANG_SOURCE([[ - int main(void) -@@ -683,7 +708,8 @@ - - # check for net-snmp headers - # Some ancient distributions may miss header -- CPPFLAGS="$NETSNMP_CFLAGS" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $NETSNMP_CFLAGS" - AC_CHECK_HEADERS(net-snmp/agent/agent_sysORTable.h net-snmp/agent/snmp_vars.h net-snmp/agent/util_funcs.h,[], - [AC_MSG_ERROR([missing net-snmp headers])],[[ - #include -@@ -739,8 +765,9 @@ - AC_MSG_ERROR([CHECKER SNMP support requires checker]) - fi - -- unset LIBS -- unset CFLAGS -+ CPPFLAGS="$SAV_CPPFLAGS" -+ CFLAGS="$SAV_CFLAGS" -+ LIBS="$SAV_LIBS" - fi - - dnl ----[What SNMP support is required]---- -@@ -798,10 +825,12 @@ - - dnl ---[ check for setns() ]---- - dnl -- CLONE_NEWNET defined from Linux 3.0 --CFLAGS=-D_GNU_SOURCE -+SAV_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS -D_GNU_SOURCE" - AC_CHECK_DECLS([CLONE_NEWNET], [], [], [[#include ]]) - dnl -- From glibc 2.14. Otherwise use setns syscall, since Linux 2.4.x - AC_CHECK_FUNCS([setns]) -+CFLAGS="$SAV_CFLAGS" - AM_CONDITIONAL([WITH_NAMESPACES], [test $ac_cv_have_decl_CLONE_NEWNET = yes]) - - dnl ---[ check for sphinx-build executable ]---- ---- a/configure 2016-09-11 18:17:50.000000000 +0100 -+++ b/configure 2016-09-16 18:06:48.934413991 +0100 -@@ -2527,7 +2527,7 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --am__api_version='1.14' -+am__api_version='1.15' - - ac_aux_dir= - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -@@ -2728,8 +2728,8 @@ - ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' - program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - --# expand $ac_aux_dir to an absolute path --am_aux_dir=`cd $ac_aux_dir && pwd` -+# Expand $ac_aux_dir to an absolute path. -+am_aux_dir=`cd "$ac_aux_dir" && pwd` - - if test x"${MISSING+set}" != xset; then - case $am_aux_dir in -@@ -2748,7 +2748,7 @@ - $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} - fi - --if test x"${install_sh}" != xset; then -+if test x"${install_sh+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; -@@ -3076,8 +3076,8 @@ - # - mkdir_p='$(MKDIR_P)' - --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. -+# We need awk for the "check" target (and possibly the TAP driver). The -+# system "awk" is bad on some platforms. - # Always define AMTAR for backward compatibility. Yes, it's still used - # in the wild :-( We should find a proper way to deprecate it ... - AMTAR='$${TAR-tar}' -@@ -3137,6 +3137,7 @@ - - - -+ - ac_config_headers="$ac_config_headers lib/config.h" - - -@@ -5259,7 +5260,8 @@ - - - # check for kernel headers --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - NETLINK_EXTRA_INCLUDE= - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -5333,6 +5335,7 @@ - - done - -+CPPFLAGS="$SAV_CPPFLAGS" - - # Checks for typedefs, structures, and compiler characteristics. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 -@@ -6521,7 +6524,8 @@ - - - if test $NETLINK_VER != None; then -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - for ac_header in libnfnetlink/libnfnetlink.h - do : - ac_fn_c_check_header_mongrel "$LINENO" "libnfnetlink/libnfnetlink.h" "ac_cv_header_libnfnetlink_libnfnetlink_h" "$ac_includes_default" -@@ -6538,7 +6542,7 @@ - done - - if test $NETLINK_VER = 3; then -- CPPFLAGS="$NL3_CFLAGS" -+ CPPFLAGS="$CPPFLAGS $NL3_CFLAGS" - for ac_header in netlink/route/link.h netlink/route/link/inet.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -6586,6 +6590,8 @@ - - done - -+ -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - - ac_fn_c_check_decl "$LINENO" "RTA_ENCAP" "ac_cv_have_decl_RTA_ENCAP" "#include -@@ -6743,7 +6749,8 @@ - if test $NETLINK_VER = 3; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for net/if.h and libnl3/netlink/route/link.h namespace collision" >&5 - $as_echo_n "checking for net/if.h and libnl3/netlink/route/link.h namespace collision... " >&6; } -- CPPFLAGS="$NL3_CFLAGS" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $NL3_CFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -6767,11 +6774,13 @@ - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - - if test $NETLINK_VER = 3; then - IPV4_DEVCONF=Yes -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - ac_fn_c_check_decl "$LINENO" "IPV4_DEVCONF_ARP_IGNORE" "ac_cv_have_decl_IPV4_DEVCONF_ARP_IGNORE" "#include - " - if test "x$ac_cv_have_decl_IPV4_DEVCONF_ARP_IGNORE" = xyes; then : -@@ -6849,6 +6858,7 @@ - - fi - -+ CPPFLAGS="$SAV_CPPFLAGS" - else - IPV4_DEVCONF=No - fi -@@ -6919,7 +6929,8 @@ - - - LIBS="$IPTC_LIBS" -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iptc_init in -liptc" >&5 - $as_echo_n "checking for iptc_init in -liptc... " >&6; } - if ${ac_cv_lib_iptc_iptc_init+:} false; then : -@@ -7002,12 +7013,14 @@ - USE_LIBIPTC=No - fi - -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - - if test $USE_LIBIPTC = Yes; then - BUILD_OPTIONS="$BUILD_OPTIONS LIBIPTC" - -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - if test "${enable_libipset}" != no; then - pkg-config --exists libipset - if test $? -eq 0; then -@@ -7326,6 +7339,8 @@ - - fi - -+ -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - fi - if test $USE_LIBIPTC = Yes; then -@@ -7350,7 +7365,8 @@ - # and which causes a namespace collision. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiptc/libiptc.h linux/if.h and net/if.h namespace collision" >&5 - $as_echo_n "checking for libiptc/libiptc.h linux/if.h and net/if.h namespace collision... " >&6; } --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -7373,6 +7389,7 @@ - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+CPPFLAGS="$SAV_CPPFLAGS" - - IPVS_SYNCD_ATTRIBUTES=No - IPVS_64BIT_STATS=No -@@ -7403,7 +7420,8 @@ - BUILD_OPTIONS="$BUILD_OPTIONS LIBIPVS_NETLINK" - fi - -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - IPVS_SYNCD_ATTRIBUTES=Yes - ac_fn_c_check_decl "$LINENO" "IPVS_DAEMON_ATTR_SYNC_MAXLEN" "ac_cv_have_decl_IPVS_DAEMON_ATTR_SYNC_MAXLEN" "#include - " -@@ -7509,7 +7527,6 @@ - fi - - if test "$enable_lvs_64bit_stats" != "no"; then -- CPPFLAGS="$kernelinc" - IPVS_64BIT_STATS=Yes - ac_fn_c_check_decl "$LINENO" "IPVS_SVC_ATTR_STATS64" "ac_cv_have_decl_IPVS_SVC_ATTR_STATS64" "#include - " -@@ -7557,6 +7574,7 @@ - BUILD_OPTIONS="$BUILD_OPTIONS IPVS_64BIT_STATS" - fi - fi -+ CPPFLAGS="$SAV_CPPFLAGS" - else - IPVS_SUPPORT=No - fi -@@ -7587,7 +7605,8 @@ - BUILD_OPTIONS="$BUILD_OPTIONS VRRP_AUTH" - fi - -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - MACVLAN_SUPPORT=Yes - ac_fn_c_check_decl "$LINENO" "IFLA_MACVLAN_MODE" "ac_cv_have_decl_IFLA_MACVLAN_MODE" " - #include -@@ -7640,6 +7659,7 @@ - - BUILD_OPTIONS="$BUILD_OPTIONS VRRP_VMAC" - fi -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - if test $VRRP_SUPPORT = Yes; then - WITH_VRRP_TRUE= -@@ -7713,7 +7733,8 @@ - - - # Introduced in Linux 2.6.19 --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - ac_fn_c_check_decl "$LINENO" "FRA_SRC" "ac_cv_have_decl_FRA_SRC" "#include - #include - " -@@ -7739,8 +7760,10 @@ - FIB_ROUTING_FALSE= - fi - -+CPPFLAGS="$SAV_CPPFLAGS" - --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - if test ${MACVLAN_SUPPORT} = Yes; then - # Introduced in Linux 3.17 - ac_fn_c_check_decl "$LINENO" "IFLA_INET6_ADDR_GEN_MODE" "ac_cv_have_decl_IFLA_INET6_ADDR_GEN_MODE" " -@@ -7763,6 +7786,7 @@ - fi - - fi -+CPPFLAGS="$SAV_CPPFLAGS" - - SNMP_SUPPORT=No - SNMP_KEEPALIVED_SUPPORT=No -@@ -7883,8 +7907,10 @@ - NETSNMP_LIBS="$NETSNMP_LIBS_AGENT $NETSNMP_LIBS_EXT" - NETSNMP_CFLAGS="`${NETSNMP_CONFIG} --base-cflags` -DNETSNMP_NO_INLINE" - -- CFLAGS="${NETSNMP_CFLAGS}" -- LIBS="${NETSNMP_LIBS}" -+ SAV_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS ${NETSNMP_CFLAGS}" -+ SAV_LIBS="$LIBS" -+ LIBS="$LIBS ${NETSNMP_LIBS}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler supports flag \"${NETSNMP_CFLAGS} ${NETSNMP_LIBS}\" from Net-SNMP" >&5 - $as_echo_n "checking whether C compiler supports flag \"${NETSNMP_CFLAGS} ${NETSNMP_LIBS}\" from Net-SNMP... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -7928,7 +7954,8 @@ - - # check for net-snmp headers - # Some ancient distributions may miss header -- CPPFLAGS="$NETSNMP_CFLAGS" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $NETSNMP_CFLAGS" - for ac_header in net-snmp/agent/agent_sysORTable.h net-snmp/agent/snmp_vars.h net-snmp/agent/util_funcs.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -8000,8 +8027,9 @@ - as_fn_error $? "CHECKER SNMP support requires checker" "$LINENO" 5 - fi - -- unset LIBS -- unset CFLAGS -+ CPPFLAGS="$SAV_CPPFLAGS" -+ CFLAGS="$SAV_CFLAGS" -+ LIBS="$SAV_LIBS" - fi - - if test $SNMP_SUPPORT = Yes; then -@@ -8183,7 +8211,8 @@ - - fi - --CFLAGS=-D_GNU_SOURCE -+SAV_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS -D_GNU_SOURCE" - ac_fn_c_check_decl "$LINENO" "CLONE_NEWNET" "ac_cv_have_decl_CLONE_NEWNET" "#include - " - if test "x$ac_cv_have_decl_CLONE_NEWNET" = xyes; then : -@@ -8207,6 +8236,7 @@ - fi - done - -+CFLAGS="$SAV_CFLAGS" - if test $ac_cv_have_decl_CLONE_NEWNET = yes; then - WITH_NAMESPACES_TRUE= - WITH_NAMESPACES_FALSE='#' diff --git a/fix-checksum-VRRPv3-unicast.patch b/fix-checksum-VRRPv3-unicast.patch new file mode 100644 index 0000000..2a228bf --- /dev/null +++ b/fix-checksum-VRRPv3-unicast.patch @@ -0,0 +1,43 @@ +From 67275d23aaef66c8b0ab854db93a1a3dd0e5124e Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Thu, 31 Aug 2017 08:56:37 +0100 +Subject: [PATCH] Fix calculation of checksum for VRRPv3 IPv4 unicast peers + +Alternate unicast peers were being sent adverts with the checksum +set to 0. The reason for this was that the checksum field was not +being set to 0 before the checksum calculation, hence causing the +calculated checksum to be 0 for the second, fourth, sixth etc +unicast peer. + +Signed-off-by: Quentin Armitage +--- + keepalived/vrrp/vrrp.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c +index a297c5e..0813a00 100644 +--- a/keepalived/vrrp/vrrp.c ++++ b/keepalived/vrrp/vrrp.c +@@ -965,6 +965,10 @@ vrrp_build_vrrp_v3(vrrp_t *vrrp, uint8_t prio, char *buffer) + hd->naddr = (uint8_t)((!LIST_ISEMPTY(vrrp->vip)) ? LIST_SIZE(vrrp->vip) : 0); + hd->v3.adver_int = htons((vrrp->adver_int / TIMER_CENTI_HZ) & 0x0FFF); /* interval in centiseconds, reserved bits zero */ + ++ /* For IPv4 to calculate the checksum, the value must start as 0. ++ * For IPv6, the kernel will update checksum field. */ ++ hd->chksum = 0; ++ + /* Family specific */ + if (vrrp->family == AF_INET) { + /* copy the ip addresses */ +@@ -994,8 +998,6 @@ vrrp_build_vrrp_v3(vrrp_t *vrrp, uint8_t prio, char *buffer) + ip6arr[i++] = ip_addr->u.sin6_addr; + } + } +- /* Kernel will update checksum field. let it be 0 now. */ +- hd->chksum = 0; + } + + return 0; +-- +2.9.5 + diff --git a/fix-conditional-compilation.patch b/fix-conditional-compilation.patch new file mode 100644 index 0000000..8a622f7 --- /dev/null +++ b/fix-conditional-compilation.patch @@ -0,0 +1,26 @@ +From 8228f6eea861ca293a868dee06c564756009785c Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 15 Aug 2017 20:38:42 +0100 +Subject: [PATCH] Fix sense of a conditional compilation check + +Signed-off-by: Quentin Armitage +--- + keepalived/vrrp/vrrp_scheduler.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/keepalived/vrrp/vrrp_scheduler.c b/keepalived/vrrp/vrrp_scheduler.c +index 48acd11..9d33a62 100644 +--- a/keepalived/vrrp/vrrp_scheduler.c ++++ b/keepalived/vrrp/vrrp_scheduler.c +@@ -661,7 +661,7 @@ vrrp_backup(vrrp_t * vrrp, char *buffer, ssize_t len) + + static void + vrrp_become_master(vrrp_t * vrrp, +-#ifdef _WITH_VRRP_AUTH_ ++#ifndef _WITH_VRRP_AUTH_ + __attribute__((unused)) + #endif + char *buffer, __attribute__((unused)) ssize_t len) +-- +2.9.5 + diff --git a/generate-readme.patch b/generate-readme.patch new file mode 100644 index 0000000..3f40028 --- /dev/null +++ b/generate-readme.patch @@ -0,0 +1,249 @@ +From 3b83f50634061216eda32a1dbc5601f1b69d7d60 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Fri, 1 Sep 2017 14:14:25 +0100 +Subject: [PATCH] Generate README from README.md + +Signed-off-by: Quentin Armitage +--- + .gitignore | 1 + + Makefile.am | 13 ++++++++ + Makefile.in | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- + 3 files changed, 100 insertions(+), 16 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index fecba88..c706ffb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,6 +8,9 @@ export DEBUG_CFLAGS + export DEBUG_CPPFLAGS + export DEBUG_LDFLAGS + ++edit = echo " EDIT $@"; \ ++ sed -e "/^\[\!\[/d" ++ + SUBDIRS = lib keepalived doc + + if BUILD_GENHASH +@@ -18,12 +21,22 @@ SUBDIRS += bin_install + + EXTRA_DIST = AUTHOR CONTRIBUTORS snap README.md + ++doc_DATA = README ++ ++MOSTLYCLEANFILES = README ++ + MAINTAINERCLEANFILES = @MAINTAINERCLEANFILES@ + ++README: $(srcdir)/README.md ++ @$(edit) '$(srcdir)/$@.md' >$@ ++ + distclean-local: + @rm -f aclocal.m4 ar-lib compile depcomp missing keepalived-$(VERSION).tar.gz config.log config.status + @rm -rf autom4te.cache + ++dist-hook: ++ @rm -f $(distdir)/README ++ + .PHONY: docker + docker: + docker build -t keepalived . +diff --git a/Makefile.in b/Makefile.in +index 896845a..9daefec 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -19,6 +19,7 @@ + # Keepalived OpenSource project. + # + # Copyright (C) 2001-2016 Alexandre Cassen, ++ + VPATH = @srcdir@ + am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ +@@ -132,6 +133,35 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__uninstall_files_from_dir = { \ ++ test -z "$$files" \ ++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ ++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ ++ $(am__cd) "$$dir" && rm -f $$files; }; \ ++ } ++am__installdirs = "$(DESTDIR)$(docdir)" ++DATA = $(doc_DATA) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + am__recursive_targets = \ +@@ -162,7 +192,7 @@ CTAGS = ctags + CSCOPE = cscope + DIST_SUBDIRS = lib keepalived doc genhash bin_install + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/keepalived.spec.in \ +- COPYING ChangeLog INSTALL TODO ar-lib compile depcomp \ ++ COPYING ChangeLog INSTALL README TODO ar-lib compile depcomp \ + install-sh missing + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) +@@ -314,8 +344,13 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ ++edit = echo " EDIT $@"; \ ++ sed -e "/^\[\!\[/d" ++ + SUBDIRS = lib keepalived doc $(am__append_1) bin_install + EXTRA_DIST = AUTHOR CONTRIBUTORS snap README.md ++doc_DATA = README ++MOSTLYCLEANFILES = README + DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + +@@ -357,6 +392,27 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) + $(am__aclocal_m4_deps): + keepalived.spec: $(top_builddir)/config.status $(srcdir)/keepalived.spec.in + cd $(top_builddir) && $(SHELL) ./config.status $@ ++install-docDATA: $(doc_DATA) ++ @$(NORMAL_INSTALL) ++ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ ++ if test -n "$$list"; then \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ ++ fi; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ ++ done ++ ++uninstall-docDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) + + # This directory's subdirectories are mostly independent; you can cd + # into them and run 'make' without going through this Makefile. +@@ -521,6 +577,9 @@ distdir: $(DISTFILES) + || exit 1; \ + fi; \ + done ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$(top_distdir)" distdir="$(distdir)" \ ++ dist-hook + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ +@@ -654,9 +713,12 @@ distcleancheck: distclean + exit 1; } >&2 + check-am: all-am + check: check-recursive +-all-am: Makefile ++all-am: Makefile $(DATA) + installdirs: installdirs-recursive + installdirs-am: ++ for dir in "$(DESTDIR)$(docdir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -677,6 +739,7 @@ install-strip: + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi + mostlyclean-generic: ++ -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: + +@@ -710,7 +773,7 @@ info: info-recursive + + info-am: + +-install-data-am: ++install-data-am: install-docDATA + + install-dvi: install-dvi-recursive + +@@ -756,25 +819,26 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: ++uninstall-am: uninstall-docDATA + + .MAKE: $(am__recursive_targets) install-am install-strip + + .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-local cscope cscopelist-am ctags ctags-am dist dist-all \ +- dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \ +- dist-zip distcheck distclean distclean-generic distclean-local \ +- distclean-tags distcleancheck distdir distuninstallcheck dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ +- uninstall-am ++ dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ ++ dist-xz dist-zip distcheck distclean distclean-generic \ ++ distclean-local distclean-tags distcleancheck distdir \ ++ distuninstallcheck dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am \ ++ install-docDATA install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am tags tags-am uninstall uninstall-am \ ++ uninstall-docDATA + + .PRECIOUS: Makefile + +@@ -783,10 +847,16 @@ export DEBUG_CFLAGS + export DEBUG_CPPFLAGS + export DEBUG_LDFLAGS + ++README: $(srcdir)/README.md ++ @$(edit) '$(srcdir)/$@.md' >$@ ++ + distclean-local: + @rm -f aclocal.m4 ar-lib compile depcomp missing keepalived-$(VERSION).tar.gz config.log config.status + @rm -rf autom4te.cache + ++dist-hook: ++ @rm -f $(distdir)/README ++ + .PHONY: docker + docker: + docker build -t keepalived . +-- +2.9.5 + diff --git a/keepalived.spec b/keepalived.spec index 5639d53..b01b217 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,8 +8,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 1.3.5 -Release: 3%{?dist} +Version: 1.3.6 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Group: System Environment/Daemons @@ -17,6 +17,11 @@ Group: System Environment/Daemons Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service +Patch0: generate-readme.patch +Patch1: fix-checksum-VRRPv3-unicast.patch +Patch2: fix-conditional-compilation.patch + + Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -48,6 +53,9 @@ infrastructures. %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure \ @@ -99,6 +107,9 @@ rm -rf %{buildroot} %{_mandir}/man8/keepalived.8* %changelog +* Mon Sep 11 2017 Ryan O'Hara - 1.3.6-1 +- Update to 1.3.6 (#1481471) + * Thu Aug 03 2017 Fedora Release Engineering - 1.3.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From ccdacbcc6fd16a611a537cb85f0f4a4bd43fbe39 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 11 Sep 2017 10:23:20 -0600 Subject: [PATCH 02/72] Add new 1.3.6 sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cbf28ac..fb24f24 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /keepalived-1.2.24.tar.gz /keepalived-1.3.2.tar.gz /keepalived-1.3.5.tar.gz +/keepalived-1.3.6.tar.gz diff --git a/sources b/sources index de055d7..ee214c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-1.3.5.tar.gz) = ebd710167becd4b99b665877953d19477c11f1d1c736eb580a05dedd4946363b756553e20607f34aa6c35f57b7252d8a22287beedc316b62a745fccc4243a720 +SHA512 (keepalived-1.3.6.tar.gz) = 3182ab06836c0d0ca0dfc17d2eaa9031be71133de7f29f7608f841788ca6ff4002bbde7e8c8d99e898cfcd0b67f5158e4b50467b7863395149eafa38fec6c6de From 6149f68d143eb10f3560624a1b1f9740a670a188 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 11 Sep 2017 10:14:07 -0600 Subject: [PATCH 03/72] Update to 1.3.6 (#1481471) --- .gitignore | 1 + configure.patch | 562 ------------------------------ fix-checksum-VRRPv3-unicast.patch | 43 +++ fix-conditional-compilation.patch | 26 ++ generate-readme.patch | 249 +++++++++++++ keepalived.spec | 15 +- sources | 2 +- 7 files changed, 333 insertions(+), 565 deletions(-) delete mode 100644 configure.patch create mode 100644 fix-checksum-VRRPv3-unicast.patch create mode 100644 fix-conditional-compilation.patch create mode 100644 generate-readme.patch diff --git a/.gitignore b/.gitignore index cbf28ac..fb24f24 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /keepalived-1.2.24.tar.gz /keepalived-1.3.2.tar.gz /keepalived-1.3.5.tar.gz +/keepalived-1.3.6.tar.gz diff --git a/configure.patch b/configure.patch deleted file mode 100644 index 015742b..0000000 --- a/configure.patch +++ /dev/null @@ -1,562 +0,0 @@ ---- a/configure.ac 2016-09-11 17:47:25.000000000 +0100 -+++ b/configure.ac 2016-09-16 18:06:48.931414048 +0100 -@@ -154,7 +154,8 @@ - [], [AC_MSG_ERROR([Missing/unusable system header file <$ac_header>])]) - - # check for kernel headers --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - dnl -- needed until Linux 3.1 - dnl -- using AC_CHECK_HEADER causes a horrible error message for the user - NETLINK_EXTRA_INCLUDE= -@@ -176,6 +177,7 @@ - AC_CHECK_HEADERS([linux/if_arp.h], - [], [AC_MSG_ERROR([Missing/unusable <$ac_header>])], - [[#include ]]) -+CPPFLAGS="$SAV_CPPFLAGS" - - # Checks for typedefs, structures, and compiler characteristics. - AC_HEADER_STDBOOL -@@ -303,16 +305,19 @@ - ]) - - if test $NETLINK_VER != None; then -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - AC_CHECK_HEADERS(libnfnetlink/libnfnetlink.h,,AC_MSG_ERROR([ - !!! Please install libnfnetlink headers. !!!])) - if test $NETLINK_VER = 3; then -- CPPFLAGS="$NL3_CFLAGS" -+ CPPFLAGS="$CPPFLAGS $NL3_CFLAGS" - AC_CHECK_HEADERS([netlink/route/link.h netlink/route/link/inet.h], [], [AC_MSG_ERROR([libnl-3 headers missing])]) - fi - - AC_CHECK_HEADERS([linux/rtnetlink.h], [], [AC_MSG_ERROR([Unusable link/rtnetlink.h])], [$NETLINK_EXTRA_INCLUDE]) - AC_CHECK_HEADERS([libnfnetlink/libnfnetlink.h netlink/genl/ctrl.h netlink/genl/genl.h netlink/netlink.h], [], [AC_MSG_ERROR([netlink headers missing])]) -+ -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - - dnl -- Check for the following variables introduced at various times into Linux -@@ -347,7 +352,8 @@ - dnl -- Resolved in libnl3-3.2.26 (release 30/3/2015) - if test $NETLINK_VER = 3; then - AC_MSG_CHECKING([for net/if.h and libnl3/netlink/route/link.h namespace collision]) -- CPPFLAGS="$NL3_CFLAGS" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $NL3_CFLAGS" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - #include -@@ -358,12 +364,14 @@ - AC_DEFINE([_HAVE_IF_H_LINK_H_COLLISION_], [ 1 ], [Define to 1 if and namespace collision]) - add_build_opt([IF_H_LINK_H_COLLISION]) - ]) -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - - dnl ----[Check have IPV4_DEVCONF defines - since Linux 3.11]---- - if test $NETLINK_VER = 3; then - IPV4_DEVCONF=Yes -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - AC_CHECK_DECLS([ - IPV4_DEVCONF_ARP_IGNORE, - IPV4_DEVCONF_ACCEPT_LOCAL, -@@ -375,6 +383,7 @@ - break - ], - [[#include ]]) -+ CPPFLAGS="$SAV_CPPFLAGS" - else - IPV4_DEVCONF=No - fi -@@ -397,20 +406,23 @@ - if test $USE_LIBIPTC = Yes; then - add_pkg_config([--static libiptc], [IPTC]) - LIBS="$IPTC_LIBS" -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - AC_CHECK_LIB(iptc, iptc_init, - [ - add_pkg_config([--static libiptc]) - AC_DEFINE([_HAVE_LIBIPTC_], [ 1 ], [Define to 1 if have iptables libraries]) - ], - [USE_LIBIPTC=No]) -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - - if test $USE_LIBIPTC = Yes; then - add_build_opt([LIBIPTC]) - - dnl ----[Check for ipset libraries]---- -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - if test "${enable_libipset}" != no; then - pkg-config --exists libipset - if test $? -eq 0; then -@@ -478,6 +490,8 @@ - AC_CHECK_DECL([XT_EXTENSION_MAXNAMELEN], [], - [AC_DEFINE([XT_EXTENSION_MAXNAMELEN], [ (XT_FUNCTION_MAXNAMELEN - 1) ], [Define if doesnt define it])], - [#include ]) -+ -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - fi - AM_CONDITIONAL([LIBIPTC], [test $USE_LIBIPTC = Yes]) -@@ -488,7 +502,8 @@ - # Linux 4.5 to 4.5.4 has indirectly including - # and which causes a namespace collision. - AC_MSG_CHECKING([for libiptc/libiptc.h linux/if.h and net/if.h namespace collision]) --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - ]])], -@@ -500,6 +515,7 @@ - AC_DEFINE([_HAVE_LINUX_NET_IF_H_COLLISION_], [ 1 ], [Define to 1 if have libiptc/libiptc.h linux/if.h and net/if.h namespace collision]) - add_build_opt([LINUX_NET_IF_H_COLLISION]) - ]) -+CPPFLAGS="$SAV_CPPFLAGS" - - dnl ----[ Checks for LVS and VRRP support ]---- - IPVS_SYNCD_ATTRIBUTES=No -@@ -518,7 +534,8 @@ - fi - - dnl ----[ IPVS syncd options ]--- -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - IPVS_SYNCD_ATTRIBUTES=Yes - AC_CHECK_DECLS([ - IPVS_DAEMON_ATTR_SYNC_MAXLEN, -@@ -540,7 +557,6 @@ - dnl ----[ IPVS 64-bit stats ]---- - dnl -- Since Linux 4.2 - if test "$enable_lvs_64bit_stats" != "no"; then -- CPPFLAGS="$kernelinc" - IPVS_64BIT_STATS=Yes - AC_CHECK_DECLS([ - IPVS_SVC_ATTR_STATS64, -@@ -555,6 +571,7 @@ - add_build_opt([IPVS_64BIT_STATS]) - fi - fi -+ CPPFLAGS="$SAV_CPPFLAGS" - else - IPVS_SUPPORT=No - fi -@@ -577,7 +594,8 @@ - fi - - dnl ----[ Checks for kernel VMAC support ]---- -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - MACVLAN_SUPPORT=Yes - dnl -- Since Linux 2.6.33 - AC_CHECK_DECLS([ -@@ -594,6 +612,7 @@ - AC_DEFINE([_HAVE_VRRP_VMAC_], [ 1 ], [Define to 1 if have MAC VLAN support]) - add_build_opt([VRRP_VMAC]) - fi -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - AM_CONDITIONAL([WITH_VRRP], [test $VRRP_SUPPORT = Yes]) - AM_CONDITIONAL([VRRP_AUTH], [test $VRRP_AUTH_SUPPORT = Yes]) -@@ -614,7 +633,8 @@ - - dnl ----[ Checks for FIB routing support ]---- - # Introduced in Linux 2.6.19 --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - AC_CHECK_DECL([FRA_SRC], - [ - FIB_ROUTING_SUPPORT=Yes -@@ -626,9 +646,11 @@ - ],[[#include - #include ]]) - AM_CONDITIONAL([FIB_ROUTING], [test $FIB_ROUTING_SUPPORT = Yes]) -+CPPFLAGS="$SAV_CPPFLAGS" - - dnl ----[ Checks for kernel IFLA_INET6_ADDR_GEN_MODE support ]---- --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - if test ${MACVLAN_SUPPORT} = Yes; then - # Introduced in Linux 3.17 - AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE], -@@ -638,6 +660,7 @@ - #include - ]]) - fi -+CPPFLAGS="$SAV_CPPFLAGS" - - dnl ----[ Checks for SNMP support ]---- - SNMP_SUPPORT=No -@@ -662,8 +685,10 @@ - NETSNMP_LIBS="$NETSNMP_LIBS_AGENT $NETSNMP_LIBS_EXT" - NETSNMP_CFLAGS="`${NETSNMP_CONFIG} --base-cflags` -DNETSNMP_NO_INLINE" - -- CFLAGS="${NETSNMP_CFLAGS}" -- LIBS="${NETSNMP_LIBS}" -+ SAV_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS ${NETSNMP_CFLAGS}" -+ SAV_LIBS="$LIBS" -+ LIBS="$LIBS ${NETSNMP_LIBS}" - AC_MSG_CHECKING([whether C compiler supports flag "${NETSNMP_CFLAGS} ${NETSNMP_LIBS}" from Net-SNMP]) - AC_LINK_IFELSE([AC_LANG_SOURCE([[ - int main(void) -@@ -683,7 +708,8 @@ - - # check for net-snmp headers - # Some ancient distributions may miss header -- CPPFLAGS="$NETSNMP_CFLAGS" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $NETSNMP_CFLAGS" - AC_CHECK_HEADERS(net-snmp/agent/agent_sysORTable.h net-snmp/agent/snmp_vars.h net-snmp/agent/util_funcs.h,[], - [AC_MSG_ERROR([missing net-snmp headers])],[[ - #include -@@ -739,8 +765,9 @@ - AC_MSG_ERROR([CHECKER SNMP support requires checker]) - fi - -- unset LIBS -- unset CFLAGS -+ CPPFLAGS="$SAV_CPPFLAGS" -+ CFLAGS="$SAV_CFLAGS" -+ LIBS="$SAV_LIBS" - fi - - dnl ----[What SNMP support is required]---- -@@ -798,10 +825,12 @@ - - dnl ---[ check for setns() ]---- - dnl -- CLONE_NEWNET defined from Linux 3.0 --CFLAGS=-D_GNU_SOURCE -+SAV_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS -D_GNU_SOURCE" - AC_CHECK_DECLS([CLONE_NEWNET], [], [], [[#include ]]) - dnl -- From glibc 2.14. Otherwise use setns syscall, since Linux 2.4.x - AC_CHECK_FUNCS([setns]) -+CFLAGS="$SAV_CFLAGS" - AM_CONDITIONAL([WITH_NAMESPACES], [test $ac_cv_have_decl_CLONE_NEWNET = yes]) - - dnl ---[ check for sphinx-build executable ]---- ---- a/configure 2016-09-11 18:17:50.000000000 +0100 -+++ b/configure 2016-09-16 18:06:48.934413991 +0100 -@@ -2527,7 +2527,7 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --am__api_version='1.14' -+am__api_version='1.15' - - ac_aux_dir= - for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -@@ -2728,8 +2728,8 @@ - ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' - program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - --# expand $ac_aux_dir to an absolute path --am_aux_dir=`cd $ac_aux_dir && pwd` -+# Expand $ac_aux_dir to an absolute path. -+am_aux_dir=`cd "$ac_aux_dir" && pwd` - - if test x"${MISSING+set}" != xset; then - case $am_aux_dir in -@@ -2748,7 +2748,7 @@ - $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} - fi - --if test x"${install_sh}" != xset; then -+if test x"${install_sh+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; -@@ -3076,8 +3076,8 @@ - # - mkdir_p='$(MKDIR_P)' - --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. -+# We need awk for the "check" target (and possibly the TAP driver). The -+# system "awk" is bad on some platforms. - # Always define AMTAR for backward compatibility. Yes, it's still used - # in the wild :-( We should find a proper way to deprecate it ... - AMTAR='$${TAR-tar}' -@@ -3137,6 +3137,7 @@ - - - -+ - ac_config_headers="$ac_config_headers lib/config.h" - - -@@ -5259,7 +5260,8 @@ - - - # check for kernel headers --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - NETLINK_EXTRA_INCLUDE= - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -@@ -5333,6 +5335,7 @@ - - done - -+CPPFLAGS="$SAV_CPPFLAGS" - - # Checks for typedefs, structures, and compiler characteristics. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 -@@ -6521,7 +6524,8 @@ - - - if test $NETLINK_VER != None; then -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - for ac_header in libnfnetlink/libnfnetlink.h - do : - ac_fn_c_check_header_mongrel "$LINENO" "libnfnetlink/libnfnetlink.h" "ac_cv_header_libnfnetlink_libnfnetlink_h" "$ac_includes_default" -@@ -6538,7 +6542,7 @@ - done - - if test $NETLINK_VER = 3; then -- CPPFLAGS="$NL3_CFLAGS" -+ CPPFLAGS="$CPPFLAGS $NL3_CFLAGS" - for ac_header in netlink/route/link.h netlink/route/link/inet.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -6586,6 +6590,8 @@ - - done - -+ -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - - ac_fn_c_check_decl "$LINENO" "RTA_ENCAP" "ac_cv_have_decl_RTA_ENCAP" "#include -@@ -6743,7 +6749,8 @@ - if test $NETLINK_VER = 3; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for net/if.h and libnl3/netlink/route/link.h namespace collision" >&5 - $as_echo_n "checking for net/if.h and libnl3/netlink/route/link.h namespace collision... " >&6; } -- CPPFLAGS="$NL3_CFLAGS" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $NL3_CFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -6767,11 +6774,13 @@ - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - - if test $NETLINK_VER = 3; then - IPV4_DEVCONF=Yes -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - ac_fn_c_check_decl "$LINENO" "IPV4_DEVCONF_ARP_IGNORE" "ac_cv_have_decl_IPV4_DEVCONF_ARP_IGNORE" "#include - " - if test "x$ac_cv_have_decl_IPV4_DEVCONF_ARP_IGNORE" = xyes; then : -@@ -6849,6 +6858,7 @@ - - fi - -+ CPPFLAGS="$SAV_CPPFLAGS" - else - IPV4_DEVCONF=No - fi -@@ -6919,7 +6929,8 @@ - - - LIBS="$IPTC_LIBS" -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iptc_init in -liptc" >&5 - $as_echo_n "checking for iptc_init in -liptc... " >&6; } - if ${ac_cv_lib_iptc_iptc_init+:} false; then : -@@ -7002,12 +7013,14 @@ - USE_LIBIPTC=No - fi - -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - - if test $USE_LIBIPTC = Yes; then - BUILD_OPTIONS="$BUILD_OPTIONS LIBIPTC" - -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - if test "${enable_libipset}" != no; then - pkg-config --exists libipset - if test $? -eq 0; then -@@ -7326,6 +7339,8 @@ - - fi - -+ -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - fi - if test $USE_LIBIPTC = Yes; then -@@ -7350,7 +7365,8 @@ - # and which causes a namespace collision. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiptc/libiptc.h linux/if.h and net/if.h namespace collision" >&5 - $as_echo_n "checking for libiptc/libiptc.h linux/if.h and net/if.h namespace collision... " >&6; } --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -7373,6 +7389,7 @@ - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+CPPFLAGS="$SAV_CPPFLAGS" - - IPVS_SYNCD_ATTRIBUTES=No - IPVS_64BIT_STATS=No -@@ -7403,7 +7420,8 @@ - BUILD_OPTIONS="$BUILD_OPTIONS LIBIPVS_NETLINK" - fi - -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - IPVS_SYNCD_ATTRIBUTES=Yes - ac_fn_c_check_decl "$LINENO" "IPVS_DAEMON_ATTR_SYNC_MAXLEN" "ac_cv_have_decl_IPVS_DAEMON_ATTR_SYNC_MAXLEN" "#include - " -@@ -7509,7 +7527,6 @@ - fi - - if test "$enable_lvs_64bit_stats" != "no"; then -- CPPFLAGS="$kernelinc" - IPVS_64BIT_STATS=Yes - ac_fn_c_check_decl "$LINENO" "IPVS_SVC_ATTR_STATS64" "ac_cv_have_decl_IPVS_SVC_ATTR_STATS64" "#include - " -@@ -7557,6 +7574,7 @@ - BUILD_OPTIONS="$BUILD_OPTIONS IPVS_64BIT_STATS" - fi - fi -+ CPPFLAGS="$SAV_CPPFLAGS" - else - IPVS_SUPPORT=No - fi -@@ -7587,7 +7605,8 @@ - BUILD_OPTIONS="$BUILD_OPTIONS VRRP_AUTH" - fi - -- CPPFLAGS="$kernelinc" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $kernelinc" - MACVLAN_SUPPORT=Yes - ac_fn_c_check_decl "$LINENO" "IFLA_MACVLAN_MODE" "ac_cv_have_decl_IFLA_MACVLAN_MODE" " - #include -@@ -7640,6 +7659,7 @@ - - BUILD_OPTIONS="$BUILD_OPTIONS VRRP_VMAC" - fi -+ CPPFLAGS="$SAV_CPPFLAGS" - fi - if test $VRRP_SUPPORT = Yes; then - WITH_VRRP_TRUE= -@@ -7713,7 +7733,8 @@ - - - # Introduced in Linux 2.6.19 --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - ac_fn_c_check_decl "$LINENO" "FRA_SRC" "ac_cv_have_decl_FRA_SRC" "#include - #include - " -@@ -7739,8 +7760,10 @@ - FIB_ROUTING_FALSE= - fi - -+CPPFLAGS="$SAV_CPPFLAGS" - --CPPFLAGS="$kernelinc" -+SAV_CPPFLAGS="$CPPFLAGS" -+CPPFLAGS="$CPPFLAGS $kernelinc" - if test ${MACVLAN_SUPPORT} = Yes; then - # Introduced in Linux 3.17 - ac_fn_c_check_decl "$LINENO" "IFLA_INET6_ADDR_GEN_MODE" "ac_cv_have_decl_IFLA_INET6_ADDR_GEN_MODE" " -@@ -7763,6 +7786,7 @@ - fi - - fi -+CPPFLAGS="$SAV_CPPFLAGS" - - SNMP_SUPPORT=No - SNMP_KEEPALIVED_SUPPORT=No -@@ -7883,8 +7907,10 @@ - NETSNMP_LIBS="$NETSNMP_LIBS_AGENT $NETSNMP_LIBS_EXT" - NETSNMP_CFLAGS="`${NETSNMP_CONFIG} --base-cflags` -DNETSNMP_NO_INLINE" - -- CFLAGS="${NETSNMP_CFLAGS}" -- LIBS="${NETSNMP_LIBS}" -+ SAV_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS ${NETSNMP_CFLAGS}" -+ SAV_LIBS="$LIBS" -+ LIBS="$LIBS ${NETSNMP_LIBS}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler supports flag \"${NETSNMP_CFLAGS} ${NETSNMP_LIBS}\" from Net-SNMP" >&5 - $as_echo_n "checking whether C compiler supports flag \"${NETSNMP_CFLAGS} ${NETSNMP_LIBS}\" from Net-SNMP... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -7928,7 +7954,8 @@ - - # check for net-snmp headers - # Some ancient distributions may miss header -- CPPFLAGS="$NETSNMP_CFLAGS" -+ SAV_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $NETSNMP_CFLAGS" - for ac_header in net-snmp/agent/agent_sysORTable.h net-snmp/agent/snmp_vars.h net-snmp/agent/util_funcs.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -8000,8 +8027,9 @@ - as_fn_error $? "CHECKER SNMP support requires checker" "$LINENO" 5 - fi - -- unset LIBS -- unset CFLAGS -+ CPPFLAGS="$SAV_CPPFLAGS" -+ CFLAGS="$SAV_CFLAGS" -+ LIBS="$SAV_LIBS" - fi - - if test $SNMP_SUPPORT = Yes; then -@@ -8183,7 +8211,8 @@ - - fi - --CFLAGS=-D_GNU_SOURCE -+SAV_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS -D_GNU_SOURCE" - ac_fn_c_check_decl "$LINENO" "CLONE_NEWNET" "ac_cv_have_decl_CLONE_NEWNET" "#include - " - if test "x$ac_cv_have_decl_CLONE_NEWNET" = xyes; then : -@@ -8207,6 +8236,7 @@ - fi - done - -+CFLAGS="$SAV_CFLAGS" - if test $ac_cv_have_decl_CLONE_NEWNET = yes; then - WITH_NAMESPACES_TRUE= - WITH_NAMESPACES_FALSE='#' diff --git a/fix-checksum-VRRPv3-unicast.patch b/fix-checksum-VRRPv3-unicast.patch new file mode 100644 index 0000000..2a228bf --- /dev/null +++ b/fix-checksum-VRRPv3-unicast.patch @@ -0,0 +1,43 @@ +From 67275d23aaef66c8b0ab854db93a1a3dd0e5124e Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Thu, 31 Aug 2017 08:56:37 +0100 +Subject: [PATCH] Fix calculation of checksum for VRRPv3 IPv4 unicast peers + +Alternate unicast peers were being sent adverts with the checksum +set to 0. The reason for this was that the checksum field was not +being set to 0 before the checksum calculation, hence causing the +calculated checksum to be 0 for the second, fourth, sixth etc +unicast peer. + +Signed-off-by: Quentin Armitage +--- + keepalived/vrrp/vrrp.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c +index a297c5e..0813a00 100644 +--- a/keepalived/vrrp/vrrp.c ++++ b/keepalived/vrrp/vrrp.c +@@ -965,6 +965,10 @@ vrrp_build_vrrp_v3(vrrp_t *vrrp, uint8_t prio, char *buffer) + hd->naddr = (uint8_t)((!LIST_ISEMPTY(vrrp->vip)) ? LIST_SIZE(vrrp->vip) : 0); + hd->v3.adver_int = htons((vrrp->adver_int / TIMER_CENTI_HZ) & 0x0FFF); /* interval in centiseconds, reserved bits zero */ + ++ /* For IPv4 to calculate the checksum, the value must start as 0. ++ * For IPv6, the kernel will update checksum field. */ ++ hd->chksum = 0; ++ + /* Family specific */ + if (vrrp->family == AF_INET) { + /* copy the ip addresses */ +@@ -994,8 +998,6 @@ vrrp_build_vrrp_v3(vrrp_t *vrrp, uint8_t prio, char *buffer) + ip6arr[i++] = ip_addr->u.sin6_addr; + } + } +- /* Kernel will update checksum field. let it be 0 now. */ +- hd->chksum = 0; + } + + return 0; +-- +2.9.5 + diff --git a/fix-conditional-compilation.patch b/fix-conditional-compilation.patch new file mode 100644 index 0000000..8a622f7 --- /dev/null +++ b/fix-conditional-compilation.patch @@ -0,0 +1,26 @@ +From 8228f6eea861ca293a868dee06c564756009785c Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Tue, 15 Aug 2017 20:38:42 +0100 +Subject: [PATCH] Fix sense of a conditional compilation check + +Signed-off-by: Quentin Armitage +--- + keepalived/vrrp/vrrp_scheduler.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/keepalived/vrrp/vrrp_scheduler.c b/keepalived/vrrp/vrrp_scheduler.c +index 48acd11..9d33a62 100644 +--- a/keepalived/vrrp/vrrp_scheduler.c ++++ b/keepalived/vrrp/vrrp_scheduler.c +@@ -661,7 +661,7 @@ vrrp_backup(vrrp_t * vrrp, char *buffer, ssize_t len) + + static void + vrrp_become_master(vrrp_t * vrrp, +-#ifdef _WITH_VRRP_AUTH_ ++#ifndef _WITH_VRRP_AUTH_ + __attribute__((unused)) + #endif + char *buffer, __attribute__((unused)) ssize_t len) +-- +2.9.5 + diff --git a/generate-readme.patch b/generate-readme.patch new file mode 100644 index 0000000..3f40028 --- /dev/null +++ b/generate-readme.patch @@ -0,0 +1,249 @@ +From 3b83f50634061216eda32a1dbc5601f1b69d7d60 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Fri, 1 Sep 2017 14:14:25 +0100 +Subject: [PATCH] Generate README from README.md + +Signed-off-by: Quentin Armitage +--- + .gitignore | 1 + + Makefile.am | 13 ++++++++ + Makefile.in | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- + 3 files changed, 100 insertions(+), 16 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index fecba88..c706ffb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,6 +8,9 @@ export DEBUG_CFLAGS + export DEBUG_CPPFLAGS + export DEBUG_LDFLAGS + ++edit = echo " EDIT $@"; \ ++ sed -e "/^\[\!\[/d" ++ + SUBDIRS = lib keepalived doc + + if BUILD_GENHASH +@@ -18,12 +21,22 @@ SUBDIRS += bin_install + + EXTRA_DIST = AUTHOR CONTRIBUTORS snap README.md + ++doc_DATA = README ++ ++MOSTLYCLEANFILES = README ++ + MAINTAINERCLEANFILES = @MAINTAINERCLEANFILES@ + ++README: $(srcdir)/README.md ++ @$(edit) '$(srcdir)/$@.md' >$@ ++ + distclean-local: + @rm -f aclocal.m4 ar-lib compile depcomp missing keepalived-$(VERSION).tar.gz config.log config.status + @rm -rf autom4te.cache + ++dist-hook: ++ @rm -f $(distdir)/README ++ + .PHONY: docker + docker: + docker build -t keepalived . +diff --git a/Makefile.in b/Makefile.in +index 896845a..9daefec 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -19,6 +19,7 @@ + # Keepalived OpenSource project. + # + # Copyright (C) 2001-2016 Alexandre Cassen, ++ + VPATH = @srcdir@ + am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ +@@ -132,6 +133,35 @@ am__can_run_installinfo = \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__uninstall_files_from_dir = { \ ++ test -z "$$files" \ ++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ ++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ ++ $(am__cd) "$$dir" && rm -f $$files; }; \ ++ } ++am__installdirs = "$(DESTDIR)$(docdir)" ++DATA = $(doc_DATA) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive + am__recursive_targets = \ +@@ -162,7 +192,7 @@ CTAGS = ctags + CSCOPE = cscope + DIST_SUBDIRS = lib keepalived doc genhash bin_install + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/keepalived.spec.in \ +- COPYING ChangeLog INSTALL TODO ar-lib compile depcomp \ ++ COPYING ChangeLog INSTALL README TODO ar-lib compile depcomp \ + install-sh missing + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) +@@ -314,8 +344,13 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ ++edit = echo " EDIT $@"; \ ++ sed -e "/^\[\!\[/d" ++ + SUBDIRS = lib keepalived doc $(am__append_1) bin_install + EXTRA_DIST = AUTHOR CONTRIBUTORS snap README.md ++doc_DATA = README ++MOSTLYCLEANFILES = README + DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + +@@ -357,6 +392,27 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) + $(am__aclocal_m4_deps): + keepalived.spec: $(top_builddir)/config.status $(srcdir)/keepalived.spec.in + cd $(top_builddir) && $(SHELL) ./config.status $@ ++install-docDATA: $(doc_DATA) ++ @$(NORMAL_INSTALL) ++ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ ++ if test -n "$$list"; then \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ ++ fi; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ ++ done ++ ++uninstall-docDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) + + # This directory's subdirectories are mostly independent; you can cd + # into them and run 'make' without going through this Makefile. +@@ -521,6 +577,9 @@ distdir: $(DISTFILES) + || exit 1; \ + fi; \ + done ++ $(MAKE) $(AM_MAKEFLAGS) \ ++ top_distdir="$(top_distdir)" distdir="$(distdir)" \ ++ dist-hook + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ +@@ -654,9 +713,12 @@ distcleancheck: distclean + exit 1; } >&2 + check-am: all-am + check: check-recursive +-all-am: Makefile ++all-am: Makefile $(DATA) + installdirs: installdirs-recursive + installdirs-am: ++ for dir in "$(DESTDIR)$(docdir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done + install: install-recursive + install-exec: install-exec-recursive + install-data: install-data-recursive +@@ -677,6 +739,7 @@ install-strip: + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi + mostlyclean-generic: ++ -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + + clean-generic: + +@@ -710,7 +773,7 @@ info: info-recursive + + info-am: + +-install-data-am: ++install-data-am: install-docDATA + + install-dvi: install-dvi-recursive + +@@ -756,25 +819,26 @@ ps: ps-recursive + + ps-am: + +-uninstall-am: ++uninstall-am: uninstall-docDATA + + .MAKE: $(am__recursive_targets) install-am install-strip + + .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-local cscope cscopelist-am ctags ctags-am dist dist-all \ +- dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \ +- dist-zip distcheck distclean distclean-generic distclean-local \ +- distclean-tags distcleancheck distdir distuninstallcheck dvi \ +- dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-dvi install-dvi-am \ +- install-exec install-exec-am install-html install-html-am \ +- install-info install-info-am install-man install-pdf \ +- install-pdf-am install-ps install-ps-am install-strip \ +- installcheck installcheck-am installdirs installdirs-am \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ +- uninstall-am ++ dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ ++ dist-xz dist-zip distcheck distclean distclean-generic \ ++ distclean-local distclean-tags distcleancheck distdir \ ++ distuninstallcheck dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am \ ++ install-docDATA install-dvi install-dvi-am install-exec \ ++ install-exec-am install-html install-html-am install-info \ ++ install-info-am install-man install-pdf install-pdf-am \ ++ install-ps install-ps-am install-strip installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ ++ pdf-am ps ps-am tags tags-am uninstall uninstall-am \ ++ uninstall-docDATA + + .PRECIOUS: Makefile + +@@ -783,10 +847,16 @@ export DEBUG_CFLAGS + export DEBUG_CPPFLAGS + export DEBUG_LDFLAGS + ++README: $(srcdir)/README.md ++ @$(edit) '$(srcdir)/$@.md' >$@ ++ + distclean-local: + @rm -f aclocal.m4 ar-lib compile depcomp missing keepalived-$(VERSION).tar.gz config.log config.status + @rm -rf autom4te.cache + ++dist-hook: ++ @rm -f $(distdir)/README ++ + .PHONY: docker + docker: + docker build -t keepalived . +-- +2.9.5 + diff --git a/keepalived.spec b/keepalived.spec index 5639d53..b01b217 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,8 +8,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 1.3.5 -Release: 3%{?dist} +Version: 1.3.6 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Group: System Environment/Daemons @@ -17,6 +17,11 @@ Group: System Environment/Daemons Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service +Patch0: generate-readme.patch +Patch1: fix-checksum-VRRPv3-unicast.patch +Patch2: fix-conditional-compilation.patch + + Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -48,6 +53,9 @@ infrastructures. %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure \ @@ -99,6 +107,9 @@ rm -rf %{buildroot} %{_mandir}/man8/keepalived.8* %changelog +* Mon Sep 11 2017 Ryan O'Hara - 1.3.6-1 +- Update to 1.3.6 (#1481471) + * Thu Aug 03 2017 Fedora Release Engineering - 1.3.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index de055d7..ee214c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-1.3.5.tar.gz) = ebd710167becd4b99b665877953d19477c11f1d1c736eb580a05dedd4946363b756553e20607f34aa6c35f57b7252d8a22287beedc316b62a745fccc4243a720 +SHA512 (keepalived-1.3.6.tar.gz) = 3182ab06836c0d0ca0dfc17d2eaa9031be71133de7f29f7608f841788ca6ff4002bbde7e8c8d99e898cfcd0b67f5158e4b50467b7863395149eafa38fec6c6de From 591faaae28c1c1cd1905ed9e3fc35349d0789d62 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 12 Sep 2017 16:01:33 -0600 Subject: [PATCH 04/72] Add --with-init=systemd to avoid build problems in chroot --- keepalived.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index b01b217..95dd531 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -63,7 +63,8 @@ infrastructures. %{?with_profile:--enable-profile} \ %{!?with_vrrp:--disable-vrrp} \ %{?with_snmp:--enable-snmp --enable-snmp-rfc} \ - %{?with_sha1:--enable-sha1} + %{?with_sha1:--enable-sha1} \ + --with-init=systemd %{__make} %{?_smp_mflags} STRIP=/bin/true %install From f60162b47c62a1f8f3002a3a7e368cb0bcf8c9ff Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 12 Sep 2017 16:01:33 -0600 Subject: [PATCH 05/72] Add --with-init=systemd to avoid build problems in chroot --- keepalived.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index b01b217..95dd531 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -63,7 +63,8 @@ infrastructures. %{?with_profile:--enable-profile} \ %{!?with_vrrp:--disable-vrrp} \ %{?with_snmp:--enable-snmp --enable-snmp-rfc} \ - %{?with_sha1:--enable-sha1} + %{?with_sha1:--enable-sha1} \ + --with-init=systemd %{__make} %{?_smp_mflags} STRIP=/bin/true %install From 9157eff06e490b6250c07f0deec194ab8a87e7b9 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 25 Oct 2017 10:00:55 -0500 Subject: [PATCH 06/72] Update to 1.3.9 (#1497576) --- .gitignore | 1 + fix-checksum-VRRPv3-unicast.patch | 43 ------ fix-conditional-compilation.patch | 26 ---- generate-readme.patch | 249 ------------------------------ keepalived.spec | 13 +- sources | 2 +- 6 files changed, 6 insertions(+), 328 deletions(-) delete mode 100644 fix-checksum-VRRPv3-unicast.patch delete mode 100644 fix-conditional-compilation.patch delete mode 100644 generate-readme.patch diff --git a/.gitignore b/.gitignore index fb24f24..54b00c8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /keepalived-1.3.2.tar.gz /keepalived-1.3.5.tar.gz /keepalived-1.3.6.tar.gz +/keepalived-1.3.9.tar.gz diff --git a/fix-checksum-VRRPv3-unicast.patch b/fix-checksum-VRRPv3-unicast.patch deleted file mode 100644 index 2a228bf..0000000 --- a/fix-checksum-VRRPv3-unicast.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 67275d23aaef66c8b0ab854db93a1a3dd0e5124e Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Thu, 31 Aug 2017 08:56:37 +0100 -Subject: [PATCH] Fix calculation of checksum for VRRPv3 IPv4 unicast peers - -Alternate unicast peers were being sent adverts with the checksum -set to 0. The reason for this was that the checksum field was not -being set to 0 before the checksum calculation, hence causing the -calculated checksum to be 0 for the second, fourth, sixth etc -unicast peer. - -Signed-off-by: Quentin Armitage ---- - keepalived/vrrp/vrrp.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c -index a297c5e..0813a00 100644 ---- a/keepalived/vrrp/vrrp.c -+++ b/keepalived/vrrp/vrrp.c -@@ -965,6 +965,10 @@ vrrp_build_vrrp_v3(vrrp_t *vrrp, uint8_t prio, char *buffer) - hd->naddr = (uint8_t)((!LIST_ISEMPTY(vrrp->vip)) ? LIST_SIZE(vrrp->vip) : 0); - hd->v3.adver_int = htons((vrrp->adver_int / TIMER_CENTI_HZ) & 0x0FFF); /* interval in centiseconds, reserved bits zero */ - -+ /* For IPv4 to calculate the checksum, the value must start as 0. -+ * For IPv6, the kernel will update checksum field. */ -+ hd->chksum = 0; -+ - /* Family specific */ - if (vrrp->family == AF_INET) { - /* copy the ip addresses */ -@@ -994,8 +998,6 @@ vrrp_build_vrrp_v3(vrrp_t *vrrp, uint8_t prio, char *buffer) - ip6arr[i++] = ip_addr->u.sin6_addr; - } - } -- /* Kernel will update checksum field. let it be 0 now. */ -- hd->chksum = 0; - } - - return 0; --- -2.9.5 - diff --git a/fix-conditional-compilation.patch b/fix-conditional-compilation.patch deleted file mode 100644 index 8a622f7..0000000 --- a/fix-conditional-compilation.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8228f6eea861ca293a868dee06c564756009785c Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Tue, 15 Aug 2017 20:38:42 +0100 -Subject: [PATCH] Fix sense of a conditional compilation check - -Signed-off-by: Quentin Armitage ---- - keepalived/vrrp/vrrp_scheduler.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/keepalived/vrrp/vrrp_scheduler.c b/keepalived/vrrp/vrrp_scheduler.c -index 48acd11..9d33a62 100644 ---- a/keepalived/vrrp/vrrp_scheduler.c -+++ b/keepalived/vrrp/vrrp_scheduler.c -@@ -661,7 +661,7 @@ vrrp_backup(vrrp_t * vrrp, char *buffer, ssize_t len) - - static void - vrrp_become_master(vrrp_t * vrrp, --#ifdef _WITH_VRRP_AUTH_ -+#ifndef _WITH_VRRP_AUTH_ - __attribute__((unused)) - #endif - char *buffer, __attribute__((unused)) ssize_t len) --- -2.9.5 - diff --git a/generate-readme.patch b/generate-readme.patch deleted file mode 100644 index 3f40028..0000000 --- a/generate-readme.patch +++ /dev/null @@ -1,249 +0,0 @@ -From 3b83f50634061216eda32a1dbc5601f1b69d7d60 Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Fri, 1 Sep 2017 14:14:25 +0100 -Subject: [PATCH] Generate README from README.md - -Signed-off-by: Quentin Armitage ---- - .gitignore | 1 + - Makefile.am | 13 ++++++++ - Makefile.in | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- - 3 files changed, 100 insertions(+), 16 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index fecba88..c706ffb 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,6 +8,9 @@ export DEBUG_CFLAGS - export DEBUG_CPPFLAGS - export DEBUG_LDFLAGS - -+edit = echo " EDIT $@"; \ -+ sed -e "/^\[\!\[/d" -+ - SUBDIRS = lib keepalived doc - - if BUILD_GENHASH -@@ -18,12 +21,22 @@ SUBDIRS += bin_install - - EXTRA_DIST = AUTHOR CONTRIBUTORS snap README.md - -+doc_DATA = README -+ -+MOSTLYCLEANFILES = README -+ - MAINTAINERCLEANFILES = @MAINTAINERCLEANFILES@ - -+README: $(srcdir)/README.md -+ @$(edit) '$(srcdir)/$@.md' >$@ -+ - distclean-local: - @rm -f aclocal.m4 ar-lib compile depcomp missing keepalived-$(VERSION).tar.gz config.log config.status - @rm -rf autom4te.cache - -+dist-hook: -+ @rm -f $(distdir)/README -+ - .PHONY: docker - docker: - docker build -t keepalived . -diff --git a/Makefile.in b/Makefile.in -index 896845a..9daefec 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -19,6 +19,7 @@ - # Keepalived OpenSource project. - # - # Copyright (C) 2001-2016 Alexandre Cassen, -+ - VPATH = @srcdir@ - am__is_gnu_make = { \ - if test -z '$(MAKELEVEL)'; then \ -@@ -132,6 +133,35 @@ am__can_run_installinfo = \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -+am__install_max = 40 -+am__nobase_strip_setup = \ -+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -+am__nobase_strip = \ -+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -+am__nobase_list = $(am__nobase_strip_setup); \ -+ for p in $$list; do echo "$$p $$p"; done | \ -+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ -+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ -+ if (++n[$$2] == $(am__install_max)) \ -+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ -+ END { for (dir in files) print dir, files[dir] }' -+am__base_list = \ -+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ -+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } -+am__installdirs = "$(DESTDIR)$(docdir)" -+DATA = $(doc_DATA) - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive - am__recursive_targets = \ -@@ -162,7 +192,7 @@ CTAGS = ctags - CSCOPE = cscope - DIST_SUBDIRS = lib keepalived doc genhash bin_install - am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/keepalived.spec.in \ -- COPYING ChangeLog INSTALL TODO ar-lib compile depcomp \ -+ COPYING ChangeLog INSTALL README TODO ar-lib compile depcomp \ - install-sh missing - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) -@@ -314,8 +344,13 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -+edit = echo " EDIT $@"; \ -+ sed -e "/^\[\!\[/d" -+ - SUBDIRS = lib keepalived doc $(am__append_1) bin_install - EXTRA_DIST = AUTHOR CONTRIBUTORS snap README.md -+doc_DATA = README -+MOSTLYCLEANFILES = README - DISTCHECK_CONFIGURE_FLAGS = \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) - -@@ -357,6 +392,27 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) - $(am__aclocal_m4_deps): - keepalived.spec: $(top_builddir)/config.status $(srcdir)/keepalived.spec.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -+install-docDATA: $(doc_DATA) -+ @$(NORMAL_INSTALL) -+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ -+ if test -n "$$list"; then \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ -+ fi; \ -+ for p in $$list; do \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ echo "$$d$$p"; \ -+ done | $(am__base_list) | \ -+ while read files; do \ -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ -+ $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ -+ done -+ -+uninstall-docDATA: -+ @$(NORMAL_UNINSTALL) -+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ -+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -+ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) - - # This directory's subdirectories are mostly independent; you can cd - # into them and run 'make' without going through this Makefile. -@@ -521,6 +577,9 @@ distdir: $(DISTFILES) - || exit 1; \ - fi; \ - done -+ $(MAKE) $(AM_MAKEFLAGS) \ -+ top_distdir="$(top_distdir)" distdir="$(distdir)" \ -+ dist-hook - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ -@@ -654,9 +713,12 @@ distcleancheck: distclean - exit 1; } >&2 - check-am: all-am - check: check-recursive --all-am: Makefile -+all-am: Makefile $(DATA) - installdirs: installdirs-recursive - installdirs-am: -+ for dir in "$(DESTDIR)$(docdir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -677,6 +739,7 @@ install-strip: - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi - mostlyclean-generic: -+ -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) - - clean-generic: - -@@ -710,7 +773,7 @@ info: info-recursive - - info-am: - --install-data-am: -+install-data-am: install-docDATA - - install-dvi: install-dvi-recursive - -@@ -756,25 +819,26 @@ ps: ps-recursive - - ps-am: - --uninstall-am: -+uninstall-am: uninstall-docDATA - - .MAKE: $(am__recursive_targets) install-am install-strip - - .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-am clean clean-cscope clean-generic \ - clean-local cscope cscopelist-am ctags ctags-am dist dist-all \ -- dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \ -- dist-zip distcheck distclean distclean-generic distclean-local \ -- distclean-tags distcleancheck distdir distuninstallcheck dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-ps install-ps-am install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ -- uninstall-am -+ dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ -+ dist-xz dist-zip distcheck distclean distclean-generic \ -+ distclean-local distclean-tags distcleancheck distdir \ -+ distuninstallcheck dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am \ -+ install-docDATA install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ -+ pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-docDATA - - .PRECIOUS: Makefile - -@@ -783,10 +847,16 @@ export DEBUG_CFLAGS - export DEBUG_CPPFLAGS - export DEBUG_LDFLAGS - -+README: $(srcdir)/README.md -+ @$(edit) '$(srcdir)/$@.md' >$@ -+ - distclean-local: - @rm -f aclocal.m4 ar-lib compile depcomp missing keepalived-$(VERSION).tar.gz config.log config.status - @rm -rf autom4te.cache - -+dist-hook: -+ @rm -f $(distdir)/README -+ - .PHONY: docker - docker: - docker build -t keepalived . --- -2.9.5 - diff --git a/keepalived.spec b/keepalived.spec index 95dd531..a551779 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,7 +8,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 1.3.6 +Version: 1.3.9 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -17,11 +17,6 @@ Group: System Environment/Daemons Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service -Patch0: generate-readme.patch -Patch1: fix-checksum-VRRPv3-unicast.patch -Patch2: fix-conditional-compilation.patch - - Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -53,9 +48,6 @@ infrastructures. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %configure \ @@ -108,6 +100,9 @@ rm -rf %{buildroot} %{_mandir}/man8/keepalived.8* %changelog +* Wed Oct 25 2017 Ryan O'Hara - 1.3.9-1 +- Update to 1.3.9 (#1497576) + * Mon Sep 11 2017 Ryan O'Hara - 1.3.6-1 - Update to 1.3.6 (#1481471) diff --git a/sources b/sources index ee214c4..00333ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-1.3.6.tar.gz) = 3182ab06836c0d0ca0dfc17d2eaa9031be71133de7f29f7608f841788ca6ff4002bbde7e8c8d99e898cfcd0b67f5158e4b50467b7863395149eafa38fec6c6de +SHA512 (keepalived-1.3.9.tar.gz) = 283bfb35052c8f742050c03ce1b24c3db19fb43fbee9307b50ae719b5d06e461dfa4fda3a167afddd2aae216a97f6e84f79c5f0bdbe5c439f339b0f41fa83cd7 From cf7647208b809e833d3ec42bbfc006f9927faea5 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 25 Oct 2017 10:00:55 -0500 Subject: [PATCH 07/72] Update to 1.3.9 (#1497576) --- .gitignore | 1 + fix-checksum-VRRPv3-unicast.patch | 43 ------ fix-conditional-compilation.patch | 26 ---- generate-readme.patch | 249 ------------------------------ keepalived.spec | 13 +- sources | 2 +- 6 files changed, 6 insertions(+), 328 deletions(-) delete mode 100644 fix-checksum-VRRPv3-unicast.patch delete mode 100644 fix-conditional-compilation.patch delete mode 100644 generate-readme.patch diff --git a/.gitignore b/.gitignore index fb24f24..54b00c8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /keepalived-1.3.2.tar.gz /keepalived-1.3.5.tar.gz /keepalived-1.3.6.tar.gz +/keepalived-1.3.9.tar.gz diff --git a/fix-checksum-VRRPv3-unicast.patch b/fix-checksum-VRRPv3-unicast.patch deleted file mode 100644 index 2a228bf..0000000 --- a/fix-checksum-VRRPv3-unicast.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 67275d23aaef66c8b0ab854db93a1a3dd0e5124e Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Thu, 31 Aug 2017 08:56:37 +0100 -Subject: [PATCH] Fix calculation of checksum for VRRPv3 IPv4 unicast peers - -Alternate unicast peers were being sent adverts with the checksum -set to 0. The reason for this was that the checksum field was not -being set to 0 before the checksum calculation, hence causing the -calculated checksum to be 0 for the second, fourth, sixth etc -unicast peer. - -Signed-off-by: Quentin Armitage ---- - keepalived/vrrp/vrrp.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c -index a297c5e..0813a00 100644 ---- a/keepalived/vrrp/vrrp.c -+++ b/keepalived/vrrp/vrrp.c -@@ -965,6 +965,10 @@ vrrp_build_vrrp_v3(vrrp_t *vrrp, uint8_t prio, char *buffer) - hd->naddr = (uint8_t)((!LIST_ISEMPTY(vrrp->vip)) ? LIST_SIZE(vrrp->vip) : 0); - hd->v3.adver_int = htons((vrrp->adver_int / TIMER_CENTI_HZ) & 0x0FFF); /* interval in centiseconds, reserved bits zero */ - -+ /* For IPv4 to calculate the checksum, the value must start as 0. -+ * For IPv6, the kernel will update checksum field. */ -+ hd->chksum = 0; -+ - /* Family specific */ - if (vrrp->family == AF_INET) { - /* copy the ip addresses */ -@@ -994,8 +998,6 @@ vrrp_build_vrrp_v3(vrrp_t *vrrp, uint8_t prio, char *buffer) - ip6arr[i++] = ip_addr->u.sin6_addr; - } - } -- /* Kernel will update checksum field. let it be 0 now. */ -- hd->chksum = 0; - } - - return 0; --- -2.9.5 - diff --git a/fix-conditional-compilation.patch b/fix-conditional-compilation.patch deleted file mode 100644 index 8a622f7..0000000 --- a/fix-conditional-compilation.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8228f6eea861ca293a868dee06c564756009785c Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Tue, 15 Aug 2017 20:38:42 +0100 -Subject: [PATCH] Fix sense of a conditional compilation check - -Signed-off-by: Quentin Armitage ---- - keepalived/vrrp/vrrp_scheduler.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/keepalived/vrrp/vrrp_scheduler.c b/keepalived/vrrp/vrrp_scheduler.c -index 48acd11..9d33a62 100644 ---- a/keepalived/vrrp/vrrp_scheduler.c -+++ b/keepalived/vrrp/vrrp_scheduler.c -@@ -661,7 +661,7 @@ vrrp_backup(vrrp_t * vrrp, char *buffer, ssize_t len) - - static void - vrrp_become_master(vrrp_t * vrrp, --#ifdef _WITH_VRRP_AUTH_ -+#ifndef _WITH_VRRP_AUTH_ - __attribute__((unused)) - #endif - char *buffer, __attribute__((unused)) ssize_t len) --- -2.9.5 - diff --git a/generate-readme.patch b/generate-readme.patch deleted file mode 100644 index 3f40028..0000000 --- a/generate-readme.patch +++ /dev/null @@ -1,249 +0,0 @@ -From 3b83f50634061216eda32a1dbc5601f1b69d7d60 Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Fri, 1 Sep 2017 14:14:25 +0100 -Subject: [PATCH] Generate README from README.md - -Signed-off-by: Quentin Armitage ---- - .gitignore | 1 + - Makefile.am | 13 ++++++++ - Makefile.in | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- - 3 files changed, 100 insertions(+), 16 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index fecba88..c706ffb 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,6 +8,9 @@ export DEBUG_CFLAGS - export DEBUG_CPPFLAGS - export DEBUG_LDFLAGS - -+edit = echo " EDIT $@"; \ -+ sed -e "/^\[\!\[/d" -+ - SUBDIRS = lib keepalived doc - - if BUILD_GENHASH -@@ -18,12 +21,22 @@ SUBDIRS += bin_install - - EXTRA_DIST = AUTHOR CONTRIBUTORS snap README.md - -+doc_DATA = README -+ -+MOSTLYCLEANFILES = README -+ - MAINTAINERCLEANFILES = @MAINTAINERCLEANFILES@ - -+README: $(srcdir)/README.md -+ @$(edit) '$(srcdir)/$@.md' >$@ -+ - distclean-local: - @rm -f aclocal.m4 ar-lib compile depcomp missing keepalived-$(VERSION).tar.gz config.log config.status - @rm -rf autom4te.cache - -+dist-hook: -+ @rm -f $(distdir)/README -+ - .PHONY: docker - docker: - docker build -t keepalived . -diff --git a/Makefile.in b/Makefile.in -index 896845a..9daefec 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -19,6 +19,7 @@ - # Keepalived OpenSource project. - # - # Copyright (C) 2001-2016 Alexandre Cassen, -+ - VPATH = @srcdir@ - am__is_gnu_make = { \ - if test -z '$(MAKELEVEL)'; then \ -@@ -132,6 +133,35 @@ am__can_run_installinfo = \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -+am__install_max = 40 -+am__nobase_strip_setup = \ -+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -+am__nobase_strip = \ -+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -+am__nobase_list = $(am__nobase_strip_setup); \ -+ for p in $$list; do echo "$$p $$p"; done | \ -+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ -+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ -+ if (++n[$$2] == $(am__install_max)) \ -+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ -+ END { for (dir in files) print dir, files[dir] }' -+am__base_list = \ -+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ -+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -+am__uninstall_files_from_dir = { \ -+ test -z "$$files" \ -+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ -+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ -+ $(am__cd) "$$dir" && rm -f $$files; }; \ -+ } -+am__installdirs = "$(DESTDIR)$(docdir)" -+DATA = $(doc_DATA) - RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive - am__recursive_targets = \ -@@ -162,7 +192,7 @@ CTAGS = ctags - CSCOPE = cscope - DIST_SUBDIRS = lib keepalived doc genhash bin_install - am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/keepalived.spec.in \ -- COPYING ChangeLog INSTALL TODO ar-lib compile depcomp \ -+ COPYING ChangeLog INSTALL README TODO ar-lib compile depcomp \ - install-sh missing - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) -@@ -314,8 +344,13 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ -+edit = echo " EDIT $@"; \ -+ sed -e "/^\[\!\[/d" -+ - SUBDIRS = lib keepalived doc $(am__append_1) bin_install - EXTRA_DIST = AUTHOR CONTRIBUTORS snap README.md -+doc_DATA = README -+MOSTLYCLEANFILES = README - DISTCHECK_CONFIGURE_FLAGS = \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) - -@@ -357,6 +392,27 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) - $(am__aclocal_m4_deps): - keepalived.spec: $(top_builddir)/config.status $(srcdir)/keepalived.spec.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -+install-docDATA: $(doc_DATA) -+ @$(NORMAL_INSTALL) -+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ -+ if test -n "$$list"; then \ -+ echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ -+ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ -+ fi; \ -+ for p in $$list; do \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ echo "$$d$$p"; \ -+ done | $(am__base_list) | \ -+ while read files; do \ -+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ -+ $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ -+ done -+ -+uninstall-docDATA: -+ @$(NORMAL_UNINSTALL) -+ @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ -+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -+ dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) - - # This directory's subdirectories are mostly independent; you can cd - # into them and run 'make' without going through this Makefile. -@@ -521,6 +577,9 @@ distdir: $(DISTFILES) - || exit 1; \ - fi; \ - done -+ $(MAKE) $(AM_MAKEFLAGS) \ -+ top_distdir="$(top_distdir)" distdir="$(distdir)" \ -+ dist-hook - -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -755 \ - -exec chmod u+rwx,go+rx {} \; -o \ -@@ -654,9 +713,12 @@ distcleancheck: distclean - exit 1; } >&2 - check-am: all-am - check: check-recursive --all-am: Makefile -+all-am: Makefile $(DATA) - installdirs: installdirs-recursive - installdirs-am: -+ for dir in "$(DESTDIR)$(docdir)"; do \ -+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -+ done - install: install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive -@@ -677,6 +739,7 @@ install-strip: - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi - mostlyclean-generic: -+ -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) - - clean-generic: - -@@ -710,7 +773,7 @@ info: info-recursive - - info-am: - --install-data-am: -+install-data-am: install-docDATA - - install-dvi: install-dvi-recursive - -@@ -756,25 +819,26 @@ ps: ps-recursive - - ps-am: - --uninstall-am: -+uninstall-am: uninstall-docDATA - - .MAKE: $(am__recursive_targets) install-am install-strip - - .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-am clean clean-cscope clean-generic \ - clean-local cscope cscopelist-am ctags ctags-am dist dist-all \ -- dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \ -- dist-zip distcheck distclean distclean-generic distclean-local \ -- distclean-tags distcleancheck distdir distuninstallcheck dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-data install-data-am install-dvi install-dvi-am \ -- install-exec install-exec-am install-html install-html-am \ -- install-info install-info-am install-man install-pdf \ -- install-pdf-am install-ps install-ps-am install-strip \ -- installcheck installcheck-am installdirs installdirs-am \ -- maintainer-clean maintainer-clean-generic mostlyclean \ -- mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ -- uninstall-am -+ dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ -+ dist-xz dist-zip distcheck distclean distclean-generic \ -+ distclean-local distclean-tags distcleancheck distdir \ -+ distuninstallcheck dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am \ -+ install-docDATA install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ -+ pdf-am ps ps-am tags tags-am uninstall uninstall-am \ -+ uninstall-docDATA - - .PRECIOUS: Makefile - -@@ -783,10 +847,16 @@ export DEBUG_CFLAGS - export DEBUG_CPPFLAGS - export DEBUG_LDFLAGS - -+README: $(srcdir)/README.md -+ @$(edit) '$(srcdir)/$@.md' >$@ -+ - distclean-local: - @rm -f aclocal.m4 ar-lib compile depcomp missing keepalived-$(VERSION).tar.gz config.log config.status - @rm -rf autom4te.cache - -+dist-hook: -+ @rm -f $(distdir)/README -+ - .PHONY: docker - docker: - docker build -t keepalived . --- -2.9.5 - diff --git a/keepalived.spec b/keepalived.spec index 95dd531..a551779 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,7 +8,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 1.3.6 +Version: 1.3.9 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -17,11 +17,6 @@ Group: System Environment/Daemons Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service -Patch0: generate-readme.patch -Patch1: fix-checksum-VRRPv3-unicast.patch -Patch2: fix-conditional-compilation.patch - - Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -53,9 +48,6 @@ infrastructures. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %configure \ @@ -108,6 +100,9 @@ rm -rf %{buildroot} %{_mandir}/man8/keepalived.8* %changelog +* Wed Oct 25 2017 Ryan O'Hara - 1.3.9-1 +- Update to 1.3.9 (#1497576) + * Mon Sep 11 2017 Ryan O'Hara - 1.3.6-1 - Update to 1.3.6 (#1481471) diff --git a/sources b/sources index ee214c4..00333ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-1.3.6.tar.gz) = 3182ab06836c0d0ca0dfc17d2eaa9031be71133de7f29f7608f841788ca6ff4002bbde7e8c8d99e898cfcd0b67f5158e4b50467b7863395149eafa38fec6c6de +SHA512 (keepalived-1.3.9.tar.gz) = 283bfb35052c8f742050c03ce1b24c3db19fb43fbee9307b50ae719b5d06e461dfa4fda3a167afddd2aae216a97f6e84f79c5f0bdbe5c439f339b0f41fa83cd7 From 026eed3599dfaa6b77e70553a93eb67393939138 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Fri, 5 Jan 2018 10:53:44 -0600 Subject: [PATCH 08/72] Update to 1.4.0 (#1529802) --- .gitignore | 1 + keepalived.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 54b00c8..2002669 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /keepalived-1.3.5.tar.gz /keepalived-1.3.6.tar.gz /keepalived-1.3.9.tar.gz +/keepalived-1.4.0.tar.gz diff --git a/keepalived.spec b/keepalived.spec index a551779..53d2151 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,7 +8,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 1.3.9 +Version: 1.4.0 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -100,6 +100,9 @@ rm -rf %{buildroot} %{_mandir}/man8/keepalived.8* %changelog +* Fri Jan 05 2018 Ryan O'Hara - 1.4.0-1 +- Update to 1.4.0 (#1529802) + * Wed Oct 25 2017 Ryan O'Hara - 1.3.9-1 - Update to 1.3.9 (#1497576) diff --git a/sources b/sources index 00333ed..d3143ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-1.3.9.tar.gz) = 283bfb35052c8f742050c03ce1b24c3db19fb43fbee9307b50ae719b5d06e461dfa4fda3a167afddd2aae216a97f6e84f79c5f0bdbe5c439f339b0f41fa83cd7 +SHA512 (keepalived-1.4.0.tar.gz) = 485eda5912d68663f011b8e79263ce1e38ed785919055b113536f63aab52c0d5f581a9ab1951c7f62362ac0a68ee921efc41934a4e535d6df7e59249ef32d6d3 From 23f2285cd95b876c2e0a0e4fc9936a4ef9d61e8c Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 29 Jan 2018 11:49:05 -0600 Subject: [PATCH 09/72] Update to 1.4.1 (#1539269) --- .gitignore | 1 + keepalived.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2002669..074351f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /keepalived-1.3.6.tar.gz /keepalived-1.3.9.tar.gz /keepalived-1.4.0.tar.gz +/keepalived-1.4.1.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 53d2151..1c69884 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,7 +8,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 1.4.0 +Version: 1.4.1 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -100,6 +100,9 @@ rm -rf %{buildroot} %{_mandir}/man8/keepalived.8* %changelog +* Mon Jan 29 2018 Ryan O'Hara - 1.4.1-1 +- Update to 1.4.1 (#1539269) + * Fri Jan 05 2018 Ryan O'Hara - 1.4.0-1 - Update to 1.4.0 (#1529802) diff --git a/sources b/sources index d3143ff..9786635 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-1.4.0.tar.gz) = 485eda5912d68663f011b8e79263ce1e38ed785919055b113536f63aab52c0d5f581a9ab1951c7f62362ac0a68ee921efc41934a4e535d6df7e59249ef32d6d3 +SHA512 (keepalived-1.4.1.tar.gz) = fa951d6605a6e3d0ecb5c964681836884b15395be36d0cab81ac0d91355a84c805fc2f7eb3706a79ed4afff59df566b0e15d3ccceda8e258573e53bc12afa244 From 13ac177343434bbdc7f5693f81a913333a96cfa6 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:35:56 +0100 Subject: [PATCH 10/72] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- keepalived.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 1c69884..775da25 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -21,7 +21,6 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %{with snmp} BuildRequires: net-snmp-devel %endif From d1d6487c611d244344e6eb7459376c82f0b29d8e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:16:40 +0100 Subject: [PATCH 11/72] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- keepalived.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/keepalived.spec b/keepalived.spec index 775da25..528ef9b 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -66,9 +66,6 @@ rm -rf %{buildroot}%{_sysconfdir}/keepalived/samples/ %{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/keepalived.service mkdir -p %{buildroot}%{_libexecdir}/keepalived -%clean -rm -rf %{buildroot} - %post %systemd_post keepalived.service From 6f5d5e40cd98ff1d10dd59f5dbd2269ee398115a Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Fri, 23 Feb 2018 08:42:34 -0600 Subject: [PATCH 12/72] Add BuildRequires gcc --- keepalived.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/keepalived.spec b/keepalived.spec index 528ef9b..9527193 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -24,6 +24,7 @@ Requires(postun): systemd %if %{with snmp} BuildRequires: net-snmp-devel %endif +BuildRequires: gcc BuildRequires: systemd-units BuildRequires: openssl-devel BuildRequires: libnl3-devel From c547ab1223fba677d7c906dd062c0e83e48e4a82 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 7 Mar 2018 10:24:56 -0600 Subject: [PATCH 13/72] Update to 1.4.2 (#1539269) --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 9527193..72497b2 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,7 +8,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 1.4.1 +Version: 1.4.2 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -97,6 +97,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Mar 07 2018 Ryan O'Hara - 1.4.2-1 +- Update to 1.4.2 (#1539269) + * Mon Jan 29 2018 Ryan O'Hara - 1.4.1-1 - Update to 1.4.1 (#1539269) From bf78e8c58a0b5e04180e013c076f0dd0fe1384d2 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 7 Mar 2018 10:28:22 -0600 Subject: [PATCH 14/72] Add keepalived-1.4.2 source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 074351f..1568284 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /keepalived-1.3.9.tar.gz /keepalived-1.4.0.tar.gz /keepalived-1.4.1.tar.gz +/keepalived-1.4.2.tar.gz diff --git a/sources b/sources index 9786635..d9fd221 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-1.4.1.tar.gz) = fa951d6605a6e3d0ecb5c964681836884b15395be36d0cab81ac0d91355a84c805fc2f7eb3706a79ed4afff59df566b0e15d3ccceda8e258573e53bc12afa244 +SHA512 (keepalived-1.4.2.tar.gz) = 325282daea9c6dc9ec38ca405fcba3e55c07f6358c59fae5dc3422c0f987197658d39cda3ed6523ea29a356d74d09fe57e62411bd7498f5ef086cf191eb42fe3 From a2d5f0cef2a5d76b9b0095aee5c84bca9f270bfa Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Thu, 19 Apr 2018 10:34:12 -0500 Subject: [PATCH 15/72] Update to 1.4.3 (#1565388) --- .gitignore | 1 + keepalived.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1568284..9074737 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /keepalived-1.4.0.tar.gz /keepalived-1.4.1.tar.gz /keepalived-1.4.2.tar.gz +/keepalived-1.4.3.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 72497b2..6cb8045 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,7 +8,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -97,6 +97,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Apr 19 2018 Ryan O'Hara - 1.4.3-1 +- Update to 1.4.3 (#1565388) + * Wed Mar 07 2018 Ryan O'Hara - 1.4.2-1 - Update to 1.4.2 (#1539269) diff --git a/sources b/sources index d9fd221..765a6a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-1.4.2.tar.gz) = 325282daea9c6dc9ec38ca405fcba3e55c07f6358c59fae5dc3422c0f987197658d39cda3ed6523ea29a356d74d09fe57e62411bd7498f5ef086cf191eb42fe3 +SHA512 (keepalived-1.4.3.tar.gz) = bbf734123edeee4c807788e8db626975d7b626003ce2a6b901fbac3b7985b11c222db78e2806a7e7211980a748a6a302847736b14f3f8ed32b7337dbde6f4eac From 80e6f7a4117fe87045ead655ecaa373f4c1e2675 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Thu, 10 May 2018 08:27:28 -0500 Subject: [PATCH 16/72] Update to 1.4.4 (#1576138) --- .gitignore | 1 + keepalived.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9074737..c0e255e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /keepalived-1.4.1.tar.gz /keepalived-1.4.2.tar.gz /keepalived-1.4.3.tar.gz +/keepalived-1.4.4.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 6cb8045..450f444 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,7 +8,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 1.4.3 +Version: 1.4.4 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -97,6 +97,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu May 10 2019 Ryan O'Hara - 1.4.4-1 +- Update to 1.4.4 (#1576138) + * Thu Apr 19 2018 Ryan O'Hara - 1.4.3-1 - Update to 1.4.3 (#1565388) diff --git a/sources b/sources index 765a6a2..ed4807f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-1.4.3.tar.gz) = bbf734123edeee4c807788e8db626975d7b626003ce2a6b901fbac3b7985b11c222db78e2806a7e7211980a748a6a302847736b14f3f8ed32b7337dbde6f4eac +SHA512 (keepalived-1.4.4.tar.gz) = 93eae899e83c3f6efcfb4296a6f9889e7eae2883c085d7d5fa5573dfa111c82540575c708a87d29974e1e0fa778ad5271be067d9258ab438790f58c169efc391 From f03712cfbeeeb8877a20d8e2a0d241d118d97597 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 2 Jul 2018 10:28:50 -0500 Subject: [PATCH 17/72] Update to 1.4.5 --- .gitignore | 1 + keepalived.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c0e255e..3839d97 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /keepalived-1.4.2.tar.gz /keepalived-1.4.3.tar.gz /keepalived-1.4.4.tar.gz +/keepalived-1.4.5.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 450f444..9bd402f 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,7 +8,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -97,7 +97,10 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog -* Thu May 10 2019 Ryan O'Hara - 1.4.4-1 +* Mon Jul 02 2018 Ryan O'Hara - 1.4.5-1 +- Update to 1.4.5 + +* Thu May 10 2018 Ryan O'Hara - 1.4.4-1 - Update to 1.4.4 (#1576138) * Thu Apr 19 2018 Ryan O'Hara - 1.4.3-1 diff --git a/sources b/sources index ed4807f..f97e69a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-1.4.4.tar.gz) = 93eae899e83c3f6efcfb4296a6f9889e7eae2883c085d7d5fa5573dfa111c82540575c708a87d29974e1e0fa778ad5271be067d9258ab438790f58c169efc391 +SHA512 (keepalived-1.4.5.tar.gz) = 0786ecbef6dd840c8852f619cad1ea6a9c98b86a6c26bc6b104b38825212af689fbeb45148404b94dc6e3cdf7626cb6b2c902685b03586d05177578dff957bd5 From 323bf2579ec482d8c407c8695bec1c78b27f42d1 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 3 Jul 2018 09:49:08 -0500 Subject: [PATCH 18/72] Update to 2.0.5 (#1576138) --- .gitignore | 1 + keepalived.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3839d97..2b11590 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /keepalived-1.4.3.tar.gz /keepalived-1.4.4.tar.gz /keepalived-1.4.5.tar.gz +/keepalived-2.0.5.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 9bd402f..e071c26 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,7 +8,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 1.4.5 +Version: 2.0.5 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -97,6 +97,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Jul 03 2018 Ryan O'Hara - 2.0.5-1 +- Update to 2.0.5 (#1576138) + * Mon Jul 02 2018 Ryan O'Hara - 1.4.5-1 - Update to 1.4.5 diff --git a/sources b/sources index f97e69a..58bcd43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-1.4.5.tar.gz) = 0786ecbef6dd840c8852f619cad1ea6a9c98b86a6c26bc6b104b38825212af689fbeb45148404b94dc6e3cdf7626cb6b2c902685b03586d05177578dff957bd5 +SHA512 (keepalived-2.0.5.tar.gz) = f263ad2318787b18870820b80b6acd202cb9203e34d71c1664bc54ebdcef93b8823a6cdd00608f132bc0a10dd01acd1949e932f5dee33f937eea27fc82039362 From 634766574c8a09d8c577b7bcf07fc6a0c6c8f270 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:29:41 -0500 Subject: [PATCH 19/72] Remove needless use of %defattr --- keepalived.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index e071c26..0bdb989 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -77,7 +77,6 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %systemd_postun_with_restart keepalived.service %files -%defattr(-,root,root,-) %attr(0755,root,root) %{_sbindir}/keepalived %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/keepalived %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/keepalived/keepalived.conf From 2f0e224822e720efe19808c6d118a654d4a1e736 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 06:58:55 +0000 Subject: [PATCH 20/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 0bdb989..e10e2cd 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,7 +9,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Group: System Environment/Daemons @@ -96,6 +96,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jul 03 2018 Ryan O'Hara - 2.0.5-1 - Update to 2.0.5 (#1576138) From 351f65b591018cdb9a9cef26ad882abc0f4a8894 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 24 Jul 2018 14:44:59 -0700 Subject: [PATCH 21/72] Rebuild for new net-snmp --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index e10e2cd..9c41e73 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,7 +9,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Group: System Environment/Daemons @@ -96,6 +96,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Jul 24 2018 Adam Williamson - 2.0.5-3 +- Rebuild for new net-snmp + * Fri Jul 13 2018 Fedora Release Engineering - 2.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From dcb381c23372507fb8ce99044206a04f97675edc Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 25 Jul 2018 10:15:37 -0500 Subject: [PATCH 22/72] Update to 2.0.6 (#1576138) --- .gitignore | 1 + keepalived.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2b11590..a766dc5 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /keepalived-1.4.4.tar.gz /keepalived-1.4.5.tar.gz /keepalived-2.0.5.tar.gz +/keepalived-2.0.6.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 9c41e73..0a42cb9 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,8 +8,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.0.5 -Release: 3%{?dist} +Version: 2.0.6 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Group: System Environment/Daemons @@ -96,6 +96,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Jul 25 2018 Ryan O'Hara - 2.0.6-1 +- Update to 2.0.6 (#1576138) + * Tue Jul 24 2018 Adam Williamson - 2.0.5-3 - Rebuild for new net-snmp diff --git a/sources b/sources index 58bcd43..e043d10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.0.5.tar.gz) = f263ad2318787b18870820b80b6acd202cb9203e34d71c1664bc54ebdcef93b8823a6cdd00608f132bc0a10dd01acd1949e932f5dee33f937eea27fc82039362 +SHA512 (keepalived-2.0.6.tar.gz) = 9e340825b443c02ba1afe27d9ad97afc34722d80a27fc9a5f934157ec04ff15cef0a82b68c8917712415dc7ef079e27af88ac29a372ef42c87fcc9f9b8ab751e From ee2512c93d52acf575d19bf793520fe539240a2e Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 26 Nov 2018 11:48:53 -0600 Subject: [PATCH 23/72] Update to 2.0.10 --- .gitignore | 1 + keepalived.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a766dc5..4080a2c 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /keepalived-1.4.5.tar.gz /keepalived-2.0.5.tar.gz /keepalived-2.0.6.tar.gz +/keepalived-2.0.10.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 0a42cb9..1de2cd2 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,7 +8,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.0.6 +Version: 2.0.10 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -96,6 +96,13 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Mon Nov 26 2018 Ryan O'Hara - 2.0.10-1 +- Update to 2.0.10 +- Fix improper pathname validation (#1651864, CVE-2018-19044) +- Fix insecure permissions when creating temporary files (#1651868, CVE-2018-19045) +- Fix insecure use of temporary files (#1651870, CVE-2018-19046) +- Fix buffer overflow when parsing HTTP status codes (#1651873, CVE-2018-19047) + * Wed Jul 25 2018 Ryan O'Hara - 2.0.6-1 - Update to 2.0.6 (#1576138) diff --git a/sources b/sources index e043d10..5aaafd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.0.6.tar.gz) = 9e340825b443c02ba1afe27d9ad97afc34722d80a27fc9a5f934157ec04ff15cef0a82b68c8917712415dc7ef079e27af88ac29a372ef42c87fcc9f9b8ab751e +SHA512 (keepalived-2.0.10.tar.gz) = e76562e5d9d9dc945f0c9702f5f3c6be6acd8c66a59aea1f8287810a2eeb4c65b6cb7e1cd84c1e478978f7db94dba7f8a918ca4847f90a6554b20d757addd2db From d2743216657469f61f95ba0774d342b2f5e1090c Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 9 Jan 2019 09:59:45 -0600 Subject: [PATCH 24/72] Update to 2.0.11 --- .gitignore | 1 + keepalived.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4080a2c..43b57d5 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /keepalived-2.0.5.tar.gz /keepalived-2.0.6.tar.gz /keepalived-2.0.10.tar.gz +/keepalived-2.0.11.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 1de2cd2..c78297e 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,7 +8,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.0.10 +Version: 2.0.11 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -96,6 +96,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Jan 09 2019 Ryan O'Hara - 2.0.11-1 +- Update to 2.0.11 + * Mon Nov 26 2018 Ryan O'Hara - 2.0.10-1 - Update to 2.0.10 - Fix improper pathname validation (#1651864, CVE-2018-19044) diff --git a/sources b/sources index 5aaafd7..81d80fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.0.10.tar.gz) = e76562e5d9d9dc945f0c9702f5f3c6be6acd8c66a59aea1f8287810a2eeb4c65b6cb7e1cd84c1e478978f7db94dba7f8a918ca4847f90a6554b20d757addd2db +SHA512 (keepalived-2.0.11.tar.gz) = ead982aeacdf329109089dfc58a42915ff44b0c4897006000c74642fa3747b2cac1a472faa438ce517f47b80d193d466875ab7130d2206400c8b2ad52f17c6d4 From 8c76bfcb9fbe88b393fcf36313de56437d84f15c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:50 +0100 Subject: [PATCH 25/72] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- keepalived.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index c78297e..93fbb9b 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -12,7 +12,6 @@ Version: 2.0.11 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ -Group: System Environment/Daemons Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service From e4f5d4eec9d85996bcda0ead7f4d5df544115606 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 05:19:04 +0000 Subject: [PATCH 26/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 93fbb9b..1710456 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,7 +9,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.0.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -95,6 +95,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Jan 09 2019 Ryan O'Hara - 2.0.11-1 - Update to 2.0.11 From 17f6220c6ebd3a2e8ba8793e1f9d3b136f413207 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 4 Feb 2019 10:41:31 -0600 Subject: [PATCH 27/72] Update to 2.0.12 (#1576138) --- .gitignore | 1 + keepalived.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 43b57d5..f1e4307 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /keepalived-2.0.6.tar.gz /keepalived-2.0.10.tar.gz /keepalived-2.0.11.tar.gz +/keepalived-2.0.12.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 1710456..4f42b0c 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,8 +8,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.0.11 -Release: 2%{?dist} +Version: 2.0.12 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -95,6 +95,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Mon Feb 04 2019 Ryan O'Hara - 2.0.12-1 +- Update to 2.0.12 (#1576138) + * Fri Feb 01 2019 Fedora Release Engineering - 2.0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 81d80fc..0c91aa2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.0.11.tar.gz) = ead982aeacdf329109089dfc58a42915ff44b0c4897006000c74642fa3747b2cac1a472faa438ce517f47b80d193d466875ab7130d2206400c8b2ad52f17c6d4 +SHA512 (keepalived-2.0.12.tar.gz) = 345f7574cfe978194504691c0a7bcad76b1438bf8833911271647d445f0d1352972257554524e94be44e9d971299678d2f9a026e29088e844bbb3d2b25637076 From 6eb20360a8726ea860f4c45582557d034dc9ceb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 25 Jun 2019 19:50:33 +0200 Subject: [PATCH 28/72] Rebuilt (iptables) --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 4f42b0c..e98a52b 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,7 +9,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.0.12 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -95,6 +95,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Jun 25 2019 Björn Esser - 2.0.12-2 +- Rebuilt (iptables) + * Mon Feb 04 2019 Ryan O'Hara - 2.0.12-1 - Update to 2.0.12 (#1576138) From d966df8df6080c39e94d1dcd68cb3aa4047eefba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 11:21:33 +0000 Subject: [PATCH 29/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index e98a52b..de20485 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,7 +9,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.0.12 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -95,6 +95,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.0.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jun 25 2019 Björn Esser - 2.0.12-2 - Rebuilt (iptables) From f1fd3d1618ea948d4b2337c44cb78486cad5419a Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 30 Jul 2019 09:38:27 -0500 Subject: [PATCH 30/72] Update to 2.0.18 (#1678397) --- .gitignore | 1 + keepalived.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f1e4307..a7d0a2c 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /keepalived-2.0.10.tar.gz /keepalived-2.0.11.tar.gz /keepalived-2.0.12.tar.gz +/keepalived-2.0.18.tar.gz diff --git a/keepalived.spec b/keepalived.spec index de20485..ad981d2 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,8 +8,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.0.12 -Release: 3%{?dist} +Version: 2.0.18 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -95,6 +95,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Jul 30 2019 Ryan O'Hara - 2.0.18-1 +- Update to 2.0.18 (#1678397) + * Thu Jul 25 2019 Fedora Release Engineering - 2.0.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 0c91aa2..63a74a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.0.12.tar.gz) = 345f7574cfe978194504691c0a7bcad76b1438bf8833911271647d445f0d1352972257554524e94be44e9d971299678d2f9a026e29088e844bbb3d2b25637076 +SHA512 (keepalived-2.0.18.tar.gz) = 11e0a9b9bdca734a923254b4484f4e808cf362e795e3f457f707772b7522929be4bbbba9b1c152b7cb7601d8315b6faea229ed59f115787d6197fbc62770f9a3 From 1de187ff0d221027bd5b5077a0349416d59cc222 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 30 Jul 2019 09:40:10 -0500 Subject: [PATCH 31/72] Change pidfile directory (#1712730) --- keepalived.service | 2 +- keepalived.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/keepalived.service b/keepalived.service index 64c5d3f..a5a9b28 100644 --- a/keepalived.service +++ b/keepalived.service @@ -5,7 +5,7 @@ Wants=network-online.target [Service] Type=forking -PIDFile=/var/run/keepalived.pid +PIDFile=/run/keepalived.pid KillMode=process EnvironmentFile=-/etc/sysconfig/keepalived ExecStart=/usr/sbin/keepalived $KEEPALIVED_OPTIONS diff --git a/keepalived.spec b/keepalived.spec index ad981d2..0b36367 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,7 +9,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.0.18 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -95,6 +95,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Jul 30 2019 Ryan O'Hara - 2.0.18-2 +- Change pidfile directory (#1712730) + * Tue Jul 30 2019 Ryan O'Hara - 2.0.18-1 - Update to 2.0.18 (#1678397) From 30521c556a7418a99e3550c5b226c5d95e5a9885 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 6 Nov 2019 13:30:03 -0600 Subject: [PATCH 32/72] Update to 2.0.19 (#1763424) --- .gitignore | 1 + keepalived.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a7d0a2c..64c0b73 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /keepalived-2.0.11.tar.gz /keepalived-2.0.12.tar.gz /keepalived-2.0.18.tar.gz +/keepalived-2.0.19.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 0b36367..9d47db3 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -8,8 +8,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.0.18 -Release: 2%{?dist} +Version: 2.0.19 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -95,6 +95,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Nov 06 2019 Ryan O'Hara - 2.0.19-1 +- Update to 2.0.19 (#1763424) + * Tue Jul 30 2019 Ryan O'Hara - 2.0.18-2 - Change pidfile directory (#1712730) diff --git a/sources b/sources index 63a74a2..e7a9ff7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.0.18.tar.gz) = 11e0a9b9bdca734a923254b4484f4e808cf362e795e3f457f707772b7522929be4bbbba9b1c152b7cb7601d8315b6faea229ed59f115787d6197fbc62770f9a3 +SHA512 (keepalived-2.0.19.tar.gz) = 68a510983bc043484e5edbc1d87563677a048282ec52873105f0af922e8b4de5b8e7176944010f9d4d6f65d1a4ebaf930c3d37273e28c1f115ed0fda245d8109 From 876ddb0e6e6350c3035e0db3cded7a43fa6f6599 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 6 Nov 2019 13:47:41 -0600 Subject: [PATCH 33/72] Enable nftables support (#1769278) --- keepalived.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/keepalived.spec b/keepalived.spec index 9d47db3..fe1f5f3 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -1,6 +1,7 @@ %bcond_without snmp %bcond_without vrrp %bcond_without sha1 +%bcond_without nftables %bcond_with profile %bcond_with debug @@ -23,6 +24,9 @@ Requires(postun): systemd %if %{with snmp} BuildRequires: net-snmp-devel %endif +%if %{with nftables} +BuildRequires: libnftnl-devel +%endif BuildRequires: gcc BuildRequires: systemd-units BuildRequires: openssl-devel @@ -54,6 +58,7 @@ infrastructures. %{?with_profile:--enable-profile} \ %{!?with_vrrp:--disable-vrrp} \ %{?with_snmp:--enable-snmp --enable-snmp-rfc} \ + %{?with_nftables:--enable-nftables} \ %{?with_sha1:--enable-sha1} \ --with-init=systemd %{__make} %{?_smp_mflags} STRIP=/bin/true @@ -95,6 +100,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Nov 06 2019 Ryan O'Hara - 2.0.19-2 +- Enable nftables support (#1769278) + * Wed Nov 06 2019 Ryan O'Hara - 2.0.19-1 - Update to 2.0.19 (#1763424) From c453f7e249adedd76c702dfc5b28efe98a7e118d Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 12 Nov 2019 04:44:42 -0600 Subject: [PATCH 34/72] Fix track_process with PIDs over 32767 (#1770766) --- ...ed-fix-track_process-with-pids-32767.patch | 49 +++++++++++++++++++ keepalived.spec | 8 ++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 keepalived-fix-track_process-with-pids-32767.patch diff --git a/keepalived-fix-track_process-with-pids-32767.patch b/keepalived-fix-track_process-with-pids-32767.patch new file mode 100644 index 0000000..35b7025 --- /dev/null +++ b/keepalived-fix-track_process-with-pids-32767.patch @@ -0,0 +1,49 @@ +From 23a5b8113bf0b8ec4718443df0406882e8e4d831 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Sat, 9 Nov 2019 10:07:48 +0000 +Subject: [PATCH] Fix track_process with PIDs > 32767 + +Signed-off-by: Quentin Armitage +--- + keepalived/core/track_process.c | 4 ++-- + lib/scheduler.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/keepalived/core/track_process.c b/keepalived/core/track_process.c +index 550254b1..76ff6009 100644 +--- a/keepalived/core/track_process.c ++++ b/keepalived/core/track_process.c +@@ -341,7 +341,7 @@ check_process(pid_t pid, char *comm, tracked_process_instance_t *tpi) + * swapped in to read it. */ + if (!have_comm) { + if (vrrp_data->vrrp_use_process_cmdline) { +- snprintf(cmdline, sizeof(cmdline), "/proc/%hd/cmdline", pid); ++ snprintf(cmdline, sizeof(cmdline), "/proc/%d/cmdline", pid); + + if ((fd = open(cmdline, O_RDONLY)) == -1) + return; +@@ -358,7 +358,7 @@ check_process(pid_t pid, char *comm, tracked_process_instance_t *tpi) + } + + if (vrrp_data->vrrp_use_process_comm) { +- snprintf(cmdline, sizeof(cmdline), "/proc/%hd/comm", pid); ++ snprintf(cmdline, sizeof(cmdline), "/proc/%d/comm", pid); + + fd = open(cmdline, O_RDONLY); + if (fd == -1) { +diff --git a/lib/scheduler.c b/lib/scheduler.c +index 3cd7b65a..de92c7d4 100644 +--- a/lib/scheduler.c ++++ b/lib/scheduler.c +@@ -441,7 +441,7 @@ report_child_status(int status, pid_t pid, char const *prog_name) + prog_id = child_finder_name(pid); + + if (!prog_id) { +- snprintf(pid_buf, sizeof(pid_buf), "pid %hd", pid); ++ snprintf(pid_buf, sizeof(pid_buf), "pid %d", pid); + prog_id = pid_buf; + } + +-- +2.23.0 + diff --git a/keepalived.spec b/keepalived.spec index fe1f5f3..c1dca52 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,13 +10,15 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.0.19 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service +Patch0: keepalived-fix-track_process-with-pids-32767.patch + Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -51,6 +53,7 @@ infrastructures. %prep %setup -q +%patch0 -p1 %build %configure \ @@ -100,6 +103,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Nov 12 2019 Ryan O'Hara - 2.0.19-3 +- Fix track_process with PIDs over 32767 (#1770766) + * Wed Nov 06 2019 Ryan O'Hara - 2.0.19-2 - Enable nftables support (#1769278) From 50dd9a30e1cf19a1eecc3d4c7b5b03bd38ed8cb2 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 12 Nov 2019 04:47:40 -0600 Subject: [PATCH 35/72] Fix file descriptor errors on reload --- ...fix-file-descriptor-errors-on-reload.patch | 164 ++++++++++++++++++ keepalived.spec | 7 +- 2 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 keepalived-fix-file-descriptor-errors-on-reload.patch diff --git a/keepalived-fix-file-descriptor-errors-on-reload.patch b/keepalived-fix-file-descriptor-errors-on-reload.patch new file mode 100644 index 0000000..1530517 --- /dev/null +++ b/keepalived-fix-file-descriptor-errors-on-reload.patch @@ -0,0 +1,164 @@ +From 1c3c8eefd0a40d4938d6f05969c886988116a425 Mon Sep 17 00:00:00 2001 +From: Quentin Armitage +Date: Wed, 6 Nov 2019 23:15:23 +0000 +Subject: [PATCH] Resolve file descriptor errors on reload + +If a read or write thread was on the thread reaady queue when a +reload was processed, the file descriptor was not removed from the +epoll instance. + +This commit ensures that file descriptors relating to threads on +the thread ready queue are removed from the epoll instance during +a reload. + +Signed-off-by: Quentin Armitage +--- + keepalived/bfd/bfd_scheduler.c | 2 +- + keepalived/check/check_bfd.c | 2 +- + keepalived/vrrp/vrrp_scheduler.c | 2 +- + lib/scheduler.c | 31 +++++++++++++++++++------------ + lib/scheduler.h | 3 ++- + 5 files changed, 24 insertions(+), 16 deletions(-) + +diff --git a/keepalived/bfd/bfd_scheduler.c b/keepalived/bfd/bfd_scheduler.c +index 5c3d0691..d51d420f 100644 +--- a/keepalived/bfd/bfd_scheduler.c ++++ b/keepalived/bfd/bfd_scheduler.c +@@ -908,7 +908,7 @@ bfd_receiver_thread(thread_ref_t thread) + data->thread_in = NULL; + + /* Ignore THREAD_READ_TIMEOUT */ +- if (thread->type == THREAD_READY_FD) { ++ if (thread->type == THREAD_READY_READ_FD) { + if (!bfd_receive_packet(&pkt, fd, bfd_buffer, BFD_BUFFER_SIZE)) + bfd_handle_packet(&pkt); + } +diff --git a/keepalived/check/check_bfd.c b/keepalived/check/check_bfd.c +index 4bd8af23..f9590c30 100644 +--- a/keepalived/check/check_bfd.c ++++ b/keepalived/check/check_bfd.c +@@ -290,7 +290,7 @@ bfd_check_thread(thread_ref_t thread) + bfd_thread = thread_add_read(master, bfd_check_thread, NULL, + thread->u.f.fd, TIMER_NEVER, false); + +- if (thread->type != THREAD_READY_FD) ++ if (thread->type != THREAD_READY_READ_FD) + return 0; + + while (read(thread->u.f.fd, &evt, sizeof(bfd_event_t)) != -1) +diff --git a/keepalived/vrrp/vrrp_scheduler.c b/keepalived/vrrp/vrrp_scheduler.c +index 91a4898c..7e6da60a 100644 +--- a/keepalived/vrrp/vrrp_scheduler.c ++++ b/keepalived/vrrp/vrrp_scheduler.c +@@ -762,7 +762,7 @@ vrrp_bfd_thread(thread_ref_t thread) + bfd_thread = thread_add_read(master, vrrp_bfd_thread, NULL, + thread->u.f.fd, TIMER_NEVER, false); + +- if (thread->type != THREAD_READY_FD) ++ if (thread->type != THREAD_READY_READ_FD) + return 0; + + while (read(thread->u.f.fd, &evt, sizeof(bfd_event_t)) != -1) +diff --git a/lib/scheduler.c b/lib/scheduler.c +index 8fc2a032..3cd7b65a 100644 +--- a/lib/scheduler.c ++++ b/lib/scheduler.c +@@ -116,7 +116,8 @@ get_thread_type_str(thread_type_t id) + if (id == THREAD_CHILD_TERMINATED) return "CHILD_TERMINATED"; + if (id == THREAD_TERMINATE_START) return "TERMINATE_START"; + if (id == THREAD_TERMINATE) return "TERMINATE"; +- if (id == THREAD_READY_FD) return "READY_FD"; ++ if (id == THREAD_READY_READ_FD) return "READY_READ_FD"; ++ if (id == THREAD_READY_WRITE_FD) return "READY_WRITE_FD"; + if (id == THREAD_READ_ERROR) return "READ_ERROR"; + if (id == THREAD_WRITE_ERROR) return "WRITE_ERROR"; + #ifdef USE_SIGNAL_THREADS +@@ -859,7 +860,8 @@ thread_destroy_rb(thread_master_t *m, rb_root_cached_t *root) + + if (thread->type == THREAD_READ || + thread->type == THREAD_WRITE || +- thread->type == THREAD_READY_FD || ++ thread->type == THREAD_READY_READ_FD || ++ thread->type == THREAD_READY_WRITE_FD || + thread->type == THREAD_READ_TIMEOUT || + thread->type == THREAD_WRITE_TIMEOUT || + thread->type == THREAD_READ_ERROR || +@@ -1409,14 +1411,18 @@ thread_cancel(thread_ref_t thread_cp) + rb_erase_cached(&thread->n, &m->child); + rb_erase(&thread->rb_data, &m->child_pid); + break; +- case THREAD_READY_FD: ++ case THREAD_READY_READ_FD: + case THREAD_READ_TIMEOUT: ++ if (thread->event) ++ thread_event_del(thread, THREAD_FL_EPOLL_READ_BIT); ++ list_head_del(&thread->next); ++ break; ++ case THREAD_READY_WRITE_FD: + case THREAD_WRITE_TIMEOUT: +- if (thread->event) { +- rb_erase(&thread->event->n, &m->io_events); +- FREE(thread->event); +- } +- /* ... falls through ... */ ++ if (thread->event) ++ thread_event_del(thread, THREAD_FL_EPOLL_WRITE_BIT); ++ list_head_del(&thread->next); ++ break; + case THREAD_EVENT: + case THREAD_READY: + #ifdef USE_SIGNAL_THREADS +@@ -1735,7 +1741,7 @@ thread_fetch_next_queue(thread_master_t *m) + , ev->fd, ep_ev->events); + continue; + } +- thread_move_ready(m, &m->read, ev->read, THREAD_READY_FD); ++ thread_move_ready(m, &m->read, ev->read, THREAD_READY_READ_FD); + ev->read = NULL; + } + +@@ -1746,7 +1752,7 @@ thread_fetch_next_queue(thread_master_t *m) + , ev->fd, ep_ev->events); + continue; + } +- thread_move_ready(m, &m->write, ev->write, THREAD_READY_FD); ++ thread_move_ready(m, &m->write, ev->write, THREAD_READY_WRITE_FD); + ev->write = NULL; + } + } +@@ -1804,7 +1810,8 @@ process_threads(thread_master_t *m) + * snmp_read, bfd_receiver, bfd pipe in vrrp/check, dbus pipe or netlink fds. */ + thread = thread_trim_head(thread_list); + if (!shutting_down || +- (thread->type == THREAD_READY_FD && ++ ((thread->type == THREAD_READY_READ_FD || ++ thread->type == THREAD_READY_WRITE_FD) && + (thread->u.f.fd == m->timer_fd || + thread->u.f.fd == m->signal_fd + #ifdef _WITH_SNMP_ +@@ -1823,7 +1830,7 @@ process_threads(thread_master_t *m) + shutting_down = true; + } + +- m->current_event = (thread->type == THREAD_READY_FD) ? thread->event : NULL; ++ m->current_event = (thread->type == THREAD_READY_READ_FD || thread->type == THREAD_READY_WRITE_FD) ? thread->event : NULL; + thread_type = thread->type; + thread_add_unuse(master, thread); + +diff --git a/lib/scheduler.h b/lib/scheduler.h +index 69324fe0..fea99cd0 100644 +--- a/lib/scheduler.h ++++ b/lib/scheduler.h +@@ -56,7 +56,8 @@ typedef enum { + THREAD_CHILD_TERMINATED, + THREAD_TERMINATE_START, + THREAD_TERMINATE, +- THREAD_READY_FD, ++ THREAD_READY_READ_FD, ++ THREAD_READY_WRITE_FD, + THREAD_READ_ERROR, + THREAD_WRITE_ERROR, + #ifdef USE_SIGNAL_THREADS +-- +2.23.0 + diff --git a/keepalived.spec b/keepalived.spec index c1dca52..8e73f42 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.0.19 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -18,6 +18,7 @@ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service Patch0: keepalived-fix-track_process-with-pids-32767.patch +Patch1: keepalived-fix-file-descriptor-errors-on-reload.patch Requires(post): systemd Requires(preun): systemd @@ -54,6 +55,7 @@ infrastructures. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure \ @@ -103,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Nov 12 2019 Ryan O'Hara - 2.0.19-4 +- Fix file descriptor errors on reload + * Tue Nov 12 2019 Ryan O'Hara - 2.0.19-3 - Fix track_process with PIDs over 32767 (#1770766) From af6662bda06ff09fc68198c2c12ab61a901f6582 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 06:58:36 +0000 Subject: [PATCH 36/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 8e73f42..5480edb 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.0.19 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -105,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.0.19-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 12 2019 Ryan O'Hara - 2.0.19-4 - Fix file descriptor errors on reload From 09cfcb545fbe4d4e61de13b9e58ca5c5e8fb7cff Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 12 Feb 2020 18:35:12 -0600 Subject: [PATCH 37/72] Update to 2.0.20 (#1794135) --- .gitignore | 1 + keepalived.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 64c0b73..7718416 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /keepalived-2.0.12.tar.gz /keepalived-2.0.18.tar.gz /keepalived-2.0.19.tar.gz +/keepalived-2.0.20.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 5480edb..6069a14 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,8 +9,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.0.19 -Release: 5%{?dist} +Version: 2.0.20 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -105,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Feb 12 2019 Ryan O'Hara - 2.0.20-1 +- Update to 2.0.20 (#1794135) + * Wed Jan 29 2020 Fedora Release Engineering - 2.0.19-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index e7a9ff7..c4f0b3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.0.19.tar.gz) = 68a510983bc043484e5edbc1d87563677a048282ec52873105f0af922e8b4de5b8e7176944010f9d4d6f65d1a4ebaf930c3d37273e28c1f115ed0fda245d8109 +SHA512 (keepalived-2.0.20.tar.gz) = 36bbc4aa0a1045486e608c9f4ed73f4335b871dae88beaed10d86445474c462136885225cd6b61219a36fca2ff43771623bc6d072e406cf684acc2ca8f2a38f6 From 431b0fca307543e53c6e88582b1fdd95f673a2b9 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Thu, 13 Feb 2020 10:31:48 -0600 Subject: [PATCH 38/72] Remove unused patches --- ...fix-file-descriptor-errors-on-reload.patch | 164 ------------------ ...ed-fix-track_process-with-pids-32767.patch | 49 ------ keepalived.spec | 12 +- 3 files changed, 5 insertions(+), 220 deletions(-) delete mode 100644 keepalived-fix-file-descriptor-errors-on-reload.patch delete mode 100644 keepalived-fix-track_process-with-pids-32767.patch diff --git a/keepalived-fix-file-descriptor-errors-on-reload.patch b/keepalived-fix-file-descriptor-errors-on-reload.patch deleted file mode 100644 index 1530517..0000000 --- a/keepalived-fix-file-descriptor-errors-on-reload.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 1c3c8eefd0a40d4938d6f05969c886988116a425 Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Wed, 6 Nov 2019 23:15:23 +0000 -Subject: [PATCH] Resolve file descriptor errors on reload - -If a read or write thread was on the thread reaady queue when a -reload was processed, the file descriptor was not removed from the -epoll instance. - -This commit ensures that file descriptors relating to threads on -the thread ready queue are removed from the epoll instance during -a reload. - -Signed-off-by: Quentin Armitage ---- - keepalived/bfd/bfd_scheduler.c | 2 +- - keepalived/check/check_bfd.c | 2 +- - keepalived/vrrp/vrrp_scheduler.c | 2 +- - lib/scheduler.c | 31 +++++++++++++++++++------------ - lib/scheduler.h | 3 ++- - 5 files changed, 24 insertions(+), 16 deletions(-) - -diff --git a/keepalived/bfd/bfd_scheduler.c b/keepalived/bfd/bfd_scheduler.c -index 5c3d0691..d51d420f 100644 ---- a/keepalived/bfd/bfd_scheduler.c -+++ b/keepalived/bfd/bfd_scheduler.c -@@ -908,7 +908,7 @@ bfd_receiver_thread(thread_ref_t thread) - data->thread_in = NULL; - - /* Ignore THREAD_READ_TIMEOUT */ -- if (thread->type == THREAD_READY_FD) { -+ if (thread->type == THREAD_READY_READ_FD) { - if (!bfd_receive_packet(&pkt, fd, bfd_buffer, BFD_BUFFER_SIZE)) - bfd_handle_packet(&pkt); - } -diff --git a/keepalived/check/check_bfd.c b/keepalived/check/check_bfd.c -index 4bd8af23..f9590c30 100644 ---- a/keepalived/check/check_bfd.c -+++ b/keepalived/check/check_bfd.c -@@ -290,7 +290,7 @@ bfd_check_thread(thread_ref_t thread) - bfd_thread = thread_add_read(master, bfd_check_thread, NULL, - thread->u.f.fd, TIMER_NEVER, false); - -- if (thread->type != THREAD_READY_FD) -+ if (thread->type != THREAD_READY_READ_FD) - return 0; - - while (read(thread->u.f.fd, &evt, sizeof(bfd_event_t)) != -1) -diff --git a/keepalived/vrrp/vrrp_scheduler.c b/keepalived/vrrp/vrrp_scheduler.c -index 91a4898c..7e6da60a 100644 ---- a/keepalived/vrrp/vrrp_scheduler.c -+++ b/keepalived/vrrp/vrrp_scheduler.c -@@ -762,7 +762,7 @@ vrrp_bfd_thread(thread_ref_t thread) - bfd_thread = thread_add_read(master, vrrp_bfd_thread, NULL, - thread->u.f.fd, TIMER_NEVER, false); - -- if (thread->type != THREAD_READY_FD) -+ if (thread->type != THREAD_READY_READ_FD) - return 0; - - while (read(thread->u.f.fd, &evt, sizeof(bfd_event_t)) != -1) -diff --git a/lib/scheduler.c b/lib/scheduler.c -index 8fc2a032..3cd7b65a 100644 ---- a/lib/scheduler.c -+++ b/lib/scheduler.c -@@ -116,7 +116,8 @@ get_thread_type_str(thread_type_t id) - if (id == THREAD_CHILD_TERMINATED) return "CHILD_TERMINATED"; - if (id == THREAD_TERMINATE_START) return "TERMINATE_START"; - if (id == THREAD_TERMINATE) return "TERMINATE"; -- if (id == THREAD_READY_FD) return "READY_FD"; -+ if (id == THREAD_READY_READ_FD) return "READY_READ_FD"; -+ if (id == THREAD_READY_WRITE_FD) return "READY_WRITE_FD"; - if (id == THREAD_READ_ERROR) return "READ_ERROR"; - if (id == THREAD_WRITE_ERROR) return "WRITE_ERROR"; - #ifdef USE_SIGNAL_THREADS -@@ -859,7 +860,8 @@ thread_destroy_rb(thread_master_t *m, rb_root_cached_t *root) - - if (thread->type == THREAD_READ || - thread->type == THREAD_WRITE || -- thread->type == THREAD_READY_FD || -+ thread->type == THREAD_READY_READ_FD || -+ thread->type == THREAD_READY_WRITE_FD || - thread->type == THREAD_READ_TIMEOUT || - thread->type == THREAD_WRITE_TIMEOUT || - thread->type == THREAD_READ_ERROR || -@@ -1409,14 +1411,18 @@ thread_cancel(thread_ref_t thread_cp) - rb_erase_cached(&thread->n, &m->child); - rb_erase(&thread->rb_data, &m->child_pid); - break; -- case THREAD_READY_FD: -+ case THREAD_READY_READ_FD: - case THREAD_READ_TIMEOUT: -+ if (thread->event) -+ thread_event_del(thread, THREAD_FL_EPOLL_READ_BIT); -+ list_head_del(&thread->next); -+ break; -+ case THREAD_READY_WRITE_FD: - case THREAD_WRITE_TIMEOUT: -- if (thread->event) { -- rb_erase(&thread->event->n, &m->io_events); -- FREE(thread->event); -- } -- /* ... falls through ... */ -+ if (thread->event) -+ thread_event_del(thread, THREAD_FL_EPOLL_WRITE_BIT); -+ list_head_del(&thread->next); -+ break; - case THREAD_EVENT: - case THREAD_READY: - #ifdef USE_SIGNAL_THREADS -@@ -1735,7 +1741,7 @@ thread_fetch_next_queue(thread_master_t *m) - , ev->fd, ep_ev->events); - continue; - } -- thread_move_ready(m, &m->read, ev->read, THREAD_READY_FD); -+ thread_move_ready(m, &m->read, ev->read, THREAD_READY_READ_FD); - ev->read = NULL; - } - -@@ -1746,7 +1752,7 @@ thread_fetch_next_queue(thread_master_t *m) - , ev->fd, ep_ev->events); - continue; - } -- thread_move_ready(m, &m->write, ev->write, THREAD_READY_FD); -+ thread_move_ready(m, &m->write, ev->write, THREAD_READY_WRITE_FD); - ev->write = NULL; - } - } -@@ -1804,7 +1810,8 @@ process_threads(thread_master_t *m) - * snmp_read, bfd_receiver, bfd pipe in vrrp/check, dbus pipe or netlink fds. */ - thread = thread_trim_head(thread_list); - if (!shutting_down || -- (thread->type == THREAD_READY_FD && -+ ((thread->type == THREAD_READY_READ_FD || -+ thread->type == THREAD_READY_WRITE_FD) && - (thread->u.f.fd == m->timer_fd || - thread->u.f.fd == m->signal_fd - #ifdef _WITH_SNMP_ -@@ -1823,7 +1830,7 @@ process_threads(thread_master_t *m) - shutting_down = true; - } - -- m->current_event = (thread->type == THREAD_READY_FD) ? thread->event : NULL; -+ m->current_event = (thread->type == THREAD_READY_READ_FD || thread->type == THREAD_READY_WRITE_FD) ? thread->event : NULL; - thread_type = thread->type; - thread_add_unuse(master, thread); - -diff --git a/lib/scheduler.h b/lib/scheduler.h -index 69324fe0..fea99cd0 100644 ---- a/lib/scheduler.h -+++ b/lib/scheduler.h -@@ -56,7 +56,8 @@ typedef enum { - THREAD_CHILD_TERMINATED, - THREAD_TERMINATE_START, - THREAD_TERMINATE, -- THREAD_READY_FD, -+ THREAD_READY_READ_FD, -+ THREAD_READY_WRITE_FD, - THREAD_READ_ERROR, - THREAD_WRITE_ERROR, - #ifdef USE_SIGNAL_THREADS --- -2.23.0 - diff --git a/keepalived-fix-track_process-with-pids-32767.patch b/keepalived-fix-track_process-with-pids-32767.patch deleted file mode 100644 index 35b7025..0000000 --- a/keepalived-fix-track_process-with-pids-32767.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 23a5b8113bf0b8ec4718443df0406882e8e4d831 Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Sat, 9 Nov 2019 10:07:48 +0000 -Subject: [PATCH] Fix track_process with PIDs > 32767 - -Signed-off-by: Quentin Armitage ---- - keepalived/core/track_process.c | 4 ++-- - lib/scheduler.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/keepalived/core/track_process.c b/keepalived/core/track_process.c -index 550254b1..76ff6009 100644 ---- a/keepalived/core/track_process.c -+++ b/keepalived/core/track_process.c -@@ -341,7 +341,7 @@ check_process(pid_t pid, char *comm, tracked_process_instance_t *tpi) - * swapped in to read it. */ - if (!have_comm) { - if (vrrp_data->vrrp_use_process_cmdline) { -- snprintf(cmdline, sizeof(cmdline), "/proc/%hd/cmdline", pid); -+ snprintf(cmdline, sizeof(cmdline), "/proc/%d/cmdline", pid); - - if ((fd = open(cmdline, O_RDONLY)) == -1) - return; -@@ -358,7 +358,7 @@ check_process(pid_t pid, char *comm, tracked_process_instance_t *tpi) - } - - if (vrrp_data->vrrp_use_process_comm) { -- snprintf(cmdline, sizeof(cmdline), "/proc/%hd/comm", pid); -+ snprintf(cmdline, sizeof(cmdline), "/proc/%d/comm", pid); - - fd = open(cmdline, O_RDONLY); - if (fd == -1) { -diff --git a/lib/scheduler.c b/lib/scheduler.c -index 3cd7b65a..de92c7d4 100644 ---- a/lib/scheduler.c -+++ b/lib/scheduler.c -@@ -441,7 +441,7 @@ report_child_status(int status, pid_t pid, char const *prog_name) - prog_id = child_finder_name(pid); - - if (!prog_id) { -- snprintf(pid_buf, sizeof(pid_buf), "pid %hd", pid); -+ snprintf(pid_buf, sizeof(pid_buf), "pid %d", pid); - prog_id = pid_buf; - } - --- -2.23.0 - diff --git a/keepalived.spec b/keepalived.spec index 6069a14..3925e7f 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,16 +10,13 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.0.20 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service -Patch0: keepalived-fix-track_process-with-pids-32767.patch -Patch1: keepalived-fix-file-descriptor-errors-on-reload.patch - Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -54,8 +51,6 @@ infrastructures. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build %configure \ @@ -105,7 +100,10 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog -* Wed Feb 12 2019 Ryan O'Hara - 2.0.20-1 +* Thu Feb 13 2020 Ryan O'Hara - 2.0.20-2 +- Remove unused patches + +* Wed Feb 12 2020 Ryan O'Hara - 2.0.20-1 - Update to 2.0.20 (#1794135) * Wed Jan 29 2020 Fedora Release Engineering - 2.0.19-5 From 2bce22461137d744df40d135afa438f801bac88f Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 18 Feb 2020 16:01:10 -0600 Subject: [PATCH 39/72] Build with nftables support instead of iptables --- keepalived.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/keepalived.spec b/keepalived.spec index 3925e7f..5839924 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.0.20 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -25,14 +25,16 @@ Requires(postun): systemd BuildRequires: net-snmp-devel %endif %if %{with nftables} +BuildRequires: libmnl-devel BuildRequires: libnftnl-devel +%else +BuildRequires: ipset-devel +BuildRequires: iptables-devel %endif BuildRequires: gcc BuildRequires: systemd-units BuildRequires: openssl-devel BuildRequires: libnl3-devel -BuildRequires: ipset-devel -BuildRequires: iptables-devel BuildRequires: libnfnetlink-devel %description @@ -58,7 +60,7 @@ infrastructures. %{?with_profile:--enable-profile} \ %{!?with_vrrp:--disable-vrrp} \ %{?with_snmp:--enable-snmp --enable-snmp-rfc} \ - %{?with_nftables:--enable-nftables} \ + %{?with_nftables:--enable-nftables --disable-iptables --disable-ipset} \ %{?with_sha1:--enable-sha1} \ --with-init=systemd %{__make} %{?_smp_mflags} STRIP=/bin/true @@ -100,6 +102,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Feb 18 2020 Ryan O'Hara - 2.0.20-3 +- Build with nftables support instead of iptables + * Thu Feb 13 2020 Ryan O'Hara - 2.0.20-2 - Remove unused patches From 81079d0e6c5845230f45d6237b8a161efd017c52 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 15 Jul 2020 10:46:06 -0500 Subject: [PATCH 40/72] Update to 2.1.5 (#1794135) --- .gitignore | 1 + keepalived.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7718416..2c78dfb 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /keepalived-2.0.18.tar.gz /keepalived-2.0.19.tar.gz /keepalived-2.0.20.tar.gz +/keepalived-2.1.5.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 5839924..8613a98 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,8 +9,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.0.20 -Release: 3%{?dist} +Version: 2.1.5 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -102,6 +102,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Jul 15 2020 Ryan O'Hara - 2.1.5-1 +- Update to 2.1.5 (#1794135) + * Tue Feb 18 2020 Ryan O'Hara - 2.0.20-3 - Build with nftables support instead of iptables diff --git a/sources b/sources index c4f0b3d..3486f36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.0.20.tar.gz) = 36bbc4aa0a1045486e608c9f4ed73f4335b871dae88beaed10d86445474c462136885225cd6b61219a36fca2ff43771623bc6d072e406cf684acc2ca8f2a38f6 +SHA512 (keepalived-2.1.5.tar.gz) = 107d071aa1546023a3eb7c2cba4707ab6fbb10af62984ab41c9358b5e28289f8f277456983fe8649a15a77939734d3af573b8b050500d9eb521b4b0537f97aa6 From 8c86bb36180e030d2865cab597c2048dfb9d4f8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 02:59:20 +0000 Subject: [PATCH 41/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 8613a98..5393a58 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.1.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -102,6 +102,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 15 2020 Ryan O'Hara - 2.1.5-1 - Update to 2.1.5 (#1794135) From ff693becfeb1037ad1f9d39eceea78eda6c5ffc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Thu, 27 Aug 2020 14:13:48 +0200 Subject: [PATCH 42/72] Rebuilt for new net-snmp release --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 5393a58..a6d0d3c 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.1.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -102,6 +102,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Aug 27 2020 Josef Řídký - 2.1.5-3 +- Rebuilt for new net-snmp release + * Tue Jul 28 2020 Fedora Release Engineering - 2.1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From aa67a09473a788891a9f4416182992f99ae9d347 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 4 Jan 2021 22:38:36 +0000 Subject: [PATCH 43/72] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- keepalived.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/keepalived.spec b/keepalived.spec index a6d0d3c..27ab28b 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -36,6 +36,7 @@ BuildRequires: systemd-units BuildRequires: openssl-devel BuildRequires: libnl3-devel BuildRequires: libnfnetlink-devel +BuildRequires: make %description Keepalived provides simple and robust facilities for load balancing From ab73f75b7a89b8f0304e0f10ead4c271d6bf2496 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Thu, 14 Jan 2021 13:07:21 -0600 Subject: [PATCH 44/72] Update to 2.2.0 (#1914512) --- .gitignore | 1 + keepalived.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2c78dfb..1c614ea 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /keepalived-2.0.19.tar.gz /keepalived-2.0.20.tar.gz /keepalived-2.1.5.tar.gz +/keepalived-2.2.0.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 27ab28b..55537f7 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,8 +9,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.1.5 -Release: 3%{?dist} +Version: 2.2.0 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -103,6 +103,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jan 14 2021 Ryan O'Hara - 2.2.0-1 +- Update to 2.2.0 (#1914512) + * Thu Aug 27 2020 Josef Řídký - 2.1.5-3 - Rebuilt for new net-snmp release diff --git a/sources b/sources index 3486f36..f388362 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.1.5.tar.gz) = 107d071aa1546023a3eb7c2cba4707ab6fbb10af62984ab41c9358b5e28289f8f277456983fe8649a15a77939734d3af573b8b050500d9eb521b4b0537f97aa6 +SHA512 (keepalived-2.2.0.tar.gz) = f93d29f34ab5a8b0e7d9c9e8ce23f978f27d200dbecffe04d236bd05a2afeabc94569d5b53399e7cdd358f9e794b5d37bc476ce8ec1adb1942017c35434064f9 From d5123177642a10fb6f4e11a707f889710370c7f9 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 18 Jan 2021 10:13:49 -0600 Subject: [PATCH 45/72] Update to 2.2.1 (#1917152) --- .gitignore | 1 + keepalived.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1c614ea..75a2df5 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /keepalived-2.0.20.tar.gz /keepalived-2.1.5.tar.gz /keepalived-2.2.0.tar.gz +/keepalived-2.2.1.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 55537f7..45847a8 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,7 +9,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.2.0 +Version: 2.2.1 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -103,6 +103,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Mon Jan 18 2021 Ryan O'Hara - 2.2.1-1 +- Update to 2.2.1 (#1917152) + * Thu Jan 14 2021 Ryan O'Hara - 2.2.0-1 - Update to 2.2.0 (#1914512) diff --git a/sources b/sources index f388362..25ef34b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.2.0.tar.gz) = f93d29f34ab5a8b0e7d9c9e8ce23f978f27d200dbecffe04d236bd05a2afeabc94569d5b53399e7cdd358f9e794b5d37bc476ce8ec1adb1942017c35434064f9 +SHA512 (keepalived-2.2.1.tar.gz) = 721ac77e641ba53b23b65d278002a7af639c17741405d6bce4fc5f9f069a7f84d2dcae8bf8d08c517326373c113424efdb522cfb31638d23e4ad6c261252ea3c From 2e6a5516c93376a0dead0d03815e29123e88c2d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 15:26:47 +0000 Subject: [PATCH 46/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 45847a8..76d61a4 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -103,6 +103,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 18 2021 Ryan O'Hara - 2.2.1-1 - Update to 2.2.1 (#1917152) From 6a3a16a4ee5f69865a61a9e14873e54142b3d403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:34 +0100 Subject: [PATCH 47/72] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- keepalived.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 76d61a4..e630ca9 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -103,6 +103,10 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.2.1-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 2.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From db9617baa5fe9d28cc337f3a20ee007d4228e95f Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Wed, 7 Apr 2021 08:22:41 -0500 Subject: [PATCH 48/72] Update to 2.2.2 (#1935590) --- .gitignore | 1 + keepalived.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 75a2df5..7f5d174 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /keepalived-2.1.5.tar.gz /keepalived-2.2.0.tar.gz /keepalived-2.2.1.tar.gz +/keepalived-2.2.2.tar.gz diff --git a/keepalived.spec b/keepalived.spec index e630ca9..8f535e9 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,8 +9,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.2.1 -Release: 3%{?dist} +Version: 2.2.2 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -103,6 +103,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Apr 07 2021 Ryan O'Hara - 2.2.2-1 +- Update to 2.2.2 (#1935590) + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.2.1-3 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. diff --git a/sources b/sources index 25ef34b..1754f00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.2.1.tar.gz) = 721ac77e641ba53b23b65d278002a7af639c17741405d6bce4fc5f9f069a7f84d2dcae8bf8d08c517326373c113424efdb522cfb31638d23e4ad6c261252ea3c +SHA512 (keepalived-2.2.2.tar.gz) = 05bb589c76faa4d3f734ecb1a3e5ac40af006fe5dce962bcd9617f192e59bb5336a911b148c1530fb864333da87c3d42a6fbf7d0ef074f6a53ce5a71db8ec706 From 950a4aec8ba4307343fec3fa8dbedfe80a919d50 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 12 Apr 2021 11:58:48 -0500 Subject: [PATCH 49/72] Add BuildRequires for file-devel --- keepalived.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/keepalived.spec b/keepalived.spec index 8f535e9..cab114e 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -36,6 +36,7 @@ BuildRequires: systemd-units BuildRequires: openssl-devel BuildRequires: libnl3-devel BuildRequires: libnfnetlink-devel +BuildRequires: file-devel BuildRequires: make %description @@ -61,7 +62,7 @@ infrastructures. %{?with_profile:--enable-profile} \ %{!?with_vrrp:--disable-vrrp} \ %{?with_snmp:--enable-snmp --enable-snmp-rfc} \ - %{?with_nftables:--enable-nftables --disable-iptables --disable-ipset} \ + %{?with_nftables:--enable-nftables --disable-iptables} \ %{?with_sha1:--enable-sha1} \ --with-init=systemd %{__make} %{?_smp_mflags} STRIP=/bin/true @@ -103,6 +104,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Mon Apr 12 2021 Ryan O'Hara - 2.2.2-2 +- Add BuildRequires for file-devel + * Wed Apr 07 2021 Ryan O'Hara - 2.2.2-1 - Update to 2.2.2 (#1935590) From ece94fbbeafba7329c49b958e185002789418df7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:41:04 +0000 Subject: [PATCH 50/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index cab114e..0ff02b2 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -104,6 +104,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Apr 12 2021 Ryan O'Hara - 2.2.2-2 - Add BuildRequires for file-devel From 68fd833be94b94f7381225021ab628db55ed8459 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 3 Aug 2021 12:48:52 -0500 Subject: [PATCH 51/72] Fix build errors (#1987620) --- bz1987620-fix-build-errors.patch | 32 ++++++++++++++++++++++++++++++++ keepalived.spec | 8 +++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 bz1987620-fix-build-errors.patch diff --git a/bz1987620-fix-build-errors.patch b/bz1987620-fix-build-errors.patch new file mode 100644 index 0000000..ee4a31b --- /dev/null +++ b/bz1987620-fix-build-errors.patch @@ -0,0 +1,32 @@ +From d9c99ffe43d9848579a472c7c5ec5515e6599cb9 Mon Sep 17 00:00:00 2001 +From: Ryan O'Hara +Date: Mon, 7 Jun 2021 16:58:23 -0500 +Subject: [PATCH] Fix build errors + +--- + keepalived/core/layer4.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c +index d2cc971a..fdca0491 100644 +--- a/keepalived/core/layer4.c ++++ b/keepalived/core/layer4.c +@@ -27,13 +27,14 @@ + #include + #include + #include ++#include ++#include + #include + #include + #ifdef ERRQUEUE_NEEDS_SYS_TIME + #include + #endif + #include +-#include + + #include "layer4.h" + #include "logger.h" +-- +2.31.1 + diff --git a/keepalived.spec b/keepalived.spec index 0ff02b2..1886933 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,13 +10,15 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service +Patch1: bz1987620-fix-build-errors.patch + Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -55,6 +57,7 @@ infrastructures. %prep %setup -q +%patch1 -p1 %build %configure \ @@ -104,6 +107,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Aug 03 2021 Ryan O'Hara - 2.2.2-4 +- Fix build errors (#1987620) + * Thu Jul 22 2021 Fedora Release Engineering - 2.2.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 465c8166fcad6e59be4b9d3384e01752c51394ac Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 3 Aug 2021 13:25:59 -0500 Subject: [PATCH 52/72] Add systemd notify support --- keepalived.service | 5 +++-- keepalived.spec | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/keepalived.service b/keepalived.service index a5a9b28..b4a521d 100644 --- a/keepalived.service +++ b/keepalived.service @@ -4,11 +4,12 @@ After=network-online.target syslog.target Wants=network-online.target [Service] -Type=forking +Type=notify +NotifyAccess=all PIDFile=/run/keepalived.pid KillMode=process EnvironmentFile=-/etc/sysconfig/keepalived -ExecStart=/usr/sbin/keepalived $KEEPALIVED_OPTIONS +ExecStart=/usr/sbin/keepalived --dont-fork $KEEPALIVED_OPTIONS ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/keepalived.spec b/keepalived.spec index 1886933..155f221 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -35,6 +35,7 @@ BuildRequires: iptables-devel %endif BuildRequires: gcc BuildRequires: systemd-units +BuildRequires: systemd-devel BuildRequires: openssl-devel BuildRequires: libnl3-devel BuildRequires: libnfnetlink-devel @@ -107,6 +108,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Aug 03 2021 Ryan O'Hara - 2.2.2-5 +- Add systemd notify support + * Tue Aug 03 2021 Ryan O'Hara - 2.2.2-4 - Fix build errors (#1987620) From 2d246f0caabac6a0da49bf3c1bf72d2e663f7793 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Sat, 14 Aug 2021 16:33:10 -0500 Subject: [PATCH 53/72] Update to 2.2.3 (#1993601) --- .gitignore | 1 + bz1987620-fix-build-errors.patch | 32 -------------------------------- keepalived.spec | 10 +++++----- sources | 2 +- 4 files changed, 7 insertions(+), 38 deletions(-) delete mode 100644 bz1987620-fix-build-errors.patch diff --git a/.gitignore b/.gitignore index 7f5d174..913af37 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /keepalived-2.2.0.tar.gz /keepalived-2.2.1.tar.gz /keepalived-2.2.2.tar.gz +/keepalived-2.2.3.tar.gz diff --git a/bz1987620-fix-build-errors.patch b/bz1987620-fix-build-errors.patch deleted file mode 100644 index ee4a31b..0000000 --- a/bz1987620-fix-build-errors.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d9c99ffe43d9848579a472c7c5ec5515e6599cb9 Mon Sep 17 00:00:00 2001 -From: Ryan O'Hara -Date: Mon, 7 Jun 2021 16:58:23 -0500 -Subject: [PATCH] Fix build errors - ---- - keepalived/core/layer4.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/keepalived/core/layer4.c b/keepalived/core/layer4.c -index d2cc971a..fdca0491 100644 ---- a/keepalived/core/layer4.c -+++ b/keepalived/core/layer4.c -@@ -27,13 +27,14 @@ - #include - #include - #include -+#include -+#include - #include - #include - #ifdef ERRQUEUE_NEEDS_SYS_TIME - #include - #endif - #include --#include - - #include "layer4.h" - #include "logger.h" --- -2.31.1 - diff --git a/keepalived.spec b/keepalived.spec index 155f221..77d63e5 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,16 +9,14 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.2.2 -Release: 5%{?dist} +Version: 2.2.3 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service -Patch1: bz1987620-fix-build-errors.patch - Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -58,7 +56,6 @@ infrastructures. %prep %setup -q -%patch1 -p1 %build %configure \ @@ -108,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Sat Aug 14 2021 Ryan O'Hara - 2.2.3-1 +- Update to 2.2.3 (#1993601) + * Tue Aug 03 2021 Ryan O'Hara - 2.2.2-5 - Add systemd notify support diff --git a/sources b/sources index 1754f00..7328974 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.2.2.tar.gz) = 05bb589c76faa4d3f734ecb1a3e5ac40af006fe5dce962bcd9617f192e59bb5336a911b148c1530fb864333da87c3d42a6fbf7d0ef074f6a53ce5a71db8ec706 +SHA512 (keepalived-2.2.3.tar.gz) = 79c884d73326c0ab4eb1cd9335b87b11f145549a8aa97da782b3b3371d361504b4c4a34a430d13fbbd2ae11c65e4980b283527e8327db142dba34c00fda25ccd From f1c64ecfa34fb07e9a82d85fa69a955d17c401ce Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 23 Aug 2021 09:14:11 -0500 Subject: [PATCH 54/72] Update to 2.2.4 (#1996274) --- .gitignore | 1 + keepalived.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 913af37..3d0ed91 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /keepalived-2.2.1.tar.gz /keepalived-2.2.2.tar.gz /keepalived-2.2.3.tar.gz +/keepalived-2.2.4.tar.gz diff --git a/keepalived.spec b/keepalived.spec index 77d63e5..35786bf 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,7 +9,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.2.3 +Version: 2.2.4 Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -105,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Mon Aug 23 2021 Ryan O'Hara - 2.2.4-1 +- Update to 2.2.4 (#1996274) + * Sat Aug 14 2021 Ryan O'Hara - 2.2.3-1 - Update to 2.2.3 (#1993601) diff --git a/sources b/sources index 7328974..1ab012a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.2.3.tar.gz) = 79c884d73326c0ab4eb1cd9335b87b11f145549a8aa97da782b3b3371d361504b4c4a34a430d13fbbd2ae11c65e4980b283527e8327db142dba34c00fda25ccd +SHA512 (keepalived-2.2.4.tar.gz) = b8b0f3e7092b7b7093a9927259928076ee95ed176dd26b3a5c38e8c0dc7b83468433944905618dbc9e4b73b81b0cd3f16c2db4234ed4fcdf30f4fc0e532f9422 From df4d8c96ef3985f66c0e7cf0bf886ca520fe940f Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:05:11 +0200 Subject: [PATCH 55/72] Rebuilt with OpenSSL 3.0.0 --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 35786bf..d5a8d64 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -105,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Sep 14 2021 Sahana Prasad - 2.2.4-2 +- Rebuilt with OpenSSL 3.0.0 + * Mon Aug 23 2021 Ryan O'Hara - 2.2.4-1 - Update to 2.2.4 (#1996274) From 1a50e5dce8999b6fb9595cab3f4b7f09d2406c79 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 28 Nov 2021 12:15:41 -0800 Subject: [PATCH 56/72] Rebuild for new libnftnl --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index d5a8d64..13597f8 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -105,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Sat Nov 27 2021 Kevin Fenzi - 2.2.4-3 +- Rebuild for new libnftnl + * Tue Sep 14 2021 Sahana Prasad - 2.2.4-2 - Rebuilt with OpenSSL 3.0.0 From 47102d40dfc76491abd905d041d1807639638be2 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 14 Dec 2021 10:13:13 -0600 Subject: [PATCH 57/72] Fix dbus policy (#2027158, CVE-2021-44225) --- bz2027158-fix-dbus-policy.patch | 41 +++++++++++++++++++++++++++++++++ keepalived.spec | 8 ++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 bz2027158-fix-dbus-policy.patch diff --git a/bz2027158-fix-dbus-policy.patch b/bz2027158-fix-dbus-policy.patch new file mode 100644 index 0000000..29d1fc5 --- /dev/null +++ b/bz2027158-fix-dbus-policy.patch @@ -0,0 +1,41 @@ +From 7977fec0be89ae6fe87405b3f8da2f0b5e415e3d Mon Sep 17 00:00:00 2001 +From: Vincent Bernat +Date: Tue, 23 Nov 2021 06:50:59 +0100 +Subject: [PATCH] dbus: fix policy to not be overly broad + +The DBus policy did not restrict the message destination, allowing any +user to inspect and manipulate any property. + +Signed-off-by: Vincent Bernat +--- + keepalived/dbus/org.keepalived.Vrrp1.conf | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/keepalived/dbus/org.keepalived.Vrrp1.conf b/keepalived/dbus/org.keepalived.Vrrp1.conf +index 2b78a575..b5ced608 100644 +--- a/keepalived/dbus/org.keepalived.Vrrp1.conf ++++ b/keepalived/dbus/org.keepalived.Vrrp1.conf +@@ -3,12 +3,15 @@ + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> + + +- +- ++ ++ + + +- +- +- ++ ++ ++ + + +-- +2.33.1 + diff --git a/keepalived.spec b/keepalived.spec index 13597f8..8b27078 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,13 +10,15 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service +Patch1: bz2027158-fix-dbus-policy.patch + Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -56,6 +58,7 @@ infrastructures. %prep %setup -q +%patch1 -p1 %build %configure \ @@ -105,6 +108,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Dec 14 2021 Ryan O'Hara - 2.2.4-4 +- Fix dbus policy (#2027158, CVE-2021-44225) + * Sat Nov 27 2021 Kevin Fenzi - 2.2.4-3 - Rebuild for new libnftnl From 6f08ad609296011fcb6d7c5d91222512a60c26d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 14:24:44 +0000 Subject: [PATCH 58/72] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 8b27078..e7e1d89 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -108,6 +108,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.2.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Dec 14 2021 Ryan O'Hara - 2.2.4-4 - Fix dbus policy (#2027158, CVE-2021-44225) From 10c982818243172f3b90d4af6bebe99c98174860 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Mon, 14 Feb 2022 13:07:46 -0600 Subject: [PATCH 59/72] Update to 2.2.7 (#2041231) --- .gitignore | 1 + bz2027158-fix-dbus-policy.patch | 41 --------------------------------- keepalived.spec | 10 ++++---- sources | 2 +- 4 files changed, 7 insertions(+), 47 deletions(-) delete mode 100644 bz2027158-fix-dbus-policy.patch diff --git a/.gitignore b/.gitignore index 3d0ed91..f32893f 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /keepalived-2.2.2.tar.gz /keepalived-2.2.3.tar.gz /keepalived-2.2.4.tar.gz +/keepalived-2.2.7.tar.gz diff --git a/bz2027158-fix-dbus-policy.patch b/bz2027158-fix-dbus-policy.patch deleted file mode 100644 index 29d1fc5..0000000 --- a/bz2027158-fix-dbus-policy.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7977fec0be89ae6fe87405b3f8da2f0b5e415e3d Mon Sep 17 00:00:00 2001 -From: Vincent Bernat -Date: Tue, 23 Nov 2021 06:50:59 +0100 -Subject: [PATCH] dbus: fix policy to not be overly broad - -The DBus policy did not restrict the message destination, allowing any -user to inspect and manipulate any property. - -Signed-off-by: Vincent Bernat ---- - keepalived/dbus/org.keepalived.Vrrp1.conf | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/keepalived/dbus/org.keepalived.Vrrp1.conf b/keepalived/dbus/org.keepalived.Vrrp1.conf -index 2b78a575..b5ced608 100644 ---- a/keepalived/dbus/org.keepalived.Vrrp1.conf -+++ b/keepalived/dbus/org.keepalived.Vrrp1.conf -@@ -3,12 +3,15 @@ - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - - -- -- -+ -+ - - -- -- -- -+ -+ -+ - - --- -2.33.1 - diff --git a/keepalived.spec b/keepalived.spec index e7e1d89..a14eb15 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -9,16 +9,14 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.2.4 -Release: 5%{?dist} +Version: 2.2.7 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service -Patch1: bz2027158-fix-dbus-policy.patch - Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -58,7 +56,6 @@ infrastructures. %prep %setup -q -%patch1 -p1 %build %configure \ @@ -108,6 +105,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Mon Feb 14 2022 Ryan O'Hara - 2.2.7-1 +- Update to 2.2.7 (#2041231) + * Thu Jan 20 2022 Fedora Release Engineering - 2.2.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 1ab012a..7b56158 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.2.4.tar.gz) = b8b0f3e7092b7b7093a9927259928076ee95ed176dd26b3a5c38e8c0dc7b83468433944905618dbc9e4b73b81b0cd3f16c2db4234ed4fcdf30f4fc0e532f9422 +SHA512 (keepalived-2.2.7.tar.gz) = 9869437fe6f0c10590b13088002b53474a51102da9838a6575d835d006c4871b61324ab80e0e81e0a23d0124e6f033cfc7114749e87b8f736408f3f0bedb3968 From ef92eda6bc2debf35967cd8d53737fb16c72b0db Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Thu, 7 Jul 2022 09:21:11 -0500 Subject: [PATCH 60/72] Move keepalived.conf.sample to keepalived.conf --- keepalived.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index a14eb15..23443bc 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -73,6 +73,8 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} rm -rf %{buildroot}%{_initrddir}/ rm -rf %{buildroot}%{_sysconfdir}/keepalived/samples/ +mv %{buildroot}%{_sysconfdir}/keepalived/keepalived.conf.sample \ + %{buildroot}%{_sysconfdir}/keepalived/keepalived.conf %{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/keepalived.service mkdir -p %{buildroot}%{_libexecdir}/keepalived @@ -105,6 +107,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jul 07 2022 Ryan O'Hara - 2.2.7-2 +- Move keepalived.conf.sample to keepalived.conf + * Mon Feb 14 2022 Ryan O'Hara - 2.2.7-1 - Update to 2.2.7 (#2041231) From ef21173d930a7c52bd65cec63c794ede08c2f1d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:51:41 +0000 Subject: [PATCH 61/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 23443bc..a224f4e 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,7 +10,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -107,6 +107,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jul 07 2022 Ryan O'Hara - 2.2.7-2 - Move keepalived.conf.sample to keepalived.conf From c78adb070ca5926239e1e959da934e8c5627e3df Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 7 Dec 2022 13:23:17 +0100 Subject: [PATCH 62/72] Fix spurious implicit function declaration in broken configure check Related to: --- keepalived-configure-c99.patch | 51 ++++++++++++++++++++++++++++++++++ keepalived.spec | 11 ++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 keepalived-configure-c99.patch diff --git a/keepalived-configure-c99.patch b/keepalived-configure-c99.patch new file mode 100644 index 0000000..cabf8d9 --- /dev/null +++ b/keepalived-configure-c99.patch @@ -0,0 +1,51 @@ +Fix a configure check that happens to trigger and implicit function +declaration error. + +Fixed slightly differently in upstream via: + +commit 516032ec39169d05c613de0e8ee10845658748ff +Author: Quentin Armitage +Date: Sun Apr 17 18:02:18 2022 +0100 + + config parser: Fix segfault caused by extra '}' and other parser fixes + + If there was a configuration error in a block, e.g. a vrrp_instance, + keepalived would apply the configuration in the rest of the block to + the previous object of that type, e.g. the previous vrrp instance. If + there had been no previous instance, keepalived would probably segfault. + + This commit changes the way the parser works. A new instance of an + object, e.g. a VRRP instance or a virtual server, is only added to the + list of those objects once the configuration of that object is complete. + In particular it no longer applies the configuration to the last entry + on the list of the relevant object type, but keeps a point to the + object currently being configured. + + Signed-off-by: Quentin Armitage + +diff --git a/configure b/configure +index 7cd6c4f614930391..b099b8f42aca1cba 100755 +--- a/configure ++++ b/configure +@@ -6382,7 +6382,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + #include + +- static int func(int i) __attribute__((error("deliberate error"))) ++ static int __attribute__((error("deliberate error"))) func(int i) + { + return i * 2; + } +diff --git a/configure.ac b/configure.ac +index 350a9f4e9567518c..5546143b4630aff6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -792,7 +792,7 @@ AC_COMPILE_IFELSE( + [[ + #include + +- static int func(int i) __attribute__((error("deliberate error"))) ++ static int __attribute__((error("deliberate error"))) func(int i) + { + return i * 2; + } diff --git a/keepalived.spec b/keepalived.spec index a224f4e..b4696be 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,12 +10,13 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service +Patch0: keepalived-configure-c99.patch Requires(post): systemd Requires(preun): systemd @@ -55,7 +56,10 @@ can be used independently or all together to provide resilient infrastructures. %prep -%setup -q +%autosetup -p1 + +# Prevent re-running autotools. +touch aclocal.m4 Makefile.in lib/config.h.in configure %build %configure \ @@ -107,6 +111,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Dec 7 2022 Florian Weimer - 2.2.7-4 +- Fix spurious implicit function declaration in broken configure check + * Thu Jul 21 2022 Fedora Release Engineering - 2.2.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 532118f86c7096d875ec411519e585865bce82a7 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 20 Dec 2022 18:14:59 -0600 Subject: [PATCH 63/72] Enable JSON support --- keepalived.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index b4696be..d3349ed 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -1,6 +1,7 @@ %bcond_without snmp %bcond_without vrrp %bcond_without sha1 +%bcond_without json %bcond_without nftables %bcond_with profile %bcond_with debug @@ -10,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.7 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -68,6 +69,7 @@ touch aclocal.m4 Makefile.in lib/config.h.in configure %{!?with_vrrp:--disable-vrrp} \ %{?with_snmp:--enable-snmp --enable-snmp-rfc} \ %{?with_nftables:--enable-nftables --disable-iptables} \ + %{?with_json:--enable-json} \ %{?with_sha1:--enable-sha1} \ --with-init=systemd %{__make} %{?_smp_mflags} STRIP=/bin/true @@ -111,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Tue Dec 20 2022 Ryan O'Hara - 2.2.7-5 +- Enable JSON support + * Wed Dec 7 2022 Florian Weimer - 2.2.7-4 - Fix spurious implicit function declaration in broken configure check From de115a1372cd7d7a3e5173a0e4f7147ad23cb8df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 14:21:30 +0000 Subject: [PATCH 64/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index d3349ed..a27852c 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.7 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.2.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Dec 20 2022 Ryan O'Hara - 2.2.7-5 - Enable JSON support From 780ef6446b07a9271d6b71c5730626baec512e03 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Thu, 8 Jun 2023 18:00:01 -0500 Subject: [PATCH 65/72] Update to 2.2.8 (#2211385) --- .gitignore | 1 + keepalived.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f32893f..fc05a06 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /keepalived-2.2.3.tar.gz /keepalived-2.2.4.tar.gz /keepalived-2.2.7.tar.gz +/keepalived-2.2.8.tar.gz diff --git a/keepalived.spec b/keepalived.spec index a27852c..1362ad4 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -10,14 +10,14 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers -Version: 2.2.7 -Release: 6%{?dist} +Version: 2.2.8 +Release: 1%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service -Patch0: keepalived-configure-c99.patch +#Patch0: keepalived-configure-c99.patch Requires(post): systemd Requires(preun): systemd @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jun 08 2023 Ryan O'Hara - 2.2.8-1 +- Update to 2.2.8 (#2211385) + * Thu Jan 19 2023 Fedora Release Engineering - 2.2.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 7b56158..68261a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (keepalived-2.2.7.tar.gz) = 9869437fe6f0c10590b13088002b53474a51102da9838a6575d835d006c4871b61324ab80e0e81e0a23d0124e6f033cfc7114749e87b8f736408f3f0bedb3968 +SHA512 (keepalived-2.2.8.tar.gz) = dc0ab5b0ef8911a7859422eccc2771a40e942236c855a628158ed748eb5f7dc4b6f4850e9c3057e81fd9d2daa640ab51fb1d7af12748a613280a217b333eb06b From 098dca0ed21074b53aa7aed9026b4a0831bfbad2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 08:41:22 +0000 Subject: [PATCH 66/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 1362ad4..121b73f 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 2.2.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 08 2023 Ryan O'Hara - 2.2.8-1 - Update to 2.2.8 (#2211385) From df0ff14d28dd89b4d19d8d58696f5db0900f6eae Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Fri, 4 Aug 2023 11:24:33 -0500 Subject: [PATCH 67/72] Migrate to SPDX license --- keepalived.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/keepalived.spec b/keepalived.spec index 121b73f..2ab8e6e 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,8 +11,8 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 2%{?dist} -License: GPLv2+ +Release: 3%{?dist} +License: GPL-2.0-or-later URL: http://www.keepalived.org/ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Fri Aug 04 2023 Ryan O'Hara - 2.2.8-3 +- Migrate to SPDX license + * Thu Jul 20 2023 Fedora Release Engineering - 2.2.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 92bd098510522b0fc04f4f7870738c1f78ab6894 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 00:14:23 +0000 Subject: [PATCH 68/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 2ab8e6e..0b5da89 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 2.2.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Aug 04 2023 Ryan O'Hara - 2.2.8-3 - Migrate to SPDX license From 4151e48314acdf270dbc0e48b93bd204c5a8c3ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:54:28 +0000 Subject: [PATCH 69/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 0b5da89..506f3eb 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.2.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 2.2.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f65880bc11a1a6c9fc64cc7793768fecacc1a774 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:38:15 +0000 Subject: [PATCH 70/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 506f3eb..fb45386 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.2.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 2.2.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 07efe939867a2a58a5b5ea8deb0666f87e7e2bd5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 08:36:42 +0000 Subject: [PATCH 71/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index fb45386..6a06c0d 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-2.0-or-later URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.2.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 2.2.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f2489fa190b0efca5bd8aac2c15822346370bfd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:22:50 +0000 Subject: [PATCH 72/72] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- keepalived.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keepalived.spec b/keepalived.spec index 6a06c0d..28896aa 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -11,7 +11,7 @@ Name: keepalived Summary: High Availability monitor built upon LVS, VRRP and service pollers Version: 2.2.8 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL-2.0-or-later URL: http://www.keepalived.org/ @@ -113,6 +113,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man8/keepalived.8* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.2.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 2.2.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild