summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/Depends.mk1
-rw-r--r--package/iptables-snmp/Config.in2
-rw-r--r--package/iptables-snmp/patches/patch-libiptc_libip6tc_c11
-rw-r--r--package/net-snmp/Makefile88
4 files changed, 30 insertions, 72 deletions
diff --git a/package/Depends.mk b/package/Depends.mk
index 3b4e03f49..c5ae83d4d 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -80,6 +80,7 @@ ifneq ($(strip ${ADK_PACKAGE_TC_ATM}),)
iproute2-compile: linux-atm-compile
endif
ipsec-tools-compile: openssl-compile
+iptables-snmp-compile: net-snmp-compile
iptraf-compile: ncurses-compile
irssi-compile: glib-compile ncurses-compile
iw-compile: libnl-compile
diff --git a/package/iptables-snmp/Config.in b/package/iptables-snmp/Config.in
index 80a49552b..799c1506e 100644
--- a/package/iptables-snmp/Config.in
+++ b/package/iptables-snmp/Config.in
@@ -1,7 +1,7 @@
config ADK_PACKAGE_IPTABLES_SNMP
prompt "export iptables information via snmp"
tristate
- default ADK_PACKAGE_IPTABLES
+ select ADK_PACKAGE_IPTABLES
depends on ADK_PACKAGE_SNMPD
help
This is a library for the netkit snmp daemon, allowing it to export
diff --git a/package/iptables-snmp/patches/patch-libiptc_libip6tc_c b/package/iptables-snmp/patches/patch-libiptc_libip6tc_c
new file mode 100644
index 000000000..68ae9cf7f
--- /dev/null
+++ b/package/iptables-snmp/patches/patch-libiptc_libip6tc_c
@@ -0,0 +1,11 @@
+--- iptables-snmp-0.1.orig/libiptc/libip6tc.c 2005-07-05 00:11:28.000000000 +0200
++++ iptables-snmp-0.1/libiptc/libip6tc.c 2009-11-13 23:18:45.195701184 +0100
+@@ -111,7 +111,7 @@ typedef unsigned int socklen_t;
+ #include "libiptc.c"
+
+ #define BIT6(a, l) \
+- ((ntohl(a->in6_u.u6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
++ ((ntohl(a->s6_addr32[(l) / 32]) >> (31 - ((l) & 31))) & 1)
+
+ int
+ ipv6_prefix_length(const struct in6_addr *a)
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index c78efadcf..ebd3b3d41 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= net-snmp
-PKG_VERSION:= 5.4.2.1
+PKG_VERSION:= 5.5
PKG_RELEASE:= 1
-PKG_MD5SUM:= 984932520143f0c8bf7b7ce1fc9e1da1
+PKG_MD5SUM:= 5b2551e7bd024fbbee84dca22a5f13a1
PKG_DESCR:= SNMP Agent
PKG_SECTION:= net
PKG_DEPENDS:= libnetsnmp libelf
@@ -14,94 +14,40 @@ PKG_NOPARALLEL:= 1
PKG_URL:= http://www.net-snmp.org
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=net-snmp/}
-PKG_DESCR_1:= SNMP utilities
-PKG_DEPENDS_1:= libnetsnmp libelf
+PKG_DESCR_UTILS:= SNMP utilities
+PKG_DEPENDS_UTILS:= libnetsnmp libelf
-PKG_DESCR_2:= SNMP library
-PKG_DEPENDS_2:= libelf
-PKG_SECTION_2:= libs
+PKG_DESCR_LIBS:= SNMP library
+PKG_DEPENDS_LIBS:= libelf
+PKG_SECTION_LIBS:= libs
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,SNMPD,snmpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SNMP_UTILS,snmp-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_2},${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,SNMP_UTILS,snmp-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UTILS},${PKG_DESCR_UTILS},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LIBS},${PKG_DESCR_LIBS},${PKG_SECTION_LIBS}))
-
-SNMP_MIB_MODULES_INCLUDED = \
- host/hr_device \
- host/hr_disk \
- host/hr_filesys \
- host/hr_network \
- host/hr_partition \
- host/hr_proc \
- host/hr_storage \
- host/hr_system \
- mibII/at \
- mibII/icmp \
- mibII/ip \
- mibII/snmp_mib \
- mibII/sysORTable \
- mibII/system_mib \
- mibII/tcp \
- mibII/udp \
- mibII/vacm_context \
- mibII/vacm_vars \
- snmpv3/snmpEngine \
- snmpv3/snmpMPDStats \
- snmpv3/usmStats \
- snmpv3/usmUser \
- snmpv3mibs \
- tunnel \
- ucd-snmp/disk \
- ucd-snmp/dlmod \
- ucd-snmp/extensible \
- ucd-snmp/loadave \
- ucd-snmp/memory \
- ucd-snmp/pass \
- ucd-snmp/proc \
- ucd-snmp/vmstat \
- util_funcs \
- utilities/execute \
-
-SNMP_MIB_MODULES_EXCLUDED = \
- mibII/interfaces \
- if-mib \
- agent_mibs \
- agentx \
- host \
- ieee802dot11 \
- mibII \
- notification \
- notification-log-mib \
- notification/snmpNotifyTable \
- target \
- ucd_snmp \
- utilities \
-
-SNMP_TRANSPORTS_INCLUDED= Callback UDP
-
-SNMP_TRANSPORTS_EXCLUDED= TCP TCPv6 UDPv6 Unix
+SNMP_TRANSPORTS_INCLUDED= UDP TCP Callback Unix
+SNMP_TRANSPORTS_EXCLUDED= TCPIPv6 UDPIPv6 Alias
+TLDFLAGS+= -pthread
CONFIGURE_STYLE:= gnu
-CONFIGURE_ENV+= ac_cv_header_pcap_h=no
-CONFIGURE_ARGS+= --with-endianness=little \
- --with-logfile=/var/log/snmpd.log \
+CONFIGURE_ARGS+= --with-logfile=/var/log/snmpd.log \
--with-persistent-directory=/usr/lib/snmp/ \
--with-default-snmp-version=3 \
--with-sys-contact=root@localhost \
--with-sys-location=Unknown \
--enable-applications \
+ --disable-embedded-perl \
+ --without-perl-modules \
--disable-debugging \
--disable-manuals \
--disable-mib-loading \
--disable-mibs \
--disable-scripts \
- --with-out-mib-modules="${SNMP_MIB_MODULES_EXCLUDED}" \
- --with-mib-modules="${SNMP_MIB_MODULES_INCLUDED}" \
- --with-out-transports="${SNMP_TRANSPORTS_EXCLUDED}" \
--with-transports="${SNMP_TRANSPORTS_INCLUDED}" \
- --without-opaque-special-types \
+ --with-out-transports="${SNMP_TRANSPORTS_EXCLUDED}" \
+ --with-opaque-special-types \
--without-openssl \
--without-libwrap \
--without-rpm \