[Pkg-net-snmp-commits] r325 - branches/net-snmp54/debian branches/net-snmp54/debian/patches branches/net-snmp54-dev/debian/patches trunk/debian/patches
Jochen Friedrich
jochen at alioth.debian.org
Tue Dec 15 13:54:19 UTC 2009
Author: jochen
Date: 2009-12-15 13:54:19 +0000 (Tue, 15 Dec 2009)
New Revision: 325
Modified:
branches/net-snmp54-dev/debian/patches/03_makefiles.patch
branches/net-snmp54/debian/changelog
branches/net-snmp54/debian/patches/03_makefiles.patch
trunk/debian/patches/03_makefiles.patch
Log:
Install all provided NET-SNMP MIBs.
Modified: branches/net-snmp54/debian/changelog
===================================================================
--- branches/net-snmp54/debian/changelog 2009-12-15 13:49:14 UTC (rev 324)
+++ branches/net-snmp54/debian/changelog 2009-12-15 13:54:19 UTC (rev 325)
@@ -2,8 +2,9 @@
* Add conditional depends back that were lost in the build system
change (Closes: #560408)
+ * Install all provided NET-SNMP MIBs.
- -- Jochen Friedrich <jochen at scram.de> Mon, 14 Dec 2009 18:38:07 +0100
+ -- Jochen Friedrich <jochen at scram.de> Tue, 15 Dec 2009 14:47:21 +0100
net-snmp (5.4.2.1~dfsg-4) unstable; urgency=low
Modified: branches/net-snmp54/debian/patches/03_makefiles.patch
===================================================================
--- branches/net-snmp54/debian/patches/03_makefiles.patch 2009-12-15 13:49:14 UTC (rev 324)
+++ branches/net-snmp54/debian/patches/03_makefiles.patch 2009-12-15 13:54:19 UTC (rev 325)
@@ -1,7 +1,7 @@
Index: net-snmp-5.4.2.1/local/Makefile.in
===================================================================
---- net-snmp-5.4.2.1.orig/local/Makefile.in 2009-11-27 15:21:50.000000000 +0100
-+++ net-snmp-5.4.2.1/local/Makefile.in 2009-11-27 15:33:50.000000000 +0100
+--- net-snmp-5.4.2.1.orig/local/Makefile.in 2009-12-14 18:40:54.000000000 +0100
++++ net-snmp-5.4.2.1/local/Makefile.in 2009-12-14 18:42:44.000000000 +0100
@@ -100,7 +100,7 @@
mib2c.made: $(srcdir)/mib2c
@@ -13,8 +13,8 @@
fi
Index: net-snmp-5.4.2.1/Makefile.top
===================================================================
---- net-snmp-5.4.2.1.orig/Makefile.top 2009-11-27 15:21:50.000000000 +0100
-+++ net-snmp-5.4.2.1/Makefile.top 2009-11-27 15:33:50.000000000 +0100
+--- net-snmp-5.4.2.1.orig/Makefile.top 2009-12-14 18:40:54.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.top 2009-12-14 18:42:44.000000000 +0100
@@ -24,8 +24,9 @@
man5dir = $(mandir)/man5
man8dir = $(mandir)/man8
@@ -28,15 +28,17 @@
Index: net-snmp-5.4.2.1/mibs/Makefile.in
===================================================================
---- net-snmp-5.4.2.1.orig/mibs/Makefile.in 2009-11-27 15:21:50.000000000 +0100
-+++ net-snmp-5.4.2.1/mibs/Makefile.in 2009-11-27 15:34:14.000000000 +0100
-@@ -13,53 +13,22 @@
+--- net-snmp-5.4.2.1.orig/mibs/Makefile.in 2009-12-14 18:40:54.000000000 +0100
++++ net-snmp-5.4.2.1/mibs/Makefile.in 2009-12-14 18:48:11.000000000 +0100
+@@ -13,53 +13,24 @@
OTHERUNINSTALL=mibsuninstall
-V1MIBS = RFC1155-SMI.txt RFC1213-MIB.txt RFC-1215.txt
+NETSNMPMIBS = NET-SNMP-TC NET-SNMP-MIB NET-SNMP-AGENT-MIB \
-+ NET-SNMP-EXAMPLES-MIB NET-SNMP-EXTEND-MIB
++ NET-SNMP-EXAMPLES-MIB NET-SNMP-EXTEND-MIB \
++ NET-SNMP-MONITOR-MIB NET-SNMP-SYSTEM-MIB \
++ NET-SNMP-VACM-MIB
-V2MIBS = SNMPv2-CONF.txt SNMPv2-SMI.txt SNMPv2-TC.txt SNMPv2-TM.txt \
- SNMPv2-MIB.txt
@@ -96,8 +98,8 @@
mibsuninstall: installdirs
Index: net-snmp-5.4.2.1/Makefile.in
===================================================================
---- net-snmp-5.4.2.1.orig/Makefile.in 2009-11-27 15:21:50.000000000 +0100
-+++ net-snmp-5.4.2.1/Makefile.in 2009-11-27 15:33:50.000000000 +0100
+--- net-snmp-5.4.2.1.orig/Makefile.in 2009-12-14 18:40:54.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.in 2009-12-14 18:42:44.000000000 +0100
@@ -156,7 +156,7 @@
#
# override LD_RUN_PATH to avoid dependencies on the build directory
Modified: branches/net-snmp54-dev/debian/patches/03_makefiles.patch
===================================================================
--- branches/net-snmp54-dev/debian/patches/03_makefiles.patch 2009-12-15 13:49:14 UTC (rev 324)
+++ branches/net-snmp54-dev/debian/patches/03_makefiles.patch 2009-12-15 13:54:19 UTC (rev 325)
@@ -1,7 +1,7 @@
Index: net-snmp-5.4.2.1/local/Makefile.in
===================================================================
---- net-snmp-5.4.2.1.orig/local/Makefile.in 2009-11-06 17:21:05.000000000 +0100
-+++ net-snmp-5.4.2.1/local/Makefile.in 2009-11-06 17:25:10.000000000 +0100
+--- net-snmp-5.4.2.1.orig/local/Makefile.in 2009-12-14 18:40:54.000000000 +0100
++++ net-snmp-5.4.2.1/local/Makefile.in 2009-12-14 18:42:44.000000000 +0100
@@ -100,7 +100,7 @@
mib2c.made: $(srcdir)/mib2c
@@ -13,8 +13,8 @@
fi
Index: net-snmp-5.4.2.1/Makefile.top
===================================================================
---- net-snmp-5.4.2.1.orig/Makefile.top 2009-11-06 17:21:05.000000000 +0100
-+++ net-snmp-5.4.2.1/Makefile.top 2009-11-06 17:25:41.000000000 +0100
+--- net-snmp-5.4.2.1.orig/Makefile.top 2009-12-14 18:40:54.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.top 2009-12-14 18:42:44.000000000 +0100
@@ -24,8 +24,9 @@
man5dir = $(mandir)/man5
man8dir = $(mandir)/man8
@@ -28,15 +28,17 @@
Index: net-snmp-5.4.2.1/mibs/Makefile.in
===================================================================
---- net-snmp-5.4.2.1.orig/mibs/Makefile.in 2009-11-06 17:21:05.000000000 +0100
-+++ net-snmp-5.4.2.1/mibs/Makefile.in 2009-11-06 17:25:10.000000000 +0100
-@@ -13,53 +13,33 @@
+--- net-snmp-5.4.2.1.orig/mibs/Makefile.in 2009-12-14 18:40:54.000000000 +0100
++++ net-snmp-5.4.2.1/mibs/Makefile.in 2009-12-14 18:48:11.000000000 +0100
+@@ -13,53 +13,24 @@
OTHERUNINSTALL=mibsuninstall
-V1MIBS = RFC1155-SMI.txt RFC1213-MIB.txt RFC-1215.txt
+NETSNMPMIBS = NET-SNMP-TC NET-SNMP-MIB NET-SNMP-AGENT-MIB \
-+ NET-SNMP-EXAMPLES-MIB NET-SNMP-EXTEND-MIB
++ NET-SNMP-EXAMPLES-MIB NET-SNMP-EXTEND-MIB \
++ NET-SNMP-MONITOR-MIB NET-SNMP-SYSTEM-MIB \
++ NET-SNMP-VACM-MIB
-V2MIBS = SNMPv2-CONF.txt SNMPv2-SMI.txt SNMPv2-TC.txt SNMPv2-TM.txt \
- SNMPv2-MIB.txt
@@ -81,9 +83,6 @@
+EXTRAMIBS = GNOME-SMI LM-SENSORS-MIB
+
+MIBS = $(NETSNMPMIBS) $(UCDMIBS) $(EXTRAMIBS)
-+
-+HELPERS = Makefile.mib ianalist rfclist rfcmibs.diff
-+BINHELPERS = mibfetch smistrip
all: standardall
@@ -94,32 +93,13 @@
+ @for i in $(MIBS); do \
+ $(INSTALL_DATA) $(srcdir)/$$i.txt $(INSTALL_PREFIX)$(mibdir)/$$i ; \
+ echo "install: installed $$i.txt in $(INSTALL_PREFIX)$(mibdir)/$$i" ; \
-+ done
-+ @for i in $(HELPERS); do \
-+ $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_PREFIX)$(datadir)/mibs ; \
-+ echo "install: installed $$i in $(INSTALL_PREFIX)$(datadir)/mibs" ; \
-+ done
-+ @for i in $(BINHELPERS) ; do \
-+ $(INSTALL) $(srcdir)/$$i $(INSTALL_PREFIX)$(datadir)/mibs ; \
-+ echo "install: installed $$i in $(INSTALL_PREFIX)$(datadir)/mibs" ; \
done
mibsuninstall: installdirs
-@@ -67,6 +47,10 @@
- rm -f $(INSTALL_PREFIX)$(mibdir)/$$i ; \
- echo "removed $$i from $(INSTALL_PREFIX)$(mibdir)" ; \
- done
-+ @for i in $(HELPERS) $(BINHELPERS) ; do \
-+ rm -f $(INSTALL_PREFIX)$(mibdir)/$$i ; \
-+ echo "removed $$i from $(INSTALL_PREFIX)$(datadir)/mibs" ; \
-+ done
-
- installdirs:
- @$(SHELL) $(srcdir)/../mkinstalldirs $(INSTALL_PREFIX)$(mibdir)
Index: net-snmp-5.4.2.1/Makefile.in
===================================================================
---- net-snmp-5.4.2.1.orig/Makefile.in 2009-11-06 17:21:05.000000000 +0100
-+++ net-snmp-5.4.2.1/Makefile.in 2009-11-06 17:25:10.000000000 +0100
+--- net-snmp-5.4.2.1.orig/Makefile.in 2009-12-14 18:40:54.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.in 2009-12-14 18:42:44.000000000 +0100
@@ -156,7 +156,7 @@
#
# override LD_RUN_PATH to avoid dependencies on the build directory
Modified: trunk/debian/patches/03_makefiles.patch
===================================================================
--- trunk/debian/patches/03_makefiles.patch 2009-12-15 13:49:14 UTC (rev 324)
+++ trunk/debian/patches/03_makefiles.patch 2009-12-15 13:54:19 UTC (rev 325)
@@ -1,7 +1,7 @@
Index: net-snmp-5.4.2.1/local/Makefile.in
===================================================================
---- net-snmp-5.4.2.1.orig/local/Makefile.in 2009-11-06 17:21:05.000000000 +0100
-+++ net-snmp-5.4.2.1/local/Makefile.in 2009-11-06 17:25:10.000000000 +0100
+--- net-snmp-5.4.2.1.orig/local/Makefile.in 2009-12-14 18:40:54.000000000 +0100
++++ net-snmp-5.4.2.1/local/Makefile.in 2009-12-14 18:42:44.000000000 +0100
@@ -100,7 +100,7 @@
mib2c.made: $(srcdir)/mib2c
@@ -13,8 +13,8 @@
fi
Index: net-snmp-5.4.2.1/Makefile.top
===================================================================
---- net-snmp-5.4.2.1.orig/Makefile.top 2009-11-06 17:21:05.000000000 +0100
-+++ net-snmp-5.4.2.1/Makefile.top 2009-11-06 17:25:41.000000000 +0100
+--- net-snmp-5.4.2.1.orig/Makefile.top 2009-12-14 18:40:54.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.top 2009-12-14 18:42:44.000000000 +0100
@@ -24,8 +24,9 @@
man5dir = $(mandir)/man5
man8dir = $(mandir)/man8
@@ -28,15 +28,17 @@
Index: net-snmp-5.4.2.1/mibs/Makefile.in
===================================================================
---- net-snmp-5.4.2.1.orig/mibs/Makefile.in 2009-11-06 17:21:05.000000000 +0100
-+++ net-snmp-5.4.2.1/mibs/Makefile.in 2009-11-06 17:25:10.000000000 +0100
-@@ -13,53 +13,33 @@
+--- net-snmp-5.4.2.1.orig/mibs/Makefile.in 2009-12-14 18:40:54.000000000 +0100
++++ net-snmp-5.4.2.1/mibs/Makefile.in 2009-12-14 18:48:11.000000000 +0100
+@@ -13,53 +13,24 @@
OTHERUNINSTALL=mibsuninstall
-V1MIBS = RFC1155-SMI.txt RFC1213-MIB.txt RFC-1215.txt
+NETSNMPMIBS = NET-SNMP-TC NET-SNMP-MIB NET-SNMP-AGENT-MIB \
-+ NET-SNMP-EXAMPLES-MIB NET-SNMP-EXTEND-MIB
++ NET-SNMP-EXAMPLES-MIB NET-SNMP-EXTEND-MIB \
++ NET-SNMP-MONITOR-MIB NET-SNMP-SYSTEM-MIB \
++ NET-SNMP-VACM-MIB
-V2MIBS = SNMPv2-CONF.txt SNMPv2-SMI.txt SNMPv2-TC.txt SNMPv2-TM.txt \
- SNMPv2-MIB.txt
@@ -81,9 +83,6 @@
+EXTRAMIBS = GNOME-SMI LM-SENSORS-MIB
+
+MIBS = $(NETSNMPMIBS) $(UCDMIBS) $(EXTRAMIBS)
-+
-+HELPERS = Makefile.mib ianalist rfclist rfcmibs.diff
-+BINHELPERS = mibfetch smistrip
all: standardall
@@ -94,32 +93,13 @@
+ @for i in $(MIBS); do \
+ $(INSTALL_DATA) $(srcdir)/$$i.txt $(INSTALL_PREFIX)$(mibdir)/$$i ; \
+ echo "install: installed $$i.txt in $(INSTALL_PREFIX)$(mibdir)/$$i" ; \
-+ done
-+ @for i in $(HELPERS); do \
-+ $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_PREFIX)$(datadir)/mibs ; \
-+ echo "install: installed $$i in $(INSTALL_PREFIX)$(datadir)/mibs" ; \
-+ done
-+ @for i in $(BINHELPERS) ; do \
-+ $(INSTALL) $(srcdir)/$$i $(INSTALL_PREFIX)$(datadir)/mibs ; \
-+ echo "install: installed $$i in $(INSTALL_PREFIX)$(datadir)/mibs" ; \
done
mibsuninstall: installdirs
-@@ -67,6 +47,10 @@
- rm -f $(INSTALL_PREFIX)$(mibdir)/$$i ; \
- echo "removed $$i from $(INSTALL_PREFIX)$(mibdir)" ; \
- done
-+ @for i in $(HELPERS) $(BINHELPERS) ; do \
-+ rm -f $(INSTALL_PREFIX)$(mibdir)/$$i ; \
-+ echo "removed $$i from $(INSTALL_PREFIX)$(datadir)/mibs" ; \
-+ done
-
- installdirs:
- @$(SHELL) $(srcdir)/../mkinstalldirs $(INSTALL_PREFIX)$(mibdir)
Index: net-snmp-5.4.2.1/Makefile.in
===================================================================
---- net-snmp-5.4.2.1.orig/Makefile.in 2009-11-06 17:21:05.000000000 +0100
-+++ net-snmp-5.4.2.1/Makefile.in 2009-11-06 17:25:10.000000000 +0100
+--- net-snmp-5.4.2.1.orig/Makefile.in 2009-12-14 18:40:54.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.in 2009-12-14 18:42:44.000000000 +0100
@@ -156,7 +156,7 @@
#
# override LD_RUN_PATH to avoid dependencies on the build directory
More information about the Pkg-net-snmp-commits
mailing list