[Pkg-net-snmp-commits] r290 - branches/net-snmp54/debian/patches branches/net-snmp54-dev/debian/patches trunk/debian/patches

Jochen Friedrich jochen at alioth.debian.org
Fri Nov 6 14:43:13 UTC 2009


Author: jochen
Date: 2009-11-06 14:43:13 +0000 (Fri, 06 Nov 2009)
New Revision: 290

Modified:
   branches/net-snmp54-dev/debian/patches/03_makefiles.patch
   branches/net-snmp54/debian/patches/03_makefiles.patch
   trunk/debian/patches/03_makefiles.patch
Log:
Install scripts with correct permissions.


Modified: branches/net-snmp54/debian/patches/03_makefiles.patch
===================================================================
--- branches/net-snmp54/debian/patches/03_makefiles.patch	2009-11-06 13:28:41 UTC (rev 289)
+++ branches/net-snmp54/debian/patches/03_makefiles.patch	2009-11-06 14:43:13 UTC (rev 290)
@@ -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-03 15:24:11.000000000 +0100
-+++ net-snmp-5.4.2.1/local/Makefile.in	2009-11-03 15:25:09.000000000 +0100
+--- net-snmp-5.4.2.1.orig/local/Makefile.in	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/local/Makefile.in	2009-11-06 15:05:53.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-03 15:24:11.000000000 +0100
-+++ net-snmp-5.4.2.1/Makefile.top	2009-11-03 15:25:09.000000000 +0100
+--- net-snmp-5.4.2.1.orig/Makefile.top	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.top	2009-11-06 15:05:53.000000000 +0100
 @@ -26,6 +26,7 @@
  snmplibdir	= $(datadir)/snmp
  mibdir		= $(snmplibdir)/mibs
@@ -25,9 +25,9 @@
  
 Index: net-snmp-5.4.2.1/mibs/Makefile.in
 ===================================================================
---- net-snmp-5.4.2.1.orig/mibs/Makefile.in	2009-11-03 15:24:11.000000000 +0100
-+++ net-snmp-5.4.2.1/mibs/Makefile.in	2009-11-03 15:25:09.000000000 +0100
-@@ -13,57 +13,30 @@
+--- net-snmp-5.4.2.1.orig/mibs/Makefile.in	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/mibs/Makefile.in	2009-11-06 15:07:25.000000000 +0100
+@@ -13,57 +13,35 @@
  OTHERUNINSTALL=mibsuninstall
  
  
@@ -70,13 +70,14 @@
 +EXTRAMIBS = BGP4-MIB.txt BRIDGE-MIB.txt GNOME-SMI.txt OSPF-MIB.txt \
 +	OSPF-TRAP-MIB.txt RIPv2-MIB.txt SOURCE-ROUTING-MIB.txt \
 +	LM-SENSORS-MIB.txt
-+
-+MIBS	= $(NETSNMPMIBS) $(UCDMIBS) $(EXTRAMIBS)
  
 -MIBS	= $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \
 -	$(AGENTMIBS) $(IANAMIBS) \
 -	$(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS)
-+HELPERS = Makefile.mib mibfetch smistrip ianalist rfclist rfcmibs.diff
++MIBS	= $(NETSNMPMIBS) $(UCDMIBS) $(EXTRAMIBS)
++
++HELPERS = Makefile.mib ianalist rfclist rfcmibs.diff
++BINHELPERS = mibfetch smistrip
  
  all: standardall
  
@@ -86,17 +87,21 @@
  		$(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_PREFIX)$(mibdir) ; \
  		echo "install: installed $$i in $(INSTALL_PREFIX)$(mibdir)" ; \
  	done
++	@for i in $(BINHELPERS) ; do \
++		$(INSTALL) $(srcdir)/$$i $(INSTALL_PREFIX)$(mibdir) ; \
++		echo "install: installed $$i in $(INSTALL_PREFIX)$(mibdir)" ; \
++	done
  
  mibsuninstall: installdirs
 -	@for i in $(MIBS) ; do \
