svn commit: r306180 - in head/sysutils: cdrtools-devel/files cdrtools/files

[Marius Strobl]

Author: marius (src committer)
Date: Sat Oct 20 13:56:03 2012
New Revision: 306180
URL: http://svn.freebsd.org/changeset/ports/306180

Log:
  Fix a bug preventing compilation with clang 3.1 (r156863).
  
  PR:		172799
  Approved by:	netchild
  Obtained from:	NetBSD
  Feature safe:	yes

Added:
  head/sysutils/cdrtools-devel/files/patch-include::schily::sha2.h   (contents, props changed)
  head/sysutils/cdrtools/files/patch-include::schily::sha2.h   (contents, props changed)

Added: head/sysutils/cdrtools-devel/files/patch-include::schily::sha2.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/cdrtools-devel/files/patch-include::schily::sha2.h	Sat Oct 20 13:56:03 2012	(r306180)
@@ -0,0 +1,15 @@
+--- include/schily/sha2.h.orig	2010-08-27 12:41:30.000000000 +0200
++++ include/schily/sha2.h	2012-10-20 14:39:42.000000000 +0200
+@@ -104,10 +104,12 @@
+ 
+ #ifdef	HAVE_LONGLONG
+ extern void SHA384Init		__PR((SHA2_CTX *));
++#ifndef	HAVE_PRAGMA_WEAK
+ extern void SHA384Transform	__PR((UInt64_t state[8],
+ 					const UInt8_t [SHA384_BLOCK_LENGTH]));
+ extern void SHA384Update	__PR((SHA2_CTX *, const UInt8_t *, size_t));
+ extern void SHA384Pad		__PR((SHA2_CTX *));
++#endif
+ extern void SHA384Final		__PR((UInt8_t [SHA384_DIGEST_LENGTH],
+ 					SHA2_CTX *));
+ extern char *SHA384End		__PR((SHA2_CTX *, char *));

Added: head/sysutils/cdrtools/files/patch-include::schily::sha2.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/cdrtools/files/patch-include::schily::sha2.h	Sat Oct 20 13:56:03 2012	(r306180)
@@ -0,0 +1,14 @@
+--- include/schily/sha2.h.orig	2009-08-09 14:29:59.000000000 +0200
++++ include/schily/sha2.h	2012-10-20 14:25:05.000000000 +0200
+@@ -102,9 +102,11 @@
+ 
+ #ifdef	HAVE_LONGLONG
+ extern void SHA384Init		__PR((SHA2_CTX *));
++#ifndef	HAVE_PRAGMA_WEAK
+ extern void SHA384Transform	__PR((UInt64_t state[8], const UInt8_t [SHA384_BLOCK_LENGTH]));
+ extern void SHA384Update	__PR((SHA2_CTX *, const UInt8_t *, size_t));
+ extern void SHA384Pad		__PR((SHA2_CTX *));
++#endif
+ extern void SHA384Final		__PR((UInt8_t [SHA384_DIGEST_LENGTH], SHA2_CTX *));
+ extern char *SHA384End		__PR((SHA2_CTX *, char *));
+ extern char *SHA384File		__PR((const char *, char *));