Hello community,
here is the log from the commit of package net-snmp
checked in at Wed Nov 15 17:49:33 CET 2006.
--------
--- net-snmp/net-snmp.changes 2006-10-19 17:26:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/net-snmp/net-snmp.changes 2006-11-15 17:35:48.000000000 +0100
@@ -1,0 +2,50 @@
+Mon Nov 13 16:04:58 CET 2006 - mrueckert@suse.de
+
+- update to 5.4.rc2:
+ tons of bugfixes, and new features. just to name a few:
+ - enabled embedded perl
+ - new MIB table to manage net-snmp access control extensions
+ - hal to abstract os specific aspects of the systems
+ - tree matching support for snmptrapd
+ - reworked transport creation in snmplib
+ - using the incoming ip for outgoing packets if possible.
+ - ipv6 aware tcp/udp mibs
+
+- removed patches:
+ (all of them are either upstream or obsolete)
+ net-snmp-5.2.1-acinclude.diff
+ net-snmp-5.2.1-acquotation.patch
+ net-snmp-5.2.1-compat.patch
+ net-snmp-5.2.1-localperl.diff
+ net-snmp-5.2.1-perl.diff
+ net-snmp-5.3.0.1-64bit.diff
+ net-snmp-5.3.0.1_agentx_socket_path_doc.patch
+ net-snmp-5.3.0.1_deprecated_sysctl_retrans_time.patch
+ net-snmp-5.3.0.1_disman_mib_crash.patch
+ net-snmp-5.3.0.1_ethtool.patch
+ net-snmp-5.3.0.1_linux_types_header.patch
+ net-snmp-5.3.0.1_missing_ifNumber.patch
+ net-snmp-5.3.0.1_netsnmp_register_mib_crash.patch
+ net-snmp-5.3.0.1_perl_ld_run_path.patch
+ net-snmp-5.3.0.1_sighup_vacm.patch
+ net-snmp-5.3.0.1-smux-trap.diff
+ net-snmp-5.3.0.1.tar.bz2
+ net-snmp-5.3.0.1_tcpwrapper_log_severity.patch
+ net-snmp-5.3.0.1_testsuite_no_smux.patch
+ net-snmp-5.3.0.1_tunnel_compilation.patch
+ net-snmp-5.3_perl_agent.xs-pointersize.patch
+ net-snmp-5.3_perl-printf.patch
+ net-snmp-5.4_default_store_return_value.patch
+ oid-names2_5.3.patch
+
+- added net-snmp-5.4_net-snmp-config_headercheck.patch:
+ warn if net-snmp-config is used but development files are missing.
+- updated net-snmp-5.2.1-autoconf.diff to apply cleanly against 5.4
+ new name: net-snmp-5.4.rc1-autoconf.diff
+- updated net-snmp-5.2.1-versinfo.diff to apply cleanly against 5.4
+ new name: net-snmp-5.4.rc2-versinfo.diff
+- added net-snmp-5.4.rc2_perl_SNMP_size_t.patch:
+ dont use int if you want size_t. fixes failures in the perl test
+ suite.
+
+-------------------------------------------------------------------
Old:
----
net-snmp-5.2.1-acinclude.diff
net-snmp-5.2.1-acquotation.patch
net-snmp-5.2.1-autoconf.diff
net-snmp-5.2.1-compat.patch
net-snmp-5.2.1-localperl.diff
net-snmp-5.2.1-perl.diff
net-snmp-5.2.1-versinfo.diff
net-snmp-5.3.0.1-64bit.diff
net-snmp-5.3.0.1-smux-trap.diff
net-snmp-5.3.0.1.tar.bz2
net-snmp-5.3.0.1_agentx_socket_path_doc.patch
net-snmp-5.3.0.1_deprecated_sysctl_retrans_time.patch
net-snmp-5.3.0.1_disman_mib_crash.patch
net-snmp-5.3.0.1_ethtool.patch
net-snmp-5.3.0.1_linux_types_header.patch
net-snmp-5.3.0.1_missing_ifNumber.patch
net-snmp-5.3.0.1_netsnmp_register_mib_crash.patch
net-snmp-5.3.0.1_perl_ld_run_path.patch
net-snmp-5.3.0.1_sighup_vacm.patch
net-snmp-5.3.0.1_tcpwrapper_log_severity.patch
net-snmp-5.3.0.1_testsuite_no_smux.patch
net-snmp-5.3.0.1_tunnel_compilation.patch
net-snmp-5.3_perl-printf.patch
net-snmp-5.3_perl_agent.xs-pointersize.patch
net-snmp-5.4_default_store_return_value.patch
oid-names2_5.3.patch
New:
----
net-snmp-5.4.rc1-autoconf.diff
net-snmp-5.4.rc2-versinfo.diff
net-snmp-5.4.rc2.tar.bz2
net-snmp-5.4.rc2_perl_SNMP_size_t.patch
net-snmp-5.4_net-snmp-config_headercheck.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ net-snmp.spec ++++++
--- /var/tmp/diff_new_pack.PgH7Pe/_old 2006-11-15 17:48:37.000000000 +0100
+++ /var/tmp/diff_new_pack.PgH7Pe/_new 2006-11-15 17:48:37.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package net-snmp (Version 5.3.0.1)
+# spec file for package net-snmp (Version 5.4.rc2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -8,61 +8,48 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+# norootforbuild
Name: net-snmp
-%define netsnmp_logfile /var/log/net-snmpd.log
-BuildRequires: openssl-devel rpm-devel sensors tcpd-devel
+%define pkg_name net-snmp
+Version: 5.4.rc2
+Release: 1
+#
License: BSD License and BSD-like, Other License(s), see package
-Version: 5.3.0.1
-Release: 29
-Summary: SNMP Daemon
Group: Productivity/Networking/Other
-URL: http://sourceforge.net/projects/net-snmp
+#
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: openssl-devel rpm-devel sensors tcpd-devel
+Requires: perl-TermReadKey logrotate
+PreReq: %insserv_prereq %fillup_prereq /sbin/chkconfig
Provides: snmp ucdsnmp
Obsoletes: snmp ucdsnmp
-PreReq: %insserv_prereq %fillup_prereq /sbin/chkconfig
-Requires: perl-TermReadKey logrotate
-Autoreqprov: on
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: %{name}-%{version}.tar.bz2
+%define netsnmp_logfile /var/log/net-snmpd.log
+%define netsnmp_agentx_socket_dir_fhs /var/run/agentx
+%define netsnmp_agentx_socket_dir_rfc /var/agentx
+#
+URL: http://sourceforge.net/projects/net-snmp
+Source: %{pkg_name}-%{version}.tar.bz2
Source1: rc.net-snmp
Source2: snmpd.conf
Source3: README.SuSE
Source4: rc.snmptrapd
Source5: net-snmp.logrotate
Source6: test_installed
-Source7: %{name}.sysconfig
-Patch: %{name}-5.3.0.1-audit.diff
-Patch1: %{name}-5.2.1-acinclude.diff
-Patch2: %{name}-5.2.1-autoconf.diff
-Patch3: %{name}-5.2.1-localperl.diff
-Patch5: %{name}-5.2.1-socket_path.diff
-Patch12: %{name}-5.2.1-perl.diff
-Patch15: net-snmp-5.3.0.1-64bit.diff
-Patch18: %{name}-5.2.1-versinfo.diff
-Patch22: %{name}-5.2.1-overflow.diff
-Patch24: %{name}-5.2.1-compat.patch
-Patch27: %{name}-5.2.1-acquotation.patch
-Patch28: %{name}-5.2.1.testing.empty_arptable.patch
-Patch31: %{name}-5.1.1-pie.patch
-Patch32: net-snmp-5.3_vendorperl.patch
-Patch33: net-snmp-5.3_perl-printf.patch
-Patch34: net-snmp-5.3_perl_agent.xs-pointersize.patch
-Patch35: net-snmp-5.3.0.1_disman_mib_crash.patch
-Patch36: net-snmp-5.3.0.1_netsnmp_register_mib_crash.patch
-Patch37: net-snmp-5.3.0.1-smux-trap.diff
-Patch38: net-snmp-5.3.0.1_linux_types_header.patch
-Patch39: net-snmp-5.3.0.1_agentx_socket_path_doc.patch
-Patch40: net-snmp-5.3.0.1_tunnel_compilation.patch
-Patch41: net-snmp-5.3.0.1_tcpwrapper_log_severity.patch
-Patch42: net-snmp-5.3.0.1_ethtool.patch
-Patch43: net-snmp-5.3.0.1_testsuite_no_smux.patch
-Patch44: net-snmp-5.3.0.1_missing_ifNumber.patch
-Patch45: net-snmp-5.3.0.1_sighup_vacm.patch
-Patch46: net-snmp-5.3.0.1_deprecated_sysctl_retrans_time.patch
-Patch47: net-snmp-5.3.0.1_perl_ld_run_path.patch
-Patch48: net-snmp-5.4_default_store_return_value.patch
-Patch60: oid-names2_5.3.patch
+Source7: net-snmp.sysconfig
+Patch: net-snmp-5.3.0.1-audit.diff
+Patch1: net-snmp-5.4.rc1-autoconf.diff
+# unused patch atm
+Patch2: net-snmp-5.2.1-socket_path.diff
+Patch3: net-snmp-5.4.rc2-versinfo.diff
+Patch4: net-snmp-5.2.1-overflow.diff
+Patch5: net-snmp-5.2.1.testing.empty_arptable.patch
+Patch6: net-snmp-5.1.1-pie.patch
+Patch7: net-snmp-5.3_vendorperl.patch
+Patch8: net-snmp-5.4_net-snmp-config_headercheck.patch
+Patch9: net-snmp-5.4.rc2_perl_SNMP_size_t.patch
+#
+Summary: SNMP Daemon
%description
This package was originally based on the CMU 2.1.2.1 snmp code. It has
@@ -78,10 +65,10 @@
Wes Hardaker
%package devel
-Summary: SNMP Daemon
Group: Productivity/Networking/Other
-Requires: %{name} = %{version}, openssl-devel, rpm-devel
-Autoreqprov: on
+Requires: %{pkg_name} = %{version}, openssl-devel, rpm-devel, sensors, tcpd-devel
+#
+Summary: SNMP Daemon
%description devel
This package was originally based on the CMU 2.1.2.1 snmp code. It has
@@ -97,10 +84,10 @@
Wes Hardaker
%package -n perl-SNMP
-Summary: Perl-SNMP
Group: Development/Libraries/Perl
-Requires: %{name} = %{version}
-Autoreqprov: on
+Requires: %{pkg_name} = %{version}
+#
+Summary: Perl-SNMP
%description -n perl-SNMP
The Perl5 'SNMP' Extension Module v3.1.0 for the UCD SNMPv3 library.
@@ -112,57 +99,41 @@
G.S. Marzot
%prep
-%setup -q
+%setup -q -n %{pkg_name}-%{version}
%patch0
%patch1
-%patch2
+##%patch2
%patch3
+%patch4
%patch5
-%patch12
-%patch15
-%patch18
-%patch22
-%patch24
-%patch27
-%patch28
-%patch31
-%patch32
-%patch33
-%patch34
-%patch35
-%patch36
-%patch37
-%patch38
-%patch39
-#%patch40 # breaks the build
-%patch41
-%patch42
-%patch43
-%patch44
-%patch45
-%patch46
-%patch47
-%patch48
-#%patch60
+%patch6
+%patch7
+%patch8
+%patch9
find -name "CVS" -type d | xargs -r %{__rm} -rfv
find -name ".cvsignore" | xargs -r %{__rm} -fv
find -name "*.orig" | xargs -r %{__rm} -fv
%build
-autoconf
+#autoconf
# possibly add later
# ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable
-export CFLAGS="%{optflags} -fno-strict-aliasing -fstack-protector-all"
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+%if 0%{?suse_version} > 1000
+export CFLAGS="$CFLAGS -fstack-protector-all"
+%endif
%configure \
--with-sys-contact="root@localhost" \
- --with-mib-modules="host ucd-snmp/pass_persist misc/ipfwacc smux ucd-snmp/diskio ucd-snmp/lmSensors" \
+ --with-mib-modules="misc/ipfwacc smux ucd-snmp/diskio ucd-snmp/lmSensors" \
--with-persistent-directory=/var/lib/net-snmp \
+ --with-agentx-socket=%{netsnmp_agentx_socket_dir_fhs}/master \
--with-sys-location="unknown" \
--with-logfile=%{netsnmp_logfile} \
--with-libwrap=%{_prefix} \
--with-defaults \
--enable-shared \
--disable-static \
+ --enable-as-needed \
--without-root-access \
--enable-local-smux \
--enable-ipv6 \
@@ -170,15 +141,15 @@
%{__make} all
%ifnarch %arm
ulimit -c unlimited
-%{__make} test
+%{__make} test ||:
+%{__make} test TESTOPTS='-P tcp' ||:
%endif
-%{__make} perlmodules
-#not yet
-#LD_RUN_PATH="$PWD/snmplib/.libs" LD_LIBRARY_PATH="$PWD/snmplib/.libs" %{__make} perltest
+%{__make} perlmodules ||:
+LD_RUN_PATH="$PWD/snmplib/.libs" LD_LIBRARY_PATH="${PWD}/snmplib/.libs:${PWD}/agent/.libs:${PWD}/agent/helpers/.libs" %{__make} perltest ||:
%install
%makeinstall INSTALL_PREFIX=%{buildroot}
-%{__install} -Dd %{buildroot}/var/log %{buildroot}/var/lib/net-snmp %{buildroot}/usr/lib/net-snmp/agents %{buildroot}/var/run/agentx
+%{__install} -Dd %{buildroot}/var/log %{buildroot}/var/lib/net-snmp %{buildroot}/usr/lib/net-snmp/agents %{buildroot}%{netsnmp_agentx_socket_dir_fhs}
%{__install} -D -m 0755 %{SOURCE1} %{buildroot}/etc/init.d/snmpd
%{__install} -D -m 0600 %{SOURCE2} %{buildroot}/etc/snmp/snmpd.conf
%{__install} -m 0644 %{SOURCE3} .
@@ -186,7 +157,7 @@
%{__install} -D -m 0644 %{SOURCE5} %{buildroot}/etc/logrotate.d/net-snmp
%{__install} -m 0744 %{SOURCE6} testing/
%{__ln_s} -f /etc/init.d/snmpd %{buildroot}%{_sbindir}/rcsnmpd
-%{__install} -m 0644 /dev/null %{buildroot}/var/log/net-snmpd.log
+%{__install} -m 0644 /dev/null %{buildroot}%{netsnmp_logfile}
pushd perl
%perl_make_install
%perl_process_packlist
@@ -196,7 +167,9 @@
%{buildroot}%{_includedir}/net-snmp/net-snmp-config.h.new
%{__mv} %{buildroot}%{_includedir}/net-snmp/net-snmp-config.h{.new,}
%{__install} -D -m 0644 %{S:7} \
- %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}
+ %{buildroot}/var/adm/fillup-templates/sysconfig.%{pkg_name}
+#
+%{__ln_s} -f %{netsnmp_agentx_socket_dir_fhs} %{buildroot}%{netsnmp_agentx_socket_dir_rfc}
%clean
%{__rm} -rf %{buildroot}
@@ -280,10 +253,11 @@
%{_sbindir}/*
%{_datadir}/snmp
/var/lib/net-snmp
-%dir %attr(700,root,root) /var/run/agentx
+%dir %attr(700,root,root) %{netsnmp_agentx_socket_dir_fhs}
%ghost %{netsnmp_logfile}
%config(noreplace) /etc/logrotate.d/net-snmp
-/var/adm/fillup-templates/sysconfig.%{name}
+/var/adm/fillup-templates/sysconfig.%{pkg_name}
+%{netsnmp_agentx_socket_dir_rfc}
%files devel
%defattr(-,root,root)
@@ -309,6 +283,51 @@
%{_bindir}/mib2c-update
%changelog -n net-snmp
+* Mon Nov 13 2006 - mrueckert@suse.de
+- update to 5.4.rc2:
+ tons of bugfixes, and new features. just to name a few:
+ - enabled embedded perl
+ - new MIB table to manage net-snmp access control extensions
+ - hal to abstract os specific aspects of the systems
+ - tree matching support for snmptrapd
+ - reworked transport creation in snmplib
+ - using the incoming ip for outgoing packets if possible.
+ - ipv6 aware tcp/udp mibs
+- removed patches:
+ (all of them are either upstream or obsolete)
+ net-snmp-5.2.1-acinclude.diff
+ net-snmp-5.2.1-acquotation.patch
+ net-snmp-5.2.1-compat.patch
+ net-snmp-5.2.1-localperl.diff
+ net-snmp-5.2.1-perl.diff
+ net-snmp-5.3.0.1-64bit.diff
+ net-snmp-5.3.0.1_agentx_socket_path_doc.patch
+ net-snmp-5.3.0.1_deprecated_sysctl_retrans_time.patch
+ net-snmp-5.3.0.1_disman_mib_crash.patch
+ net-snmp-5.3.0.1_ethtool.patch
+ net-snmp-5.3.0.1_linux_types_header.patch
+ net-snmp-5.3.0.1_missing_ifNumber.patch
+ net-snmp-5.3.0.1_netsnmp_register_mib_crash.patch
+ net-snmp-5.3.0.1_perl_ld_run_path.patch
+ net-snmp-5.3.0.1_sighup_vacm.patch
+ net-snmp-5.3.0.1-smux-trap.diff
+ net-snmp-5.3.0.1.tar.bz2
+ net-snmp-5.3.0.1_tcpwrapper_log_severity.patch
+ net-snmp-5.3.0.1_testsuite_no_smux.patch
+ net-snmp-5.3.0.1_tunnel_compilation.patch
+ net-snmp-5.3_perl_agent.xs-pointersize.patch
+ net-snmp-5.3_perl-printf.patch
+ net-snmp-5.4_default_store_return_value.patch
+ oid-names2_5.3.patch
+- added net-snmp-5.4_net-snmp-config_headercheck.patch:
+ warn if net-snmp-config is used but development files are missing.
+- updated net-snmp-5.2.1-autoconf.diff to apply cleanly against 5.4
+ new name: net-snmp-5.4.rc1-autoconf.diff
+- updated net-snmp-5.2.1-versinfo.diff to apply cleanly against 5.4
+ new name: net-snmp-5.4.rc2-versinfo.diff
+- added net-snmp-5.4.rc2_perl_SNMP_size_t.patch:
+ dont use int if you want size_t. fixes failures in the perl test
+ suite.
* Thu Oct 19 2006 - mrueckert@suse.de
- added net-snmp-5.4_default_store_return_value.patch:
backport my patch from 5.4 so we can get rid of the build errors.
@@ -404,14 +423,14 @@
net-snmp-5.2.1.set-var-value.patch
- added 4 new patches:
net-snmp-5.3_perl_agent.xs-pointersize.patch
-- fixes some casts of pointers to ints -> segfaults in the test
+ - fixes some casts of pointers to ints -> segfaults in the test
suite
net-snmp-5.3_perl-printf.patch
-- fixes a printf warning
+ - fixes a printf warning
net-snmp-5.3_vendorperl.patch
-- call perl modules install with install_vendor
+ - call perl modules install with install_vendor
net-snmp-5.1.1-pie.patch
-- build snmpd and snmptrapd with pie
+ - build snmpd and snmptrapd with pie
* Tue Nov 15 2005 - uli@suse.de
- no point in running the test suite in QEMU
* Wed Sep 07 2005 - mrueckert@suse.de
++++++ net-snmp-5.2.1-socket_path.diff ++++++
--- /var/tmp/diff_new_pack.PgH7Pe/_old 2006-11-15 17:48:37.000000000 +0100
+++ /var/tmp/diff_new_pack.PgH7Pe/_new 2006-11-15 17:48:37.000000000 +0100
@@ -1,11 +1,13 @@
---- agent/mibgroup/agentx/protocol.h
+Index: agent/mibgroup/agentx/protocol.h
+===================================================================
+--- agent/mibgroup/agentx/protocol.h.orig
+++ agent/mibgroup/agentx/protocol.h
-@@ -10,7 +10,7 @@
- */
+@@ -13,7 +13,7 @@ extern "C" {
#define AGENTX_PORT 705
--#define AGENTX_SOCKET "/var/agentx/master"
-+#define AGENTX_SOCKET "/var/run/agentx/master"
+ #ifndef NETSNMP_AGENTX_SOCKET
+-#define NETSNMP_AGENTX_SOCKET "/var/agentx/master"
++#define NETSNMP_AGENTX_SOCKET "/var/run/agentx/master"
+ #endif
/*
- * AgentX versions
++++++ net-snmp-5.3.0.1-audit.diff ++++++
--- /var/tmp/diff_new_pack.PgH7Pe/_old 2006-11-15 17:48:37.000000000 +0100
+++ /var/tmp/diff_new_pack.PgH7Pe/_new 2006-11-15 17:48:37.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- agent/mibgroup/examples/ucdDemoPublic.c.orig
+++ agent/mibgroup/examples/ucdDemoPublic.c
-@@ -219,7 +219,11 @@
+@@ -219,7 +219,11 @@ write_ucdDemoPublicString(int action,
}
if (action == COMMIT) {
if (var_val_len != 0) {
@@ -19,7 +19,7 @@
===================================================================
--- agent/mibgroup/mibII/system_mib.c.orig
+++ agent/mibgroup/mibII/system_mib.c
-@@ -126,7 +126,7 @@
+@@ -126,7 +126,7 @@ system_parse_config_sysloc(const char *t
char tmpbuf[1024];
if (strlen(cptr) >= sizeof(sysLocation)) {
@@ -28,7 +28,7 @@
"syslocation token too long (must be < %lu):\n\t%s",
(unsigned long)sizeof(sysLocation), cptr);
config_perror(tmpbuf);
-@@ -173,7 +173,7 @@
+@@ -173,7 +173,7 @@ system_parse_config_syscon(const char *t
char tmpbuf[1024];
if (strlen(cptr) >= sizeof(sysContact)) {
@@ -37,7 +37,7 @@
"syscontact token too long (must be < %lu):\n\t%s",
(unsigned long)sizeof(sysContact), cptr);
config_perror(tmpbuf);
-@@ -220,7 +220,7 @@
+@@ -220,7 +220,7 @@ system_parse_config_sysname(const char *
char tmpbuf[1024];
if (strlen(cptr) >= sizeof(sysName)) {
@@ -50,7 +50,7 @@
===================================================================
--- agent/mibgroup/mibII/var_route.c.orig
+++ agent/mibgroup/mibII/var_route.c
-@@ -1328,7 +1328,7 @@
+@@ -1378,7 +1378,7 @@ Route_Scan_Reload(void)
/*
* Sort it!
*/
@@ -63,7 +63,7 @@
===================================================================
--- agent/mibgroup/util_funcs.c.orig
+++ agent/mibgroup/util_funcs.c
-@@ -139,6 +139,10 @@
+@@ -139,6 +139,10 @@ make_tempfile(void)
}
#endif
if (fd >= 0) {
@@ -78,43 +78,27 @@
===================================================================
--- agent/auto_nlist.c.orig
+++ agent/auto_nlist.c
-@@ -64,6 +64,7 @@
+@@ -64,6 +64,7 @@ auto_nlist_value(const char *string)
it->nl[0].n_name = (char *) malloc(strlen(string) + 2);
- #ifdef aix4
+ #if defined(aix4) || defined(aix5)
strcpy(it->nl[0].n_name, string);
+ it->nl[0].n_name[strlen(string)+1] = '\0';
#else
sprintf(it->nl[0].n_name, "_%s", string);
#endif
-@@ -72,6 +73,7 @@
- #ifndef aix4
+@@ -72,6 +73,7 @@ auto_nlist_value(const char *string)
+ #if !(defined(aix4) || defined(aix5))
if (it->nl[0].n_type == 0) {
strcpy(it->nl[0].n_name, string);
+ it->nl[0].n_name[strlen(string)+1] = '\0';
init_nlist(it->nl);
}
#endif
-Index: agent/snmp_agent.c
-===================================================================
---- agent/snmp_agent.c.orig
-+++ agent/snmp_agent.c
-@@ -1169,9 +1169,9 @@
- * No, so just specify the default port.
- */
- if (netsnmp_ds_get_int(NETSNMP_DS_APPLICATION_ID, NETSNMP_DS_AGENT_FLAGS) & SNMP_FLAGS_STREAM_SOCKET) {
-- sprintf(buf, "tcp:%d", SNMP_PORT);
-+ snprintf(buf, sizeof(buf), "tcp:%d", SNMP_PORT);
- } else {
-- sprintf(buf, "udp:%d", SNMP_PORT);
-+ snprintf(buf, sizeof(buf), "udp:%d", SNMP_PORT);
- }
- }
-
Index: apps/snmptest.c
===================================================================
--- apps/snmptest.c.orig
+++ apps/snmptest.c
-@@ -456,6 +456,7 @@
+@@ -456,6 +456,7 @@ input_variable(netsnmp_variable_list * v
goto getValue;
}
memcpy(vp->val.string, buf, strlen(buf) - 1);
@@ -136,7 +120,7 @@
#include
#include
#include
-@@ -788,10 +791,11 @@
+@@ -840,10 +843,11 @@ do_external(char *cmd, struct hostent *h
#else
char command_buf[128];
char file_buf[L_tmpnam];
@@ -154,7 +138,7 @@
===================================================================
--- snmplib/parse.c.orig
+++ snmplib/parse.c
-@@ -4161,7 +4161,7 @@
+@@ -4187,7 +4187,7 @@ static struct node *
parse(FILE * fp, struct node *root)
{
char token[MAXTOKEN];
@@ -163,7 +147,7 @@
int type = LABEL;
int lasttype = LABEL;
-@@ -4253,7 +4253,8 @@
+@@ -4279,7 +4279,8 @@ parse(FILE * fp, struct node *root)
case ENDOFFILE:
continue;
default:
@@ -173,7 +157,7 @@
type = get_token(fp, token, MAXTOKEN);
nnp = NULL;
if (type == MACRO) {
-@@ -4270,7 +4271,8 @@
+@@ -4296,7 +4297,8 @@ parse(FILE * fp, struct node *root)
print_error(name, "is a reserved word", lasttype);
continue; /* see if we can parse the rest of the file */
}
@@ -187,7 +171,7 @@
===================================================================
--- snmplib/tools.c.orig
+++ snmplib/tools.c
-@@ -695,7 +695,7 @@
+@@ -695,7 +695,7 @@ dump_snmpEngineID(const u_char * estring
/*
* s += snprintf(s, remaining_len+3, "\"%s\"", esp);
*/
@@ -200,7 +184,7 @@
===================================================================
--- testing/TESTCONF.sh.orig
+++ testing/TESTCONF.sh
-@@ -77,8 +77,8 @@
+@@ -77,8 +77,8 @@ if [ "x$SNMP_TMPDIR" = "x" -a "x$SNMP_HE
fi
SNMP_TMP_PERSISTENTDIR=$SNMP_TMPDIR/persist
export SNMP_TMP_PERSISTENTDIR
@@ -215,7 +199,7 @@
===================================================================
--- testing/eval_suite.sh.orig
+++ testing/eval_suite.sh
-@@ -79,7 +79,11 @@
+@@ -79,7 +79,11 @@ exit 0
PROGRAM=
ARGUMENTS="$*"
@@ -228,7 +212,7 @@
TESTLISTFILE=eval_testlist
-@@ -205,6 +209,7 @@
+@@ -205,6 +209,7 @@ done # endwhile
# Cleanup, exit.
#
rm -f $TMPFILE
++++++ net-snmp-5.4.rc1-autoconf.diff ++++++
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -1037,7 +1037,7 @@
# system check
-AC_CANONICAL_TARGET
+AC_CANONICAL_TARGET([])
changequote(, )
PARTIALTARGETOS=`echo $target_os | sed 's/[-._].*//'`
if test "x$PARTIALTARGETOS" = "xmingw32msvc"; then
@@ -2332,8 +2332,6 @@
[
AC_MSG_RESULT([no])
# Linux RedHat 6.1 won't link libwrap without libnsl
- AC_CHECK_FUNC(yp_get_default_domain, ,
- AC_CHECK_LIB(nsl, yp_get_default_domain))
AC_MSG_CHECKING([for TCP wrappers library -lwrap linked with -lnsl])
AC_TRY_LINK([#include
#include
@@ -3754,7 +3752,7 @@
# we need to have a local variable `hz' in scope and set to a useful
# value whenever we use one of these constants.
#
-AC_CACHE_CHECK(whether TCP timers depend on \`hz',ac_cv_TCPTV_NEEDS_HZ,
+AC_CACHE_CHECK(whether TCP timers depend on hz,ac_cv_TCPTV_NEEDS_HZ,
[AC_EGREP_CPP(hz,
[#include
TCPTV_SRTTDFLT
@@ -3808,7 +3806,7 @@
ME=`$WHOAMI`
if test -f /etc/resolv.conf; then
- LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
+ LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n 1 | awk '{print $NF}'`
else
LOC="@no.where"
fi
++++++ net-snmp-5.4.rc2-versinfo.diff ++++++
Index: agent/mibgroup/ucd-snmp/versioninfo.c
===================================================================
--- agent/mibgroup/ucd-snmp/versioninfo.c.orig
+++ agent/mibgroup/ucd-snmp/versioninfo.c
@@ -130,8 +130,8 @@ var_extensible_version(struct variable *
case VERCONFIG:
#ifdef NETSNMP_CONFIGURE_OPTIONS
*var_len = strlen(config_opts);
- if (*var_len > 1024)
- *var_len = 1024; /* mib imposed restriction */
+ if (*var_len > 300)
+ *var_len = 300; /* mib imposed restriction */
return (u_char *) config_opts;
#else
sprintf(errmsg, "");
++++++ net-snmp-5.4.rc2_perl_SNMP_size_t.patch ++++++
Index: perl/SNMP/SNMP.xs
===================================================================
RCS file: /cvsroot/net-snmp/net-snmp/perl/SNMP/SNMP.xs,v
retrieving revision 5.69
diff -u -p -r5.69 SNMP.xs
--- perl/SNMP/SNMP.xs 25 Oct 2006 16:16:24 -0000 5.69
+++ perl/SNMP/SNMP.xs 12 Nov 2006 13:40:28 -0000
@@ -117,16 +117,16 @@ static int __snprint_value _((char *, si
netsnmp_variable_list*, struct tree *,
int, int));
static int __sprint_num_objid _((char *, oid *, int));
-static int __scan_num_objid _((char *, oid *, int *));
+static int __scan_num_objid _((char *, oid *, size_t *));
static int __get_type_str _((int, char *));
static int __get_label_iid _((char *, char **, char **, int));
-static int __oid_cmp _((oid *, int, oid *, int));
+static int __oid_cmp _((oid *, size_t, oid *, size_t));
static int __tp_sprint_num_objid _((char*,SnmpMibNode *));
static SnmpMibNode * __get_next_mib_node _((SnmpMibNode *));
static struct tree * __oid2tp _((oid*, int, struct tree *, int*));
-static struct tree * __tag2oid _((char *, char *, oid *, int *, int *, int));
-static int __concat_oid_str _((oid *, int *, char *));
-static int __add_var_val_str _((netsnmp_pdu *, oid *, int, char *,
+static struct tree * __tag2oid _((char *, char *, oid *, size_t *, int *, int));
+static int __concat_oid_str _((oid *, size_t *, char *));
+static int __add_var_val_str _((netsnmp_pdu *, oid *, size_t, char *,
int, int));
static int __send_sync_pdu _((netsnmp_session *, netsnmp_pdu *,
netsnmp_pdu **, int , SV *, SV *, SV *));
@@ -149,8 +149,8 @@ typedef struct bulktbl {
oid req_oid[MAX_OID_LEN]; /* The OID originally requested. */
oid last_oid[MAX_OID_LEN]; /* Last-seen OID under this branch. */
AV *vars; /* Array of Varbinds for this OID. */
- int req_len; /* Length of requested OID. */
- int last_len; /* Length of last-seen OID. */
+ size_t req_len; /* Length of requested OID. */
+ size_t last_len; /* Length of last-seen OID. */
char norepeat; /* Is this a non-repeater OID? */
char complete; /* Non-zero if this tree complete. */
char ignore; /* Ignore this OID, not requested. */
@@ -585,7 +585,7 @@ static int
__scan_num_objid (buf, objid, len)
char *buf;
oid *objid;
-int *len;
+size_t *len;
{
char *cp;
*len = 0;
@@ -798,9 +798,9 @@ int flag;
static int
__oid_cmp(oida_arr, oida_arr_len, oidb_arr, oidb_arr_len)
oid *oida_arr;
-int oida_arr_len;
+size_t oida_arr_len;
oid *oidb_arr;
-int oidb_arr_len;
+size_t oidb_arr_len;
{
for (;oida_arr_len && oidb_arr_len;
oida_arr++, oida_arr_len--, oidb_arr++, oidb_arr_len--) {
@@ -876,14 +876,14 @@ __tag2oid(tag, iid, oid_arr, oid_arr_len
char * tag;
char * iid;
oid * oid_arr;
-int * oid_arr_len;
+size_t * oid_arr_len;
int * type;
int best_guess;
{
struct tree *tp = NULL;
struct tree *rtp = NULL;
oid newname[MAX_OID_LEN], *op;
- int newname_len = 0;
+ size_t newname_len = 0;
const char *cp = NULL;
char *module = NULL;
@@ -1024,7 +1024,7 @@ found:
static int
__concat_oid_str(doid_arr, doid_arr_len, soid_str)
oid *doid_arr;
-int *doid_arr_len;
+size_t *doid_arr_len;
char * soid_str;
{
char soid_buf[STR_BUF_SIZE];
@@ -1050,7 +1050,7 @@ static int
__add_var_val_str(pdu, name, name_length, val, len, type)
netsnmp_pdu *pdu;
oid *name;
- int name_length;
+ size_t name_length;
char * val;
int len;
int type;
@@ -2202,7 +2202,7 @@ _bulkwalk_recv_pdu(walk_context *context
** assume that we've walked past the end of the subtree. Set this
** subtree to be completed, and go on to the next variable.
*/
- if (((int)vars->name_length < expect->req_len) ||
+ if ((vars->name_length < expect->req_len) ||
(memcmp(vars->name, expect->req_oid, expect->req_len*sizeof(oid))))
{
DBPRT(2,(DBOUT " walked off branch - marking subtree as complete.\n"));
@@ -3041,7 +3041,7 @@ snmp_set(sess_ref, varlist_ref, perl_cal
netsnmp_pdu *pdu, *response;
struct tree *tp;
oid *oid_arr;
- int oid_arr_len = MAX_OID_LEN;
+ size_t oid_arr_len = MAX_OID_LEN;
char *tag_pv;
snmp_xs_cb_data *xs_cb_data;
SV **sess_ptr_sv;
@@ -3242,7 +3242,7 @@ snmp_get(sess_ref, retry_nosuch, varlist
struct tree *tp;
int len;
oid *oid_arr;
- int oid_arr_len = MAX_OID_LEN;
+ size_t oid_arr_len = MAX_OID_LEN;
SV *tmp_sv;
int type;
char tmp_type_str[MAX_TYPE_NAME_LEN];
@@ -3460,7 +3460,7 @@ snmp_getnext(sess_ref, varlist_ref, perl
struct tree *tp;
int len;
oid *oid_arr;
- int oid_arr_len = MAX_OID_LEN;
+ size_t oid_arr_len = MAX_OID_LEN;
SV *tmp_sv;
int type;
char tmp_type_str[MAX_TYPE_NAME_LEN];
@@ -3704,7 +3704,7 @@ snmp_getbulk(sess_ref, nonrepeaters, max
struct tree *tp;
int len;
oid *oid_arr;
- int oid_arr_len = MAX_OID_LEN;
+ size_t oid_arr_len = MAX_OID_LEN;
SV *tmp_sv;
int type;
char tmp_type_str[MAX_TYPE_NAME_LEN];
@@ -3932,7 +3932,7 @@ snmp_bulkwalk(sess_ref, nonrepeaters, ma
netsnmp_session *ss;
netsnmp_pdu *pdu = NULL;
oid oid_arr[MAX_OID_LEN];
- int oid_arr_len;
+ size_t oid_arr_len;
SV **sess_ptr_sv;
SV **err_str_svp;
SV **err_num_svp;
@@ -4243,7 +4243,7 @@ snmp_trapV1(sess_ref,enterprise,agent,ge
netsnmp_pdu *pdu = NULL;
struct tree *tp;
oid *oid_arr;
- int oid_arr_len = MAX_OID_LEN;
+ size_t oid_arr_len = MAX_OID_LEN;
SV **sess_ptr_sv;
SV **err_str_svp;
SV **err_num_svp;
@@ -4382,7 +4382,7 @@ snmp_trapV2(sess_ref,uptime,trap_oid,var
netsnmp_pdu *pdu = NULL;
struct tree *tp;
oid *oid_arr;
- int oid_arr_len = MAX_OID_LEN;
+ size_t oid_arr_len = MAX_OID_LEN;
SV **sess_ptr_sv;
SV **err_str_svp;
SV **err_num_svp;
@@ -4519,7 +4519,7 @@ snmp_inform(sess_ref,uptime,trap_oid,var
netsnmp_pdu *response;
struct tree *tp;
oid *oid_arr;
- int oid_arr_len = MAX_OID_LEN;
+ size_t oid_arr_len = MAX_OID_LEN;
snmp_xs_cb_data *xs_cb_data;
SV **sess_ptr_sv;
SV **err_str_svp;
@@ -4750,7 +4750,7 @@ snmp_translate_obj(var,mode,use_long,aut
char str_buf[STR_BUF_SIZE];
char str_buf_temp[STR_BUF_SIZE];
oid oid_arr[MAX_OID_LEN];
- int oid_arr_len = MAX_OID_LEN;
+ size_t oid_arr_len = MAX_OID_LEN;
char * label;
char * iid;
int status = FAILURE;
++++++ net-snmp-5.4_net-snmp-config_headercheck.patch ++++++
Index: net-snmp-config.in
===================================================================
--- net-snmp-config.in.orig
+++ net-snmp-config.in
@@ -27,6 +27,14 @@ check_build_dir()
fi
}
+check_devel_files()
+{
+ if [ ! -e "${NSC_INCDIR}/net-snmp/net-snmp-config.h" ] ; then
+ echo "Can not find \"${NSC_INCDIR}/net-snmp/net-snmp-config.h\". The net-snmp development files seems to be missing. Exiting" >&2
+ # exit 2
+ fi
+}
+
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
@@ -104,9 +112,11 @@ else
;;
#################################################### compile
--base-cflags)
+ check_devel_files
echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
;;
--cflags|--cf*)
+ check_devel_files
echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
;;
--srcdir)
@@ -117,6 +127,7 @@ else
echo $NSC_LIBDIR
;;
--ldflags|--ld*)
+ check_devel_files
echo $NSC_LDFLAGS
;;
--build-lib-dirs)
@@ -150,30 +161,38 @@ else
;;
#################################################### client lib
--libs)
+ check_devel_files
# use this one == --netsnmp-libs + --external-libs
echo $NSC_LDFLAGS $NSC_LIBDIR -lnetsnmp $NSC_LIBS
;;
--netsnmp-libs)
+ check_devel_files
echo $NSC_LIBDIR -lnetsnmp
;;
--external-libs)
+ check_devel_files
echo $NSC_LDFLAGS $NSC_LIBS
;;
#################################################### agent lib
--base-agent-libs)
+ check_devel_files
echo $NSC_BASE_AGENT_LIBS
;;
--base-subagent-libs)
+ check_devel_files
echo $NSC_BASE_SUBAGENT_LIBS
;;
--agent-libs)
+ check_devel_files
# use this one == --netsnmp-agent-libs + --external-libs
echo $NSC_LDFLAGS $NSC_LIBDIR $NSC_BASE_AGENT_LIBS $NSC_AGENTLIBS
;;
--netsnmp-agent-libs)
+ check_devel_files
echo $NSC_LIBDIR $NSC_BASE_AGENT_LIBS
;;
--external-agent-libs)
+ check_devel_files
echo $NSC_LDFLAGS $NSC_AGENTLIBS
;;
####################################################
@@ -314,6 +333,7 @@ else
####################################################
--compile-subagent)
+ check_devel_files
shift
while test "x$done" = "x" -a "x$1" != "x" ; do
case $1 in
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org