From nobody@FreeBSD.org  Fri May 14 12:22:37 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CA12B106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 14 May 2010 12:22:37 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id B9FB28FC20
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 14 May 2010 12:22:37 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o4ECMbe2005561
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 14 May 2010 12:22:37 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o4ECMbUP005560;
	Fri, 14 May 2010 12:22:37 GMT
	(envelope-from nobody)
Message-Id: <201005141222.o4ECMbUP005560@www.freebsd.org>
Date: Fri, 14 May 2010 12:22:37 GMT
From: Lucius Windschuh <lwindschuh@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] Make math/dieharder compile again
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: bf1783@gmail.com

>Number:         146579
>Category:       ports
>Synopsis:       [patch] Make math/dieharder compile again
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 14 12:30:05 UTC 2010
>Closed-Date:    Sat Jun 05 19:40:31 UTC 2010
>Last-Modified:  Sat Jun  5 19:50:02 UTC 2010
>Originator:     Lucius Windschuh
>Release:        9-CURRENT (i386)
>Organization:
>Environment:
FreeBSD t400 9.0-CURRENT FreeBSD 9.0-CURRENT #160 r207913P: Tue May 11 14:59:59 CEST 2010     root@t400:/usr/obj/usr/src/sys/CURRENT  i386

>Description:
math/dieharder is marked BROKEN on i386, amd64 and sparc64.
It shouldn't compile on any platform except amd64 because it uses amd64 assembler unconditionally in libdieharder/skein_block_ref.c.
The attached patch simply comments out the affected function, as it does not seem to be used at all (dieharder compiles and runs fine without it)!
This was tested on i386 by me.

Could somebody please test if dieharder compiles also on ia64 and sparc64 and, if it works, remove the BROKEN tag from the Makefile?
>How-To-Repeat:
cd /usr/ports/math/dieharder && make
(on non-amd64)
>Fix:
Put the attached file into math/dieharder/files/patch-libdieharder__skein_block_ref.c and remove the BROKEN mark from math/dieharder/Makefile

Patch attached with submission follows:

--- libdieharder/skein_block_ref.c.orig	2010-05-14 14:08:11.000000000 +0200
+++ libdieharder/skein_block_ref.c	2010-05-14 14:07:52.000000000 +0200
@@ -123,7 +123,7 @@
 
 typedef unsigned long long uint64;
 