-+	@for i in $(MIBS) $(HELPERS) ; do \
++	@for i in $(MIBS) $(HELPERS) $(BINHELPERS) ; do \
  		rm -f $(INSTALL_PREFIX)$(mibdir)/$$i ; \
  		echo "removed $$i from $(INSTALL_PREFIX)$(mibdir)" ; \
  	done
 Index: net-snmp-5.4.2.1/mibs/Makefile.mib
 ===================================================================
---- net-snmp-5.4.2.1.orig/mibs/Makefile.mib	2009-11-03 15:24:11.000000000 +0100
-+++ net-snmp-5.4.2.1/mibs/Makefile.mib	2009-11-03 15:25:09.000000000 +0100
+--- net-snmp-5.4.2.1.orig/mibs/Makefile.mib	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/mibs/Makefile.mib	2009-11-06 15:05:53.000000000 +0100
 @@ -5,9 +5,9 @@
  IANAHOST =	http://www.iana.org
  IANADIR =	assignments
@@ -121,8 +126,8 @@
  ianamibs:	ianalist
 Index: net-snmp-5.4.2.1/Makefile.in
 ===================================================================
---- net-snmp-5.4.2.1.orig/Makefile.in	2009-11-03 15:27:14.000000000 +0100
-+++ net-snmp-5.4.2.1/Makefile.in	2009-11-03 15:27:43.000000000 +0100
+--- net-snmp-5.4.2.1.orig/Makefile.in	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.in	2009-11-06 15:05:53.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-11-06 13:28:41 UTC (rev 289)
+++ branches/net-snmp54-dev/debian/patches/03_makefiles.patch	2009-11-06 14:43:13 UTC (rev 290)
@@ -1,6 +1,8 @@
---- net-snmp-5.1.2.orig/local/Makefile.in
-+++ net-snmp-5.1.2/local/Makefile.in
-@@ -58,7 +58,7 @@
+Index: net-snmp-5.4.2.1/local/Makefile.in
+===================================================================
+--- net-snmp-5.4.2.1.orig/local/Makefile.in	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/local/Makefile.in	2009-11-06 15:05:53.000000000 +0100
+@@ -100,7 +100,7 @@
  
  mib2c.made: $(srcdir)/mib2c
  	if test "x$(PERL)" != "x" ; then \
@@ -9,32 +11,129 @@
  	else \
  	  touch mib2c.made; \
          fi
