summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/net-snmp/Makefile48
-rw-r--r--package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c48
2 files changed, 24 insertions, 72 deletions
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index 85f4903f6..501d5661e 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -1,23 +1,23 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= net-snmp
-PKG_VERSION:= 5.7.2.1
+PKG_VERSION:= 5.7.3
PKG_RELEASE:= 1
-PKG_HASH:= 35dd20a2b17849f6d5a0a6109b4f52c1a777a3e1a00c79c4a175c520d23f3497
+PKG_HASH:= 12ef89613c7707dc96d13335f153c1921efc9d61d3708ef09f3fc4a7014fb4f0
PKG_DESCR:= snmp agent
PKG_SECTION:= net/misc
PKG_DEPENDS:= libnetsnmp libelf libnl
PKG_BUILDDEP:= libelf libnl
PKG_URL:= http://www.net-snmp.org/
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=net-snmp/}
+PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=net-snmp/)
PKG_NOPARALLEL:= 1
PKG_LIBNAME:= libnetsnmp
PKG_OPTS:= dev
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SUBPKGS:= SNMPD SNMP_UTILS LIBNETSNMP
PKGSD_SNMP_UTILS:= snmp utilities
@@ -29,15 +29,15 @@ PKGSC_LIBNETSNMP:= libs/net
PKG_FLAVOURS_SNMPD:= WITH_IPV6
PKGFD_WITH_IPV6:= enable ipv6 support
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_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},${PKGSS_SNMP_UTILS},${PKGSD_SNMP_UTILS},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBNETSNMP},${PKGSD_LIBNETSNMP},${PKGSC_LIBNETSNMP},${PKG_OPTS}))
+$(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),$(PKGSS_SNMP_UTILS),$(PKGSD_SNMP_UTILS),$(PKG_SECTION)))
+$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_LIBNETSNMP),$(PKGSD_LIBNETSNMP),$(PKGSC_LIBNETSNMP),$(PKG_OPTS)))
SNMP_TRANSPORTS_INCLUDED:= UDP TCP Callback Unix
SNMP_TRANSPORTS_EXCLUDED:= Alias
-ifneq (${ADK_PACKAGE_SNMPD_WITH_IPV6},)
+ifneq ($(ADK_PACKAGE_SNMPD_WITH_IPV6),)
SNMP_TRANSPORTS_INCLUDED+= TCPIPv6 UDPIPv6
else
SNMP_TRANSPORTS_EXCLUDED:= TCPIPv6 UDPIPv6
@@ -57,35 +57,35 @@ CONFIGURE_ARGS+= --with-defaults \
--disable-mib-loading \
--disable-mibs \
--disable-scripts \
- --with-transports="${SNMP_TRANSPORTS_INCLUDED}" \
- --with-out-transports="${SNMP_TRANSPORTS_EXCLUDED}" \
+ --with-transports="$(SNMP_TRANSPORTS_INCLUDED)" \
+ --with-out-transports="$(SNMP_TRANSPORTS_EXCLUDED)" \
--with-opaque-special-types \
--without-openssl \
--without-libwrap \
--without-rpm \
--without-zlib
-ifneq (${ADK_PACKAGE_SNMPD_WITH_IPV6},)
+ifneq ($(ADK_PACKAGE_SNMPD_WITH_IPV6),)
CONFIGURE_ARGS+= --enable-ipv6
else
CONFIGURE_ARGS+= --disable-ipv6
endif
-FAKE_FLAGS+= INSTALL_PREFIX="${WRKINST}"
+FAKE_FLAGS+= INSTALL_PREFIX="$(WRKINST)"
libnetsnmp-install:
- ${INSTALL_DIR} ${IDIR_LIBNETSNMP}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libnetsnmp*.so* ${IDIR_LIBNETSNMP}/usr/lib/
+ $(INSTALL_DIR) $(IDIR_LIBNETSNMP)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libnetsnmp*.so* $(IDIR_LIBNETSNMP)/usr/lib/
snmpd-install:
- ${INSTALL_DIR} ${IDIR_SNMPD}/etc/snmp
- ${INSTALL_DIR} ${IDIR_SNMPD}/usr/sbin
- ${INSTALL_DATA} ./files/snmpd.conf ${IDIR_SNMPD}/etc/snmp/snmpd.conf
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/snmpd ${IDIR_SNMPD}/usr/sbin/snmpd
+ $(INSTALL_DIR) $(IDIR_SNMPD)/etc/snmp
+ $(INSTALL_DIR) $(IDIR_SNMPD)/usr/sbin
+ $(INSTALL_DATA) ./files/snmpd.conf $(IDIR_SNMPD)/etc/snmp/snmpd.conf
+ $(INSTALL_BIN) $(WRKINST)/usr/sbin/snmpd $(IDIR_SNMPD)/usr/sbin/snmpd
snmp-utils-install:
- ${INSTALL_DIR} ${IDIR_SNMP_UTILS}/usr/bin
- ${CP} ${WRKINST}/usr/bin/snmp{get,set,status,test,trap,walk} \
- ${IDIR_SNMP_UTILS}/usr/bin/
+ $(INSTALL_DIR) $(IDIR_SNMP_UTILS)/usr/bin
+ $(CP) $(WRKINST)/usr/bin/snmp{get,set,status,test,trap,walk} \
+ $(IDIR_SNMP_UTILS)/usr/bin/
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c b/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c
deleted file mode 100644
index a4396b963..000000000
--- a/package/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable_c
+++ /dev/null
@@ -1,48 +0,0 @@
---- net-snmp-5.7.2.orig/agent/mibgroup/mibII/tcpTable.c 2012-10-10 00:28:58.000000000 +0200
-+++ net-snmp-5.7.2/agent/mibgroup/mibII/tcpTable.c 2014-01-01 17:12:30.000000000 +0100
-@@ -34,6 +34,12 @@
- #include <netlink/netlink.h>
- #include <netlink/msg.h>
- #include <linux/inet_diag.h>
-+
-+/* libnl 2.0 compatibility code */
-+#define nl_handle nl_sock
-+#define nl_handle_alloc nl_socket_alloc
-+#define nl_handle_alloc_cb nl_socket_alloc_cb
-+#define nl_handle_destroy nl_socket_free
- #endif
-
- #include <net-snmp/net-snmp-includes.h>
-@@ -579,8 +585,8 @@ tcpTable_load_netlink(void)
- }
-
- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
-- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror()));
-- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror());
-+ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(1)));
-+ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(1));
- nl_handle_destroy(nl);
- return -1;
- }
-@@ -594,8 +600,8 @@ tcpTable_load_netlink(void)
- nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
-
- if (nl_send_auto_complete(nl, nm) < 0) {
-- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror()));
-- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror());
-+ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(1)));
-+ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(1));
- nl_handle_destroy(nl);
- return -1;
- }
-@@ -607,8 +613,8 @@ tcpTable_load_netlink(void)
-
- while (running) {
- if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
-- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror()));
-- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror());
-+ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(1)));
-+ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(1));
- nl_handle_destroy(nl);
- return -1;
- }
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 11:33:08 +0000