pool/net-snmp
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 40231 from net-snmp:factory

Browse Source 
Copy from net-snmp:factory/net-snmp based on submit request 40231 from user coolo

OBS-URL: https://build.opensuse.org/request/show/40231
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/net-snmp?expand=0&rev=29
This commit is contained in:
OBS User autobuild 2010-05-18 18:40:49 +00:00 committed by Git OBS Bridge
parent 43432f2022
commit 19642b4f1a
15 changed files with 103 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net-snmp-5.4.2_snmpconf-selinux.patch
View File

@ -1,14 +0,0 @@
https://bugzilla.redhat.com/show_bug.cgi?id=248329
Index: local/snmpconf
===================================================================
--- local/snmpconf.orig
+++ local/snmpconf
@@ -682,6 +682,7 @@ sub output_files {
}
}
close(O);
+ system("restorecon $outputf");
}
}

15
net-snmp-5.4.rc2-versinfo.diff
View File

@ -1,15 +0,0 @@
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, "");

6
net-snmp-5.4.2_net-snmp-config_headercheck.patch → net-snmp-5.5.0-net-snmp-config-headercheck.patch
View File

@ -1,7 +1,7 @@
Index: net-snmp-config.in
Index: net-snmp-5.5/net-snmp-config.in
===================================================================
--- net-snmp-config.in.orig
+++ net-snmp-config.in
--- net-snmp-5.5.orig/net-snmp-config.in
+++ net-snmp-5.5/net-snmp-config.in
@@ -41,6 +41,14 @@ count()
echo $#
}

6
net-snmp-5.4.2_perl_tk_warning.patch → net-snmp-5.5.0-perl-tk-warning.patch
View File

