mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

Update to 4.2.7

Browse Source
This commit is contained in:
Edwin Groothuis 2008-04-30 11:45:55 +00:00
parent 89753e7c8f
commit 2baffc74eb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=212353
9 changed files with 79 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net-mgmt/net-snmp4/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= ucd-snmp
PORTVERSION= 4.2.6
PORTREVISION= 9
PORTVERSION= 4.2.7
CATEGORIES= net-mgmt ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= net-snmp

6
net-mgmt/net-snmp4/distinfo
View File

@ -1,3 +1,3 @@
MD5 (ucd-snmp-4.2.6.tar.gz) = cf3f24e6a69a4f52c14affe0064116b1
SHA256 (ucd-snmp-4.2.6.tar.gz) = af924b281c017d3d2a3b050d24c6be6e0a6d02c1da479c140d7de5e9f6ee0bc9
SIZE (ucd-snmp-4.2.6.tar.gz) = 1717379
MD5 (ucd-snmp-4.2.7.tar.gz) = b1ee350dfcca83e6c46769cf9852063a
SHA256 (ucd-snmp-4.2.7.tar.gz) = 0299577d3417f605ea276acdecec331bf99e512a7a5c12828016b0f8116c83a6
SIZE (ucd-snmp-4.2.7.tar.gz) = 1770886

10
net-mgmt/net-snmp4/files/patch-agent__mibgroup__ucd-snmp__memory_freebsd2.c Normal file
View File

@ -0,0 +1,10 @@
--- agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig 2008-04-30 11:37:04.000000000 +0000
+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c 2008-04-30 11:36:43.000000000 +0000
@@ -30,6 +30,7 @@
#else
#include <vm/vm_param.h>
#endif
+#include <vm/swap_pager.h>
#include <time.h>
#include <nlist.h>

10
net-mgmt/net-snmp4/files/patch-al
View File

