[packages] net-snmp: Enable ipv6 support if defined globally

[openwrt/svn-archive/archive.git] / libs / net-snmp / Makefile

diff --git a/libs/net-snmp/Makefile b/libs/net-snmp/Makefile
index 235f8f2e8c4b2696c6d9f79147753d88de3b75b8..c3f10b79774e1496ad46de70bd124a0cda42417e 100644 (file)
--- a/libs/net-snmp/Makefile
+++ b/libs/net-snmp/Makefile
@@ -1,20 +1,19 @@
-# 
-# Copyright (C) 2006-2007 OpenWrt.org
+#
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=net-snmp
-PKG_VERSION:=5.1.2
-PKG_RELEASE:=2.3
+PKG_VERSION:=5.4.2.1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/net-snmp
-PKG_MD5SUM:=8080555ab3f90011f25d5122042d9a8d
+PKG_MD5SUM:=984932520143f0c8bf7b7ce1fc9e1da1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -38,7 +37,7 @@ $(call Package/net-snmp/Default)
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=+libelf
-  TITLE:=Open source SNMP implementation (librairies)
+  TITLE:=Open source SNMP implementation (libraries)
 endef
 
 define Package/libnetsnmp/description
@@ -77,6 +76,7 @@ endef
 define Package/snmpd-static
 $(call Package/net-snmp/Default)
   TITLE:=Open source SNMP implementation (daemon)
+  DEPENDS:=+libelf
 endef
 
 define Package/snmpd-static/description
@@ -95,9 +95,10 @@ SNMP_MIB_MODULES_INCLUDED = \
        host/hr_proc \
        host/hr_storage \
        host/hr_system \
+       ieee802dot11 \
        mibII/at \
        mibII/icmp \
-       mibII/interfaces \
+       mibII/ifTable \
        mibII/ip \
        mibII/snmp_mib \
        mibII/sysORTable \
@@ -110,7 +111,6 @@ SNMP_MIB_MODULES_INCLUDED = \
        snmpv3/snmpMPDStats \
        snmpv3/usmStats \
        snmpv3/usmUser \
-       snmpv3mibs \
        tunnel \
        ucd-snmp/disk \
        ucd-snmp/dlmod \
@@ -126,18 +126,26 @@ SNMP_MIB_MODULES_INCLUDED = \
 SNMP_MIB_MODULES_EXCLUDED = \
        agent_mibs \
        agentx \
+       disman/event \
+       disman/schedule \
+       hardware \
        host \
-       ieee802dot11 \
+       if-mib \
        mibII \
        notification \
+       notification-log-mib \
        snmpv3mibs \
        target \
+       tcp-mib \
        ucd_snmp \
+       udp-mib \
        utilities \
 
-SNMP_TRANSPORTS_INCLUDED = Callback UDP
+SNMP_TRANSPORTS_INCLUDED = Callback UDP 
 
-SNMP_TRANSPORTS_EXCLUDED = TCP TCPv6 UDPv6 Unix
+SNMP_TRANSPORTS_EXCLUDED = TCP TCPIPv6 Unix
+
+TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
        --enable-shared \
@@ -150,7 +158,6 @@ CONFIGURE_ARGS += \
        --with-sys-location=Unknown \
        --enable-applications \
        --disable-debugging \
-       --disable-ipv6 \
        --disable-manuals \
        --disable-mibs \
        --disable-scripts \
@@ -163,17 +170,23 @@ CONFIGURE_ARGS += \
        --without-rpm \
        --without-zlib \
 
+ifeq ($(CONFIG_IPV6),y)
+SNMP_TRANSPORTS_INCLUDED+= UDPIPv6
+CONFIGURE_ARGS+= --enable-ipv6
+endif
+
 define Build/Compile
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
+               LDFLAGS="$(TARGET_LDFLAGS) -lm" \
                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
                all install
        ( cd $(PKG_INSTALL_DIR); mv ./usr/sbin/snmpd ./usr/sbin/snmpd-shared; )
        #ifneq ($(CONFIG_PACKAGE_snmpd-static),)
        ( cd $(PKG_BUILD_DIR); rm -f agent/snmpd; )
        $(MAKE) -C $(PKG_BUILD_DIR) \
-               LDFLAGS="$(TARGET_LDFLAGS) -static" \
+               LDFLAGS="$(TARGET_LDFLAGS) -lm -static" \
                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
                all install
        ( cd $(PKG_INSTALL_DIR); mv ./usr/sbin/snmpd ./usr/sbin/snmpd-static; )
@@ -181,14 +194,14 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(1)/usr/bin/
-       mkdir -p $(1)/usr/include
+       $(INSTALL_DIR) $(2)/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(2)/bin/
+       $(SED) 's,=/usr,=$(STAGING_DIR)/usr,g' $(2)/bin/net-snmp-config
+
+       $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/net-snmp $(1)/usr/include/
-       mkdir -p $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(1)/usr/lib/
-       $(SED) 's,-I/usr/include,,g' $(1)/usr/bin/net-snmp-config
-       $(SED) 's,-L/usr/lib,,g' $(1)/usr/bin/net-snmp-config
 endef
 
 define Package/libnetsnmp/install
@@ -198,12 +211,14 @@ endef
 
 define Package/snmpd/conffiles
 /etc/default/snmpd
-/etc/snmp/snmpd.conf
+/etc/config/snmpd
 endef
 
 define Package/snmpd/install
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/config/snmpd
        $(INSTALL_DIR) $(1)/etc/snmp
-       $(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/snmp/snmpd.conf
+       ln -sf /var/run/snmpd.conf $(1)/etc/snmp/
        $(INSTALL_DIR) $(1)/etc/default
        $(INSTALL_DATA) ./files/snmpd.default $(1)/etc/default/snmpd
        $(INSTALL_DIR) $(1)/etc/init.d
@@ -214,12 +229,14 @@ endef
 
 define Package/snmpd-static/conffiles
 /etc/default/snmpd
-/etc/snmp/snmpd.conf
+/etc/config/snmpd
 endef
 
 define Package/snmpd-static/install
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/config/snmpd
        $(INSTALL_DIR) $(1)/etc/snmp
-       $(INSTALL_DATA) ./files/snmpd.conf $(1)/etc/snmp/snmpd.conf
+       ln -sf /var/run/snmpd.conf $(1)/etc/snmp/
        $(INSTALL_DIR) $(1)/etc/default
        $(INSTALL_DATA) ./files/snmpd.default $(1)/etc/default/snmpd
        $(INSTALL_DIR) $(1)/etc/init.d