---- net-snmp-5.1.2.orig/mibs/Makefile.in
-+++ net-snmp-5.1.2/mibs/Makefile.in
-@@ -43,11 +43,15 @@
+Index: net-snmp-5.4.2.1/Makefile.top
+===================================================================
+--- net-snmp-5.4.2.1.orig/Makefile.top	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.top	2009-11-06 15:05:53.000000000 +0100
+@@ -26,6 +26,7 @@
+ snmplibdir	= $(datadir)/snmp
+ mibdir		= $(snmplibdir)/mibs
+ persistentdir	= @PERSISTENT_DIRECTORY@
++sysconfdir	= @sysconfdir@
+ DESTDIR         = @INSTALL_PREFIX@
+ INSTALL_PREFIX  = $(DESTDIR)
+ 
+Index: net-snmp-5.4.2.1/mibs/Makefile.in
+===================================================================
+--- net-snmp-5.4.2.1.orig/mibs/Makefile.in	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/mibs/Makefile.in	2009-11-06 15:07:25.000000000 +0100
+@@ -13,57 +13,35 @@
+ OTHERUNINSTALL=mibsuninstall
+ 
+ 
+-V1MIBS	= RFC1155-SMI.txt RFC1213-MIB.txt RFC-1215.txt
+-
+-V2MIBS = SNMPv2-CONF.txt SNMPv2-SMI.txt SNMPv2-TC.txt SNMPv2-TM.txt \
+-	SNMPv2-MIB.txt
+-
+-V3MIBS	= SNMP-FRAMEWORK-MIB.txt SNMP-MPD-MIB.txt SNMP-TARGET-MIB.txt \
+-	SNMP-NOTIFICATION-MIB.txt SNMP-PROXY-MIB.txt \
+-	SNMP-USER-BASED-SM-MIB.txt SNMP-VIEW-BASED-ACM-MIB.txt \
+-	SNMP-COMMUNITY-MIB.txt TRANSPORT-ADDRESS-MIB.txt
+-
+-AGENTMIBS = AGENTX-MIB.txt SMUX-MIB.txt
+-
+-IANAMIBS = IANAifType-MIB.txt IANA-LANGUAGE-MIB.txt \
+-	IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
+-
+-RFCMIBS	= IF-MIB.txt IF-INVERTED-STACK-MIB.txt \
+-	EtherLike-MIB.txt \
+-	IP-MIB.txt IP-FORWARD-MIB.txt IANA-RTPROTO-MIB.txt \
+-	TCP-MIB.txt UDP-MIB.txt \
+-	INET-ADDRESS-MIB.txt HCNUM-TC.txt \
+-	HOST-RESOURCES-MIB.txt HOST-RESOURCES-TYPES.txt \
+-	RMON-MIB.txt \
+-	IPV6-TC.txt IPV6-MIB.txt IPV6-ICMP-MIB.txt IPV6-TCP-MIB.txt \
+-	IPV6-UDP-MIB.txt \
+-	DISMAN-EVENT-MIB.txt DISMAN-SCRIPT-MIB.txt DISMAN-SCHEDULE-MIB.txt \
+-	NOTIFICATION-LOG-MIB.txt SNMP-USM-AES-MIB.txt \
+-	SNMP-USM-DH-OBJECTS-MIB.txt \
+-	SCTP-MIB.txt
+-
+ NETSNMPMIBS = NET-SNMP-TC.txt NET-SNMP-MIB.txt NET-SNMP-AGENT-MIB.txt \
+ 	NET-SNMP-EXAMPLES-MIB.txt NET-SNMP-EXTEND-MIB.txt
+ 
  UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
  	UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
  
+-DEFAULTMIBS = @default_mibs_install@
 +EXTRAMIBS = BGP4-MIB.txt BRIDGE-MIB.txt GNOME-SMI.txt OSPF-MIB.txt \
 +	OSPF-TRAP-MIB.txt RIPv2-MIB.txt SOURCE-ROUTING-MIB.txt \
 +	LM-SENSORS-MIB.txt
-+
- DEFAULTMIBS = @default_mibs_install@
  
- MIBS	= $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \
- 	$(AGENTMIBS) $(IANAMIBS) \
+-MIBS	= $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \
+-	$(AGENTMIBS) $(IANAMIBS) \
 -	$(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS)
-+	$(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS) $(EXTRAMIBS)
++MIBS	= $(NETSNMPMIBS) $(UCDMIBS) $(EXTRAMIBS)
++
++HELPERS = Makefile.mib ianalist rfclist rfcmibs.diff
++BINHELPERS = mibfetch smistrip
  
  all: standardall
  
---- net-snmp-5.1.2.orig/Makefile.top
-+++ net-snmp-5.1.2/Makefile.top
-@@ -27,6 +27,7 @@
- snmplibdir	= $(datadir)/snmp
- mibdir		= $(snmplibdir)/mibs
- persistentdir	= @PERSISTENT_DIRECTORY@
-+sysconfdir	= @sysconfdir@
- DESTDIR         = @INSTALL_PREFIX@
- INSTALL_PREFIX  = @INSTALL_PREFIX@
+ mibsinstall: installdirs
+-	@for i in $(MIBS) ; do \
++	@for i in $(MIBS) $(HELPERS) ; do \
+ 		$(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_PREFIX)$(mibdir) ; \
+ 		echo "install: installed $$i in $(INSTALL_PREFIX)$(mibdir)" ; \
+ 	done
++	@for i in $(BINHELPERS) ; do \
++		$(INSTALL) $(srcdir)/$$i $(INSTALL_PREFIX)$(mibdir) ; \
++		echo "install: installed $$i in $(INSTALL_PREFIX)$(mibdir)" ; \
++	done
  
