From d2c32546c5a50996f07af3dc21c4470189a89036 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Thu, 15 Sep 2016 10:50:20 -0500
Subject: [PATCH 01/11] Update to 1.2.24 (#1376254)

---
 .gitignore      | 1 +
 keepalived.spec | 5 ++++-
 sources         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 79b18ce..b22de8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /keepalived-1.2.21.tar.gz
 /keepalived-1.2.22.tar.gz
 /keepalived-1.2.23.tar.gz
+/keepalived-1.2.24.tar.gz
diff --git a/keepalived.spec b/keepalived.spec
index 6b5513c..53da84b 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.2.23
+Version: 1.2.24
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
@@ -108,6 +108,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Thu Sep 15 2016 Ryan O'Hara <rohara@redhat.com> - 1.2.24-1
+- Update to 1.2.24 (#1376254)
+
 * Wed Jul 13 2016 Ryan O'Hara <rohara@redhat.com> - 1.2.23-1
 - Update to 1.2.23 (#1354696)
 
diff --git a/sources b/sources
index 4a8fda8..77133bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-451919d34d0af969a2c574529dca96e9  keepalived-1.2.23.tar.gz
+e878312095b7dcab91ad06e257822247  keepalived-1.2.24.tar.gz

From 86bf8a191d5eebf1918afd8ddea7aa840ad97bb3 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Fri, 16 Sep 2016 14:14:06 -0500
Subject: [PATCH 02/11] Fix configure script

---
 configure.patch        | 562 +++++++++++++++++++++++++++++++++++++++++
 install-vrrp-mib.patch |  35 ---
 keepalived.spec        |   8 +-
 3 files changed, 569 insertions(+), 36 deletions(-)
 create mode 100644 configure.patch
 delete mode 100644 install-vrrp-mib.patch

diff --git a/configure.patch b/configure.patch
new file mode 100644
index 0000000..015742b
--- /dev/null
+++ b/configure.patch
@@ -0,0 +1,562 @@
+--- 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 -- <linux/netlink.h> needed <sys/socket.h> 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 <sys/socket.h>]])
++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 <net/if.h>
+       #include <netlink/route/link.h>
+@@ -358,12 +364,14 @@
+       AC_DEFINE([_HAVE_IF_H_LINK_H_COLLISION_], [ 1 ], [Define to 1 if <net/if.h> and <netlink/route/link.h> 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 <linux/ip.h>]])
++  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 <linux/netfilter/x_tables.h> doesnt define it])],
+       [#include <linux/netfilter/x_tables.h>])
++
++    CPPFLAGS="$SAV_CPPFLAGS"
+   fi
+ fi
+ AM_CONDITIONAL([LIBIPTC], [test $USE_LIBIPTC = Yes])
+@@ -488,7 +502,8 @@
+ # Linux 4.5 to 4.5.4 has <libiptc/libiptc.h> indirectly including <net/if.h>
+ # and <linux/if.h> 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 <libiptc/libiptc.h>
+   ]])],
+@@ -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 <sys/socket.h>
+       #include <linux/fib_rules.h>]])
+ 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 <linux/if_link.h>
+     ]])
+ 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 <net-snmp/agent/util_funcs.h> 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 <net-snmp/net-snmp-config.h>
+@@ -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 <sched.h>]])
+ 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 @@
+ # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+ 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 <linux/rtnetlink.h>
+@@ -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 <linux/ip.h>
+ "
+ 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 <linux/if.h> 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 <linux/ip_vs.h>
+ "
+@@ -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 <linux/ip_vs.h>
+ "
+@@ -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 <sys/socket.h>
+@@ -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 <sys/socket.h>
+       #include <linux/fib_rules.h>
+ "
+@@ -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 <net-snmp/agent/util_funcs.h> 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 <sched.h>
+ "
+ 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/install-vrrp-mib.patch b/install-vrrp-mib.patch
deleted file mode 100644
index c44cdab..0000000
--- a/install-vrrp-mib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 15105f7a4d8c6661326e3e70b6bdc27b36e88cd7 Mon Sep 17 00:00:00 2001
-From: Ryan O'Hara <rohara@redhat.com>
-Date: Tue, 5 Apr 2016 08:50:33 -0500
-Subject: [PATCH] Install VRRP-MIB when applicable
-
-It appears that the condition in Makefile.in for installing VRRP-MIB
-was using a non-existent macro, SNMP_RFC2_SUPPORT. This patch removes
-two conditions from Makefile.in that use undefined macros and adds a
-condition to install VRRP-MIB when SNMP_RFCV2_SUPPORT is set
-appropriately.
----
- Makefile.in | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index e77f046..fa88656 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -85,12 +85,9 @@ install:
- 	$(MAKE) -C genhash install
- ifeq (@SNMP_SUPPORT@, _WITH_SNMP_)
- 	mkdir -p $(DESTDIR)/usr/share/snmp/mibs/
--ifeq (@SNMP_RFC2_SUPPORT@, _WITH_SNMP_RFC2_)
-+ifeq (@SNMP_RFCV2_SUPPORT@, _WITH_SNMP_RFCV2_)
- 	cp -f doc/VRRP-MIB $(DESTDIR)/usr/share/snmp/mibs/
- endif
--ifeq (@SNMP_RFC3_SUPPORT@, _WITH_SNMP_RFC3_)
--	cp -f doc/VRRPv3-MIB $(DESTDIR)/usr/share/snmp/mibs/
--endif
- ifeq (@SNMP_RFCV3_SUPPORT@, _WITH_SNMP_RFCV3_)
- 	cp -f doc/VRRPv3-MIB $(DESTDIR)/usr/share/snmp/mibs/
- endif
--- 
-2.4.3
-
diff --git a/keepalived.spec b/keepalived.spec
index 53da84b..3a4e833 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: 1.2.24
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 Group: System Environment/Daemons
@@ -17,6 +17,8 @@ Group: System Environment/Daemons
 Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Source1: keepalived.service
 