-#if 1
+#if 0
 uint64 timingAdjust = 200;
 
 uint64 time() {


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri May 14 12:30:15 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146579 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: bf1783@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/146579: [patch] Make math/dieharder compile again
Date: Fri, 14 May 2010 12:30:13 UT

 Maintainer of math/dieharder,
 
 Please note that PR ports/146579 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/146579
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: "b. f." <bf1783@googlemail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/146579: [patch] Make math/dieharder compile again
Date: Mon, 17 May 2010 02:33:31 +0000

 --0016e6d99c2c055e9c0486c10d38
 Content-Type: text/plain; charset=ISO-8859-1
 
 On Fri, 14 May 2010 12:30:13 UT, Edwin Groothuis <edwin@freebsd.org> wrote:
 > Maintainer of math/dieharder,
 >
 > Please note that PR ports/146579 has just been submitted.
 >
 > If it contains a patch for an upgrade, an enhancement or a bug fix
 > you agree on, reply to this email stating that you approve the patch
 > and a committer will take care of it.
 >
 > The full text of the PR can be found at:
 >     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/146579
 >
 > --
 > Edwin Groothuis via the GNATS Auto Assign Tool
 > edwin@FreeBSD.org
 >
 
 The non-portable time() function in libdieharder/skein_block_ref.c was
 copied from libdieharder/bauer/skein_block_ref.c, where is used to
 time a skein block test.  I'm not sure why it wasn't trimmed from
 libdieharder/skein_block_ref.c, as the other time() calls in the
 sources evidently use time(3).  I'll disable the problematic function,
 although slightly differently, and also make a number of other small
 changes.  Please apply the attached patch to the port, instead of the
 original submission.  I've removed the architectural restrictions:
 earlier versions of the port were known to work with Debian on ia64
 and sparc, so let's see if the current version works on these
 architectures with FreeBSD.  We can restore the restrictions or apply
 additional patches later if it does not.
 
 b.
 
 --0016e6d99c2c055e9c0486c10d38
 Content-Type: text/plain; charset=US-ASCII; name="dieharder_time_diff.txt"
 Content-Disposition: attachment; filename="dieharder_time_diff.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: file0
 
 ZGlmZiAteCAnb2xkLionIC1ydU4gZGllaGFyZGVyLm9yaWcvTWFrZWZpbGUgZGllaGFyZGVyL01h
 a2VmaWxlCi0tLSBkaWVoYXJkZXIub3JpZy9NYWtlZmlsZQkyMDEwLTA1LTE2IDE2OjEyOjIyLjAw
 MDAwMDAwMCAtMDQwMAorKysgZGllaGFyZGVyL01ha2VmaWxlCTIwMTAtMDUtMTYgMTc6Mjk6NDgu
 MDAwMDAwMDAwIC0wNDAwCkBAIC03LDcgKzcsNyBAQAogCiBQT1JUTkFNRT0JZGllaGFyZGVyCiBE
 SVNUVkVSU0lPTj0JMy4yOS40YmV0YQotUE9SVFJFVklTSU9OPQkxCitQT1JUUkVWSVNJT049CTIK
 IENBVEVHT1JJRVM9CW1hdGgKIE1BU1RFUl9TSVRFUz0JaHR0cDovL3d3dy5waHkuZHVrZS5lZHUv
 fnJnYi9HZW5lcmFsL2RpZWhhcmRlci8KIEVYVFJBQ1RfU1VGWD0JLnRnegpAQCAtMTksNiArMTks
 NyBAQAogCiBNQUtFX0pPQlNfVU5TQUZFPQl5ZXMKIAorVVNFX0RPUzJVTklYPQl5ZXMKIFVTRV9B
 VVRPVE9PTFM9CWFjbG9jYWw6MTEwIGF1dG9oZWFkZXI6MjYyIGxpYnRvb2w6MjIKIENQUEZMQUdT
 Kz0JLUkke0xPQ0FMQkFTRX0vaW5jbHVkZQogTERGTEFHUys9CS1MJHtMT0NBTEJBU0V9L2xpYgpA
 QCAtMjgsMTYgKzI5LDEzIEBACiBNQU4zPQkJbGliZGllaGFyZGVyLjMKIAogLmluY2x1ZGUgPGJz
 ZC5wb3J0LnByZS5taz4KLS5pZiAke0FSQ0h9ID09ICJpMzg2IiB8fCAke0FSQ0h9ID09ICJpYTY0
 IiB8fCAke0FSQ0h9ID09ICJzcGFyYzY0IgotQlJPS0VOPQlkb2VzIG5vdCBjb21waWxlIG9uIGkz
 ODYsIGlhNjQsIG9yIHNwYXJjNjQKLS5lbmRpZgogCiBwb3N0LXBhdGNoOgogCUAke1JFSU5QTEFD
 RV9DTUR9IC1lICJzfC4vY29uZmlndXJlfCMuL2NvbmZpZ3VyZXxnIiBcCiAJCSR7V1JLU1JDfS9h
 dXRvZ2VuLnNoCiAKIHJ1bi1hdXRvdG9vbHM6Ci0JQChjZCAke1dSS1NSQ307ICR7U0VURU5WfSAk
 e0FVVE9UT09MU19FTlZ9ICR7U0h9IC4vYXV0b2dlbi5zaCkKKwkoY2QgJHtXUktTUkN9OyAke1NF
 VEVOVn0gJHtBVVRPVE9PTFNfRU5WfSAke0FVVE9SRUNPTkZ9IC1pZnYpCiAJQCR7UkVJTlBMQUNF
 X0NNRH0gLWUgIi9ebHRtYWluPS8hc15cJCRhY19hdXhfZGlyL2x0bWFpbi5zaF4ke0xJQlRPT0xG
 TEFHU30gJHtMVE1BSU59XmciIFwKIAkJLWUgJy9eTElCVE9PTD0vc15cJCQodG9wX2J1aWxkZGly
 KS9saWJ0b29sXiR7TElCVE9PTH1eZycgXAogCQkJJHtXUktTUkN9L2NvbmZpZ3VyZQpkaWZmIC14
 ICdvbGQuKicgLXJ1TiBkaWVoYXJkZXIub3JpZy9maWxlcy9wYXRjaC1saWJkaWVoYXJkZXJfX3Nr
 ZWluX2Jsb2NrX3JlZi5jIGRpZWhhcmRlci9maWxlcy9wYXRjaC1saWJkaWVoYXJkZXJfX3NrZWlu
 X2Jsb2NrX3JlZi5jCi0tLSBkaWVoYXJkZXIub3JpZy9maWxlcy9wYXRjaC1saWJkaWVoYXJkZXJf
 X3NrZWluX2Jsb2NrX3JlZi5jCTE5NjktMTItMzEgMTk6MDA6MDAuMDAwMDAwMDAwIC0wNTAwCisr
 KyBkaWVoYXJkZXIvZmlsZXMvcGF0Y2gtbGliZGllaGFyZGVyX19za2Vpbl9ibG9ja19yZWYuYwky
 MDEwLTA1LTE2IDIxOjI0OjM2LjAwMDAwMDAwMCAtMDQwMApAQCAtMCwwICsxLDE2IEBACistLS0g
 bGliZGllaGFyZGVyL3NrZWluX2Jsb2NrX3JlZi5jLm9yaWcJMjAxMC0wNS0xNiAyMToyMDo1OS4w
 MDAwMDAwMDAgLTA0MDAKKysrKyBsaWJkaWVoYXJkZXIvc2tlaW5fYmxvY2tfcmVmLmMJMjAxMC0w
 NS0xNiAyMToyMzowOS4wMDAwMDAwMDAgLTA0MDAKK0BAIC0xMjEsNiArMTIxLDcgQEAKKyAJd2hp
 bGUgKC0tYmxrQ250KTsKKyB9CisgCisrI2lmZGVmIFRTQ19USU1FCisgdHlwZWRlZiB1bnNpZ25l
 ZCBsb25nIGxvbmcgdWludDY0OworIAorICNpZiAxCitAQCAtMTM5LDQgKzE0MCw1IEBACisgfQor
 IAorICNlbmRpZgorKyNlbmRpZgorIAo=
 --0016e6d99c2c055e9c0486c10d38--
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Jun 5 19:40:29 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146579 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146579: commit references a PR
Date: Sat,  5 Jun 2010 19:44:20 +0000 (UTC)

 miwi        2010-06-05 19:40:22 UTC
 
   FreeBSD ports repository
 
   Modified files:
     math/dieharder       Makefile 
   Added files:
     math/dieharder/files patch-libdieharder__skein_block_ref.c 
   Log:
   - Unbreak && Fix build
   
   PR:             146579
   Submitted by:   Lucius Windschuh <lwindschuh@gmail.com>
   Approved by:    bf@ (maintainer)
   
   Revision  Changes    Path
   1.11      +3 -5      ports/math/dieharder/Makefile
   1.1       +16 -0     ports/math/dieharder/files/patch-libdieharder__skein_block_ref.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
