diff options
| -rw-r--r-- | app-crypt/coolkey/ChangeLog | 8 | ||||
| -rw-r--r-- | app-crypt/coolkey/coolkey-1.1.0-r1.ebuild | 7 | ||||
| -rw-r--r-- | app-crypt/coolkey/files/coolkey-1.1.0-gcc-4.3.patch | 54 |
3 files changed, 64 insertions, 5 deletions
diff --git a/app-crypt/coolkey/ChangeLog b/app-crypt/coolkey/ChangeLog index ed386d1609ff..fc1c28c17da7 100644 --- a/app-crypt/coolkey/ChangeLog +++ b/app-crypt/coolkey/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/coolkey -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/ChangeLog,v 1.5 2007/11/10 11:26:35 alonbl Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/ChangeLog,v 1.6 2008/05/08 07:42:38 alonbl Exp $ + + 08 May 2008; Alon Bar-Lev <alonbl@gentoo.org> + +files/coolkey-1.1.0-gcc-4.3.patch, coolkey-1.1.0-r1.ebuild: + Fix gcc-4.3 issue, bug#220783, thanks to Peter Alfredsen 10 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> -coolkey-1.1.0.ebuild: Cleanup diff --git a/app-crypt/coolkey/coolkey-1.1.0-r1.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r1.ebuild index 3213f99e094a..1349664a6566 100644 --- a/app-crypt/coolkey/coolkey-1.1.0-r1.ebuild +++ b/app-crypt/coolkey/coolkey-1.1.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/coolkey-1.1.0-r1.ebuild,v 1.1 2007/09/08 08:20:52 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/coolkey-1.1.0-r1.ebuild,v 1.2 2008/05/08 07:42:38 alonbl Exp $ inherit eutils @@ -21,11 +21,12 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${P}-cache-move.patch" + epatch "${FILESDIR}/${P}-gcc-4.3.patch" } src_compile() { econf $(use_enable debug) || die "configure failed" - emake || die "make failed" + emake -j1 || die "make failed" } src_install() { diff --git a/app-crypt/coolkey/files/coolkey-1.1.0-gcc-4.3.patch b/app-crypt/coolkey/files/coolkey-1.1.0-gcc-4.3.patch new file mode 100644 index 000000000000..5e41b5ab702b --- /dev/null +++ b/app-crypt/coolkey/files/coolkey-1.1.0-gcc-4.3.patch @@ -0,0 +1,54 @@ +diff -up ./src/coolkey/slot.cpp.coolkey-gcc43 ./src/coolkey/slot.cpp +--- ./src/coolkey/slot.cpp.coolkey-gcc43 2008-02-13 18:01:45.000000000 -0800 ++++ ./src/coolkey/slot.cpp 2008-02-13 18:03:05.000000000 -0800 +@@ -25,7 +25,6 @@ + #include "PKCS11Exception.h" + #include <winscard.h> + #include "slot.h" +-#include <memory.h> + #include "zlib.h" + #include "params.h" + +@@ -33,7 +32,6 @@ + + #define MIN(x, y) ((x) < (y) ? (x) : (y)) + +-using std::auto_ptr; + + + #ifdef DEBUG +diff -up ./src/coolkey/machdep.cpp.coolkey-gcc43 ./src/coolkey/machdep.cpp +--- ./src/coolkey/machdep.cpp.coolkey-gcc43 2008-02-13 18:02:06.000000000 -0800 ++++ ./src/coolkey/machdep.cpp 2008-02-13 18:04:04.000000000 -0800 +@@ -33,6 +33,8 @@ + #include <sys/stat.h> + #include <sys/mman.h> + #include <pthread.h> ++#include <string.h> ++#include <stdlib.h> + #endif + + #ifdef _WIN32 +diff -up ./src/coolkey/log.cpp.coolkey-gcc43 ./src/coolkey/log.cpp +--- ./src/coolkey/log.cpp.coolkey-gcc43 2008-02-13 18:01:55.000000000 -0800 ++++ ./src/coolkey/log.cpp 2008-02-13 18:03:37.000000000 -0800 +@@ -18,6 +18,8 @@ + * ***** END COPYRIGHT BLOCK *****/ + + #include <string> ++#include <string.h> ++#include <stdlib.h> + #include "mypkcs11.h" + #include <assert.h> + #include <stdio.h> +diff -up ./src/coolkey/object.cpp.coolkey-gcc43 ./src/coolkey/object.cpp +--- ./src/coolkey/object.cpp.coolkey-gcc43 2008-02-13 18:02:20.000000000 -0800 ++++ ./src/coolkey/object.cpp 2008-02-13 18:04:22.000000000 -0800 +@@ -21,6 +21,7 @@ + #include "PKCS11Exception.h" + #include "object.h" + #include <algorithm> ++#include <string.h> + + using std::find_if; + |