| 1 |
commit: 4d97f82d5ba9351db902435b7efc657d5c141cae |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 29 19:04:15 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 29 21:33:53 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d97f82d |
| 7 |
|
| 8 |
net-libs/libssh: 0.9.0 version bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.67, Repoman-2.3.16 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
net-libs/libssh/Manifest | 1 + |
| 14 |
.../{libssh-9999.ebuild => libssh-0.9.0.ebuild} | 27 ++++++++++------------ |
| 15 |
net-libs/libssh/libssh-9999.ebuild | 27 ++++++++++------------ |
| 16 |
3 files changed, 25 insertions(+), 30 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest |
| 19 |
index fc0e59cb996..5364d75e205 100644 |
| 20 |
--- a/net-libs/libssh/Manifest |
| 21 |
+++ b/net-libs/libssh/Manifest |
| 22 |
@@ -1,2 +1,3 @@ |
| 23 |
DIST libssh-0.8.6.tar.xz 433680 BLAKE2B f222e67676a90a2d2431463dc71859ad336a23a519b54e08fe368efe6322d0b9c8e393ec92d5246cb4721cd57bb955856fa6a2d92ffe71b6c35e2c94cde28762 SHA512 e91d1f4c1343aa232ade0fe4b5e9a92ca65e3716f4ebe2ec25b04def4fae5a3774349f05a6919836551f66fb0288ed6a3e19e0ab786c081616218be973356522 |
| 24 |
DIST libssh-0.8.7.tar.xz 430104 BLAKE2B 8ad9455d81120726434a418abb74bfee53279040541cda50117909d43088ea992b9dbc7164b079dbe970b4348b967ed0d3f6352df98f60d1e6d9f14a086b5a40 SHA512 13c3dccad81d521edf29c8a5e2c5f7fdd90507a0eda652b2b040a0a17bab88860873e089a46e181907ea3f449ca1847b1c84453b1960f456e391eefe5be983c5 |
| 25 |
+DIST libssh-0.9.0.tar.xz 487628 BLAKE2B 43c9c889160089f8ab4ce9d486e1892ef9fb7941d7473baf2c27e3fe05da0299bd8a7fa5c4392f24411ec0970f61fc302fbe18b8c807efe07d65f6fc326467e3 SHA512 8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865 |
| 26 |
|
| 27 |
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild |
| 28 |
similarity index 88% |
| 29 |
copy from net-libs/libssh/libssh-9999.ebuild |
| 30 |
copy to net-libs/libssh/libssh-0.9.0.ebuild |
| 31 |
index d88693448ce..19777b48ff3 100644 |
| 32 |
--- a/net-libs/libssh/libssh-9999.ebuild |
| 33 |
+++ b/net-libs/libssh/libssh-0.9.0.ebuild |
| 34 |
@@ -3,7 +3,6 @@ |
| 35 |
|
| 36 |
EAPI=7 |
| 37 |
|
| 38 |
-MY_P="${PN}-${PV/_rc/rc}" |
| 39 |
inherit cmake-multilib |
| 40 |
|
| 41 |
DESCRIPTION="Access a working SSH implementation by means of a library" |
| 42 |
@@ -13,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then |
| 43 |
inherit git-r3 |
| 44 |
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" |
| 45 |
else |
| 46 |
- SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz" |
| 47 |
+ SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz" |
| 48 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" |
| 49 |
fi |
| 50 |
|
| 51 |
@@ -43,8 +42,6 @@ DEPEND="${RDEPEND} |
| 52 |
|
| 53 |
DOCS=( AUTHORS README ChangeLog ) |
| 54 |
|
| 55 |
-S="${WORKDIR}/${MY_P}" |
| 56 |
- |
| 57 |
PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) |
| 58 |
|
| 59 |
src_prepare() { |
| 60 |
@@ -54,34 +51,34 @@ src_prepare() { |
| 61 |
cmake_comment_add_subdirectory examples |
| 62 |
|
| 63 |
# keyfile torture test is currently broken |
| 64 |
- sed -i \ |
| 65 |
- -e '/torture_keyfiles/d' \ |
| 66 |
- tests/unittests/CMakeLists.txt || die |
| 67 |
+ sed -e "/torture_keyfiles/d" \ |
| 68 |
+ -i tests/unittests/CMakeLists.txt || die |
| 69 |
|
| 70 |
# disable tests that take too long (bug #677006) |
| 71 |
if use sparc; then |
| 72 |
- sed -i \ |
| 73 |
- -e '/torture_threads_pki_rsa/d' \ |
| 74 |
- -e '/torture_pki_dsa/d' \ |
| 75 |
- tests/unittests/CMakeLists.txt || die |
| 76 |
+ sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \ |
| 77 |
+ -i tests/unittests/CMakeLists.txt || die |
| 78 |
fi |
| 79 |
+ |
| 80 |
+ sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ |
| 81 |
+ -i ConfigureChecks.cmake || die |
| 82 |
} |
| 83 |
|
| 84 |
multilib_src_configure() { |
| 85 |
local mycmakeargs=( |
| 86 |
- -DUNIT_TESTING="$(usex test)" |
| 87 |
+ -DWITH_NACL=OFF |
| 88 |
+ -DWITH_STACK_PROTECTOR=OFF |
| 89 |
+ -DWITH_STACK_PROTECTOR_STRONG=OFF |
| 90 |
-DWITH_DEBUG_CALLTRACE="$(usex debug)" |
| 91 |
-DWITH_DEBUG_CRYPTO="$(usex debug)" |
| 92 |
-DWITH_GCRYPT="$(usex gcrypt)" |
| 93 |
-DWITH_GSSAPI="$(usex gssapi)" |
| 94 |
-DWITH_MBEDTLS="$(usex mbedtls)" |
| 95 |
- -DWITH_NACL=no |
| 96 |
-DWITH_PCAP="$(usex pcap)" |
| 97 |
-DWITH_SERVER="$(usex server)" |
| 98 |
-DWITH_SFTP="$(usex sftp)" |
| 99 |
- -DWITH_STACK_PROTECTOR=OFF |
| 100 |
- -DWITH_STACK_PROTECTOR_STRONG=OFF |
| 101 |
-DWITH_STATIC_LIB="$(usex static-libs)" |
| 102 |
+ -DUNIT_TESTING="$(usex test)" |
| 103 |
-DWITH_ZLIB="$(usex zlib)" |
| 104 |
) |
| 105 |
|
| 106 |
|
| 107 |
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild |
| 108 |
index d88693448ce..19777b48ff3 100644 |
| 109 |
--- a/net-libs/libssh/libssh-9999.ebuild |
| 110 |
+++ b/net-libs/libssh/libssh-9999.ebuild |
| 111 |
@@ -3,7 +3,6 @@ |
| 112 |
|
| 113 |
EAPI=7 |
| 114 |
|
| 115 |
-MY_P="${PN}-${PV/_rc/rc}" |
| 116 |
inherit cmake-multilib |
| 117 |
|
| 118 |
DESCRIPTION="Access a working SSH implementation by means of a library" |
| 119 |
@@ -13,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then |
| 120 |
inherit git-r3 |
| 121 |
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git" |
| 122 |
else |
| 123 |
- SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz" |
| 124 |
+ SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz" |
| 125 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" |
| 126 |
fi |
| 127 |
|
| 128 |
@@ -43,8 +42,6 @@ DEPEND="${RDEPEND} |
| 129 |
|
| 130 |
DOCS=( AUTHORS README ChangeLog ) |
| 131 |
|
| 132 |
-S="${WORKDIR}/${MY_P}" |
| 133 |
- |
| 134 |
PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) |
| 135 |
|
| 136 |
src_prepare() { |
| 137 |
@@ -54,34 +51,34 @@ src_prepare() { |
| 138 |
cmake_comment_add_subdirectory examples |
| 139 |
|
| 140 |
# keyfile torture test is currently broken |
| 141 |
- sed -i \ |
| 142 |
- -e '/torture_keyfiles/d' \ |
| 143 |
- tests/unittests/CMakeLists.txt || die |
| 144 |
+ sed -e "/torture_keyfiles/d" \ |
| 145 |
+ -i tests/unittests/CMakeLists.txt || die |
| 146 |
|
| 147 |
# disable tests that take too long (bug #677006) |
| 148 |
if use sparc; then |
| 149 |
- sed -i \ |
| 150 |
- -e '/torture_threads_pki_rsa/d' \ |
| 151 |
- -e '/torture_pki_dsa/d' \ |
| 152 |
- tests/unittests/CMakeLists.txt || die |
| 153 |
+ sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \ |
| 154 |
+ -i tests/unittests/CMakeLists.txt || die |
| 155 |
fi |
| 156 |
+ |
| 157 |
+ sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \ |
| 158 |
+ -i ConfigureChecks.cmake || die |
| 159 |
} |
| 160 |
|
| 161 |
multilib_src_configure() { |
| 162 |
local mycmakeargs=( |
| 163 |
- -DUNIT_TESTING="$(usex test)" |
| 164 |
+ -DWITH_NACL=OFF |
| 165 |
+ -DWITH_STACK_PROTECTOR=OFF |
| 166 |
+ -DWITH_STACK_PROTECTOR_STRONG=OFF |
| 167 |
-DWITH_DEBUG_CALLTRACE="$(usex debug)" |
| 168 |
-DWITH_DEBUG_CRYPTO="$(usex debug)" |
| 169 |
-DWITH_GCRYPT="$(usex gcrypt)" |
| 170 |
-DWITH_GSSAPI="$(usex gssapi)" |
| 171 |
-DWITH_MBEDTLS="$(usex mbedtls)" |
| 172 |
- -DWITH_NACL=no |
| 173 |
-DWITH_PCAP="$(usex pcap)" |
| 174 |
-DWITH_SERVER="$(usex server)" |
| 175 |
-DWITH_SFTP="$(usex sftp)" |
| 176 |
- -DWITH_STACK_PROTECTOR=OFF |
| 177 |
- -DWITH_STACK_PROTECTOR_STRONG=OFF |
| 178 |
-DWITH_STATIC_LIB="$(usex static-libs)" |
| 179 |
+ -DUNIT_TESTING="$(usex test)" |
| 180 |
-DWITH_ZLIB="$(usex zlib)" |
| 181 |
) |
Archives