Date: Sat, 29 May 2004 12:10:29 +0100 (BST) From: rik <freebsd-ports@rikrose.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/67336: [maintainer update] fix build of ports/security/tor on FreeBSD 4 Message-ID: <20040529111029.611248B8CC@lost.little-black-kitty.net> Resent-Message-ID: <200405291120.i4TBKQvN043692@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67336 >Category: ports >Synopsis: [maintainer update] fix build of ports/security/tor on FreeBSD 4 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat May 29 04:20:26 PDT 2004 >Closed-Date: >Last-Modified: >Originator: freebsd-ports@rikrose.net >Release: FreeBSD 4.9-STABLE i386 >Organization: N/A >Environment: System: FreeBSD izzard.internal 4.9-STABLE FreeBSD 4.9-STABLE #3: Sat Nov 29 14:56:52 GMT 2003 RIK@izzard.internal:/usr/obj/usr/src/sys/IZZARD i386 >Description: machine/limits.h strikes again. After I removed it from the build on 5, it's required on 4, and I hadn't tested it thoroughly enough. Lesson learned, patch attached. >How-To-Repeat: >Fix: --- ../../files/patch-src::common::util.c.orig Sat May 29 08:30:00 2004 +++ ../../files/patch-src::common::util.c Sat May 29 12:01:04 2004 @@ -1,11 +1,19 @@ -diff -ur /tmp/tor-0.0.6.2/src/common/util.c ./src/common/util.c ---- /tmp/tor-0.0.6.2/src/common/util.c Sun May 2 00:29:20 2004 -+++ ./src/common/util.c Fri May 28 14:49:22 2004 -@@ -56,7 +56,9 @@ +--- src/common/util.c.orig Sun May 2 00:29:20 2004 ++++ src/common/util.c Fri May 28 22:20:56 2004 +@@ -25,6 +25,8 @@ + #include <windows.h> + #endif + ++#include <sys/param.h> ++ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +@@ -56,7 +58,9 @@ #include <sys/limits.h> #endif #ifdef HAVE_MACHINE_LIMITS_H -+#ifndef __FreeBSD__ ++#if !defined __FreeBSD_version || (defined __FreeBSD_version && __FreeBSD_version < 500000) #include <machine/limits.h> +#endif #endif --- ../../files/patch-src::or::or.h.orig Sat May 29 08:30:00 2004 +++ ../../files/patch-src::or::or.h Sat May 29 12:01:04 2004 @@ -1,11 +1,19 @@ -diff -ur /tmp/tor-0.0.6.2/src/or/or.h ./src/or/or.h ---- /tmp/tor-0.0.6.2/src/or/or.h Sun May 2 04:15:55 2004 -+++ ./src/or/or.h Fri May 28 14:49:34 2004 -@@ -38,7 +38,9 @@ +--- src/or/or.h.orig Sun May 2 04:15:55 2004 ++++ src/or/or.h Fri May 28 22:21:13 2004 +@@ -14,6 +14,8 @@ + #define FD_SETSIZE 512 + #endif + ++#include <sys/param.h> ++ + #include <stdio.h> + #include <stdlib.h> + #include <limits.h> +@@ -38,7 +40,9 @@ #include <sys/limits.h> #endif #ifdef HAVE_MACHINE_LIMITS_H -+#ifndef __FreeBSD__ ++#if !defined __FreeBSD_version || (defined __FreeBSD_version && __FreeBSD_version < 500000) #include <machine/limits.h> +#endif #endif >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040529111029.611248B8CC>