Update GNOME-SMI and fix patch to add the MIBS to the right path

git-svn-id: svn://svn.debian.org/pkg-net-snmp/trunk@203 db575a87-f10d-0410-9662-f1d5ac62e4ba

1 files changed, 31 insertions, 25 deletions

diff --git a/debian/patches/06_extramibs.patch b/debian/patches/06_extramibs.patch
index cd0c6b6..f06eedb 100644
--- a/debian/patches/06_extramibs.patch
+++ b/debian/patches/06_extramibs.patch
@@ -1,5 +1,6 @@
---- net-snmp-5.3.0.1.orig/mibs/BGP4-MIB.txt	1970-01-01 01:00:00.000000000 +0100
-+++ net-snmp-5.3.0.1/mibs/BGP4-MIB.txt	2005-07-20 21:45:50.000000000 +0200
+diff -ruN net-snmp-5.4.1.orig/mibs/BGP4-MIB.txt net-snmp-5.4.1/mibs/BGP4-MIB.txt
+--- net-snmp-5.4.1.orig/mibs/BGP4-MIB.txt	1970-01-01 01:00:00.000000000 +0100
++++ net-snmp-5.4.1/mibs/BGP4-MIB.txt	2007-09-20 16:30:52.000000000 +0200
 @@ -0,0 +1,929 @@
 +    BGP4-MIB DEFINITIONS ::= BEGIN
 +
@@ -930,9 +931,9 @@
 +            ::= { bgpMIBGroups 5 }
 +
 +    END
-diff -ruN mibs/BRIDGE-MIB.txt.orig mibs/BRIDGE-MIB.txt
---- mibs/BRIDGE-MIB.txt.orig	1970-01-01 01:00:00.000000000 +0100
-+++ mibs/BRIDGE-MIB.txt	2005-07-20 21:45:50.000000000 +0200
+diff -ruN net-snmp-5.4.1.orig/mibs/BRIDGE-MIB.txt net-snmp-5.4.1/mibs/BRIDGE-MIB.txt
+--- net-snmp-5.4.1.orig/mibs/BRIDGE-MIB.txt	1970-01-01 01:00:00.000000000 +0100
++++ net-snmp-5.4.1/mibs/BRIDGE-MIB.txt	2007-09-20 16:30:52.000000000 +0200
 @@ -0,0 +1,1075 @@
 +BRIDGE-MIB DEFINITIONS ::= BEGIN
 +
@@ -2009,10 +2010,10 @@ diff -ruN mibs/BRIDGE-MIB.txt.orig mibs/BRIDGE-MIB.txt
 +    ::= 2
 +
 +END
-diff -ruN mibs/GNOME-SMI.txt.orig mibs/GNOME-SMI.txt
---- mibs/GNOME-SMI.txt.orig	1970-01-01 01:00:00.000000000 +0100
-+++ mibs/GNOME-SMI.txt	2005-07-20 21:47:13.000000000 +0200
-@@ -0,0 +1,83 @@
+diff -ruN net-snmp-5.4.1.orig/mibs/GNOME-SMI.txt net-snmp-5.4.1/mibs/GNOME-SMI.txt
+--- net-snmp-5.4.1.orig/mibs/GNOME-SMI.txt	1970-01-01 01:00:00.000000000 +0100
++++ net-snmp-5.4.1/mibs/GNOME-SMI.txt	2007-09-20 16:33:55.000000000 +0200
+@@ -0,0 +1,88 @@
 +GNOME-SMI DEFINITIONS ::= BEGIN
 +
 +IMPORTS
@@ -2022,7 +2023,7 @@ diff -ruN mibs/GNOME-SMI.txt.orig mibs/GNOME-SMI.txt
 +		FROM SNMPv2-SMI;
 +
 +gnome MODULE-IDENTITY
-+	LAST-UPDATED "200505070000Z"
++	LAST-UPDATED "200709070000Z"
 +	ORGANIZATION "GNOME project"
 +	CONTACT-INFO
 +		"GNU Network Object Model Environment project
@@ -2033,8 +2034,8 @@ diff -ruN mibs/GNOME-SMI.txt.orig mibs/GNOME-SMI.txt
 +		Administrative contact for MIB module:
 +
 +		Jochen Friedrich
-+		Buedingerstr. 30b
-+		63546 Hammersbach
++		Ramsaystr. 9
++		63450 Hanau
 +		Germany 
 +
 +		email: jochen@scram.de"
@@ -2043,6 +2044,11 @@ diff -ruN mibs/GNOME-SMI.txt.orig mibs/GNOME-SMI.txt
 +
 +	-- revision history
 +
++	REVISION "200709070000Z"  -- Sep 07, 2007
++	DESCRIPTION
++		"Fixed wrong enterprise number (how comes this
++		typo was unnoticed for so long?)."
++
 +	REVISION "200505070000Z"  -- May 07, 2005
 +	DESCRIPTION
 +		"Added gnomeLDAP subtree for LDAP definitions."
