From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 29 08:50:29 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 03D6D16A4A7 for ; Wed, 29 Nov 2006 08:50:29 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D5AF43CCB for ; Wed, 29 Nov 2006 08:50:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kAT8oCcM002299 for ; Wed, 29 Nov 2006 08:50:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kAT8oCi0002298; Wed, 29 Nov 2006 08:50:12 GMT (envelope-from gnats) Resent-Date: Wed, 29 Nov 2006 08:50:12 GMT Resent-Message-Id: <200611290850.kAT8oCi0002298@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, "Eric P. Scott" Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4747116A415 for ; Wed, 29 Nov 2006 08:48:10 +0000 (UTC) (envelope-from eps@anna.ana.com) Received: from anna.ana.com (anna.ana.com [208.69.41.33]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9053243CC0 for ; Wed, 29 Nov 2006 08:48:09 +0000 (GMT) (envelope-from eps@anna.ana.com) Received: from anna.ana.com (localhost [127.0.0.1]) by anna.ana.com (8.13.8/8.13.8) with ESMTP id kAT8rxAx017903 for ; Wed, 29 Nov 2006 00:54:04 -0800 (PST) Received: (from eps@localhost) by anna.ana.com (8.13.8/8.13.8/Submit) id kAT8rxtl017902; Wed, 29 Nov 2006 00:53:59 -0800 (PST) Message-Id: <200611290853.kAT8rxtl017902@anna.ana.com> Date: Wed, 29 Nov 2006 00:53:59 -0800 (PST) From: "Eric P. Scott" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/105994: security/dropbear: fix compilation problems X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Eric P. Scott" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Nov 2006 08:50:29 -0000 >Number: 105994 >Category: ports >Synopsis: security/dropbear: fix compilation problems >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Nov 29 08:50:11 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Eric P. Scott >Release: FreeBSD 4.11-SECURITY i386 >Organization: ana-systems, Inc. >Environment: System: FreeBSD fourever 4.11-SECURITY FreeBSD 4.11-SECURITY #0: Tue Feb 28 16:06:29 GMT 2006 root@builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: dropbear-0.48.1 fails to build on FreeBSD 4.x; Two files in upstream source contain misordered statements >How-To-Repeat: See http://pointyhat.freebsd.org/errorlogs/ >Fix: 1. Add as files/patch-includes.h ------- --- includes.h.orig Sat Mar 11 20:52:51 2006 +++ includes.h @@ -72,11 +72,11 @@ #include #endif -#include - #ifdef HAVE_NETINET_IN_H #include #endif + +#include /* netbsd 1.6 needs this to be included before netinet/ip.h for some * undocumented reason */ ------- 2. Add as files/patch-random.c ------- --- random.c.orig Sat Mar 11 20:52:51 2006 +++ random.c @@ -158,6 +158,8 @@ pid_t pid; struct timeval tv; + hash_state hs; + unsigned char hash[SHA1_HASH_SIZE]; if (!donerandinit) { dropbear_exit("seedrandom not done"); @@ -166,8 +168,6 @@ pid = getpid(); gettimeofday(&tv, NULL); - hash_state hs; - unsigned char hash[SHA1_HASH_SIZE]; sha1_init(&hs); sha1_process(&hs, (void*)hashpool, sizeof(hashpool)); sha1_process(&hs, (void*)&pid, sizeof(pid)); ------- >Release-Note: >Audit-Trail: >Unformatted: