head	1.3;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.3.2.2
	OPENPKG_E1_FP:1.3.2.2
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.3.2.2
	OPENPKG_2_STABLE:1.3.0.2;
locks; strict;
comment	@# @;


1.3
date	2006.07.10.21.34.19;	author thl;	state Exp;
branches
	1.3.2.1;
next	1.2;
commitid	o1BcxwG7uJJJomEr;

1.2
date	2006.05.16.07.23.05;	author rse;	state Exp;
branches;
next	1.1;
commitid	eE3Nn4Fm5v2ksdxr;

1.1
date	2005.09.06.19.18.58;	author steve;	state Exp;
branches;
next	;

1.3.2.1
date	2006.07.10.21.34.19;	author rse;	state dead;
branches;
next	1.3.2.2;
commitid	iZxwRSmmWscPXUQr;

1.3.2.2
date	2006.10.16.14.49.07;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.3
log
@upgrading package: cryptlib 3.22 -> 3.23
@
text
@Index: random/unix.c
--- random/unix.c.orig	2005-08-23 00:48:20 +0200
+++ random/unix.c	2005-09-06 20:55:10 +0200
@@@@ -24,6 +24,9 @@@@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#ifdef __FreeBSD__
+#include <pthread.h>
+#endif
 #include "crypt.h"
 
 /* Unix and Unix-like systems share the same makefile, make sure that the
@


1.3.2.1
log
@file cryptlib.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:49:07 +0000
@
text
@d1 13
@


1.3.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 13
Index: random/unix.c
--- random/unix.c.orig	2005-08-23 00:48:20 +0200
+++ random/unix.c	2005-09-06 20:55:10 +0200
@@@@ -24,6 +24,9 @@@@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#ifdef __FreeBSD__
+#include <pthread.h>
+#endif
 #include "crypt.h"
 
 /* Unix and Unix-like systems share the same makefile, make sure that the
@


1.2
log
@fix static vs. extern issue under GCC 4.0
@
text
@a13 16
Index: cert/ext_def.c
--- cert/ext_def.c.orig	2005-08-14 22:34:44 +0200
+++ cert/ext_def.c	2006-05-16 09:20:41 +0200
@@@@ -116,9 +116,9 @@@@
    highest warning level enabled, this produces a compiler warning, so we
    turn the warning off for this module */
 
-extern const ATTRIBUTE_INFO FAR_BSS generalNameInfo[];
-extern const ATTRIBUTE_INFO FAR_BSS holdInstructionInfo[];
-extern const ATTRIBUTE_INFO FAR_BSS contentTypeInfo[];
+static const ATTRIBUTE_INFO FAR_BSS generalNameInfo[];
+static const ATTRIBUTE_INFO FAR_BSS holdInstructionInfo[];
+static const ATTRIBUTE_INFO FAR_BSS contentTypeInfo[];
 
 #if defined( _MSC_VER )
   #pragma warning( disable: 4211 )
@


1.1
log
@upgrading package: cryptlib 3.21 -> 3.22
@
text
@d14 16
@