@@ -2056,7 +2062,7 @@ diff -ruN mibs/GNOME-SMI.txt.orig mibs/GNOME-SMI.txt
 +	DESCRIPTION
 +		"Initial version."
 +
-+	::= { enterprises 3317 }	-- assigned by IANA
++	::= { enterprises 3319 }	-- assigned by IANA
 +
 +gnomeProducts OBJECT-IDENTITY
 +	STATUS	current
@@ -2096,9 +2102,9 @@ diff -ruN mibs/GNOME-SMI.txt.orig mibs/GNOME-SMI.txt
 +-- more to come if necessary.
 +
 +END
-diff -ruN mibs/OSPF-MIB.txt.orig mibs/OSPF-MIB.txt
---- mibs/OSPF-MIB.txt.orig	1970-01-01 01:00:00.000000000 +0100
-+++ mibs/OSPF-MIB.txt	2005-07-20 21:45:50.000000000 +0200
+diff -ruN net-snmp-5.4.1.orig/mibs/OSPF-MIB.txt net-snmp-5.4.1/mibs/OSPF-MIB.txt
+--- net-snmp-5.4.1.orig/mibs/OSPF-MIB.txt	1970-01-01 01:00:00.000000000 +0100
++++ net-snmp-5.4.1/mibs/OSPF-MIB.txt	2007-09-20 16:30:52.000000000 +0200
 @@ -0,0 +1,2723 @@
 +OSPF-MIB DEFINITIONS ::= BEGIN
 +
@@ -4823,9 +4829,9 @@ diff -ruN mibs/OSPF-MIB.txt.orig mibs/OSPF-MIB.txt
 +       ::= { ospfGroups 13 }
 +
 +END
-diff -ruN mibs/OSPF-TRAP-MIB.txt.orig mibs/OSPF-TRAP-MIB.txt
---- mibs/OSPF-TRAP-MIB.txt.orig	1970-01-01 01:00:00.000000000 +0100
-+++ mibs/OSPF-TRAP-MIB.txt	2005-07-20 21:45:50.000000000 +0200
+diff -ruN net-snmp-5.4.1.orig/mibs/OSPF-TRAP-MIB.txt net-snmp-5.4.1/mibs/OSPF-TRAP-MIB.txt
+--- net-snmp-5.4.1.orig/mibs/OSPF-TRAP-MIB.txt	1970-01-01 01:00:00.000000000 +0100
++++ net-snmp-5.4.1/mibs/OSPF-TRAP-MIB.txt	2007-09-20 16:30:52.000000000 +0200
 @@ -0,0 +1,443 @@
 +OSPF-TRAP-MIB DEFINITIONS ::= BEGIN
 +
@@ -5270,9 +5276,9 @@ diff -ruN mibs/OSPF-TRAP-MIB.txt.orig mibs/OSPF-TRAP-MIB.txt
 +
 +
 +END
-diff -ruN mibs/RIPv2-MIB.txt.orig mibs/RIPv2-MIB.txt
---- mibs/RIPv2-MIB.txt.orig	1970-01-01 01:00:00.000000000 +0100
-+++ mibs/RIPv2-MIB.txt	2005-07-20 21:45:50.000000000 +0200
+diff -ruN net-snmp-5.4.1.orig/mibs/RIPv2-MIB.txt net-snmp-5.4.1/mibs/RIPv2-MIB.txt
+--- net-snmp-5.4.1.orig/mibs/RIPv2-MIB.txt	1970-01-01 01:00:00.000000000 +0100
++++ net-snmp-5.4.1/mibs/RIPv2-MIB.txt	2007-09-20 16:30:52.000000000 +0200
 @@ -0,0 +1,530 @@
 +   RIPv2-MIB DEFINITIONS ::= BEGIN
 +
@@ -5804,9 +5810,9 @@ diff -ruN mibs/RIPv2-MIB.txt.orig mibs/RIPv2-MIB.txt
 +       "This group defines peer information for RIP-II systems."
 +    ::= { rip2Groups 4 }
 +END
-diff -ruN mibs/SOURCE-ROUTING-MIB.txt.orig mibs/SOURCE-ROUTING-MIB.txt
---- mibs/SOURCE-ROUTING-MIB.txt.orig	1970-01-01 01:00:00.000000000 +0100
-+++ mibs/SOURCE-ROUTING-MIB.txt	2005-07-20 21:45:50.000000000 +0200
+diff -ruN net-snmp-5.4.1.orig/mibs/SOURCE-ROUTING-MIB.txt net-snmp-5.4.1/mibs/SOURCE-ROUTING-MIB.txt
+--- net-snmp-5.4.1.orig/mibs/SOURCE-ROUTING-MIB.txt	1970-01-01 01:00:00.000000000 +0100
++++ net-snmp-5.4.1/mibs/SOURCE-ROUTING-MIB.txt	2007-09-20 16:30:52.000000000 +0200
 @@ -0,0 +1,452 @@
 +SOURCE-ROUTING-MIB DEFINITIONS ::= BEGIN
 +