+Patch0: configure.patch
+
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -47,6 +49,7 @@ infrastructures.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -108,6 +111,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Fri Sep 16 2016 Ryan O'Hara <rohara@redhat.com> - 1.2.24-2
+- Fix configure script
+
 * Thu Sep 15 2016 Ryan O'Hara <rohara@redhat.com> - 1.2.24-1
 - Update to 1.2.24 (#1376254)
 

From fc9ae2358443565b7f7f8b69a5d8961983a20e94 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Fri, 16 Sep 2016 15:34:39 -0500
Subject: [PATCH 03/11] Update keepalived-1.2.24 tarball

---
 keepalived.spec | 3 ---
 sources         | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/keepalived.spec b/keepalived.spec
index 3a4e833..15f736b 100644
--- a/keepalived.spec
+++ b/keepalived.spec
@@ -17,8 +17,6 @@ Group: System Environment/Daemons
 Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Source1: keepalived.service
 
-Patch0: configure.patch
-
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -49,7 +47,6 @@ infrastructures.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \
diff --git a/sources b/sources
index 77133bb..3fff0cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e878312095b7dcab91ad06e257822247  keepalived-1.2.24.tar.gz
+1b027083376ae1b5ff712f38fcf5293f  keepalived-1.2.24.tar.gz

From 7a74e981febc30f4426df4dd8471571083dd8c1e Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Fri, 16 Sep 2016 15:45:18 -0500
Subject: [PATCH 04/11] Add BuildRequires for iptables-devel (#1361686)

---
 keepalived.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/keepalived.spec b/keepalived.spec
index 15f736b..0ff3c36 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: 1.2.24
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 Group: System Environment/Daemons
@@ -29,6 +29,7 @@ BuildRequires: systemd-units
 BuildRequires: openssl-devel
 BuildRequires: libnl3-devel
 BuildRequires: ipset-devel
+BuildRequires: iptables-devel
 BuildRequires: libnfnetlink-devel
 
 %description
@@ -108,6 +109,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Fri Sep 16 2016 Ryan O'Hara <rohara@redhat.com> - 1.2.24-3
+- Add BuildRequires for iptables-devel (#1361686)
+
 * Fri Sep 16 2016 Ryan O'Hara <rohara@redhat.com> - 1.2.24-2
 - Fix configure script
 

From 2b5c163081ed819f0bac838e5582ab585ccd6351 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Mon, 28 Nov 2016 09:10:20 -0600
Subject: [PATCH 05/11] Update to 1.3.2 (#1396857)

---
 .gitignore      |  1 +
 keepalived.spec | 17 +++++------------
 sources         |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index b22de8d..3126734 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /keepalived-1.2.22.tar.gz
 /keepalived-1.2.23.tar.gz
 /keepalived-1.2.24.tar.gz
+/keepalived-1.3.2.tar.gz
diff --git a/keepalived.spec b/keepalived.spec
index 0ff3c36..ae37a7e 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.2.24
-Release: 3%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
 Group: System Environment/Daemons
@@ -66,16 +66,6 @@ rm -rf %{buildroot}%{_sysconfdir}/keepalived/samples/
 %{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/keepalived.service
 mkdir -p %{buildroot}%{_libexecdir}/keepalived
 
-%if %{with snmp}
-mkdir -p %{buildroot}%{_datadir}/snmp/mibs/
-%{__mv} %{buildroot}%{_datadir}/snmp/mibs/KEEPALIVED-MIB \
-    %{buildroot}%{_datadir}/snmp/mibs/KEEPALIVED-MIB.txt
-%{__mv} %{buildroot}%{_datadir}/snmp/mibs/VRRP-MIB \
-    %{buildroot}%{_datadir}/snmp/mibs/VRRP-MIB.txt
-    %{__mv} %{buildroot}%{_datadir}/snmp/mibs/VRRPv3-MIB \
-    %{buildroot}%{_datadir}/snmp/mibs/VRRPv3-MIB.txt
-%endif
-
 %clean
 rm -rf %{buildroot}
 
@@ -109,6 +99,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Mon Nov 28 2016 Ryan O'Hara <rohara@redhat.com> - 1.3.2-1
+- Update to 1.3.2 (#1396857)
+
 * Fri Sep 16 2016 Ryan O'Hara <rohara@redhat.com> - 1.2.24-3
 - Add BuildRequires for iptables-devel (#1361686)
 
diff --git a/sources b/sources
index 3fff0cf..9ad9739 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b027083376ae1b5ff712f38fcf5293f  keepalived-1.2.24.tar.gz
+744025d57c7f065c42fe925b0283897e  keepalived-1.3.2.tar.gz

From 68f15cb7f3b35d0701cfe5c01ea64501c4f60ebf Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Sun, 26 Mar 2017 16:37:35 -0500
Subject: [PATCH 06/11] Fix systemd service to start after
 network-online.target (#1413320)

---
 keepalived.service | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keepalived.service b/keepalived.service
index 1b3e587..64c5d3f 100644
--- a/keepalived.service
+++ b/keepalived.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=LVS and VRRP High Availability Monitor
-After=syslog.target network-online.target
+After=network-online.target syslog.target
+Wants=network-online.target
 
 [Service]
 Type=forking

From 9a96084b5059ad61bde58db64f6cb0cbfa82432d Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Sun, 26 Mar 2017 16:42:35 -0500
Subject: [PATCH 07/11] Update to 1.3.5 (#1422063)

---
 .gitignore      | 1 +
 keepalived.spec | 5 ++++-
 sources         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3126734..cbf28ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /keepalived-1.2.23.tar.gz
 /keepalived-1.2.24.tar.gz
 /keepalived-1.3.2.tar.gz
+/keepalived-1.3.5.tar.gz
diff --git a/keepalived.spec b/keepalived.spec
index ae37a7e..cb938bd 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.2
+Version: 1.3.5
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
@@ -99,6 +99,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Sun Mar 26 2017 Ryan O'Hara <rohara@redhat.com> - 1.3.5-1
+- Update to 1.3.5 (#1422063)
+
 * Mon Nov 28 2016 Ryan O'Hara <rohara@redhat.com> - 1.3.2-1
 - Update to 1.3.2 (#1396857)
 
diff --git a/sources b/sources
index 9ad9739..de055d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-744025d57c7f065c42fe925b0283897e  keepalived-1.3.2.tar.gz
+SHA512 (keepalived-1.3.5.tar.gz) = ebd710167becd4b99b665877953d19477c11f1d1c736eb580a05dedd4946363b756553e20607f34aa6c35f57b7252d8a22287beedc316b62a745fccc4243a720

From 55f7b2900df796fe91fc00ba3efc92b33b310873 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Tue, 12 Sep 2017 16:01:33 -0600
Subject: [PATCH 08/11] 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 cb938bd..41a3800 100644
--- a/keepalived.spec
+++ b/keepalived.spec
@@ -55,7 +55,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 d3dd1cde0b7ffe7fe554d04827b61c750ed3773c Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Mon, 11 Sep 2017 10:14:07 -0600
Subject: [PATCH 09/11] 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                   |  13 +-
 5 files changed, 330 insertions(+), 563 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 -- <linux/netlink.h> needed <sys/socket.h> 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 <sys/socket.h>]])
-+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 <net/if.h>
-       #include <netlink/route/link.h>
-@@ -358,12 +364,14 @@
-       AC_DEFINE([_HAVE_IF_H_LINK_H_COLLISION_], [ 1 ], [Define to 1 if <net/if.h> and <netlink/route/link.h> 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 <linux/ip.h>]])
-+  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 <linux/netfilter/x_tables.h> doesnt define it])],
-       [#include <linux/netfilter/x_tables.h>])
-+
-+    CPPFLAGS="$SAV_CPPFLAGS"
-   fi
- fi
- AM_CONDITIONAL([LIBIPTC], [test $USE_LIBIPTC = Yes])
-@@ -488,7 +502,8 @@
- # Linux 4.5 to 4.5.4 has <libiptc/libiptc.h> indirectly including <net/if.h>
- # and <linux/if.h> 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 <libiptc/libiptc.h>
-   ]])],
-@@ -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 <sys/socket.h>
-       #include <linux/fib_rules.h>]])
- 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 <linux/if_link.h>
-     ]])
- 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 <net-snmp/agent/util_funcs.h> 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 <net-snmp/net-snmp-config.h>
-@@ -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 <sched.h>]])
- 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 @@
- # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
- 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 <linux/rtnetlink.h>
-@@ -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 <linux/ip.h>
- "
- 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 <linux/if.h> 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 <linux/ip_vs.h>
- "
-@@ -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 <linux/ip_vs.h>
- "
-@@ -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 <sys/socket.h>
-@@ -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 <sys/socket.h>
-       #include <linux/fib_rules.h>
- "
-@@ -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 <net-snmp/agent/util_funcs.h> 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 <sched.h>
- "
- 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 <quentin@armitage.org.uk>
+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 <quentin@armitage.org.uk>
+---
+ 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 <quentin@armitage.org.uk>
+Date: Tue, 15 Aug 2017 20:38:42 +0100
+Subject: [PATCH] Fix sense of a conditional compilation check
+
+Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
+---
+ 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 <quentin@armitage.org.uk>
+Date: Fri, 1 Sep 2017 14:14:25 +0100
+Subject: [PATCH] Generate README from README.md
+
+Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
+---
+ .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, <acassen@gmail.com>
++
+ 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 41a3800..f527cd1 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.5
+Version: 1.3.6
 Release: 1%{?dist}
 License: GPLv2+
 URL: http://www.keepalived.org/
