SHA256
1
0
forked from pool/net-snmp

Accepting request 51508 from net-snmp:factory

Accepted submit request 51508 from user leonardocf

OBS-URL: https://build.opensuse.org/request/show/51508
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/net-snmp?expand=0&rev=34
This commit is contained in:
Ruediger Oertel 2010-10-28 10:41:04 +00:00 committed by Git OBS Bridge
parent 85548f394d
commit 26486d146f
10 changed files with 111 additions and 49 deletions

View File

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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b8eb82e4e947c6969ddde288f429b738b8f90300a8c4e00d2211955b404073d
size 3968691

View File

@ -0,0 +1,37 @@
Index: net-snmp-5.6/agent/mibgroup/host.h
===================================================================
--- net-snmp-5.6.orig/agent/mibgroup/host.h
+++ net-snmp-5.6/agent/mibgroup/host.h
@@ -22,8 +22,8 @@
config_require(host/hr_disk)
config_require(host/hr_partition)
- config_version_require((host/hr_storage, 5.7, host/hrh_storage))
- config_version_require((host/hr_filesys, 5.7, host/hrh_filesys))
+ config_require(host/hrh_storage)
+ config_require(host/hrh_filesys)
config_version_require((host/hr_swinst, 5.6, host/hrSWInstalledTable))
config_version_require((host/hr_swrun, 5.6, host/hrSWRunTable))
Index: net-snmp-5.6/agent/mibgroup/velocity.h
===================================================================
--- net-snmp-5.6.orig/agent/mibgroup/velocity.h
+++ net-snmp-5.6/agent/mibgroup/velocity.h
@@ -5,7 +5,7 @@
config_require(host/hr_system)
config_require(velocity/velocity_system)
- config_require(host/hr_storage)
+ config_require(host/hrh_storage)
config_require(host/hr_device)
config_require(host/hr_other)
config_require(host/hr_proc)
@@ -13,7 +13,7 @@
config_require(host/hr_print)
config_require(host/hr_disk)
config_require(host/hr_partition)
- config_require(host/hr_filesys)
+ config_require(host/hrh_filesys)
config_require(velocity/velocity_swrun)
config_require(host/hr_swrun)
config_require(host/hr_swinst)

View File

@ -1,7 +1,7 @@
Index: net-snmp-5.5/net-snmp-config.in
Index: net-snmp-5.6/net-snmp-config.in
===================================================================
--- net-snmp-5.5.orig/net-snmp-config.in
+++ net-snmp-5.5/net-snmp-config.in
--- net-snmp-5.6.orig/net-snmp-config.in
+++ net-snmp-5.6/net-snmp-config.in
@@ -41,6 +41,14 @@ count()
echo $#
}
@ -17,7 +17,7 @@ Index: net-snmp-5.5/net-snmp-config.in
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
@@ -120,9 +128,11 @@ else
@@ -127,9 +135,11 @@ else
;;
#################################################### compile
--base-cflags)
@ -29,7 +29,7 @@ Index: net-snmp-5.5/net-snmp-config.in
echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
;;
--srcdir)
@@ -133,6 +143,7 @@ else
@@ -140,6 +150,7 @@ else
echo $NSC_LIBDIR
;;
--ldflags|--ld*)
@ -37,13 +37,12 @@ Index: net-snmp-5.5/net-snmp-config.in
echo $NSC_LDFLAGS
;;
--build-lib-dirs)
@@ -166,30 +177,38 @@ else
;;
@@ -177,29 +188,37 @@ else
#################################################### client lib
--libs)
+ check_devel_files
# use this one == --netsnmp-libs + --external-libs
echo $NSC_LDFLAGS $NSC_LIBDIR -lnetsnmp $NSC_LIBS
+ check_devel_files
echo $NSC_LDFLAGS $NSC_LIBDIR -lnetsnmp $NSC_LIBS $NSC_LNETSNMPLIBS
;;
--netsnmp-libs)
+ check_devel_files
@ -51,12 +50,12 @@ Index: net-snmp-5.5/net-snmp-config.in
;;
--external-libs)
+ check_devel_files
echo $NSC_LDFLAGS $NSC_LIBS
echo $NSC_LDFLAGS $NSC_LIBS $NSC_LNETSNMPLIBS
;;
#################################################### agent lib
--base-agent-libs)
+ check_devel_files
echo $NSC_BASE_AGENT_LIBS
echo $NSC_BASE_AGENT_LIBS $NSC_LNETSNMPLIBS
;;
--base-subagent-libs)
+ check_devel_files
@ -76,7 +75,7 @@ Index: net-snmp-5.5/net-snmp-config.in
echo $NSC_LDFLAGS $NSC_AGENTLIBS
;;
####################################################
@@ -215,6 +234,7 @@ else
@@ -225,6 +244,7 @@ else
####################################################
--compile-subagent)

