From a99e18ef8a9805a1c0a04a88e395c90a54bb7f19 Mon Sep 17 00:00:00 2001 From: Vasilis Tsiligiannis Date: Sat, 27 Jun 2009 21:43:45 +0000 Subject: [PATCH] [packages] net-snmp: Update to v5.4.2.1 SVN-Revision: 16591 --- libs/net-snmp/Makefile | 18 +- .../patches/100-debian-statistics.patch | 22 + .../patches/110-debian-makefiles.patch | 40 + .../patches/120-debian-searchdirs.patch | 14 + ...2-6.1.patch => 130-debian-extramibs.patch} | 1102 +---------------- .../patches/140-debian-docfiles.patch | 95 ++ .../patches/150-debian-defaultconfig.patch | 142 +++ .../patches/901-ipsec-interfaces.patch | 44 - 8 files changed, 370 insertions(+), 1107 deletions(-) create mode 100644 libs/net-snmp/patches/100-debian-statistics.patch create mode 100644 libs/net-snmp/patches/110-debian-makefiles.patch create mode 100644 libs/net-snmp/patches/120-debian-searchdirs.patch rename libs/net-snmp/patches/{500-debian-subset-5.1.2-6.1.patch => 130-debian-extramibs.patch} (82%) create mode 100644 libs/net-snmp/patches/140-debian-docfiles.patch create mode 100644 libs/net-snmp/patches/150-debian-defaultconfig.patch delete mode 100644 libs/net-snmp/patches/901-ipsec-interfaces.patch diff --git a/libs/net-snmp/Makefile b/libs/net-snmp/Makefile index d0be2ddbb5..8b6bd3633a 100644 --- a/libs/net-snmp/Makefile +++ b/libs/net-snmp/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=net-snmp -PKG_VERSION:=5.1.2 -PKG_RELEASE:=5 +PKG_VERSION:=5.4.2.1 +PKG_RELEASE:=1 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 @@ -98,7 +98,7 @@ SNMP_MIB_MODULES_INCLUDED = \ ieee802dot11 \ mibII/at \ mibII/icmp \ - mibII/interfaces \ + mibII/ifTable \ mibII/ip \ mibII/snmp_mib \ mibII/sysORTable \ @@ -126,12 +126,19 @@ SNMP_MIB_MODULES_INCLUDED = \ SNMP_MIB_MODULES_EXCLUDED = \ agent_mibs \ agentx \ + disman/event \ + disman/schedule \ + hardware \ host \ + if-mib \ mibII \ notification \ + notification-log-mib \ snmpv3mibs \ target \ + tcp-mib \ ucd_snmp \ + udp-mib \ utilities \ SNMP_TRANSPORTS_INCLUDED = Callback UDP @@ -168,13 +175,14 @@ 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; ) diff --git a/libs/net-snmp/patches/100-debian-statistics.patch b/libs/net-snmp/patches/100-debian-statistics.patch new file mode 100644 index 0000000000..48695ae822 --- /dev/null +++ b/libs/net-snmp/patches/100-debian-statistics.patch @@ -0,0 +1,22 @@ +--- net-snmp-5.1.2.orig/agent/mibgroup/mibII/interfaces.c ++++ net-snmp-5.1.2/agent/mibgroup/mibII/interfaces.c +@@ -1598,6 +1612,10 @@ + struct ifnet *nnew; + char *stats, *ifstart = line; + ++ /* Ignore interfaces with no statistics. */ ++ if (strstr(line, "No statistics available.")) ++ continue; ++ + if (line[strlen(line) - 1] == '\n') + line[strlen(line) - 1] = '\0'; + +@@ -1631,7 +1649,7 @@ + &coll) != 5)) { + if ((scan_line_to_use == scan_line_2_2) + && !strstr(line, "No statistics available")) +- snmp_log(LOG_ERR, ++ snmp_log(LOG_DEBUG, + "/proc/net/dev data format error, line ==|%s|", + line); + continue; diff --git a/libs/net-snmp/patches/110-debian-makefiles.patch b/libs/net-snmp/patches/110-debian-makefiles.patch new file mode 100644 index 0000000000..372e7767ba --- /dev/null +++ b/libs/net-snmp/patches/110-debian-makefiles.patch @@ -0,0 +1,40 @@ +--- net-snmp-5.1.2.orig/local/Makefile.in ++++ net-snmp-5.1.2/local/Makefile.in +@@ -58,7 +58,7 @@ + + mib2c.made: $(srcdir)/mib2c + if test "x$(PERL)" != "x" ; then \ +- $(PERL) -p -e 's%^#!.*/perl.*%#!$(PERL)%;s#/usr/local/share/snmp#$(snmplibdir)#;' ${srcdir}/mib2c > mib2c.made; \ ++ $(PERL) -p -e 's%^#!.*/perl.*%#!$(PERL)%;s#/usr/local/share/snmp#$(snmplibdir)#;s#/usr/local/etc/snmp#$(SNMPCONFPATH)#;' ${srcdir}/mib2c > mib2c.made; \ + else \ + touch mib2c.made; \ + fi +--- net-snmp-5.1.2.orig/mibs/Makefile.in ++++ net-snmp-5.1.2/mibs/Makefile.in +@@ -43,11 +43,15 @@ + UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \ + UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt + ++EXTRAMIBS = BGP4-MIB.txt BRIDGE-MIB.txt GNOME-SMI.txt OSPF-MIB.txt \ ++ OSPF-TRAP-MIB.txt RIPv2-MIB.txt SOURCE-ROUTING-MIB.txt \ ++ LM-SENSORS-MIB.txt ++ + DEFAULTMIBS = @default_mibs_install@ + + MIBS = $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \ + $(AGENTMIBS) $(IANAMIBS) \ +- $(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS) ++ $(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS) $(EXTRAMIBS) + + all: standardall + +--- net-snmp-5.1.2.orig/Makefile.top ++++ net-snmp-5.1.2/Makefile.top +@@ -27,6 +27,7 @@ + snmplibdir = $(datadir)/snmp + mibdir = $(snmplibdir)/mibs + persistentdir = @PERSISTENT_DIRECTORY@ ++sysconfdir = @sysconfdir@ + DESTDIR = @INSTALL_PREFIX@ + INSTALL_PREFIX = @INSTALL_PREFIX@ + diff --git a/libs/net-snmp/patches/120-debian-searchdirs.patch b/libs/net-snmp/patches/120-debian-searchdirs.patch new file mode 100644 index 0000000000..cb1bade245 --- /dev/null +++ b/libs/net-snmp/patches/120-debian-searchdirs.patch @@ -0,0 +1,14 @@ +--- net-snmp-5.1.2.orig/local/mib2c ++++ net-snmp-5.1.2/local/mib2c +@@ -60,8 +60,9 @@ + if($ENV{MIB2C_DIR}) { + push @def_search_dirs, split(/:/, $ENV{MIB2C_DIR}); + } +-push @def_search_dirs, "/usr/local/share/snmp/"; +-push @def_search_dirs, "/usr/local/share/snmp/mib2c-data"; ++push @def_search_dirs, "/etc/snmp/"; ++push @def_search_dirs, "/usr/share/snmp/"; ++push @def_search_dirs, "/usr/share/snmp/mib2c-data"; + push @def_search_dirs, "./mib2c-conf.d"; + + sub usage { diff --git a/libs/net-snmp/patches/500-debian-subset-5.1.2-6.1.patch b/libs/net-snmp/patches/130-debian-extramibs.patch similarity index 82% rename from libs/net-snmp/patches/500-debian-subset-5.1.2-6.1.patch rename to libs/net-snmp/patches/130-debian-extramibs.patch index 9f441770e3..f06eedb197 100644 --- a/libs/net-snmp/patches/500-debian-subset-5.1.2-6.1.patch +++ b/libs/net-snmp/patches/130-debian-extramibs.patch @@ -1,848 +1,6 @@ -diff -ruN net-snmp-5.1.2-orig/EXAMPLE-trap.conf net-snmp-5.1.2-5/EXAMPLE-trap.conf ---- net-snmp-5.1.2-orig/EXAMPLE-trap.conf 1970-01-01 01:00:00.000000000 +0100 -+++ net-snmp-5.1.2-5/EXAMPLE-trap.conf 2005-03-13 16:17:21.000000000 +0100 -@@ -0,0 +1,18 @@ -+############################################################################### -+# -+# EXAMPLE.conf: -+# An example configuration file for configuring the ucd-snmp snmptrapd agent. -+# -+############################################################################### -+# -+# This file is intended to only be an example. If, however, you want -+# to use it, it should be placed in /etc/snmp/snmptrapd.conf. -+# When the snmptrapd agent starts up, this is where it will look for it. -+# -+# All lines beginning with a '#' are comments and are intended for you -+# to read. All other lines are configuration commands for the agent. -+ -+# -+# PLEASE: read the snmptrapd.conf(5) manual page as well! -+# -+ -diff -ruN net-snmp-5.1.2-orig/EXAMPLE.conf.def net-snmp-5.1.2-5/EXAMPLE.conf.def ---- net-snmp-5.1.2-orig/EXAMPLE.conf.def 2003-02-25 15:04:06.000000000 +0100 -+++ net-snmp-5.1.2-5/EXAMPLE.conf.def 2005-03-13 16:17:21.000000000 +0100 -@@ -6,7 +6,7 @@ - ############################################################################### - # - # This file is intended to only be an example. If, however, you want --# to use it, it should be placed in SYSCONFDIR/share/snmp/snmpd.conf. -+# to use it, it should be placed in /etc/snmp/snmpd.conf. - # When the snmpd agent starts up, this is where it will look for it. - # - # You might be interested in generating your own snmpd.conf file using -@@ -58,31 +58,37 @@ - # from): - - # sec.name source community --com2sec local localhost COMMUNITY --com2sec mynetwork NETWORK/24 COMMUNITY -+com2sec paranoid default public -+#com2sec readonly default public -+#com2sec readwrite default private - - #### - # Second, map the security names into group names: - - # sec.model sec.name --group MyRWGroup v1 local --group MyRWGroup v2c local --group MyRWGroup usm local --group MyROGroup v1 mynetwork --group MyROGroup v2c mynetwork --group MyROGroup usm mynetwork -+group MyROSystem v1 paranoid -+group MyROSystem v2c paranoid -+group MyROSystem usm paranoid -+group MyROGroup v1 readonly -+group MyROGroup v2c readonly -+group MyROGroup usm readonly -+group MyRWGroup v1 readwrite -+group MyRWGroup v2c readwrite -+group MyRWGroup usm readwrite - - #### - # Third, create a view for us to let the groups have rights to: - - # incl/excl subtree mask - view all included .1 80 -+view system included .iso.org.dod.internet.mgmt.mib-2.system - - #### - # Finally, grant the 2 groups access to the 1 view with different - # write permissions: - - # context sec.model sec.level match read write notif -+access MyROSystem "" any noauth exact system none none - access MyROGroup "" any noauth exact all none none - access MyRWGroup "" any noauth exact all all none - -@@ -100,8 +106,8 @@ - # value of an object whose value is given here will fail with an error - # status of notWritable. - --syslocation Right here, right now. --syscontact Me -+syslocation Unknown (configure /etc/snmp/snmpd.local.conf) -+syscontact Root (configure /etc/snmp/snmpd.local.conf) - - # Example output of snmpwalk: - # % snmpwalk -v 1 -c public localhost system -@@ -135,13 +141,13 @@ - # - - # Make sure mountd is running --proc mountd -+#proc mountd - - # Make sure there are no more than 4 ntalkds running, but 0 is ok too. --proc ntalkd 4 -+#proc ntalkd 4 - - # Make sure at least one sendmail, but less than or equal to 10 are running. --proc sendmail 10 1 -+#proc sendmail 10 1 - - # A snmpwalk of the prTable would look something like this: - # -@@ -199,7 +205,7 @@ - # ARGS: optional arguments to be passed to the program - - # a simple hello world --exec echotest /bin/echo hello world -+#exec echotest /bin/echo hello world - - # Run a shell script containing: - # -@@ -250,7 +256,7 @@ - - # Check the / partition and make sure it contains at least 10 megs. - --disk / 10000 -+#disk / 10000 - - # % snmpwalk -v 1 -c public localhost .EXTENSIBLEDOTMIB.DISKMIBNUM - # enterprises.ucdavis.diskTable.dskEntry.diskIndex.1 = 0 -@@ -279,7 +285,7 @@ - # 15MAX: Similar, but for 15 min average. - - # Check for loads: --load 12 14 14 -+#load 12 14 14 - - # % snmpwalk -v 1 -c public localhost .EXTENSIBLEDOTMIB.LOADAVEMIBNUM - # enterprises.ucdavis.loadTable.laEntry.loadaveIndex.1 = 1 -@@ -365,7 +371,7 @@ - # (commented out here since it requires that you place the - # script in the right location. (its not installed by default)) - --# pass .EXTENSIBLEDOTMIB.255 /bin/sh PREFIX/local/passtest -+# pass .EXTENSIBLEDOTMIB.255 /bin/sh /usr/local/passtest - - # % snmpwalk -v 1 -c public localhost .EXTENSIBLEDOTMIB.255 - # enterprises.ucdavis.255.1 = "life the universe and everything" -diff -ruN net-snmp-5.1.2-orig/FAQ net-snmp-5.1.2-5/FAQ ---- net-snmp-5.1.2-orig/FAQ 2004-08-07 10:02:45.000000000 +0200 -+++ net-snmp-5.1.2-5/FAQ 2005-03-13 16:17:21.000000000 +0100 -@@ -104,7 +104,7 @@ - I don't understand the new access control stuff - what does it mean? - How do I configure SNMPv3 users? - The 'createUser' line disappears when I start the agent. Why? -- What's the difference between /var/ucd-snmp and /usr/local/share/snmp? -+ What's the difference between /var/ucd-snmp and /usr/share/snmp? - My new agent is ignoring the old snmpd.conf file. Why? - Why am I getting "Connection refused"? - I'm getting errors about "bad security model" - why? -@@ -620,7 +620,7 @@ - - Firstly, - -- cp MY-MIB.txt /usr/local/share/snmp/mibs -+ cp MY-MIB.txt /usr/share/snmp/mibs - - or - -@@ -639,7 +639,7 @@ - Note that you need *both* steps. - The first command copies the file defining the new MIB to a - expected location for MIB files. This defaults to -- /usr/local/share/snmp/mibs (or PREFIX/share/snmp/mibs if the the -+ /usr/share/snmp/mibs (or PREFIX/share/snmp/mibs if the the - suite was installed into a different base location). Some - ready-packaged distributions (such as Linux RPM packages) may look - for MIB files in a different location, such as /etc/snmp/mibs - put -@@ -1111,7 +1111,7 @@ - If this is the case, then you can specify this interpreter - explicitly as part of the trap handle directive: - -- traphandle default /usr/bin/perl /usr/local/bin/log_it -+ traphandle default /usr/bin/perl /usr/bin/log_it - - Note that in this case, it's almost certain that you'll also - need to give the full path to the traphandle script (as shown) -@@ -1263,7 +1263,7 @@ - (if appropriate) the community string to use. - - Some of these (such as the MIB file location), might belong in a -- shared snmp.conf file (typically /usr/local/share/snmp/snmp.conf or -+ shared snmp.conf file (typically /usr/share/snmp/snmp.conf or - /etc/snmp/snmp.conf) to apply to all users of the system. Others - (particularly the SNMPv3 security settings), are more likely to refer - to a particular user, and should go in a personal snmp.conf file -@@ -1522,7 +1522,7 @@ - - - Alternatively, the tools may be looking in the wrong place. -- The default location for the mib files is /usr/local/share/snmp/mibs. -+ The default location for the mib files is /usr/share/snmp/mibs. - Again, this is set when the suite is first configured and compiled. - This can be changed using the environmental variable 'MIBDIRS' - or the snmp.conf directive 'mibdirs'. -@@ -2507,11 +2507,11 @@ - - - --What's the difference between /var/ucd-snmp and /usr/local/share/snmp? -+What's the difference between /var/ucd-snmp and /usr/share/snmp? - --------------------------------------------------------------------- - - Most "static" agent configuration should go in the traditional location -- (typically /usr/local/share/snmp/snmpd.conf or /etc/snmp). The -+ (typically /usr/share/snmp/snmpd.conf or /etc/snmp). The - /var/ucd-snmp (or /var/net-snmp) location is used for information set during - the running of the agent, which needs to be persistent between one run of - the agent and the next. -@@ -2531,7 +2531,7 @@ - distribution), with the current release installed from the source. - - The default location for this file with the basic distribution is -- /usr/local/share/snmp/snmpd.conf (or PREFIX/share/snmp/snmpd.conf). -+ /usr/share/snmp/snmpd.conf (or PREFIX/share/snmp/snmpd.conf). - Ready-installed versions often look for the file as /etc/snmpd.conf, - or /etc/snmp/snmpd.conf. Try moving the old config file to the new - location, and restart the agent. -diff -ruN net-snmp-5.1.2-orig/Makefile.in net-snmp-5.1.2-5/Makefile.in ---- net-snmp-5.1.2-orig/Makefile.in 2004-08-04 14:48:14.000000000 +0200 -+++ net-snmp-5.1.2-5/Makefile.in 2005-03-13 16:17:21.000000000 +0100 -@@ -163,6 +163,11 @@ - ( cd perl ; $(MAKE) clean ) ; \ - fi - -+perlrealclean: -+ @if test -f perl/Makefile; then \ -+ ( cd perl ; $(MAKE) realclean ) ; \ -+ fi -+ - # - # make distclean completely removes all traces of building including - # any files generated by configure itself. -diff -ruN net-snmp-5.1.2-orig/Makefile.rules net-snmp-5.1.2-5/Makefile.rules ---- net-snmp-5.1.2-orig/Makefile.rules 2004-02-13 23:42:28.000000000 +0100 -+++ net-snmp-5.1.2-5/Makefile.rules 2005-03-13 16:17:21.000000000 +0100 -@@ -301,7 +301,7 @@ - # cleaning targets - # - clean: cleansubdirs $(OTHERCLEANTODOS) -- rm -f core ${OBJS} ${LOBJS} $(STANDARDCLEANTARGETS) $(OTHERCLEANTARGETS) -+ rm -f -- core ${OBJS} ${LOBJS} $(STANDARDCLEANTARGETS) $(OTHERCLEANTARGETS) - rm -rf .libs - - cleansubdirs: -diff -ruN net-snmp-5.1.2-orig/Makefile.top net-snmp-5.1.2-5/Makefile.top ---- net-snmp-5.1.2-orig/Makefile.top 2004-08-07 09:29:36.000000000 +0200 -+++ net-snmp-5.1.2-5/Makefile.top 2005-03-13 16:17:21.000000000 +0100 -@@ -27,6 +27,7 @@ - snmplibdir = $(datadir)/snmp - mibdir = $(snmplibdir)/mibs - persistentdir = @PERSISTENT_DIRECTORY@ -+sysconfdir = @sysconfdir@ - INSTALL_PREFIX = @INSTALL_PREFIX@ - - # -diff -ruN net-snmp-5.1.2-orig/acconfig.h net-snmp-5.1.2-5/acconfig.h ---- net-snmp-5.1.2-orig/acconfig.h 2004-06-28 20:54:17.000000000 +0200 -+++ net-snmp-5.1.2-5/acconfig.h 2005-03-13 16:17:21.000000000 +0100 -@@ -560,6 +560,9 @@ - /* define if you have getservbyname */ - #undef HAVE_GETSERVBYNAME - -+/* define if you have dlopen */ -+#undef HAVE_DLOPEN -+ - /* printing system */ - #undef HAVE_LPSTAT - #undef LPSTAT_PATH -diff -ruN net-snmp-5.1.2-orig/acinclude.m4 net-snmp-5.1.2-5/acinclude.m4 ---- net-snmp-5.1.2-orig/acinclude.m4 1970-01-01 01:00:00.000000000 +0100 -+++ net-snmp-5.1.2-5/acinclude.m4 2005-03-13 16:17:21.000000000 +0100 -@@ -0,0 +1,193 @@ -+dnl @synopsis AC_PROMPT_USER_NO_DEFINE(VARIABLENAME,QUESTION,[DEFAULT]) -+dnl -+dnl Asks a QUESTION and puts the results in VARIABLENAME with an optional -+dnl DEFAULT value if the user merely hits return. -+dnl -+dnl @version 1.15 -+dnl @author Wes Hardaker -+dnl -+AC_DEFUN([AC_PROMPT_USER_NO_DEFINE], -+dnl changequote(<<, >>) dnl -+dnl << -+[ -+if test "x$defaults" = "xno"; then -+echo $ac_n "$2 ($3): $ac_c" -+read tmpinput -+if test "$tmpinput" = "" -a "$3" != ""; then -+ tmpinput="$3" -+fi -+eval $1=\"$tmpinput\" -+else -+tmpinput="$3" -+eval $1=\"$tmpinput\" -+fi -+] -+dnl >> -+dnl changequote([, ]) -+) dnl done AC_PROMPT_USER -+ -+dnl @synopsis AC_PROMPT_USER(VARIABLENAME,QUESTION,[DEFAULT],QUOTED) -+dnl -+dnl Asks a QUESTION and puts the results in VARIABLENAME with an optional -+dnl DEFAULT value if the user merely hits return. Also calls -+dnl AC_DEFINE_UNQUOTED() on the VARIABLENAME for VARIABLENAMEs that should -+dnl be entered into the config.h file as well. If QUOTED is "quoted" then -+dnl the result will be defined within quotes. -+dnl -+dnl @version 1.15 -+dnl @author Wes Hardaker -+dnl -+AC_DEFUN([AC_PROMPT_USER], -+[ -+MSG_CHECK=`echo "$2" | tail -1` -+AC_CACHE_CHECK($MSG_CHECK, ac_cv_user_prompt_$1, -+[echo "" >&AC_FD_MSG -+AC_PROMPT_USER_NO_DEFINE($1,[$2],$3) -+eval ac_cv_user_prompt_$1=\$$1 -+echo $ac_n "setting $MSG_CHECK to... $ac_c" >&AC_FD_MSG -+]) -+if test "$ac_cv_user_prompt_$1" != "none"; then -+ if test "x$4" = "xquoted" -o "x$4" = "xQUOTED"; then -+ AC_DEFINE_UNQUOTED($1,"$ac_cv_user_prompt_$1") -+ else -+ AC_DEFINE_UNQUOTED($1,$ac_cv_user_prompt_$1) -+ fi -+fi -+]) dnl -+ -+dnl @synopsis AC_CHECK_STRUCT_FOR(INCLUDES,STRUCT,MEMBER,DEFINE,[no]) -+dnl -+dnl Checks STRUCT for MEMBER and defines DEFINE if found. -+dnl -+dnl @version 1.15 -+dnl @author Wes Hardaker -+dnl -+AC_DEFUN(AC_CHECK_STRUCT_FOR,[ -+ -+ac_safe_struct=`echo "$2" | sed 'y%./+-%__p_%'` -+ac_safe_member=`echo "$3" | sed 'y%./+-%__p_%'` -+ac_safe_all="ac_cv_struct_${ac_safe_struct}_has_${ac_safe_member}" -+changequote(, )dnl -+ ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+changequote([, ])dnl -+ -+AC_MSG_CHECKING([for $2.$3]) -+AC_CACHE_VAL($ac_safe_all, -+[ -+if test "x$4" = "x"; then -+ defineit="= 0" -+elif test "x$4" = "xno"; then -+ defineit="" -+else -+ defineit="$4" -+fi -+AC_TRY_COMPILE([ -+$1 -+],[ -+struct $2 testit; -+testit.$3 $defineit; -+], eval "${ac_safe_all}=yes", eval "${ac_safe_all}=no" ) -+]) -+ -+if eval "test \"x$`echo ${ac_safe_all}`\" = \"xyes\""; then -+ AC_MSG_RESULT(yes) -+ AC_DEFINE_UNQUOTED($ac_uc_define) -+else -+ AC_MSG_RESULT(no) -+fi -+ -+]) -+ -+dnl AC_CHECK_IFNET_FOR(SUBSTRUCT,[no]) -+AC_DEFUN(AC_CHECK_IFNET_FOR,[ -+dnl check for $1 in struct ifnet -+AC_CHECK_STRUCT_FOR([ -+#ifdef IFNET_NEEDS_KERNEL -+#define _KERNEL 1 -+#endif -+#include -+#include -+#ifdef HAVE_SYS_TIME_H -+#include -+#endif -+#include -+#ifdef HAVE_NET_IF_VAR_H -+#include -+#endif -+#ifdef HAVE_SYS_QUEUE_H -+#include -+#endif -+#ifdef linux -+struct ifnet { -+ char *if_name; /* name, e.g. "en" or "lo" */ -+ short if_unit; /* sub-unit for lower level driver */ -+ short if_mtu; /* maximum transmission unit */ -+ short if_flags; /* up/down, broadcast, etc. */ -+ int if_metric; /* routing metric (external only) */ -+ char if_hwaddr [6]; /* ethernet address */ -+ int if_type; /* interface type: 1=generic, -+ 28=slip, ether=6, loopback=24 */ -+ int if_speed; /* interface speed: in bits/sec */ -+ -+ struct sockaddr if_addr; /* interface's address */ -+ struct sockaddr ifu_broadaddr; /* broadcast address */ -+ struct sockaddr ia_subnetmask; /* interface's mask */ -+ -+ struct ifqueue { -+ int ifq_len; -+ int ifq_drops; -+ } if_snd; /* output queue */ -+ int if_ibytes; /* octets received on interface */ -+ int if_ipackets; /* packets received on interface */ -+ int if_ierrors; /* input errors on interface */ -+ int if_iqdrops; /* input queue overruns */ -+ int if_obytes; /* octets sent on interface */ -+ int if_opackets; /* packets sent on interface */ -+ int if_oerrors; /* output errors on interface */ -+ int if_collisions; /* collisions on csma interfaces */ -+/* end statistics */ -+ struct ifnet *if_next; -+}; -+#endif -+], ifnet, $1, $2) -+]) -+ -+dnl -+dnl Add a search path to the LIBS and CFLAGS variables -+dnl -+AC_DEFUN(AC_ADD_SEARCH_PATH,[ -+ if test "x$1" != x -a -d $1; then -+ if test -d $1/lib; then -+ LDFLAGS="-L$1/lib $LDFLAGS" -+ fi -+ if test -d $1/include; then -+ CPPFLAGS="-I$1/include $CPPFLAGS" -+ fi -+ fi -+]) -+ -+dnl -+dnl Store information for displaying later. -+dnl -+AC_DEFUN(AC_MSG_CACHE_INIT,[ -+ rm -f configure-summary -+]) -+ -+AC_DEFUN(AC_MSG_CACHE_ADD,[ -+ cat >> configure-summary << EOF -+ $1 -+EOF -+]) -+ -+AC_DEFUN(AC_MSG_CACHE_DISPLAY,[ -+ echo "" -+ echo "---------------------------------------------------------" -+ echo " Net-SNMP configuration summary:" -+ echo "---------------------------------------------------------" -+ echo "" -+ cat configure-summary -+ echo "" -+ echo "---------------------------------------------------------" -+ echo "" -+]) -+ -diff -ruN net-snmp-5.1.2-orig/agent/Makefile.in net-snmp-5.1.2-5/agent/Makefile.in ---- net-snmp-5.1.2-orig/agent/Makefile.in 2003-10-14 15:30:48.000000000 +0200 -+++ net-snmp-5.1.2-5/agent/Makefile.in 2005-03-13 16:17:21.000000000 +0100 -@@ -82,7 +82,7 @@ - # libnetsnmpagent objects - LIBAGENTOBJS=snmp_agent.o snmp_vars.o agent_read_config.o \ - agent_registry.o agent_index.o agent_trap.o kernel.o \ -- agent_handler.o @OTHERAGENTLIBOBJS@ -+ agent_handler.o @OTHERAGENTLIBOBJS@ @WRAPLIBS@ - LLIBAGENTOBJS=snmp_agent.lo snmp_vars.lo agent_read_config.lo \ - agent_registry.lo agent_index.lo agent_trap.lo kernel.lo \ - agent_handler.lo @OTHERAGENTLIBLOBJS@ -@@ -120,11 +120,11 @@ - - - libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) -- $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS) -+ $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} $(LIB_LD_LIBS) $(AGENT_RELINK_LIBS) - $(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) - - libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} -- $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS) -+ $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} $(LIB_LD_LIBS) $(MIBS_RELINK_LIBS) $(LIBSENSORS) - $(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) - - embedperlinstall: -diff -ruN net-snmp-5.1.2-orig/agent/helpers/Makefile.in net-snmp-5.1.2-5/agent/helpers/Makefile.in ---- net-snmp-5.1.2-orig/agent/helpers/Makefile.in 2004-03-01 06:26:12.000000000 +0100 -+++ net-snmp-5.1.2-5/agent/helpers/Makefile.in 2005-03-13 16:17:21.000000000 +0100 -@@ -68,5 +68,5 @@ - all: standardall - - libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION): ${LOBJS} -- $(LIB_LD_CMD) libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION) ${LOBJS} $(LIB_LD_LIBS) -+ $(LIB_LD_CMD) libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION) ${LOBJS} $(LIB_LD_LIBS) $(HELPERS_RELINK_LIBS) - $(RANLIB) libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION) -diff -ruN net-snmp-5.1.2-orig/agent/mibgroup/agentx/protocol.h net-snmp-5.1.2-5/agent/mibgroup/agentx/protocol.h ---- net-snmp-5.1.2-orig/agent/mibgroup/agentx/protocol.h 2002-04-20 09:30:01.000000000 +0200 -+++ net-snmp-5.1.2-5/agent/mibgroup/agentx/protocol.h 2005-03-13 16:17:21.000000000 +0100 -@@ -10,7 +10,7 @@ - */ - - #define AGENTX_PORT 705 --#define AGENTX_SOCKET "/var/agentx/master" -+#define AGENTX_SOCKET "/var/run/agentx" - - /* - * AgentX versions -diff -ruN net-snmp-5.1.2-orig/agent/mibgroup/mibII/interfaces.c net-snmp-5.1.2-5/agent/mibgroup/mibII/interfaces.c ---- net-snmp-5.1.2-orig/agent/mibgroup/mibII/interfaces.c 2004-07-23 02:55:41.000000000 +0200 -+++ net-snmp-5.1.2-5/agent/mibgroup/mibII/interfaces.c 2005-03-13 16:17:21.000000000 +0100 -@@ -1512,14 +1512,28 @@ - struct ifreq ifrq; - struct ifnet **ifnetaddr_ptr; - FILE *devin; -- unsigned long rec_pkt, rec_oct, rec_err, rec_drop; -- unsigned long snd_pkt, snd_oct, snd_err, snd_drop, coll; - int i, fd; - conf_if_list *if_ptr; -+#ifdef SCNuMAX -+ uintmax_t rec_pkt, rec_oct, rec_err, rec_drop, rec_mcast; -+ uintmax_t snd_pkt, snd_oct, snd_err, snd_drop, coll; -+ const char *scan_line_2_2 = -+ "%" SCNuMAX " %" SCNuMAX " %" SCNuMAX " %" SCNuMAX -+ " %*" SCNuMAX " %*" SCNuMAX " %*" SCNuMAX " %*" SCNuMAX -+ " %" SCNuMAX " %" SCNuMAX " %" SCNuMAX " %" SCNuMAX -+ " %*" SCNuMAX " %" SCNuMAX; -+ const char *scan_line_2_0 = -+ "%" SCNuMAX " %" SCNuMAX " %*" SCNuMAX " %*" SCNuMAX -+ " %*" SCNuMAX " %" SCNuMAX " %" SCNuMAX " %*" SCNuMAX -+ " %*" SCNuMAX " %" SCNuMAX; -+#else -+ unsigned long rec_pkt, rec_oct, rec_err, rec_drop; -+ unsigned long snd_pkt, snd_oct, snd_err, snd_drop, coll; - const char *scan_line_2_2 = - "%lu %lu %lu %lu %*lu %*lu %*lu %*lu %lu %lu %lu %lu %*lu %lu"; - const char *scan_line_2_0 = - "%lu %lu %*lu %*lu %*lu %lu %lu %*lu %*lu %lu"; -+#endif - const char *scan_line_to_use; - struct timeval et; /* elapsed time */ - -@@ -1598,6 +1612,10 @@ - struct ifnet *nnew; - char *stats, *ifstart = line; - -+ /* Ignore interfaces with no statistics. */ -+ if (strstr(line, "No statistics available.")) -+ continue; -+ - if (line[strlen(line) - 1] == '\n') - line[strlen(line) - 1] = '\0'; - -@@ -1631,7 +1649,7 @@ - &coll) != 5)) { - if ((scan_line_to_use == scan_line_2_2) - && !strstr(line, "No statistics available")) -- snmp_log(LOG_ERR, -+ snmp_log(LOG_DEBUG, - "/proc/net/dev data format error, line ==|%s|", - line); - continue; -diff -ruN net-snmp-5.1.2-orig/agent/mibgroup/smux/smux.c net-snmp-5.1.2-5/agent/mibgroup/smux/smux.c ---- net-snmp-5.1.2-orig/agent/mibgroup/smux/smux.c 2004-02-04 12:25:20.000000000 +0100 -+++ net-snmp-5.1.2-5/agent/mibgroup/smux/smux.c 2005-03-13 16:17:21.000000000 +0100 -@@ -819,14 +819,14 @@ - passwd[string_len] = '\0'; - if (!smux_auth_peer(oid_name, oid_name_len, passwd, fd)) { - snmp_log(LOG_WARNING, -- "refused smux peer: oid %s, password %s, descr %s\n", -- oid_print, passwd, descr); -+ "refused smux peer: oid %s, descr %s\n", -+ oid_print, descr); - *fail = TRUE; - return ptr; - } - snmp_log(LOG_INFO, -- "accepted smux peer: oid %s, password %s, descr %s\n", -- oid_print, passwd, descr); -+ "accepted smux peer: oid %s, descr %s\n", -+ oid_print, descr); - *fail = FALSE; - return ptr; - } -diff -ruN net-snmp-5.1.2-orig/apps/Makefile.in net-snmp-5.1.2-5/apps/Makefile.in ---- net-snmp-5.1.2-orig/apps/Makefile.in 2004-03-09 16:51:28.000000000 +0100 -+++ net-snmp-5.1.2-5/apps/Makefile.in 2005-03-13 16:17:21.000000000 +0100 -@@ -129,7 +129,7 @@ - $(LINK) -o $@ snmpdf.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} - - libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS) -- $(LIB_LD_CMD) libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBTRAPD_OBJS} $(LIB_LD_LIBS) -+ $(LIB_LD_CMD) libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBTRAPD_OBJS} $(LIB_LD_LIBS) $(TRAPD_RELINK_LIBS) - $(RANLIB) libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION) - - snmpinforminstall: -diff -ruN net-snmp-5.1.2-orig/apps/snmpnetstat/if.c net-snmp-5.1.2-5/apps/snmpnetstat/if.c ---- net-snmp-5.1.2-orig/apps/snmpnetstat/if.c 2002-04-20 09:30:10.000000000 +0200 -+++ net-snmp-5.1.2-5/apps/snmpnetstat/if.c 2005-03-13 16:17:21.000000000 +0100 -@@ -300,8 +300,9 @@ - case IFINDEX: - ifindex = *var->val.integer; - for (cur_if = if_table; -- cur_if->ifindex != ifindex && cur_if->ifindex != 0; -- cur_if++); -+ cur_if < (if_table + cfg_nnets) && -+ cur_if->ifindex != ifindex && -+ cur_if->ifindex != 0; cur_if++); - if (cur_if >= (if_table + cfg_nnets)) { - fprintf(stderr, - "Inconsistent reponse from server. Aborting\n"); -@@ -492,8 +493,14 @@ - case IPIFINDEX: - ifindex = *var->val.integer; - for (cur_if = if_table; -- cur_if->ifindex != ifindex && cur_if->ifindex != 0; -- cur_if++); -+ cur_if < (if_table + cfg_nnets) && -+ cur_if->ifindex != ifindex && -+ cur_if->ifindex != 0; cur_if++); -+ if (cur_if >= (if_table + cfg_nnets)) { -+ fprintf(stderr, -+ "Inconsistent reponse from server. Aborting.\n"); -+ exit(0); -+ } - cur_if->ifindex = ifindex; - break; - case IPADDR: -@@ -567,8 +574,14 @@ - case IFINDEX: - ifindex = *var->val.integer; - for (cur_if = if_table; -- cur_if->ifindex != ifindex && cur_if->ifindex != 0; -- cur_if++); -+ cur_if < (if_table + cfg_nnets) && -+ cur_if->ifindex != ifindex && -+ cur_if->ifindex != 0; cur_if++); -+ if (cur_if >= (if_table + cfg_nnets)) { -+ fprintf(stderr, -+ "Inconsistent reponse from server. Aborting.\n"); -+ exit(0); -+ } - cur_if->ifindex = ifindex; - break; - case INOCTETS: -diff -ruN net-snmp-5.1.2-orig/configure.in net-snmp-5.1.2-5/configure.in ---- net-snmp-5.1.2-orig/configure.in 2004-06-23 00:06:40.000000000 +0200 -+++ net-snmp-5.1.2-5/configure.in 2005-03-13 16:17:21.000000000 +0100 -@@ -161,6 +161,9 @@ - AC_DEFINE(SNMP_NO_DEBUGGING) - fi - -+AC_ARG_WITH(rpm, -+[ --without-rpm Don't use RPM even if available.]) -+ - AC_ARG_WITH(dmalloc, - [ --with-dmalloc=PATH Use dmalloc library (www.dmalloc.com)], - if test "x$withval" = "xyes"; then -@@ -1539,12 +1542,13 @@ - AC_CHECK_LIB(RSAglue, RSA_PKCS1_RSAref) - fi - -- AC_CHECK_LIB(crypto, EVP_md5) -+ AC_CHECK_LIB(crypto, EVP_md5, [CRYPTOLIBS=-lcrypto], , ) - AC_CHECK_FUNCS(AES_cfb128_encrypt) - fi - elif test "x$askedpkcs" = "xyes"; then - AC_CHECK_LIB(pkcs11, C_Initialize) - fi -+AC_SUBST(CRYPTOLIBS) - - # Check for libraries that the agent needs - # saving old libraries -@@ -1664,8 +1668,9 @@ - # Replace `main' with a function in -lkvm: - AC_CHECK_LIB(kvm, kvm_read) - # DYNAMIC MODULE SUPPORT --AC_CHECK_LIB(dl, dlopen) --AC_CHECK_FUNCS(dlopen) -+AC_CHECK_FUNC(dlopen, AC_DEFINE(HAVE_DLOPEN), -+ AC_CHECK_LIB(dl, dlopen, AC_DEFINE(HAVE_DLOPEN) -+ LIBS="${LIBS} -ldl")) - - AC_CHECK_FUNCS(kvm_openfiles nlist knlist kvm_getprocs) - echo "$with_mib_modules" | grep "ucd-snmp/diskio" >/dev/null -@@ -1979,7 +1984,7 @@ - - AC_MSG_RESULT([$ac_cv_type_ssize_t]) - if test $ac_cv_type_ssize_t = yes; then -- AC_DEFINE(HAVE_SSIZE_T) -+ AC_DEFINE(HAVE_SSIZE_T, 1, [Define if type ssize_t is available]) - fi - - # Check ps args -diff -ruN net-snmp-5.1.2-orig/debian/README.Debian net-snmp-5.1.2-5/debian/README.Debian -diff -ruN net-snmp-5.1.2-orig/debian/changelog net-snmp-5.1.2-5/debian/changelog -diff -ruN net-snmp-5.1.2-orig/debian/control net-snmp-5.1.2-5/debian/control -diff -ruN net-snmp-5.1.2-orig/debian/copyright net-snmp-5.1.2-5/debian/copyright -diff -ruN net-snmp-5.1.2-orig/debian/fixman net-snmp-5.1.2-5/debian/fixman -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp-base.dirs net-snmp-5.1.2-5/debian/libsnmp-base.dirs -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp-base.docs net-snmp-5.1.2-5/debian/libsnmp-base.docs -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp-base.files net-snmp-5.1.2-5/debian/libsnmp-base.files -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp-base.postrm net-snmp-5.1.2-5/debian/libsnmp-base.postrm -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp-base.prerm net-snmp-5.1.2-5/debian/libsnmp-base.prerm -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp-perl.docs net-snmp-5.1.2-5/debian/libsnmp-perl.docs -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp-perl.files net-snmp-5.1.2-5/debian/libsnmp-perl.files -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp5-dev.files net-snmp-5.1.2-5/debian/libsnmp5-dev.files -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp5-dev.manpages net-snmp-5.1.2-5/debian/libsnmp5-dev.manpages -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp5.dirs net-snmp-5.1.2-5/debian/libsnmp5.dirs -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp5.docs net-snmp-5.1.2-5/debian/libsnmp5.docs -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp5.files net-snmp-5.1.2-5/debian/libsnmp5.files -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp5.postinst net-snmp-5.1.2-5/debian/libsnmp5.postinst -diff -ruN net-snmp-5.1.2-orig/debian/libsnmp5.prerm net-snmp-5.1.2-5/debian/libsnmp5.prerm -diff -ruN net-snmp-5.1.2-orig/debian/manpages/encode_keychange.1 net-snmp-5.1.2-5/debian/manpages/encode_keychange.1 -diff -ruN net-snmp-5.1.2-orig/debian/manpages/net-snmp-config.1 net-snmp-5.1.2-5/debian/manpages/net-snmp-config.1 -diff -ruN net-snmp-5.1.2-orig/debian/manpages/snmpvacm.1 net-snmp-5.1.2-5/debian/manpages/snmpvacm.1 -diff -ruN net-snmp-5.1.2-orig/debian/manpages/tkmib.1 net-snmp-5.1.2-5/debian/manpages/tkmib.1 -diff -ruN net-snmp-5.1.2-orig/debian/rules net-snmp-5.1.2-5/debian/rules -diff -ruN net-snmp-5.1.2-orig/debian/snmp.files net-snmp-5.1.2-5/debian/snmp.files -diff -ruN net-snmp-5.1.2-orig/debian/snmp.manpages net-snmp-5.1.2-5/debian/snmp.manpages -diff -ruN net-snmp-5.1.2-orig/debian/snmp.preinst net-snmp-5.1.2-5/debian/snmp.preinst -diff -ruN net-snmp-5.1.2-orig/debian/snmpd.default net-snmp-5.1.2-5/debian/snmpd.default -diff -ruN net-snmp-5.1.2-orig/debian/snmpd.files net-snmp-5.1.2-5/debian/snmpd.files -diff -ruN net-snmp-5.1.2-orig/debian/snmpd.init net-snmp-5.1.2-5/debian/snmpd.init -diff -ruN net-snmp-5.1.2-orig/debian/snmpd.postinst net-snmp-5.1.2-5/debian/snmpd.postinst -diff -ruN net-snmp-5.1.2-orig/debian/snmpd.postrm net-snmp-5.1.2-5/debian/snmpd.postrm -diff -ruN net-snmp-5.1.2-orig/debian/tkmib.docs net-snmp-5.1.2-5/debian/tkmib.docs -diff -ruN net-snmp-5.1.2-orig/debian/tkmib.files net-snmp-5.1.2-5/debian/tkmib.files -diff -ruN net-snmp-5.1.2-orig/debian/tkmib.manpages net-snmp-5.1.2-5/debian/tkmib.manpages -diff -ruN net-snmp-5.1.2-orig/debian/watch net-snmp-5.1.2-5/debian/watch -diff -ruN net-snmp-5.1.2-orig/ipkg/libsnmp/CONTROL/control net-snmp-5.1.2-5/ipkg/libsnmp/CONTROL/control -diff -ruN net-snmp-5.1.2-orig/ipkg/libsnmp-dev/CONTROL/control net-snmp-5.1.2-5/ipkg/libsnmp-dev/CONTROL/control -diff -ruN net-snmp-5.1.2-orig/ipkg/rules net-snmp-5.1.2-5/ipkg/rules -diff -ruN net-snmp-5.1.2-orig/ipkg/snmp-utils/CONTROL/control net-snmp-5.1.2-5/ipkg/snmp-utils/CONTROL/control -diff -ruN net-snmp-5.1.2-orig/ipkg/snmpd/CONTROL/conffiles net-snmp-5.1.2-5/ipkg/snmpd/CONTROL/conffiles -diff -ruN net-snmp-5.1.2-orig/ipkg/snmpd/CONTROL/control net-snmp-5.1.2-5/ipkg/snmpd/CONTROL/control -diff -ruN net-snmp-5.1.2-orig/ipkg/snmpd/etc/default/snmpd net-snmp-5.1.2-5/ipkg/snmpd/etc/default/snmpd -diff -ruN net-snmp-5.1.2-orig/ipkg/snmpd/etc/init.d/snmpd net-snmp-5.1.2-5/ipkg/snmpd/etc/init.d/snmpd -diff -ruN net-snmp-5.1.2-orig/ipkg/snmpd/etc/snmp/snmpd.conf net-snmp-5.1.2-5/ipkg/snmpd/etc/snmp/snmpd.conf -diff -ruN net-snmp-5.1.2-orig/ipkg/snmpd-static/CONTROL/control net-snmp-5.1.2-5/ipkg/snmpd-static/CONTROL/control -diff -ruN net-snmp-5.1.2-orig/ipkg/version net-snmp-5.1.2-5/ipkg/version -diff -ruN net-snmp-5.1.2-orig/local/Makefile.in net-snmp-5.1.2-5/local/Makefile.in ---- net-snmp-5.1.2-orig/local/Makefile.in 2003-12-20 05:38:17.000000000 +0100 -+++ net-snmp-5.1.2-5/local/Makefile.in 2005-03-13 16:17:21.000000000 +0100 -@@ -58,7 +58,7 @@ - - mib2c.made: $(srcdir)/mib2c - if test "x$(PERLPROG)" != "x" ; then \ -- $(PERLPROG) -p -e 's%^#!.*/perl.*%#!$(PERLPROG)%;s#/usr/local/share/snmp#$(snmplibdir)#;' ${srcdir}/mib2c > mib2c.made; \ -+ $(PERLPROG) -p -e 's%^#!.*/perl.*%#!$(PERLPROG)%;s#/usr/local/share/snmp#$(snmplibdir)#;s#/usr/local/etc/snmp#$(SNMPCONFPATH)#;' ${srcdir}/mib2c > mib2c.made; \ - else \ - touch mib2c.made; \ - fi -diff -ruN net-snmp-5.1.2-orig/local/mib2c net-snmp-5.1.2-5/local/mib2c ---- net-snmp-5.1.2-orig/local/mib2c 2004-06-15 16:26:37.000000000 +0200 -+++ net-snmp-5.1.2-5/local/mib2c 2005-03-13 16:17:21.000000000 +0100 -@@ -56,7 +56,8 @@ - if($ENV{MIB2C_DIR}) { - push @def_search_dirs, $ENV{MIB2C_DIR}; - } --push @def_search_dirs, "/usr/local/share/snmp/"; -+push @def_search_dirs, "/etc/snmp/"; -+push @def_search_dirs, "/usr/share/snmp/"; - - - sub usage { -diff -ruN net-snmp-5.1.2-orig/man/mib2c.1.def net-snmp-5.1.2-5/man/mib2c.1.def ---- net-snmp-5.1.2-orig/man/mib2c.1.def 2003-10-02 20:04:19.000000000 +0200 -+++ net-snmp-5.1.2-5/man/mib2c.1.def 2005-03-13 16:17:21.000000000 +0100 -@@ -72,8 +72,9 @@ - .TP - .BI -c " CONFIGFILE" - Use CONFIGFILE when generating code. These files will be searched for --first in the current directory and then in the DATADIR directory --(which is where the default mib2c configuration files can be found). -+first in the current directory and then in /etc/snmp -+(which is where the default mib2c configuration files can be found) -+and finally in the DATADIR directory. - Running mib2c without the -c CONFIGFILE option will display - a description of the valid values for CONFIGFILE, that is, - the available config files, including new ones that you might -diff -ruN net-snmp-5.1.2-orig/man/mib_api.3.def net-snmp-5.1.2-5/man/mib_api.3.def ---- net-snmp-5.1.2-orig/man/mib_api.3.def 2004-04-15 00:41:32.000000000 +0200 -+++ net-snmp-5.1.2-5/man/mib_api.3.def 2005-03-13 16:17:21.000000000 +0100 -@@ -5,7 +5,7 @@ - add_module_replacement, - read_module, read_mib, read_all_mibs, - read_objid, read_module_node, --get_module_node, read_objid -+get_module_node - snmp_set_mib_warnings, snmp_set_save_descriptions, - shutdown_mib, - print_mib, -@@ -34,9 +34,9 @@ - .PP - .BI "void print_mib(FILE *" "fp" ); - .PP --.BI "int read_objid(char *" "input" ", oid *" "output" ", int *" "out_len" ); -+.BI "int read_objid(char *" "input" ", oid *" "output" ", size_t *" "out_len" ); - .br --.BI "int get_module_node(char *" "name" ", char *" "module" ", oid *" "objid" ", int *" "objidlen" ); -+.BI "int get_module_node(char *" "name" ", char *" "module" ", oid *" "objid" ", size_t *" "objidlen" ); - .PP - .BI "void print_variable(const oid *" "objid" ", size_t " "objidlen" ", struct variable_list *" "variable" ); - .br -diff -ruN net-snmp-5.1.2-orig/man/snmp_config.5.def net-snmp-5.1.2-5/man/snmp_config.5.def ---- net-snmp-5.1.2-orig/man/snmp_config.5.def 2003-12-10 11:41:41.000000000 +0100 -+++ net-snmp-5.1.2-5/man/snmp_config.5.def 2005-03-13 16:17:21.000000000 +0100 -@@ -11,7 +11,7 @@ - found and read from. By default, the applications look for - configuration files in the following 4 directories, in order: - SYSCONFDIR/snmp, --DATADIR/snmp, LIBDIR/snmp, and $HOME/.snmp. In each of these -+/etc/snmp, LIBDIR/snmp, and $HOME/.snmp. In each of these - directories, it looks for files with the extension of both - .IR conf " and " local.conf - (reading the second ones last). In this manner, there are -diff -ruN net-snmp-5.1.2-orig/man/snmp_trap_api.3.def net-snmp-5.1.2-5/man/snmp_trap_api.3.def ---- net-snmp-5.1.2-orig/man/snmp_trap_api.3.def 2003-09-29 04:58:18.000000000 +0200 -+++ net-snmp-5.1.2-5/man/snmp_trap_api.3.def 2005-03-13 16:17:21.000000000 +0100 -@@ -1,8 +1,7 @@ - .TH SNMP_TRAP_API 3 "7 Mar 2002" VVERSIONINFO "Net-SNMP" - .UC 5 - .SH NAME --send_easy_trap, send_trap_vars, send_v2trap - send TRAPs or INFORMs --from a Net-SNMP MIB module -+send_easy_trap, send_trap_vars, send_v2trap - send TRAPs or INFORMs from a Net-SNMP MIB module - .SH SYNOPSIS - .B #include - .PP -diff -ruN net-snmp-5.1.2-orig/mibs/BGP4-MIB.txt net-snmp-5.1.2-5/mibs/BGP4-MIB.txt ---- net-snmp-5.1.2-orig/mibs/BGP4-MIB.txt 1970-01-01 01:00:00.000000000 +0100 -+++ net-snmp-5.1.2-5/mibs/BGP4-MIB.txt 2005-03-13 16:17:21.000000000 +0100 +diff -ruN net-snmp-5.4.1.orig/mibs/BGP4-MIB.txt net-snmp-5.4.1/mibs/BGP4-MIB.txt +--- net-snmp-5.4.1.orig/mibs/BGP4-MIB.txt 1970-01-01 01:00:00.000000000 +0100 ++++ net-snmp-5.4.1/mibs/BGP4-MIB.txt 2007-09-20 16:30:52.000000000 +0200 @@ -0,0 +1,929 @@ + BGP4-MIB DEFINITIONS ::= BEGIN + @@ -1773,9 +931,9 @@ diff -ruN net-snmp-5.1.2-orig/mibs/BGP4-MIB.txt net-snmp-5.1.2-5/mibs/BGP4-MIB.t + ::= { bgpMIBGroups 5 } + + END -diff -ruN net-snmp-5.1.2-orig/mibs/BRIDGE-MIB.txt net-snmp-5.1.2-5/mibs/BRIDGE-MIB.txt ---- net-snmp-5.1.2-orig/mibs/BRIDGE-MIB.txt 1970-01-01 01:00:00.000000000 +0100 -+++ net-snmp-5.1.2-5/mibs/BRIDGE-MIB.txt 2005-03-13 16:17:21.000000000 +0100 +diff -ruN net-snmp-5.4.1.orig/mibs/BRIDGE-MIB.txt net-snmp-5.4.1/mibs/BRIDGE-MIB.txt +--- net-snmp-5.4.1.orig/mibs/BRIDGE-MIB.txt 1970-01-01 01:00:00.000000000 +0100 ++++ net-snmp-5.4.1/mibs/BRIDGE-MIB.txt 2007-09-20 16:30:52.000000000 +0200 @@ -0,0 +1,1075 @@ +BRIDGE-MIB DEFINITIONS ::= BEGIN + @@ -2852,10 +2010,10 @@ diff -ruN net-snmp-5.1.2-orig/mibs/BRIDGE-MIB.txt net-snmp-5.1.2-5/mibs/BRIDGE-M + ::= 2 + +END -diff -ruN net-snmp-5.1.2-orig/mibs/GNOME-SMI.txt net-snmp-5.1.2-5/mibs/GNOME-SMI.txt ---- net-snmp-5.1.2-orig/mibs/GNOME-SMI.txt 1970-01-01 01:00:00.000000000 +0100 -+++ net-snmp-5.1.2-5/mibs/GNOME-SMI.txt 2005-03-13 16:17:21.000000000 +0100 -@@ -0,0 +1,72 @@ +diff -ruN net-snmp-5.4.1.orig/mibs/GNOME-SMI.txt net-snmp-5.4.1/mibs/GNOME-SMI.txt +--- net-snmp-5.4.1.orig/mibs/GNOME-SMI.txt 1970-01-01 01:00:00.000000000 +0100 ++++ net-snmp-5.4.1/mibs/GNOME-SMI.txt 2007-09-20 16:33:55.000000000 +0200 +@@ -0,0 +1,88 @@ +GNOME-SMI DEFINITIONS ::= BEGIN + +IMPORTS @@ -2865,7 +2023,7 @@ diff -ruN net-snmp-5.1.2-orig/mibs/GNOME-SMI.txt net-snmp-5.1.2-5/mibs/GNOME-SMI + FROM SNMPv2-SMI; + +gnome MODULE-IDENTITY -+ LAST-UPDATED "200312070000Z" ++ LAST-UPDATED "200709070000Z" + ORGANIZATION "GNOME project" + CONTACT-INFO + "GNU Network Object Model Environment project @@ -2876,8 +2034,8 @@ diff -ruN net-snmp-5.1.2-orig/mibs/GNOME-SMI.txt net-snmp-5.1.2-5/mibs/GNOME-SMI + Administrative contact for MIB module: + + Jochen Friedrich -+ Buedingerstr. 30b -+ 63546 Hammersbach ++ Ramsaystr. 9 ++ 63450 Hanau + Germany + + email: jochen@scram.de" @@ -2886,16 +2044,25 @@ diff -ruN net-snmp-5.1.2-orig/mibs/GNOME-SMI.txt net-snmp-5.1.2-5/mibs/GNOME-SMI + + -- revision history + -+ REVISION "9809010000Z" -- September 01, 1998 ++ REVISION "200709070000Z" -- Sep 07, 2007 + DESCRIPTION -+ "Initial version." ++ "Fixed wrong enterprise number (how comes this ++ typo was unnoticed for so long?)." ++ ++ REVISION "200505070000Z" -- May 07, 2005 ++ DESCRIPTION ++ "Added gnomeLDAP subtree for LDAP definitions." + + REVISION "200312070000Z" -- December 07, 2003 + DESCRIPTION + "Added gnomeSysadmin subtree for GNOME project system administration. + Updated contact info." + -+ ::= { enterprises 3317 } -- assigned by IANA ++ REVISION "9809010000Z" -- September 01, 1998 ++ DESCRIPTION ++ "Initial version." ++ ++ ::= { enterprises 3319 } -- assigned by IANA + +gnomeProducts OBJECT-IDENTITY + STATUS current @@ -2925,32 +2092,19 @@ diff -ruN net-snmp-5.1.2-orig/mibs/GNOME-SMI.txt net-snmp-5.1.2-5/mibs/GNOME-SMI + MIB registrations." + ::= { gnome 4 } + ++gnomeLDAP OBJECT-IDENTITY ++ STATUS current ++ DESCRIPTION ++ "gnomeLDAP defines the subtree for GNOME related LDAP ++ registrations." ++ ::= { gnome 5 } ++ +-- more to come if necessary. + +END -diff -ruN net-snmp-5.1.2-orig/mibs/Makefile.in net-snmp-5.1.2-5/mibs/Makefile.in ---- net-snmp-5.1.2-orig/mibs/Makefile.in 2004-06-18 20:11:15.000000000 +0200 -+++ net-snmp-5.1.2-5/mibs/Makefile.in 2005-03-13 16:17:21.000000000 +0100 -@@ -43,11 +43,15 @@ - UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \ - UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt - -+EXTRAMIBS = BGP4-MIB.txt BRIDGE-MIB.txt GNOME-SMI.txt OSPF-MIB.txt \ -+ OSPF-TRAP-MIB.txt RIPv2-MIB.txt SOURCE-ROUTING-MIB.txt \ -+ LM-SENSORS-MIB.txt -+ - DEFAULTMIBS = @default_mibs_install@ - - MIBS = $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \ - $(AGENTMIBS) $(IANAMIBS) \ -- $(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS) -+ $(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS) $(EXTRAMIBS) - - all: standardall - -diff -ruN net-snmp-5.1.2-orig/mibs/OSPF-MIB.txt net-snmp-5.1.2-5/mibs/OSPF-MIB.txt ---- net-snmp-5.1.2-orig/mibs/OSPF-MIB.txt 1970-01-01 01:00:00.000000000 +0100 -+++ net-snmp-5.1.2-5/mibs/OSPF-MIB.txt 2005-03-13 16:17:21.000000000 +0100 +diff -ruN net-snmp-5.4.1.orig/mibs/OSPF-MIB.txt net-snmp-5.4.1/mibs/OSPF-MIB.txt +--- net-snmp-5.4.1.orig/mibs/OSPF-MIB.txt 1970-01-01 01:00:00.000000000 +0100 ++++ net-snmp-5.4.1/mibs/OSPF-MIB.txt 2007-09-20 16:30:52.000000000 +0200 @@ -0,0 +1,2723 @@ +OSPF-MIB DEFINITIONS ::= BEGIN + @@ -5675,9 +4829,9 @@ diff -ruN net-snmp-5.1.2-orig/mibs/OSPF-MIB.txt net-snmp-5.1.2-5/mibs/OSPF-MIB.t + ::= { ospfGroups 13 } + +END -diff -ruN net-snmp-5.1.2-orig/mibs/OSPF-TRAP-MIB.txt net-snmp-5.1.2-5/mibs/OSPF-TRAP-MIB.txt ---- net-snmp-5.1.2-orig/mibs/OSPF-TRAP-MIB.txt 1970-01-01 01:00:00.000000000 +0100 -+++ net-snmp-5.1.2-5/mibs/OSPF-TRAP-MIB.txt 2005-03-13 16:17:21.000000000 +0100 +diff -ruN net-snmp-5.4.1.orig/mibs/OSPF-TRAP-MIB.txt net-snmp-5.4.1/mibs/OSPF-TRAP-MIB.txt +--- net-snmp-5.4.1.orig/mibs/OSPF-TRAP-MIB.txt 1970-01-01 01:00:00.000000000 +0100 ++++ net-snmp-5.4.1/mibs/OSPF-TRAP-MIB.txt 2007-09-20 16:30:52.000000000 +0200 @@ -0,0 +1,443 @@ +OSPF-TRAP-MIB DEFINITIONS ::= BEGIN + @@ -6122,9 +5276,9 @@ diff -ruN net-snmp-5.1.2-orig/mibs/OSPF-TRAP-MIB.txt net-snmp-5.1.2-5/mibs/OSPF- + + +END -diff -ruN net-snmp-5.1.2-orig/mibs/RIPv2-MIB.txt net-snmp-5.1.2-5/mibs/RIPv2-MIB.txt ---- net-snmp-5.1.2-orig/mibs/RIPv2-MIB.txt 1970-01-01 01:00:00.000000000 +0100 -+++ net-snmp-5.1.2-5/mibs/RIPv2-MIB.txt 2005-03-13 16:17:21.000000000 +0100 +diff -ruN net-snmp-5.4.1.orig/mibs/RIPv2-MIB.txt net-snmp-5.4.1/mibs/RIPv2-MIB.txt +--- net-snmp-5.4.1.orig/mibs/RIPv2-MIB.txt 1970-01-01 01:00:00.000000000 +0100 ++++ net-snmp-5.4.1/mibs/RIPv2-MIB.txt 2007-09-20 16:30:52.000000000 +0200 @@ -0,0 +1,530 @@ + RIPv2-MIB DEFINITIONS ::= BEGIN + @@ -6656,9 +5810,9 @@ diff -ruN net-snmp-5.1.2-orig/mibs/RIPv2-MIB.txt net-snmp-5.1.2-5/mibs/RIPv2-MIB + "This group defines peer information for RIP-II systems." + ::= { rip2Groups 4 } +END -diff -ruN net-snmp-5.1.2-orig/mibs/SOURCE-ROUTING-MIB.txt net-snmp-5.1.2-5/mibs/SOURCE-ROUTING-MIB.txt ---- net-snmp-5.1.2-orig/mibs/SOURCE-ROUTING-MIB.txt 1970-01-01 01:00:00.000000000 +0100 -+++ net-snmp-5.1.2-5/mibs/SOURCE-ROUTING-MIB.txt 2005-03-13 16:17:21.000000000 +0100 +diff -ruN net-snmp-5.4.1.orig/mibs/SOURCE-ROUTING-MIB.txt net-snmp-5.4.1/mibs/SOURCE-ROUTING-MIB.txt +--- net-snmp-5.4.1.orig/mibs/SOURCE-ROUTING-MIB.txt 1970-01-01 01:00:00.000000000 +0100 ++++ net-snmp-5.4.1/mibs/SOURCE-ROUTING-MIB.txt 2007-09-20 16:30:52.000000000 +0200 @@ -0,0 +1,452 @@ +SOURCE-ROUTING-MIB DEFINITIONS ::= BEGIN + @@ -7112,171 +6266,3 @@ diff -ruN net-snmp-5.1.2-orig/mibs/SOURCE-ROUTING-MIB.txt net-snmp-5.1.2-5/mibs/ + ::= { dot1dPortPairEntry 4 } + +END -diff -ruN net-snmp-5.1.2-orig/net-snmp-config.in net-snmp-5.1.2-5/net-snmp-config.in ---- net-snmp-5.1.2-orig/net-snmp-config.in 2004-06-17 15:39:28.000000000 +0200 -+++ net-snmp-5.1.2-5/net-snmp-config.in 2005-03-13 16:17:21.000000000 +0100 -@@ -113,13 +113,13 @@ - #################################################### client lib - --libs) - # use this one == --netsnmp-libs + --external-libs -- echo $NSC_LDFLAGS $NSC_LIBDIR -lnetsnmp $NSC_LIBS -+ echo $NSC_LDFLAGS $NSC_LIBDIR -lnetsnmp $NSC_LIBS @WRAPLIBS@ - ;; - --netsnmp-libs) - echo $NSC_LIBDIR -lnetsnmp - ;; - --external-libs) -- echo $NSC_LDFLAGS $NSC_LIBS -+ echo $NSC_LDFLAGS $NSC_LIBS @WRAPLIBS@ - ;; - #################################################### agent lib - --base-agent-libs) -@@ -130,13 +130,13 @@ - ;; - --agent-libs) - # use this one == --netsnmp-agent-libs + --external-libs -- echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS -+ echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS @WRAPLIBS@ - ;; - --netsnmp-agent-libs) - echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS - ;; - --external-agent-libs) -- echo $NSC_LDFLAGS $NSC_AGENTLIBS -+ echo $NSC_LDFLAGS $NSC_AGENTLIBS @WRAPLIBS@ - ;; - #################################################### - --version) -@@ -409,7 +409,7 @@ - echo "Ack. Can't create $tmpfile." - exit 1 - fi -- cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I@includedir@ -o $outname $tmpfile $cfiles $NSC_LDFLAGS -L$NSC_EXEC_PREFIX/lib -lnetsnmpagent -lnetsnmphelpers -lnetsnmpmibs -lnetsnmp $NSC_AGENTLIBS $ldflags" -+ cmd="@CC@ $cflags @CFLAGS@ @DEVFLAGS@ -I. -I@includedir@ -o $outname $tmpfile $cfiles $NSC_LDFLAGS -L$NSC_EXEC_PREFIX/lib -lnetsnmpagent -lnetsnmphelpers -lnetsnmpmibs -lnetsnmp $NSC_AGENTLIBS @WRAPLIBS@ $ldflags" - echo "running: $cmd" - `$cmd` - if test "x$norm" != "x1" ; then -diff -ruN net-snmp-5.1.2-orig/perl/agent/netsnmp_request_infoPtr.pm net-snmp-5.1.2-5/perl/agent/netsnmp_request_infoPtr.pm ---- net-snmp-5.1.2-orig/perl/agent/netsnmp_request_infoPtr.pm 2002-09-19 22:38:24.000000000 +0200 -+++ net-snmp-5.1.2-5/perl/agent/netsnmp_request_infoPtr.pm 2005-03-13 16:17:21.000000000 +0100 -@@ -4,6 +4,7 @@ - - 1; - __END__ -+ - =head1 NAME - - NetSNMP::agent::netsnmp_request_infoPtr - Perl extension for request information -diff -ruN net-snmp-5.1.2-orig/snmplib/Makefile.in net-snmp-5.1.2-5/snmplib/Makefile.in ---- net-snmp-5.1.2-orig/snmplib/Makefile.in 2004-03-04 14:41:19.000000000 +0100 -+++ net-snmp-5.1.2-5/snmplib/Makefile.in 2005-03-13 16:17:21.000000000 +0100 -@@ -178,11 +178,11 @@ - - # how to build the libraries. - libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} -- $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} -+ $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} @CRYPTOLIBS@ - $(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) - - libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): ${TOBJS} -- $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} -+ $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} @CRYPTOLIBS@ - $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) - - # -diff -ruN net-snmp-5.1.2-orig/snmplib/snmpUDPDomain.c net-snmp-5.1.2-5/snmplib/snmpUDPDomain.c ---- net-snmp-5.1.2-orig/snmplib/snmpUDPDomain.c 2004-07-07 14:21:32.000000000 +0200 -+++ net-snmp-5.1.2-5/snmplib/snmpUDPDomain.c 2005-03-13 16:17:21.000000000 +0100 -@@ -233,18 +233,6 @@ - netsnmp_transport_free(t); - return NULL; - } --#ifdef SO_BSDCOMPAT -- /* -- * Patch for Linux. Without this, UDP packets that fail get an ICMP -- * response. Linux turns the failed ICMP response into an error message -- * and return value, unlike all other OS's. -- */ -- { -- int one = 1; -- setsockopt(t->sock, SOL_SOCKET, SO_BSDCOMPAT, (void *) &one, -- sizeof(one)); -- } --#endif /*SO_BSDCOMPAT */ - /* - * SO_REUSEADDR will allow multiple apps to open the same port at - * the same time. Only the last one to open the socket will get -diff -ruN net-snmp-5.1.2-orig/snmplib/snmpUDPIPv6Domain.c net-snmp-5.1.2-5/snmplib/snmpUDPIPv6Domain.c ---- net-snmp-5.1.2-orig/snmplib/snmpUDPIPv6Domain.c 2004-07-22 19:45:00.000000000 +0200 -+++ net-snmp-5.1.2-5/snmplib/snmpUDPIPv6Domain.c 2005-03-13 16:17:21.000000000 +0100 -@@ -249,17 +249,6 @@ - netsnmp_transport_free(t); - return NULL; - } --#ifdef SO_BSDCOMPAT -- /* -- * Patch for Linux. Without this, UDP packets that fail get an ICMP -- * response. Linux turns the failed ICMP response into an error message -- * and return value, unlike all other OS's. -- */ -- { -- int one = 1; -- setsockopt(t->sock, SOL_SOCKET, SO_BSDCOMPAT, &one, sizeof(one)); -- } --#endif /*SO_BSDCOMPAT */ - - /* - * Try to set the send and receive buffers to a reasonably large value, so -diff -ruN net-snmp-5.1.2-orig/snmplib/snmp_logging.c net-snmp-5.1.2-5/snmplib/snmp_logging.c ---- net-snmp-5.1.2-orig/snmplib/snmp_logging.c 2004-03-31 03:06:08.000000000 +0200 -+++ net-snmp-5.1.2-5/snmplib/snmp_logging.c 2005-03-13 16:17:21.000000000 +0100 -@@ -860,13 +860,14 @@ - } else { - strcpy(sbuf, ""); - } -- newline = string[strlen(string) - 1] == '\n'; /* XXX - Eh ? */ - - if (logh->imagic) - printf( "%s%s", sbuf, string); - else - fprintf(stderr, "%s%s", sbuf, string); - -+ newline = string[strlen(string) - 1] == '\n'; /* XXX - Eh ? */ -+ - return 1; - } - -diff -ruN net-snmp-5.1.2-orig/snmplib/winservice.mc net-snmp-5.1.2-5/snmplib/winservice.mc ---- net-snmp-5.1.2-orig/snmplib/winservice.mc 2002-04-20 09:30:21.000000000 +0200 -+++ net-snmp-5.1.2-5/snmplib/winservice.mc 2005-03-13 16:17:21.000000000 +0100 -@@ -1,11 +1,11 @@ --;//Message catalog for Windows Serivce Support routines --;//To support event logging functionality --;//By Raju Krishnappa(raju_krishnappa@yahoo.com) -- --;//Message ID descriptions -- --MessageId=100 --SymbolicName=DISPLAY_MSG --Language=English --%1. --. -+;//Message catalog for Windows Serivce Support routines -+;//To support event logging functionality -+;//By Raju Krishnappa(raju_krishnappa@yahoo.com) -+ -+;//Message ID descriptions -+ -+MessageId=100 -+SymbolicName=DISPLAY_MSG -+Language=English -+%1. -+. -diff -ruN net-snmp-5.1.2-orig/snmplib/winservice.rc net-snmp-5.1.2-5/snmplib/winservice.rc ---- net-snmp-5.1.2-orig/snmplib/winservice.rc 2002-04-20 09:30:21.000000000 +0200 -+++ net-snmp-5.1.2-5/snmplib/winservice.rc 2005-03-13 16:17:21.000000000 +0100 -@@ -1,2 +1,2 @@ --LANGUAGE 0x9,0x1 --1 11 MSG00001.bin -+LANGUAGE 0x9,0x1 -+1 11 MSG00001.bin diff --git a/libs/net-snmp/patches/140-debian-docfiles.patch b/libs/net-snmp/patches/140-debian-docfiles.patch new file mode 100644 index 0000000000..a6cb10c00c --- /dev/null +++ b/libs/net-snmp/patches/140-debian-docfiles.patch @@ -0,0 +1,95 @@ +--- net-snmp-5.4.orig/FAQ 2006-11-25 00:34:18.000000000 +0100 ++++ net-snmp-5.4/FAQ 2006-11-25 00:37:09.000000000 +0100 +@@ -98,7 +98,7 @@ + I don't understand the new access control stuff - what does it mean? + How do I configure SNMPv3 users? + The 'createUser' line disappears when I start the agent. Why? +- What's the difference between /var/net-snmp and /usr/local/share/snmp? ++ What's the difference between /var/lib/snmp and /usr/share/snmp? + My new agent is ignoring the old snmpd.conf file. Why? + Why am I getting "Connection refused"? + Why can't I see values in the UCDavis 'extensible' or 'disk' trees? +@@ -630,7 +630,7 @@ + There are two steps required to add a new MIB file to the tools. + Firstly, copy the MIB file into the appropiate location: + +- cp MY-MIB.txt /usr/local/share/snmp/mibs ++ cp MY-MIB.txt /usr/share/snmp/mibs + (which makes it available to everyone on the system) + + or +@@ -1158,7 +1158,7 @@ + If this is the case, then you can specify this interpreter + explicitly as part of the trap handle directive: + +- traphandle default /usr/bin/perl /usr/local/bin/log_it ++ traphandle default /usr/bin/perl /usr/bin/log_it + + In this case, it's almost certain that you'll also + need to give the full path to the traphandle script (as shown) +@@ -1232,7 +1232,7 @@ + string to use. + + Some of these (such as the MIB file location), might be best put in +- a shared snmp.conf file (typically /usr/local/share/snmp/snmp.conf or ++ a shared snmp.conf file (typically /usr/share/snmp/snmp.conf or + /etc/snmp/snmp.conf) to apply to all users of the system. Others + (particularly the SNMPv3 security settings), are more likely to refer + to a particular user, and should go in a personal snmp.conf file +@@ -1455,7 +1455,7 @@ + + + Alternatively, the tools may be looking in the wrong place. +- The default location for the mib files is /usr/local/share/snmp/mibs. ++ The default location for the mib files is /usr/share/snmp/mibs. + Again, this is set when the suite is first configured and compiled. + This can be changed using the environmental variable 'MIBDIRS' + or the snmp.conf directive 'mibdirs'. +@@ -2409,7 +2409,7 @@ + + There are three ways to configure SNMPv3 users: + +- 1) Stop the agent, and create a file /var/net-snmp/snmpd.conf, ++ 1) Stop the agent, and create a file /var/lib/snmp/snmpd.conf, + containing the line + + createUser {myUser} MD5 {myPassword} DES +@@ -2422,7 +2422,7 @@ + net-snmp-config --create-snmpv3-user + + and follow the instructions. This will create an entry +- in the /var/net-snmp/snmpd.conf file similar to the above. ++ in the /var/lib/snmp/snmpd.conf file similar to the above. + Then re-start the snmpd agent. + + 3) Make sure the agent is running, and will respond to a suitable +@@ -2455,16 +2455,16 @@ + + + +-What's the difference between /var/net-snmp and /usr/local/share/snmp? +---------------------------------------------------------------------- ++What's the difference between /var/lib/snmp and /usr/share/snmp? ++---------------------------------------------------------------- + +- The /var/net-snmp location is primarily used for information set ++ The /var/lib/snmp location is primarily used for information set + during the running of the agent, which needs to be persistent between + one run of the agent and the next. Apart from "createUser" (see + the previous entry), you shouldn't need to touch this file. + + All other user-provided configuration should go in the traditional +- location (typically /usr/local/share/snmp/snmpd.conf or /etc/snmp). ++ location (typically /usr/share/snmp or /etc/snmp). + + + +@@ -2477,7 +2477,7 @@ + distribution), with the current release installed from the source. + + The default location for this file with the basic distribution is +- /usr/local/share/snmp/snmpd.conf (or PREFIX/share/snmp/snmpd.conf). ++ /usr/share/snmp/snmpd.conf (or PREFIX/share/snmp/snmpd.conf). + Ready-installed versions often look for the file as /etc/snmpd.conf, + or /etc/snmp/snmpd.conf. Try moving the old config file to the new + location, and restart the agent. diff --git a/libs/net-snmp/patches/150-debian-defaultconfig.patch b/libs/net-snmp/patches/150-debian-defaultconfig.patch new file mode 100644 index 0000000000..e55d30a3fc --- /dev/null +++ b/libs/net-snmp/patches/150-debian-defaultconfig.patch @@ -0,0 +1,142 @@ +--- net-snmp-5.1.2.orig/EXAMPLE.conf.def ++++ net-snmp-5.1.2/EXAMPLE.conf.def +@@ -6,7 +6,7 @@ + ############################################################################### + # + # This file is intended to only be an example. If, however, you want +-# to use it, it should be placed in SYSCONFDIR/snmp/snmpd.conf. ++# to use it, it should be placed in /etc/snmp/snmpd.conf. + # When the snmpd agent starts up, this is where it will look for it. + # + # You might be interested in generating your own snmpd.conf file using +@@ -58,31 +58,37 @@ + # from): + + # sec.name source community +-com2sec local localhost COMMUNITY +-com2sec mynetwork NETWORK/24 COMMUNITY ++com2sec paranoid default public ++#com2sec readonly default public ++#com2sec readwrite default private + + #### + # Second, map the security names into group names: + + # sec.model sec.name +-group MyRWGroup v1 local +-group MyRWGroup v2c local +-group MyRWGroup usm local +-group MyROGroup v1 mynetwork +-group MyROGroup v2c mynetwork +-group MyROGroup usm mynetwork ++group MyROSystem v1 paranoid ++group MyROSystem v2c paranoid ++group MyROSystem usm paranoid ++group MyROGroup v1 readonly ++group MyROGroup v2c readonly ++group MyROGroup usm readonly ++group MyRWGroup v1 readwrite ++group MyRWGroup v2c readwrite ++group MyRWGroup usm readwrite + + #### + # Third, create a view for us to let the groups have rights to: + + # incl/excl subtree mask + view all included .1 80 ++view system included .iso.org.dod.internet.mgmt.mib-2.system + + #### + # Finally, grant the 2 groups access to the 1 view with different + # write permissions: + + # context sec.model sec.level match read write notif ++access MyROSystem "" any noauth exact system none none + access MyROGroup "" any noauth exact all none none + access MyRWGroup "" any noauth exact all all none + +@@ -100,8 +106,8 @@ + # value of an object whose value is given here will fail with an error + # status of notWritable. + +-syslocation Right here, right now. +-syscontact Me ++syslocation Unknown (configure /etc/snmp/snmpd.local.conf) ++syscontact Root (configure /etc/snmp/snmpd.local.conf) + + # Example output of snmpwalk: + # % snmpwalk -v 1 -c public localhost system +@@ -135,13 +141,13 @@ + # + + # Make sure mountd is running +-proc mountd ++#proc mountd + + # Make sure there are no more than 4 ntalkds running, but 0 is ok too. +-proc ntalkd 4 ++#proc ntalkd 4 + + # Make sure at least one sendmail, but less than or equal to 10 are running. +-proc sendmail 10 1 ++#proc sendmail 10 1 + + # A snmpwalk of the prTable would look something like this: + # +@@ -199,7 +205,7 @@ + # ARGS: optional arguments to be passed to the program + + # a simple hello world +-exec echotest /bin/echo hello world ++#exec echotest /bin/echo hello world + + # Run a shell script containing: + # +@@ -250,7 +256,7 @@ + + # Check the / partition and make sure it contains at least 10 megs. + +-disk / 10000 ++#disk / 10000 + + # % snmpwalk -v 1 -c public localhost .EXTENSIBLEDOTMIB.DISKMIBNUM + # enterprises.ucdavis.diskTable.dskEntry.diskIndex.1 = 0 +@@ -279,7 +285,7 @@ + # 15MAX: Similar, but for 15 min average. + + # Check for loads: +-load 12 14 14 ++#load 12 14 14 + + # % snmpwalk -v 1 -c public localhost .EXTENSIBLEDOTMIB.LOADAVEMIBNUM + # enterprises.ucdavis.loadTable.laEntry.loadaveIndex.1 = 1 +@@ -365,7 +371,7 @@ + # (commented out here since it requires that you place the + # script in the right location. (its not installed by default)) + +-# pass .EXTENSIBLEDOTMIB.255 /bin/sh PREFIX/local/passtest ++# pass .EXTENSIBLEDOTMIB.255 /bin/sh /usr/local/passtest + + # % snmpwalk -v 1 -c public localhost .EXTENSIBLEDOTMIB.255 + # enterprises.ucdavis.255.1 = "life the universe and everything" +--- net-snmp-5.1.2.orig/EXAMPLE-trap.conf ++++ net-snmp-5.1.2/EXAMPLE-trap.conf +@@ -0,0 +1,18 @@ ++############################################################################### ++# ++# EXAMPLE-trap.conf: ++# An example configuration file for configuring the Net-SNMP snmptrapd agent. ++# ++############################################################################### ++# ++# This file is intended to only be an example. If, however, you want ++# to use it, it should be placed in /etc/snmp/snmptrapd.conf. ++# When the snmptrapd agent starts up, this is where it will look for it. ++# ++# All lines beginning with a '#' are comments and are intended for you ++# to read. All other lines are configuration commands for the agent. ++ ++# ++# PLEASE: read the snmptrapd.conf(5) manual page as well! ++# ++ diff --git a/libs/net-snmp/patches/901-ipsec-interfaces.patch b/libs/net-snmp/patches/901-ipsec-interfaces.patch deleted file mode 100644 index 886f37af75..0000000000 --- a/libs/net-snmp/patches/901-ipsec-interfaces.patch +++ /dev/null @@ -1,44 +0,0 @@ -Date: Tue, 14 Jun 2005 00:39:54 +0200 -From: Alexander Holler -To: nthill@free.fr -Subject: Patch for libsnmp (openwrt) to work with ipsec-if -Content-Type: text/plain; charset=ISO-8859-1 -Content-Transfer-Encoding: 7bit - -Hello, - -I've a small patch for net-snmp (5.1.2) which is needed to work with -ipsec-interfaces. Otherwise snmpd will segfault which means snmp is not -really usable. - -The patch is from me, but the source for the fault is from: - -http://lists.openswan.org/pipermail/users/2004-August/001773.html - -It works, because this email is going out over ipsec using a -snmp-monitored wrt54g. ;) - - ---- net-snmp-5.1.2/agent/mibgroup/mibII/interfaces.c.orig 2005-06-14 00:41:16.000000000 +0200 -+++ net-snmp-5.1.2/agent/mibgroup/mibII/interfaces.c 2005-06-14 03:21:35.000000000 +0200 -@@ -1438,8 +1438,10 @@ - - if (ioctl(fd, 0x8947, &ifr) >= 0) { - new_ioctl_nums = 1; -+/* - } else if (ioctl(fd, SIOCDEVPRIVATE, &ifr) >= 0) { - new_ioctl_nums = 0; -+*/ - } else { - DEBUGMSGTL(("mibII/interfaces", "SIOCGMIIPHY on %s failed\n", ifr.ifr_name)); - return retspeed; -@@ -1449,7 +1451,8 @@ - for (mii_reg = 0; mii_reg < 8; mii_reg++){ - data[0] = phy_id; - data[1] = mii_reg; -- if(ioctl(fd, new_ioctl_nums ? 0x8948 : SIOCDEVPRIVATE+1, &ifr) <0){ -+/* if(ioctl(fd, new_ioctl_nums ? 0x8948 : SIOCDEVPRIVATE+1, &ifr) <0){ */ -+ if(ioctl(fd, 0x8948, &ifr) <0){ - DEBUGMSGTL(("mibII/interfaces", "SIOCGMIIREG on %s failed\n", ifr.ifr_name)); - } - mii_val[mii_reg] = data[3]; -- 2.30.2