[Pkg-net-snmp-commits] r97 - in branches: net-snmp52/debian
net-snmp52/debian/patches net-snmp53/debian
net-snmp53/debian/patches
Jochen Friedrich
jochen at alioth.debian.org
Thu Nov 16 14:38:57 CET 2006
Author: jochen
Date: 2006-11-16 14:35:41 +0100 (Thu, 16 Nov 2006)
New Revision: 97
Modified:
branches/net-snmp52/debian/NEWS
branches/net-snmp52/debian/copyright
branches/net-snmp52/debian/patches/05_searchdirs.README
branches/net-snmp52/debian/patches/08_defaultconfig.patch
branches/net-snmp53/debian/NEWS
branches/net-snmp53/debian/copyright
branches/net-snmp53/debian/patches/05_searchdirs.README
branches/net-snmp53/debian/patches/08_defaultconfig.patch
Log:
Commit R92-R95 to branches as well.
Modified: branches/net-snmp52/debian/NEWS
===================================================================
--- branches/net-snmp52/debian/NEWS 2006-11-16 12:59:36 UTC (rev 96)
+++ branches/net-snmp52/debian/NEWS 2006-11-16 13:35:41 UTC (rev 97)
@@ -9,6 +9,6 @@
To enable SMUX again, remove "-I -smux" from SNMPDOPTS and eventually
bind it to localhost by adding "smuxsocket 127.0.0.1" to
- /etc/snmpd/snmpd.conf.
+ /etc/snmp/snmpd.conf.
-- Jochen Friedrich <jochen at scram.de> Fri, 20 Jan 2006 15:11:07 +0100
Modified: branches/net-snmp52/debian/copyright
===================================================================
--- branches/net-snmp52/debian/copyright 2006-11-16 12:59:36 UTC (rev 96)
+++ branches/net-snmp52/debian/copyright 2006-11-16 13:35:41 UTC (rev 97)
@@ -1,11 +1,11 @@
-This is the Debian GNU/Linux prepackaged version of snmp.
+This is the Debian GNU/Linux prepackaged version of Net-SNMP.
This package was put together by David Engel <david at debian.org>, from
sources obtained from http://net-snmp.sourceforge.net/.
Copyright:
-Various copyrights apply to this package, listed in 4 separate parts
+Various copyrights apply to this package, listed in various separate parts
below. Please make sure that you read all the parts. Up until 2001,
the project was based at UC Davis, and the first part covers all code
written during this time. From 2001 onwards, the project has been
@@ -154,3 +154,100 @@
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.
+
+---- Part 5: Sparta, Inc copyright notice (BSD) -----
+
+Copyright (c) 2003-2006, Sparta, Inc
+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 Sparta, Inc nor the names of its 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 HOLDERS 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.
+
+---- Part 6: Cisco/BUPTNIC copyright notice (BSD) -----
+
+Copyright (c) 2004, Cisco, Inc and Information Network
+Center of Beijing University of Posts and Telecommunications.
+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 Cisco, Inc, Beijing University of Posts and
+ Telecommunications, nor the names of their 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 HOLDERS 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.
+
+---- Part 7: Fabasoft R&D Software GmbH & Co KG copyright notice (BSD) -----
+
+Copyright (c) Fabasoft R&D Software GmbH & Co KG, 2003
+oss at fabasoft.com
+Author: Bernhard Penz <bernhard.penz at fabasoft.com>
+
+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.
+
+* The name of Fabasoft R&D Software GmbH & Co KG or any of its subsidiaries,
+ brand or product names may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER ``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 HOLDER 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.
+
Modified: branches/net-snmp52/debian/patches/05_searchdirs.README
===================================================================
--- branches/net-snmp52/debian/patches/05_searchdirs.README 2006-11-16 12:59:36 UTC (rev 96)
+++ branches/net-snmp52/debian/patches/05_searchdirs.README 2006-11-16 13:35:41 UTC (rev 97)
@@ -1 +1 @@
-Debian patch to add search path for perl libraries
+Debian patch to add search path for mib2c
Modified: branches/net-snmp52/debian/patches/08_defaultconfig.patch
===================================================================
--- branches/net-snmp52/debian/patches/08_defaultconfig.patch 2006-11-16 12:59:36 UTC (rev 96)
+++ branches/net-snmp52/debian/patches/08_defaultconfig.patch 2006-11-16 13:35:41 UTC (rev 97)
@@ -124,8 +124,8 @@
@@ -0,0 +1,18 @@
+###############################################################################
+#
-+# EXAMPLE.conf:
-+# An example configuration file for configuring the ucd-snmp snmptrapd agent.
++# EXAMPLE-trap.conf:
++# An example configuration file for configuring the Net-SNMP snmptrapd agent.
+#
+###############################################################################
+#
Modified: branches/net-snmp53/debian/NEWS
===================================================================
--- branches/net-snmp53/debian/NEWS 2006-11-16 12:59:36 UTC (rev 96)
+++ branches/net-snmp53/debian/NEWS 2006-11-16 13:35:41 UTC (rev 97)
@@ -3,12 +3,12 @@
As of version 5.2.2, the default configuration disables SMUX support
and binds the SNMP port to 127.0.0.1.
- Please configure /etc/snmpd.conf, /etc/hosts.allow and /etc/hosts.deny
+ Please configure /etc/snmp/snmpd.conf, /etc/hosts.allow and /etc/hosts.deny
first to set up who can access the SNMP deamon, then edit
/etc/default/snmpd and remove 127.0.0.1 from SNMPDOPTS.
To enable SMUX again, remove "-I -smux" from SNMPDOPTS and eventually
bind it to localhost by adding "smuxsocket 127.0.0.1" to
- /etc/snmpd/snmpd.conf.
+ /etc/snmp/snmpd.conf.
-- Jochen Friedrich <jochen at scram.de> Fri, 20 Jan 2006 15:11:07 +0100
Modified: branches/net-snmp53/debian/copyright
===================================================================
--- branches/net-snmp53/debian/copyright 2006-11-16 12:59:36 UTC (rev 96)
+++ branches/net-snmp53/debian/copyright 2006-11-16 13:35:41 UTC (rev 97)
@@ -1,11 +1,11 @@
-This is the Debian GNU/Linux prepackaged version of snmp.
+This is the Debian GNU/Linux prepackaged version of Net-SNMP.
This package was put together by David Engel <david at debian.org>, from
sources obtained from http://net-snmp.sourceforge.net/.
Copyright:
-Various copyrights apply to this package, listed in 4 separate parts
+Various copyrights apply to this package, listed in various separate parts
below. Please make sure that you read all the parts. Up until 2001,
the project was based at UC Davis, and the first part covers all code
written during this time. From 2001 onwards, the project has been
@@ -154,3 +154,100 @@
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.
+
+---- Part 5: Sparta, Inc copyright notice (BSD) -----
+
+Copyright (c) 2003-2006, Sparta, Inc
+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 Sparta, Inc nor the names of its 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 HOLDERS 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.
+
+---- Part 6: Cisco/BUPTNIC copyright notice (BSD) -----
+
+Copyright (c) 2004, Cisco, Inc and Information Network
+Center of Beijing University of Posts and Telecommunications.
+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 Cisco, Inc, Beijing University of Posts and
+ Telecommunications, nor the names of their 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 HOLDERS 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.
+
+---- Part 7: Fabasoft R&D Software GmbH & Co KG copyright notice (BSD) -----
+
+Copyright (c) Fabasoft R&D Software GmbH & Co KG, 2003
+oss at fabasoft.com
+Author: Bernhard Penz <bernhard.penz at fabasoft.com>
+
+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.
+
+* The name of Fabasoft R&D Software GmbH & Co KG or any of its subsidiaries,
+ brand or product names may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER ``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 HOLDER 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.
+
Modified: branches/net-snmp53/debian/patches/05_searchdirs.README
===================================================================
--- branches/net-snmp53/debian/patches/05_searchdirs.README 2006-11-16 12:59:36 UTC (rev 96)
+++ branches/net-snmp53/debian/patches/05_searchdirs.README 2006-11-16 13:35:41 UTC (rev 97)
@@ -1 +1 @@
-Debian patch to add search path for perl libraries
+Debian patch to add search path for mib2c
Modified: branches/net-snmp53/debian/patches/08_defaultconfig.patch
===================================================================
--- branches/net-snmp53/debian/patches/08_defaultconfig.patch 2006-11-16 12:59:36 UTC (rev 96)
+++ branches/net-snmp53/debian/patches/08_defaultconfig.patch 2006-11-16 13:35:41 UTC (rev 97)
@@ -124,8 +124,8 @@
@@ -0,0 +1,18 @@
+###############################################################################
+#
-+# EXAMPLE.conf:
-+# An example configuration file for configuring the ucd-snmp snmptrapd agent.
++# EXAMPLE-trap.conf:
++# An example configuration file for configuring the Net-SNMP snmptrapd agent.
+#
+###############################################################################
+#
More information about the Pkg-net-snmp-commits
mailing list