build: drop unused SMUX client OID MIBs

These MIB OIDs were only used to identify clients on the SMUX protocol.
And even for that, they were essentially pointless.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/debianpkg/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules
index 086238eda544ceb7c54ddef22f136881d693daca..7495db89cb7bb7b711a962d26f6c15685733dac6 100755 (executable)
--- a/debianpkg/backports/ubuntu12.04/debian/rules
+++ b/debianpkg/backports/ubuntu12.04/debian/rules
@@ -154,12 +154,8 @@ override_dh_auto_install:
        mkdir -p debian/tmp/etc/frr/
        perl -pi -e 's#^!log file #!log file /var/log/frr/#' debian/tmp/usr/share/doc/frr/examples/*sample*
 
-       # installing the Frr specific SNMP MIB
-ifeq ($(WANT_SNMP), 1)
-       install -D -m 644 ./zebra/GNOME-PRODUCT-ZEBRA-MIB debian/tmp/usr/share/snmp/mibs/GNOME-PRODUCT-ZEBRA-MIB
-else
+       # leftover from previously shipping SMUX client OID MIB
        mkdir -p debian/tmp/usr/share/snmp/mibs
-endif
 
        # cleaning .la files
        sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/*.la

diff --git a/debianpkg/backports/ubuntu14.04/debian/rules b/debianpkg/backports/ubuntu14.04/debian/rules
index 559a27e25617e5ab4062f8941c22c8674da49739..c955d0c9454a7066f1ed06dc1e3d7c6368e8b253 100755 (executable)
--- a/debianpkg/backports/ubuntu14.04/debian/rules
+++ b/debianpkg/backports/ubuntu14.04/debian/rules
@@ -188,12 +188,8 @@ override_dh_auto_install:
        mkdir -p debian/tmp/etc/frr/
        perl -pi -e 's#^!log file #!log file /var/log/frr/#' debian/tmp/usr/share/doc/frr/examples/*sample*
 
-       # installing the Frr specific SNMP MIB
-ifeq ($(WANT_SNMP), 1)
-       install -D -m 644 ./zebra/GNOME-PRODUCT-ZEBRA-MIB debian/tmp/usr/share/snmp/mibs/GNOME-PRODUCT-ZEBRA-MIB
-else
+       # leftover from previously shipping SMUX client OID MIB
        mkdir -p debian/tmp/usr/share/snmp/mibs/
-endif
 
        # cleaning .la files
        sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/*.la

diff --git a/debianpkg/rules b/debianpkg/rules
index 28d291e40abca8bffc5ea23a60bea1034849faf4..811d45bc0b065432c616c8b9577fca6997d1e563 100755 (executable)
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -186,12 +186,8 @@ override_dh_auto_install:
        mkdir -p debian/tmp/etc/frr/
        perl -pi -e 's#^!log file #!log file /var/log/frr/#' debian/tmp/usr/share/doc/frr/examples/*sample*
 
-       # installing the Frr specific SNMP MIB
-ifeq ($(WANT_SNMP), 1)
-       install -D -m 644 ./zebra/GNOME-PRODUCT-ZEBRA-MIB debian/tmp/usr/share/snmp/mibs/GNOME-PRODUCT-ZEBRA-MIB
-else
+       # leftover from previously shipping SMUX client OID MIB
        mkdir -p debian/tmp/usr/share/snmp/mibs/
-endif
 
        # cleaning .la files
        sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/*.la

diff --git a/zebra/GNOME-PRODUCT-ZEBRA-MIB b/zebra/GNOME-PRODUCT-ZEBRA-MIB
deleted file mode 100644 (file)
index 96bcec5..0000000
--- a/zebra/GNOME-PRODUCT-ZEBRA-MIB
+++ /dev/null
@@ -1,78 +0,0 @@
-GNOME-PRODUCT-ZEBRA-MIB DEFINITIONS ::= BEGIN\r
-\r
-IMPORTS\r
-       MODULE-IDENTITY,\r
-       OBJECT-IDENTITY\r
-               FROM SNMPv2-SMI\r
-       gnomeProducts\r
-               FROM GNOME-SMI;\r
-\r
-zebra MODULE-IDENTITY\r
-       LAST-UPDATED "200004250000Z"\r
-       ORGANIZATION "GNOME project"\r
-       CONTACT-INFO\r
-               "GNU Network Object Model Environment project\r
-               \r
-               see http://www.gnome.org for contact persons of a particular\r
-               area or subproject of GNOME.\r
-\r
-               Administrative contact for MIB module:\r
-\r
-               Jochen Friedrich\r
-               Wingertstr. 70/1\r
-               68809 Neulussheim\r
-               Germany \r
-\r
-               email: snmp@gnome.org"\r
-       DESCRIPTION\r
-               "The product registrations for the various zebra subdeamons.\r
-               These registrations are guaranteed to be unique and are used\r
-               for SMUX registration by default (if not overridden manually)."\r
-       ::= { gnomeProducts 2 }\r
-\r
-zserv OBJECT-IDENTITY\r
-       STATUS  current\r
-       DESCRIPTION\r
-               "zserv is part of the zebra project which again is a GNU\r
-               endorsed internet routing program.\r
-               zserv is the main zebra process which implements routing\r
-               entries with the kernel and handles routing updates between\r
-               other routing protocols."\r
-       ::= { zebra 1 }\r
-\r
-bgpd OBJECT-IDENTITY\r
-       STATUS  current\r
-       DESCRIPTION\r
-               "bgpd is part of the zebra project which again is a GNU\r
-               endorsed internet routing program."\r
-       ::= { zebra 2 }\r
-\r
-ripd OBJECT-IDENTITY\r
-       STATUS  current\r
-       DESCRIPTION\r
-               "ripd is part of the zebra project which again is a GNU\r
-               endorsed internet routing program."\r
-       ::= { zebra 3 }\r
-\r
-ripngd OBJECT-IDENTITY\r
-       STATUS  current\r
-       DESCRIPTION\r
-               "ripngd is part of the zebra project which again is a GNU\r
-               endorsed internet routing program."\r
-       ::= { zebra 4 }\r
-\r
-ospfd OBJECT-IDENTITY\r
-       STATUS  current\r
-       DESCRIPTION\r
-               "ospfd is part of the zebra project which again is a GNU\r
-               endorsed internet routing program."\r
-       ::= { zebra 5 }\r
-\r
-ospf6d OBJECT-IDENTITY\r
-       STATUS  current\r
-       DESCRIPTION\r
-               "ospf6d is part of the zebra project which again is a GNU\r
-               endorsed internet routing program."\r
-       ::= { zebra 6 }\r
-\r
-END\r

diff --git a/zebra/GNOME-SMI b/zebra/GNOME-SMI
deleted file mode 100644 (file)
index 164732b..0000000
--- a/zebra/GNOME-SMI
+++ /dev/null
@@ -1,53 +0,0 @@
-GNOME-SMI DEFINITIONS ::= BEGIN\r
-\r
-IMPORTS\r
-       MODULE-IDENTITY,\r
-       OBJECT-IDENTITY,\r
-       enterprises\r
-               FROM SNMPv2-SMI;\r
-\r
-gnome MODULE-IDENTITY\r
-       LAST-UPDATED "9809010000Z"\r
-       ORGANIZATION "GNOME project"\r
-       CONTACT-INFO\r
-               "GNU Network Object Model Environment project\r
-               \r
-               see http://www.gnome.org for contact persons of a particular\r
-               area or subproject of GNOME.\r
-\r
-               Administrative contact for MIB module:\r
-\r
-               Jochen Friedrich\r
-               Wingertstr. 70/1\r
-               68809 Neulussheim\r
-               Germany \r
-\r
-               email: snmp@gnome.org"\r
-       DESCRIPTION\r
-               "The Structure of GNOME."\r
-       ::= { enterprises 3317 }        -- assigned by IANA\r
-\r
-gnomeProducts OBJECT-IDENTITY\r
-       STATUS  current\r
-       DESCRIPTION\r
-               "gnomeProducts is the root OBJECT IDENTIFIER from\r
-               which sysObjectID values are assigned."\r
-       ::= { gnome 1 }\r
-\r
-gnomeMgmt OBJECT-IDENTITY\r
-       STATUS  current\r
-       DESCRIPTION\r
-               "gnomeMgmt defines the subtree for production GNOME related\r
-               MIB registrations."\r
-       ::= { gnome 2 }\r
-\r
-gnomeTest OBJECT-IDENTITY\r
-       STATUS  current\r
-       DESCRIPTION\r
-               "gnomeTest defines the subtree for testing GNOME related\r
-               MIB registrations."\r
-       ::= { gnome 3 }\r
-\r
--- more to come if necessary.\r
-\r
-END\r

diff --git a/zebra/subdir.am b/zebra/subdir.am
index 69f7bc2041163e6c7ca7ceff7ead308f40493646..5dc3750315b14b4ac789700120b9f65cb152f476 100644 (file)
--- a/zebra/subdir.am
+++ b/zebra/subdir.am
@@ -141,8 +141,3 @@ if DEV_BUILD
 zebra_zebra_fpm_la_SOURCES += zebra/zebra_fpm_dt.c
 endif
 endif
-
-EXTRA_DIST += \
-       zebra/GNOME-SMI \
-       zebra/GNOME-PRODUCT-ZEBRA-MIB \
-       # end