- updated for 5.4.1

Changed files:
    net-snmp-acfix.patch -> 1.12
    net-snmp-link.patch -> 1.10
    net-snmp-python.patch -> 1.3

diff --git a/net-snmp-acfix.patch b/net-snmp-acfix.patch
index fa64d0d45c28994042caf56f7108f05512676ee2..57e6e2100836aefa06192eeb41a7bc0633b399ac 100644 (file)
--- a/net-snmp-acfix.patch
+++ b/net-snmp-acfix.patch
@@ -1,7 +1,6 @@
-diff -ur net-snmp-5.3.org/configure.in net-snmp-5.3/configure.in
---- net-snmp-5.3.org/configure.in      2005-12-28 18:20:56.000000000 +0100
-+++ net-snmp-5.3/configure.in  2006-01-09 01:07:39.031490000 +0100
-@@ -1699,16 +1699,18 @@
+--- net-snmp-5.4.1/configure.in.orig   2007-07-27 19:02:00.000000000 +0200
++++ net-snmp-5.4.1/configure.in        2007-09-08 16:13:11.531748373 +0200
+@@ -1726,16 +1726,18 @@
  rebuilt_new_with_security=
  already_checked_krb5=no
  
@@ -21,7 +20,7 @@ diff -ur net-snmp-5.3.org/configure.in net-snmp-5.3/configure.in
      if test no = $trykrb5; then
        AC_MSG_NOTICE([configured not to use krb5. disabling ksm])
        continue
-@@ -1718,7 +1720,7 @@
+@@ -1745,7 +1747,7 @@
  
      if test no != $krb5_config; then
        CPPFLAGS="$CPPFLAGS `$krb5_config --cflags`"
@@ -30,7 +29,7 @@ diff -ur net-snmp-5.3.org/configure.in net-snmp-5.3/configure.in
      elif test $krb5path != no; then
        AC_ADD_SEARCH_PATH($krb5path)
      else
-@@ -1755,29 +1757,34 @@
+@@ -1782,29 +1784,35 @@
      if test $ac_cv_heimdal = yes; then
        AC_DEFINE(NETSNMP_USE_KERBEROS_HEIMDAL)
        if test no = $krb5_config; then
@@ -72,60 +71,8 @@ diff -ur net-snmp-5.3.org/configure.in net-snmp-5.3/configure.in
 +      AC_MSG_RESULT(old MIT crypto API)
      fi
 +    ])
++    LNETSNMPLIBS="$LNETSNMPLIBS $KRB5_LIBS"
 +    LIBS="$old_LIBS"
    fi
  done
-
-@@ -2661,23 +2661,6 @@
-     LIBS="${LIBS} -ladm"
-     AGENTLIBS="${AGENTLIBS} -ladm"))
  
