- perl req/prov fix

[packages/net-snmp.git] / net-snmp-link.patch

diff --git a/net-snmp-link.patch b/net-snmp-link.patch
index 097b9a5509287c2fff01a986983911b033834b39..dd01ae3a93309e0bcce5d51968073df12f8c1f05 100644 (file)
--- a/net-snmp-link.patch
+++ b/net-snmp-link.patch
@@ -1,48 +1,40 @@
-diff -urN net-snmp-5.4.org/agent/Makefile.in net-snmp-5.4/agent/Makefile.in
---- net-snmp-5.4.org/agent/Makefile.in 2006-11-07 15:54:25.000000000 +0100
-+++ net-snmp-5.4/agent/Makefile.in     2006-12-21 01:59:59.846638250 +0100
-@@ -74,11 +74,11 @@
+--- net-snmp-5.6/agent/Makefile.in.orig        2010-06-08 23:05:11.000000000 +0200
++++ net-snmp-5.6/agent/Makefile.in     2010-10-24 10:33:36.007741043 +0200
+@@ -108,7 +108,7 @@
  #
  # how to build it info
  #
 -USELIBS               = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
--HELPERLIB     = helpers/libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION)
 +USELIBS               = $(top_builddir)/snmplib/libnetsnmp.la
-+HELPERLIB     = $(top_builddir)/agent/helpers/libnetsnmphelpers.la
- LOCAL_LIBS    = 
- PERLLDOPTS      = @PERLLDOPTS@
--LIBS          = ../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) @AGENTLIBS@ $(PERLLDOPTS)
-+LIBS          = $(top_builddir)/snmplib/libnetsnmp.la @AGENTLIBS@ $(PERLLDOPTS)
- OUR_AGENT_LIBS        = $(INSTALLLIBS) $(HELPERLIB) @WRAPLIBS@ $(LIBS) @DLLIBS@
- CPPFLAGS      = $(TOP_INCLUDES) -I. $(AGENT_INCLUDES) $(MIBGROUP_INCLUDES) \
-                 $(SNMPLIB_INCLUDES) @CPPFLAGS@ 
-@@ -137,11 +137,11 @@
+ AGENTLIB      = libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
+ MIBLIB                = libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
  
+@@ -249,11 +249,11 @@
  
- libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION):    ${LLIBAGENTOBJS}
--      $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS}  $(LIB_LD_LIBS)
-+      $(LIB_LD_CMD) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION) ${LLIBAGENTOBJS} @WRAPLIBS@ $(LIB_LD_LIBS) ${HELPERLIB} ${LIBS}
-       $(RANLIB) libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
  
- libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION):    ${LMIBOBJS}
--      $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS}  $(LIB_LD_LIBS) @SENSORLIBS@
-+      $(LIB_LD_CMD) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION) ${LMIBOBJS} ${HELPERLIB} $(LIB_LD_LIBS) @SENSORLIBS@ -ldl
-       $(RANLIB) libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION)
+ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION):    ${LLIBAGENTOBJS} $(USELIBS)
+-      $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
++      $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) $(LDFLAGS) ${LAGENTLIBS} @LD_NO_UNDEFINED@ $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
+       $(RANLIB) $(AGENTLIB)
  
- agentlib: libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION)
-diff -urN net-snmp-5.4.org/Makefile.rules net-snmp-5.4/Makefile.rules
---- net-snmp-5.4.org/Makefile.rules    2005-10-10 20:47:48.000000000 +0200
-+++ net-snmp-5.4/Makefile.rules        2006-12-21 01:17:16.166418250 +0100
+ libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS)
+-      $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ $(LDFLAGS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
++      $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(LDFLAGS) $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
+       $(RANLIB) $(MIBLIB)
+ 
+ agentlib: $(AGENTLIB)
+--- net-snmp-5.4.1/Makefile.rules.orig 2007-07-07 01:39:10.000000000 +0200
++++ net-snmp-5.4.1/Makefile.rules      2007-09-08 16:43:38.055836050 +0200
 @@ -8,7 +8,7 @@
  
  # the standard items to build: libraries, bins, and sbins
  STANDARDTARGETS     =$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
--STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) $(INSTALLUCDLIBS)
-+STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
+-STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLPOSTLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS) $(INSTALLUCDLIBS)
++STANDARDCLEANTARGETS=$(INSTALLLIBS) $(INSTALLPOSTLIBS) $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
  
  standardall: subdirs $(STANDARDTARGETS)
  
-@@ -175,17 +175,11 @@
+@@ -187,17 +187,11 @@
                $(LIB_LDCONFIG_CMD) ; \
        fi
  
@@ -65,10 +57,9 @@ diff -urN net-snmp-5.4.org/Makefile.rules net-snmp-5.4/Makefile.rules
  
  installsubdirlibs:
        @if test "$(SUBDIRS)" != ""; then \
-diff -urN net-snmp-5.4.org/snmplib/Makefile.in net-snmp-5.4/snmplib/Makefile.in
---- net-snmp-5.4.org/snmplib/Makefile.in       2006-09-19 16:45:29.000000000 +0200
-+++ net-snmp-5.4/snmplib/Makefile.in   2006-12-21 01:17:16.166418250 +0100
-@@ -128,7 +128,6 @@
+--- net-snmp-5.6/snmplib/Makefile.in.orig      2010-05-27 06:06:32.000000000 +0200
++++ net-snmp-5.6/snmplib/Makefile.in   2010-10-24 10:35:59.615743558 +0200
+@@ -134,7 +134,6 @@
  
  # libraries
  INSTALLLIBS=libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
@@ -76,14 +67,16 @@ diff -urN net-snmp-5.4.org/snmplib/Makefile.in net-snmp-5.4/snmplib/Makefile.in
  
  #
  # Things to build
-@@ -188,10 +187,6 @@
-       $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@
-       $(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+@@ -200,11 +199,7 @@
  
--libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
--      $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@
--      $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+ # how to build the libraries.
+ libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
+-      $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
+-      $(RANLIB) $@
 -
- #
- # internal test objects
+-libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
+-      $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
++      $(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@ @LIBS@
+       $(RANLIB) $@
+ 
  #