Note the update is attached. Please comment soon.
Michael J. Slifcak wrote:
Jochen Friedrich wrote:
Hi Mike,
Do you have individual patches which may have been rolled up into net-snmp_5.1.2-5.diff.gz ?
No, not yet. One of my plans is to switch the build system for net-snmp to
cdbs after sarge is out of the door. This will include seperating the
patches.
Jochen, Would like to review these patches with you
1.Remove SO_BSDCOMPAT socket option setting from snmplib/snmpUDPDomain.c and from snmplib/snmpUDPIPv6Domain.c These were useful only in Linux 2.0 kernels ?
According to http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=201853&archive=yes this had been added to get rid of a kernel warning on 2.6 kernels.
Do you know if the option is appropriate for 2.4 kernels ?
Confirmed the warning appears on 2.6. I have test code that calls uname() for kernel version. Suitable patch will be coming soon.
2.Add -lcrypto if defined as part of CRYPTOLIBS configure.in snmplib/Makefile.in
Not sure if that's still needed.
Perhaps for Solaris or AIX, it may be so. When the need is established and broadly useful, we would consider the patch.
3.Move assignment to newline later in function snmplib/snmp_logging.c [NOT DONE]
Old cruft from applying an old logging fix from CVS. This will be cleaned up in the next Debian release.
4.Remove CR character from Windows specific resources net-snmp-5.1.2/snmplib/winservice.rc [NOT DONE] net-snmp-5.1.2/snmplib/winservice.mc [NOT DONE]
Some more cruft.
5.Add perlrealclean rule to top level Makefile Makefile.in
This was needed to make the clean target really clean the build tree.
Suggest to accomplish this from a distclean rule: @(cd perl; make realclean)
This would be nice :-)
Wes, are you up for this ? (It was assigned to you, closed, reopened...)
7.Create Debian specific changes to Makefiles agent/Makefile.in AGENT_RELINK_LIBS, MIBS_RELINK_LIBS agent/helpers/Makefile.in HELPERS_RELINK_LIBS apps/Makefile.in TRAPD_RELINK_LIBS
I think these are too specific to Debian. Comments?
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=199166&archive=yes IMHO, this is wrong and will only increase the complexity of dependencies. This will be removed post sarge.
Ok. We'll pass on that one.
8.Comment out "No MemShared line in /proc/meminfo" in agent/mibgroup/ucd-snmp/memory.c
This fixes annoying warnings on 2.6 kernels. Directly copied from RedHat.
Confirmed. I'll see if I can make that kernel version check generic. Looks like it will be handy down the pike.
9.Various LmSensors changes [NOT DONE]
This is currently pending a resolution.
10. Add C99 macros to format result strings for 64-bit counters agent/mibgroup/mibII/interfaces.c [NOT DONE]
This has been taken from CVS to fix 64bit problems.
11.Patch to ignore interfaces that have no statistics agent/mibgroup/mibII/interfaces.c
This might need some review. There are currently bug reports open about missing interfaces (in particular when using 802.1Q).
We'll not act on this until you report back.
13.Don't log peer password in authentication log messages agent/mibgroup/smux/smux.c
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=195622&archive=yes.
14.Change location of default AgentX socket in agent/mibgroup/agentx/protocol.h "/var/agentx/master" -> "/var/run/agentx"
Debian/FHS specific.
We'll pass as it gives RFC heartburn.
16.Provide interesting sample configuration file EXAMPLE.conf.def
Would be nice. Are these changes suitably licensed (BSD-like) ?
Yes. I'm not sure who is the original author but: debian/copyright only mentions 4 BSD-like licenses. There is no Debian specific add-on or so (which would also be against the Debian policy).
Coders, what do you think about changing the old.old example? The patched one makes comments of the disk, exec, etc. lines, and does some nice touches (imo) on the VACM lines.
23.Seven new MIBs and one existing MIB are installed
Why GNOME-SMI added ? Other MIBs (except LM-SENSORS-MIB) *should* be obtainable from IETF MIB repository. Comments?
See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=196340&archive=yes GNOME-SMI is needed by zebra, quagga and maybe freeradius. So, net-snmp was the best place to add this for Debian.
Ok. I think we'll let you add it for Debian user's benefit.
27. Man page changes, relatively minor man/mib_api.3.def man/snmp_trap_api.3.def man/snmp_config.5.def <--NOT DONE
Some more are pending: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=274431
28. Add "-- core" to clean rule in Makefile.rules
This is not really needed. It's just due to the lazyness of some Debian developers who test their stuff in the build directory and expect a following build to succeed :-)
I'm all over lazy. Thanks for clarifying this.
29. Add Debian build subdirectory [NOT DONE]
This is better kept seperately. I plan to clean up the build system for net-snmp, anyways.
30. Add sample configuration file for trap handler This file acts as an empty file (no configure settings) EXAMPLE-trap.conf
Would be nice. Are these changes suitably licensed (BSD-like) ?
Yes, they are BSD-like licensed. See 16.
Ok. I think it should have a few trap config items, at least commented out. Coders with Trap Awareness Wanted to Cook a sample Trap Handler Config.
Thanks, Jochen
Thank you, Jochen.
Jochen, Would like to review these patches with you from net-snmp_5.1.2-5.diff.gz Search "Debian net-snmp" ...
As of 7:00 PM EST Oct-8-2004, the CVS tree for Net-SNMP
V5-1-patches and main branches reflect the APPLIED changes here.
IF TIME PERMITS relates to items not done due to time running short.
Patches would still be accepted, but may not be integrated in
time for the release (except for showstoppers).
1.APPLIED Wrapped SO_BSDCOMPAT socket option setting from
snmplib/snmpUDPDomain.c and from
snmplib/snmpUDPIPv6Domain.c
with netsnmp_os_prematch('Linux', "2.4")
2.NOT DONE Add -lcrypto if defined as part of CRYPTOLIBS
[-lcrypto is added if EVP_md5 symbol is found]
configure.in
snmplib/Makefile.in
3.NOT DONE Move assignment to newline later in function
snmplib/snmp_logging.c
4.NOT DONE Remove CR character from Windows specific resources
net-snmp-5.1.2/snmplib/winservice.rc
net-snmp-5.1.2/snmplib/winservice.mc
5.IF TIME PERMITS Add perlrealclean rule to top level Makefile
Makefile.in
Suggest to accomplish this
from a distclean rule: @(cd perl; make realclean)
Comments?
6.APPLIED Add WRAPLIBS to several Makefiles
agent/Makefile.in [NOT DONE - The patch point made no sense]
net-snmp-config.in [Changed only NSC_LIBS]
7.NOT DONE Create Debian specific changes to Makefiles
agent/Makefile.in AGENT_RELINK_LIBS, MIBS_RELINK_LIBS
agent/helpers/Makefile.in HELPERS_RELINK_LIBS
apps/Makefile.in TRAPD_RELINK_LIBS
8.APPLIED Wrapped "No MemShared line in /proc/meminfo" in
agent/mibgroup/ucd-snmp/memory.c
with netsnmp_os_prematch('Linux', "2.4")
9.NOT DONE Various LmSensors changes [NOT DONE]
agent/mibgroup/ucd-snmp/lmSensors.c
already applied memleak and limit check fixes
MIB object changes (Gauge to Integer) violate RFC 1902
mibs/LM-SENSOR-MIB.txt
MIB object changes (Gauge to Integer) violate RFC 1902
10.NO CHANGE Add C99 macros to format result strings for 64-bit counters
agent/mibgroup/mibII/interfaces.c [NOT DONE]
NO CHANGE -- this was already applied
11.NOT DONE Patch to ignore interfaces that have no statistics
agent/mibgroup/mibII/interfaces.c
12.NOT DONE Patch to log level Error -> Debug when printing data format error
agent/mibgroup/mibII/interfaces.c
13.APPLIED Don't log peer password in authentication log messages
agent/mibgroup/smux/smux.c
14.NOT DONE Change location of default AgentX socket in
agent/mibgroup/agentx/protocol.h
"/var/agentx/master" -> "/var/run/agentx"
15.APPLIED Insert blank line after __END__ in dummy Perl module
agent/netsnmp_request_infoPtr.pm
16.NOT DONE Provide interesting sample configuration file
EXAMPLE.conf.def
17.NOT DONE Perl command addition to substitute /usr/local/etc/snmp for SNMPCONFPATH in
local/Makefile.in
18.NOT DONE Include /etc/snmp in def_search_difs
local/mib2c
19.IF TIME PERMITS Terminate if search past last if_table entry,
indicates response from server is inconsistent
apps/snmpnetstat/if.c
20.IF TIME PERMITS Add sysconfdir to Makefile.top
21.NOT DONE Add HAVE_DLOPEN [A Test for dlopen brings in -ldl]
acconfig.h
configure.in
Seems low risk and appropriate. Comments ?
22.NOT DONE FAQ changes /usr/local --> /usr
23.NOT DONE Seven new MIBs and one existing MIB are installed
mibs/LM-SENSORS-MIB.txt (existing)
mibs/Makefile.in
mibs/OSPF-MIB.txt
mibs/RIPv2-MIB.txt
mibs/BGP4-MIB.txt
mibs/BRIDGE-MIB.txt
mibs/OSPF-TRAP-MIB.txt
mibs/SOURCE-ROUTING-MIB.txt
mibs/GNOME-SMI.txt
Why GNOME-SMI added ? Other MIBs (except LM-SENSORS-MIB)
*should* be obtainable from IETF MIB repository. Comments?
24.NOT DONE Allow for non-positive sensor values in LM-SENSORS-MIB
and change existing Temperature, Voltage, and Miscellaneous
sensor value types from Gauge to Integer.
Violates RFC 1902. Not done here. MIB rewrite later.
25.NOT DONE configure.in
--without-rpm Don't use RPM even if available. [ALREADY IN]
Add -lcrypto if EVP_md5 is available in crypto library [ALREADY IN]
Add -ldl if dlopen function is defined [ALREADY IN]
Modify HAVE_SSIZE_T to provide value "1"
Seems low risk and appropriate. Comments ?
26.NOT DONE Hard code DATADIR to /etc/snmp
man/mib2c.1.def
27.NOT DONE Man page changes, relatively minor
man/mib_api.3.def
man/snmp_trap_api.3.def
man/snmp_config.5.def <--NOT DONE
28.NOT DONE Add "--" to clean rule in Makefile.rules
29.NOT DONE Add Debian build subdirectory
Will leave to Debian packaging authority
30.NOT DONE Add sample configuration file for trap handler
This file acts as an empty file (no configure settings)
EXAMPLE-trap.conf
Would be nice. Are these changes suitably licensed (BSD-like) ?