--case $target_os in
--    aix*) # AIX perfstat library, needed for CPU/memory statistics
--        AC_CHECK_HEADERS(libperfstat.h,
--            AC_CHECK_LIB(perfstat, perfstat_cpu_total, AC_DEFINE(HAVE_PERFSTAT)
--            AGENTLIBS="${AGENTLIBS} -lperfstat"), AC_MSG_ERROR([
--
--*** To monitor CPU/memory values in AIX you need to install
--*** libperfstat which can be found in bos.perf
--]))
--        ;;
--    hpux*) # HP-UX agent needs open_mib
--        AC_CHECK_LIB(nm, open_mib, AC_DEFINE(HAVE_LIBNM)
--            AGENTLIBS="${AGENTLIBS} -lnm")
--        ;;
--    *)
--        ;;
--esac
- # WIN32
- # (mingw32 must link winsock explicitly)
- AC_CHECK_HEADERS(winsock.h,[
-@@ -2880,7 +2863,7 @@
- 
- AC_MSG_RESULT([$ac_cv_type_ssize_t])
- if test $ac_cv_type_ssize_t = yes; then
--  AC_DEFINE(HAVE_SSIZE_T)
-+  AC_DEFINE(HAVE_SSIZE_T,,[have ssize_t])
- fi
- 
- # Check ps args
---- net-snmp-5.4/agent/mibgroup/Makefile.in.orig       2006-09-13 19:00:27.000000000 +0200
-+++ net-snmp-5.4/agent/mibgroup/Makefile.in    2006-12-02 11:51:38.369040000 +0100
-@@ -22,9 +22,13 @@
- .c.o:
-       $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
- 
--OBJS  = @mib_module_list_o@
--LOBJS = @mib_module_list_lo@
--SRCS  = @mib_module_list_c@
-+@mib_module_list_o@
-+@mib_module_list_lo@
-+@mib_module_list_c@
-+
-+OBJS  = $(mib_module_list_o)
-+LOBJS = $(mib_module_list_lo)
-+SRCS  = $(mib_module_list_c)
- 
- all: standardall $(LOBJS)
- 
-

diff --git a/net-snmp-link.patch b/net-snmp-link.patch
index 21500d44a17556a23c1eb13bd6faaef9bb16daef..18a79fe7142909d9c753d8a381c55bd0eda1f256 100644 (file)
--- a/net-snmp-link.patch
+++ b/net-snmp-link.patch
@@ -1,7 +1,6 @@
-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.4.1/agent/Makefile.in.orig      2007-07-05 01:26:56.000000000 +0200
++++ net-snmp-5.4.1/agent/Makefile.in   2007-09-08 16:50:07.310018380 +0200
+@@ -74,8 +74,8 @@
  #
  # how to build it info
  #
@@ -9,40 +8,35 @@ diff -urN net-snmp-5.4.org/agent/Makefile.in net-snmp-5.4/agent/Makefile.in
 -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)
  
+@@ -143,11 +143,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} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS)
++      $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) $(LDFLAGS) ${LAGENTLIBS} $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS)
+       $(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} $(HELPERLIB) $(AGENTLIB) $(USELIBS)
+-      $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) ${LMIBLIBS} $(LDFLAGS) $(LIB_LD_LIBS)
++      $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) $(LDFLAGS) ${LMIBLIBS} $(LIB_LD_LIBS)
+       $(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,9 +59,8 @@ 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
+--- net-snmp-5.4.1/snmplib/Makefile.in.orig    2007-06-18 23:34:43.000000000 +0200
++++ net-snmp-5.4.1/snmplib/Makefile.in 2007-09-08 16:48:42.425181069 +0200
 @@ -128,7 +128,6 @@
  
  # libraries
@@ -76,17 +69,13 @@ diff -urN net-snmp-5.4.org/snmplib/Makefile.in net-snmp-5.4/snmplib/Makefile.in
  
  #
  # Things to build
-@@ -188,13 +187,9 @@
- 
- # how to build the libraries.
- libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
--      $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@
-+      $(LIB_LD_CMD) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @KRB5_LIBS@ @LIBCRYPTO@
-       $(RANLIB) libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+@@ -191,10 +190,6 @@
+       $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
+       $(RANLIB) $@
  
--libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    ${TOBJS}
--      $(LIB_LD_CMD) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION) ${TOBJS} ${LDFLAGS} @LIBCRYPTO@
--      $(RANLIB) libsnmp.$(LIB_EXTENSION)$(LIB_VERSION)
+-libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
+-      $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@
+-      $(RANLIB) $@
 -
  #
  # internal test objects

diff --git a/net-snmp-python.patch b/net-snmp-python.patch
index 84876d21e3ab0844ab0c0337e2eb590d62536d7c..3dc585d79ad135edbe4bfa2c1291aaaaf140fa44 100644 (file)
--- a/net-snmp-python.patch
+++ b/net-snmp-python.patch
@@ -1,11 +1,11 @@
---- net-snmp-5.4/Makefile.in.orig      2006-11-07 15:54:25.000000000 +0100
-+++ net-snmp-5.4/Makefile.in   2006-12-02 18:50:02.611735250 +0100
-@@ -208,7 +208,7 @@
+--- net-snmp-5.4.1/Makefile.in.orig    2007-06-08 22:32:56.000000000 +0200
++++ net-snmp-5.4.1/Makefile.in 2007-09-08 17:04:04.289715135 +0200
+@@ -207,7 +207,7 @@
          fi
  
  pythoninstall:
--      @(cd python ; $(PYMAKE) install) ; \
-+      @(cd python ; $(PYMAKE) install --optimize=2 --root=$(DESTDIR)) ; \
+-      @(dir=`pwd`; cd python; $(PYMAKE) install --basedir=$$dir) ; \
++      @(dir=`pwd`; cd python; $(PYMAKE) install --optimize=2 --root=$(DESTDIR) --basedir=$$dir) ; \
          if test $$? != 0 ; then \
             exit 1 ; \
          fi