+ mibsuninstall: installdirs
+-	@for i in $(MIBS) ; do \
++	@for i in $(MIBS) $(HELPERS) $(BINHELPERS) ; do \
+ 		rm -f $(INSTALL_PREFIX)$(mibdir)/$$i ; \
+ 		echo "removed $$i from $(INSTALL_PREFIX)$(mibdir)" ; \
+ 	done
+Index: net-snmp-5.4.2.1/mibs/Makefile.mib
+===================================================================
+--- net-snmp-5.4.2.1.orig/mibs/Makefile.mib	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/mibs/Makefile.mib	2009-11-06 15:05:53.000000000 +0100
+@@ -5,9 +5,9 @@
+ IANAHOST =	http://www.iana.org
+ IANADIR =	assignments
+ 
+-PREFIX =	/usr/local
+-ALLDIR =	$(PREFIX)/share/snmp/rfc.orig
+-INSTDIR =	$(PREFIX)/share/snmp/rfc
++PREFIX =	/usr
++ALLDIR =	/var/tmp/rfc.orig
++INSTDIR =	$(PREFIX)/share/snmp/mibs
+ 
+ MIBS =	SNMPv2-TC.txt SNMPv2-TM.txt SNMPv2-SMI.txt SNMPv2-MIB.txt \
+ 	SNMPv2-CONF.txt HCNUM-TC.txt INET-ADDRESS-MIB.txt \
+@@ -158,7 +158,7 @@
+ RFC1213-MIB.txt:	$(MIBDEPS)
+ 	./mibfetch $(RFCHOST) $(RFCDIR) 1213
+ 
+-SCTP.txt:	$(MIBDEPS)
++SCTP-MIB.txt:	$(MIBDEPS)
+ 	./mibfetch $(RFCHOST) $(RFCDIR) 3873
+ 
+ ianamibs:	ianalist
+Index: net-snmp-5.4.2.1/Makefile.in
+===================================================================
+--- net-snmp-5.4.2.1.orig/Makefile.in	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.in	2009-11-06 15:05:53.000000000 +0100
+@@ -156,7 +156,7 @@
+ #
+ # override LD_RUN_PATH to avoid dependencies on the build directory
+ perlmodules: perlmakefiles subdirs
+-	@(cd perl ; $(MAKE) LD_RUN_PATH="$(libdir):`$(PERL) -e 'use Config; print qq($$Config{archlibexp}/CORE);'`") ; \
++	@(cd perl ; $(MAKE) LD_RUN_PATH="") ; \
+         if test $$? != 0 ; then \
+            exit 1 ; \
+         fi

Modified: trunk/debian/patches/03_makefiles.patch
===================================================================
--- trunk/debian/patches/03_makefiles.patch	2009-11-06 13:28:41 UTC (rev 289)
+++ trunk/debian/patches/03_makefiles.patch	2009-11-06 14:43:13 UTC (rev 290)
@@ -1,6 +1,8 @@
---- net-snmp-5.1.2.orig/local/Makefile.in
-+++ net-snmp-5.1.2/local/Makefile.in
-@@ -58,7 +58,7 @@
+Index: net-snmp-5.4.2.1/local/Makefile.in
+===================================================================
+--- net-snmp-5.4.2.1.orig/local/Makefile.in	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/local/Makefile.in	2009-11-06 15:05:53.000000000 +0100
+@@ -100,7 +100,7 @@
  
  mib2c.made: $(srcdir)/mib2c
  	if test "x$(PERL)" != "x" ; then \
@@ -9,32 +11,129 @@
  	else \
  	  touch mib2c.made; \
          fi
