mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00
Code Issues Releases Activity

- Fix problem that was reintroduced with the upgrade to 5.7.1 [1]

Browse Source 
- Merge in upstream commits to resolve a handful of issues
  - 1421924b4852142192c5bb9e93ddbfed69e908fa [1]
  - 97172b311d20f4441c7a7e90092b59c1e0da99f7
  - 5fd26e4fa3e000ea9c81c38ab975b7946efe2157
  - cf82b894b2217c26edc6f1356351c932415604e2
- Bump PORTREVISION

PR:		ports/163069 [1]
Reported by:	Ryan Frederick <ryanrfrederick@gmail.com> [1]
Obtained from:	upstream repo
Feature safe:	yes
This commit is contained in:
Ryan Steinmetz 2011-12-07 22:58:31 +00:00
parent a214007321
commit cf01e16940
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=287038
5 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net-mgmt/net-snmp/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= snmp
PORTVERSION= 5.7.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net-mgmt ipv6
MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= net-

10
net-mgmt/net-snmp/files/patch-agent-mibgroup-hardware-fsys-fsys_getfsstats.c
View File

@ -1,5 +1,5 @@
--- ./agent/mibgroup/hardware/fsys/fsys_getfsstats.c.orig 2011-11-24 12:01:07.000000000 -0500
+++ ./agent/mibgroup/hardware/fsys/fsys_getfsstats.c 2011-11-24 12:01:20.000000000 -0500
--- ./agent/mibgroup/hardware/fsys/fsys_getfsstats.c.orig 2011-09-28 00:53:47.000000000 -0400
+++ ./agent/mibgroup/hardware/fsys/fsys_getfsstats.c 2011-12-07 17:33:47.000000000 -0500
@@ -150,9 +150,9 @@
if (!entry)
continue;
@ -12,3 +12,9 @@
entry->device[sizeof(entry->device)-1] = '\0';
entry->units = stats[i].f_bsize; /* or f_frsize */
entry->size = stats[i].f_blocks;
@@ -175,4 +175,5 @@
}
netsnmp_fsys_calculate32(entry);
}
+ free(stats);
}

11
net-mgmt/net-snmp/files/patch-agent__helpers__old_api.c Normal file
View File

@ -0,0 +1,11 @@
--- ./agent/helpers/old_api.c.orig 2011-12-07 17:43:45.000000000 -0500
+++ ./agent/helpers/old_api.c 2011-12-07 17:44:06.000000000 -0500
@@ -127,7 +127,7 @@
*/
if (netsnmp_register_handler(reginfo) != MIB_REGISTERED_OK) {
/** netsnmp_handler_registration_free(reginfo); already freed */
- SNMP_FREE(vp);
+ /* SNMP_FREE(vp); already freed */
}
}
return SNMPERR_SUCCESS;

11
net-mgmt/net-snmp/files/patch-agent__mibgroup__host__data_access__swinst_apt.c Normal file
View File

@ -0,0 +1,11 @@
--- ./agent/mibgroup/host/data_access/swinst_apt.c.orig 2011-12-07 17:42:08.000000000 -0500
+++ ./agent/mibgroup/host/data_access/swinst_apt.c 2011-12-07 17:42:15.000000000 -0500
@@ -95,7 +95,7 @@
entry->swDate_len = 8;
memcpy(entry->swDate, "\0\0\1\1\0\0\0\0", 8);
}
- fclose(p);
+ pclose(p);
DEBUGMSGTL(("swinst:load:arch"," loaded %d entries\n",
CONTAINER_SIZE(container)));

23
net-mgmt/net-snmp/files/patch-snmplib__snmp_api.c Normal file
View File

@ -0,0 +1,23 @@
--- ./snmplib/snmp_api.c.orig 2011-12-07 17:39:10.000000000 -0500
+++ ./snmplib/snmp_api.c 2011-12-07 17:46:39.000000000 -0500
@@ -704,6 +704,8 @@
netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID,
NETSNMP_DS_LIB_HEX_OUTPUT_LENGTH, 16);
+ netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_RETRIES,
+ DEFAULT_RETRIES);
#ifdef NETSNMP_USE_REVERSE_ASNENCODING
netsnmp_ds_set_boolean(NETSNMP_DS_LIBRARY_ID,
@@ -6032,8 +6034,9 @@
*/
requests++;
for (rp = slp->internal->requests; rp; rp = rp->next_request) {
- if ((!timerisset(&earliest)
- || (timercmp(&rp->expire, &earliest, <)))) {
+ if (!timerisset(&earliest)
+ || (timerisset(&rp->expire)
+ && timercmp(&rp->expire, &earliest, <))) {
earliest = rp->expire;
DEBUGMSG(("verbose:sess_select","(to in %d.%06d sec) ",
(int)earliest.tv_sec, (int)earliest.tv_usec));