@@ -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 \
@@ -100,6 +108,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Mon Sep 11 2017 Ryan O'Hara <rohara@redhat.com> - 1.3.6-1
+- Update to 1.3.6 (#1481471)
+
 * Sun Mar 26 2017 Ryan O'Hara <rohara@redhat.com> - 1.3.5-1
 - Update to 1.3.5 (#1422063)
 

From bfcd412e89576170f4f5f92690f84041e900f460 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Mon, 11 Sep 2017 10:23:20 -0600
Subject: [PATCH 10/11] 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 ed1468074d10800885290e74990391aae71007fe Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Wed, 25 Oct 2017 10:00:55 -0500
Subject: [PATCH 11/11] 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 <quentin@armitage.org.uk>
-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 <quentin@armitage.org.uk>
----
- 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 <quentin@armitage.org.uk>
-Date: Tue, 15 Aug 2017 20:38:42 +0100
-Subject: [PATCH] Fix sense of a conditional compilation check
-
-Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
----
- 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 <quentin@armitage.org.uk>
-Date: Fri, 1 Sep 2017 14:14:25 +0100
-Subject: [PATCH] Generate README from README.md
-
-Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
----
- .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, <acassen@gmail.com>
-+
- 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 f527cd1..54f2b08 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 <rohara@redhat.com> - 1.3.9-1
+- Update to 1.3.9 (#1497576)
+
 * Mon Sep 11 2017 Ryan O'Hara <rohara@redhat.com> - 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