[Pkg-net-snmp-commits] [SCM] Git repository for pkg-net-snmp branch, master, updated. edfdd032767b89aa50b401b9fdb73fd5e022ab72

Hideki Yamane henrich at debian.org
Thu Apr 11 01:24:09 UTC 2013


The following commit has been merged in the master branch:
commit 5a755c09af01c31bc3beefc461decbb1844f75db
Merge: 9c90d287bee24712eabc1c1175afc13db1ccb30a 9c3c74a98221880a5804fd58fe541c8b672995d2
Author: Hideki Yamane <henrich at debian.org>
Date:   Tue Mar 19 16:43:02 2013 +0900

    Imported Debian patch 5.7.2~dfsg-1~0.1

diff --combined debian/README.Debian
index 23b60dc,0000000..2060071
mode 100644,000000..100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -1,22 -1,0 +1,26 @@@
 +Please note the following customizations of the Net-SNMP packages for
 +Debian.
 +
- The default configuration for snmpd is rather paranoid for security
- reasons.  Edit /etc/snmp/snmpd.conf or run snmpconf to allow greater
- access.
++ - It doesn't ship some MIBs (IANA, IETF) from license reason.
++   Please download it
++   (Bug#479633, etc)
 +
- The snmpconf program provides a simple, menu driven way of configuring
- the snmp applications and daemons.
++ - The default configuration for snmpd is rather paranoid for security
++   reasons.  Edit /etc/snmp/snmpd.conf or run snmpconf to allow greater
++   access.
 +
- You can individually control whether or not snmpd and snmpdtrap are
- run by editing /etc/default/snmp.  In addition, neither daemon will be
- run if its config file in /etc/snmp is removed.
++ - The snmpconf program provides a simple, menu driven way of configuring
++   the snmp applications and daemons.
 +
- As of net-snmp version 5.0, the community string can no longer be
- specified after the agent parameter on the command line.  It must now
- be specified with the -c option.  Please see snmpcmd(1) for more
- information.
++ - You can individually control whether or not snmpd and snmpdtrap are
++   run by editing /etc/default/snmp.  In addition, neither daemon will be
++   run if its config file in /etc/snmp is removed.
 +
- snmpd is built with TCP Wrappers.  Make sure your /etc/hosts.allow and
- /etc/hosts.deny files account for this.
++ - As of net-snmp version 5.0, the community string can no longer be
++   specified after the agent parameter on the command line.  It must now
++   be specified with the -c option.  Please see snmpcmd(1) for more
++   information.
++
++ - snmpd is built with TCP Wrappers.  Make sure your /etc/hosts.allow and
++   /etc/hosts.deny files account for this.
 +
diff --combined debian/TODO
index 0000000,0000000..6de6f86
new file mode 100644
--- /dev/null
+++ b/debian/TODO
@@@ -1,0 -1,0 +1,47 @@@
++* We cannot build Perl module with -pie hardening option.
++
++* We cannot include below MIBs due to license reason, so removed them
++  from upstream tarball.
++
++RFC1155-SMI.txt
++RFC1213-MIB.txt
++SMUX-MIB.txt
++IPV6-TCP-MIB.txt
++IPV6-UDP-MIB.txt
++IPV6-MIB.txt
++IPV6-TC.txt
++IPV6-ICMP-MIB.txt
++SNMP-COMMUNITY-MIB.txt
++SNMPv2-SMI.txt
++SNMPv2-TC.txt
++SNMPv2-CONF.txt
++AGENTX-MIB.txt
++SNMP-USM-DH-OBJECTS-MIB.txt
++NETWORK-SERVICES-MIB.txt
++MTA-MIB.txt
++HOST-RESOURCES-MIB.txt
++HOST-RESOURCES-TYPES.txt
++RMON-MIB.txt
++HCNUM-TC.txt
++IF-MIB.txt
++IF-INVERTED-STACK-MIB.txt
++DISMAN-EVENT-MIB.txt
++DISMAN-EXPRESSION-MIB.txt
++NOTIFICATION-LOG-MIB.txt
++DISMAN-SCRIPT-MIB.txt
++DISMAN-SCHEDULE-MIB.txt
++SNMP-FRAMEWORK-MIB.txt
++SNMP-MPD-MIB.txt
++SNMP-NOTIFICATION-MIB.txt
++SNMP-PROXY-MIB.txt
++SNMP-TARGET-MIB.txt
++SNMP-USER-BASED-SM-MIB.txt
++SNMP-VIEW-BASED-ACM-MIB.txt
++SNMPv2-TM.txt
++SNMPv2-MIB.txt
++TRANSPORT-ADDRESS-MIB.txt
++IPV6-FLOW-LABEL-MIB.txt
++EtherLike-MIB.txt
++SNMP-USM-AES-MIB.txt
++SCTP-MIB.txt
++
diff --combined debian/changelog
index bb2dce8,0000000..f931e02
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,1224 -1,0 +1,1355 @@@
++net-snmp (5.7.2~dfsg-1~0.1) experimental; urgency=low
++
++  * Non-maintainer upload.
++  * New upstream version 5.7.2 (Closes: #557348, #631063, #684388, #599929,
++    #673197, #581185, #558356, #568550, #514842, #445608, #557186, #411858,
++    #428824, #611837, #495060, #527231, #583391, #572414, #668545, #344979,
++    #397573)
++  * debian/control
++    - set "Standards-Version: 3.9.4"
++    - set "Build-Depends: debhelper (>= 9)" to enable hardening
++    - set "Build-Depends: automake", instead of automake1.9
++    - drop "Build-Depends: python-central", use dh_python2 by default, instead
++    - remove duplicational "Priority:" and "Section:" fields
++    - make it "Multi-Arch" enable
++    - add description for non-free snmp-mibs-downloader for users' convinience
++      (Closes: #561124)
++    - add "Build-Depends: libmysqld-dev" to support MySQL
++    - add "Build-Depends: dh-autoreconf"
++    - use python-all (2.6.6-3~) instead of python-all-dev (>= 2.5.4-1~), python
++      (>=2.3.5-7) for Build-Depends
++    - add "Build-Depends: python2.7-dev"
++    - s/libsnmp-python/python-netsnmp/ as Python Policy compliant
++      (Closes: #661899)
++    - Add libsnmp-base to snmp and snmpd's Depends and remove it from
++      libsnmp30, also remove "Depends: libsnmp-perl (=${binary:Version})" from
++      libsnmp-dev to adjust dependencies in Multi-Arch compliant.
++    - simplify libsnmp-perl's Depends to avoid piuparts error
++    - remove "Conflicts: libsnmp-dev" from libsnmp-dev
++    - point to git://anonscm.debian.org/pkg-net-snmp/pkg-net-snmp.git for
++      Vcs-* fields
++  * debian/compat
++    - set 9
++  * debian/*.install
++    - split into *.manpages
++  * debian/fixman: drop it.
++  * debian/*.manpages (Closes: #505149) 
++    - remove unnecessary"snmp" from tail of all man pages
++  * debian/libsnmp-base.install
++    - move /usr/share/mibs to /usr/share/snmp/mibs (probably, previous setting
++      was just wrong...)
++    - install all mibs/*.txt
++  * debian/libsnmp-dev.install
++    - change from "usr/lib/*" to "usr/lib/*/*" to deal with Multi-Arch
++  * debian/libsnmp30.install
++    - change from "usr/lib/*.so" to "usr/lib/*/*.so" to deal with Multi-Arch
++  * debian/snmp.dirs: remove it since unnecessary
++  * debian/snmpd.dirs: remove lintian overrides direcotry, add /etc/snmp
++  * debian/libsnmp-dev.dirs: add it
++  * debian/libsnmp-perl.examples: add it since dh_installexamples target in
++    previous debian/rules doesn't work correctly.
++  * debian/patches
++    - remove all *.README files
++    - add fix_typo_in_snmpd.conf.patch (Closes: #603593)
++      Thanks to Slavko <linux at slavino.sk>
++    - add fix_logging_option.patch (Closes: #616437)
++    - add fix_snmpcheck_perl_path.patch to provide snmpcheck (Closes: #44373)
++    - add net-snmp-config_multi-arch.patch to enable Multi-Arch
++    - add fix_regular_expression.patch enable to build under Multi-Arch
++    - add to snmptranslate.1.patch fix lintian "hyphen-used-as-minus-sign"
++      warnings
++    - add fix_spelling_error.patch to fix typo
++    - add after_RFC5378 to include some MIBs as DFSF-free code in RFC Documents.
++    - adjust and refresh 03_makefiles.patch
++    - add fix_man_error.patch
++    - drop 25_duplicate_iftable.patch and 44_nlist_kvm.patch since it cannot be
++      applied to current code.
++    - drop 32_mnttab_path.patch since it was merged to upstream as 
++      configure.d/config_os_misc4
++    - drop 56_manpage.patch since most of patches are merged, and others are
++      unnecessary because upstream files are disappeared.
++    - refresh 61_vacm_missing_dependency_check.patch
++    - drop 63_fix_shell.patch since it was merged to upstream
++    - reapplied 64_missing_lib.patch since upstream source has been changed.
++    - drop 65_CVE-2012-2141.patch since it was merged to upstream
++    - drop 66_formatstrings.patch since almost merged to upstream, some of 
++      code are changed in upstream and become unnecessary.
++    - move 08_defaultconfig.patch to debian/snmptrapd.conf
++  * debian/rules
++    - enable hardening
++      (TODO: building perl module would be failed without -pie)
++    - specify LDFLAGS to enable hardening
++    - add "--with autotools-dev,autoreconf"
++    - export DEB_BUILD_MAINT_OPTIONS to enable hardening
++    - drop "dh --with python-central" (Closes: #616913) 
++    - drop "include /usr/share/python/python.mk"
++    - remove "$(PYVERS:%=debian/python-install-stamp-%)"
++    - move exist python targets under override_dh_install
++    - remove unnecessary .PHONY lines
++    - enable tests by removing no instructions with dh_auto_test line
++    - set DEB_HOST_MULTIARCH to enable Multi-Arch
++    - enable install snmpcheck
++    - don't specify to copy files but install them by using .install file
++      (mostly)
++    - enable mysql support
++    - enable AES support (Closes: #447705)
++    - don't make symlink for /usr/share/doc/libsnmp-perl since other are okay
++      but it has examples files.
++    - snmpd doc files link to libsnmp (Closes: #453124)
++    - libsnmp-perl doc files link to libsnmp
++    - adjust dh_strip for dbg package.
++    - adjust dh_clean target
++    - remove override_dh_auto_build since LD_RUN_PATH is clearly specified
++      during building perl modules
++    - add mibII/mta_sendmail to build modules (Closes: #641608)
++    - install copyright file manually for libsnmp30
++    - "get-orig-source:" target: really remove IANA files.
++    - improve specifying MIBs directory with new one.
++    - add "disman/event-mib" to MIB_MODULES, somehow changes in 5.2.2-5
++      disappeared (Closes: #562787)
++  * debian/clean
++    - most listed files are cared by autotools-dev, so removed.
++  * debian/snmp.conf: fix typo (Closes: #623499, #647468)
++  * debian/snmpd.init
++    - force remove pid files (Closes: #528104)
++    - deal with MIBs directory changes
++  * add libsnmp30.lintian-overrides since it seems to be false-positive.
++  * debian/snmpd.dirs: fix "using of /var/agentx conflicts with FHS"
++    RFC says "(It may create other, implementation-specific endpoints.)", so
++    FHS-compliant endpoint is more suitable for Debian system.
++    (Closes: #672063)
++  * debian/snmpd.lintian-overrides
++    - remove above overrides since it's unnecessary anomore.
++  * move snmp.conf from libsnmp30 to snmp.
++  * debian/snmpd.default
++    - Disable loading mteTrigger and mteTriggerConf modules as they don't
++      work without non-free MIBs.
++  * libsnmp-perl.postinst: remove it since it's not necesssary because
++    symlink is handled by debian/rules
++
++ -- Hideki Yamane <henrich at debian.org>  Tue, 19 Mar 2013 16:43:02 +0900
++
 +net-snmp (5.4.3~dfsg-2.7) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * debian/patches/27_kfreebsd_bug625985.patch: New patch, fix build error on
 +    kfreebsd-*, by Steven Chamberlain (closes: #625985).
 +
 + -- Michael Banck <mbanck at debian.org>  Sat, 24 Nov 2012 13:30:51 +0100
 +
 +net-snmp (5.4.3~dfsg-2.6) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * debian/libsnmp-perl.postinst: Fix directory to symlink upgrade in
 +    postinst (closes: #692949)
 +
 + -- David Prévot <taffit at debian.org>  Sun, 18 Nov 2012 09:24:30 -0400
 +
 +net-snmp (5.4.3~dfsg-2.5) unstable; urgency=medium
 +
 +  * Non-maintainer upload by the Security Team.
 +  * Fix CVE-2012-2141 by using Ubuntu's patch (Closes: #672492).
 +  * Do not ship *.la files (Closes: #633166).
 +  * Enable hardened build flags and fix missing format strings 
 +    (Closes: #657519).
 +  * Source debconf before doing work in postinst (Closes: #626312).
 +  * Fix check for existing snmp group in postinst (Closes: #609430).
 +  * Use *-any architecture qualifiers (Closes: #634735).
 +  * Add Indonesian debconf translation (Closes: #654166).
 +  * Add Polish debconf translation (Closes: #661252).
 +
 + -- Luk Claes <luk at debian.org>  Sun, 27 May 2012 17:22:01 +0200
 +
 +net-snmp (5.4.3~dfsg-2.4) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Trivial lintian fix: don't use braces in libsnmp-dev.install
 +  * Fix pending l10n issues. Debconf translations:
 +    - Korean (si-cheol KO).  Closes: #630948
 +    - Slovak (Slavko).  Closes: #634988
 +    - Serbian (Zlatan Todoric).  Closes: #635066
 +    - Serbian Latin (Zlatan Todoric).  Closes: #635067
 +    - Catalan; (Innocent De Marchi).  Closes: #641829
 +
 + -- Christian Perrier <bubulle at debian.org>  Mon, 19 Dec 2011 07:34:31 +0100
 +
 +net-snmp (5.4.3~dfsg-2.3) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Fix for init script status command when trapd is not running.  Thanks to
 +    Steve Camfield <steve.camfield at scamfield.co.uk> for the patch
 +    (closes: #610306)
 +
 + -- Stephen Gran <sgran at debian.org>  Sat, 27 Aug 2011 09:10:09 +0000
 +
 +net-snmp (5.4.3~dfsg-2.2) unstable; urgency=high
 +
 +  * Non-maintainer upload.
 +  * Fix FTBFS on kfreebsd-* by updating 44_nlist_kvm.patch to detect nlist
 +    (in libbsd), thanks to Jakub Wilk (Closes: #625985).
 +  * Add build-dependency on libbsd-dev on kfreebsd-* accordingly.
 +
 + -- Cyril Brulebois <kibi at debian.org>  Mon, 09 May 2011 11:12:31 +0200
 +
 +net-snmp (5.4.3~dfsg-2.1) unstable; urgency=high
 +
 +  [ Julien Cristau ]
 +  * Non-maintainer upload to fix FTBFS (closes: #625730).
 +  * Don't hardcode SHELL to /bin/sh in Makefile.top, libtool wants bash
 +    (closes: #617212).
 +  * Add missing libraries to link commands to make newer gcc happy (closes:
 +    #555767, #615756).
 +
 +  [ Cyril Brulebois ]
 +  * Do the 3.0 (quilt) dance to get Julien's patches applied.
 +  * Add some bug closures.
 +
 + -- Cyril Brulebois <kibi at debian.org>  Sat, 07 May 2011 12:14:26 +0200
 +
 +net-snmp (5.4.3~dfsg-2) unstable; urgency=high
 +
 +  * Add libperl-dev to libsnmp-dev dependencies (Closes: #608794)
 +  * Add missing include to 61_vacm_missing_dependency_check.patch
 +    (Closes: #602809)
 +  * High urgency due to RC bug fixes
 +
 + -- Jochen Friedrich <jochen at scram.de>  Wed, 05 Jan 2011 13:03:32 +0100
 +
 +net-snmp (5.4.3~dfsg-1) unstable; urgency=low
 +
 +  * New upstream version (Closes: #559109)
 +    - includes fix for CVE-2008-4309
 +    - includes fix for CVE-2008-6123 (Closes: #516801)
 +    - AgentX support listens on localhost (only) by default
 +    - support for monitoring large disks (>2Tb)
 +    - improved handling of multiple matching access control entries
 +  * Remove patches included upstream:
 +    - 31_silence_subcontainer.patch
 +    - 57_fix_ipv6_memleak.patch
 +    - 59_fix_python.patch
 +  * Update patches:
 +    - 03_makefiles.patch
 +    - 07_docfiles.patch
 +    - 08_defaultconfig.patch
 +    - 32_mnttab_path.patch
 +    - 56_manpage.patch (Closes: #582400)
 +    - 60_libsensors_api.patch (Closes: #575810)
 +  * Switch to dpkg-source 3.0 (quilt) format
 +  * Bump Standards version to 3.8.4
 +  * Moved snmp.conf from snmp to libsnmp15
 +  * Don't bind to 172.0.0.1 in snmpd.default anymore. This is now
 +    done in the upstream sample snmpd.conf file. Trying to bind to
 +    127.0.0.1 in both places will make snmpd fail to start, at all.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Thu, 10 Jun 2010 18:02:54 +0200
 +
 +net-snmp (5.4.2.1~dfsg-5) unstable; urgency=low
 +
 +  * Add conditional depends back that were lost in the build system
 +    change (Closes: #560408)
 +  * Install all provided NET-SNMP MIBs.
 +  * Install snmp.conf with empty MIB list so snmp tools work without
 +    complaining about missing MIBs. (Closes: #559200)
 +  * Add /usr/share/mibs/site and /usr/share/snmp/mibs to MIB search path
 +    (Closes: #560371)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Tue, 15 Dec 2009 14:59:44 +0100
 +
 +net-snmp (5.4.2.1~dfsg-4) unstable; urgency=low
 +
 +  * Update 26_kfreebsd.patch with patch from Petr Salinger
 +    <Petr.Salinger at seznam.cz> (Closes: #557244).
 +  * Applied patch from Jakub Wilk <ubanus at users.sf.net> to make the
 +    python module compile with python2.6 (Closes: #557540).
 +  * Suggests snmp-mibs-downloader from contrib to download MIBs.
 +    Remove the download scripts from this package (Closes: #557434, #557682)
 +  * Move net-snmp-config to libsnmp15 as it contains platform dependent
 +    code (Closes: #558488). Also clean up old Replaces / Conflicts.
 +  * Add patch from Pino Toscano <pino at kde.org> for hurd-i386 support.
 +    Closes: #530289.
 +  * Provide a new option --base-lib-cflags for CFLAGS without perl dependent
 +    stuff. (Closes: #502806)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Tue, 01 Dec 2009 18:40:38 +0100
 +
 +net-snmp (5.4.2.1~dfsg-3) unstable; urgency=low
 +
 +  * Fix typo in NEWS.
 +  * Add make to libsnmp-base dependency (Closes: #556632).
 +  * Use dh7 build system instead of cdbs (Closes: #552976).
 +  * Fix man page .so links so they get installed correctly.
 +  * Replace download host for RFCs for a faster one and add some better
 +    documentation that this step takes some time and that it can be repeated
 +    in case of a problem. (Closes: #556633, #556778, #556787, #556788)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Wed, 18 Nov 2009 16:54:11 +0100
 +
 +net-snmp (5.4.2.1~dfsg-2) unstable; urgency=low
 +
 +  * Add upstream patch R17470 to fix debugging output and numeric OID
 +    reporting. (Closes: #524203, #509562) Thanks to Luca Ferroni
 +    <luca.ferroni at labs.it> for the patch.
 +  * Fix long description of debug package.
 +  * Switch to libsensors4. (Closes: #518898) Thanks to Jonathan Nieder
 +    <jrnieder at gmail.com> for the patch.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Thu, 12 Nov 2009 16:17:40 +0100
 +
 +net-snmp (5.4.2.1~dfsg-1) unstable; urgency=low
 +
 +  * New upstream version
 +    - includes patch for CVE-2008-6123 (Closes: #516801)
 +  * remove patches applied upstream:
 +    - 55_cve2008_4309.patch
 +    - 54_fix_xen.patch
 +    - 53_fix_python_regression.patch
 +    - 52_suppress_registration_warnings.patch 
 +    - 51_allow_g_groupname.patch
 +    - 50_cve2008_0960.patch
 +    - 49_cve2008_2292_python.patch
 +    - 48_cve2008_2292_perl.patch
 +    - 47_prevent_partial_inserts.patch
 +    - 46_ifname_crop.patch
 +    - 45_process_race.patch
 +    - 43_snmp_logging.patch
 +    - 41_snmptrapd_close_handles.patch
 +  * Updated patches:
 +    - 31_silence_subcontainer.patch: Use upstream changeset 17254
 +    - 25_duplicate_iftable.patch: Regenerated
 +    - 03_makefiles.patch: Install Makefile.mib
 +  * Removed non-free MIBS from distribution (Closes: #498475)
 +  * Add debug package
 +  * Implement "status" action in the init.d script. (Closes: #528107)
 +    Thanks to Peter Eisentraut <petere at debian.org> for the patch
 +  * Fix LSB dependencies (Closes: #541366). Thanks to Petter Reinholdtsen
 +    <pere at hungry.com> for the patch.
 +  * Let snmpd run as group snmp (Closes: #520724). Thanks to Russell Coker
 +    <russell at coker.com.au> for the patch.
 +  * Update standards version to 3.8.3.
 +  * Get rid off lintian warnings.
 +  * Fix memory leak when multiple interfaces have the same IPv6 address,
 +    such as link-local addresses when VLAN subinterfaces are in use.
 +    (Closes: #531056). Thanks to John Morrissey <jwm at horde.net> for the
 +    patch.
 +  * Rework build system (Closes: #528106)
 +  * Change default configuration to make snmp daemons run without MIBs.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Mon, 09 Nov 2009 18:29:10 +0100
 +
 +net-snmp (5.4.1~dfsg-12) unstable; urgency=high
 +
 +  * Urgency high because of RC bug fix.
 +  * Modify start action so it doesn't fail if the service is already running.
 +    (Closes: #505237)
 +  * Update Romanian translation (Closes: #505767)
 +    Thanks to Eddy Petrișor <eddy.petrisor at gmail.com>.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Tue, 16 Dec 2008 15:29:28 +0100
 +
 +net-snmp (5.4.1~dfsg-11) unstable; urgency=high
 +
 +  * This update fixes the following security issue:
 +    - CVE-2008-4309: A bug in the getbulk handling code could let anyone
 +      with even minimal access crash the agent. (Closes: #504150)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Mon, 03 Nov 2008 17:58:35 +0100
 +
 +net-snmp (5.4.1~dfsg-10) unstable; urgency=high
 +
 +  * Fix python regression introduced by fix of CVE-2008-2292 (Closes: #497656)
 +  * Fix xen dom0 problems (Closes: #500717)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Mon, 06 Oct 2008 22:35:57 +0200
 +
 +net-snmp (5.4.1~dfsg-9) unstable; urgency=low
 +
 +  * Ack NMU (Closes: #485945)
 +  * Updated standards version to 3.8.0 (no changes)
 +  * Update debconf translations:
 +   o sv: Martin Bagge <brother at bsnet.se> (Closes: #491778)
 +   o ja: Hideki Yamane (Debian-JP) <henrich at debian.or.jp> (Closes: #494118)
 +  * Add patch to support -g {groupname} (Closes: #441871, #468577, #485948)
 +  * Add official patch to suppress annoying warning in syslog (Closes: #493281)
 +  * Fix default stop section in LSB header of start script.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Fri, 29 Aug 2008 18:13:49 +0200
 +
 +net-snmp (5.4.1~dfsg-8.1) unstable; urgency=high
 +
 +  * Non-maintainer upload by the Security Team.
 +  * This update fixes the following security issue:
 +    - CVE-2008-0960: The authentication code relies on the client specified
 +      HMAC length which makes it easier for an attacker to match a correct HMAC
 +      and authentication if a single byte HMAC is supplied (Closes: #485945)
 +
 + -- Nico Golde <nion at debian.org>  Thu, 12 Jun 2008 22:22:52 +0200
 +
 +net-snmp (5.4.1~dfsg-8) unstable; urgency=low
 +
 +  * NACK NMU as the patch broke perl (Closes: #483588)
 +  * Really fix CVE-2008-2292 using two upstream patches (Closes: #482333)
 +  * Update nl translation (Closes: #460587)
 +  * Update patch for support of long interface names to upstream version
 + 
 + -- Jochen Friedrich <jochen at scram.de>  Tue, 03 Jun 2008 13:06:57 +0200
 +
 +net-snmp (5.4.1~dfsg-7) unstable; urgency=low
 +
 +  * Add some more Conflicts: and Replaces: magic to allow moving
 +    net-snmp-config to libsnmp-base. (Really Closes: #443420, #443396, #261686)
 +  * Update debhelper to version 6
 +  * Add patch for support of long interface names (Closes: #468260)
 +    Thanks to Jonathan Steinert <debian at hachi.kuiki.net> for the patch.
 +  * Add upstream patch to avoid a crash on pppoe tunnels (Closes: #451294)
 +  * Convert copyright to UTF-8.
 +  * Fix spelling error in NEWS: deamon -> daemon.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Tue, 29 Apr 2008 18:37:23 +0200
 +
 +net-snmp (5.4.1~dfsg-6) unstable; urgency=low
 +
 +  * Add Noah Meyerhans as uploader
 +  * Add upstream patch for process regression (Closes: #460050)
 +  * Fix build system for Perl 5.10 (Closes: #463059)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Tue, 29 Jan 2008 14:43:18 +0100
 +
 +net-snmp (5.4.1~dfsg-5) unstable; urgency=low
 +
 +  * Add upstream changeset 16721:
 +   o snmplib: PATCH: 1806336: fix -LS option parsing (Closes: #444986)
 +  * Add patch from Petr Salinger <Petr.Salinger at seznam.cz>:
 +   o search nlist() in libkvm. (Closes: #449550)
 +  * Add finish translation from Esko Arajärvi <edu at iki.fi>.
 +    (Closes: #448421).
 +  * Updated standards version to 3.7.3
 +   o Add Homepage tag
 +   o rename XS-Vcs-* to Vcs-*
 +
 + -- Jochen Friedrich <jochen at scram.de>  Fri, 28 Dec 2007 12:43:21 +0100
 +
 +net-snmp (5.4.1~dfsg-4) unstable; urgency=low
 +
 +  * Do it right this time.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Fri, 21 Sep 2007 21:20:30 +0200
 +
 +net-snmp (5.4.1~dfsg-3) unstable; urgency=low
 +
 +  * Add some Conflicts: and Replaces: magic to allow moving 
 +    net-snmp-config to libsnmp-base. (Closes: #443420, #443396, #261686)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Fri, 21 Sep 2007 16:47:48 +0200
 +
 +net-snmp (5.4.1~dfsg-2) unstable; urgency=low
 +
 +  * Fixed extra MIB patch, so the extra MIBS are really added to the
 +    Debian package.
 +  * Update of GNOME-SMI (fixed a typo in the actual OID)
 +  * Finally move 5.4.1 to unstable (Closes: #441948, #264938, #416965)
 +  * Fixed snmp.install to not include mib2c-update.
 +  * Fixed clean target.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Thu, 20 Sep 2007 16:40:28 +0200
 +
 +net-snmp (5.4.1~dfsg-1) experimental; urgency=low
 +
 +  * New upstream version
 +  * Remove patches included in new upstream.
 +  * Fix double inclusion of net-snmp-config man page
 +  * Include stuff from 5.3.1-8:
 +   o Rearrange snmpd.postrm to not run deluser twice.
 +   o Add lintian override for false alarm caused by
 +     the Smith review project.
 +   o Add patch to snmptrapd to close its file handles (Closes: #391203)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Thu, 02 Aug 2007 14:43:20 +0200
 +
 +net-snmp (5.4~dfsg-2) experimental; urgency=low
 +
 +  [ Christian Perrier ]
 +  * Debconf templates and debian/control reviewed by the debian-l10n-
 +    english team as part of the Smith review project. Closes: #426232
 +  * Debconf translation updates:
 +    - Galician. Closes: #426836
 +    - Vietnamese. Closes: #426842
 +    - Czech. Closes: #426864
 +    - Swedish. Closes: #426882
 +    - Basque. Closes: #426933
 +    - Portuguese. Closes: #427065
 +    - Danish. Closes: #427158
 +    - Spanish. Closes: #427377
 +    - German. Closes: #427542
 +    - Russian. Closes: #427820
 +    - Italian. Closes: #428151
 +    - Brazilian Portuguese. Closes: #428885, #428886
 +    - Tamil. Closes: #428969
 +    - French. Closes: #429814
 +
 +  [ Jochen Friedrich ]
 +  * Include stuff from 5.3.1-6:
 +   o Rename dev Package to libsnmp-dev as suggested by Kurt Roeckx
 +     <kurt at roeckx.be> and Steve Langasek <vorlon at debian.org>
 +  * Remove old template entry (Closes: #422972)
 +  * Set PATH in init script (Closes: #429442)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Tue, 03 Jul 2007 14:54:00 +0200
 +
 +
 +net-snmp (5.4~dfsg-1) experimental; urgency=low
 +
 +  [ Jochen Friedrich ]
 +  * New upstream version (Closes: #279670, #412924, #416965)
 +  * Remove official patches from 5.3.1 tree
 +  * Add official patches
 +   o memory leaks in ipAddress and CirdRoute tables (SF #1610155)
 +   o tcp connection table leaks fds (SF #1611524)
 +  * Patch from upstream svn for snmpd.8 man page
 +  * Add python module
 +
 +
 +  [ Thomas Anders ]
 +  * Change makefile patch for 5.4.rc3
 +  * Change docfile patch for 5.4
 +
 +
 + -- Jochen Friedrich <jochen at scram.de>  Fri, 13 Apr 2007 16:16:02 +0200
 +
 +
 +net-snmp (5.3.1-3) unstable; urgency=low
 +
 +  * Move AgentX socket to RFC location.
 +  * Update pktinfo patch from Jan Andres <jandres at gmx.net>
 +  * Add official patches.
 +   o disabling agentX breaks snmptrapd auth (SF #1527661)
 +   o SNMP.pm gettable() patch (SF #1532044)
 +   o 8 byte IpAddress value for 64bit non-linux systems (SF #1550635)
 +   o memory leaks in ipAddress and CirdRoute tables (SF #1610160)
 +  * Synchronize tree to 5.2.3-7.
 +   o Don't fail postrm on non-existant deluser (Closes: #398540)
 +   o Add German debconf translation (Closes: #397823)
 +     Thanks to Helge Kreutzmann <debian at helgefjell.de>.
 +   o Add Italian debconf translation (Closes: #398047)
 +     Thanks to Luca Monducci <luca.mo at tiscali.it>.
 +   o Add patch to hardcode mount table location (Closes: #370132)
 +   o Add Romanian translation (Closes: #403949)
 +     Thanks to stan ioan-eugen <stan.ieugen at gmail.com>.
 +   o Update patch from Petr Salinger <Petr.Salinger at seznam.cz> for
 +     kFreeBSD and Hurd support. (Closes: #402116)
 +   o Fix restart of snmpd (Closes: #402568, #401306)
 +   o Add Spanish translation (Closes: #402685)
 +     Thanks to Javier Fernández-Sanguino Peña <jfs at computer.org>
 +   o Add Brazilian Portuguese translation (Closes: #403549)
 +     Thanks to André Luís Lopes" <andrelop at debian.org>
 +   o Don't fail postrm on non-existant deluser (Closes: #398540)
 +   o Add LSB section to startup file.
 +   o Add Thomas Anders as co-Maintainer.
 +   o Add missing copyrights to copyright file.
 +   o Fix spelling errors and wrong path names in documentation.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Wed, 11 Apr 2007 13:04:00 +0200
 +
 +net-snmp (5.3.1-2) experimental; urgency=low
 +
 +  * Add kfreebsd support. Thanks to Petr Salinger 
 +    <Petr.Salinger at seznam.cz> (Closes: #380252)
 +  * Add Russian translation. Thanks to Yuri Kozlov 
 +    <kozlov.y at gmail.com> (Closes: #380300)
 +  * Update Czech translation. Thanks to Miroslav Kure
 +    <kurem at upcase.inf.upol.cz> (Closes: #380528)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Mon, 31 Jul 2006 16:57:13 +0200
 +
 +net-snmp (5.3.1-1) experimental; urgency=low
 +
 +  * New upstream version (Closes: #358079, #252893)
 +  * Convert build system to cdbs. (Closes: #323074)
 +  * Add patch from Lars Ellenberg to answer with the same
 +    IP address the request was sent to. (Closes: #111263)
 +  * Add patch from Sven Schnelle to prevent duplicate iftable
 +    entries (Closes: #368617)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Wed, 26 Jul 2006 12:08:46 +0200
 +     
 +net-snmp (5.2.2-4) unstable; urgency=low
 +
 +  * Add French translation. Thanks to Thomas Huriaux
 +    <thomas.huriaux at gmail.com> (Closes: #357928)
 +  * Add Czech translation. Thanks to Miroslav Kure 
 +    <kurem at upcase.inf.upol.cz> (Closes: #358845)
 +  * Add Dutch translation. Thanks to Vincent Zweije 
 +    <zweije at xs4all.nl> (Closes: #360441)
 +  * Add Galician translation. Thanks to Jacobo Tarrio 
 +    <jtarrio at trasno.net> (Closes: #361778)
 +  * Add Portuguese translation. Thanks to Rui Branco 
 +    <ruipb at debianpt.org> (Closes: #375018)
 +  * Add patch from upstream to correct sysObjectID.
 +    (Closes: #363399, #374065)
 +  * Rearrange snmpd.postrm to not run deluser twice.
 +  * Change build-depends to not depend on automake but on
 +    automake1.9 (Closes: #376561)
 +  * Build with -Wall (Closes: #323074)
 +  * Add patch to make -Z support zero values. Path thanks
 +    to Peder Chr. Norgaard <Peder.Chr.Norgaard at ericsson.com>
 +    (Closes: #366817)
 +  * Make init script support reloading configuration without
 +    restart. (Closes: #367071)
 +  * Execute dh_fixperm before dh_strip (Closes: #360253)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Tue,  4 Jul 2006 15:23:54 +0200
 +
 +net-snmp (5.2.2-3) unstable; urgency=low
 +
 +  * Add short description to debconf templates (Closes: #355119)
 +  * Add Danish translation. Thanks to Claus Hindsgaul
 +    <claus.hindsgaul at gmail.com> (Closes: #355375)
 +  * Add patch to add m4 directory with extracted net-snmp specific
 +    aclocal definitions. Required to make libtool work correctly
 +    (Closes: #355850, #536123)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Sat, 11 Mar 2006 12:10:10 +0100
 +
 +net-snmp (5.2.2-2) unstable; urgency=low
 +
 +  * Redo CVS Checkout from alioth (Closes: #354779)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Wed, 01 Mar 2006 20:32:01 +0100
 +
 +net-snmp (5.2.2-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Added man page for snmpnetstat53
 +  * Fix typos in man pages. Thanks to Nicolas François
 +    <nicolas.francois at centraliens.net> (Closes: #326515, #326530, #326532).
 +  * Fix libsnmp9-dev dependencies. Thanks to Ahmed Baizid <ahmed at baizid.org>
 +    (Closes: #343577).
 +  * Listen on 127.0.0.1 by default and turn off SMUX port in
 +    /etc/defaults/snmpd. (Closes: #294309, #314907, #216108)
 +  * Remove dangling symlinks /etc/doc/snmp[d] -> libsnmp5 which might
 +    eventually be left over from old packages. Thanks to "Mario 'BitKoenig'
 +    Holbe" <Mario.Holbe at TU-Ilmenau.DE> (Closes: #336365)
 +  * Run snmpd as snmp user by default (Closes: #275374, #337053)
 +  * Depend and Builddepend libsnmpd9-dev on procps. Thanks to 
 +    Peder Chr. Norgaard <Peder.Chr.Norgaard> for pointing this out.
 +    (Closes: #325840)
 +  * Fix man page section mismatch found by lintian.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Wed, 23 Feb 2006 15:05:32 +0100
 +
 +net-snmp (5.2.1.2-4) unstable; urgency=low
 +
 +  * Version builddep on libssl-dev and rebuild, for openssl transition
 +    Closes: #334010 Thanks to Henrique de Moraes Holschuh <hmh at debian.org>.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Sat, 15 Oct 2005 09:24:26 +0200
 +
 +net-snmp (5.2.1.2-3) unstable; urgency=low
 +
 +  * Apply official library-version-update-5.2.1.2.patch to clean up the
 +    version mess (Closes: #322500)
 +  * Replace error_snmp6.patch by upstream systemstats-snmp6.patch
 +  * Added upstream inetNetToMedia-01.patch (Closes: #323038)
 +  * Added ipaddress_linux.c-in_len-out_len-type.patch from
 +    Julien BLACHE <jblache at debian.org> (Closes: #321713)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Mon,  5 Sep 2005 21:19:30 +0200
 +
 +net-snmp (5.2.1.2-2) unstable; urgency=low
 +
 +  * Don't print error message if ipv6 module is not loaded. (Closes: #319741)
 +  * Added conflicts against all packages using libsnmp5 due to upstream
 +    changing the binary API without increasing SONAME. See: #322500
 +
 + -- Jochen Friedrich <jochen at scram.de>  Thu, 28 Jul 2005 20:19:09 +0200
 +
 +net-snmp (5.2.1.2-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #293902). Contains fix for CAN-2005-2177
 +  * Acknowledge NMU (Closes: #302195, #302386). Many thanks to
 +    Henrique de Moraes Holschuh for his quick action!
 +  * Including ucd-snmp/diskio (Closes: #264938)
 +  * Don't relink libraries (Closes: #243870)
 +  * Link against libsensors on all archs again (Closes: 304103)
 +  * Include fixproc (Closes: #310692)
 +  * Updated standards version to 3.6.2
 +  * Change to patch based build system (Closes: #292412)
 +  * Updated GNOME-SMI.txt
 +
 + -- Jochen Friedrich <jochen at scram.de>  Wed, 20 Jul 2005 21:47:32 +0200
 +
 +net-snmp (5.1.2-6.1) unstable; urgency=emergency
 +
 +  * NMU (with permission from maintainer)
 +  * debian/rules: clean up libdir in all .la files installed to
 +    /usr/lib, so as to avoid breaking all libtool builds (closes: #302195).
 +
 + -- Henrique de Moraes Holschuh <hmh at debian.org>  Thu, 31 Mar 2005 12:14:11 -0300
 +
 +net-snmp (5.1.2-6) unstable; urgency=medium
 +
 +  * Backed out the unauthorized MIB changes. lm-sensors updates.
 +    Closes: #274624, Downgrades: #249904
 +  * Fixed debian/fixman to not mangle the man pages (Closes: #273779).
 +  * Fixed snmpset.1 man page. Thanks to
 +    Nicolas François (nicolas.francois at centraliens.net
 +    (Closes: #274431)
 +  * Fix from CVS for v3 enginetime wrapping problem (Closes: #271543).
 +  * Backed out patch to skip over interfaces without stats.
 +    This might have an impact on #254571, #261701. Should be retested.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Fri,  1 Oct 2004 12:54:23 +0200
 +
 +net-snmp (5.1.2-5) unstable; urgency=medium
 +
 +  * Commented out remaining MemShared message
 +    Thanks to Johan Thelmén (Really closes: #244721)
 +  * New version of lm-sensors from upstream (Thanks to Mike Slifcak).
 +    lm-sensors is now enabled again on i386.
 +    Closes: #264442, #267691, #249839, #249904, 266270
 +
 + -- Jochen Friedrich <jochen at scram.de>  Thu, 23 Sep 2004 18:45:41 +0200
 +
 +net-snmp (5.1.2-4) unstable; urgency=medium
 +
 +  * Fix from CVS for scanning 64bit counters from /proc (Closes: #210364)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Fri, 27 Aug 2004 10:12:07 +0200
 +
 +net-snmp (5.1.2-3) unstable; urgency=high
 +
 +  * Fixed init script to not depend on defaults file (Closes: #267414)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Mon, 23 Aug 2004 17:27:47 +0200
 +
 +net-snmp (5.1.2-2) unstable; urgency=medium
 +
 +  * Disable lm-sensors support for i386 once again as it's not yet mature
 +    enough for sarge:
 +    - It seems to trash memory: (Downgrades: #264442)
 +    - It doesn't work as expected: #249839, #249904
 +    - It is a likely candidate for memory leakage (at least it
 +      looks like the result of sensors_get_label() is never freed)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Tue, 17 Aug 2004 00:11:58 +0200
 +
 +net-snmp (5.1.2-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #237890, #236326, #217306, #261624)
 +    o Linux 2.6 improvements (Closes: #225253, #244721)
 +    o Misc 64bit processor fixes.
 +    o Misc perl build and install fixes.
 +    o Minor improvements to snmpnetstat (IPv6 output)
 +    o Minor improvements to snmpdelta (error reporting)
 +  * snmp now recommends perl-modules (Closes: #261687)
 +  * added watch file.
 +  * fixed some lintian errors and warnings.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Tue, 10 Aug 2004 11:18:31 +0200
 +
 +net-snmp (5.1.1-2) unstable; urgency=low
 +
 +  * Fix dependency of lm-sensors
 +  * Remove library circular dependency (Closes: #229132)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Fri,  9 Apr 2004 10:52:34 +0200
 +
 +net-snmp (5.1.1-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #232602, #238129)
 +    o Improvements on 64 bit architectures.
 +    o A few minor memory leaks fixed.
 +    o An extremely large number of minor bug fixes.
 +    o Many perl module specific bug fixes.
 +    o snmpd will safely handle more signals.
 +  * Enabled and fixed lm-sensors, this time for real. Thanks
 +    to Christopher Price <cprice at cs-home.com> for the patch.
 +    (Closes: #240502)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Tue,  6 Apr 2004 23:27:52 +0200
 +
 +net-snmp (5.1-5) unstable; urgency=low
 +
 +  * Enabled lm-sensors support again.
 +  * Fixed libsnmp-base postinst -> postrm (Closes: #236405)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Sat, 13 Mar 2004 09:39:17 +0100
 +
 +net-snmp (5.1-4) unstable; urgency=low
 +
 +  * Really fixed libwrap inclusion in net-snmp-config.in
 +    (Closes: #232396)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Mon, 23 Feb 2004 17:20:21 +0100
 +
 +net-snmp (5.1-3) unstable; urgency=low
 +
 +  * Applied patch from CVS to fix HOST-RESOURCES-MIB. (Closes: #232374)
 +  * Applied patch from CVS to fix output of strings containing
 +    CR or LF chars (bug 864367 on SF). (Closes: #218210)
 +  * Applied patch from CVS to fix syslog output.
 +  * Disabled lm-sensors support until kernel module issues are resolved.
 +
 + -- Jochen Friedrich <jochen at scram.de>  Sat, 21 Feb 2004 00:29:06 +0100
 +
 +net-snmp (5.1-2) unstable; urgency=low
 +
 +  * Fix IPv6 MIB leaking file handles. Thanks to <kaj.niemi at basen.net>
 +    for pointing out the patch at
 +    https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=85071.
 +    (Closes: #159495)
 +  * Fixed snmpd.defaults. Thanks to James Samuel
 +    <james.samuel at uk.easynet.net> for the patch. (Closes: #232394)
 +  * Fixed libwrap inclusion in net-snmp-config.in (Closes: #232396)
 +  * Updated shlibs to match version 5.1 (Closes: #232422)
 +
 + -- Jochen Friedrich <jochen at scram.de>  Thu, 12 Feb 2004 19:30:57 +0100
 +
 +net-snmp (5.1-1) unstable; urgency=low
 +
 +  * New upstream release (Closes: #224382)
 +  * New maintainer (Closes: #230679)
 +  * Bumped standards version to 3.6.1
 +  * Ack old NMUs (Closes: #182426, #186834, #183041)
 +  * Updated GNOME-SMI.txt
 +  * Removed duplicate conffiles
 +  * Fixed description to make litian happy
 +
 + -- Jochen Friedrich <jochen at scram.de>  Mon,  9 Feb 2004 23:38:57 +0100
 +
 +net-snmp (5.0.9-3) unstable; urgency=low
 +
 +  * Only support lm-sensors on i386 (closes: #216500).
 +
 + -- David Engel <david at debian.org>  Wed, 19 Nov 2003 14:13:02 -0600
 +
 +net-snmp (5.0.9-2) unstable; urgency=low
 +
 +  * Fixed problem with libsnmp5 depending on itself.
 +  * Make sure sysconfdir is defined (fixes bad path in manpages).
 +  * Fixed problem overwriting MIBs (closes: #216034).
 +
 + -- David Engel <david at debian.org>  Thu, 16 Oct 2003 14:09:38 -0500
 +
 +net-snmp (5.0.9-1) unstable; urgency=low
 +
 +  * New upstream version (closes: #214660)
 +    - snmp.conf(5) man page is now corrected (closes: #185888).
 +    - Incorrect behaviour of snmpd allowing to bypass the access
 +      restrictions using snmpbulkget is corrected (closes: #205952).
 +  * Updated the debian/copyright file.
 +  * Changed to work with current libtool and autoconf (closes: $208380).
 +  * Link libraries with complete dependencies (closes: #199166).
 +  * Updated package descriptions (closes: #210122, closes: #210017, 
 +    closes: #209704, closes: #209857, closes: #209905, closes: #209839).
 +  * Added manpages for net-snmp-config, snmpvacm, encode_keychange 
 +    (closes: #182996) and tkmib (closes: #130684) from Jurij Smakov 
 +    <jurij at wooyd.org>.
 +  * Fixed mib2c to look for config files in the correct places.
 +  * Enabled support for the lm-sensors MIB (closes: #204543).
 +  * Use the process name instead of the command-line when matching 
 +    processes with proc config file directives (closes: #204542) from 
 +    Philippe Troin <phil at fifi.org>.
 +  * Really enabled dlmod support (closes: #180639).
 +  * Don't use obsolete SO_BSDCOMPAT sockopt (closes: #201853).
 +  * Don't print SMUX passwords in log file (closes: #195622).
 +  * Fixed typo in default snmpd.conf (closes: #185366).
 +  * Don't include build paths in SNMP.so (closes: #184610).
 +  * Added the BGP4, OSPF and RIPv2 MIBs.
 +  * Ignore interfaces with no statistics (closes: #159321).
 +  * Added the GNOME SMI (closes: #196340).
 +
 + -- David Engel <david at debian.org>  Tue, 14 Oct 2003 18:12:36 -0500
 +
 +net-snmp (5.0.8-1) unstable; urgency=low
 +
 +  * New upstream version.
 +
 + -- David Engel <david at debian.org>  Wed, 14 May 2003 17:02:42 -0500
 +
 +net-snmp (5.0.7-1.1) unstable; urgency=low
 +
 +  * NMU based on patches by Paul Hampson <Paul.Hampson at anu.edu.au>
 +  * Add proper dependencies to libsnmp5-dev.  Closes: #183041.
 +  * Use updated libtool for mips/mipsel.  Closes: #182426.
 +  * Run debian/fixman.sh using bash.  Closes: #186834.
 +
 + -- Daniel Schepler <schepler at debian.org>  Sat, 26 Apr 2003 16:52:18 -0700
 +  
 +net-snmp (5.0.7-1) unstable; urgency=low
 +
 +  * New upstream version (closes:177127, closes:154323, 
 +    closes:154322).
 +  * Enabled dlmod support in snmpd (closes:180639).
 +  * Use current config.guess and config.sub (closes:172501).
 +
 + -- David Engel <david at debian.org>  Sun, 23 Feb 2003 23:01:45 -0600
 +
 +net-snmp (5.0.6-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Use autoconf2.13 (closes:157117, closes:162441, closes:162781).
 +  * Commented out example proc, exec, disk and load statements in the
 +    default snmpd.conf (closes:164028).  Users can re-enable them if
 +    desired.
 +  * Added a note to README.Debian about the new snmpcmd command line
 +    syntax regarding community strings (closes:160198).
 +
 + -- David Engel <david at debian.org>  Wed, 23 Oct 2002 09:20:11 -0500
 +
 +net-snmp (5.0.3-2) unstable; urgency=low
 +
 +  * Rebuild with perl 5.8.
 +  * Install additional UCD compatibility headers (closes: #156166).
 +
 + -- David Engel <david at debian.org>  Sun,  1 Sep 2002 21:35:12 -0500
 +
 +net-snmp (5.0.3-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Linked libraries with libcrypto and libwrap to get proper 
 +    dependencies.  Updated net-snmp-config accordingly 
 +    (closes: #155153).
 +  * Included the UCD compatibility headers and library 
 +    (closes: #155133).
 +  * Fixed bad snmpinform symlink (closes: #155196).
 +  * Fixed mib2c to look in /etc/snmp for config files 
 +    (closes: #155157).
 +
 + -- David Engel <david at debian.org>  Mon,  5 Aug 2002 21:01:27 -0500
 +
 +net-snmp (5.0.2a-1) unstable; urgency=low
 +
 +  * New upstream version (closes: #147761).
 +  * Added missing -f in init script.
 +
 + -- David Engel <david at debian.org>  Mon,  1 Jul 2002 21:36:08 -0500
 +
 +ucd-snmp (4.2.5-1) unstable; urgency=low
 +
 +  * New upstream version (closes:145289).
 +
 + -- David Engel <david at debian.org>  Tue, 14 May 2002 19:31:02 -0500
 +
 +ucd-snmp (4.2.4-2) unstable; urgency=low
 +
 +  * Made libucdmibs depend on libwrap (closes:144521).
 +
 + -- David Engel <david at debian.org>  Thu, 25 Apr 2002 15:27:40 -0500
 +
 +ucd-snmp (4.2.4-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Rebuilt with SSL since cryto can now go in main.
 +  * Explicitly use bash for the fixman script (closes:133652).
 +  * Don't use LD_RUN_PATH in perl/SNMP.so.
 +  * Fixed parsing of "-p udp:" in snmpd (closes:141176).
 +
 + -- David Engel <david at debian.org>  Tue, 23 Apr 2002 20:50:25 -0500
 +
 +ucd-snmp (4.2.3-2) unstable; urgency=high
 +
 +  * Fixed potential buffer overflow in snmpnetstat (close:129243).
 +  * Updated upstream URL in debian/copyright file (close:125669).
 +
 + -- David Engel <david at debian.org>  Mon, 28 Jan 2002 21:24:59 -0600
 +
 +ucd-snmp (4.2.3-1) unstable; urgency=low
 +
 +  * New upstream version (closes:122331).
 +  * Changed the snmpd syslog message when interface statistics are 
 +    not available from LOG_ERR to LOG_DEBUG (closes:121555).
 +  * Added a note in README.Debian about changes to
 +    ucd-snmp-includes.h (closes:121095).
 +
 + -- David Engel <david at debian.org>  Sat,  8 Dec 2001 20:11:34 -0600
 +
 +ucd-snmp (4.2.2-1) unstable; urgency=low
 +
 +  * New upstream version (closes:111966, closes:112005, closes:112073,
 +    closes:118795, closes:118848).
 +  * Removed Build-Depends on essential sed package (closes:111212).
 +  * Added the ucd-snmp.m4 autoconf file (closes:112078).
 +  * Moved mib2c from libsnmp-perl to libsnmp4.2-dev (closes:112393).
 +  * Remove /var/lib/snmp if libsnmp-base is purged (closes:113729).
 +  * Fixed int/size_t errors in mib_api man page (closes:114478).
 +  * Added a blurb in README.Debian about snmpconf (closes:115378).
 +  * Enabled smux support.
 +  * Moved the agentx socket from /var/agentx/master to /var/run/agents 
 +    for FHS compatibility (closes:120015).
 +
 + -- David Engel <david at debian.org>  Mon, 19 Nov 2001 13:33:59 -0600
 +
 +ucd-snmp (4.2.1-6) testing unstable; urgency=high
 +
 +  * Fixed LD_LIBRARY_PATH build problem when running under fakeroot
 +    (closes:107565, closes:104044).
 +  * Applied ucd-snmp-4.2.1-security*.patch from Caldera to fix potential
 +    buffer overflow, temp file race and group permission problems
 +    (closes:109345, closes:109733).
 +  * Documented the -s option in the snmpd manpage (closes:109639).
 +  * Changed the FAQ to reference /usr and /etc instead of /usr/lcoal
 +    (closes:107758).
 +  * Removed duplicate build dependency on libtool (closes:107476).
 +    Changed build dependency from perl5 to perl (>=5.6) (closes:107575).
 +  * Fixed minor typo in snmpd manpage (closes:106326).
 +  * Added symlinks for missing man pages (closes:99614) and renamed
 +    section 3 and 5 man pages to *.[35]snmp to aboid possible conflicts
 +    with other packages.
 +  * Applied ucd-snmp-4.2-ia64.patch from RedHat to properly set the return
 +    length of IP addresses on 64-bit architectures.
 +
 + -- David Engel <david at debian.org>  Sun,  2 Sep 2001 22:47:30 -0500
 +
 +ucd-snmp (4.2.1-5) unstable; urgency=low
 +
 +  * Rebuilt without SSL (closes:98306, closes:102429).  Will look
 +    into doing a non-US version with SSL.
 +
 + -- David Engel <david at debian.org>  Sat,  7 Jul 2001 20:53:16 -0500
 +
 +ucd-snmp (4.2.1-4) unstable; urgency=low
 +
 +  * Fixed bug uncovered by libtool upgrade which caused snmpd 
 +    not to build (closes:97965).
 +
 + -- David Engel <david at debian.org>  Fri, 18 May 2001 20:49:14 -0500
 +
 +ucd-snmp (4.2.1-3) unstable; urgency=low
 +
 +  * Installed the libsnmp-perl module into the perl vendor 
 +    directory (closes:95530).
 +  * Updated the description of the libsnmp-base package
 +    (closes:97170).
 +  * Upgraded to libtool 1.4 (closes:97660).
 +
 + -- David Engel <david at debian.org>  Thu, 17 May 2001 20:16:17 -0500
 +
 +ucd-snmp (4.2.1-2) unstable; urgency=low
 +
 +  * Enabled SSL support.
 +  * Included the agent libraries in the -dev package to allow 
 +    for building agent extensions.
 +
 + -- David Engel <david at debian.org>  Tue, 15 May 2001 20:15:56 -0500
 +
 +ucd-snmp (4.2.1-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Gave up and added autoconf and libtool to Build-Depends: 
 +    (closes:92103).
 +  * Fixed mib2c to use /etc/snmp instead of /usr/share/snmp.
 +
 + -- David Engel <david at debian.org>  Wed, 11 Apr 2001 23:39:52 -0500
 +
 +ucd-snmp (4.2-7) unstable; urgency=low
 +
 +  * Fixed long standing bug where mibs were not processed if the
 +    .index file was not present (closes: 89597).
 +  * Fixed starting of snmptrapd to be controlled by TRAPDRUN like
 +    it was intended and documented (closes: 90621).
 +
 + -- David Engel <david at debian.org>  Sun, 25 Mar 2001 17:51:09 -0600
 +
 +ucd-snmp (4.2-6) unstable; urgency=low
 +
 +  * Avoid rerunning autoconf/header (Bug#89033).
 +
 + -- David Engel <david at debian.org>  Sun, 11 Mar 2001 17:08:41 -0600
 +
 +ucd-snmp (4.2-5) unstable; urgency=low
 +
 +  * Fixed IBM S/390 build (Bug#88559).
 +
 + -- David Engel <david at debian.org>  Tue,  6 Mar 2001 19:56:11 -0600
 +
 +ucd-snmp (4.2-4) unstable; urgency=low
 +
 +  * Fixed build installs into the live filesystem (Bug#87015).
 +
 + -- David Engel <david at debian.org>  Sun, 25 Feb 2001 22:12:21 -0600
 +
 +ucd-snmp (4.2-3) unstable; urgency=low
 +
 +  * Removed the Pre-Depends for snmpd since it didn't fix the
 +    problem I was trying to solve (Bug#85573).
 +
 + -- David Engel <david at debian.org>  Tue, 20 Feb 2001 20:08:41 -0600
 +
 +ucd-snmp (4.2-2) unstable; urgency=low
 +
 +  * Created new libsnmp-base package to allow future libsnmpX.Y
 +    packages to coexist (Bug#31253).
 +  * Added a slight delay after stopping the daemons to let them 
 +    completely exit before restarting them (Bug#84696).
 +  * Added a /etc/default/snmpd file to control daemon activity.
 +  * Hopefully fixed strange error starting snmpd (Bug#58411).
 +  * Changed package priorities to optional to match the overrides
 +    file.
 +  * Added tkmib and libsnmp-perl packages (Bug#78942).
 +
 + -- David Engel <david at debian.org>  Sun,  4 Feb 2001 13:27:26 -0600
 +
 +ucd-snmp (4.2-1) unstable; urgency=low
 +
 +  * New upstream version (Bug#82876).
 +  * Enabled ipv6 support (Bug#82879).
 +  * Updated to packaging standard 3.2.1 (Bug#82878).
 +  * Added BRIDGE- and SOURCE-ROUTING-MIBs (Bug#62696).
 +
 + -- David Engel <david at debian.org>  Sun, 21 Jan 2001 12:52:02 -0600
 +
 +ucd-snmp (4.1.2-2) unstable; urgency=low
 +
 +  * Added real counter objects to the IPFWCHAINS MIB (George Bonser).
 +  * Don't resolve addresses to names in the IPFWCHAINS MIB (George 
 +    Bonser).
 +  * Update the IPFWCHAINS MIB information properly.
 +  * Use /dev/null as logfile to force closing of std* (Bug#71959,
 +    Bug#66898).
 +  * Added a README.Debian file describing issues that are specific
 +    to Debian (Bug#70421, Bug#66477).
 +
 + -- David Engel <david at debian.org>  Sun, 19 Nov 2000 21:39:38 -0600
 +
 +ucd-snmp (4.1.2-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Fixed segfault in snmpd on processes with long command lines
 +    (Bug#64333).
 +
 + -- David Engel <david at debian.org>  Mon, 22 May 2000 20:06:48 -0500
 +
 +ucd-snmp (4.1.1-3) unstable; urgency=low
 +
 +  * Added the ipfwchains MIB module (Bug#63252).
 +
 + -- David Engel <david at debian.org>  Sat, 29 Apr 2000 21:36:34 -0500
 +
 +ucd-snmp (4.1.1-2) frozen unstable; urgency=low
 +
 +  * Fixed incorrect .so directives in man3 pages which caused
 +    several error messages from man_db.
 +
 + -- David Engel <david at debian.org>  Sat,  8 Apr 2000 11:48:23 -0500
 +
 +ucd-snmp (4.1.1-1) frozen unstable; urgency=low
 +
 +  * New upstream version (Bug#60427).
 +  * Fixed memory leaks in snmpd (Bug#49809).
 +  * Installed snmpv3.h (Bug#60594).
 +  * Turned on syslog logging in snmpd (Bug#60611).
 +
 + -- David Engel <david at debian.org>  Sat, 25 Mar 2000 20:45:07 -0600
 +
 +ucd-snmp (4.0.1-9) frozen unstable; urgency=low
 +
 +  * Fixed more serious build problems (Bug#60381).
 +
 + -- David Engel <david at debian.org>  Tue, 14 Mar 2000 21:34:36 -0600
 +
 +ucd-snmp (4.0.1-8) frozen unstable; urgency=low
 +
 +  * Removed execute permission from header files. (Bug#60369).
 +
 + -- David Engel <david at debian.org>  Tue, 14 Mar 2000 11:30:41 -0600
 +
 +ucd-snmp (4.0.1-7) frozen unstable; urgency=low
 +
 +  * Backported important fixes from 4.1-1 to get into frozen.
 +  * Removed hidden snmpd dependency on rpm (Bug#56471).
 +  * Removed bad paths in snmpd (Bug#56498).
 +  * Fixed segfault in snmpdelta (Bug#57486).
 +
 + -- David Engel <david at debian.org>  Sun, 13 Feb 2000 12:52:53 -0600
 +
 +ucd-snmp (4.0.1-6) frozen unstable; urgency=low
 +
 +  * Issue a warning about retoring the default snmpd configuration
 +    when upgrading from the older, incompatible version (Bug#55883).
 +
 + -- David Engel <david at debian.org>  Sat, 22 Jan 2000 20:45:26 -0600
 +
 +ucd-snmp (4.0.1-5) unstable; urgency=low
 +
 +  * Install EXAMPLE.conf (Bug#51584).
 +
 + -- David Engel <david at debian.org>  Thu,  2 Dec 1999 19:55:00 -0600
 +
 +ucd-snmp (4.0.1-4) unstable; urgency=low
 +
 +  * Change persistent directory to /var/lib/snmp (Bug#48151).
 +  * Used LCD_TIME_SYNC_OPT.
 +
 + -- David Engel <david at debian.org>  Mon, 25 Oct 1999 11:29:17 -0500
 +
 +ucd-snmp (4.0.1-3) unstable; urgency=low
 +
 +  * Removed snmpcheck, at least for now (Bug#44373).
 +  * Fixed shlibs file (Bug#45577).
 +  * Fixed build problems (Bug#45758).
 +  * Use FHS /usr/share/{doc,man}.
 +
 + -- David Engel <david at debian.org>  Mon, 27 Sep 1999 20:50:55 -0500
 +
 +ucd-snmp (4.0.1-2) unstable; urgency=low
 +
 +  * Fixed parse error in the default snmpd.conf file.
 +  * Rebuilt with shared libwrap.
 +
 + -- David Engel <david at debian.org>  Fri, 27 Aug 1999 20:59:19 -0500
 +
 +ucd-snmp (4.0.1-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Switched back to normal soname since it no longer conflicts with
 +    the old one.
 +
 + -- David Engel <david at debian.org>  Wed, 25 Aug 1999 20:26:03 -0500
 +
 +ucd-snmp (3.6.2-8) unstable; urgency=low
 +
 +  * Removed execute bit from MIB files (Bug#43300).
 +  * Partially reverted previous interface fixes for 2.0 kernels.
 +
 + -- David Engel <david at debian.org>  Sat, 21 Aug 1999 23:08:26 -0500
 +
 +ucd-snmp (3.6.2-7) unstable; urgency=low
 +
 +  * Fixed incompete arg checking (Bug#43126).
 +  * Fixed ASN.1 length parsing on alpha (William Brioschi).
 +
 + -- David Engel <david at debian.org>  Wed, 18 Aug 1999 09:58:40 -0500
 +
 +ucd-snmp (3.6.2-6) unstable; urgency=low
 +
 +  * Re-did some previous fixes properly.
 +
 + -- David Engel <david at debian.org>  Fri, 13 Aug 1999 10:43:20 -0500
 +
 +ucd-snmp (3.6.2-5) unstable; urgency=low
 +
 +  * Fixed more interface calculation errors.
 +
 + -- David Engel <david at debian.org>  Thu, 12 Aug 1999 20:27:39 -0500
 +
 +ucd-snmp (3.6.2-4) unstable; urgency=low
 +
 +  * Fixed the calculation of if{In,Out}Octets under Linux 2.2.
 +  * Moved the .5 manpages to the libucdsnmp package (Bug#42759 and
 +    Bug#42765).
 +  * Started the snmptrapd daemon to replace the old snmptraplogd
 +    package functionality (Bug#42792).
 +
 + -- David Engel <david at debian.org>  Tue, 10 Aug 1999 19:37:28 -0500
 +
 +ucd-snmp (3.6.2-3) unstable; urgency=low
 +
 +  * Applied upstream patches 3, 4, 9 and 10.
 +
 + -- David Engel <david at debian.org>  Fri,  6 Aug 1999 21:59:43 -0500
 +
 +ucd-snmp (3.6.2-2) unstable; urgency=low
 +
 +  * Don't use --disable-debugging.
 +  * Fix calculation of ifNumber as interfaces are added and removed
 +    (Bug#42452).
 +  * Don't process packets in snmpd when recvfrom returns an error
 +    (Bug#42465).
 +
 + -- David Engel <david at debian.org>  Thu,  5 Aug 1999 20:33:28 -0500
 +
 +ucd-snmp (3.6.2-1) unstable; urgency=low
 +
 +  * Switched to UCD SNMP.
 +  * Use debhelper.
 +
 + -- David Engel <david at debian.org>  Sat, 24 Jul 1999 20:33:10 -0500
 +
 +snmp (3.6-3) unstable; urgency=low
 +
 +  * Split the snmpd agent into a separate package so the apps can
 +    be installed without it (Bug#37560).
 +  * Reduced the amount of information reported by the snmpd agent
 +    by default (Bug#37169).
 +
 + -- David Engel <david at debian.org>  Wed, 19 May 1999 21:50:33 -0500
 +
 +snmp (3.6-2) unstable; urgency=low
 +
 +  * Include libsnmp.a (Bug#34826).
 +  * Change CWD to / before starting snmpd (Bug#35977).
 +
 + -- David Engel <david at debian.org>  Tue, 27 Apr 1999 12:01:30 -0500
 +
 +snmp (3.6-1) frozen unstable; urgency=low
 +
 +  * New upstream version (mainly bug fixes).
 +
 + -- David Engel <david at debian.org>  Fri, 27 Nov 1998 21:59:51 -0600
 +
 +snmp (3.5-4) unstable; urgency=low
 +
 +  * Install mib.h header file (Bug#25777).
 +
 + -- David Engel <david at debian.org>  Wed, 19 Aug 1998 20:48:44 -0500
 +
 +snmp (3.5-3) frozen unstable; urgency=low
 +
 +  * Check for the existence of the rc script before running it
 +    in the prerm script (Bug#21565).
 +
 + -- David Engel <david at sw.ods.com>  Mon, 11 May 1998 15:44:17 -0500
 +
 +snmp (3.5-2) unstable; urgency=low
 +
 +  * Remove old /usr/doc/snmp directory in preinst.  Is is now a
 +    symlink to /usr/doc/libsnmp3.5.
 +  * Fixed MIB parsing bug (Bug#19225).
 +
 + -- David Engel <david at sw.ods.com>  Sat, 14 Mar 1998 14:24:50 -0600
 +
 +snmp (3.5-1) unstable; urgency=low
 +
 +  * New upstream version.
 +  * Add libsnmp3.5 and libsnmp3.5-dev packages (Bug#16557).
 +  * Explicitly link libsnmp.so.* with -lc (Bug#18315).
 +  * Add restart|reload|force-reload support to init.d script
 +    (Bug#17118).
 +
 + -- David Engel <david at sw.ods.com>  Wed, 18 Feb 1998 12:00:00 -0500
 +
 +snmp (3.4-2) unstable; urgency=low
 +
 +  * Enable full dumping of debug packets.
 +  * Change /etc/snmpd.conf to mode 600.
 +
 + -- David Engel <david at sw.ods.com>  Mon,  8 Dec 1997 13:43:41 -0600
 +
 +snmp (3.4-1) unstable; urgency=low
 +
 +  * Updated to new upstream version.
 +  * Fixes Bug#9855, Bug#11161 and Bug#11688.
 +
 + -- David Engel <david at sw.ods.com>  Thu,  7 Aug 1997 16:44:00 -0500
 +
 +snmp (3.3-2) unstable; urgency=low
 +
 +  * Built with libc6.
 +  * Updated init.d script messages to current standards.
 +
 + -- David Engel <david at sw.ods.com>  Tue, 13 May 1997 20:40:37 -0500
 +
 +
 +snmp (3.3-1) unstable; urgency=low
 +
 +  * Updated to new upstream version.
 +
 + -- David Engel <david at sw.ods.com>  Mon, 31 Mar 1997 19:13:44 -0600
 +
 +snmp (3.2-2) unstable; urgency=low
 +
 +  * Converted to new packaging standards.
 +  * Removed development files.  They may be reappear in a
 +    -dev package sometime in the future.
 +
 + -- David Engel <david at debian.org>  Wed, 19 Feb 1997 20:53:07 -0600
diff --combined debian/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --combined debian/control
index fc7266f,0000000..a1422be
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,143 -1,0 +1,150 @@@
 +Source: net-snmp
 +Section: net
 +Priority: optional
 +Maintainer: Net-SNMP Packaging Team <pkg-net-snmp-devel at lists.alioth.debian.org>
 +Uploaders: Jochen Friedrich <jochen at scram.de>, Thomas Anders <tanders at users.sourceforge.net>, Noah Meyerhans <noahm at debian.org>
- Build-Depends: debhelper (>= 7.0.50~), libtool, libwrap0-dev, libssl-dev (>> 0.9.8), perl (>=5.8), libperl-dev, python-all-dev (>= 2.5.4-1~), python-central (>=0.5.6), python (>=2.3.5-7), python-setuptools (>=0.6b3), autoconf, automake1.9, autotools-dev, debianutils (>=1.13.1), bash (>=2.05), findutils (>=4.1.20), procps, libbsd-dev [kfreebsd-any], libkvm-dev [kfreebsd-any], libsensors4-dev [linux-any]
- Standards-Version: 3.8.4
- Vcs-Svn: svn://svn.debian.org/pkg-net-snmp/
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-net-snmp/
++Build-Depends: debhelper (>= 9), libtool, libwrap0-dev, libssl-dev (>> 0.9.8), perl (>=5.8), libperl-dev,
++ python-all (>= 2.6.6-3~), python-setuptools (>=0.6b3), python2.7-dev,
++ autoconf, automake, autotools-dev, debianutils (>=1.13.1), dh-autoreconf,
++ bash (>=2.05), findutils (>=4.1.20), procps, 
++ libbsd-dev [kfreebsd-i386 kfreebsd-amd64], 
++ libkvm-dev [kfreebsd-i386 kfreebsd-amd64], 
++ libsensors4-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
++ libmysqld-dev
++Build-Conflicts: libsnmp-dev
++Standards-Version: 3.9.4
++Vcs-Git: git://anonscm.debian.org/pkg-net-snmp/pkg-net-snmp.git
++Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-net-snmp/pkg-net-snmp.git
 +XS-Python-Version: all
 +Homepage: http://net-snmp.sourceforge.net/
 +
 +Package: snmpd
- Section: net
- Priority: optional
 +Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, debconf, lsb-base (>= 3.2-13)
++Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, debconf, lsb-base (>= 3.2-13), libsnmp-base
 +Description: SNMP (Simple Network Management Protocol) agents
 + The Simple Network Management Protocol (SNMP) provides a framework
 + for the exchange of management information between agents (servers)
 + and clients.
 + .
 + The Net-SNMP agent is a daemon which listens for incoming SNMP
 + requests from clients and provides responses.
 +
 +Package: snmp
- Section: net
- Priority: optional
 +Architecture: any
 +Recommends: perl-modules
- Depends: ${shlibs:Depends}, ${misc:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}, libsnmp-base
 +Description: SNMP (Simple Network Management Protocol) applications
 + The Simple Network Management Protocol (SNMP) provides a framework
 + for the exchange of management information between agents (servers)
 + and clients. 
 + .
 + The Net-SNMP applications are a collection of command line clients
 + for issuing SNMP requests to agents.
 +
 +Package: libsnmp-base
 +Section: libs
- Priority: optional
 +Architecture: all
 +Replaces: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg)
 +Conflicts: libsnmp-dev (<< 5.4~dfsg), libsnmp9-dev (<< 5.4~dfsg)
 +Depends: ${misc:Depends}
 +Suggests: snmp-mibs-downloader
 +Description: SNMP (Simple Network Management Protocol) MIBs and documentation
 + The Simple Network Management Protocol (SNMP) provides a framework
 + for the exchange of management information between agents (servers)
 + and clients.
 + .
 + This package includes documentation and MIBs (Management Information
 + Bases) for the SNMP libraries, agents and applications. MIBs contain
 + a formal description of the data that can be managed using SNMP.
 + and applications.
++ .
++ NOTE: If you want the OIDs to resolve to their text description, you need to
++ activate the non-free repository and install "snmp-mibs-downloader" package.
 +
- Package: libsnmp15
++Package: libsnmp30
 +Section: libs
- Priority: optional
 +Architecture: any
- Replaces: libsnmp-base (<< 5.4.2.1~dfsg-4), snmp (<< 5.4.3~dfsg-1)
- Depends: libsnmp-base (>=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
++Replaces: libsnmp-base (<< 5.4.2.1~dfsg-4), snmp (<< 5.4.3~dfsg-1), libsnmp15
++Breaks: libsnmp15
++Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
 +Description: SNMP (Simple Network Management Protocol) library
 + The Simple Network Management Protocol (SNMP) provides a framework
 + for the exchange of management information between agents (servers)
 + and clients.
 + .
 + The Net-SNMP library contains common functions for the construction,
 + sending, receiving, decoding, and manipulation of the SNMP requests
 + and responses.
 +
- Package: libsnmp15-dbg
++Package: libsnmp30-dbg
 +Section: debug
 +Priority: extra
 +Architecture: any
- Depends: libsnmp15 (=${binary:Version}), ${misc:Depends}
++Depends: libsnmp30 (=${binary:Version}), ${misc:Depends}
 +Description: SNMP (Simple Network Management Protocol) library debug
 + The Simple Network Management Protocol (SNMP) provides a framework
 + for the exchange of management information between agents (servers)
 + and clients.
 + .
 + This package contains the debug symbols for the Net-SNMP libraries.
 +
 +Package: libsnmp-dev
 +Section: libdevel
- Priority: optional
 +Architecture: any
 +Replaces: libsnmp9-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
 +Provides: libsnmp9-dev
- Conflicts: libsnmp-dev, libsnmp9-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
- Depends: libc6-dev, libsnmp15 (=${binary:Version}), libsnmp-perl (=${binary:Version}), libwrap0-dev, libssl-dev, procps, libkvm-dev [kfreebsd-any], libsensors4-dev [linux-any], ${misc:Depends}, libperl-dev
++Conflicts: libsnmp9-dev, libsnmp15-dev, snmp (<< 5.4~dfsg)
++Multi-Arch: same
++Pre-Depends: ${misc:Pre-Depends}
++Depends: libc6-dev, libsnmp30 (=${binary:Version}), libwrap0-dev, libssl-dev, procps, libkvm-dev [kfreebsd-any], libsensors4-dev [linux-any], ${misc:Depends}
 +Description: SNMP (Simple Network Management Protocol) development files
 + The Simple Network Management Protocol (SNMP) provides a framework
 + for the exchange of management information between agents (servers)
 + and clients.
 + .
 + The Net-SNMP development files include the library headers, static
 + libraries, and documentation needed for development of custom SNMP
 + applications.
 +
 +Package: libsnmp-perl
 +Section: perl
- Priority: optional
 +Architecture: any
- Depends: ${perl:Depends}, libsnmp15 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
++Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 +Description: SNMP (Simple Network Management Protocol) Perl5 support
 + The Simple Network Management Protocol (SNMP) provides a framework
 + for the exchange of management information between agents (servers)
 + and clients.
 + .
 + The Net-SNMP Perl5 support files provide the Perl functions for
 + integration of SNMP into applications written in Perl.
 +
- Package: libsnmp-python
++Package: python-netsnmp
 +Section: python
- Priority: optional
 +Architecture: any
 +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
++Breaks: libsnmp-python
++Replaces: libsnmp-python
++Provides: libsnmp-python, ${python:Provides}
 +XB-Python-Version: ${python:Versions}
- Provides: ${python:Provides}
 +Description: SNMP (Simple Network Management Protocol) Python support
 + The Simple Network Management Protocol (SNMP) provides a framework
 + for the exchange of management information between agents (servers)
 + and clients.
 + .
 + The Net-SNMP Python support files provide the Python functions for
 + integration of SNMP into applications written in Python.
 +
 +Package: tkmib
- Section: net
- Priority: optional
 +Architecture: all
 +Depends: libsnmp-perl (>=${source:Version}), perl-tk, ${misc:Depends}
 +Description: SNMP (Simple Network Management Protocol) MIB browser
 + The Simple Network Management Protocol (SNMP) provides a framework
 + for the exchange of management information between agents (servers)
 + and clients.
 + .
 + The Net-SNMP MIB (Management Information Base) Browser provides a
 + graphical frontend for the Net-SNMP tools. It can be used to browse
 + the MIB tree and interactively send requests to SNMP agents.
 +
diff --combined debian/libsnmp-base.docs
index 6ea16e2,0000000..fc60795
mode 100644,000000..100644
--- a/debian/libsnmp-base.docs
+++ b/debian/libsnmp-base.docs
@@@ -1,6 -1,0 +1,6 @@@
 +FAQ
 +NEWS
 +README
 +README.snmpv3
 +README.thread
- debian/README.Debian
++mibs/README.mibs
diff --combined debian/libsnmp-base.install
index d57fd7d,0000000..2e6946b
mode 100644,000000..100644
--- a/debian/libsnmp-base.install
+++ b/debian/libsnmp-base.install
@@@ -1,8 -1,0 +1,2 @@@
- debian/tmp/usr/share/mibs
- debian/tmp/usr/share/snmp/mib2c-data
- debian/tmp/usr/share/man/man5/mib2c.conf.5snmp
- debian/tmp/usr/share/man/man5/snmp.conf.5snmp
- debian/tmp/usr/share/man/man5/snmp_config.5snmp
- debian/tmp/usr/share/man/man5/snmpd.examples.5snmp
- debian/tmp/usr/share/man/man5/snmpd.internal.5snmp
- debian/tmp/usr/share/man/man5/variables.5snmp
++mibs/*.txt	usr/share/snmp/mibs
++usr/share/snmp/mib2c-data
diff --combined debian/libsnmp-base.manpages
index 0000000,0000000..5577871
new file mode 100644
--- /dev/null
+++ b/debian/libsnmp-base.manpages
@@@ -1,0 -1,0 +1,6 @@@
++man/mib2c.conf.5
++man/snmp.conf.5
++man/snmp_config.5
++man/snmpd.examples.5
++man/snmpd.internal.5
++man/variables.5
diff --combined debian/libsnmp-dev.dirs
index 0000000,0000000..230a402
new file mode 100644
--- /dev/null
+++ b/debian/libsnmp-dev.dirs
@@@ -1,0 -1,0 +1,1 @@@
++etc/snmp
diff --combined debian/libsnmp-dev.install
index 8093fee,0000000..bcc841f
mode 100644,000000..100644
--- a/debian/libsnmp-dev.install
+++ b/debian/libsnmp-dev.install
@@@ -1,9 -1,0 +1,12 @@@
- debian/tmp/etc/snmp/mib2c*.conf
- debian/tmp/usr/bin/mib2c
- debian/tmp/usr/bin/mib2c-update
- debian/tmp/usr/include
- debian/tmp/usr/lib/lib*.a
- debian/tmp/usr/lib/lib*.so
- debian/tmp/usr/share/man/man1/mib2c.1
- debian/tmp/usr/share/man/man1/mib2c-update.1
- debian/tmp/usr/share/man/man3/*
++local/mib2c*.conf etc/snmp
++usr/bin/mib2c
++usr/bin/mib2c-update
++usr/include/*
++usr/lib/*/lib*.a
++usr/lib/*/lib*.so
++# Install the "broke" headers
++agent/mibgroup/struct.h	usr/include/net-snmp/agent
++agent/mibgroup/util_funcs.h usr/include/net-snmp
++agent/mibgroup/mibincl.h usr/include/net-snmp/library
++agent/mibgroup/header_complex.h usr/include/net-snmp/agent
++
diff --combined debian/libsnmp-dev.manpages
index 0000000,0000000..5846936
new file mode 100644
--- /dev/null
+++ b/debian/libsnmp-dev.manpages
@@@ -1,0 -1,0 +1,3 @@@
++man/mib2c.1
++man/mib2c-update.1
++man/*.3
diff --combined debian/libsnmp-perl.examples
index 0000000,0000000..f11e24b
new file mode 100644
--- /dev/null
+++ b/debian/libsnmp-perl.examples
@@@ -1,0 -1,0 +1,1 @@@
++perl/SNMP/examples/*
diff --combined debian/libsnmp-perl.install
index 074862e,0000000..36e0356
mode 100644,000000..100644
--- a/debian/libsnmp-perl.install
+++ b/debian/libsnmp-perl.install
@@@ -1,1 -1,0 +1,1 @@@
- debian/tmp/usr/lib/perl*
++usr/lib/perl*
diff --combined debian/libsnmp30.dirs
index 3d29600,0000000..3d29600
mode 100644,000000..100644
--- a/debian/libsnmp30.dirs
+++ b/debian/libsnmp30.dirs
@@@ -1,1 -1,0 +1,1 @@@
 +var/lib/snmp
diff --combined debian/libsnmp30.docs
index 0000000,0000000..f232bba
new file mode 100644
--- /dev/null
+++ b/debian/libsnmp30.docs
@@@ -1,0 -1,0 +1,9 @@@
++AGENT.txt
++FAQ
++NEWS
++README
++README.agentx
++README.snmpv3
++README.thread
++TODO
++local/README.mib2c
diff --combined debian/libsnmp30.install
index 0000000,0000000..7ef1c7f
new file mode 100644
--- /dev/null
+++ b/debian/libsnmp30.install
@@@ -1,0 -1,0 +1,3 @@@
++usr/lib/*/lib*.so.*
++usr/bin/net-snmp-config
++usr/share/man/man1/net-snmp-config.1
diff --combined debian/libsnmp30.lintian-overrides
index 0000000,0000000..6ce8d29
new file mode 100644
--- /dev/null
+++ b/debian/libsnmp30.lintian-overrides
@@@ -1,0 -1,0 +1,1 @@@
++libsnmp30: hardening-no-relro usr/lib/*/libnetsnmptrapd.so.*
diff --combined debian/libsnmp30.postinst
index 331af0a,0000000..331af0a
mode 100644,000000..100644
--- a/debian/libsnmp30.postinst
+++ b/debian/libsnmp30.postinst
@@@ -1,9 -1,0 +1,9 @@@
 +#! /bin/sh
 +
 +set -e
 +
 +ldconfig
 +
 +#DEBHELPER#
 +
 +exit 0
diff --combined debian/patches/02_statistics.patch
index 1d05728,0000000..a582476
mode 100644,000000..100644
--- a/debian/patches/02_statistics.patch
+++ b/debian/patches/02_statistics.patch
@@@ -1,24 -1,0 +1,26 @@@
- Index: net-snmp-5.4.3/agent/mibgroup/mibII/interfaces.c
++This patch ignores interfaces without statistics.
++
++Index: net-snmp-5.7.2~dfsg/agent/mibgroup/mibII/interfaces.c
 +===================================================================
- --- net-snmp-5.4.3.orig/agent/mibgroup/mibII/interfaces.c	2010-06-04 17:10:29.000000000 +0200
- +++ net-snmp-5.4.3/agent/mibgroup/mibII/interfaces.c	2010-06-04 17:10:33.000000000 +0200
- @@ -1551,6 +1551,10 @@
++--- net-snmp-5.7.2~dfsg.orig/agent/mibgroup/mibII/interfaces.c	2013-01-07 12:53:22.545808176 +0900
+++++ net-snmp-5.7.2~dfsg/agent/mibgroup/mibII/interfaces.c	2013-01-07 12:53:22.541808167 +0900
++@@ -1592,6 +1592,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';
 + 
- @@ -1584,7 +1588,7 @@
++@@ -1624,7 +1628,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 --combined debian/patches/03_makefiles.patch
index d844cc2,0000000..927c798
mode 100644,000000..100644
--- a/debian/patches/03_makefiles.patch
+++ b/debian/patches/03_makefiles.patch
@@@ -1,111 -1,0 +1,69 @@@
- Index: net-snmp-5.4.3/local/Makefile.in
++Makefile patch to include libwrap and libsensors libraries and install extra
++MIB files.
++
++Index: net-snmp-5.7.2~dfsg/local/Makefile.in
 +===================================================================
- --- net-snmp-5.4.3.orig/local/Makefile.in	2008-03-21 18:22:57.000000000 +0100
- +++ net-snmp-5.4.3/local/Makefile.in	2010-06-04 17:10:51.000000000 +0200
- @@ -100,7 +100,7 @@
++--- net-snmp-5.7.2~dfsg.orig/local/Makefile.in	2013-01-15 01:05:58.571396020 +0900
+++++ net-snmp-5.7.2~dfsg/local/Makefile.in	2013-01-15 01:05:58.567396010 +0900
++@@ -103,7 +103,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
- Index: net-snmp-5.4.3/Makefile.top
++Index: net-snmp-5.7.2~dfsg/Makefile.top
 +===================================================================
- --- net-snmp-5.4.3.orig/Makefile.top	2009-10-29 10:55:42.000000000 +0100
- +++ net-snmp-5.4.3/Makefile.top	2010-06-04 17:10:51.000000000 +0200
- @@ -24,8 +24,9 @@
-  man5dir		= $(mandir)/man5
-  man8dir		= $(mandir)/man8
++--- net-snmp-5.7.2~dfsg.orig/Makefile.top	2013-01-15 01:05:58.571396020 +0900
+++++ net-snmp-5.7.2~dfsg/Makefile.top	2013-01-15 01:11:31.544153075 +0900
++@@ -27,6 +27,7 @@
 + snmplibdir	= $(datadir)/snmp
- -mibdir		= $(snmplibdir)/mibs
- +mibdir		= $(datadir)/mibs/netsnmp
++ mibdir		= $(snmplibdir)/mibs
 + persistentdir	= @PERSISTENT_DIRECTORY@
 ++sysconfdir	= @sysconfdir@
 + DESTDIR         = @INSTALL_PREFIX@
 + INSTALL_PREFIX  = $(DESTDIR)
 + 
- Index: net-snmp-5.4.3/mibs/Makefile.in
++Index: net-snmp-5.7.2~dfsg/Makefile.in
 +===================================================================
- --- net-snmp-5.4.3.orig/mibs/Makefile.in	2009-05-29 11:08:28.000000000 +0200
- +++ net-snmp-5.4.3/mibs/Makefile.in	2010-06-04 17:13:21.000000000 +0200
- @@ -13,53 +13,24 @@
-  OTHERUNINSTALL=mibsuninstall
++--- net-snmp-5.7.2~dfsg.orig/Makefile.in	2013-01-15 01:05:58.571396020 +0900
+++++ net-snmp-5.7.2~dfsg/Makefile.in	2013-01-15 01:09:08.607827737 +0900
++@@ -17,7 +17,7 @@
 + 
-  
- -V1MIBS	= RFC1155-SMI.txt RFC1213-MIB.txt RFC-1215.txt
- +NETSNMPMIBS = NET-SNMP-TC NET-SNMP-MIB NET-SNMP-AGENT-MIB \
- +	NET-SNMP-EXAMPLES-MIB NET-SNMP-EXTEND-MIB NET-SNMP-PASS-MIB \
- +	NET-SNMP-MONITOR-MIB NET-SNMP-SYSTEM-MIB \
- +	NET-SNMP-VACM-MIB
-  
- -V2MIBS = SNMPv2-CONF.txt SNMPv2-SMI.txt SNMPv2-TC.txt SNMPv2-TM.txt \
- -	SNMPv2-MIB.txt
- +UCDMIBS = UCD-SNMP-MIB UCD-DEMO-MIB UCD-IPFWACC-MIB \
- +	UCD-DLMOD-MIB UCD-DISKIO-MIB
-  
- -V3MIBS	= SNMP-FRAMEWORK-MIB.txt SNMP-MPD-MIB.txt SNMP-TARGET-MIB.txt \
- -	SNMP-NOTIFICATION-MIB.txt SNMP-PROXY-MIB.txt \
- -	SNMP-USER-BASED-SM-MIB.txt SNMP-VIEW-BASED-ACM-MIB.txt \
- -	SNMP-COMMUNITY-MIB.txt TRANSPORT-ADDRESS-MIB.txt
- -
- -AGENTMIBS = AGENTX-MIB.txt SMUX-MIB.txt
- -
- -IANAMIBS = IANAifType-MIB.txt IANA-LANGUAGE-MIB.txt \
- -	IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
- -
- -RFCMIBS	= IF-MIB.txt IF-INVERTED-STACK-MIB.txt \
- -	EtherLike-MIB.txt \
- -	IP-MIB.txt IP-FORWARD-MIB.txt IANA-RTPROTO-MIB.txt \
- -	TCP-MIB.txt UDP-MIB.txt \
- -	INET-ADDRESS-MIB.txt HCNUM-TC.txt \
- -	HOST-RESOURCES-MIB.txt HOST-RESOURCES-TYPES.txt \
- -	RMON-MIB.txt \
- -	IPV6-TC.txt IPV6-MIB.txt IPV6-ICMP-MIB.txt IPV6-TCP-MIB.txt \
- -	IPV6-UDP-MIB.txt \
- -	DISMAN-EVENT-MIB.txt DISMAN-SCRIPT-MIB.txt DISMAN-SCHEDULE-MIB.txt \
- -	NOTIFICATION-LOG-MIB.txt SNMP-USM-AES-MIB.txt \
- -	SNMP-USM-DH-OBJECTS-MIB.txt \
- -	SCTP-MIB.txt
- -
- -NETSNMPMIBS = NET-SNMP-TC.txt NET-SNMP-MIB.txt NET-SNMP-AGENT-MIB.txt \
- -	NET-SNMP-EXAMPLES-MIB.txt NET-SNMP-EXTEND-MIB.txt NET-SNMP-PASS-MIB.txt
- -
- -UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
- -	UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
- -
- -DEFAULTMIBS = @default_mibs_install@
- -
- -MIBS	= $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \
- -	$(AGENTMIBS) $(IANAMIBS) \
- -	$(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS)
- +EXTRAMIBS = GNOME-SMI LM-SENSORS-MIB
- +
- +MIBS	= $(NETSNMPMIBS) $(UCDMIBS) $(EXTRAMIBS)
-  
-  all: standardall
-  
-  mibsinstall: installdirs
- -	@for i in $(MIBS) ; do \
- -		$(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_PREFIX)$(mibdir) ; \
- -		echo "install: installed $$i in $(INSTALL_PREFIX)$(mibdir)" ; \
- +	@for i in $(MIBS); do \
- +		$(INSTALL_DATA) $(srcdir)/$$i.txt $(INSTALL_PREFIX)$(mibdir)/$$i ; \
- +		echo "install: installed $$i.txt in $(INSTALL_PREFIX)$(mibdir)/$$i" ; \
-  	done
-  
-  mibsuninstall: installdirs
- Index: net-snmp-5.4.3/Makefile.in
- ===================================================================
- --- net-snmp-5.4.3.orig/Makefile.in	2007-06-08 22:32:56.000000000 +0200
- +++ net-snmp-5.4.3/Makefile.in	2010-06-04 17:10:51.000000000 +0200
- @@ -156,7 +156,7 @@
++ INSTALLHEADERS=version.h net-snmp-features.h
++ INCLUDESUBDIR=system
++-INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \
+++INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h kfreebsd.h \
++ 	darwin.h darwin7.h darwin8.h darwin9.h darwin10.h dragonfly.h dynix.h \
++ 	freebsd2.h freebsd3.h freebsd4.h freebsd5.h freebsd6.h \
++ 	freebsd7.h freebsd8.h freebsd9.h freebsd10.h freebsd.h \
++@@ -170,7 +170,7 @@
 + #
 + # override LD_RUN_PATH to avoid dependencies on the build directory
 + perlmodules: perlmakefiles subdirs
 +-	@(cd perl ; $(MAKE) LD_RUN_PATH="$(libdir):`$(PERL) -e 'use Config; print qq($$Config{archlibexp}/CORE);'`") ; \
 ++	@(cd perl ; $(MAKE) LD_RUN_PATH="") ; \
 +         if test $$? != 0 ; then \
 +            exit 1 ; \
 +         fi
++Index: net-snmp-5.7.2~dfsg/mibs/Makefile.in
++===================================================================
++--- net-snmp-5.7.2~dfsg.orig/mibs/Makefile.in	2013-01-15 01:05:58.571396020 +0900
+++++ net-snmp-5.7.2~dfsg/mibs/Makefile.in	2013-01-15 01:17:21.484984229 +0900
++@@ -48,11 +48,11 @@
++ UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
++ 	UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
++ 
+++EXTRAMIBS = GNOME-SMI LM-SENSORS-MIB
+++
++ DEFAULTMIBS = @default_mibs_install@
++ 
++-MIBS	= $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \
++-	$(AGENTMIBS) $(IANAMIBS) \
++-	$(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS)
+++MIBS	=  $(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS) $(EXTRAMIBS)
++ 
++ all: standardall
++ 
diff --combined debian/patches/05_searchdirs.patch
index cb1bade,0000000..43f96ec
mode 100644,000000..100644
--- a/debian/patches/05_searchdirs.patch
+++ b/debian/patches/05_searchdirs.patch
@@@ -1,14 -1,0 +1,17 @@@
++Makefile patch to include libwrap and libsensors libraries and install extra
++MIB files.
++
 +--- 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 --combined debian/patches/06_extramibs.patch
index a777b3a,0000000..792d66e
mode 100644,000000..100644
--- a/debian/patches/06_extramibs.patch
+++ b/debian/patches/06_extramibs.patch
@@@ -1,92 -1,0 +1,94 @@@
++Extra MIB files shipped with Debian.
++
 +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
 ++	MODULE-IDENTITY,
 ++	OBJECT-IDENTITY,
 ++	enterprises
 ++		FROM SNMPv2-SMI;
 ++
 ++gnome MODULE-IDENTITY
 ++	LAST-UPDATED "200709070000Z"
 ++	ORGANIZATION "GNOME project"
 ++	CONTACT-INFO
 ++		"GNU Network Object Model Environment project
 ++		
 ++		see http://www.gnome.org for contact persons of a particular
 ++		area or subproject of GNOME.
 ++
 ++		Administrative contact for MIB module:
 ++
 ++		Jochen Friedrich
 ++		Ramsaystr. 9
 ++		63450 Hanau
 ++		Germany 
 ++
 ++		email: jochen at scram.de"
 ++	DESCRIPTION
 ++		"The Structure of GNOME."
 ++
 ++	-- revision history
 ++
 ++	REVISION "200709070000Z"  -- Sep 07, 2007
 ++	DESCRIPTION
 ++		"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."
 ++
 ++	REVISION "9809010000Z"  -- September 01, 1998
 ++	DESCRIPTION
 ++		"Initial version."
 ++
 ++	::= { enterprises 3319 }	-- assigned by IANA
 ++
 ++gnomeProducts OBJECT-IDENTITY
 ++	STATUS	current
 ++	DESCRIPTION
 ++		"gnomeProducts is the root OBJECT IDENTIFIER from
 ++		which sysObjectID values are assigned."
 ++	::= { gnome 1 }
 ++
 ++gnomeMgmt OBJECT-IDENTITY
 ++	STATUS  current
 ++	DESCRIPTION
 ++		"gnomeMgmt defines the subtree for production GNOME related
 ++		MIB registrations."
 ++	::= { gnome 2 }
 ++
 ++gnomeTest OBJECT-IDENTITY
 ++	STATUS  current
 ++	DESCRIPTION
 ++		"gnomeTest defines the subtree for testing GNOME related
 ++		MIB registrations."
 ++	::= { gnome 3 }
 ++
 ++gnomeSysadmin OBJECT-IDENTITY
 ++	STATUS  current
 ++	DESCRIPTION
 ++		"gnomeSysadmin defines the subtree for GNOME related Sysadmin
 ++		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 --combined debian/patches/07_docfiles.patch
index 999509d,0000000..01dbda2
mode 100644,000000..100644
--- a/debian/patches/07_docfiles.patch
+++ b/debian/patches/07_docfiles.patch
@@@ -1,101 -1,0 +1,103 @@@
++Patch documentation files to change paths to Debian specific locations.
++
 +Index: net-snmp-5.4.3/FAQ
 +===================================================================
 +--- net-snmp-5.4.3.orig/FAQ	2010-05-23 22:39:44.000000000 +0200
 ++++ net-snmp-5.4.3/FAQ	2010-06-04 17:15:28.000000000 +0200
 +@@ -108,7 +108,7 @@
 +    How do I configure access control?
 +    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?
 +    Where should the snmpd.conf file go?
 +    Why am I getting "Connection refused"?
 +@@ -700,7 +700,7 @@
 +   There are two steps required to add a new MIB file to the tools.
 +   Firstly, copy the MIB file into the appropriate 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
 +         mkdir $HOME/.snmp
 +@@ -1396,7 +1396,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)
 +@@ -1490,7 +1490,7 @@
 +   string to use.
 + 
 +     Some of these (such as MIB information), might be best put 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 probably go in a personal snmp.conf
 +@@ -2655,7 +2655,7 @@
 + 
 + 	createUser {myUser} MD5 {myPassword} DES
 + 
 +-    to the file /var/net-snmp/snmpd.conf (where {myUser} and
 ++    to the file /var/lib/snmp/snmpd.conf (where {myUser} and
 +     {myPassword} are the appropriate values for username and password,
 +     _without_ the braces!).  Then re-start the snmpd agent.
 + 
 +@@ -2664,7 +2664,7 @@
 +         net-snmp-config --create-snmpv3-user
 + 
 +      and follow the prompts given.  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 an SNMPv3
 +@@ -2698,16 +2698,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).
 + 
 + 
 + 
 +@@ -2728,7 +2728,7 @@
 + -----------------------------------
 + 
 +     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.
 + 
 +Index: net-snmp-5.4.3/EXAMPLE.conf.def
 +===================================================================
 +--- net-snmp-5.4.3.orig/EXAMPLE.conf.def	2009-06-01 15:11:07.000000000 +0200
 ++++ net-snmp-5.4.3/EXAMPLE.conf.def	2010-06-04 17:24:24.000000000 +0200
 +@@ -23,7 +23,7 @@
 + #  SNMPv3 AUTHENTICATION
 + #
 + #  Note that these particular settings don't actually belong here.
 +-#  They should be copied to the file /var/net-snmp/snmpd.conf
 ++#  They should be copied to the file /var/lib/snmp/snmpd.conf
 + #     and the passwords changed, before being uncommented in that file *only*.
 + #  Then restart the agent
 + 
diff --combined debian/patches/26_kfreebsd.patch
index cf9613a,0000000..6ff23f0
mode 100644,000000..100644
--- a/debian/patches/26_kfreebsd.patch
+++ b/debian/patches/26_kfreebsd.patch
@@@ -1,127 -1,0 +1,50 @@@
- only in patch2:
- unchanged:
- Index: net-snmp-5.4.2.1/Makefile.in
++Preliminary support for kfreebsd.
++Index: net-snmp-5.7.2~dfsg/agent/mibgroup/hardware/cpu/cpu_sysctl.c
 +===================================================================
- --- net-snmp-5.4.2.1.orig/Makefile.in	2009-11-27 15:13:25.000000000 +0100
- +++ net-snmp-5.4.2.1/Makefile.in	2009-11-27 15:13:35.000000000 +0100
- @@ -17,8 +17,8 @@
-  INCLUDESUBDIR=system
-  INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi.h cygwin.h \
-  	darwin.h darwin7.h darwin8.h darwin9.h freebsd5.h freebsd6.h \
- -	dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd.h generic.h hpux.h \
- -	irix.h linux.h mingw32.h mips.h netbsd.h openbsd.h osf5.h \
- +	dynix.h freebsd2.h freebsd3.h freebsd4.h freebsd.h generic.h kfreebsd.h \
- +	hpux.h irix.h linux.h mingw32.h mips.h netbsd.h openbsd.h osf5.h \
-  	solaris2.3.h solaris2.4.h solaris2.5.h solaris2.6.h \
-  	solaris.h sunos.h svr5.h sysv.h ultrix4.h dragonfly.h
-  INCLUDESUBDIR2=machine
- Index: net-snmp-5.4.2.1/include/net-snmp/system/kfreebsd.h
- ===================================================================
- --- /dev/null	1970-01-01 00:00:00.000000000 +0000
- +++ net-snmp-5.4.2.1/include/net-snmp/system/kfreebsd.h	2009-11-27 15:13:35.000000000 +0100
- @@ -0,0 +1,65 @@
- +#include "freebsd6.h"
- +#define freebsd6 freebsd6
- +
- +#include <osreldate.h>
- +#define __FreeBSD_version __FreeBSD_kernel_version
- +
- +#include <sys/queue.h>
- +#include <sys/_types.h>
- +
- +typedef unsigned int tcp_seq;
- +typedef unsigned int tcp_cc;        
- +#define TCPOPT_SACK_HDR         (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_SACK<<8)
- +#define MAX_SACK_BLKS   6       /* Max # SACK blocks stored at sender side */
- +#define TCP_MAX_SACK    3       /* MAX # SACKs sent in any segment */
- +
- +#include <netinet/tcp_var.h>  
- +
- +#include <net/ethernet.h>
- +#include <net/if_arp.h>
- +#include <netinet/in.h>
- +
- +/*
- + * Externalized form of struct socket used by the sysctl(3) interface.
- + */
- +struct xsocket {
- +        size_t  xso_len;        /* length of this structure */
- +        struct  socket *xso_so; /* makes a convenient handle sometimes */
- +        short   so_type;
- +        short   so_options;
- +        short   so_linger;
- +        short   so_state;
- +        caddr_t so_pcb;         /* another convenient handle */
- +        int     xso_protocol;
- +        int     xso_family;
- +        short   so_qlen;
- +        short   so_incqlen;
- +        short   so_qlimit;
- +        short   so_timeo;
- +        u_short so_error;
- +        pid_t   so_pgid;
- +        u_long  so_oobmark;
- +        struct xsockbuf {
- +                u_int   sb_cc;
- +                u_int   sb_hiwat;
- +                u_int   sb_mbcnt;
- +                u_int   sb_mbmax;
- +                int     sb_lowat;
- +                int     sb_timeo;
- +                short   sb_flags;
- +        } so_rcv, so_snd;
- +        uid_t   so_uid;         /* XXX */
- +};
- +typedef     u_quad_t so_gen_t;
- +
- +#define _SYS_SOCKETVAR_H_
- +#include <netinet/in_pcb.h>
- +
- +struct  xtcpcb {
- +        size_t  xt_len;
- +        struct  inpcb   xt_inp;
- +        struct  tcpcb   xt_tp;
- +        struct  xsocket xt_socket;
- +        u_quad_t        xt_alignment_hack;
- +};
- +
- Index: net-snmp-5.4.2.1/agent/mibgroup/hardware/cpu/cpu_sysctl.c
- ===================================================================
- --- net-snmp-5.4.2.1.orig/agent/mibgroup/hardware/cpu/cpu_sysctl.c	2009-11-27 15:15:37.000000000 +0100
- +++ net-snmp-5.4.2.1/agent/mibgroup/hardware/cpu/cpu_sysctl.c	2009-11-27 15:19:01.000000000 +0100
- @@ -11,7 +11,7 @@
++--- net-snmp-5.7.2~dfsg.orig/agent/mibgroup/hardware/cpu/cpu_sysctl.c	2013-01-07 13:18:53.861513650 +0900
+++++ net-snmp-5.7.2~dfsg/agent/mibgroup/hardware/cpu/cpu_sysctl.c	2013-01-07 13:21:32.693902019 +0900
++@@ -12,7 +12,7 @@
 + #include <unistd.h>
 + #include <sys/types.h>
 + 
 +-#if defined(__FreeBSD__)
 ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 + #include <sys/resource.h>
 + #if !defined(CPUSTATES)
 + #include <sys/dkstat.h>
- @@ -73,7 +73,7 @@
-  #define NETSNMP_CPU_STATS uint64_t
-  #endif
++@@ -83,7 +83,7 @@
++ #elif defined(KERN_CPTIME)                /* OpenBSD */
++ #define NETSNMP_KERN_CPU  KERN_CPTIME
 + 
 +-#elif defined(__FreeBSD__)
 ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 + #define NETSNMP_KERN_CPU  0    /* dummy value - sysctlnametomib(2) should be used */
 + 
 + #else
- @@ -107,7 +107,7 @@
++@@ -117,7 +117,7 @@
 + #define NETSNMP_VM_STATS_TYPE  struct uvmexp
 + #endif  /* VM_UVMEXP2 || VM_UVMEXP */
 + 
 +-#elif defined(__FreeBSD__)                /* FreeBSD */
 ++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) /* FreeBSD */
 + #define NETSNMP_VM_STATS       VM_METER
 + #define NETSNMP_VM_STATS_TYPE  struct vmmeter
 +     #define NS_VM_INTR		v_intr
 +@@ -159,7 +159,7 @@
++      * Don't fight it, Dave - go with the flow....
++      */
++     NETSNMP_CPU_STATS cpu_stats[CPUSTATES];
++-#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+++#if !defined(__FreeBSD__) || defined(__FreeBSD_kernel__) && !defined(__NetBSD__)
++     int            cpu_mib[] = { CTL_KERN, NETSNMP_KERN_CPU };
++ #endif
++     size_t         cpu_size  = sizeof(cpu_stats);
++@@ -173,7 +173,7 @@
 +     size_t         mem_size  = sizeof(NETSNMP_VM_STATS_TYPE);
 +     netsnmp_cpu_info *cpu = netsnmp_cpu_get_byIdx( -1, 0 );
 + 
- -#if defined(__FreeBSD__)
- +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++-#if (defined(__FreeBSD__) || defined(__NetBSD__))
+++#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__))
 +     sysctlbyname("kern.cp_time", cpu_stats, &cpu_size, NULL, 0);
 + #else
 +     sysctl(cpu_mib, 2,  cpu_stats, &cpu_size, NULL, 0);
diff --combined debian/patches/27_kfreebsd_bug625985.patch
index 37e512f,0000000..c23b671
mode 100644,000000..100644
--- a/debian/patches/27_kfreebsd_bug625985.patch
+++ b/debian/patches/27_kfreebsd_bug625985.patch
@@@ -1,18 -1,0 +1,18 @@@
- Index: net-snmp-5.4.3~dfsg/agent/mibgroup/hardware/memory/memory_freebsd.c
++Index: net-snmp-5.7.2~dfsg/agent/mibgroup/hardware/memory/memory_freebsd.c
 +===================================================================
- --- net-snmp-5.4.3~dfsg.orig/agent/mibgroup/hardware/memory/memory_freebsd.c	2008-05-28 12:48:46.000000000 +0100
- +++ net-snmp-5.4.3~dfsg/agent/mibgroup/hardware/memory/memory_freebsd.c	2012-11-20 22:23:34.693203872 +0000
- @@ -205,11 +205,12 @@
++--- net-snmp-5.7.2~dfsg.orig/agent/mibgroup/hardware/memory/memory_freebsd.c	2013-01-07 14:23:52.000000000 +0900
+++++ net-snmp-5.7.2~dfsg/agent/mibgroup/hardware/memory/memory_freebsd.c	2013-01-07 14:23:55.000000000 +0900
++@@ -211,11 +211,12 @@
 + 
 + #include <sys/conf.h>
 + 
 ++kvm_t   *kd = NULL;
 ++
 + int
 + swapmode(long pagesize)
 + {
 +     int             i, n;
 +-    static kvm_t   *kd = NULL;
 +     struct kvm_swap kswap[16];
 +     netsnmp_memory_info *mem;
 +     char buf[1024];
diff --combined debian/patches/60_libsensors_api.patch
index 6272065,0000000..1fd4a56
mode 100644,000000..100644
--- a/debian/patches/60_libsensors_api.patch
+++ b/debian/patches/60_libsensors_api.patch
@@@ -1,218 -1,0 +1,211 @@@
- Index: net-snmp-5.4.3/agent/mibgroup/ucd-snmp/lmSensors.c
++Patch from Jonathan Nieder <jrnieder at gmail.com> to update lmsensors API to libsensors4.
++
++Index: net-snmp-5.7.2~dfsg/agent/mibgroup/ucd-snmp/lmSensors.c
 +===================================================================
- --- net-snmp-5.4.3.orig/agent/mibgroup/ucd-snmp/lmSensors.c	2010-06-04 18:04:58.000000000 +0200
- +++ net-snmp-5.4.3/agent/mibgroup/ucd-snmp/lmSensors.c	2010-06-04 18:06:48.000000000 +0200
- @@ -89,7 +89,6 @@
-      #include </usr/platform/sun4u/include/sys/envctrl.h>
++--- net-snmp-5.7.2~dfsg.orig/agent/mibgroup/ucd-snmp/lmSensors.c	2013-01-14 15:20:53.481713884 +0900
+++++ net-snmp-5.7.2~dfsg/agent/mibgroup/ucd-snmp/lmSensors.c	2013-01-14 15:34:53.367634884 +0900
++@@ -94,7 +94,6 @@
++     #endif 
 + #else
 +     #include <sensors/sensors.h>
 +-    #define CONFIG_FILE_NAME "/etc/sensors.conf"
 + #endif
 + 
 + #include "lmSensors.h"
- @@ -247,7 +246,7 @@
-                     size_t * var_len, WriteMethod ** write_method)
-  {
-      static long     long_ret;
- -    static unsigned char string[SPRINT_MAX_LEN];
- +    static char string[SPRINT_MAX_LEN];
-  
-      int             s_index;
-      int             s_type = -1;
- @@ -352,9 +351,7 @@
++@@ -357,9 +356,7 @@
 + {
 +     int             res;
 + #ifndef solaris2
 +-    char            filename[] = CONFIG_FILE_NAME;
 +     time_t          t = time(NULL);
 +-    FILE            *fp = fopen(filename, "r");
 +     int             i = 0;
 +   
 +     DEBUGMSG(("ucd-snmp/lmSensors", "=> sensor_init\n"));
- @@ -366,13 +363,7 @@
++@@ -371,13 +368,7 @@
 +         sensor_array[i].sensor = NULL;
 +     }
 + 
 +-    if (!fp)
 +-    {
 +-        res = 1;
 +-        goto leaving;
 +-    }
 +-
 +-    if (sensors_init(fp))
 ++    if (sensors_init(NULL))
 +     {
 +         res = 2;
 +         goto leaving;
- @@ -390,7 +381,7 @@
++@@ -395,7 +386,7 @@
 + sensor_load(void)
 + {
 +     int rc = 0;
 +-    time_t	   t = time(NULL);
 ++    time_t        t = time(NULL);
 + 
 +     if (t > timestamp + 7) /* this may require some tuning - currently 7 seconds*/
 +     {
- @@ -940,7 +931,8 @@
++@@ -947,7 +938,8 @@
 + #else /* end solaris2 only ie. ifdef everything else */
 + 
 +     const sensors_chip_name *chip;
 +-    const sensors_feature_data *data;
 ++    const sensors_feature *feature;
 ++    const sensors_subfeature *subfeature;
 +     int             chip_nr = 0;
-      int             rc = 0;
 +     unsigned int    i = 0;
- @@ -961,78 +953,80 @@
++ 
++@@ -969,78 +961,80 @@
 +         sensor_array[i].current_len = DEFAULT_SENSORS;
 +     } /* end for */
 + 
 +-    while ((chip = sensors_get_detected_chips(&chip_nr))) {
 +-	int             a = 0;
 +-	int             b = 0;
 +-
 +-        while ((data = sensors_get_all_features(*chip, &a, &b))) {
 +-            char           *label = NULL;
 +-            double          val;
 +-
 +-            if ((data->mode & SENSORS_MODE_R) &&
 +-                (data->mapping == SENSORS_NO_MAPPING) &&
 +-                !sensors_get_label(*chip, data->number, &label) &&
 +-                !sensors_get_feature(*chip, data->number, &val)) {
 +-                int             type = -1;
- -                float           mul;
++-                float           mul = 0;
 +-                _sensor_array  *array;
 +-
 +-                /* The label, as determined for a given chip in sensors.conf,
 +-                 * is used to place each sensor in the appropriate bucket.
 +-                 * Volt, Fan, Temp, and Misc.  If the text being looked for below
 +-                 * is not in the label of a given sensor (e.g., the temp1 sensor
 +-                 * has been labeled 'CPU' and not 'CPU temp') it will end up being
 +-                 * lumped in the MISC bucket. */
 +-
 +-                if (strstr(label, "V")) {
 +-                    type = VOLT_TYPE;
 +-                    mul = 1000.0;
 +-                }
 +-                if (strstr(label, "fan") || strstr(label, "Fan")) {
 +-                    type = FAN_TYPE;
 +-                    mul = 1.0;
 +-                }
 +-                if (strstr(label, "temp") || strstr(label, "Temp")) {
 +-                    type = TEMP_TYPE;
 +-                    mul = 1000.0;
 +-                }
 +-                if (type == -1) {
 +-                    type = MISC_TYPE;
 +-                    mul = 1000.0;
 +-                }
 +-
 +-                array = &sensor_array[type];
 +-                if ( array->current_len <= array->n) {
 +-                    _sensor* old_buffer = array->sensor;
 +-                    size_t new_size = (sizeof(_sensor) * array->current_len) + (sizeof(_sensor) * DEFAULT_SENSORS);
 +-                    array->sensor = (_sensor*)realloc(array->sensor, new_size);
 +-                    if (array->sensor == NULL)
 +-                    {
 +-                       /* Continuing would be unsafe */
 +-                       snmp_log(LOG_ERR, "too many sensors to fit, and failed to alloc more, failing on %s\n", label);
 +-                       free(old_buffer);
 +-                       old_buffer = NULL;
 +-                       if (label) {
 +-                           free(label);
 +-                           label = NULL;
 +-                       } /* end if label */
- -                       return (rc=1);
++-                       return 1;
 +-                    } /* end if array->sensor */
 +-                    array->current_len = new_size / sizeof(_sensor);
- -                    DEBUGMSG(("ucd-snmp/lmSensors", "type #%d increased to %d elements\n", type, array->current_len));
++-                    DEBUGMSG(("ucd-snmp/lmSensors", "type #%d increased to %d elements\n", type, (int)array->current_len));
 +-                } /* end if array->current */
- -                strncpy(array->sensor[array->n].name, label, MAX_NAME);
++-                strlcpy(array->sensor[array->n].name, label, MAX_NAME);
 +-                array->sensor[array->n].value = (int) (val * mul);
- -                DEBUGMSGTL(("sensors","sensor %d, value %d\n",
++-                DEBUGMSGTL(("sensors","sensor %s, value %d\n",
 +-                            array->sensor[array->n].name,
 +-                            array->sensor[array->n].value));
 +-                array->n++;
 +-            } /* end if data-mode */
 +-	    if (label) {
 +-		free(label);
 +-		label = NULL;
 +-	    } /* end if label */
 +-        } /* end while data */
 ++    while ((chip = sensors_get_detected_chips(NULL, &chip_nr))) {
 ++        int             a = 0;
 ++        while ((feature = sensors_get_features(chip, &a))) {
 ++            int             b = 0;
 ++            while ((subfeature = sensors_get_all_subfeatures(chip,
 ++                    feature, &b))) {
 ++                char           *label = NULL;
 ++                double          val;
 ++
 ++                if ((subfeature->flags & SENSORS_MODE_R) &&
 ++                    (label = sensors_get_label(chip, feature)) &&
 ++                    !sensors_get_value(chip, subfeature->number, &val)) {
 ++                    int             type = -1;
 ++                    float           mul;
 ++                    _sensor_array  *array;
 ++
 ++                    /* The label, as determined for a given chip in
 ++                     * sensors.conf, is used to place each sensor in the
 ++                     * appropriate bucket.  Volt, Fan, Temp, and Misc.
 ++                     * If the text being looked for below is not in the
 ++                     * label of a given sensor (e.g., the temp1 sensor
 ++                     * has been labeled 'CPU' and not 'CPU temp') it
 ++                     * will end up being lumped in the MISC bucket. */
 ++
 ++                    if (strstr(label, "V")) {
 ++                        type = VOLT_TYPE;
 ++                        mul = 1000.0;
 ++                    }
 ++                    if (strstr(label, "fan") || strstr(label, "Fan")) {
 ++                        type = FAN_TYPE;
 ++                        mul = 1.0;
 ++                    }
 ++                    if (strstr(label, "temp") || strstr(label, "Temp")) {
 ++                        type = TEMP_TYPE;
 ++                        mul = 1000.0;
 ++                    }
 ++                    if (type == -1) {
 ++                        type = MISC_TYPE;
 ++                        mul = 1000.0;
 ++                    }
 ++
 ++                    array = &sensor_array[type];
 ++                    if ( array->current_len <= array->n) {
 ++                        _sensor* old_buffer = array->sensor;
 ++                        size_t new_size = (sizeof(_sensor) * array->current_len) + (sizeof(_sensor) * DEFAULT_SENSORS);
 ++                        array->sensor = (_sensor*)realloc(array->sensor, new_size);
 ++                        if (array->sensor == NULL)
 ++                        {
 ++                           /* Continuing would be unsafe */
 ++                           snmp_log(LOG_ERR, "too many sensors to fit, and failed to alloc more, failing on %s\n", label);
 ++                           free(old_buffer);
 ++                           old_buffer = NULL;
 ++                           if (label) {
 ++                               free(label);
 ++                               label = NULL;
 ++                           } /* end if label */
 ++                           return (rc=1);
 ++                        } /* end if array->sensor */
 ++                        array->current_len = new_size / sizeof(_sensor);
 ++                        DEBUGMSG(("ucd-snmp/lmSensors", "type #%d increased to %d elements\n", type, array->current_len));
 ++                    } /* end if array->current */
 ++                    strncpy(array->sensor[array->n].name, label, MAX_NAME);
 ++                    array->sensor[array->n].value = (int) (val * mul);
 ++                    DEBUGMSGTL(("sensors","sensor %d, value %d\n",
 ++                                array->sensor[array->n].name,
 ++                                array->sensor[array->n].value));
 ++                    array->n++;
 ++                } /* end if data-mode */
 ++                if (label) {
 ++                    free(label);
 ++                    label = NULL;
 ++                } /* end if label */
 ++            } /* end while subfeature */
 ++        } /* end while feature */
 +     } /* end while chip */
-      return rc;
++     DEBUGMSG(("ucd-snmp/lmSensors", "<= sensor_load\n"));
 + #endif  /* end else ie. ifdef everything else */
diff --combined debian/patches/61_vacm_missing_dependency_check.patch
index 85486d8,0000000..dd94576
mode 100644,000000..100644
--- a/debian/patches/61_vacm_missing_dependency_check.patch
+++ b/debian/patches/61_vacm_missing_dependency_check.patch
@@@ -1,67 -1,0 +1,33 @@@
- Index: net-snmp-5.4.3~dfsg/agent/agent_read_config.c
++Do not call vacm_standard_views() if the corresponding module was not compiled.
++(applied upstream in changeset 19116)
++
++http://net-snmp.git.sourceforge.net/git/gitweb.cgi?p=net-snmp/net-snmp;a=commitdiff;h=93161743ab8caa5259a945a8d890ae96a99f0b1c;hp=2299559c29fc6493ac2f8836b82683c0904a9b9d
++
++However, it isn't applied newest 5.7.2 source tree... why?
++
++Index: net-snmp-5.7.2~dfsg/apps/snmptrapd_auth.c
 +===================================================================
- --- net-snmp-5.4.3~dfsg.orig/agent/agent_read_config.c	2008-07-24 08:53:02.000000000 +0200
- +++ net-snmp-5.4.3~dfsg/agent/agent_read_config.c	2011-01-05 12:45:24.000000000 +0100
- @@ -282,7 +282,9 @@
-      snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
-                          SNMPD_CALLBACK_PRE_UPDATE_CONFIG, NULL);
-      free_config();
- +#ifdef USING_MIBII_VACM_CONF_MODULE
-      vacm_standard_views(0,0,NULL,NULL);
- +#endif
-      read_configs();
-  }
-  
- Index: net-snmp-5.4.3~dfsg/apps/snmptrapd.c
- ===================================================================
- --- net-snmp-5.4.3~dfsg.orig/apps/snmptrapd.c	2010-04-30 21:10:17.000000000 +0200
- +++ net-snmp-5.4.3~dfsg/apps/snmptrapd.c	2011-01-05 12:45:24.000000000 +0100
- @@ -1477,7 +1477,9 @@
-  trapd_update_config(void)
-  {
-      free_config();
- +#ifdef USING_MIBII_VACM_CONF_MODULE
-      vacm_standard_views(0,0,NULL,NULL);
- +#endif
-      read_configs();
-  }
++--- net-snmp-5.7.2~dfsg.orig/apps/snmptrapd_auth.c	2013-01-23 11:40:36.267276110 +0900
+++++ net-snmp-5.7.2~dfsg/apps/snmptrapd_auth.c	2013-01-23 11:40:36.263276099 +0900
++@@ -27,6 +27,7 @@
++ #endif
 + 
- Index: net-snmp-5.4.3~dfsg/apps/snmptrapd_auth.c
- ===================================================================
- --- net-snmp-5.4.3~dfsg.orig/apps/snmptrapd_auth.c	2006-09-15 02:48:50.000000000 +0200
- +++ net-snmp-5.4.3~dfsg/apps/snmptrapd_auth.c	2011-01-05 12:47:02.000000000 +0100
- @@ -18,6 +18,7 @@
-  #include "snmptrapd_ds.h"
-  #include "mibII/vacm_conf.h"
 + #include <net-snmp/agent/agent_trap.h>
 ++#include <net-snmp/agent/net-snmp-agent-includes.h>
 + 
 + /**
 +  * initializes the snmptrapd authorization code registering needed
- @@ -32,8 +33,10 @@
-                                             netsnmp_trapd_auth);
-      traph->authtypes = TRAP_AUTH_NONE;
-  
- +#ifdef USING_MIBII_VACM_CONF_MODULE
-      /* register our configuration tokens for VACM configs */
-      init_vacm_config_tokens();
- +#endif
-  
-      /* register a config token for turning off the authorization entirely */
-      netsnmp_ds_register_config(ASN_BOOLEAN, "snmptrapd", "disableAuthorization",
- @@ -109,6 +112,7 @@
-          return NETSNMPTRAPD_HANDLER_FINISH;
-      }
-  
++Index: net-snmp-5.7.2~dfsg/agent/agent_read_config.c
++===================================================================
++--- net-snmp-5.7.2~dfsg.orig/agent/agent_read_config.c	2013-01-23 11:38:12.334930631 +0900
+++++ net-snmp-5.7.2~dfsg/agent/agent_read_config.c	2013-01-23 11:41:40.083429045 +0900
++@@ -290,6 +290,9 @@
++     snmp_call_callbacks(SNMP_CALLBACK_APPLICATION,
++                         SNMPD_CALLBACK_PRE_UPDATE_CONFIG, NULL);
++     free_config();
 ++#ifdef USING_MIBII_VACM_CONF_MODULE
-      /* check the pdu against each typo of VACM access we may want to
-         check up on later.  We cache the results for future lookup on
-         each call to netsnmp_trapd_check_auth */
- @@ -125,6 +129,7 @@
-          }
-      }
-      DEBUGMSGTL(("snmptrapd:auth", "Final bitmask auth: %x\n", ret));
+++    vacm_standard_views(0,0,NULL,NULL);
 ++#endif
++     read_configs();
++ }
 + 
-      if (ret) {
-          /* we have policy to at least do "something".  Remember and continue. */
diff --combined debian/patches/62_add_lib_cflags.patch
index 527c595,0000000..305d777
mode 100644,000000..100644
--- a/debian/patches/62_add_lib_cflags.patch
+++ b/debian/patches/62_add_lib_cflags.patch
@@@ -1,38 -1,0 +1,32 @@@
- Index: net-snmp-5.4.2.1/configure.in
++Patch to add option "--base-lib-cflags" to net-snmp-config. This flag returns options needed to link
++against libnetsnmp. In particular, no perl specific options are provided.
++
++It was reported in
++"libsnmp-base: forcing perl headers in net-snmp-config --cflags breaks perl builds"
++http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502806
++
++
++
++Index: net-snmp-5.7.2~dfsg/net-snmp-config.in
 +===================================================================
- --- net-snmp-5.4.2.1.orig/configure.in	2009-12-01 17:30:39.000000000 +0100
- +++ net-snmp-5.4.2.1/configure.in	2009-12-01 17:30:40.000000000 +0100
- @@ -3050,6 +3050,10 @@
-    fi
-  fi
-  
- +# Save CFLAGS for net-snmp-config
- +LIBCFLAGS="$CFLAGS"
- +AC_SUBST(LIBCFLAGS)
- +
-  ####################
-  # on to embedding...
-  
- Index: net-snmp-5.4.2.1/net-snmp-config.in
- ===================================================================
- --- net-snmp-5.4.2.1.orig/net-snmp-config.in	2009-12-01 17:30:12.000000000 +0100
- +++ net-snmp-5.4.2.1/net-snmp-config.in	2009-12-01 17:31:16.000000000 +0100
- @@ -107,6 +107,9 @@
++--- net-snmp-5.7.2~dfsg.orig/net-snmp-config.in	2013-01-14 04:28:45.350028570 +0000
+++++ net-snmp-5.7.2~dfsg/net-snmp-config.in	2013-01-14 04:28:45.350028570 +0000
++@@ -140,6 +140,9 @@
 +     --base-cflags)
 +       echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
 +       ;;
 ++    --base-lib-cflags)
 ++      echo @LIBCFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
 ++      ;;
 +     --cflags|--cf*)
 +       echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
 +       ;;
- @@ -684,6 +687,8 @@
++@@ -643,6 +646,8 @@
 +   echo "  These options produce the various compilation flags needed when"
 +   echo "  building external SNMP applications:"
 +   echo ""
 ++  echo "    --base-lib-cflags lists additional compilation flags needed for linking"
 ++  echo "                      against libsnmp"
 +   echo "    --base-cflags     lists additional compilation flags needed"
 +   echo "    --cflags          lists additional compilation flags needed"
 +   echo "                      (includes -I. and extra developer warning flags)"
diff --combined debian/patches/64_missing_lib.patch
index 40fb010,0000000..f395e9d
mode 100644,000000..100644
--- a/debian/patches/64_missing_lib.patch
+++ b/debian/patches/64_missing_lib.patch
@@@ -1,56 -1,0 +1,45 @@@
- Index: net-snmp-5.4.3~dfsg/configure.in
++Index: net-snmp-5.7.2~dfsg/apps/Makefile.in
 +===================================================================
- --- net-snmp-5.4.3~dfsg.orig/configure.in	2011-05-07 10:22:19.000000000 +0000
- +++ net-snmp-5.4.3~dfsg/configure.in	2011-05-07 10:24:48.425604190 +0000
- @@ -2727,6 +2727,7 @@
-      AC_CHECK_LIB(pkcs11, C_Initialize, AC_DEFINE(HAVE_LIBPKCS11)
-              LIBPKCS11="-lpkcs11")
-  fi
- +AC_SUBST(LIBCRYPTO)
-  
-  LIBS=$NONAGENTLIBS
-  
- @@ -2779,10 +2780,12 @@
-  			AC_MSG_RESULT(no)
-  			AC_MSG_ERROR(Asked to use libwrap but I couldn't find it.))])
-      LAGENTLIBS="$_wraplibs"
- +    LIBWRAP="$_wraplibs"
-      CPPFLAGS=${_cppflags}
-      LDFLAGS=${_ldflags}
-      LIBS=${_libs}
-    fi
- +  AC_SUBST(LIBWRAP)
-  ])
-  
-  AC_CHECK_HEADERS(rpm/rpmlib.h rpm/header.h)
- Index: net-snmp-5.4.3~dfsg/apps/Makefile.in
- ===================================================================
- --- net-snmp-5.4.3~dfsg.orig/apps/Makefile.in	2007-07-04 23:26:56.000000000 +0000
- +++ net-snmp-5.4.3~dfsg/apps/Makefile.in	2011-05-07 10:27:52.989604084 +0000
- @@ -50,6 +50,8 @@
-  AGENTLIB        = ../agent/libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
-  MIBLIB          = ../agent/libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
-  USEAGENTLIBS	= $(MIBLIB) $(AGENTLIB) $(HELPERLIB) $(USELIBS)
++--- net-snmp-5.7.2~dfsg.orig/apps/Makefile.in	2012-10-09 22:28:58.000000000 +0000
+++++ net-snmp-5.7.2~dfsg/apps/Makefile.in	2013-01-14 05:56:10.000000000 +0000
++@@ -83,6 +83,8 @@
++ USEAGENTLIBS	= $(MIBLIB) $(AGENTLIB) $(USELIBS)
++ MYSQL_LIBS	= @MYSQL_LIBS@
++ MYSQL_INCLUDES	= @MYSQL_INCLUDES@
 ++LIBCRYPTO       = @LIBCRYPTO@
 ++LIBWRAP         = @LIBWRAP@
 + 
-  #
-  # link path in src dir
- @@ -115,7 +117,7 @@
-  	$(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++ VAL_LIBS	= @VAL_LIBS@
++ LIBS		= $(USELIBS) $(VAL_LIBS) @LIBS@
++@@ -170,7 +172,7 @@
++ 	$(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) ${LDFLAGS} ${LIBS}
 + 
 + snmptrapd$(EXEEXT):    $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS)
- -	$(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS}
- +	$(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) $(LOCAL_LIBS) ${LDFLAGS} ${TRAPLIBS} $(LIBWRAP)
++-	$(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRAPLIBS}
+++	$(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRAPLIBS} $(LIBWRAP)
 + 
 + snmptrap$(EXEEXT):    snmptrap.$(OSUFFIX) $(USELIBS)
-  	$(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
- @@ -128,7 +130,7 @@
-  	$(LINK) ${CFLAGS} -o $@ snmpset.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++ 	$(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++@@ -183,7 +185,7 @@
++ 	$(LINK) ${CFLAGS} -o $@ snmpset.$(OSUFFIX) ${LDFLAGS} ${LIBS}
 + 
 + snmpusm$(EXEEXT):    snmpusm.$(OSUFFIX) $(USELIBS)
- -	$(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
- +	$(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} $(LIBCRYPTO)
++-	$(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) ${LDFLAGS} ${LIBS}
+++	$(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) ${LDFLAGS} ${LIBS} $(LIBCRYPTO)
 + 
 + snmpvacm$(EXEEXT):    snmpvacm.$(OSUFFIX) $(USELIBS)
-  	$(LINK) ${CFLAGS} -o $@ snmpvacm.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} 
++ 	$(LINK) ${CFLAGS} -o $@ snmpvacm.$(OSUFFIX) ${LDFLAGS} ${LIBS}
++Index: net-snmp-5.7.2~dfsg/configure.ac
++===================================================================
++--- net-snmp-5.7.2~dfsg.orig/configure.ac	2012-10-09 22:28:58.000000000 +0000
+++++ net-snmp-5.7.2~dfsg/configure.ac	2013-01-14 05:56:44.894900017 +0000
++@@ -78,6 +78,9 @@
++ 
++ AC_SUBST(PARTIALTARGETFLAGS)
++ AC_SUBST(ac_cv_NETSNMP_SYSTEM_INCLUDE_FILE)
+++LIBWRAP="$_wraplibs"
+++AC_SUBST(LIBWRAP)
+++AC_SUBST(LIBCRYPTO)
++ 
++ AC_CONFIG_FILES([Makefile:Makefile.top:Makefile.in:Makefile.rules])
++ AC_CONFIG_FILES([snmplib/Makefile:Makefile.top:snmplib/Makefile.in:Makefile.rules:snmplib/Makefile.depend])
diff --combined debian/patches/after_RFC5378
index 0000000,0000000..9bb502e
new file mode 100644
--- /dev/null
+++ b/debian/patches/after_RFC5378
@@@ -1,0 -1,0 +1,43 @@@
++Description: exclude under RFC5378 modules
++Author: Hideki Yamane <henrich at debian.org>
++---
++Origin: vendor
++Forwarded: not-needed
++Last-Update: 2013-02-08
++
++--- net-snmp-5.7.2~dfsg.orig/mibs/rfclist
+++++ net-snmp-5.7.2~dfsg/mibs/rfclist
++@@ -233,33 +233,3 @@
++ 5190	MIDCOM-MIB
++ 5240	PIM-BSR-MIB
++ 5324	T11-FC-SP-TC-MIB:T11-FC-SP-AUTHENTICATION-MIB:T11-FC-SP-ZONING-MIB:T11-FC-SP-POLICY-MIB:T11-FC-SP-SA-MIB
++-5427	SYSLOG-TC-MIB
++-5428	PKTC-IETF-EVENT-MIB
++-5488	NEMO-MIB
++-5519	MGMD-STD-MIB
++-5525	RSERPOOL-MIB
++-5542	PW-TC-STD-MIB
++-5591    SNMP-TSM-MIB
++-5601	PW-STD-MIB:IANA-PWE3-MIB
++-5602	PW-MPLS-STD-MIB
++-5603	PW-ENET-STD-MIB
++-5604	PW-TDM-MIB
++-5605	PW-ATM-MIB
++-5643	OSPFV3-MIB
++-5650	VDSL2-LINE-TC-MIB:VDSL2-LINE-MIB
++-5676	SYSLOG-MSG-MIB
++-5728	DVB-RCS-MIB
++-5813	FORCES-MIB
++-5815	IPFIX-MIB:IPFIX-SELECTOR-MIB
++-5833	CAPWAP-BASE-MIB
++-5834	CAPWAP-DOT11-MIB
++-5907	NTPv4-MIB
++-6065	SNMP-VACM-AAA-MIB
++-6173	IFCP-MGMT-MIB
++-6240	PW-CEP-STD-MIB
++-6340	FLOAT-TC-MIB
++-6353	SNMP-TLS-TM-MIB
++-6445	MPLS-FRR-GENERAL-STD-MIB:MPLS-FRR-ONE2ONE-STD-MIB:MPLS-FRR-FACILITY-STD-MIB
++-6475	PMIPV6-TC-MIB:PMIPV6-MIB
++-6527	VRRPV3-MIB
++-6615	IPFIX-MIB:IPFIX-SELECTOR-MIB
diff --combined debian/patches/dropped_25_duplicate_iftable.patch
index 0000000,0000000..6d2e841
new file mode 100644
--- /dev/null
+++ b/debian/patches/dropped_25_duplicate_iftable.patch
@@@ -1,0 -1,0 +1,115 @@@
++Patch from
++http://sourceforge.net/tracker/index.php?func=detail&aid=1513191&group_id=12694&atid=312694 :
++
++This patch fixes bug #1238981 for me. If a new device
++will be added, the old device are first checked. If
++there's an old device with the same name is found, the
++old device is removed from the list. This fixes the
++problem that i have tons of ppp0 interfaces in the
++snmpd ifTable.
++
++Signed-of-by: Sven Schnelle <svens at gmx.de>
++
++-> not applied to current code. need to investigate more 
++  Hideki Yamane <henrich at debian.org>
++
++
++diff -ru net-snmp-5.4.2.1.orig/agent/mibgroup/if-mib/data_access/interface.c net-snmp-5.4.2.1/agent/mibgroup/if-mib/data_access/interface.c
++--- net-snmp-5.4.2.1.orig/agent/mibgroup/if-mib/data_access/interface.c	2008-02-23 00:52:33.000000000 +0100
+++++ net-snmp-5.4.2.1/agent/mibgroup/if-mib/data_access/interface.c	2009-07-31 17:10:49.000000000 +0200
++@@ -469,12 +469,12 @@
++         if (index != tmp) {
++             static int logged = 0;
++             if (!logged) {
++-                snmp_log(LOG_ERR, "IfIndex of an interface changed. Such " \
++-                         "interfaces will appear multiple times in IF-MIB.\n");
+++                snmp_log(LOG_ERR, "IfIndex of an interface changed.\n");
++                 logged = 1;
++             }
++-            DEBUGMSGTL(("access:interface:ifIndex", "index %d != tmp for %s\n",
++-                         index, name));
+++	    se_remove_value_from_slist("interfaces", name);
+++	    se_add_pair_to_slist("interfaces", strdup(name), index);
+++	    DEBUGMSGTL(("access:interface:ifIndex", "ifname %s, old index %d, already existing, replaced with %d\n", name, tmp, index));
++         }
++ }
++ 
++diff -ru net-snmp-5.4.2.1.orig/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c net-snmp-5.4.2.1/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c
++--- net-snmp-5.4.2.1.orig/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c	2008-02-12 20:05:24.000000000 +0100
+++++ net-snmp-5.4.2.1/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c	2009-07-31 17:04:17.000000000 +0200
++@@ -266,8 +266,21 @@
++ _add_new_interface(netsnmp_interface_entry *ifentry,
++                    netsnmp_container *container)
++ {
++-    ifTable_rowreq_ctx *rowreq_ctx;
++-
+++    ifTable_rowreq_ctx *rowreq_ctx, *container_entry;
+++    netsnmp_iterator *ctxit;
+++    ctxit = CONTAINER_ITERATOR(container);
+++    container_entry = ITERATOR_FIRST(ctxit);
+++
+++    for(; container_entry; container_entry = ITERATOR_NEXT(ctxit)) {
+++	if(!strcmp(ifentry->name, container_entry->data.ifName) && \
+++	    ifentry->index != container_entry->data.ifentry->index) {
+++		DEBUGMSGTL(("ifTable:access", "removing old entry %s (index %d != %d)\n",
+++		    container_entry->data.ifName, container_entry->data.ifentry->index, ifentry->index));
+++		    se_remove_value_from_slist("interfaces", container_entry->data.ifName);
+++		CONTAINER_REMOVE(container, container_entry);
+++		ifTable_release_rowreq_ctx(container_entry);
+++		}
+++    }
++     DEBUGMSGTL(("ifTable:access", "creating new entry\n"));
++ 
++     /*
++Nur in net-snmp-5.4.2.1/agent/mibgroup/if-mib/ifTable: ifTable_data_access.c.orig.
++diff -ru net-snmp-5.4.2.1.orig/snmplib/snmp_enum.c net-snmp-5.4.2.1/snmplib/snmp_enum.c
++--- net-snmp-5.4.2.1.orig/snmplib/snmp_enum.c	2005-02-09 20:46:35.000000000 +0100
+++++ net-snmp-5.4.2.1/snmplib/snmp_enum.c	2009-07-31 17:04:17.000000000 +0200
++@@ -213,6 +213,27 @@
++     return SE_DNE;              /* XXX: um, no good solution here */
++ }
++ 
+++int se_remove_value_from_list(struct snmp_enum_list **list, const char *label)
+++{
+++   struct snmp_enum_list *lastlist;
+++   if(!list)
+++     return SE_DNE;
+++
+++   lastlist = NULL;
+++   while(*list) {
+++      if(strcmp((*list)->label, label) == 0) {
+++	 free((*list)->label);
+++	 if(lastlist)
+++	   lastlist->next = (*list)->next;
+++	 free(*list);
+++	 *list = NULL;
+++	 return 0;
+++      }
+++      lastlist = *list;
+++      (*list) = (*list)->next;
+++   }
+++   
+++}
++ int
++ se_find_free_value_in_list(struct snmp_enum_list *list)
++ {
++@@ -331,6 +352,19 @@
++     return (se_find_value_in_list(se_find_slist(listname), label));
++ }
++ 
+++void se_remove_value_from_slist(const char *listname, const char *label)
+++{
+++   struct snmp_enum_list_str *sptr, *lastp = NULL;
+++   struct snmp_enum_list *list;
+++   if (!listname)
+++     return;
+++
+++   for (sptr = sliststorage;
+++	sptr != NULL; lastp = sptr, sptr = sptr->next)
+++     if (sptr->name && strcmp(sptr->name, listname) == 0)
+++       se_remove_value_from_list(&sptr->list, label);
+++}
+++
++ int
++ se_find_free_value_in_slist(const char *listname)
++ {
diff --combined debian/patches/dropped_44_nlist_kvm.patch
index 0000000,0000000..3ec6670
new file mode 100644
--- /dev/null
+++ b/debian/patches/dropped_44_nlist_kvm.patch
@@@ -1,0 -1,0 +1,17 @@@
++
++Patch from Petr Salinger <Petr.Salinger at seznam.cz>: search nlist() in libkvm.
++
++cannot apply to current code?
++
++--- net-snmp-5.4.3~dfsg.orig/configure.in
+++++ net-snmp-5.4.3~dfsg/configure.in
++@@ -2890,6 +2890,9 @@
++ 	AC_DEFINE(HAVE_LIBKVM, 1, [Define to 1 if you have the `kvm' library (-lkvm).])
++ 	LAGENTLIBS="$LAGENTLIBS ${_libkvm}"
++ fi
+++AC_CHECK_FUNC(nlist, AC_DEFINE(HAVE_NLIST, 1, [Define to 1 if you have the `nlist' function.]),
+++        AC_CHECK_LIB(bsd, nlist, AC_DEFINE(HAVE_NLIST, 1, [Define to 1 if you have the `nlist' function.])
+++        LAGENTLIBS="$LAGENTLIBS bsd"))
++ 
++ # DYNAMIC MODULE SUPPORT
++ AC_CHECK_FUNC(dlopen, AC_DEFINE(HAVE_DLOPEN, 1, [Define to 1 if you have the `dlopen' function.]),
diff --combined debian/patches/fix_logging_option.patch
index 0000000,0000000..675737f
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix_logging_option.patch
@@@ -1,0 -1,0 +1,23 @@@
++Description: fix man description
++Author: Hideki Yamane <henrich at debian.org>
++
++---
++Origin: vendor
++Bug-Debian: http://bugs.debian.org/616437
++Forwarded: no
++Last-Update: 2013-01-23
++
++--- net-snmp-5.7.2~dfsg.orig/man/snmpd.8.def
+++++ net-snmp-5.7.2~dfsg/man/snmpd.8.def
++@@ -78,9 +78,9 @@ To get a list of compiled modules, run t
++ .I "\-Dmib_init \-H"
++ (assuming debugging support has been compiled in).
++ .TP
++-.B \-L[efos]
+++.B \-L[eEfFoOsS]
++ Specify where logging output should be directed (standard error or output,
++-to a file or via syslog).  See LOGGING OPTIONS in snmpcmd(5) for details.
+++to a file or via syslog).  See LOGGING OPTIONS in snmpcmd(1) for details.
++ .TP
++ .BR \-m " \fIMIBLIST"
++ Specifies a colon separated list of MIB modules to load for this
diff --combined debian/patches/fix_man_error.patch
index 0000000,0000000..5cbda9c
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix_man_error.patch
@@@ -1,0 -1,0 +1,25 @@@
++Description: fix man error
++ 
++ - mib2c.conf
++   http://lintian.debian.org/tags/manpage-has-bad-whatis-entry.html
++
++
++Author: Hideki Yamane <henrich at debian.org>
++
++---
++Origin: vendor
++Forwarded: no
++Last-Update: 2013-01-26
++
++Index: net-snmp-5.7.2~dfsg/man/mib2c.conf.5.in
++===================================================================
++--- net-snmp-5.7.2~dfsg.orig/man/mib2c.conf.5.in	2013-01-26 19:04:05.000000000 +0900
+++++ net-snmp-5.7.2~dfsg/man/mib2c.conf.5.in	2013-01-26 19:04:05.000000000 +0900
++@@ -1,6 +1,6 @@
++ .TH MIB2C.CONF 5 "28 Apr 2004" VVERSIONINFO "Net-SNMP"
++ .SH NAME
++-mib2c.conf \[em] How to write mib2c.conf files to do ANYTHING based on MIB input.
+++mib2c.conf - How to write mib2c.conf files to do ANYTHING based on MIB input.
++ .SH SYNOPSIS
++ % cat > mib2c.test.conf  << EOF
++ @foreach $t table@
diff --combined debian/patches/fix_regular_expression.patch
index 0000000,0000000..97f79bb
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix_regular_expression.patch
@@@ -1,0 -1,0 +1,46 @@@
++Description: fix regular expression mismatching
++ setup.py would find library via net-snmp-config, however, its result also 
++ matches to "-L/usr/lib/x86_64-linux-gnu" and return "inux-gnu" as library
++ in Debian/Ubuntu enabling Multi-Arch environtment as below.
++>>> import os
++>>> import re
++>>> import string
++>>> import sys
++>>> netsnmp_libs="-Wl,-z,relro -Wl,-z,now -L/usr/lib/x86_64-linux-gnu -lnetsnmp -lcrypto -lm"
++>>> print netsnmp_libs
++-Wl,-z,relro -Wl,-z,now -L/usr/lib/x86_64-linux-gnu -lnetsnmp -lcrypto -lm
++>>> re.findall(r"-l(\S+)", netsnmp_libs)
++['inux-gnu', 'netsnmp', 'crypto', 'm']
++
++ Just inserting space will fix this.
++>>> re.findall(r" -l(\S+)", netsnmp_libs)
++['netsnmp', 'crypto', 'm']
++
++Author: Hideki Yamane <henrich at debian.org>
++
++---
++Origin: vendor
++Forwarded: no
++Last-Update: 2013-01-07
++
++Index: net-snmp-5.7.1~dfsg/python/setup.py
++===================================================================
++--- net-snmp-5.7.1~dfsg.orig/python/setup.py	2013-01-07 11:33:32.346195340 +0900
+++++ net-snmp-5.7.1~dfsg/python/setup.py	2013-01-07 11:33:58.654255360 +0900
++@@ -18,14 +18,14 @@
++     netsnmp_libs = os.popen(basedir+'/net-snmp-config --libs').read()
++     libdir = os.popen(basedir+'/net-snmp-config --build-lib-dirs '+basedir).read()
++     incdir = os.popen(basedir+'/net-snmp-config --build-includes '+basedir).read()
++-    libs = re.findall(r"-l(\S+)", netsnmp_libs)
+++    libs = re.findall(r" -l(\S+)", netsnmp_libs)
++     libdirs = re.findall(r"-L(\S+)", libdir)
++     incdirs = re.findall(r"-I(\S+)", incdir)
++ else:
++     netsnmp_libs = os.popen('net-snmp-config --libs').read()
++     libdirs = re.findall(r"-L(\S+)", netsnmp_libs)
++     incdirs = []
++-    libs = re.findall(r"-l(\S+)", netsnmp_libs)
+++    libs = re.findall(r" -l(\S+)", netsnmp_libs)
++ 
++ setup(
++     name="netsnmp-python", version="1.0a1",
diff --combined debian/patches/fix_snmpcheck_perl_path.patch
index 0000000,0000000..7d7b9de
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix_snmpcheck_perl_path.patch
@@@ -1,0 -1,0 +1,19 @@@
++Description: fix snmpcheck shebang
++ Just don't use /usr/local/bin/perl...
++
++Author: Hideki Yamane <henrich at debian.org>
++
++---
++Origin: vendor
++Bug-Debian: http://bugs.debian.org/44373
++Forwarded: not-needed
++Last-Update: 2012-07-17
++
++--- net-snmp-5.7.1~dfsg.orig/local/snmpcheck.def
+++++ net-snmp-5.7.1~dfsg/local/snmpcheck.def
++@@ -1,4 +1,4 @@
++-#!/usr/local/bin/perl -w
+++#!/usr/bin/perl 
++ 
++ use strict 'refs';
++ require Net::Ping;
diff --combined debian/patches/fix_spelling_error.patch
index 0000000,0000000..b86c706
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix_spelling_error.patch
@@@ -1,0 -1,0 +1,52 @@@
++Description: fix spelling error
++Author: Hideki Yamane <henrich at debian.org>
++
++---
++Origin: vendor
++Forwarded: no
++Last-Update: 2013-01-22
++
++--- net-snmp-5.7.2~dfsg.orig/apps/encode_keychange.c
+++++ net-snmp-5.7.2~dfsg/apps/encode_keychange.c
++@@ -403,7 +403,7 @@ usage_to_file(FILE * ofp)
++    "-f will require reading from the stdin/terminal, ignoring a) and b).\n\
++     -P will prevent prompts for passphrases to stdout from being printed.\n\
++ \n\
++-    <engineID> is interpreted as a hex string when preceeded by \"0x\",\n\
+++    <engineID> is interpreted as a hex string when preceded by \"0x\",\n\
++     otherwise it is created to contain \"text\".  If nothing is given,\n\
++     <engineID> is constructed from the first IP address for the local host.\n");
++ 
++--- net-snmp-5.7.2~dfsg.orig/apps/snmpusm.c
+++++ net-snmp-5.7.2~dfsg/apps/snmpusm.c
++@@ -150,7 +150,7 @@ usage(void)
++     fprintf(stderr, "\t\t\t(it won't be active until you active it)\n");
++     fprintf(stderr, "\t-Cx\t\tChange the privacy key.\n");
++     fprintf(stderr, "\t-Ca\t\tChange the authentication key.\n");
++-    fprintf(stderr, "\t-Ck\t\tAllows to use localized key (must start with 0x)\n");
+++    fprintf(stderr, "\t-Ck\t\tAllows one to use localized key (must start with 0x)\n");
++     fprintf(stderr, "\t\t\tinstead of passphrase.\n");
++ }
++ 
++--- net-snmp-5.7.2~dfsg.orig/apps/snmpnetstat/inet6.c
+++++ net-snmp-5.7.2~dfsg/apps/snmpnetstat/inet6.c
++@@ -333,7 +333,7 @@ icmp6_stats(const char *name)
++     struct stat_table icmp6stats_tbl[] = {
++         {1, "%d total message%s received"},
++         {2, "%d message%s dropped due to errors"},
++-        {18, "%d ouput message request%s"},
+++        {18, "%d output message request%s"},
++         {19, "%d output message%s discarded"},
++         {0, ""}
++     };
++--- net-snmp-5.7.2~dfsg.orig/apps/snmpnetstat/inet.c
+++++ net-snmp-5.7.2~dfsg/apps/snmpnetstat/inet.c
++@@ -445,7 +445,7 @@ icmp_stats(const char *name)
++     struct stat_table icmpstats_tbl[] = {
++         {1, "%d total message%s received"},
++         {2, "%d message%s dropped due to errors"},
++-        {14, "%d ouput message request%s"},
+++        {14, "%d output message request%s"},
++         {15, "%d output message%s discarded"},
++         {0, ""}
++     };
diff --combined debian/patches/fix_typo_in_snmpd.conf.patch
index 0000000,0000000..acab1d6
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix_typo_in_snmpd.conf.patch
@@@ -1,0 -1,0 +1,19 @@@
++Description: fix typo
++Author: Hideki Yamane <henrich at debian.org>
++---
++Origin: vendor
++Bug-Debian: http://bugs.debian.org/603593
++Forwarded: no
++Last-Update: 2013-01-23
++
++--- net-snmp-5.7.2~dfsg.orig/EXAMPLE.conf.def
+++++ net-snmp-5.7.2~dfsg/EXAMPLE.conf.def
++@@ -63,7 +63,7 @@ view   systemonly  included   .1.3.6.1.2
++ #rwuser   authPrivUser   priv
++ 
++ #  It's no longer typically necessary to use the full 'com2sec/group/access' configuration
++-#  r[ou]user and r[ow]community, together with suitable views, should cover most requirements
+++#  r[ow]user and r[ow]community, together with suitable views, should cover most requirements
++ 
++ 
++ 
diff --combined debian/patches/net-snmp-config_multi-arch.patch
index 0000000,0000000..60b653e
new file mode 100644
--- /dev/null
+++ b/debian/patches/net-snmp-config_multi-arch.patch
@@@ -1,0 -1,0 +1,32 @@@
++Description: enable Multi-Arch support in net-snmp-config
++ specify $DEB_HOST_MULTIARCH to enable Multi-Arch
++
++Author: Hideki Yamane <henrich at debian.org>
++
++---
++Origin: vendor
++Forwarded: no
++Last-Update: 2012-07-18
++
++Index: net-snmp-5.7.2~dfsg/net-snmp-config.in
++===================================================================
++--- net-snmp-5.7.2~dfsg.orig/net-snmp-config.in	2013-01-14 16:10:26.524006164 +0900
+++++ net-snmp-5.7.2~dfsg/net-snmp-config.in	2013-01-14 16:13:34.584345846 +0900
++@@ -90,14 +90,14 @@
++     --prefix=*)
++       prefix=$optarg
++       NSC_PREFIX=${prefix}
++-      NSC_INCLUDEDIR=${prefix}/include
++-      NSC_LIBDIR=-L${prefix}/lib
+++      NSC_INCLUDEDIR=${prefix}/include/$DEB_HOST_MULTIARC/,${prefix}/include/
+++      NSC_LIBDIR=-L${prefix}/lib/$DEB_HOST_MULTIARCH/,${prefix}/lib/
++       ;;
++ 
++     --exec-prefix=*)
++       exec_prefix=$optarg
++       NSC_EXEC_PREFIX=${exec_prefix}
++-      NSC_LIBDIR=-L${exec_prefix}/lib
+++      NSC_LIBDIR=-L${exec_prefix}/lib/$DEB_HOST_MULTIARCH/,${prefix}/lib/
++       ;;
++ 
++     --debug-tokens|--deb*|--dbg*)
diff --combined debian/patches/series
index ee92653,0000000..80ba325
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,19 -1,0 +1,20 @@@
 +02_statistics.patch
 +03_makefiles.patch
 +05_searchdirs.patch
 +06_extramibs.patch
 +07_docfiles.patch
- 08_defaultconfig.patch
- 25_duplicate_iftable.patch
 +26_kfreebsd.patch
 +27_kfreebsd_bug625985.patch 
- 32_mnttab_path.patch
- 44_nlist_kvm.patch
- 56_manpage.patch
 +60_libsensors_api.patch
 +61_vacm_missing_dependency_check.patch
 +62_add_lib_cflags.patch
- 63_fix_shell.patch
 +64_missing_lib.patch
- 65_CVE-2012-2141.patch
- 66_formatstrings.patch
++fix_snmpcheck_perl_path.patch
++fix_regular_expression.patch
++snmptranslate.1.patch
++fix_spelling_error.patch
++#net-snmp-config_multi-arch.patch
++fix_logging_option.patch
++fix_typo_in_snmpd.conf.patch
++fix_man_error.patch
++after_RFC5378
diff --combined debian/patches/snmptranslate.1.patch
index 0000000,0000000..b95b933
new file mode 100644
--- /dev/null
+++ b/debian/patches/snmptranslate.1.patch
@@@ -1,0 -1,0 +1,60 @@@
++Description: fix hyphen-used-as-minus-sign
++ fix lintian "hyphen-used-as-minus-sign" warnings.
++
++Author: Hideki Yamane <henrich at debian.org>
++
++---
++Origin: vendor
++Forwarded: no
++Last-Update: 2012-07-17
++
++Index: net-snmp-5.7.2~dfsg/man/snmptranslate.1.def
++===================================================================
++--- net-snmp-5.7.2~dfsg.orig/man/snmptranslate.1.def	2012-10-10 07:28:58.000000000 +0900
+++++ net-snmp-5.7.2~dfsg/man/snmptranslate.1.def	2013-01-15 01:19:05.000000000 +0900
++@@ -163,22 +163,22 @@
++ .nf
++ +--system(1)
++    |
++-   +-- -R-- String    sysDescr(1)
+++   +-- \-R-- String    sysDescr(1)
++    |        Textual Convention: DisplayString
++    |        Size: 0..255
++-   +-- -R-- ObjID     sysObjectID(2)
++-   +-- -R-- TimeTicks sysUpTime(3)
++-   +-- -RW- String    sysContact(4)
+++   +-- \-R-- ObjID     sysObjectID(2)
+++   +-- \-R-- TimeTicks sysUpTime(3)
+++   +-- \-RW- String    sysContact(4)
++    |        Textual Convention: DisplayString
++    |        Size: 0..255
++-   +-- -RW- String    sysName(5)
+++   +-- \-RW- String    sysName(5)
++    |        Textual Convention: DisplayString
++    |        Size: 0..255
++-   +-- -RW- String    sysLocation(6)
+++   +-- \-RW- String    sysLocation(6)
++    |        Textual Convention: DisplayString
++    |        Size: 0..255
++-   +-- -R-- Integer   sysServices(7)
++-   +-- -R-- TimeTicks sysORLastChange(8)
+++   +-- \-R-- Integer   sysServices(7)
+++   +-- \-R-- TimeTicks sysORLastChange(8)
++    |        Textual Convention: TimeStamp
++    |
++    +--sysORTable(9)
++@@ -186,11 +186,11 @@
++       +--sysOREntry(1)
++          |
++          +-- ---- Integer   sysORIndex(1)
++-         +-- -R-- ObjID     sysORID(2)
++-         +-- -R-- String    sysORDescr(3)
+++         +-- \-R-- ObjID     sysORID(2)
+++         +-- \-R-- String    sysORDescr(3)
++          |        Textual Convention: DisplayString
++          |        Size: 0..255
++-         +-- -R-- TimeTicks sysORUpTime(4)
+++         +-- \-R-- TimeTicks sysORUpTime(4)
++                   Textual Convention: TimeStamp
++ 
++ .fi
diff --combined debian/python-netsnmp.install
index 80f0c2a,0000000..80f0c2a
mode 100644,000000..100644
--- a/debian/python-netsnmp.install
+++ b/debian/python-netsnmp.install
@@@ -1,1 -1,0 +1,1 @@@
 +debian/tmp/usr/lib/python*
diff --combined debian/rules
index facff93,0000000..f49a5cf
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,147 -1,0 +1,113 @@@
 +#!/usr/bin/make -f
++#export DH_VERBOSE=1
 +
- include /usr/share/python/python.mk
++# TODO
++# without -pie build fails during perl module build somehow...
++export DEB_BUILD_MAINT_OPTIONS := hardening=+all,-pie
++DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 +
- LIB_VERSION = 15
++LIB_VERSION = 30
 +UPSTREAM_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ':' | sed 's/ //' | sed 's/~dfsg.*$$//')
 +COMPAT_VERSION = $(UPSTREAM_VERSION)~dfsg
 +PYTHON_VERSION = 1.0a1
 +
- MIB_MODULES = smux ucd-snmp/dlmod
++MIB_MODULES = smux ucd-snmp/dlmod mibII/mta_sendmail disman/event-mib
 +EXCL_MIB_MODULES =
 +
- PYVERS=$(shell pyversions -vr)
++OLD_MIBS_DIR="/usr/share/mibs/site:/usr/share/snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp"
++MIBS_DIR="/usr/share/snmp/mibs:/usr/share/snmp/mibs/iana:/usr/share/snmp/mibs/ietf"
 +
- ifeq (linux,$(DEB_HOST_ARCH_OS))
- MIB_MODULES += ucd-snmp/diskio ucd-snmp/lmSensors 
++ifeq (linux,$(DEB_BUILD_ARCH_OS))
++MIB_MODULES += ucd-snmp/diskio ucd-snmp/lmsensorsMib
 +IPV6 = --enable-ipv6
 +DEB_DH_GENCONTROL_ARGS=-- -Vos-specific-dev="libsensors4-dev"
 +else
- ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
++ifeq (kfreebsd,$(DEB_BUILD_ARCH_OS))
 +IPV6 = --disable-ipv6
 +DEB_DH_GENCONTROL_ARGS=-- -Vos-specific-dev="libkvm-dev"
 +endif
 +endif
- ifeq (hurd,$(DEB_HOST_ARCH_OS))
++ifeq (hurd,$(DEB_BUILD_HOST_OS))
 +IPV6 = --enable-ipv6
 +EXCL_MIB_MODULES += mibII
 +else
 +MIB_MODULES += host
 +endif
 +
- DEB_CFLAGS_MAINT_APPEND=-DNETSNMP_USE_INLINE
- 
 +%:
- 	dh --with python-central $@
++	dh $@ --with autotools-dev,autoreconf
 +
- .PHONY: override_dh_auto_configure
 +override_dh_auto_configure:
- 	ln -f -s /usr/share/misc/config.guess .
- 	ln -f -s /usr/share/misc/config.sub .
- 	libtoolize --install --copy
- 	aclocal
- 	autoheader
- 	autoconf
 +	dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \
 +	  --with-persistent-directory=/var/lib/snmp \
 +	  --enable-ucd-snmp-compatibility \
- 	  --enable-shared $(shell dpkg-buildflags --export=configure) \
++	  --enable-shared --with-cflags="$(CFLAGS) -DNETSNMP_USE_INLINE" \
++	  --with-ldflags="$(LDFLAGS)" \
 +	  --with-perl-modules="INSTALLDIRS=vendor" --enable-as-needed \
 +	  $(IPV6) --with-logfile=none \
 +	  --without-rpm --with-libwrap --with-openssl \
 +	  --without-dmalloc --without-efence --without-rsaref \
 +	  --with-sys-contact="root" --with-sys-location="Unknown" \
 +	  --with-mib-modules="$(MIB_MODULES)" \
 +	  --with-out-mib-modules="$(EXCL_MIB_MODULES)" \
 +	  --enable-mfd-rewrites \
 +	  --with-mnttab=/etc/mtab \
- 	  --with-mibdirs="\$$HOME/.snmp/mibs:/usr/share/mibs/site:/usr/share/snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp" \
++	  --with-mibdirs="\$$HOME/.snmp/mibs:$(MIBS_DIR):$(OLD_MIBS_DIR)" \
++	  --with-mysql \
 +	  --with-defaults
++# --with-python-modules=""  # don't specify it, since dh_python2 cannot handle it.
++# --with-dnssec-local-validation  # not enabled since libval doesn't exist in Debian yet
 +
- .PHONY: override_dh_clean
 +override_dh_clean:
 +	dh_clean
- 	rm -rf `find . -name .libs`
- 	rm -rf `find . -name .svn`
- 	find . -name *\.py[co] -exec rm {} \;
- 	find debian -name python-*-stamp-* -exec rm {} \;
- 	rm -rf python/build
- 	rm -rf python/netsnmp_python.egg-info
- 
- .PHONY: override_dh_auto_build
- override_dh_auto_build:
- 	dh_auto_build -- LD_RUN_PATH=
- 
- .PHONY: override_dh_auto_install
- override_dh_auto_install: $(PYVERS:%=debian/python-build-stamp-%)
- 	dh_auto_install -- INSTALL_PREFIX=$(CURDIR)/debian/tmp DESTDIR=$(CURDIR)/debian/tmp
- 	# Install the "broke" headers
- 	cp agent/mibgroup/struct.h debian/tmp/usr/include/net-snmp/agent
- 	cp agent/mibgroup/util_funcs.h debian/tmp/usr/include/net-snmp
- 	cp agent/mibgroup/mibincl.h debian/tmp/usr/include/net-snmp/library
- 	cp agent/mibgroup/header_complex.h debian/tmp/usr/include/net-snmp/agent
- 	# Remove the snmpcheck program since we don't support it (yet).
- 	rm debian/tmp/usr/bin/snmpcheck
- 	# Copy the .conf files.
- 	mkdir -p debian/tmp/etc/snmp
- 	cp EXAMPLE.conf debian/tmp/etc/snmp/snmpd.conf
- 	cp EXAMPLE-trap.conf debian/tmp/etc/snmp/snmptrapd.conf
- 	cp debian/snmp.conf debian/tmp/etc/snmp/snmp.conf
- 	mv debian/tmp/usr/share/snmp/mib2c*.conf debian/tmp/etc/snmp
- 	dh_installdocs -plibsnmp-base mibs/README.mibs
- 	# Perform other man pages fixups.
- 	bash ./debian/fixman
++	rm -rf `find . -name .libs` \
++	       python/build         \
++	       python/netsnmp_python.egg-info
 +
- .PHONY: override_dh_auto_test
- dh_auto_test:
- 
- .PHONY: override_dh_makeshlibs
- override_dh_makeshlibs:
- 	dh_makeshlibs -plibsnmp$(LIB_VERSION) -V"libsnmp$(LIB_VERSION) (>= $(COMPAT_VERSION))"
- 
- .PHONY: override_dh_strip
 +override_dh_strip:
 +	dh_strip -plibsnmp$(LIB_VERSION) --dbg-package=libsnmp$(LIB_VERSION)-dbg
 +	dh_strip
 +
- .PHONY: override_dh_install
- override_dh_install: $(PYVERS:%=debian/python-install-stamp-%)
- 	dh_installexamples -plibsnmp-perl $(shell ls -d perl/SNMP/examples/* | grep -v SCCS)
++override_dh_makeshlibs:
++	dh_makeshlibs -plibsnmp$(LIB_VERSION) -V"libsnmp$(LIB_VERSION) (>= $(COMPAT_VERSION))"
++
++override_dh_install:
++	cd python; python setup.py build --basedir=$(CURDIR) ; \
++		   python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb --basedir=$(CURDIR) ; \
++		   find $(CURDIR) -name *.pyc -delete
++	install $(CURDIR)/EXAMPLE.conf $(CURDIR)/debian/snmpd/etc/snmp/snmpd.conf
 +	dh_install
 +
- .PHONY: override_dh_installdocs
 +override_dh_installdocs:
- 	dh_installdocs
- 	rm -rf debian/libsnmp-dev/usr/share/doc/libsnmp-dev
- 	rm -rf debian/libsnmp$(LIB_VERSION)-dbg/usr/share/doc/libsnmp$(LIB_VERSION)-dbg
- 	rm -rf debian/libsnmp-perl/usr/share/doc/libsnmp-perl
- 	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp-dev/usr/share/doc/libsnmp-dev
- 	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp$(LIB_VERSION)-dbg/usr/share/doc/libsnmp$(LIB_VERSION)-dbg
- 	ln -sf libsnmp$(LIB_VERSION) debian/libsnmp-perl/usr/share/doc/libsnmp-perl
++	dh_installdocs --link-doc=libsnmp$(LIB_VERSION) \
++		       -plibsnmp-dev \
++		       -plibsnmp$(LIB_VERSION)-dbg \
++		       -ppython-netsnmp \
++		       -plibsnmp-perl \
++		       -psnmpd \
++		       -psnmp
++	dh_installdocs  -plibsnmp-perl -ptkmib -plibsnmp-base
++	# dh_installdocs has a bug when --link-doc is called it don't install copyright file to referenced package
++	# so specify to copy it
++	install -d $(CURDIR)/debian/libsnmp$(LIB_VERSION)/usr/share/doc/libsnmp$(LIB_VERSION)/
++	install -m644 debian/copyright $(CURDIR)/debian/libsnmp$(LIB_VERSION)/usr/share/doc/libsnmp$(LIB_VERSION)/
 +
- .PHONY: override_dh_fixperms
 +override_dh_fixperms:
 +	dh_fixperms
++	chmod -x debian/libsnmp-dev/etc/snmp/*.conf
 +	chmod 600 debian/snmpd/etc/snmp/snmp*d.conf
 +
- debian/python-build-stamp-%:
- 	# Build python modules manually as the net-snmp Makefile is too limited.
- 	cd python; python$* setup.py build --basedir=$(CURDIR)
- 	touch $@
- 
- debian/python-install-stamp-%:
- 	# Build python modules manually as the net-snmp Makefile is too limited.
- 	cd python; python$* setup.py install --root $(CURDIR)/debian/tmp $(py_setup_install_args)
- 	mv debian/tmp/usr/lib/python$*/$(call py_sitename, $*)/netsnmp_python-$(PYTHON_VERSION).egg-info \
- 	   debian/tmp/usr/lib/python$*/$(call py_sitename, $*)/netsnmp_python.egg-info
- 	touch $@
++override_dh_auto_test:
++	# prevent test since it fails with network configuration under pbuilder/etc.
++	true
 +
 +get-orig-source:
 +	@uscan --download-version $(UPSTREAM_VERSION) --destdir /tmp --force-download --no-symlink
- 	@tar xfz /tmp/net-snmp-$(UPSTREAM_VERSION).tar.gz -C /tmp
++	@tar xf /tmp/net-snmp-$(UPSTREAM_VERSION).tar.gz -C /tmp
 +	@rm -rf /tmp/net-snmp-$(UPSTREAM_VERSION)/doc
 +	@cd /tmp/net-snmp-$(UPSTREAM_VERSION)/mibs; \
- 	cat rfclist ianalist | while read rfc mibs; do rm -f `echo $$mibs | sed 's/:/.txt /g' | sed 's/$$/.txt/'`; done
++	 grep ^iana ianalist | while read iana mibs; do rm -f `echo $$mibs | sed -e s/$$/.txt/`; done; \
++	 cat rfclist | while read rfc mibs; do rm -f `echo $$mibs | sed 's/:/.txt /g' | sed 's/$$/.txt/'`; done
 +	@rm -f /tmp/net-snmp-$(UPSTREAM_VERSION)/mibs/RFC-1215.txt
- 	@cd /tmp; tar czf net-snmp_$(COMPAT_VERSION).orig.tar.gz net-snmp-$(UPSTREAM_VERSION)
++	@cd /tmp; tar cJf net-snmp_$(COMPAT_VERSION).orig.tar.xz net-snmp-$(UPSTREAM_VERSION)
 +	@rm -rf /tmp/net-snmp-$(UPSTREAM_VERSION)
diff --combined debian/snmp.conf
index e8ca08e,0000000..95a6e6f
mode 100644,000000..100644
--- a/debian/snmp.conf
+++ b/debian/snmp.conf
@@@ -1,5 -1,0 +1,4 @@@
- #
 +# As the snmp packages come without MIB files due to license reasons, loading
 +# of MIBs is disabled by default. If you added the MIBs you can reenable
- # loaging them by commenting out the following line.
++# loading them by commenting out the following line.
 +mibs :
diff --combined debian/snmp.install
index 9085ef4,0000000..17352b8
mode 100644,000000..100644
--- a/debian/snmp.install
+++ b/debian/snmp.install
@@@ -1,9 -1,0 +1,6 @@@
- debian/tmp/usr/bin/snmp*
- debian/tmp/usr/bin/encode*
- debian/tmp/usr/bin/fixproc
- debian/tmp/usr/bin/traptoemail
- debian/tmp/usr/share/man/man1/snmp*
- debian/tmp/usr/share/man/man1/encode*
- debian/tmp/usr/share/man/man1/fixproc.1
- debian/tmp/usr/share/man/man1/traptoemail.1
- debian/tmp/usr/share/snmp/snmpconf-data/snmp-data
++debian/snmp.conf etc/snmp/
++usr/bin/snmp*
++usr/bin/encode*
++usr/bin/fixproc
++usr/bin/traptoemail
++usr/share/snmp/snmpconf-data/snmp-data
diff --combined debian/snmp.manpages
index 0000000,0000000..0ab3306
new file mode 100644
--- /dev/null
+++ b/debian/snmp.manpages
@@@ -1,0 -1,0 +1,4 @@@
++man/snmp*.1
++man/encode*.1
++man/fixproc.1
++man/traptoemail.1
diff --combined debian/snmpd.default
index 14f2b86,0000000..d67821b
mode 100644,000000..100644
--- a/debian/snmpd.default
+++ b/debian/snmpd.default
@@@ -1,22 -1,0 +1,22 @@@
 +# This file controls the activity of snmpd and snmptrapd
 +
 +# Don't load any MIBs by default.
 +# You might comment this lines once you have the MIBs downloaded.
 +export MIBS=
 +
 +# snmpd control (yes means start daemon).
 +SNMPDRUN=yes
 +
 +# snmpd options (use syslog, close stdin/out/err).
- SNMPDOPTS='-Lsd -Lf /dev/null -u snmp -g snmp -I -smux -p /var/run/snmpd.pid'
++SNMPDOPTS='-Lsd -Lf /dev/null -u snmp -g snmp -I -smux,mteTrigger,mteTriggerConf -p /var/run/snmpd.pid'
 +
 +# snmptrapd control (yes means start daemon).  As of net-snmp version
 +# 5.0, master agentx support must be enabled in snmpd before snmptrapd
 +# can be run.  See snmpd.conf(5) for how to do this.
 +TRAPDRUN=no
 +
 +# snmptrapd options (use syslog).
 +TRAPDOPTS='-Lsd -p /var/run/snmptrapd.pid'
 +
 +# create symlink on Debian legacy location to official RFC path
 +SNMPDCOMPAT=yes
diff --combined debian/snmpd.dirs
index 14ce423,0000000..62c8242
mode 100644,000000..100644
--- a/debian/snmpd.dirs
+++ b/debian/snmpd.dirs
@@@ -1,2 -1,0 +1,2 @@@
- usr/share/lintian/overrides
- var/agentx
++etc/snmp
++var/run/agentx
diff --combined debian/snmpd.init
index 92e54bb,0000000..e2107cf
mode 100644,000000..100644
--- a/debian/snmpd.init
+++ b/debian/snmpd.init
@@@ -1,106 -1,0 +1,111 @@@
 +#! /bin/sh -e
 +### BEGIN INIT INFO
 +# Provides:           snmpd snmptrapd
 +# Required-Start:     $network $remote_fs $syslog
 +# Required-Stop:      $network $remote_fs $syslog
 +# Default-Start:      2 3 4 5
 +# Default-Stop:       0 1 6
 +# Short-Description:  SNMP agents
 +# Description:        NET SNMP (Simple Network Management Protocol) Agents
 +### END INIT INFO
 +#
 +# Author:    Jochen Friedrich <jochen at scram.de>
 +#
 +set -e
 +
 +. /lib/lsb/init-functions
 +
 +export PATH=/sbin:/usr/sbin:/bin:/usr/bin
 +
 +test -x /usr/sbin/snmpd || exit 0
 +test -x /usr/sbin/snmptrapd || exit 0
 +
 +# Defaults
- export MIBDIRS=/usr/share/mibs/site:/usr/share/snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp
- SNMPDRUN=yes
- SNMPDOPTS='-Lsd -Lf /dev/null -p /var/run/snmpd.pid'
++OLD_MIBS_DIR="/usr/share/mibs/site:/usr/share/snmp/mibs:/usr/share/mibs/iana:/usr/share/mibs/ietf:/usr/share/mibs/netsnmp"
++MIBS_DIR="/usr/share/snmp/mibs:/usr/share/snmp/mibs/iana:/usr/share/snmp/mibs/ietf"
++export MIBDIRS="$MIBS_DIR:$OLD_MIBS_DIR"
++
++SNMP_PID="/run/snmpd.pid"
++TRAPD_PID="/run/snmptrapd.pid"
++SNMPDRUN="yes"
++SNMPDOPTS="-Lsd -Lf /dev/null -p $SNMP_PID"
 +TRAPDRUN=no
- TRAPDOPTS='-Lsd -p /var/run/snmptrapd.pid'
++TRAPDOPTS="-Lsd -p $TRAPD_PID"
 +
 +# Reads config file (will override defaults above)
 +[ -r /etc/default/snmpd ] && . /etc/default/snmpd
 +
 +# Cd to / before starting any daemons.
 +cd /
 +
 +# Create compatibility link to old AgentX socket location
 +if [ "$SNMPDCOMPAT" = "yes" ] && [ "$1" != status ]; then
 +  ln -sf /var/agentx/master /var/run/agentx
 +fi
 +
 +case "$1" in
 +  start)
 +    echo -n "Starting network management services:"
 +    if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then
 +	start-stop-daemon --quiet --start --oknodo --exec /usr/sbin/snmpd \
 +	    -- $SNMPDOPTS
 +	echo -n " snmpd"
 +    fi
 +    if [ "$TRAPDRUN" = "yes" -a -f /etc/snmp/snmptrapd.conf ]; then
 +	start-stop-daemon --quiet --start --oknodo --exec /usr/sbin/snmptrapd \
 +	    -- $TRAPDOPTS
 +	echo -n " snmptrapd"
 +    fi
 +    echo "."
 +    ;;
 +  stop)
 +    echo -n "Stopping network management services:"
-     start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmpd
++    start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmpd && [ ! -f $SNMP_PID ] || rm $SNMP_PID
 +    echo -n " snmpd"
-     start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmptrapd
++    start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmptrapd && [ ! -f $TRAPD_PID ] || rm $TRAPD_PID
 +    echo -n " snmptrapd"
 +    echo "."
 +    ;;
 +  restart)
 +    echo -n "Restarting network management services:"
-     start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmpd
-     start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmptrapd
++    start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmpd  && [ ! -f $SNMP_PID ] || rm $SNMP_PID
++    start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/snmptrapd  && [ ! -f $TRAPD_PID ] || rm $TRAPD_PID
 +    # Allow the daemons time to exit completely.
 +    sleep 2
 +    if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then
 +	start-stop-daemon --quiet --start --exec /usr/sbin/snmpd -- $SNMPDOPTS
 +	echo -n " snmpd"
 +    fi
 +    if [ "$TRAPDRUN" = "yes" -a -f /etc/snmp/snmptrapd.conf ]; then
 +	# Allow snmpd time to start up.
 +	sleep 1
 +	start-stop-daemon --quiet --start --exec /usr/sbin/snmptrapd -- $TRAPDOPTS
 +	echo -n " snmptrapd"
 +    fi
 +    echo "."
 +    ;;
 +  reload|force-reload)
 +    echo -n "Reloading network management services:"
 +    if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then
 +        start-stop-daemon --quiet --stop --signal 1 \
 +	    --pidfile /var/run/snmpd.pid --exec /usr/sbin/snmpd
 +	echo -n " snmpd"
 +    fi
 +    echo "."
 +    ;;
 +  status)
 +    status=0
 +    if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then
 +    	status_of_proc /usr/sbin/snmpd snmpd || status=$?
 +    fi
 +    if [ "$TRAPDRUN" = "yes" -a -f /etc/snmp/snmptrapd.conf ]; then
 +    	status_of_proc /usr/sbin/snmptrapd snmptrapd || status=$?
 +    fi
 +    exit $status
 +    ;;
 +  *)
 +    echo "Usage: /etc/init.d/snmpd {start|stop|restart|reload|force-reload|status}"
 +    exit 1
 +esac
 +
 +exit 0
diff --combined debian/snmpd.install
index bbbc21f,0000000..0080a68
mode 100644,000000..100644
--- a/debian/snmpd.install
+++ b/debian/snmpd.install
@@@ -1,11 -1,0 +1,6 @@@
- debian/tmp/usr/sbin/*
- debian/tmp/usr/share/man/man5/snmpd.conf.5snmp
- debian/tmp/usr/share/man/man5/snmptrapd.conf.5snmp
- debian/tmp/usr/share/man/man8/snmpd.8
- debian/tmp/usr/share/man/man8/snmptrapd.8
- debian/tmp/usr/share/snmp/snmpconf-data/snmpd-data
- debian/tmp/usr/share/snmp/snmpconf-data/snmptrapd-data
- debian/tmp/usr/share/snmp/snmp_perl.pl
- debian/tmp/usr/share/snmp/snmp_perl_trapd.pl
- debian/tmp/etc/snmp/snmpd.conf
- debian/tmp/etc/snmp/snmptrapd.conf
++debian/snmptrapd.conf etc/snmp/
++usr/sbin/*
++usr/share/snmp/snmpconf-data/snmpd-data
++usr/share/snmp/snmpconf-data/snmptrapd-data
++usr/share/snmp/snmp_perl.pl
++usr/share/snmp/snmp_perl_trapd.pl
diff --combined debian/snmpd.lintian-overrides
index 57ba01f,0000000..0784d73
mode 100644,000000..100644
--- a/debian/snmpd.lintian-overrides
+++ b/debian/snmpd.lintian-overrides
@@@ -1,3 -1,0 +1,2 @@@
 +snmpd: non-standard-file-perm etc/snmp/snmpd.conf 0600 != 0644
 +snmpd: non-standard-file-perm etc/snmp/snmptrapd.conf 0600 != 0644
- snmpd: non-standard-dir-in-var var/agentx/
diff --combined debian/snmpd.manpages
index 0000000,0000000..ec2dace
new file mode 100644
--- /dev/null
+++ b/debian/snmpd.manpages
@@@ -1,0 -1,0 +1,5 @@@
++man/snmpd.conf.5
++man/snmptrapd.conf.5
++man/snmpd.8
++man/snmptrapd.8
++
diff --combined debian/snmptrapd.conf
index 0000000,0000000..51aeef7
new file mode 100644
--- /dev/null
+++ b/debian/snmptrapd.conf
@@@ -1,0 -1,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 --combined debian/tkmib.install
index af20861,0000000..c3a11bb
mode 100644,000000..100644
--- a/debian/tkmib.install
+++ b/debian/tkmib.install
@@@ -1,2 -1,0 +1,2 @@@
- debian/tmp/usr/bin/tkmib
- debian/tmp/usr/share/man/man1/tkmib.1
++usr/bin/tkmib
++usr/share/man/man1/tkmib.1

-- 
Git repository for pkg-net-snmp



More information about the Pkg-net-snmp-commits mailing list