View File

@ -1,8 +1,21 @@
Index: net-snmp-5.5/apps/Makefile.in
Index: net-snmp-5.6/agent/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
--- net-snmp-5.6.orig/agent/Makefile.in
+++ net-snmp-5.6/agent/Makefile.in
@@ -245,7 +245,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c
$(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $?
snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(MIBLIB) $(LIBTARG)
- $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${OUR_AGENT_LIBS}
+ $(LINK) $(CFLAGS) -o $@ -pie ${LAGENTOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${OUR_AGENT_LIBS}
libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS)
Index: net-snmp-5.6/apps/Makefile.in
===================================================================
--- net-snmp-5.6.orig/apps/Makefile.in
+++ net-snmp-5.6/apps/Makefile.in
@@ -127,7 +127,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX
$(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS)
@ -11,16 +24,3 @@ Index: net-snmp-5.5/apps/Makefile.in
snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS)
$(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS}
Index: net-snmp-5.5/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 $?
snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG)
- $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${OUR_AGENT_LIBS}
+ $(LINK) $(CFLAGS) -o $@ -pie ${LAGENTOBJS} $(LOCAL_LIBS) ${LDFLAGS} ${OUR_AGENT_LIBS}
libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS)

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:00675c8b2da210c9903a7c978ad2c6d3fee0e4edfb17d67bc46395c612686503
size 107502

View File

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

3
net-snmp-5.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:05d41dae9b81ba40d0abaefc8559814ff5c8eb41b16686335605b66898854c1f
size 4248283

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Wed Oct 27 16:48:40 UTC 2010 - lchiquitto@novell.com
- enable new implementation of hrStorage and hrFilesys to fix
persistent indexes in FS and Storage tables (bnc#648364)
-------------------------------------------------------------------
Thu Oct 21 14:37:36 UTC 2010 - lchiquitto@novell.com
- update upstream patches from branch V5-6-patches to 20101021
-------------------------------------------------------------------
Tue Oct 19 23:59:46 UTC 2010 - lchiquitto@novell.com
- update to version 5.6:
new features and lots of bug fixes
- refresh and rename patches to apply cleanly after update:
net-snmp-5.6.0-pie.patch
net-snmp-5.6.0-vendorperl.patch
net-snmp-5.6.0-net-snmp-config-headercheck.patch
-------------------------------------------------------------------
Tue Aug 3 18:33:33 UTC 2010 - lchiquitto@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package net-snmp (Version 5.5)
# spec file for package net-snmp (Version 5.6)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -27,8 +27,8 @@
%define netsnmp_agentx_socket_dir_rfc /var/agentx
Name: net-snmp
Version: 5.5
Release: 12
Version: 5.6
Release: 1.1
License: BSD3c(or similar) ; MIT License (or similar)
Group: Productivity/Networking/Other
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -55,16 +55,17 @@ Source6: test_installed
Source7: net-snmp.sysconfig
Source8: net-snmp-rpmlintrc
Source9: baselibs.conf
Patch0: net-snmp-5.5.0-upstream-20100803.patch.bz2
Patch0: net-snmp-5.6.0-upstream-20101021.patch.bz2
# unused patch atm
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
Patch3: net-snmp-5.6.0-pie.patch
Patch4: net-snmp-5.6.0-vendorperl.patch
Patch5: net-snmp-5.6.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-rpmdb-h-detect.patch
Patch9: net-snmp-5.6.0-enable-hrh-filesys.patch
#
Summary: SNMP Daemon
@ -89,9 +90,9 @@ Authors:
--------
Wes Hardaker <hardaker@users.sourceforge.net>
%define library_name libsnmp20
%define library_name libsnmp25
%package -n libsnmp20
%package -n libsnmp25
License: BSD3c(or similar) ; MIT License (or similar)
Group: Productivity/Networking/Other
Requires: snmp-mibs = %{version}
@ -99,7 +100,7 @@ Requires: perl-base = %{perl_version}
#
Summary: Shared Libraries from net-snmp
%description -n libsnmp20
%description -n libsnmp25
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:
@ -208,6 +209,7 @@ Authors:
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build
autoreconf -fi
@ -332,6 +334,9 @@ popd
%{_bindir}/snmpwalk
%{_bindir}/traptoemail
%{_bindir}/net-snmp-create-v3-user
%{_bindir}/net-snmp-cert
%{_bindir}/agentxtrap
%{_bindir}/snmp-bridge-mib
%dir %{_prefix}/lib/net-snmp
%dir %{_prefix}/lib/net-snmp/agents
%{_mandir}/man[158]/*