---- net-snmp-5.1.2.orig/mibs/Makefile.in
-+++ net-snmp-5.1.2/mibs/Makefile.in
-@@ -43,11 +43,15 @@
+Index: net-snmp-5.4.2.1/Makefile.top
+===================================================================
+--- net-snmp-5.4.2.1.orig/Makefile.top	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.top	2009-11-06 15:05:53.000000000 +0100
+@@ -26,6 +26,7 @@
+ snmplibdir	= $(datadir)/snmp
+ mibdir		= $(snmplibdir)/mibs
+ persistentdir	= @PERSISTENT_DIRECTORY@
++sysconfdir	= @sysconfdir@
+ DESTDIR         = @INSTALL_PREFIX@
+ INSTALL_PREFIX  = $(DESTDIR)
+ 
+Index: net-snmp-5.4.2.1/mibs/Makefile.in
+===================================================================
+--- net-snmp-5.4.2.1.orig/mibs/Makefile.in	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/mibs/Makefile.in	2009-11-06 15:07:25.000000000 +0100
+@@ -13,57 +13,35 @@
+ OTHERUNINSTALL=mibsuninstall
+ 
+ 
+-V1MIBS	= RFC1155-SMI.txt RFC1213-MIB.txt RFC-1215.txt
+-
+-V2MIBS = SNMPv2-CONF.txt SNMPv2-SMI.txt SNMPv2-TC.txt SNMPv2-TM.txt \
+-	SNMPv2-MIB.txt
+-
+-V3MIBS	= SNMP-FRAMEWORK-MIB.txt SNMP-MPD-MIB.txt SNMP-TARGET-MIB.txt \
+-	SNMP-NOTIFICATION-MIB.txt SNMP-PROXY-MIB.txt \
+-	SNMP-USER-BASED-SM-MIB.txt SNMP-VIEW-BASED-ACM-MIB.txt \
+-	SNMP-COMMUNITY-MIB.txt TRANSPORT-ADDRESS-MIB.txt
+-
+-AGENTMIBS = AGENTX-MIB.txt SMUX-MIB.txt
+-
+-IANAMIBS = IANAifType-MIB.txt IANA-LANGUAGE-MIB.txt \
+-	IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
+-
+-RFCMIBS	= IF-MIB.txt IF-INVERTED-STACK-MIB.txt \
+-	EtherLike-MIB.txt \
+-	IP-MIB.txt IP-FORWARD-MIB.txt IANA-RTPROTO-MIB.txt \
+-	TCP-MIB.txt UDP-MIB.txt \
+-	INET-ADDRESS-MIB.txt HCNUM-TC.txt \
+-	HOST-RESOURCES-MIB.txt HOST-RESOURCES-TYPES.txt \
+-	RMON-MIB.txt \
+-	IPV6-TC.txt IPV6-MIB.txt IPV6-ICMP-MIB.txt IPV6-TCP-MIB.txt \
+-	IPV6-UDP-MIB.txt \
+-	DISMAN-EVENT-MIB.txt DISMAN-SCRIPT-MIB.txt DISMAN-SCHEDULE-MIB.txt \
+-	NOTIFICATION-LOG-MIB.txt SNMP-USM-AES-MIB.txt \
+-	SNMP-USM-DH-OBJECTS-MIB.txt \
+-	SCTP-MIB.txt
+-
+ NETSNMPMIBS = NET-SNMP-TC.txt NET-SNMP-MIB.txt NET-SNMP-AGENT-MIB.txt \
+ 	NET-SNMP-EXAMPLES-MIB.txt NET-SNMP-EXTEND-MIB.txt
+ 
  UCDMIBS = UCD-SNMP-MIB.txt UCD-DEMO-MIB.txt UCD-IPFWACC-MIB.txt \
  	UCD-DLMOD-MIB.txt UCD-DISKIO-MIB.txt
  
+-DEFAULTMIBS = @default_mibs_install@
 +EXTRAMIBS = BGP4-MIB.txt BRIDGE-MIB.txt GNOME-SMI.txt OSPF-MIB.txt \
 +	OSPF-TRAP-MIB.txt RIPv2-MIB.txt SOURCE-ROUTING-MIB.txt \
 +	LM-SENSORS-MIB.txt
-+
- DEFAULTMIBS = @default_mibs_install@
  
- MIBS	= $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \
- 	$(AGENTMIBS) $(IANAMIBS) \
+-MIBS	= $(V1MIBS) $(V2MIBS) $(V3MIBS) $(RFCMIBS) \
+-	$(AGENTMIBS) $(IANAMIBS) \
 -	$(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS)
