From 42e763ddb82083939241f22438cc1afeb503187f Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 14 Feb 2013 12:36:44 -0500 Subject: [PATCH] add missing IETF MIB license text (BSD) --- IETF-MIB-LICENSE.txt | 41 +++++++++++++++++++++++++++++++++++++++++ net-snmp.spec | 9 ++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 IETF-MIB-LICENSE.txt diff --git a/IETF-MIB-LICENSE.txt b/IETF-MIB-LICENSE.txt new file mode 100644 index 0000000..5fd2a6a --- /dev/null +++ b/IETF-MIB-LICENSE.txt @@ -0,0 +1,41 @@ +MIBs included in this software taken from IETF Documents are considered +Code Components in accordance with the IETF Trust License Policy, as found +here: + +http://trustee.ietf.org/license-info/ + +They are available under the terms of the Simplified BSD license, a copy of +which is included below. + +***** + +Copyright (c) 2013 IETF Trust and the persons identified as authors of +the code. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +· Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. + +· Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +· Neither the name of Internet Society, IETF or IETF Trust, nor the +names of specific contributors, may be used to endorse or promote +products derived from this software without specific prior written +permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS +IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER +OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/net-snmp.spec b/net-snmp.spec index 5e0e43c..4795000 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -11,7 +11,7 @@ Summary: A collection of SNMP protocol tools and libraries Name: net-snmp Version: 5.7.2 -Release: 5%{?dist} +Release: 5%{?dist}.1 Epoch: 1 License: BSD @@ -29,6 +29,7 @@ Source8: net-snmptrapd.sysconfig Source9: net-snmp-tmpfs.conf Source10: snmpd.service Source11: snmptrapd.service +Source12: IETF-MIB-LICENSE.txt Patch1: net-snmp-5.7.2-pie.patch Patch2: net-snmp-5.5-dir-fix.patch Patch3: net-snmp-5.6-multilib.patch @@ -183,6 +184,7 @@ The net-snmp-sysvinit package provides SysV init scripts for Net-SNMP daemons. %prep %setup -q +cp %{SOURCE12} . %ifnarch ia64 %patch1 -p1 -b .pie @@ -411,6 +413,7 @@ rm -rf ${RPM_BUILD_ROOT} %doc README README.agent-mibs README.agentx README.krb5 README.snmpv3 %doc local/passtest local/ipf-mod.pl %doc README.thread AGENT.txt PORTING local/README.mib2c +%doc IETF-MIB-LICENSE.txt %dir %{_sysconfdir}/snmp %config(noreplace) %{_sysconfdir}/snmp/snmpd.conf %config(noreplace) %{_sysconfdir}/snmp/snmptrapd.conf @@ -474,6 +477,7 @@ rm -rf ${RPM_BUILD_ROOT} %files libs %doc COPYING README ChangeLog.trimmed FAQ NEWS TODO +%doc IETF-MIB-LICENSE.txt %{_libdir}/libnetsnmp.so.* %dir %{_datadir}/snmp %dir %{_datadir}/snmp/mibs @@ -491,6 +495,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_initrddir}/snmptrapd %changelog +* Thu Feb 14 2013 Tom Callaway 1:5.7.2-5.1 +- add missing IETF MIB license text (BSD) + * Thu Jan 17 2013 Jan Safranek - 1:5.7.2-5 - Python: fixed IPADDRESS size on 64-bit systems (#895357)