Accepting request 110576 from net-snmp:factory
Add fixes for bnc#707636 and bnc#750704. OBS-URL: https://build.opensuse.org/request/show/110576 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/net-snmp?expand=0&rev=55
This commit is contained in:
parent
ce8e4a012d
commit
4b6eec883a
18
net-snmp-5.7.1-adjust-copyright-in-agent-txt-file.patch
Normal file
18
net-snmp-5.7.1-adjust-copyright-in-agent-txt-file.patch
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
commit c9ac420343e16df2b7065f5bf2790df44e247fba
|
||||||
|
Author: Dave Shield <D.T.Shield@liverpool.ac.uk>
|
||||||
|
Date: Tue Mar 20 10:26:10 2012 +0000
|
||||||
|
|
||||||
|
Allow distribution as part of normal Net-SNMP packages.
|
||||||
|
|
||||||
|
Index: net-snmp-5.7.1/AGENT.txt
|
||||||
|
===================================================================
|
||||||
|
--- net-snmp-5.7.1.orig/AGENT.txt
|
||||||
|
+++ net-snmp-5.7.1/AGENT.txt
|
||||||
|
@@ -1166,4 +1166,6 @@ above all feedback, would be most apprec
|
||||||
|
|
||||||
|
------------------------------------------------------------------------
|
||||||
|
Copyright 1999, 2000 - D.T.Shield.
|
||||||
|
-Not to be distributed without the explicit permission of the author.
|
||||||
|
+This file may be distributed as part of a source or binary packaging
|
||||||
|
+of the Net-SNMP software suite. It may not be distributed independently
|
||||||
|
+without the explicit permission of the author.
|
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 22 11:04:08 UTC 2012 - lchiquitto@suse.com
|
||||||
|
|
||||||
|
- update copyright notice of AGENT.txt allowing us to redistribute
|
||||||
|
the file in our package (from Dave Shield) (bnc#750704)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Feb 8 06:09:32 UTC 2012 - coolo@suse.com
|
||||||
|
|
||||||
|
- fix license to be in spdx.org format
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 1 11:01:12 UTC 2011 - lchiquitto@suse.com
|
||||||
|
|
||||||
|
- logrotate: use "reload" instead of "try-restart" to avoid an
|
||||||
|
unnecessary stop/start cycle in the agent (bnc#707636)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Oct 21 12:30:29 UTC 2011 - lchiquitto@suse.com
|
Fri Oct 21 12:30:29 UTC 2011 - lchiquitto@suse.com
|
||||||
|
|
||||||
|
@ -9,9 +9,9 @@
|
|||||||
create 600 root root
|
create 600 root root
|
||||||
sharedscripts
|
sharedscripts
|
||||||
postrotate
|
postrotate
|
||||||
/etc/init.d/snmpd try-restart ||:
|
/etc/init.d/snmpd reload ||:
|
||||||
if [ -x /etc/init.d/snmptrapd ] ; then \
|
if [ -x /etc/init.d/snmptrapd ] ; then \
|
||||||
/etc/init.d/snmptrapd try-restart ||: ; \
|
/etc/init.d/snmptrapd reload ||: ; \
|
||||||
fi
|
fi
|
||||||
endscript
|
endscript
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package net-snmp
|
# spec file for package net-snmp
|
||||||
#
|
#
|
||||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -15,7 +15,6 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
# norootforbuild
|
|
||||||
|
|
||||||
%define pkg_name net-snmp
|
%define pkg_name net-snmp
|
||||||
%ifnarch s390 s390x
|
%ifnarch s390 s390x
|
||||||
@ -28,16 +27,17 @@
|
|||||||
|
|
||||||
Name: net-snmp
|
Name: net-snmp
|
||||||
Version: 5.7.1
|
Version: 5.7.1
|
||||||
Release: 1
|
Release: 0
|
||||||
License: BSD3c(or similar) ; MIT License (or similar)
|
|
||||||
Group: Productivity/Networking/Other
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: openssl-devel rpm-devel tcpd-devel
|
BuildRequires: openssl-devel
|
||||||
|
BuildRequires: rpm-devel
|
||||||
|
BuildRequires: tcpd-devel
|
||||||
%if 0%{?netsnmp_with_sensors}
|
%if 0%{?netsnmp_with_sensors}
|
||||||
BuildRequires: libsensors4-devel
|
BuildRequires: libsensors4-devel
|
||||||
%endif
|
%endif
|
||||||
Requires: perl-TermReadKey logrotate
|
Requires: logrotate
|
||||||
Requires: perl-SNMP = %{version}
|
Requires: perl-SNMP = %{version}
|
||||||
|
Requires: perl-TermReadKey
|
||||||
PreReq: %insserv_prereq %fillup_prereq /sbin/chkconfig
|
PreReq: %insserv_prereq %fillup_prereq /sbin/chkconfig
|
||||||
# bug437293
|
# bug437293
|
||||||
%ifarch ppc64
|
%ifarch ppc64
|
||||||
@ -69,8 +69,11 @@ Patch12: net-snmp-5.7.1-use-pclose-to-close-pipes.patch
|
|||||||
Patch13: net-snmp-5.7.1-fix-handling-of-large-filesystems.patch
|
Patch13: net-snmp-5.7.1-fix-handling-of-large-filesystems.patch
|
||||||
Patch14: net-snmp-5.7.1-snmplib-default-retries.patch
|
Patch14: net-snmp-5.7.1-snmplib-default-retries.patch
|
||||||
Patch15: net-snmp-5.7.1-fsys-memory-leak.patch
|
Patch15: net-snmp-5.7.1-fsys-memory-leak.patch
|
||||||
|
Patch16: net-snmp-5.7.1-adjust-copyright-in-agent-txt-file.patch
|
||||||
#
|
#
|
||||||
Summary: SNMP Daemon
|
Summary: SNMP Daemon
|
||||||
|
License: BSD-3-Clause ; MIT
|
||||||
|
Group: Productivity/Networking/Other
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c
|
Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c
|
||||||
@ -96,12 +99,12 @@ Authors:
|
|||||||
%define library_name libsnmp30
|
%define library_name libsnmp30
|
||||||
|
|
||||||
%package -n libsnmp30
|
%package -n libsnmp30
|
||||||
License: BSD3c(or similar) ; MIT License (or similar)
|
|
||||||
Group: Productivity/Networking/Other
|
|
||||||
Requires: snmp-mibs = %{version}
|
|
||||||
Requires: perl-base = %{perl_version}
|
Requires: perl-base = %{perl_version}
|
||||||
|
Requires: snmp-mibs = %{version}
|
||||||
#
|
#
|
||||||
Summary: Shared Libraries from net-snmp
|
Summary: Shared Libraries from net-snmp
|
||||||
|
License: BSD-3-Clause ; MIT
|
||||||
|
Group: Productivity/Networking/Other
|
||||||
|
|
||||||
%description -n libsnmp30
|
%description -n libsnmp30
|
||||||
Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c
|
Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c
|
||||||
@ -123,8 +126,6 @@ Authors:
|
|||||||
Wes Hardaker <hardaker@users.sourceforge.net>
|
Wes Hardaker <hardaker@users.sourceforge.net>
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
License: BSD3c(or similar) ; MIT License (or similar)
|
|
||||||
Group: Development/Libraries/C and C++
|
|
||||||
# bug437293
|
# bug437293
|
||||||
%ifarch ppc64
|
%ifarch ppc64
|
||||||
Obsoletes: net-snmp-devel-64bit
|
Obsoletes: net-snmp-devel-64bit
|
||||||
@ -132,13 +133,19 @@ Obsoletes: net-snmp-devel-64bit
|
|||||||
#
|
#
|
||||||
Requires: %{library_name} = %{version}
|
Requires: %{library_name} = %{version}
|
||||||
# for mib2c
|
# for mib2c
|
||||||
|
Requires: libopenssl-devel
|
||||||
|
Requires: perl
|
||||||
Requires: perl-SNMP = %{version}
|
Requires: perl-SNMP = %{version}
|
||||||
Requires: libopenssl-devel rpm-devel tcpd-devel perl zlib-devel
|
Requires: rpm-devel
|
||||||
|
Requires: tcpd-devel
|
||||||
|
Requires: zlib-devel
|
||||||
%if 0%{?netsnmp_with_sensors}
|
%if 0%{?netsnmp_with_sensors}
|
||||||
Requires: libsensors4-devel
|
Requires: libsensors4-devel
|
||||||
%endif
|
%endif
|
||||||
#
|
#
|
||||||
Summary: Development files from net-snmp
|
Summary: Development files from net-snmp
|
||||||
|
License: BSD-3-Clause ; MIT
|
||||||
|
Group: Development/Libraries/C and C++
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c
|
Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c
|
||||||
@ -161,10 +168,10 @@ Authors:
|
|||||||
Wes Hardaker <hardaker@users.sourceforge.net>
|
Wes Hardaker <hardaker@users.sourceforge.net>
|
||||||
|
|
||||||
%package -n snmp-mibs
|
%package -n snmp-mibs
|
||||||
License: BSD3c(or similar) ; MIT License (or similar)
|
|
||||||
Group: Productivity/Networking/Other
|
|
||||||
#
|
#
|
||||||
Summary: MIB files from net-snmp
|
Summary: MIB files from net-snmp
|
||||||
|
License: BSD-3-Clause ; MIT
|
||||||
|
Group: Productivity/Networking/Other
|
||||||
|
|
||||||
%description -n snmp-mibs
|
%description -n snmp-mibs
|
||||||
Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c
|
Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c
|
||||||
@ -186,12 +193,12 @@ Authors:
|
|||||||
Wes Hardaker <hardaker@users.sourceforge.net>
|
Wes Hardaker <hardaker@users.sourceforge.net>
|
||||||
|
|
||||||
%package -n perl-SNMP
|
%package -n perl-SNMP
|
||||||
License: GPLv2+
|
|
||||||
Group: Development/Libraries/Perl
|
|
||||||
Requires: %{pkg_name} = %{version}
|
Requires: %{pkg_name} = %{version}
|
||||||
Requires: perl-base = %{perl_version}
|
Requires: perl-base = %{perl_version}
|
||||||
#
|
#
|
||||||
Summary: Perl5 SNMP Extension Module
|
Summary: Perl5 SNMP Extension Module
|
||||||
|
License: GPL-2.0+
|
||||||
|
Group: Development/Libraries/Perl
|
||||||
|
|
||||||
%description -n perl-SNMP
|
%description -n perl-SNMP
|
||||||
The Perl5 'SNMP' Extension Module v3.1.0 for the UCD SNMPv3 library.
|
The Perl5 'SNMP' Extension Module v3.1.0 for the UCD SNMPv3 library.
|
||||||
@ -217,6 +224,7 @@ Authors:
|
|||||||
%patch13 -p1
|
%patch13 -p1
|
||||||
%patch14 -p1
|
%patch14 -p1
|
||||||
%patch15 -p1
|
%patch15 -p1
|
||||||
|
%patch16 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \
|
MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \
|
||||||
|
Loading…
Reference in New Issue
Block a user