From: Yann E. MORIN Date: Sat, 15 Aug 2020 22:39:24 +0200 Subject: [Buildroot] [PATCH] package/keepalived: ipset support only makes sense when iptables is enabled In-Reply-To: <20200815195851.282863-1-thomas.petazzoni@bootlin.com> References: <20200815195851.282863-1-thomas.petazzoni@bootlin.com> Message-ID: <20200815203924.GB24264@scaer> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Thomas, All, On 2020-08-15 21:58 +0200, Thomas Petazzoni spake thusly: > In keepalived, ipset is only used when iptables support is > enabled. The configure.ac script is quite convoluted, but one can > clearly see: > > AS_IF([test .$enable_iptables != .no], > [ > ... testing for iptables ... > if test $USE_IPTABLES = Yes; then > dnl ----[Check for ipset libraries]---- > SAV_CPPFLAGS="$CPPFLAGS" > CPPFLAGS="$CPPFLAGS $kernelinc" > if test "${enable_libipset}" != no; then > ... testing for libipset ... > fi > ] > > So, the libipset library is only tested and used if iptables is > enabled. This is also visible by the code that shows at the end of the > configure script which features are enabled: > > echo "Use iptables : ${USE_IPTABLES}" > if test .$USE_IPTABLES = .Yes; then > echo "Use libipset : ${USE_LIBIPSET}" > fi > > Once again, the libipset support only makes sense when iptables is > enabled. > > However, the configure.ac script also has some logic to detect if a > ---libipset option is passed while iptables is enabled: > > AS_IF([test .$enable_iptables = .no], > AS_IF([test .$enable_libipset != .], [AC_MSG_ERROR([disable-libipset requires vrrp and iptables])]) > ) > > The error message is quite misleading because it is in fact displayed > as soon as a ---libipset is passed not just > --disable-libipset. > > In the context of Buildroot, we are always passing a > ---libipset, regardless of whether iptables support is > enabled or not, which makes the build error out: > > configure: error: disable-libipset requires vrrp and iptables > > This commit fixes that by enclosing the libipset logic inside the > iptables condition. When iptables is not available, we pass > --disable-iptables and that's it, nothing else is needed. When > iptables is available, we pass --enable-iptables *and* > --enable-libipset or --disable-libipset depending on the availability > of libipset. > > This has been tested successfully with the following combinations: > > - keepalived, without iptables or libipset > - keepalived, with iptables, but without libipset > - keepalived, without iptables, but with libipset. In this case > libipset is obviously not used. > - keepalived, with iptables and with libipset. Both are used. Note > that you will not see the keepalived binary linked with libipset.so > in "readelf -d" because keepalived dlopen()s the libipset.so > library by default. > > Fixes: > > http://autobuild.buildroot.org/results/a1712b2cc3ad878e6876325ec7d4c434d0d9d11b/ > (case with --disable-libipset --disable-iptables) > > http://autobuild.buildroot.net/results/4567e3b0a0510e8a615781178ff5bbbd835a92c3/ > (case with --enable-libipset --disable-iptables) > > Signed-off-by: Thomas Petazzoni Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/keepalived/keepalived.mk | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk > index df1ab6d306..1a42d0c880 100644 > --- a/package/keepalived/keepalived.mk > +++ b/package/keepalived/keepalived.mk > @@ -32,16 +32,16 @@ else > KEEPALIVED_CONF_OPTS += --disable-libnl > endif > > +ifeq ($(BR2_PACKAGE_IPTABLES),y) > +KEEPALIVED_DEPENDENCIES += iptables > +KEEPALIVED_CONF_OPTS += --enable-iptables > +# ipset support only makes sense when iptables support is enabled. > ifeq ($(BR2_PACKAGE_IPSET),y) > KEEPALIVED_DEPENDENCIES += ipset > KEEPALIVED_CONF_OPTS += --enable-libipset > else > KEEPALIVED_CONF_OPTS += --disable-libipset > endif > - > -ifeq ($(BR2_PACKAGE_IPTABLES),y) > -KEEPALIVED_DEPENDENCIES += iptables > -KEEPALIVED_CONF_OPTS += --enable-iptables > else > KEEPALIVED_CONF_OPTS += --disable-iptables > endif > -- > 2.26.2 > -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'