From owner-svn-ports-all@FreeBSD.ORG Sat Apr 20 17:28:38 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 0ED7C8D0; Sat, 20 Apr 2013 17:28:38 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DABDA769; Sat, 20 Apr 2013 17:28:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3KHSbYl066289; Sat, 20 Apr 2013 17:28:37 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3KHSbx7066287; Sat, 20 Apr 2013 17:28:37 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201304201728.r3KHSbx7066287@svn.freebsd.org> From: Olli Hauer Date: Sat, 20 Apr 2013 17:28:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316160 - in head/www/apache24: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2013 17:28:38 -0000 Author: ohauer Date: Sat Apr 20 17:28:36 2013 New Revision: 316160 URL: http://svnweb.freebsd.org/changeset/ports/316160 Log: - fix build on sparc64 machine Feature safe: yes with hat apache@ PR: 177693 Submitted by: Michael Moll Obtained from: http://svn.apache.org/viewvc?view=revision&revision=1470183 Added: head/www/apache24/files/patch-server__core.c (contents, props changed) Modified: head/www/apache24/Makefile Modified: head/www/apache24/Makefile ============================================================================== --- head/www/apache24/Makefile Sat Apr 20 16:29:57 2013 (r316159) +++ head/www/apache24/Makefile Sat Apr 20 17:28:36 2013 (r316160) @@ -2,6 +2,7 @@ PORTNAME= apache24 PORTVERSION= 2.4.4 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} Added: head/www/apache24/files/patch-server__core.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/apache24/files/patch-server__core.c Sat Apr 20 17:28:36 2013 (r316160) @@ -0,0 +1,27 @@ +Apache issue: https://issues.apache.org/bugzilla/show_bug.cgi?id=52900 + +Obtained from: +http://svn.apache.org/viewvc?view=revision&revision=1470183 +============================================================ +--- ./server/core.c.orig 2013-02-06 18:15:16.000000000 +0100 ++++ ./server/core.c 2013-04-20 19:11:17.000000000 +0200 +@@ -4768,13 +4768,18 @@ + AP_DECLARE(apr_uint32_t) ap_random_pick(apr_uint32_t min, apr_uint32_t max) + { + apr_uint32_t number; ++#if (!__GNUC__ || __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8) || \ ++ !__sparc__ || APR_SIZEOF_VOIDP != 8) ++ /* This triggers a gcc bug on sparc/64bit with gcc < 4.8, PR 52900 */ + if (max < 16384) { + apr_uint16_t num16; + ap_random_insecure_bytes(&num16, sizeof(num16)); + RAND_RANGE(num16, min, max, APR_UINT16_MAX); + number = num16; + } +- else { ++ else ++#endif ++ { + ap_random_insecure_bytes(&number, sizeof(number)); + RAND_RANGE(number, min, max, APR_UINT32_MAX); + }