Patchwork [2/2] quagga: bump to version 0.99.22.1

login
register
mail settings
Submitter Gustavo Zacarias
Date April 16, 2013, 12:39 a.m.
Message ID <1366072783-28319-2-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/236799/
State Accepted
Commit 14dcb32ee45ccc8861365086d3d6c502458edae7
Headers show

Comments

Gustavo Zacarias - April 16, 2013, 12:39 a.m.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/quagga/quagga.mk | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
Peter Korsgaard - April 17, 2013, 7:49 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Gustavo> ---
 Gustavo>  package/quagga/quagga.mk | 7 ++-----
 Gustavo>  1 file changed, 2 insertions(+), 5 deletions(-)

 Gustavo> diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
 Gustavo> index fb060ef..42f8506 100644
 Gustavo> --- a/package/quagga/quagga.mk
 Gustavo> +++ b/package/quagga/quagga.mk
 Gustavo> @@ -4,7 +4,7 @@
 Gustavo>  #
 Gustavo>  #############################################################
 
 Gustavo> -QUAGGA_VERSION = 0.99.21
 Gustavo> +QUAGGA_VERSION = 0.99.22.1
 Gustavo>  QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga
 Gustavo>  QUAGGA_DEPENDENCIES = host-gawk
 Gustavo>  QUAGGA_LICENSE = GPLv2+
 Gustavo> @@ -25,12 +25,9 @@ QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZERBRA),--enable-tcp-zebra,--di
 Gustavo>  QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),--enable-opaque-lsa,--disable-opaque-lsa)
 
 Gustavo>  ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y)
 Gustavo> +QUAGGA_CONF_ENV += ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
 Gustavo>  QUAGGA_CONF_OPT += --enable-snmp
 Gustavo>  QUAGGA_DEPENDENCIES += netsnmp
 Gustavo> -# SNMP support tries -lcrypto by default, disable it if we ain't got openssl
 Gustavo> -ifneq ($(BR2_PACKAGE_OPENSSL),y)
 Gustavo> -QUAGGA_CONF_OPT +=--without-crypto
 Gustavo> -endif

Why? Doesn't it have crypto support any more? Or if it does, shouldn't
we ensure it gets built after openssl?

 Gustavo>  else
 Gustavo>  QUAGGA_CONF_OPT +=--disable-snmp
 Gustavo>  endif
 Gustavo> -- 
 Gustavo> 1.8.1.5

 Gustavo> _______________________________________________
 Gustavo> buildroot mailing list
 Gustavo> buildroot@busybox.net
 Gustavo> http://lists.busybox.net/mailman/listinfo/buildroot
Gustavo Zacarias - April 17, 2013, 7:50 p.m.
On 04/17/2013 04:49 PM, Peter Korsgaard wrote:

> Why? Doesn't it have crypto support any more? Or if it does, shouldn't
> we ensure it gets built after openssl?

It was a bad default link line regarding net-snmp in the previous
versions, fixed by the switch to net-snmp-config.
Regards.
Peter Korsgaard - April 17, 2013, 7:54 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> On 04/17/2013 04:49 PM, Peter Korsgaard wrote:
 >> Why? Doesn't it have crypto support any more? Or if it does, shouldn't
 >> we ensure it gets built after openssl?

 Gustavo> It was a bad default link line regarding net-snmp in the
 Gustavo> previous versions, fixed by the switch to net-snmp-config.

Ok, thanks.
Peter Korsgaard - April 17, 2013, 7:54 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Committed, thanks.

Patch

diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index fb060ef..42f8506 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -4,7 +4,7 @@ 
 #
 #############################################################
 
-QUAGGA_VERSION = 0.99.21
+QUAGGA_VERSION = 0.99.22.1
 QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga
 QUAGGA_DEPENDENCIES = host-gawk
 QUAGGA_LICENSE = GPLv2+
@@ -25,12 +25,9 @@  QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZERBRA),--enable-tcp-zebra,--di
 QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),--enable-opaque-lsa,--disable-opaque-lsa)
 
 ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y)
+QUAGGA_CONF_ENV += ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
 QUAGGA_CONF_OPT += --enable-snmp
 QUAGGA_DEPENDENCIES += netsnmp
-# SNMP support tries -lcrypto by default, disable it if we ain't got openssl
-ifneq ($(BR2_PACKAGE_OPENSSL),y)
-QUAGGA_CONF_OPT +=--without-crypto
-endif
 else
 QUAGGA_CONF_OPT +=--disable-snmp
 endif