@ -1,6 +1,6 @@
--- configure.in~ Sat May 6 01:46:26 2000
+++ configure.in Wed May 17 11:09:08 2000
@@ -1286,6 +1286,26 @@
--- configure.in.orig 2006-06-19 08:08:48.000000000 +0000
+++ configure.in 2008-04-30 05:57:39.000000000 +0000
@@ -1405,6 +1405,26 @@
AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE,
[
@ -24,6 +24,6 @@
+ rt.rt_dst;
+ ], ac_cv_RTENTRY_TYPE="BSD-4.4")
+
dnl 4.4 compat
# 4.4 compat
AC_TRY_COMPILE([
#include <sys/types.h>
#ifdef HAVE_SYS_PARAM_H

27
net-mgmt/net-snmp4/files/patch-disk.c
View File

@ -1,17 +1,26 @@
--- agent/mibgroup/ucd-snmp/disk.c.orig Wed Apr 3 07:57:57 2002
+++ agent/mibgroup/ucd-snmp/disk.c Thu Aug 29 12:11:17 2002
@@ -340,7 +340,7 @@
--- agent/mibgroup/ucd-snmp/disk.c.orig 2003-05-14 10:17:46.000000000 +0000
+++ agent/mibgroup/ucd-snmp/disk.c 2008-04-30 06:01:57.000000000 +0000
@@ -346,7 +346,7 @@
double totalblks, free, used, avail, availblks;
#else
static long avail;
-#ifdef STRUCT_STATVFS_HAS_F_FILES
+#if defined(HAVE_UFS_FFS_FS_H) || defined(STRUCT_STATVFS_HAS_F_FILES)
-#if defined(STRUCT_STATVFS_HAS_F_FILES) || defined(STRUCT_STATFS_HAS_F_FILES)
+#if defined(STRUCT_STATVFS_HAS_F_FILES) || defined(STRUCT_STATFS_HAS_F_FILES) || defined(HAVE_UFS_FFS_FS_H)
int percent_inode;
#endif
#endif
@@ -424,6 +424,11 @@
@@ -425,7 +425,7 @@
iserror = (disks[disknum].minimumspace >= 0 ?
avail < disks[disknum].minimumspace :
100-percent <= disks[disknum].minpercent) ? 1 : 0;
-#if defined(STRUCT_STATVFS_HAS_F_FILES) || defined(STRUCT_STATFS_HAS_F_AVAIL)
+#if defined(STRUCT_STATVFS_HAS_F_FILES) || defined(STRUCT_STATFS_HAS_F_AVAIL) || defined(HAVE_UFS_FFS_FS_H)
percent_inode = vfs.f_favail <= 0 ? 100 :
(int) ((double) (vfs.f_files - vfs.f_ffree) /
(double) (vfs.f_files - (vfs.f_ffree - vfs.f_favail)) * 100.0 + 0.5);
@@ -436,6 +436,11 @@
(double) (vfs.f_files) * 100.0 + 0.5);
#endif
#endif
+#if defined(HAVE_UFS_FFS_FS_H) && !defined(STRUCT_STATVFS_HAS_F_FILES)
+ percent_inode = vfs.f_files == 0 ? 100.0 :
@ -21,12 +30,12 @@
switch (vp->magic) {
case DISKTOTAL:
long_ret = vfs.f_blocks * (vfs.f_bsize / 1024);
@@ -444,7 +449,7 @@
@@ -456,7 +461,7 @@
case DISKPERCENT:
long_ret = percent;
return ((u_char *) (&long_ret));
-#ifdef STRUCT_STATVFS_HAS_F_FILES
+#if defined(HAVE_UFS_FFS_FS_H) || defined(STRUCT_STATVFS_HAS_F_FILES)
-#if defined(STRUCT_STATVFS_HAS_F_FILES) || defined(STRUCT_STATFS_HAS_F_FILES)
+#if defined(STRUCT_STATVFS_HAS_F_FILES) || defined(STRUCT_STATFS_HAS_F_FILES) || defined(HAVE_UFS_FFS_FS_H)
case DISKPERCENTNODE:
long_ret = percent_inode;
return ((u_char *) (&long_ret));

22
net-mgmt/net-snmp4/files/patch-hr_storage.c
View File

@ -1,6 +1,6 @@
--- agent/mibgroup/host/hr_storage.c.orig Thu Jul 4 09:00:11 2002
+++ agent/mibgroup/host/hr_storage.c Thu Jun 24 16:47:34 2004
@@ -32,7 +32,7 @@
--- agent/mibgroup/host/hr_storage.c.orig 2006-06-20 09:29:35.000000000 +0000
+++ agent/mibgroup/host/hr_storage.c 2008-04-30 06:08:02.000000000 +0000
@@ -39,7 +39,7 @@
#else
#if HAVE_VM_VM_H
#include <vm/vm.h>
@ -9,16 +9,16 @@
#include <machine/types.h>
#endif
#if HAVE_SYS_VMMETER_H
@@ -148,7 +148,7 @@
#define HRFS_mount mnt_mountp
@@ -162,7 +162,7 @@
#define HRFS_statfs statvfs
#define HRFS_mount f_mntonname
-#elif defined(HAVE_STATVFS)
+#elif defined(HAVE_STATVFS) && defined(HAVE_MNTENT)
extern struct mntent *HRFS_entry;
extern int fscount;
@@ -553,7 +553,7 @@
@@ -568,7 +568,7 @@
}
case HRSTORE_UNITS:
if ( store_idx < HRS_TYPE_FS_MAX )
@ -27,10 +27,10 @@
long_return = stat_buf.f_frsize;
#else
long_return = stat_buf.f_bsize;
@@ -634,7 +634,15 @@
@@ -649,7 +649,15 @@
for (i = 0; i < sizeof(mbstat.m_mtypes)/sizeof(mbstat.m_mtypes[0]); i++)
long_return += mbstat.m_mtypes[i];
#elif defined(MBSTAT_SYMBOL)
#elif defined(MBSTAT_SYMBOL) && defined(STRUCT_MBSTAT_HAS_M_MBUFS)
+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021
long_return = mbstat.m_mbufs;
+#elif __FreeBSD_version < 500024
@ -43,10 +43,10 @@
#elif defined(NO_DUMMY_VALUES)
return NULL;
#else
@@ -693,7 +701,15 @@
@@ -708,7 +716,15 @@
+ (mclpool.pr_nget - mclpool.pr_nput)
* mclpool.pr_size;
#elif defined(MBSTAT_SYMBOL)
#elif defined(MBSTAT_SYMBOL) && defined(STRUCT_MBSTAT_HAS_M_CLUSTERS)
+#if !defined(__FreeBSD__) || __FreeBSD_version < 500021
long_return = mbstat.m_clusters - mbstat.m_clfree; /* unlikely, but... */
+#elif __FreeBSD_version < 500024
@ -59,7 +59,7 @@
#elif defined(NO_DUMMY_VALUES)
return NULL;
#else
@@ -723,7 +739,11 @@
@@ -738,7 +754,11 @@
#if !defined(linux) && !defined(solaris2) && !defined(hpux10) && !defined(hpux11)
case HRS_TYPE_MBUF:
#if defined(MBSTAT_SYMBOL)

97
net-mgmt/net-snmp4/files/patch-hr_swrun.c
View File

@ -1,84 +1,47 @@
--- agent/mibgroup/host/hr_swrun.c.orig Sat Feb 16 09:41:19 2002
+++ agent/mibgroup/host/hr_swrun.c Sat Feb 16 23:41:05 2002
@@ -543,7 +543,11 @@
strcpy(string, proc_buf->p_user.u_comm);
--- agent/mibgroup/host/hr_swrun.c.orig 2006-06-06 08:11:59.000000000 +0000
+++ agent/mibgroup/host/hr_swrun.c 2008-04-30 11:30:47.000000000 +0000
@@ -549,7 +549,7 @@
string[ sizeof(string)-1 ] = 0;
#endif
#elif HAVE_KVM_GETPROCS
+#if defined(freebsd5) && __FreeBSD_version >= 500014
+ strcpy(string, proc_table[LowProcIndex].ki_comm);
+#else
- #if defined(freebsd5)
+ #if defined(freebsd5) && __FreeBSD_version >= 500014
strcpy(string, proc_table[LowProcIndex].ki_comm);
#else
strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm);
+#endif
#elif defined(linux)
sprintf( string, "/proc/%d/status", pid );
if ((fp = fopen( string, "r")) == NULL) return NULL;
@@ -638,7 +642,11 @@
@@ -648,7 +648,7 @@
*cp1 = 0;
#endif
#elif HAVE_KVM_GETPROCS
+#if defined(freebsd5) && __FreeBSD_version >= 500014
+ strcpy(string, proc_table[LowProcIndex].ki_comm);
+#else
- #if defined(freebsd5)
+ #if defined(freebsd5) && __FreeBSD_version >= 500014
strcpy(string, proc_table[LowProcIndex].ki_comm);
#else
strcpy(string, proc_table[LowProcIndex].kp_proc.p_comm);
+#endif
#elif defined(linux)
sprintf( string, "/proc/%d/cmdline", pid );
if ((fp = fopen( string, "r")) == NULL) return NULL;
@@ -810,7 +818,11 @@
@@ -827,7 +827,7 @@
}
#else
#if HAVE_KVM_GETPROCS
+#if defined(freebsd5) && __FreeBSD_version >= 500014
+ switch ( proc_table[LowProcIndex].ki_stat ) {
+#else
switch ( proc_table[LowProcIndex].kp_proc.p_stat ) {
+#endif
#elif defined(dynix)
switch ( lowpsinfo.pr_state ) {
#elif defined(solaris2)
@@ -906,9 +918,17 @@
- #if defined(freebsd5)
+ #if defined(freebsd5) && __FreeBSD_version >= 500014
switch ( proc_table[LowProcIndex].ki_stat ) {
#else
switch ( proc_table[LowProcIndex].kp_proc.p_stat ) {
@@ -927,7 +927,7 @@
proc_buf->p_stime*100;
#endif
#elif HAVE_KVM_GETPROCS
+#if defined(freebsd5) && __FreeBSD_version >= 500014
+ /* XXX: Accessing ki_paddr causes sig10 ...
+ long_return = proc_table[LowProcIndex].ki_paddr->p_uticks +
+ proc_table[LowProcIndex].ki_paddr->p_sticks +
+ proc_table[LowProcIndex].ki_paddr->p_iticks; */
+ long_return = 0;
+#else
- #if defined(freebsd5)
+ #if defined(freebsd5) && __FreeBSD_version >= 500014
long_return = proc_table[LowProcIndex].ki_runtime / 100000;
#else
long_return = proc_table[LowProcIndex].kp_proc.p_uticks +
proc_table[LowProcIndex].kp_proc.p_sticks +
proc_table[LowProcIndex].kp_proc.p_iticks;
+#endif
#elif defined(linux)
sprintf( string, "/proc/%d/stat", pid );
if ((fp = fopen( string, "r")) == NULL) return NULL;
@@ -976,6 +996,13 @@
#elif HAVE_KVM_GETPROCS
#if defined(freebsd3) && !defined(darwin)
long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_map.size/1024;
+#elif defined(freebsd5) && __FreeBSD_version >= 500014
+ /* XXX
+ long_return = proc_table[LowProcIndex].ki_vmspace->vm_tsize +
+ proc_table[LowProcIndex].ki_vmspace->vm_ssize +
+ proc_table[LowProcIndex].ki_vmspace->vm_dsize;
+ long_return = long_return * (getpagesize() / 1024); */
+ long_return = 0;
#else
long_return = proc_table[LowProcIndex].kp_eproc.e_vm.vm_tsize +
proc_table[LowProcIndex].kp_eproc.e_vm.vm_ssize +
@@ -1237,8 +1264,13 @@
@@ -1266,7 +1266,7 @@
#elif defined(solaris2)
return proc_table[current_proc_entry++];
#elif HAVE_KVM_GETPROCS
+#if defined(freebsd5) && __FreeBSD_version >= 500014
+ if ( proc_table[current_proc_entry].ki_stat != 0 )
+ return proc_table[current_proc_entry++].ki_pid;
+#else
if ( proc_table[current_proc_entry].kp_proc.p_stat != 0 )
return proc_table[current_proc_entry++].kp_proc.p_pid;
+#endif
#else
if ( proc_table[current_proc_entry].p_stat != 0 )
return proc_table[current_proc_entry++].p_pid;
- #if defined(freebsd5)
+ #if defined(freebsd5) && __FreeBSD_version >= 500014
if ( proc_table[current_proc_entry].ki_stat != 0 )
return proc_table[current_proc_entry++].ki_pid;
#else

10
net-mgmt/net-snmp4/files/patch-scapi.c
View File

@ -1,10 +0,0 @@
--- ../../work/ucd-snmp-4.2.6/snmplib/scapi.c 2001-10-01 02:52:49.000000000 -0700
+++ snmplib/scapi.c 2008-03-04 16:41:52.000000000 -0800
@@ -56,6 +56,7 @@
#include <openssl/hmac.h>
#include <openssl/evp.h>
#include <openssl/rand.h>
+#include <openssl/des.h>
#endif
#ifdef QUITFUN

2
net-mgmt/net-snmp4/pkg-plist
View File

@ -9,7 +9,7 @@ bin/snmpdf
bin/snmpget
bin/snmpgetnext
bin/snmpinform
bin/snmpnetstat
bin/snmpnetstat53
bin/snmpset
bin/snmpstatus
bin/snmptable