-+	$(NETSNMPMIBS) $(UCDMIBS) $(DEFAULTMIBS) $(EXTRAMIBS)
++MIBS	= $(NETSNMPMIBS) $(UCDMIBS) $(EXTRAMIBS)
++
++HELPERS = Makefile.mib ianalist rfclist rfcmibs.diff
++BINHELPERS = mibfetch smistrip
  
  all: standardall
  
---- net-snmp-5.1.2.orig/Makefile.top
-+++ net-snmp-5.1.2/Makefile.top
-@@ -27,6 +27,7 @@
- snmplibdir	= $(datadir)/snmp
- mibdir		= $(snmplibdir)/mibs
- persistentdir	= @PERSISTENT_DIRECTORY@
-+sysconfdir	= @sysconfdir@
- DESTDIR         = @INSTALL_PREFIX@
- INSTALL_PREFIX  = @INSTALL_PREFIX@
+ mibsinstall: installdirs
+-	@for i in $(MIBS) ; do \
++	@for i in $(MIBS) $(HELPERS) ; do \
+ 		$(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_PREFIX)$(mibdir) ; \
+ 		echo "install: installed $$i in $(INSTALL_PREFIX)$(mibdir)" ; \
+ 	done
++	@for i in $(BINHELPERS) ; do \
++		$(INSTALL) $(srcdir)/$$i $(INSTALL_PREFIX)$(mibdir) ; \
++		echo "install: installed $$i in $(INSTALL_PREFIX)$(mibdir)" ; \
++	done
  
+ mibsuninstall: installdirs
+-	@for i in $(MIBS) ; do \
++	@for i in $(MIBS) $(HELPERS) $(BINHELPERS) ; do \
+ 		rm -f $(INSTALL_PREFIX)$(mibdir)/$$i ; \
+ 		echo "removed $$i from $(INSTALL_PREFIX)$(mibdir)" ; \
+ 	done
+Index: net-snmp-5.4.2.1/mibs/Makefile.mib
+===================================================================
+--- net-snmp-5.4.2.1.orig/mibs/Makefile.mib	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/mibs/Makefile.mib	2009-11-06 15:05:53.000000000 +0100
+@@ -5,9 +5,9 @@
+ IANAHOST =	http://www.iana.org
+ IANADIR =	assignments
+ 
+-PREFIX =	/usr/local
+-ALLDIR =	$(PREFIX)/share/snmp/rfc.orig
+-INSTDIR =	$(PREFIX)/share/snmp/rfc
++PREFIX =	/usr
++ALLDIR =	/var/tmp/rfc.orig
++INSTDIR =	$(PREFIX)/share/snmp/mibs
+ 
+ MIBS =	SNMPv2-TC.txt SNMPv2-TM.txt SNMPv2-SMI.txt SNMPv2-MIB.txt \
+ 	SNMPv2-CONF.txt HCNUM-TC.txt INET-ADDRESS-MIB.txt \
+@@ -158,7 +158,7 @@
+ RFC1213-MIB.txt:	$(MIBDEPS)
+ 	./mibfetch $(RFCHOST) $(RFCDIR) 1213
+ 
+-SCTP.txt:	$(MIBDEPS)
++SCTP-MIB.txt:	$(MIBDEPS)
+ 	./mibfetch $(RFCHOST) $(RFCDIR) 3873
+ 
+ ianamibs:	ianalist
+Index: net-snmp-5.4.2.1/Makefile.in
+===================================================================
+--- net-snmp-5.4.2.1.orig/Makefile.in	2009-11-06 15:03:06.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.in	2009-11-06 15:05:53.000000000 +0100
+@@ -156,7 +156,7 @@
+ #
+ # override LD_RUN_PATH to avoid dependencies on the build directory
+ perlmodules: perlmakefiles subdirs
+-	@(cd perl ; $(MAKE) LD_RUN_PATH="$(libdir):`$(PERL) -e 'use Config; print qq($$Config{archlibexp}/CORE);'`") ; \
++	@(cd perl ; $(MAKE) LD_RUN_PATH="") ; \
+         if test $$? != 0 ; then \
+            exit 1 ; \
+         fi




More information about the Pkg-net-snmp-commits mailing list