| 1 |
commit: 41509daa139cc19bd8d5753057444be9a2536e92 |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 5 19:02:42 2017 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 5 19:03:10 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41509daa |
| 7 |
|
| 8 |
dev-libs/cryptlib: fixups |
| 9 |
|
| 10 |
Remove cflags translations based on upstream recommendation |
| 11 |
we should interact with upstream if there are issues. |
| 12 |
|
| 13 |
Remove the test patch as it was not helpful, tests were |
| 14 |
accessing network anyway. Added restrict tests. |
| 15 |
|
| 16 |
Add static-libs USE for pleasure |
| 17 |
|
| 18 |
Package-Manager: portage-2.3.3 |
| 19 |
|
| 20 |
....4.3.1-r1.ebuild => cryptlib-3.4.3.1-r2.ebuild} | 21 +++------ |
| 21 |
.../cryptlib/files/cryptlib-3.4.3.1-tests.patch | 52 ---------------------- |
| 22 |
2 files changed, 6 insertions(+), 67 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-libs/cryptlib/cryptlib-3.4.3.1-r1.ebuild b/dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild |
| 25 |
similarity index 87% |
| 26 |
rename from dev-libs/cryptlib/cryptlib-3.4.3.1-r1.ebuild |
| 27 |
rename to dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild |
| 28 |
index d63a959..b9161e5 100644 |
| 29 |
--- a/dev-libs/cryptlib/cryptlib-3.4.3.1-r1.ebuild |
| 30 |
+++ b/dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild |
| 31 |
@@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip |
| 32 |
LICENSE="Sleepycat" |
| 33 |
KEYWORDS="~amd64 ~x86" |
| 34 |
SLOT="0" |
| 35 |
-IUSE="doc ldap odbc python test" |
| 36 |
+IUSE="doc ldap odbc python static-libs test" |
| 37 |
|
| 38 |
S="${WORKDIR}" |
| 39 |
|
| 40 |
@@ -34,9 +34,11 @@ DEPEND="${RDEPEND} |
| 41 |
PATCHES=( |
| 42 |
"${FILESDIR}/${P}-build.patch" |
| 43 |
"${FILESDIR}/${P}-zlib.patch" |
| 44 |
- "${FILESDIR}/${P}-tests.patch" |
| 45 |
) |
| 46 |
|
| 47 |
+# test access the network |
| 48 |
+RESTRICT="test" |
| 49 |
+ |
| 50 |
src_unpack() { |
| 51 |
# we need the -a option, so we can not use 'unpack' |
| 52 |
unzip -qoa "${DISTDIR}/cl${MY_PV}.zip" || die |
| 53 |
@@ -68,19 +70,12 @@ src_prepare() { |
| 54 |
} |
| 55 |
|
| 56 |
src_compile() { |
| 57 |
- # At least -O2 is needed. |
| 58 |
- replace-flags -O -O2 |
| 59 |
- replace-flags -O0 -O2 |
| 60 |
- replace-flags -O1 -O2 |
| 61 |
- replace-flags -Os -O2 |
| 62 |
- is-flagq -O* || append-flags -O2 |
| 63 |
- |
| 64 |
use ldap && append-cppflags -DHAS_LDAP |
| 65 |
use odbc && append-cppflags -DHAS_ODBC |
| 66 |
|
| 67 |
export DISABLE_AUTODETECT=1 |
| 68 |
- emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" default |
| 69 |
emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" shared |
| 70 |
+ use static-libs && emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" default |
| 71 |
use test && emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" stestlib |
| 72 |
|
| 73 |
# |
| 74 |
@@ -94,10 +89,6 @@ src_compile() { |
| 75 |
ln -s "${solibname}" libcl.so || die |
| 76 |
|
| 77 |
if use python; then |
| 78 |
- |
| 79 |
- # Python bindings don't work with -O2 and higher. |
| 80 |
- replace-flags -O* -O1 |
| 81 |
- |
| 82 |
wrap_python ${FUNCNAME} |
| 83 |
fi |
| 84 |
} |
| 85 |
@@ -112,7 +103,7 @@ src_install() { |
| 86 |
doheader cryptlib.h |
| 87 |
|
| 88 |
dolib.so libcl.so* |
| 89 |
- dolib.a libcl.a |
| 90 |
+ use static-libs && dolib.a libcl.a |
| 91 |
|
| 92 |
if use doc; then |
| 93 |
newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf" |
| 94 |
|
| 95 |
diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.3.1-tests.patch b/dev-libs/cryptlib/files/cryptlib-3.4.3.1-tests.patch |
| 96 |
deleted file mode 100644 |
| 97 |
index f18bc96..00000000 |
| 98 |
--- a/dev-libs/cryptlib/files/cryptlib-3.4.3.1-tests.patch |
| 99 |
+++ /dev/null |
| 100 |
@@ -1,52 +0,0 @@ |
| 101 |
-From c25dad21f5b1db106e4fe42f38a0dac6290b8a41 Mon Sep 17 00:00:00 2001 |
| 102 |
-From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 103 |
-Date: Sat, 4 Feb 2017 05:48:54 +0200 |
| 104 |
-Subject: [PATCH] tests: disable online tests |
| 105 |
- |
| 106 |
-Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 107 |
---- |
| 108 |
- test/testfunc.c | 6 ++++++ |
| 109 |
- 1 file changed, 6 insertions(+) |
| 110 |
- |
| 111 |
-diff --git a/test/testfunc.c b/test/testfunc.c |
| 112 |
-index 79d7148..017a4a8 100644 |
| 113 |
---- a/test/testfunc.c |
| 114 |
-+++ b/test/testfunc.c |
| 115 |
-@@ -1119,6 +1119,7 @@ BOOLEAN testSessions( void ) |
| 116 |
- } |
| 117 |
- if( !testSessionAttributes() ) |
| 118 |
- return( FALSE ); |
| 119 |
-+#if 0 |
| 120 |
- if( !testSessionSSH() ) |
| 121 |
- return( FALSE ); |
| 122 |
- if( !testSessionSSHPubkeyAuth() ) |
| 123 |
-@@ -1127,6 +1128,7 @@ BOOLEAN testSessions( void ) |
| 124 |
- return( FALSE ); |
| 125 |
- if( !testSessionSSHExec() ) |
| 126 |
- return( FALSE ); |
| 127 |
-+#endif |
| 128 |
- if( !testSessionSSL() ) |
| 129 |
- return( FALSE ); |
| 130 |
- if( !testSessionSSLLocalSocket() ) |
| 131 |
-@@ -1147,14 +1149,18 @@ BOOLEAN testSessions( void ) |
| 132 |
- if( !testSessionTLS12ClientCert() ) |
| 133 |
- return( FALSE ); |
| 134 |
- #endif /* 0 */ |
| 135 |
-+#if 0 |
| 136 |
- if( !testSessionOCSP() ) |
| 137 |
- return( FALSE ); |
| 138 |
-+#endif |
| 139 |
-+#if 0 |
| 140 |
- if( !testSessionTSP() ) |
| 141 |
- return( FALSE ); |
| 142 |
- if( !testSessionEnvTSP() ) |
| 143 |
- return( FALSE ); |
| 144 |
- if( !testSessionCMP() ) |
| 145 |
- return( FALSE ); |
| 146 |
-+#endif |
| 147 |
- |
| 148 |
- return( TRUE ); |
| 149 |
- } |
| 150 |
--- |
| 151 |
-2.10.2 |
| 152 |
- |
Archives