Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory vz-cvs-3.sog:/tmp/cvs-serv26602/main/finkinfo/net

Modified Files:
        net-snmp-unified.info net-snmp-unified.patch 
Added Files:
        net-snmp-unified-10.6.info 
Log Message:
working net-snmp for < 10.6

Index: net-snmp-unified.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/net-snmp-unified.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- net-snmp-unified.patch      23 May 2011 15:27:11 -0000      1.8
+++ net-snmp-unified.patch      26 May 2011 00:54:32 -0000      1.9
@@ -1,7 +1,37 @@
+diff -Nurd net-snmp-5.6.1/agent/mibgroup/agentx/master_admin.c 
net-snmp-5.6.1-new/agent/mibgroup/agentx/master_admin.c
+--- net-snmp-5.6.1/agent/mibgroup/agentx/master_admin.c        2010-01-24 
06:41:03.000000000 -0500
++++ net-snmp-5.6.1-new/agent/mibgroup/agentx/master_admin.c    2011-05-25 
17:55:07.000000000 -0400
+@@ -58,7 +58,7 @@
+ open_agentx_session(netsnmp_session * session, netsnmp_pdu *pdu)
+ {
+     netsnmp_session *sp;
+-    struct timeval  now;
++    struct timeval now;
+ 
+     DEBUGMSGTL(("agentx/master", "open %8p\n", session));
+     sp = (netsnmp_session *) malloc(sizeof(netsnmp_session));
+@@ -99,7 +99,7 @@
+     sp->securityAuthProtoLen = pdu->variables->name_length;
+     sp->securityName = strdup((char *) pdu->variables->val.string);
+     gettimeofday(&now, NULL);
+-    sp->engineTime = calculate_sectime_diff(&now, 
netsnmp_get_agent_starttime());
++    sp->engineTime = calculate_sectime_diff(&now, (const struct 
timeval*)netsnmp_get_agent_starttime());
+ 
+     sp->subsession = session;   /* link back to head */
+     sp->flags |= SNMP_FLAGS_SUBSESSION;
 diff -Nurd net-snmp-5.6.1/agent/mibgroup/hardware/memory/memory_darwin.c 
net-snmp-5.6.1-new/agent/mibgroup/hardware/memory/memory_darwin.c
 --- net-snmp-5.6.1/agent/mibgroup/hardware/memory/memory_darwin.c      
2007-06-18 17:12:35.000000000 -0400
-+++ net-snmp-5.6.1-new/agent/mibgroup/hardware/memory/memory_darwin.c  
2011-03-30 10:29:12.000000000 -0400
-@@ -9,6 +9,11 @@
++++ net-snmp-5.6.1-new/agent/mibgroup/hardware/memory/memory_darwin.c  
2011-05-25 16:43:27.000000000 -0400
+@@ -5,10 +5,20 @@
+ 
+ #include <dirent.h>
+ #include <unistd.h>
++#include <mach/host_priv.h>
++#include <mach/mach_error.h>
+ #include <mach/mach_host.h>
++#include <mach/mach_port.h>
++#include <mach/processor_set.h>
++#include <mach/vm_map.h>
  #include <sys/stat.h>
  #include <sys/sysctl.h>
  
@@ -13,18 +43,18 @@
  
  /*
   * Retained from UCD implementation
-@@ -75,7 +80,7 @@
+@@ -75,7 +85,7 @@
              for (address = 0;; address += size) {
                  /* Get memory region. */
                  count = VM_REGION_EXTENDED_INFO_COUNT; 
 -                if (vm_region(tasks[j], &address, &size, 
VM_REGION_EXTENDED_INFO, (vm_region_extended_info_t)&info, &count, 
&object_name) != KERN_SUCCESS) {
-+                if (VM_REGION_FUNC(tasks[j], &address, &size, 
VM_REGION_EXTENDED_INFO, (vm_region_extended_info_t)&info, &count, 
&object_name) != KERN_SUCCESS) {
++                if (VM_REGION_FUNC(tasks[j], &address, &size, 
VM_REGION_EXTENDED_INFO, (int*)&info, &count, &object_name) != KERN_SUCCESS) {
                      /* No more memory regions. */
                      break;
                  }
 diff -Nurd net-snmp-5.6.1/agent/mibgroup/host/hr_swrun.c 
net-snmp-5.6.1-new/agent/mibgroup/host/hr_swrun.c
 --- net-snmp-5.6.1/agent/mibgroup/host/hr_swrun.c      2010-07-29 
10:58:47.000000000 -0400
-+++ net-snmp-5.6.1-new/agent/mibgroup/host/hr_swrun.c  2011-03-30 
09:35:37.000000000 -0400
++++ net-snmp-5.6.1-new/agent/mibgroup/host/hr_swrun.c  2011-05-24 
17:34:07.000000000 -0400
 @@ -39,9 +39,6 @@
  #if HAVE_SYS_PROC_H
  #include <sys/proc.h>
@@ -35,9 +65,211 @@
  #if HAVE_SYS_SYSCTL_H
  #include <sys/sysctl.h>
  #endif
+diff -Nurd 
net-snmp-5.6.1/agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable_data_access.c
 
net-snmp-5.6.1-new/agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable_data_access.c
+--- 
net-snmp-5.6.1/agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable_data_access.c
   2006-09-14 13:15:32.000000000 -0400
++++ 
net-snmp-5.6.1-new/agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable_data_access.c
       2011-05-25 15:14:01.000000000 -0400
+@@ -127,7 +127,7 @@
+     /*
+      * do we have a corresponding row?
+      */
+-    ip4if_rrc = CONTAINER_FIND(c, ift_rrc);
++    ip4if_rrc = (ifTable_rowreq_ctx*)CONTAINER_FIND(c, ift_rrc);
+     if (NULL == ip4if_rrc) {
+         /*
+          * no corresponding row. should we have one?
+diff -Nurd 
net-snmp-5.6.1/agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable_interface.c
 
net-snmp-5.6.1-new/agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable_interface.c
+--- 
net-snmp-5.6.1/agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable_interface.c
     2010-10-27 14:35:26.000000000 -0400
++++ 
net-snmp-5.6.1-new/agent/mibgroup/ip-mib/ipv4InterfaceTable/ipv4InterfaceTable_interface.c
 2011-05-25 15:04:11.000000000 -0400
+@@ -489,7 +489,7 @@
+ {
+     int             rc = SNMP_ERR_NOERROR;
+     ipv4InterfaceTable_rowreq_ctx *rowreq_ctx =
+-        netsnmp_container_table_row_extract(requests);
++        
(ipv4InterfaceTable_rowreq_ctx*)netsnmp_container_table_row_extract(requests);
+ 
+     
DEBUGMSGTL(("internal:ipv4InterfaceTable:_mfd_ipv4InterfaceTable_object_lookup",
 "called\n"));
+ 
+@@ -580,7 +580,7 @@
+                                    netsnmp_request_info *requests)
+ {
+     ipv4InterfaceTable_rowreq_ctx *rowreq_ctx =
+-        netsnmp_container_table_row_extract(requests);
++        
(ipv4InterfaceTable_rowreq_ctx*)netsnmp_container_table_row_extract(requests);
+     netsnmp_table_request_info *tri;
+     u_char         *old_string;
+     void            (*dataFreeHook) (void *);
+@@ -745,7 +745,7 @@
+                                       netsnmp_request_info *requests)
+ {
+     ipv4InterfaceTable_rowreq_ctx *rowreq_ctx =
+-        netsnmp_container_table_row_extract(requests);
++        
(ipv4InterfaceTable_rowreq_ctx*)netsnmp_container_table_row_extract(requests);
+     netsnmp_table_request_info *tri;
+     int             rc;
+ 
+@@ -829,7 +829,7 @@
+ {
+     int             rc;
+     ipv4InterfaceTable_rowreq_ctx *rowreq_ctx =
+-        netsnmp_container_table_row_extract(requests);
++        
(ipv4InterfaceTable_rowreq_ctx*)netsnmp_container_table_row_extract(requests);
+ 
+     
DEBUGMSGTL(("internal:ipv4InterfaceTable:_mfd_ipv4InterfaceTable_undo_setup", 
"called\n"));
+ 
+@@ -891,7 +891,7 @@
+                                      netsnmp_request_info *requests)
+ {
+     ipv4InterfaceTable_rowreq_ctx *rowreq_ctx =
+-        netsnmp_container_table_row_extract(requests);
++        
(ipv4InterfaceTable_rowreq_ctx*)netsnmp_container_table_row_extract(requests);
+     int             rc;
+ 
+     
DEBUGMSGTL(("internal:ipv4InterfaceTable:_mfd_ipv4InterfaceTable_undo_cleanup", 
"called\n"));
+@@ -971,7 +971,7 @@
+                                    netsnmp_request_info *requests)
+ {
+     ipv4InterfaceTable_rowreq_ctx *rowreq_ctx =
+-        netsnmp_container_table_row_extract(requests);
++        
(ipv4InterfaceTable_rowreq_ctx*)netsnmp_container_table_row_extract(requests);
+     netsnmp_table_request_info *tri;
+     int             rc = SNMP_ERR_NOERROR;
+ 
+@@ -1019,7 +1019,7 @@
+ {
+     int             rc;
+     ipv4InterfaceTable_rowreq_ctx *rowreq_ctx =
+-        netsnmp_container_table_row_extract(requests);
++        
(ipv4InterfaceTable_rowreq_ctx*)netsnmp_container_table_row_extract(requests);
+ 
+     DEBUGMSGTL(("internal:ipv4InterfaceTable:_mfd_ipv4InterfaceTable_commit", 
"called\n"));
+ 
+@@ -1053,7 +1053,7 @@
+ {
+     int             rc;
+     ipv4InterfaceTable_rowreq_ctx *rowreq_ctx =
+-        netsnmp_container_table_row_extract(requests);
++        
(ipv4InterfaceTable_rowreq_ctx*)netsnmp_container_table_row_extract(requests);
+ 
+     
DEBUGMSGTL(("internal:ipv4InterfaceTable:_mfd_ipv4InterfaceTable_undo_commit", 
"called\n"));
+ 
+@@ -1132,7 +1132,7 @@
+ {
+     int             rc;
+     ipv4InterfaceTable_rowreq_ctx *rowreq_ctx =
+-        netsnmp_container_table_row_extract(requests);
++        
(ipv4InterfaceTable_rowreq_ctx*)netsnmp_container_table_row_extract(requests);
+     netsnmp_table_request_info *tri;
+ 
+     
DEBUGMSGTL(("internal:ipv4InterfaceTable:_mfd_ipv4InterfaceTable_undo_values", 
"called\n"));
+@@ -1187,7 +1187,7 @@
+                                             netsnmp_request_info *requests)
+ {
+     ipv4InterfaceTable_rowreq_ctx *rowreq_ctx =
+-        netsnmp_container_table_row_extract(requests);
++        
(ipv4InterfaceTable_rowreq_ctx*)netsnmp_container_table_row_extract(requests);
+ 
+     
DEBUGMSGTL(("internal:ipv4InterfaceTable:_mfd_ipv4InterfaceTable_irreversible:commit",
 "called\n"));
+ 
+@@ -1303,7 +1303,7 @@
+         return NULL;
+ 
+     rowreq_ctx =
+-        CONTAINER_FIND(ipv4InterfaceTable_if_ctx.container, &oid_idx);
++        
(ipv4InterfaceTable_rowreq_ctx*)CONTAINER_FIND(ipv4InterfaceTable_if_ctx.container,
 &oid_idx);
+ 
+     return rowreq_ctx;
+ }
+diff -Nurd net-snmp-5.6.1/agent/mibgroup/mibII/at.c 
net-snmp-5.6.1-new/agent/mibgroup/mibII/at.c
+--- net-snmp-5.6.1/agent/mibgroup/mibII/at.c   2010-10-28 13:43:00.000000000 
-0400
++++ net-snmp-5.6.1-new/agent/mibgroup/mibII/at.c       2011-05-25 
15:22:49.000000000 -0400
+@@ -696,7 +696,7 @@
+     if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
+         snmp_log_perror("route-sysctl-estimate");
+     else {
+-        if ((at = malloc(needed ? needed : 1)) == NULL)
++        if ((at = (char*)malloc(needed ? needed : 1)) == NULL)
+             snmp_log_perror("malloc");
+         else {
+             if (sysctl(mib, 6, at, &needed, NULL, 0) < 0)
+diff -Nurd net-snmp-5.6.1/agent/mibgroup/mibII/ipAddr.c 
net-snmp-5.6.1-new/agent/mibgroup/mibII/ipAddr.c
+--- net-snmp-5.6.1/agent/mibgroup/mibII/ipAddr.c       2010-01-23 
10:07:35.000000000 -0500
++++ net-snmp-5.6.1-new/agent/mibgroup/mibII/ipAddr.c   2011-05-25 
18:16:15.000000000 -0400
+@@ -774,7 +774,7 @@
+     if (sysctl(mib, 6, 0, &len, 0, 0) < 0)
+         return;
+ 
+-    ifbuf = malloc(len);
++    ifbuf = (char*)malloc(len);
+     if (ifbuf == 0)
+         return;
+     if (sysctl(mib, 6, ifbuf, &len, 0, 0) < 0) {
+diff -Nurd net-snmp-5.6.1/agent/mibgroup/mibII/tcpTable.c 
net-snmp-5.6.1-new/agent/mibgroup/mibII/tcpTable.c
+--- net-snmp-5.6.1/agent/mibgroup/mibII/tcpTable.c     2010-10-20 
09:12:08.000000000 -0400
++++ net-snmp-5.6.1-new/agent/mibgroup/mibII/tcpTable.c 2011-05-25 
16:06:37.000000000 -0400
+@@ -849,7 +849,7 @@
+      */
+     len = 0;
+     if (sysctl(sname, 4, 0, &len, 0, 0) < 0 ||
+-       (tcpcb_buf = malloc(len)) == NULL)
++       (tcpcb_buf = (char*)malloc(len)) == NULL)
+         return -1;
+     if (sysctl(sname, 4, tcpcb_buf, &len, 0, 0) < 0) {
+         free(tcpcb_buf);
+diff -Nurd net-snmp-5.6.1/agent/mibgroup/mibII/udpTable.c 
net-snmp-5.6.1-new/agent/mibgroup/mibII/udpTable.c
+--- net-snmp-5.6.1/agent/mibgroup/mibII/udpTable.c     2010-03-08 
18:07:20.000000000 -0500
++++ net-snmp-5.6.1-new/agent/mibgroup/mibII/udpTable.c 2011-05-25 
16:15:51.000000000 -0400
+@@ -628,7 +628,7 @@
+      */
+     len = 0;
+     if (sysctl(sname, 4, 0, &len, 0, 0) < 0 ||
+-       (udpcb_buf = malloc(len)) == NULL)
++       (udpcb_buf = (char*)malloc(len)) == NULL)
+         return -1;
+     if (sysctl(sname, 4, udpcb_buf, &len, 0, 0) < 0) {
+         free(udpcb_buf);
+diff -Nurd net-snmp-5.6.1/agent/mibgroup/mibII/var_route.c 
net-snmp-5.6.1-new/agent/mibgroup/mibII/var_route.c
+--- net-snmp-5.6.1/agent/mibgroup/mibII/var_route.c    2010-06-22 
04:37:26.000000000 -0400
++++ net-snmp-5.6.1-new/agent/mibgroup/mibII/var_route.c        2011-05-25 
19:11:46.000000000 -0400
+@@ -1786,7 +1786,7 @@
+ 
+     if (len > rtbuflen) {
+         char           *newbuf;
+-        newbuf = realloc(rtbuf, len);
++        newbuf = (char*)realloc(rtbuf, len);
+         if (newbuf == 0)
+             return -1;
+         rtbuf = newbuf;
+diff -Nurd net-snmp-5.6.1/agent/mibgroup/ucd-snmp/dlmod.c 
net-snmp-5.6.1-new/agent/mibgroup/ucd-snmp/dlmod.c
+--- net-snmp-5.6.1/agent/mibgroup/ucd-snmp/dlmod.c     2010-06-16 
17:34:42.000000000 -0400
++++ net-snmp-5.6.1-new/agent/mibgroup/ucd-snmp/dlmod.c 2011-05-25 
15:35:03.000000000 -0400
+@@ -182,7 +182,7 @@
+             return;
+     }
+     snprintf(sym_init, sizeof(sym_init), "init_%s", dlm->name);
+-    dl_init = dlsym(dlm->handle, sym_init);
++    dl_init = (int (*)())dlsym(dlm->handle, sym_init);
+     if (dl_init == NULL) {
+         dlclose(dlm->handle);
+         snprintf(dlm->error, sizeof(dlm->error),
+@@ -206,13 +206,13 @@
+         return;
+ 
+     snprintf(sym_deinit, sizeof(sym_deinit), "deinit_%s", dlm->name);
+-    dl_deinit = dlsym(dlm->handle, sym_deinit);
++    dl_deinit = (int (*)())dlsym(dlm->handle, sym_deinit);
+     if (dl_deinit) {
+         DEBUGMSGTL(("dlmod", "Calling deinit_%s()\n", dlm->name));
+         dl_deinit();
+     } else {
+         snprintf(sym_deinit, sizeof(sym_deinit), "shutdown_%s", dlm->name);
+-        dl_deinit = dlsym(dlm->handle, sym_deinit);
++        dl_deinit = (int (*)())dlsym(dlm->handle, sym_deinit);
+         if (dl_deinit) {
+             DEBUGMSGTL(("dlmod", "Calling shutdown_%s()\n", dlm->name));
+             dl_deinit();
 diff -Nurd net-snmp-5.6.1/agent/mibgroup/ucd-snmp/memory_darwin7.c 
net-snmp-5.6.1-new/agent/mibgroup/ucd-snmp/memory_darwin7.c
 --- net-snmp-5.6.1/agent/mibgroup/ucd-snmp/memory_darwin7.c    2008-10-21 
17:10:43.000000000 -0400
-+++ net-snmp-5.6.1-new/agent/mibgroup/ucd-snmp/memory_darwin7.c        
2011-03-30 10:29:30.000000000 -0400
++++ net-snmp-5.6.1-new/agent/mibgroup/ucd-snmp/memory_darwin7.c        
2011-05-24 17:34:07.000000000 -0400
 @@ -48,6 +48,12 @@
  #include "memory.h"
  #include "memory_darwin7.h"
@@ -60,9 +292,21 @@
                      /* No more memory regions. */
                      break;
                  }
+diff -Nurd net-snmp-5.6.1/agent/mibgroup/utilities/iquery.c 
net-snmp-5.6.1-new/agent/mibgroup/utilities/iquery.c
+--- net-snmp-5.6.1/agent/mibgroup/utilities/iquery.c   2010-01-06 
03:00:28.000000000 -0500
++++ net-snmp-5.6.1-new/agent/mibgroup/utilities/iquery.c       2011-05-25 
14:34:48.000000000 -0400
+@@ -184,7 +184,7 @@
+             memdup( &(ss->community), secName, strlen(secName));
+             ss->community_len = strlen(secName);
+         }
+-        ss->myvoid = netsnmp_check_outstanding_agent_requests;
++        ss->myvoid = (void*)netsnmp_check_outstanding_agent_requests;
+         ss->flags |= SNMP_FLAGS_RESP_CALLBACK | SNMP_FLAGS_DONT_PROBE;
+     }
+ #endif
 diff -Nurd net-snmp-5.6.1/configure.d/config_os_functions 
net-snmp-5.6.1-new/configure.d/config_os_functions
 --- net-snmp-5.6.1/configure.d/config_os_functions     2010-12-06 
17:08:12.000000000 -0500
-+++ net-snmp-5.6.1-new/configure.d/config_os_functions 2011-03-30 
10:27:44.000000000 -0400
++++ net-snmp-5.6.1-new/configure.d/config_os_functions 2011-05-24 
17:34:07.000000000 -0400
 @@ -95,7 +95,8 @@
                 [sigprocmask                                    ] dnl
                 [statfs          statvfs       stime            ] dnl
@@ -73,9 +317,33 @@
  
  #  Apps:
  AC_CHECK_FUNCS([getdtablesize                                  ] dnl
+diff -Nurd net-snmp-5.6.1/configure.d/config_os_progs 
net-snmp-5.6.1-new/configure.d/config_os_progs
+--- net-snmp-5.6.1/configure.d/config_os_progs 2010-11-16 03:01:46.000000000 
-0500
++++ net-snmp-5.6.1-new/configure.d/config_os_progs     2011-05-25 
19:17:34.000000000 -0400
+@@ -207,6 +207,7 @@
+   ;;
+ esac
+ 
++LD_NO_UNDEFINED=-no-undefined
+ AC_SUBST(LD_NO_UNDEFINED)
+ 
+ 
+@@ -404,12 +405,7 @@
+         #   Flat Namespace linking                      (Mac OS/X)
+         #
+         AC_MSG_CHECKING([whether darwin ld might need -flat_namespace])
+-      if test -z "$MACOSX_DEPLOYMENT_TARGET"; then
+-              LDFLAGS="-flat_namespace $LDFLAGS"
+-              AC_MSG_RESULT([yes])
+-      else
+               AC_MSG_RESULT([no])
+-      fi
+       ;;
+ 
+     *)
 diff -Nurd net-snmp-5.6.1/configure.d/config_project_perl_python 
net-snmp-5.6.1-new/configure.d/config_project_perl_python
 --- net-snmp-5.6.1/configure.d/config_project_perl_python      2010-07-29 
11:47:40.000000000 -0400
-+++ net-snmp-5.6.1-new/configure.d/config_project_perl_python  2011-03-30 
09:32:45.000000000 -0400
++++ net-snmp-5.6.1-new/configure.d/config_project_perl_python  2011-05-24 
17:34:07.000000000 -0400
 @@ -87,7 +87,7 @@
      if test "xenable_perl_cc_checks" != "xno" ; then
          AC_MSG_CHECKING([for Perl cc])
@@ -114,7 +382,7 @@
        PERLLDOPTS_FOR_APPS="$netsnmp_perlccdlflags"
 diff -Nurd net-snmp-5.6.1/net-snmp-config.in 
net-snmp-5.6.1-new/net-snmp-config.in
 --- net-snmp-5.6.1/net-snmp-config.in  2010-10-13 05:58:34.000000000 -0400
-+++ net-snmp-5.6.1-new/net-snmp-config.in      2011-03-30 09:34:09.000000000 
-0400
++++ net-snmp-5.6.1-new/net-snmp-config.in      2011-05-24 17:34:07.000000000 
-0400
 @@ -57,7 +57,7 @@
  NSC_SRCDIR=@srcdir@
  NSC_INCDIR=${NSC_PREFIX}/include
@@ -124,3 +392,35 @@
  NSC_SRC_LIBDIRS="agent/.libs snmplib/.libs"
  NSC_SRC_LIBDEPS="agent/.libs/libnetsnmpmibs.a agent/.libs/libnetsnmpagent.a 
snmplib/.libs/libnetsnmp.a"
  
+diff -Nurd net-snmp-5.6.1/snmplib/md5.c net-snmp-5.6.1-new/snmplib/md5.c
+--- net-snmp-5.6.1/snmplib/md5.c       2010-05-27 11:15:43.000000000 -0400
++++ net-snmp-5.6.1-new/snmplib/md5.c   2011-05-25 15:05:30.000000000 -0400
+@@ -195,7 +195,7 @@
+ {
+     register unsigned int tmp, A, B, C, D;      /* hpux sysv sun */
+ #ifdef WORDS_BIGENDIAN
+-    MDreverse(X);
++    MDreverse((unsigned int*)X);
+ #endif
+     A = MDp->buffer[0];
+     B = MDp->buffer[1];
+@@ -275,7 +275,7 @@
+     MDp->buffer[2] += C;
+     MDp->buffer[3] += D;
+ #ifdef WORDS_BIGENDIAN
+-    MDreverse(X);
++    MDreverse((unsigned int*)X);
+ #endif
+ }
+ 
+diff -Nurd net-snmp-5.6.1/snmplib/system.c net-snmp-5.6.1-new/snmplib/system.c
+--- net-snmp-5.6.1/snmplib/system.c    2010-07-29 10:58:47.000000000 -0400
++++ net-snmp-5.6.1-new/snmplib/system.c        2011-05-24 17:34:27.000000000 
-0400
+@@ -149,6 +149,7 @@
+ 
+ #if defined(darwin9)
+ #include <crt_externs.h>        /* for _NSGetArgv() */
++#include <mach-o/dyld.h>        /* for _NSGetExecutablePath() */
+ #endif
+ 
+ #if HAVE_PWD_H

--- NEW FILE: net-snmp-unified-10.6.info ---
Info4: <<
Package: net-snmp-unified
Version: 5.6.1
Revision: 12
Distribution: 10.6
Description: SNMP tools and libraries
License: BSD
Maintainer: Benjamin Reed <[email protected]>

Depends: <<
        daemonic,
        %N25-shlibs (>= %v-%r)
<<
BuildDepends: <<
        autoconf (>= 2.63-1),
        automake1.11,
        expat1,
        fink (>= 0.30.0-1),
        flag-sort (>= 0.4-1),
        gawk,
        libtool2,
        system-openssl-dev,
        system-perl
<<
BuildConflicts: coreutils-default
Conflicts: <<
        net-snmp (<< 5.4-1),
        net-snmp-ssl (<< 5.4-1),
        ucd-snmp (<< 5.4-1)
<<
Replaces: <<
        net-snmp (<< 5.4-1),
        net-snmp-ssl (<< 5.4-1),
        ucd-snmp (<< 5.4-1)
<<

Source: mirror:sourceforge:net-snmp/net-snmp-%v.tar.gz
Source-MD5: b4e30ead5783b0bb1d280172c6095ea4
PatchScript: <<
        ln -sf darwin9.h include/net-snmp/system/darwin10.h
        patch -p1 --fuzz=4 < %{PatchFile}
        autoreconf -fvi
<<
PatchFile: %n.patch
PatchFile-MD5: d98d483c7569d02618a23f1cf339ba60

SetCPPFLAGS: -I%p/lib/system-openssl/include
SetLDFLAGS: -L%p/lib/system-openssl/lib
UseMaxBuildJobs: false
ConfigureParams: <<
--with-install-prefix='%d' \
--enable-ipv6 \
--mandir='${prefix}/share/man' \
--with-logfile=%p/var/log/snmpd.log \
--with-persistent-directory=%p/var/%N \
--with-default-snmp-version="3" \
--enable-shared \
--with-openssl=%p/lib/system-openssl \
--with-mibdirs='$HOME/.snmp/mibs:%p/share/snmp/mibs:/usr/share/snmp/mibs' \
--with-mib-modules='ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable if-mib' 
\
--enable-mfd-rewrites \
--with-sys-contact='[email protected]' \
--with-sys-location=Unknown \
--without-kmem-usage \
--without-python-modules
<<
CompileScript: <<
        #!/bin/sh -ev
        
        eval "`/usr/bin/perl -V:archname -V:version`"
        export PERLMAKEARGS="PREFIX=%p INSTALLPRIVLIB=%p/lib/perl5/$version 
INSTALLARCHLIB=%p/lib/perl5/$version/$archname 
INSTALLSITELIB=%p/lib/perl5/$version 
INSTALLSITEARCH=%p/lib/perl5/$version/$archname 
INSTALLMAN1DIR=%p/lib/perl5/$version INSTALLMAN3DIR=%p/lib/perl5/$version 
INSTALLSITEMAN1DIR=%p/lib/perl5/$version 
INSTALLSITEMAN3DIR=%p/lib/perl5/$version INSTALLBIN=%p/bin 
INSTALLSITEBIN=%p/bin INSTALLSCRIPT=%p/bin"
        
        PERLPROG=/usr/bin/perl ./configure %c 
--with-perl-modules="$PERLMAKEARGS"
        make perlmakefiles
        find . -name Makefile | xargs perl -pi -e 's,-arch [^ ]*,,g'
        [ -z "$CC" ] && CC=gcc
        [ -z "$CXX" ] && CXX=g++
        make CC="flag-sort -v -r $CC" CXX="flag-sort -v -r $CXX" 
LINKCC="flag-sort -v -r $CXX" CFLAGS="-fno-strict-aliasing -g -O -Udarwin9 
-Ddarwin9=darwin9"
<<

InstallScript: <<
#!/bin/sh -ev

        make -j1 install DESTDIR="%d"
        install -d -m 755 %i/var/log
        install -d -m 755 %i/share/doc/installed-packages
        find %i -name perllocal.pod -exec rm -rf {} \; || :

        for type in "" "-ssl"; do
                touch %i/share/doc/installed-packages/net-snmp$type
        done
<<
DocFiles: AGENT.txt CHANGES COPYING ChangeLog CodingStyle EXAMPLE.conf.def FAQ 
NEWS PORTING README* TODO
SplitOff: <<
        Package: %N25-shlibs
        DocFiles: COPYING
        Files: lib/libnetsnmp*.25*.dylib
        Shlibs: <<
                %p/lib/libnetsnmp.25.dylib        26.0.0 
net-snmp-unified25-shlibs (>= 5.6.1-1)
                %p/lib/libnetsnmpagent.25.dylib   26.0.0 
net-snmp-unified25-shlibs (>= 5.6.1-1)
                %p/lib/libnetsnmphelpers.25.dylib 26.0.0 
net-snmp-unified25-shlibs (>= 5.6.1-1)
                %p/lib/libnetsnmpmibs.25.dylib    26.0.0 
net-snmp-unified25-shlibs (>= 5.6.1-1)
                %p/lib/libnetsnmptrapd.25.dylib   26.0.0 
net-snmp-unified25-shlibs (>= 5.6.1-1)
        <<
<<
SplitOff2: <<
        Package: %N25-dev
        Depends: %N25-shlibs (= %v-%r)
        Conflicts: <<
                net-snmp-dev (<< 5.4-1),
                net-snmp-ssl-dev (<< 5.4-1),
                net-snmp-unified15-dev,
                net-snmp-unified-dev
        <<
        Replaces: <<
                net-snmp-dev (<< 5.4-1),
                net-snmp (<< 5.4-1),
                net-snmp-ssl-dev (<< 5.4-1),
                net-snmp-ssl (<< 5.4-1),
                net-snmp-unified15-dev,
                net-snmp-unified-dev
        <<
        BuildDependsOnly: true
        DocFiles: COPYING
        Files: include lib/*.a lib/*.dylib bin/net-snmp-config
<<
SplitOff3: <<
        Package: net-snmp
        Description: upgrade package for net-snmp-unified
        Depends: <<
                %N (>= %v-%r),
                fink (>= 0.30.0-1),
                fink-obsolete-packages
        <<
        Files: share/doc/installed-packages/%n
<<
SplitOff4: <<
        Package: net-snmp-ssl
        Description: upgrade package for net-snmp-unified
        Depends: <<
                %N (>= %v-%r),
                fink (>= 0.30.0-1),
                fink-obsolete-packages
        <<
        Files: share/doc/installed-packages/%n
<<

PreRmScript: <<
if [ $1 != "upgrade" ]; then
        daemonic disable %N
fi
<<
PostRmScript: <<
if [ $1 = "remove" ]; then
        rm -rf %p/share/snmp
        rm -rf %p/var/%n
fi
<<
DaemonicFile: <<
<service>
<description>An SNMP daemon to respond to SNMP request packets.</description>
<message>snmpd</message>

<daemon name="snmpd">
<executable checkexit="true">%p/sbin/snmpd</executable>

</daemon>

</service>
<<

Homepage: http://net-snmp.sourceforge.net/
DescDetail: <<
The net-snmp package, previously known as ucd-snmp, provides tools 
and libraries relating to SNMP. It provides SNMP libraries, tools 
to request and set information, an SNMP daemon, among other features.
<<
DescUsage: <<
In order to run net-snmp correctly, the community name needs to be set. The
easiest way to set this is to run the 'snmpconf' program, allowing you to
setup the various net-snmp configuration files.
<<
DescPackaging: <<
Customised install script to put files in correct directories.

Logfile set to PREFIX/var/log/snmpd.log
Persistent directory set to PREFIX/var/net-snmp

Default snmp version set to 3, but can be overridden using the '-v' flag for
the command tools, or alternatively using the 'defVersion' option in the
snmp.conf file.
<<
DescPort: <<
Based on the net-snmp package developed by Justin Hallett and Jeremy Higgs.

dmacks: OS X 10.3 has kvm.h but that header does not declare an
(apparently global var) "kd". Later OS X disable kvm altogether (via
the platform-specific defs in net-snmp/system/*.h, which override
configure detection) so it's not a problem there, but backporting that
solution to 10.3 fails to build for deeper reasons. So we'll just
declare kd and hope for the best.
<<
<<


Index: net-snmp-unified.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/net-snmp-unified.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- net-snmp-unified.info       23 May 2011 15:27:11 -0000      1.14
+++ net-snmp-unified.info       26 May 2011 00:54:32 -0000      1.15
@@ -1,7 +1,8 @@
 Info4: <<
 Package: net-snmp-unified
 Version: 5.6.1
-Revision: 1
+Revision: 2
+Distribution: 10.4, 10.5
 Description: SNMP tools and libraries
 License: BSD
 Maintainer: Benjamin Reed <[email protected]>
@@ -15,6 +16,7 @@
        automake1.11,
        expat1,
        fink (>= 0.30.0-1),
+       flag-sort (>= 0.4-1),
        gawk,
        libtool2,
        system-openssl-dev,
@@ -35,29 +37,27 @@
 Source: mirror:sourceforge:net-snmp/net-snmp-%v.tar.gz
 Source-MD5: b4e30ead5783b0bb1d280172c6095ea4
 PatchScript: <<
+       ln -sf darwin9.h include/net-snmp/system/darwin10.h
        patch -p1 --fuzz=4 < %{PatchFile}
        autoreconf -fvi
 <<
 PatchFile: %n.patch
-PatchFile-MD5: dd74cb8804fff24d2464cc7ec6b05dda
+PatchFile-MD5: d98d483c7569d02618a23f1cf339ba60
 
 SetCPPFLAGS: -I%p/lib/system-openssl/include
 SetLDFLAGS: -L%p/lib/system-openssl/lib
-SetMAKEFLAGS: -j1
-NoSetMAKEFLAGS: true
 UseMaxBuildJobs: false
 ConfigureParams: <<
 --with-install-prefix='%d' \
 --enable-ipv6 \
 --mandir='${prefix}/share/man' \
---with-ldflags='-Wl,-flat_namespace' \
 --with-logfile=%p/var/log/snmpd.log \
 --with-persistent-directory=%p/var/%N \
 --with-default-snmp-version="3" \
 --enable-shared \
 --with-openssl=%p/lib/system-openssl \
 --with-mibdirs='$HOME/.snmp/mibs:%p/share/snmp/mibs:/usr/share/snmp/mibs' \
---with-mib-modules='ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable if-mib 
tcp-mib udp-mib mibII/ipv6' \
+--with-out-mib-modules=mibII/ipv6 \
 --enable-mfd-rewrites \
 --with-sys-contact='[email protected]' \
 --with-sys-location=Unknown \
@@ -67,20 +67,22 @@
 CompileScript: <<
        #!/bin/sh -ev
        
-       ln -sf darwin9.h include/net-snmp/system/darwin10.h
        eval "`/usr/bin/perl -V:archname -V:version`"
        export PERLMAKEARGS="PREFIX=%p INSTALLPRIVLIB=%p/lib/perl5/$version 
INSTALLARCHLIB=%p/lib/perl5/$version/$archname 
INSTALLSITELIB=%p/lib/perl5/$version 
INSTALLSITEARCH=%p/lib/perl5/$version/$archname 
INSTALLMAN1DIR=%p/lib/perl5/$version INSTALLMAN3DIR=%p/lib/perl5/$version 
INSTALLSITEMAN1DIR=%p/lib/perl5/$version 
INSTALLSITEMAN3DIR=%p/lib/perl5/$version INSTALLBIN=%p/bin 
INSTALLSITEBIN=%p/bin INSTALLSCRIPT=%p/bin"
        
        PERLPROG=/usr/bin/perl ./configure %c 
--with-perl-modules="$PERLMAKEARGS"
        make perlmakefiles
        find . -name Makefile | xargs perl -pi -e 's,-arch [^ ]*,,g'
-       make
+       [ -z "$CC" ] && CC=gcc
+       [ -z "$CXX" ] && CXX=g++
+       MAJOR_VERSION=`uname -r | cut -d. -f1`
+       make CC="flag-sort -v -r $CC" CXX="flag-sort -v -r $CXX" 
LINKCC="flag-sort -v -r $CXX" CFLAGS="-fno-strict-aliasing -g -O 
-Udarwin$MAJOR_VERSION -Ddarwin$MAJOR_VERSION=darwin$MAJOR_VERSION"
 <<
 
 InstallScript: <<
 #!/bin/sh -ev
 
-       make -j1 install DESTDIR=%d
+       make -j1 install DESTDIR="%d"
        install -d -m 755 %i/var/log
        install -d -m 755 %i/share/doc/installed-packages
        find %i -name perllocal.pod -exec rm -rf {} \; || :
@@ -188,10 +190,6 @@
 Default snmp version set to 3, but can be overridden using the '-v' flag for
 the command tools, or alternatively using the 'defVersion' option in the
 snmp.conf file.
-
-Need -flat_namespace because net-snmp apps fail otherwise:
-
-http://lists.apple.com/archives/Unix-porting/2005/Jul/msg00044.html
 <<
 DescPort: <<
 Based on the net-snmp package developed by Justin Hallett and Jeremy Higgs.


------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery, 
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now. 
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to