- Update to version 1.22

Approved by:	sem (mentor)
This commit is contained in:
Andrej Zverev 2005-10-06 12:59:01 +00:00
parent 0772879ea2
commit d4d7e2ee60
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=144397
4 changed files with 62 additions and 8 deletions

View file

@ -7,8 +7,7 @@
#
PORTNAME= and
PORTVERSION= 1.0.9
PORTREVISION= 2
PORTVERSION= 1.2.2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}

View file

@ -1,2 +1,2 @@
MD5 (and-1.0.9.tar.gz) = 0489b469eb94be6c977056b308d3f375
SIZE (and-1.0.9.tar.gz) = 25959
MD5 (and-1.2.2.tar.gz) = b939909039a8487eec93ff7eb56a4779
SIZE (and-1.2.2.tar.gz) = 29989

View file

@ -1,6 +1,6 @@
--- and-OpenBSD.c.orig Sun Jan 27 18:52:18 2002
+++ and-OpenBSD.c Thu Oct 6 14:51:53 2005
@@ -91,6 +91,21 @@
--- and-OpenBSD.c.orig Sat Mar 6 16:34:02 2004
+++ and-OpenBSD.c Thu Oct 6 16:11:57 2005
@@ -91,10 +91,24 @@
abort();
}
if (openbsd_next >= openbsd_nproc) return NULL;
@ -22,7 +22,11 @@
strncpy(openbsd_proc.command,openbsd_pt[openbsd_next].kp_proc.p_comm,1023);
openbsd_proc.command[1023] = 0;
openbsd_proc.pid = openbsd_pt[openbsd_next].kp_proc.p_pid;
@@ -102,6 +117,7 @@
- openbsd_proc.ppid = openbsd_pt[openbsd_next].kp_proc.p_ppid; /* FIXME that correct? */
openbsd_proc.nice = openbsd_pt[openbsd_next].kp_proc.p_nice-20;
openbsd_proc.uid = openbsd_pt[openbsd_next].kp_eproc.e_pcred.p_ruid;
openbsd_proc.gid = openbsd_pt[openbsd_next].kp_eproc.e_pcred.p_rgid;
@@ -103,6 +117,7 @@
openbsd_pt[openbsd_next].kp_proc.p_sticks +
openbsd_pt[openbsd_next].kp_proc.p_iticks)
/ openbsd_hz;

View file

@ -0,0 +1,51 @@
--- and.c.orig Mon Apr 5 23:19:01 2004
+++ and.c Thu Oct 6 16:04:09 2005
@@ -47,7 +47,11 @@
#include <sys/types.h>
#include <signal.h>
#include <regex.h>
-#include <values.h>
+#if defined(__FreeBSD__) && __FreeBSD_version >= 500014
+#include <sys/limits.h>
+#else
+#include <limits.h>
+#endif
#define DEBUG 0
@@ -714,7 +718,7 @@
} else if (and_db.entry[i].uid == -1) {
exactness[i] = 0;
} else {
- exactness[i] = -MAXINT;
+ exactness[i] = -INT_MAX;
}
/* group id */
if (gid == and_db.entry[i].gid) {
@@ -722,7 +726,7 @@
} else if (and_db.entry[i].gid == -1) {
exactness[i] += 0;
} else {
- exactness[i] = -MAXINT;
+ exactness[i] = -INT_MAX;
}
/* command */
if (command!=NULL && regexec(and_db.entry[i].command,command,0,0,0) == 0) {
@@ -730,7 +734,7 @@
} else if (strcmp(and_db.entry[i].command_str,"*") == 0) {
exactness[i] += 0;
} else {
- exactness[i] = -MAXINT;
+ exactness[i] = -INT_MAX;
}
/* parent */
par = parent;
@@ -745,7 +749,7 @@
exactness[i] += 0;
break;
} else if (last) {
- exactness[i] = -MAXINT;
+ exactness[i] = -INT_MAX;
break;
}
par = par->parent;