| 1 |
alonbl 08/05/08 07:42:39 |
| 2 |
|
| 3 |
Added: coolkey-1.1.0-gcc-4.3.patch |
| 4 |
Log: |
| 5 |
Fix gcc-4.3 issue, bug#220783, thanks to Peter Alfredsen |
| 6 |
(Portage version: 2.1.5_rc7) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-crypt/coolkey/files/coolkey-1.1.0-gcc-4.3.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/coolkey/files/coolkey-1.1.0-gcc-4.3.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/coolkey/files/coolkey-1.1.0-gcc-4.3.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: coolkey-1.1.0-gcc-4.3.patch |
| 15 |
=================================================================== |
| 16 |
diff -up ./src/coolkey/slot.cpp.coolkey-gcc43 ./src/coolkey/slot.cpp |
| 17 |
--- ./src/coolkey/slot.cpp.coolkey-gcc43 2008-02-13 18:01:45.000000000 -0800 |
| 18 |
+++ ./src/coolkey/slot.cpp 2008-02-13 18:03:05.000000000 -0800 |
| 19 |
@@ -25,7 +25,6 @@ |
| 20 |
#include "PKCS11Exception.h" |
| 21 |
#include <winscard.h> |
| 22 |
#include "slot.h" |
| 23 |
-#include <memory.h> |
| 24 |
#include "zlib.h" |
| 25 |
#include "params.h" |
| 26 |
|
| 27 |
@@ -33,7 +32,6 @@ |
| 28 |
|
| 29 |
#define MIN(x, y) ((x) < (y) ? (x) : (y)) |
| 30 |
|
| 31 |
-using std::auto_ptr; |
| 32 |
|
| 33 |
|
| 34 |
#ifdef DEBUG |
| 35 |
diff -up ./src/coolkey/machdep.cpp.coolkey-gcc43 ./src/coolkey/machdep.cpp |
| 36 |
--- ./src/coolkey/machdep.cpp.coolkey-gcc43 2008-02-13 18:02:06.000000000 -0800 |
| 37 |
+++ ./src/coolkey/machdep.cpp 2008-02-13 18:04:04.000000000 -0800 |
| 38 |
@@ -33,6 +33,8 @@ |
| 39 |
#include <sys/stat.h> |
| 40 |
#include <sys/mman.h> |
| 41 |
#include <pthread.h> |
| 42 |
+#include <string.h> |
| 43 |
+#include <stdlib.h> |
| 44 |
#endif |
| 45 |
|
| 46 |
#ifdef _WIN32 |
| 47 |
diff -up ./src/coolkey/log.cpp.coolkey-gcc43 ./src/coolkey/log.cpp |
| 48 |
--- ./src/coolkey/log.cpp.coolkey-gcc43 2008-02-13 18:01:55.000000000 -0800 |
| 49 |
+++ ./src/coolkey/log.cpp 2008-02-13 18:03:37.000000000 -0800 |
| 50 |
@@ -18,6 +18,8 @@ |
| 51 |
* ***** END COPYRIGHT BLOCK *****/ |
| 52 |
|
| 53 |
#include <string> |
| 54 |
+#include <string.h> |
| 55 |
+#include <stdlib.h> |
| 56 |
#include "mypkcs11.h" |
| 57 |
#include <assert.h> |
| 58 |
#include <stdio.h> |
| 59 |
diff -up ./src/coolkey/object.cpp.coolkey-gcc43 ./src/coolkey/object.cpp |
| 60 |
--- ./src/coolkey/object.cpp.coolkey-gcc43 2008-02-13 18:02:20.000000000 -0800 |
| 61 |
+++ ./src/coolkey/object.cpp 2008-02-13 18:04:22.000000000 -0800 |
| 62 |
@@ -21,6 +21,7 @@ |
| 63 |
#include "PKCS11Exception.h" |
| 64 |
#include "object.h" |
| 65 |
#include <algorithm> |
| 66 |
+#include <string.h> |
| 67 |
|
| 68 |
using std::find_if; |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
|
| 73 |
-- |
| 74 |
gentoo-commits@l.g.o mailing list |
Archives