From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 29 04:20:51 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CEAA616A4CE for ; Sat, 29 May 2004 04:20:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3C0043D48 for ; Sat, 29 May 2004 04:20:51 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i4TBKQHR043693 for ; Sat, 29 May 2004 04:20:26 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i4TBKQvN043692; Sat, 29 May 2004 04:20:26 -0700 (PDT) (envelope-from gnats) Resent-Date: Sat, 29 May 2004 04:20:26 -0700 (PDT) Resent-Message-Id: <200405291120.i4TBKQvN043692@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, rik Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EEA6916A4CE for ; Sat, 29 May 2004 04:10:35 -0700 (PDT) Received: from lost.little-black-kitty.net (lost.little-black-kitty.net [193.110.88.119]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAD0243D3F for ; Sat, 29 May 2004 04:10:34 -0700 (PDT) (envelope-from rik@little-black-kitty.net) Received: by lost.little-black-kitty.net (Postfix, from userid 1000) id 611248B8CC; Sat, 29 May 2004 12:10:29 +0100 (BST) Message-Id: <20040529111029.611248B8CC@lost.little-black-kitty.net> Date: Sat, 29 May 2004 12:10:29 +0100 (BST) From: rik To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/67336: [maintainer update] fix build of ports/security/tor on FreeBSD 4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 May 2004 11:20:52 -0000 >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 + #endif + ++#include ++ + #include + #include + #include +@@ -56,7 +58,9 @@ #include #endif #ifdef HAVE_MACHINE_LIMITS_H -+#ifndef __FreeBSD__ ++#if !defined __FreeBSD_version || (defined __FreeBSD_version && __FreeBSD_version < 500000) #include +#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 ++ + #include + #include + #include +@@ -38,7 +40,9 @@ #include #endif #ifdef HAVE_MACHINE_LIMITS_H -+#ifndef __FreeBSD__ ++#if !defined __FreeBSD_version || (defined __FreeBSD_version && __FreeBSD_version < 500000) #include +#endif #endif >Release-Note: >Audit-Trail: >Unformatted: