upgrade to iproute2-2.6.15-060110

[openwrt.git] / openwrt / package / net-snmp / Makefile

diff --git a/openwrt/package/net-snmp/Makefile b/openwrt/package/net-snmp/Makefile
index a0ffdc9..25a1cc6 100644 (file)
--- a/openwrt/package/net-snmp/Makefile
+++ b/openwrt/package/net-snmp/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=net-snmp
 PKG_VERSION:=5.1.2
-PKG_RELEASE:=2
+PKG_RELEASE:=2.1
 PKG_MD5SUM:=8080555ab3f90011f25d5122042d9a8d
 
 PKG_SOURCE_URL:=@SF/net-snmp
@@ -41,6 +41,7 @@ SNMP_MIB_MODULES_INCLUDED = \
        snmpv3mibs \
        tunnel \
        ucd-snmp/disk \
+       ucd-snmp/dlmod \
        ucd-snmp/extensible \
        ucd-snmp/loadave \
        ucd-snmp/memory \
@@ -62,9 +63,9 @@ SNMP_MIB_MODULES_EXCLUDED = \
        ucd_snmp \
        utilities \
 
-SNMP_TRANSPORTS_INCLUDED = UDP
+SNMP_TRANSPORTS_INCLUDED = Callback UDP
 
-SNMP_TRANSPORTS_EXCLUDED = Callback TCP TCPv6 UDPv6 Unix
+SNMP_TRANSPORTS_EXCLUDED = TCP TCPv6 UDPv6 Unix
 
 PKG_CONFIGURE_OPTIONS = \
        --enable-shared \
@@ -149,7 +150,7 @@ endif
 
 $(IPKG_LIBNETSNMP):
        install -d -m0755 $(IDIR_LIBNETSNMP)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.so.* $(IDIR_LIBNETSNMP)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.so.* $(IDIR_LIBNETSNMP)/usr/lib/
        $(RSTRIP) $(IDIR_LIBNETSNMP)
        $(IPKG_BUILD) $(IDIR_LIBNETSNMP) $(PACKAGE_DIR)
 
@@ -179,17 +180,17 @@ $(IPKG_SNMPD_STATIC):
 
 $(IPKG_SNMP_UTILS):
        install -d -m0755 $(IDIR_SNMP_UTILS)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(IDIR_SNMP_UTILS)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(IDIR_SNMP_UTILS)/usr/bin/
        $(RSTRIP) $(IDIR_SNMP_UTILS)
        $(IPKG_BUILD) $(IDIR_SNMP_UTILS) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libnetsnmp.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(STAGING_DIR)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(STAGING_DIR)/usr/bin/
        mkdir -p $(STAGING_DIR)/usr/include
-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/net-snmp $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/net-snmp $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(STAGING_DIR)/usr/lib/
        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libnetsnmp.so