Import of pkgsrc-2014Q1

This commit is contained in:
2014-11-05 12:41:07 +01:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
+4 -4
View File
@@ -1,10 +1,10 @@
$NetBSD: patch-aa,v 1.2 2007/12/15 16:41:51 seb Exp $
$NetBSD: patch-aa,v 1.3 2014/02/06 09:09:17 obache Exp $
Fix for LP64 big-endian platforms.
--- http/engine.c.orig 2007-07-29 20:23:26.000000000 +0000
+++ http/engine.c
@@ -246,7 +246,7 @@ int add_host_allow(char *name) {
--- src/http/engine.c.orig 2012-05-10 20:52:38.000000000 +0000
+++ src/http/engine.c
@@ -245,7 +245,7 @@ int add_host_allow(char *name) {
struct sockaddr_in *sin = (struct sockaddr_in *)_res->ai_addr;
NEW(h);
-29
View File
@@ -1,29 +0,0 @@
$NetBSD: patch-ab,v 1.4 2008/12/28 22:38:08 seb Exp $
--- process/sysdep_NETBSD.c.orig 2007-07-29 20:23:26.000000000 +0000
+++ process/sysdep_NETBSD.c
@@ -55,6 +55,8 @@
#include <sys/dkstat.h>
#endif
+#include <sys/param.h>
+
#include "monitor.h"
#include "process.h"
#include "process_sysdep.h"
@@ -171,9 +173,15 @@ int initprocesstree_sysdep(ProcessTree_T
{
pt[i].pid = pinfo[i].kp_proc.p_pid;
pt[i].ppid = pinfo[i].kp_eproc.e_ppid;
+#if defined(__NetBSD_Prereq__) && (499004400 <= __NetBSD_Version__)
+ pt[i].cputime = (long)((pinfo[i].kp_proc.p_rtime.sec << 4) +
+ (pinfo[i].kp_proc.p_rtime.frac >> 60)
+ );
+#else
pt[i].cputime = (long)((pinfo[i].kp_proc.p_rtime.tv_sec * 10) +
(pinfo[i].kp_proc.p_rtime.tv_usec / 100000)
);
+#endif
pt[i].mem_kbyte = (unsigned long)(pinfo[i].kp_eproc.e_vm.vm_rssize * pagesize_kbyte);
if(pinfo[i].kp_proc.p_stat == SZOMB)
{