Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Apr 2013 17:28:37 +0000 (UTC)
From:      Olli Hauer <ohauer@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r316160 - in head/www/apache24: . files
Message-ID:  <201304201728.r3KHSbx7066287@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <kvedulv@kvedulv.de>
  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);
+     }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304201728.r3KHSbx7066287>