@ -1,7 +1,7 @@
Index: local/tkmib
Index: net-snmp-5.5/local/tkmib
===================================================================
--- local/tkmib.orig
+++ local/tkmib
--- net-snmp-5.5.orig/local/tkmib
+++ net-snmp-5.5/local/tkmib
@@ -27,10 +27,9 @@ instructions.
if (!$havetk) {

12
net-snmp-5.1.1-pie.patch → net-snmp-5.5.0-pie.patch
View File

@ -1,7 +1,7 @@
Index: apps/Makefile.in
Index: net-snmp-5.5/apps/Makefile.in
===================================================================
--- apps/Makefile.in.orig
+++ apps/Makefile.in
--- net-snmp-5.5.orig/apps/Makefile.in
+++ net-snmp-5.5/apps/Makefile.in
@@ -121,7 +121,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX
$(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
@ -11,10 +11,10 @@ Index: apps/Makefile.in
snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS)
$(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
Index: agent/Makefile.in
Index: net-snmp-5.5/agent/Makefile.in
===================================================================
--- agent/Makefile.in.orig
+++ agent/Makefile.in
--- net-snmp-5.5.orig/agent/Makefile.in
+++ net-snmp-5.5/agent/Makefile.in
@@ -142,7 +142,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c
$(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $?

6
net-snmp-5.2.1-socket_path.diff → net-snmp-5.5.0-socket-path.patch
View File

@ -1,7 +1,7 @@
Index: agent/mibgroup/agentx/protocol.h
Index: net-snmp-5.5/agent/mibgroup/agentx/protocol.h
===================================================================
--- agent/mibgroup/agentx/protocol.h.orig
+++ agent/mibgroup/agentx/protocol.h
--- net-snmp-5.5.orig/agent/mibgroup/agentx/protocol.h
+++ net-snmp-5.5/agent/mibgroup/agentx/protocol.h
@@ -13,7 +13,7 @@ extern "C" {
#define AGENTX_PORT 705

14
net-snmp-5.4.2_testing.empty_arptable.patch → net-snmp-5.5.0-testing-empty-arptable.patch
View File

@ -1,7 +1,7 @@
Index: testing/rfc1213/snmpfun.sh
Index: net-snmp-5.5/testing/rfc1213/snmpfun.sh
===================================================================
--- testing/rfc1213/snmpfun.sh.orig
+++ testing/rfc1213/snmpfun.sh
--- net-snmp-5.5.orig/testing/rfc1213/snmpfun.sh
+++ net-snmp-5.5/testing/rfc1213/snmpfun.sh
@@ -1,4 +1,3 @@
-
# functions used by RFC-1213 MIB test modules
@ -39,7 +39,7 @@ Index: testing/rfc1213/snmpfun.sh
- CHECKFILE '' "\.$2\."
- if [ "$snmp_last_test_result" = 0 ] ; then
- test_finish FAIL
+ check_skip_arp_tests
+ check_skip_arp_tests
+ if check_skip_arp_tests "$2" ; then
+ test_finish SKIPPED
else
@ -78,10 +78,10 @@ Index: testing/rfc1213/snmpfun.sh
}
+
Index: testing/rfc1213/test_fun
Index: net-snmp-5.5/testing/rfc1213/test_fun
===================================================================
--- testing/rfc1213/test_fun.orig
+++ testing/rfc1213/test_fun
--- net-snmp-5.5.orig/testing/rfc1213/test_fun
+++ net-snmp-5.5/testing/rfc1213/test_fun
@@ -51,6 +51,9 @@ test_finish()
if [ x$1 == x"PASS" ];then
pass_num=`expr $pass_num + 1`

3
net-snmp-5.5.0-upstream-20100428.patch.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1087517eea0b114eff794bab3cd393d1f616f7be3118df92a5c62083d64223df
size 170985

6
net-snmp-5.5.0_use_lmsensors_v3.patch → net-snmp-5.5.0-use-lmsensors-v3.patch
View File

@ -2,8 +2,10 @@
agent/mibgroup/hardware/sensors.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- agent/mibgroup/hardware/sensors.h.orig
+++ agent/mibgroup/hardware/sensors.h
Index: net-snmp-5.5/agent/mibgroup/hardware/sensors.h
===================================================================
--- net-snmp-5.5.orig/agent/mibgroup/hardware/sensors.h
+++ net-snmp-5.5/agent/mibgroup/hardware/sensors.h
@@ -7,7 +7,7 @@ config_require(hardware/sensors/picld_se
config_require(hardware/sensors/kstat_sensors)
# endif

40
net-snmp-5.4.2_velocity-mib.patch → net-snmp-5.5.0-velocity-mib.patch
View File

@ -1,7 +1,7 @@
Index: LICENSE.VELOCITY
Index: net-snmp-5.5/LICENSE.VELOCITY
===================================================================
--- /dev/null
+++ LICENSE.VELOCITY
+++ net-snmp-5.5/LICENSE.VELOCITY
@@ -0,0 +1,41 @@
+/* Portions of these files are subject to the following copyright(s). See
+ * the Net-SNMP's COPYING file for more details and other copyrights
@ -44,10 +44,10 @@ Index: LICENSE.VELOCITY
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
Index: agent/mibgroup/velocity.h
Index: net-snmp-5.5/agent/mibgroup/velocity.h
===================================================================
--- /dev/null
+++ agent/mibgroup/velocity.h
+++ net-snmp-5.5/agent/mibgroup/velocity.h
@@ -0,0 +1,28 @@
+/*
+ * Velocity 'wrapper' interface which is an extension of the host resources
@ -77,10 +77,10 @@ Index: agent/mibgroup/velocity.h
+config_add_mib(UCD-SNMP-MIB)
+config_add_mib(VELOCITY-MIB)
+config_add_mib(VELOCITY-TYPES)
Index: agent/mibgroup/velocity/velocity_app.c
Index: net-snmp-5.5/agent/mibgroup/velocity/velocity_app.c
===================================================================
--- /dev/null
+++ agent/mibgroup/velocity/velocity_app.c
+++ net-snmp-5.5/agent/mibgroup/velocity/velocity_app.c
@@ -0,0 +1,499 @@
+#include <net-snmp/net-snmp-config.h>
+
@ -581,10 +581,10 @@ Index: agent/mibgroup/velocity/velocity_app.c
+ return total;
+}
+
Index: agent/mibgroup/velocity/velocity_app.h
Index: net-snmp-5.5/agent/mibgroup/velocity/velocity_app.h
===================================================================
--- /dev/null
+++ agent/mibgroup/velocity/velocity_app.h
+++ net-snmp-5.5/agent/mibgroup/velocity/velocity_app.h
@@ -0,0 +1,38 @@
+/*
+ * Application watching mib group
@ -624,10 +624,10 @@ Index: agent/mibgroup/velocity/velocity_app.h
+#define APPIDS 7
+
+#endif /* _MIBGROUP_APP_H */
Index: agent/mibgroup/velocity/velocity_swrun.c
Index: net-snmp-5.5/agent/mibgroup/velocity/velocity_swrun.c
===================================================================
--- /dev/null
+++ agent/mibgroup/velocity/velocity_swrun.c
+++ net-snmp-5.5/agent/mibgroup/velocity/velocity_swrun.c
@@ -0,0 +1,1595 @@
+/*
+ * Velocity MIB - Running Software group implementation - velocity_swrun.c
@ -2224,10 +2224,10 @@ Index: agent/mibgroup/velocity/velocity_swrun.c
+ End_VELOCITY_SWRun();
+ return total;
+}
Index: agent/mibgroup/velocity/velocity_swrun.h
Index: net-snmp-5.5/agent/mibgroup/velocity/velocity_swrun.h
===================================================================
--- /dev/null
+++ agent/mibgroup/velocity/velocity_swrun.h
+++ net-snmp-5.5/agent/mibgroup/velocity/velocity_swrun.h
@@ -0,0 +1,13 @@
+/*
+ * Velocity MIB - Running Software group interface - velocity_swrun.h
@ -2242,10 +2242,10 @@ Index: agent/mibgroup/velocity/velocity_swrun.h
+
+
+#endif /* _MIBGROUP_VELOCITYSWRUN_H */
Index: agent/mibgroup/velocity/velocity_system.c
Index: net-snmp-5.5/agent/mibgroup/velocity/velocity_system.c
===================================================================
--- /dev/null
+++ agent/mibgroup/velocity/velocity_system.c
+++ net-snmp-5.5/agent/mibgroup/velocity/velocity_system.c
@@ -0,0 +1,403 @@
+/*
+ * Velocity MIB - system group implementation - velocity_system.c
@ -2650,10 +2650,10 @@ Index: agent/mibgroup/velocity/velocity_system.c
+}
+
+#endif /* UTMP_FILE */
Index: agent/mibgroup/velocity/velocity_system.h
Index: net-snmp-5.5/agent/mibgroup/velocity/velocity_system.h
===================================================================
--- /dev/null
+++ agent/mibgroup/velocity/velocity_system.h
+++ net-snmp-5.5/agent/mibgroup/velocity/velocity_system.h
@@ -0,0 +1,12 @@
+/*
+ * Velocity MIB - system group interface - velocity_system.h
@ -2667,10 +2667,10 @@ Index: agent/mibgroup/velocity/velocity_system.h
+
+
+#endif /* _MIBGROUP_VELOCITYSYSTEM_H */
Index: mibs/VELOCITY-MIB.txt
Index: net-snmp-5.5/mibs/VELOCITY-MIB.txt
===================================================================
--- /dev/null
+++ mibs/VELOCITY-MIB.txt
+++ net-snmp-5.5/mibs/VELOCITY-MIB.txt
@@ -0,0 +1,671 @@
+VELOCITY-MIB DEFINITIONS ::= BEGIN
+
@ -3343,10 +3343,10 @@ Index: mibs/VELOCITY-MIB.txt
+ ::= { velocityMIBGroups 5 }
+
+END
Index: mibs/VELOCITY-TYPES.txt
Index: net-snmp-5.5/mibs/VELOCITY-TYPES.txt
===================================================================
--- /dev/null
+++ mibs/VELOCITY-TYPES.txt
+++ net-snmp-5.5/mibs/VELOCITY-TYPES.txt
@@ -0,0 +1,23 @@
+VELOCITY-TYPES DEFINITIONS ::= BEGIN
+

6
net-snmp-5.4.2_vendorperl.patch → net-snmp-5.5.0-vendorperl.patch
View File

@ -1,7 +1,7 @@
Index: Makefile.in
Index: net-snmp-5.5/Makefile.in
===================================================================
--- Makefile.in.orig
+++ Makefile.in
--- net-snmp-5.5.orig/Makefile.in
+++ net-snmp-5.5/Makefile.in
@@ -175,7 +175,7 @@ perlmakefiles: net-snmp-config-x
fi

3
net-snmp-5.5.0_upstream-20100405.patch.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6a7da68a61e3a60ec4b100662c569f32bc63b43f0d24b82da7b0ebd55508ef92
size 164499

23
net-snmp.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Fri Apr 30 16:01:08 UTC 2010 - lchiquitto@novell.com
- create /var/run/agentx during startup to support systems that
mount /var/run as tmpfs
-------------------------------------------------------------------
Wed Apr 28 21:41:22 UTC 2010 - lchiquitto@novell.com
- update libsnmp package name to reflect the library version we
are currently shipping
- remove patches that are obsolete:
net-snmp-5.4.rc2-versinfo.diff
net-snmp-5.4.2_snmpconf-selinux.patch
- refresh all patches to apply as "-p1"
- spec file cleanup: remove conditionals to build on unsupported
versions of the distribution
-------------------------------------------------------------------
Wed Apr 28 21:38:21 UTC 2010 - lchiquitto@novell.com
- update upstream patches from branch V5-5-patches to 20100428
-------------------------------------------------------------------
Mon Apr 5 15:58:58 UTC 2010 - lchiquitto@novell.com

63
net-snmp.spec
View File

@ -20,8 +20,7 @@
Name: net-snmp
Version: 5.5
Release: 5
#
Release: 6
License: BSD3c(or similar) ; MIT License (or similar)
Group: Productivity/Networking/Other
#
@ -29,11 +28,6 @@ Group: Productivity/Networking/Other
%ifnarch s390 s390x
%define with_sensors 1
%endif
%if 0%{?suse_version} > 1020
%define perl_requires Requires: perl-base = %{perl_version}
%else
%define perl_requires Requires: perl = %{perl_version}
%endif
%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
@ -65,18 +59,16 @@ Source6: test_installed
Source7: net-snmp.sysconfig
Source8: net-snmp-rpmlintrc
Source9: baselibs.conf
Patch0: net-snmp-5.5.0_upstream-20100405.patch.bz2
Patch0: net-snmp-5.5.0-upstream-20100428.patch.bz2
# unused patch atm
Patch2: net-snmp-5.2.1-socket_path.diff
Patch3: net-snmp-5.4.rc2-versinfo.diff
Patch5: net-snmp-5.4.2_testing.empty_arptable.patch
Patch6: net-snmp-5.1.1-pie.patch
Patch7: net-snmp-5.4.2_vendorperl.patch
Patch8: net-snmp-5.4.2_net-snmp-config_headercheck.patch
Patch9: net-snmp-5.4.2_perl_tk_warning.patch
Patch10: net-snmp-5.4.2_snmpconf-selinux.patch
Patch11: net-snmp-5.4.2_velocity-mib.patch
Patch13: net-snmp-5.5.0_use_lmsensors_v3.patch
Patch1: net-snmp-5.5.0-socket-path.patch
Patch2: net-snmp-5.5.0-testing-empty-arptable.patch
Patch3: net-snmp-5.5.0-pie.patch
Patch4: net-snmp-5.5.0-vendorperl.patch
Patch5: net-snmp-5.5.0-net-snmp-config-headercheck.patch
Patch6: net-snmp-5.5.0-perl-tk-warning.patch
Patch7: net-snmp-5.5.0-velocity-mib.patch
Patch8: net-snmp-5.5.0-use-lmsensors-v3.patch
#
Summary: SNMP Daemon
@ -101,18 +93,17 @@ Authors:
--------
Wes Hardaker <hardaker@users.sourceforge.net>
%define library_name libsnmp15
%define library_name libsnmp20
%package -n libsnmp15
%package -n libsnmp20
License: BSD3c(or similar) ; MIT License (or similar)
Group: Productivity/Networking/Other
Requires: snmp-mibs = %{version}
# we link libperl
%perl_requires
Requires: perl-base = %{perl_version}
#
Summary: Shared Libraries from net-snmp
%description -n libsnmp15
%description -n libsnmp20
Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c
and SNMP v3 using both IPv4 and IPv6. The suite includes:
@ -198,7 +189,7 @@ Authors:
License: GPLv2+
Group: Development/Libraries/Perl
Requires: %{pkg_name} = %{version}
%perl_requires
Requires: perl-base = %{perl_version}
#
Summary: Perl5 SNMP Extension Module
@ -213,18 +204,14 @@ Authors:
%prep
%setup -q -n %{pkg_name}-%{version}
%patch0 -p1
%patch2
%patch3
%patch5
%patch6
%patch7
%patch8
%patch9
%patch10
%patch11
%patch13
find -name "CVS" -type d | xargs -r %{__rm} -rfv
find -name ".cvsignore" | xargs -r %{__rm} -fv
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%build
autoreconf -fi
@ -233,9 +220,7 @@ autoreconf -fi
# ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable
export CFLAGS="%{optflags} -fno-strict-aliasing -DNETSNMP_NO_INLINE"
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="misc/ipfwacc \
@ -383,7 +368,7 @@ fi
%{_mandir}/man[158]/*
%{_sbindir}/*
/var/lib/net-snmp
%dir %attr(700,root,root) %{netsnmp_agentx_socket_dir_fhs}
%dir %ghost %attr(700,root,root) %{netsnmp_agentx_socket_dir_fhs}
%ghost %{netsnmp_logfile}
%config(noreplace) /etc/logrotate.d/net-snmp
/var/adm/fillup-templates/sysconfig.%{pkg_name}

4
rc.net-snmp
View File

@ -107,6 +107,10 @@ case "$1" in
SNMPDNOTCPWRAPPERLOG="--dontLogTCPWrappersConnects"
;;
esac
# /var/run can now be mounted as tmpfs
if [ ! -d /var/run/agentx ]; then
mkdir -m 0700 /var/run/agentx
fi
startproc $SNMPD $SNMPDCONF -r -A -LF ${SNMPD_LOGLEVEL:-d} $SNMPD_LOGFILE -p /var/run/snmpd.pid $agentargs $SNMPDNOSMUX $SNMPDNOTCPWRAPPERLOG
rc_status -v
rc_reset