[Pkg-net-snmp-commits] [pkg-net-snmp] 02/06: Merge tag 'upstream/5.7.3+dfsg'
Hideki Yamane
henrich at moszumanska.debian.org
Thu May 28 13:52:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
henrich pushed a commit to branch master
in repository pkg-net-snmp.
commit 3c2433a9ebc2f1219c0d45f3c3330a3e3b8ad0bc
Merge: b271500 ac870b5
Author: Hideki Yamane <henrich at debian.org>
Date: Tue Apr 28 20:30:05 2015 +0900
Merge tag 'upstream/5.7.3+dfsg'
Upstream version 5.7.3+dfsg
.gitignore | 2 +
CHANGES | 128 +-
COPYING | 35 +-
ChangeLog | 3471 +++++++++++++++++++-
FAQ | 2 +-
Makefile.in | 6 +-
Makefile.top | 5 +-
NEWS | 20 +-
README | 5 +-
README.win32 | 5 +-
acconfig.h | 9 -
agent/Makefile.depend | 810 +----
agent/agent_index.c | 28 +-
agent/agent_registry.c | 18 +-
agent/agent_trap.c | 4 +-
agent/auto_nlist.c | 1 +
agent/helpers/Makefile.depend | 101 +-
agent/helpers/instance.c | 2 +-
agent/helpers/old_api.c | 17 +-
agent/helpers/table_data.c | 3 +-
agent/helpers/table_dataset.c | 13 +-
agent/helpers/table_tdata.c | 3 +-
agent/kernel.c | 38 +-
agent/mibgroup/Makefile.depend | 525 ++-
agent/mibgroup/agent/extend.c | 52 +-
agent/mibgroup/agent/nsCache.c | 3 +-
agent/mibgroup/agent/nsTransactionTable.c | 1 +
agent/mibgroup/agentx/agentx_config.c | 4 +-
agent/mibgroup/agentx/master_admin.c | 2 +-
agent/mibgroup/agentx/subagent.c | 2 +-
agent/mibgroup/disman/event/mteTrigger.c | 15 +-
agent/mibgroup/disman/expr/expExpressionConf.c | 2 +-
agent/mibgroup/disman/expr/expValue.c | 6 +-
.../disman/expression/expExpressionTable.c | 6 +-
agent/mibgroup/disman/expression/expObjectTable.c | 15 +-
agent/mibgroup/disman/mteObjectsTable.c | 3 +-
agent/mibgroup/disman/mteTriggerDeltaTable.c | 4 +-
agent/mibgroup/disman/mteTriggerExistenceTable.c | 24 +-
agent/mibgroup/disman/mteTriggerTable.c | 48 +-
agent/mibgroup/disman/mteTriggerThresholdTable.c | 42 +-
agent/mibgroup/disman/nslookup/lookupCtlTable.c | 2 +-
agent/mibgroup/disman/ping/pingCtlTable.c | 35 +-
.../disman/traceroute/traceRouteCtlTable.c | 40 +-
.../etherlike-mib/data_access/dot3stats_linux.c | 10 +-
.../dot3StatsTable/dot3StatsTable_data_access.c | 3 +-
agent/mibgroup/examples/delayed_instance.c | 3 +-
agent/mibgroup/examples/example.c | 12 +-
agent/mibgroup/examples/netSnmpHostsTable.c | 12 +-
agent/mibgroup/hardware/cpu/cpu_kstat.c | 2 +
agent/mibgroup/hardware/cpu/cpu_linux.c | 24 +-
agent/mibgroup/hardware/cpu/cpu_mach.c | 1 +
agent/mibgroup/hardware/cpu/cpu_perfstat.c | 2 +-
agent/mibgroup/hardware/cpu/cpu_pstat.c | 100 +-
agent/mibgroup/hardware/cpu/cpu_sysctl.c | 117 +-
agent/mibgroup/hardware/fsys/fsys_getfsstats.c | 27 +-
agent/mibgroup/hardware/fsys/fsys_mntctl.c | 9 +-
agent/mibgroup/hardware/fsys/fsys_mntent.c | 8 +-
agent/mibgroup/hardware/fsys/mnttypes.h | 12 +
agent/mibgroup/hardware/fsys/mounts.h | 6 +
agent/mibgroup/hardware/memory.h | 2 +-
agent/mibgroup/hardware/memory/hw_mem.c | 9 +-
agent/mibgroup/hardware/memory/memory_darwin.c | 15 +-
agent/mibgroup/hardware/memory/memory_freebsd.c | 54 +-
agent/mibgroup/hardware/memory/memory_netbsd.c | 16 +-
agent/mibgroup/host/data_access/swinst_apt.c | 9 +-
agent/mibgroup/host/data_access/swinst_darwin.c | 7 +-
agent/mibgroup/host/data_access/swinst_pkginfo.c | 142 +-
agent/mibgroup/host/data_access/swrun_cygwin.c | 18 +-
agent/mibgroup/host/data_access/swrun_darwin.c | 15 +-
agent/mibgroup/host/data_access/swrun_kinfo.c | 87 +-
agent/mibgroup/host/data_access/swrun_kvm_proc.c | 18 +-
.../host/data_access/swrun_procfs_status.c | 70 +-
agent/mibgroup/host/data_access/swrun_procinfo.c | 6 +-
agent/mibgroup/host/hr_disk.c | 6 +
agent/mibgroup/host/hr_partition.c | 4 +
agent/mibgroup/host/hr_print.c | 5 +-
agent/mibgroup/host/hr_swinst.c | 7 +-
agent/mibgroup/host/hr_swrun.c | 33 +
agent/mibgroup/host/hr_system.c | 28 +-
agent/mibgroup/if-mib/data_access/interface.c | 2 +
.../mibgroup/if-mib/data_access/interface_linux.c | 44 +-
.../mibgroup/if-mib/data_access/interface_sysctl.c | 5 +-
.../mibgroup/if-mib/ifTable/ifTable_data_access.c | 5 -
.../mibgroup/if-mib/ifXTable/ifXTable_interface.c | 2 +-
agent/mibgroup/ip-forward-mib/data_access/route.h | 4 +
.../ip-forward-mib/data_access/route_ioctl.c | 36 +-
.../ip-forward-mib/data_access/route_linux.c | 1 -
.../ip-forward-mib/data_access/route_solaris.c | 258 ++
.../ip-forward-mib/data_access/route_sysctl.c | 436 +++
.../ip-forward-mib/data_access/route_sysctl.h | 9 +
.../inetCidrRouteTable_interface.c | 2 +
.../ipCidrRouteTable/ipCidrRouteTable.c | 12 +-
.../ipCidrRouteTable/ipCidrRouteTable.h | 12 +-
.../ipCidrRouteTable_data_access.c | 5 +-
.../ipCidrRouteTable/ipCidrRouteTable_interface.c | 6 +-
agent/mibgroup/ip-mib/data_access/arp.h | 2 +
agent/mibgroup/ip-mib/data_access/arp_sysctl.c | 330 ++
agent/mibgroup/ip-mib/data_access/defaultrouter.h | 2 +
.../ip-mib/data_access/defaultrouter_linux.c | 24 +-
.../ip-mib/data_access/defaultrouter_sysctl.c | 230 ++
agent/mibgroup/ip-mib/data_access/ipaddress.h | 2 +
.../mibgroup/ip-mib/data_access/ipaddress_common.c | 63 +-
.../mibgroup/ip-mib/data_access/ipaddress_ioctl.c | 2 +-
.../mibgroup/ip-mib/data_access/ipaddress_sysctl.c | 272 ++
agent/mibgroup/ip-mib/data_access/scalars_common.h | 3 +-
agent/mibgroup/ip-mib/data_access/scalars_linux.c | 146 +
agent/mibgroup/ip-mib/data_access/scalars_sysctl.c | 291 ++
agent/mibgroup/ip-mib/data_access/systemstats.h | 2 +
.../ip-mib/data_access/systemstats_common.c | 42 +-
.../ip-mib/data_access/systemstats_linux.c | 23 +-
.../ip-mib/data_access/systemstats_sysctl.c | 791 +++++
.../inetNetToMediaTable_data_access.c | 2 +-
.../ipSystemStatsTable_data_access.c | 1 +
agent/mibgroup/ip-mib/ip_scalars.c | 297 +-
agent/mibgroup/kernel_sunos5.c | 24 +-
agent/mibgroup/kernel_sunos5.h | 2 +
agent/mibgroup/mibII.h | 20 +-
agent/mibgroup/mibII/at.c | 3 +-
agent/mibgroup/mibII/icmp.c | 477 ++-
agent/mibgroup/mibII/icmp.h | 17 +-
agent/mibgroup/mibII/interfaces.c | 4 +-
agent/mibgroup/mibII/ip.c | 2 +-
agent/mibgroup/mibII/ipCidrRouteTable.c | 30 +-
agent/mibgroup/mibII/kernel_linux.c | 8 +-
agent/mibgroup/mibII/kernel_linux.h | 156 +-
.../mibII/{kernel_linux.h => kernel_mib.h} | 25 +-
agent/mibgroup/mibII/kernel_netbsd.c | 119 +-
agent/mibgroup/mibII/kernel_netbsd.h | 85 +-
agent/mibgroup/mibII/kernel_sysctl.c | 175 +
agent/mibgroup/mibII/kernel_sysctl.h | 19 +
agent/mibgroup/mibII/mibII_common.h | 5 +-
agent/mibgroup/mibII/mta_sendmail.c | 14 +-
agent/mibgroup/mibII/snmp_mib.c | 6 +-
agent/mibgroup/mibII/snmp_mib_5_5.c | 6 +-
agent/mibgroup/mibII/tcpTable.c | 92 +-
agent/mibgroup/mibII/udpTable.c | 1 +
agent/mibgroup/mibII/updates.c | 26 +-
agent/mibgroup/mibII/var_route.c | 1 +
.../notification/snmpNotifyFilterProfileTable.c | 4 +-
agent/mibgroup/notification/snmpNotifyTable.c | 16 +-
.../rmon-mib/data_access/etherstats_linux.c | 6 +-
.../etherStatsTable/etherStatsTable_data_access.c | 50 +-
agent/mibgroup/sctp-mib/sctpScalars_linux.c | 41 +-
agent/mibgroup/sctp-mib/sctpTables_linux.c | 8 +-
.../snmpNotifyFilterTable_interface.c | 2 +-
.../usmDHUserKeyTable/usmDHUserKeyTable_data_set.c | 10 +-
agent/mibgroup/snmpv3/usmUser.c | 4 +-
agent/mibgroup/target/snmpTargetAddrEntry.c | 255 +-
agent/mibgroup/target/snmpTargetAddrEntry.h | 11 +-
agent/mibgroup/target/target.c | 17 +-
agent/mibgroup/tcp-mib/data_access/tcpConn.h | 4 +-
agent/mibgroup/tcp-mib/data_access/tcpConn_linux.c | 6 +-
agent/mibgroup/tcp-mib/data_access/tcpConn_unsup.c | 60 +
agent/mibgroup/testhandler.c | 3 +-
agent/mibgroup/ucd-snmp/disk.c | 2 -
agent/mibgroup/ucd-snmp/disk_hw.c | 5 +-
agent/mibgroup/ucd-snmp/diskio.c | 226 +-
agent/mibgroup/ucd-snmp/dlmod.c | 170 +-
agent/mibgroup/ucd-snmp/dlmod.h | 2 +-
agent/mibgroup/ucd-snmp/extensible.c | 8 +-
agent/mibgroup/ucd-snmp/lmsensorsMib.c | 4 +-
agent/mibgroup/ucd-snmp/loadave.c | 15 +-
agent/mibgroup/ucd-snmp/logmatch.c | 34 +-
agent/mibgroup/ucd-snmp/pass.c | 2 +-
agent/mibgroup/ucd-snmp/pass_common.c | 12 +-
agent/mibgroup/ucd-snmp/pass_persist.c | 13 +
agent/mibgroup/ucd-snmp/vmstat.c | 6 +-
agent/mibgroup/ucd-snmp/vmstat.h | 1 +
agent/mibgroup/udp-mib/data_access/udp_endpoint.h | 4 +-
.../udp-mib/data_access/udp_endpoint_unsup.c | 65 +
agent/mibgroup/util_funcs.c | 2 +-
agent/mibgroup/util_funcs/get_pid_from_inode.h | 4 +-
agent/mibgroup/utilities/iquery.c | 8 +-
agent/mibgroup/utilities/override.c | 6 +-
agent/mibgroup/winExtDLL.c | 275 +-
agent/snmp_agent.c | 3 +
agent/snmp_vars.c | 1 -
agent/snmpd.c | 9 +
apps/Makefile.depend | 312 +-
apps/agentxtrap.c | 17 +-
apps/snmpdf.c | 123 +-
apps/snmpnetstat/Makefile.depend | 186 +-
apps/snmpnetstat/Makefile.in | 8 +-
apps/snmpnetstat/if.c | 81 +-
apps/snmpnetstat/inet.c | 210 +-
apps/snmpnetstat/inet6.c | 140 +-
apps/snmpnetstat/inetx.c | 584 ++++
apps/snmpnetstat/main.c | 72 +-
apps/snmpnetstat/netstat.h | 15 +-
apps/snmpnetstat/route.c | 126 +-
apps/snmpnetstat/routex.c | 558 ++++
apps/snmpstatus.c | 4 +
apps/snmptls.c | 4 +-
apps/snmptranslate.c | 4 +-
apps/snmptrapd.c | 11 +-
apps/snmptrapd_sql.c | 14 +-
configure | 1926 +++++++----
configure.ac | 3 +-
configure.d/config_modules_agent | 14 +-
configure.d/config_modules_lib | 16 +-
configure.d/config_os_headers | 77 +-
configure.d/config_os_libs2 | 49 +-
configure.d/config_os_misc4 | 97 +
configure.d/config_os_progs | 9 +-
configure.d/config_os_struct_members | 85 +-
dist/Makefile | 2 +-
dist/generation-scripts/gen-variables | 10 -
dist/makerelease.xml | 197 +-
dist/net-snmp.spec | 21 +-
dist/release | 3 -
dist/run-autoconf | 2 +-
include/net-snmp/agent/agent_registry.h | 25 +-
include/net-snmp/agent/old_api.h | 2 +-
include/net-snmp/agent/snmp_vars.h | 2 +-
include/net-snmp/data_access/ip_scalars.h | 5 +
include/net-snmp/data_access/ipaddress.h | 2 +
include/net-snmp/library/large_fd_set.h | 12 +-
include/net-snmp/library/read_config.h | 5 +-
include/net-snmp/library/snmpUDPBaseDomain.h | 16 +-
include/net-snmp/library/snmpUDPDomain.h | 3 +-
include/net-snmp/library/snmpUDPIPv4BaseDomain.h | 3 +-
include/net-snmp/library/system.h | 3 +-
include/net-snmp/library/tools.h | 21 +-
include/net-snmp/net-snmp-config.h.in | 57 +-
include/net-snmp/system/darwin10.h | 12 +-
include/net-snmp/system/darwin11.h | 20 +-
include/net-snmp/system/darwin12.h | 20 +-
include/net-snmp/system/{darwin10.h => darwin13.h} | 23 +-
include/net-snmp/system/darwin9.h | 11 -
include/net-snmp/system/freebsd10.h | 4 +-
include/net-snmp/system/freebsd11.h | 3 +
include/net-snmp/system/freebsd12.h | 3 +
include/net-snmp/system/freebsd9.h | 2 +-
include/net-snmp/types.h | 4 +-
local/Makefile.in | 4 +-
local/gittools/shell-functions | 12 +
local/mib2c.iterate_access.conf | 3 +-
local/{snmpconf => snmpconf.in} | 8 +-
m4/ac_add_search_path.m4 | 2 +-
man/Makefile.in | 30 +-
man/netsnmp_config_api.3.def | 2 +-
man/netsnmp_mib_api.3.def | 3 +-
man/netsnmp_pdu_api.3.def | 3 +-
man/netsnmp_sess_api.3.def | 3 +-
man/netsnmp_session_api.3.def | 3 +-
man/netsnmp_varbind_api.3.def | 6 +-
man/snmp_async_send.3 | 1 -
man/snmp_config.5.def | 33 +-
man/snmp_sess_synch_response.3 | 1 -
man/snmp_synch_response.3 | 1 -
man/snmpcmd.1.def | 2 +-
man/snmpd.conf.5.def | 6 +-
man/snmpd.examples.5.def | 2 +-
man/snmpdelta.1.def | 2 +-
man/snmpdf.1.def | 12 +-
man/snmpgetnext.1.def | 2 +-
man/snmpnetstat.1.def | 100 +-
man/snmpstatus.1.def | 2 +-
man/snmptable.1.def | 11 +-
man/snmptest.1.def | 2 +-
man/snmptranslate.1.def | 5 +-
man/snmptrapd.8.def | 31 +-
man/snmptrapd.conf.5.def | 70 +-
man/snmpwalk.1.def | 2 +-
mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt | 166 +
mibs/IANA-LANGUAGE-MIB.txt | 126 +
mibs/IANA-RTPROTO-MIB.txt | 95 +
mibs/IANAifType-MIB.txt | 646 ++++
mibs/Makefile.in | 1 +
mibs/RFC-1215.txt | 38 +
mibs/UCD-SNMP-MIB.txt | 22 +-
mibs/ianalist | 6 +-
mibs/makehtml.pl | 26 +-
mibs/miblist.txt | 51 +
mibs/nodemap | 2 +-
mibs/rfclist | 24 +-
net-snmp-config.in | 4 +-
perl/ASN/ASN.pm | 2 +-
perl/AnyData_SNMP/Storage.pm | 2 +-
perl/OID/OID.pm | 2 +-
perl/SNMP/SNMP.pm | 4 +-
perl/SNMP/SNMP.xs | 34 +-
perl/SNMP/t/dump-session.t | 29 +
perl/SNMP/t/snmptest.cmd | 3 -
perl/TrapReceiver/TrapReceiver.pm | 2 +-
perl/TrapReceiver/TrapReceiver.xs | 10 +-
perl/TrapReceiver/const-c.inc | 146 -
perl/TrapReceiver/const-xs.inc | 90 -
perl/agent/Support/Support.pm | 2 +-
perl/agent/agent.pm | 2 +-
perl/agent/default_store/default_store.pm | 2 +-
perl/default_store/default_store.pm | 2 +-
python/netsnmp/client_intf.c | 80 +-
snmplib/Makefile.depend | 522 +--
snmplib/asn1.c | 13 +-
snmplib/container_binary_array.c | 18 +
snmplib/dir_utils.c | 9 +-
snmplib/inet_ntop.c | 2 +-
snmplib/inet_ntop.h | 4 +-
snmplib/inet_pton.c | 2 +-
snmplib/inet_pton.h | 4 +-
snmplib/keytools.c | 23 +-
snmplib/large_fd_set.c | 34 +-
snmplib/lcd_time.c | 6 +
snmplib/md5.c | 2 +-
snmplib/mib.c | 458 +--
snmplib/parse.c | 19 +-
snmplib/read_config.c | 33 +-
snmplib/scapi.c | 10 +-
snmplib/snmp_alarm.c | 4 +-
snmplib/snmp_api.c | 155 +-
snmplib/snmp_client.c | 5 +
snmplib/snmp_parse_args.c | 13 +-
snmplib/snmp_transport.c | 25 +-
snmplib/snmpksm.c | 94 +-
snmplib/snmptsm.c | 10 +-
snmplib/snmpusm.c | 18 +-
snmplib/strlcat.c | 2 +-
snmplib/strtoull.c | 4 +
snmplib/system.c | 43 +-
snmplib/tools.c | 50 +-
snmplib/transports/snmpDTLSUDPDomain.c | 4 +-
snmplib/transports/snmpIPXDomain.c | 4 +-
snmplib/transports/snmpIPv4BaseDomain.c | 2 +-
snmplib/transports/snmpIPv6BaseDomain.c | 91 +-
snmplib/transports/snmpTCPDomain.c | 8 +-
snmplib/transports/snmpTCPIPv6Domain.c | 10 +-
snmplib/transports/snmpTLSTCPDomain.c | 4 +-
snmplib/transports/snmpUDPBaseDomain.c | 207 +-
snmplib/transports/snmpUDPDomain.c | 7 +-
snmplib/transports/snmpUDPIPv4BaseDomain.c | 32 +-
snmplib/transports/snmpUDPIPv6Domain.c | 25 +-
snmplib/transports/snmpUnixDomain.c | 2 +-
snmplib/winservice.c | 2 +
testing/Makefile.in | 2 +-
testing/RUNFULLTESTS | 5 +-
testing/RUNTESTS | 18 +-
testing/failed_tests | 1 -
testing/fulltests/default/Sv3usmconfigbase | 8 +-
.../fulltests/default/T027snmpv3Defaults_simple | 1 +
testing/fulltests/default/T060trapdperl_simple | 6 +-
.../fulltests/default/T065agentextend_sh_simple | 65 +
testing/fulltests/default/T065agentextend_simple | 2 +-
testing/fulltests/default/T066pass_simple | 4 +-
testing/fulltests/default/T067passpersist_simple | 4 +-
testing/fulltests/default/T068execfix_simple | 72 +
testing/fulltests/default/T071com2sec6_simple | 4 +-
testing/fulltests/default/T072com2secunix_simple | 2 +-
testing/fulltests/default/T115agentxperl_simple | 2 +-
testing/fulltests/default/T120proxyget_simple | 2 +-
testing/fulltests/default/T121proxyset_simple | 2 +-
testing/fulltests/default/T122proxysetfail_simple | 2 +-
testing/fulltests/default/T160snmpnetstat_simple | 16 +-
.../fulltests/default/T161snmpTargetAddr_simple | 142 +
.../fulltests/default/T200snmpv2cwalkall_simple | 4 +-
testing/fulltests/support/clib_build | 12 +
testing/fulltests/support/simple_TESTCONF.sh | 4 +
testing/fulltests/support/simple_eval_tools.sh | 49 +-
.../unit-tests/T005table_dataset_cagentlib.c | 4 +
testing/fulltests/unit-tests/T008asn1_clib.c | 152 +-
.../fulltests/unit-tests/T014gethostbyaddr_clib.c | 66 +-
.../fulltests/unit-tests/T016read_config_clib.c | 4 +-
.../T020netsnmp_sprint_realloc_objid_tree_clib.c | 82 +
.../T021binary_array_oid_duplicates_clib.c | 72 +
.../T021netsnmp_sprint_realloc_no_type_clib.c | 51 +
win32/Configure | 337 +-
win32/Makefile-apps.in | 1 -
win32/MgmtApi-winExtDLL.h | 77 -
win32/build.pl | 401 +--
win32/libagent/Makefile.in | 7 +
win32/libagent/libagent.dsp | 4 +
win32/libsnmp_dll/Makefile.in | 1 -
win32/mib_module_includes.h | 3 +
win32/mib_module_inits.h | 3 +
win32/mib_module_shutdown.h | 4 +
win32/net-snmp/net-snmp-config.h | 30 +-
win32/net-snmp/net-snmp-config.h.in | 30 +-
win32/netsnmpmibs/Makefile.in | 7 +
win32/netsnmpmibs/netsnmpmibs.dsp | 4 +
win32/snmpd/Makefile.in | 1 -
win32/snmpnetstat/Makefile.in | 23 +-
win32/snmpnetstat/snmpnetstat.dsp | 10 +-
win32/snmptrapd/Makefile.in | 1 -
win32/transports/snmp_transport_inits.h | 1 +
384 files changed, 17929 insertions(+), 5588 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-net-snmp/pkg-net-snmp.git
More information about the Pkg-net-snmp-commits
mailing list