Diff libssh-0.11.5 with a libssh-9999

/usr/portage/net-libs/libssh/libssh-9999.ebuild 2026-08-26 20:03:05.410473046 +0300
18 18
		https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz
19 19
		verify-sig? ( https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz.asc )
20 20
	"
21
	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
21
	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
22 22
	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-libssh )"
23 23
fi
24 24

  
25 25
LICENSE="LGPL-2.1"
26 26
SLOT="0/4" # subslot = soname major version
27
IUSE="debug doc examples gssapi mbedtls pcap server +sftp static-libs test zlib"
27
IUSE="debug examples fido2 gssapi mbedtls pcap server +sftp static-libs test zlib"
28 28
# Maintainer: check IUSE-defaults at DefineOptions.cmake
29 29
RESTRICT="!test? ( test )"
30 30

  
31 31
RDEPEND="
32 32
	!mbedtls? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
33
	fido2? ( dev-libs/libfido2:= )
33 34
	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
34 35
	mbedtls? ( net-libs/mbedtls:3=[${MULTILIB_USEDEP},threads] )
35 36
	zlib? ( >=virtual/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
36 37
"
37
DEPEND="${RDEPEND}
38
DEPEND="
39
	${RDEPEND}
38 40
	test? (
39 41
		>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
40 42
		elibc_musl? ( sys-libs/argp-standalone )
41 43
	)
42 44
"
43
BDEPEND+=" doc? ( app-text/doxygen[dot] )"
44 45

  
45 46
DOCS=( AUTHORS CHANGELOG README )
46 47

  
48
MULTILIB_WRAPPED_HEADERS=(
49
	# No multilib for libfido2
50
	/usr/include/libssh/sk_api.h
51
)
52

  
47 53
src_unpack() {
48 54
	if [[ ${PV} == *9999* ]] ; then
49 55
		git-r3_src_unpack
......
108 114
		-DWITH_STACK_PROTECTOR_STRONG=OFF
109 115
		-DWITH_DEBUG_CALLTRACE=$(usex debug)
110 116
		-DWITH_DEBUG_CRYPTO=$(usex debug)
117
		-DWITH_FIDO2=$(multilib_native_usex fido2)
111 118
		# Deprecated per CMakeLists.txt
112 119
		-DWITH_GCRYPT=OFF
113 120
		-DWITH_GSSAPI=$(usex gssapi)
......
117 124
		-DWITH_SERVER=$(usex server)
118 125
		-DWITH_SFTP=$(usex sftp)
119 126
		-DBUILD_STATIC_LIB=$(usex static-libs)
127

  
120 128
		# dropbear's dhclient tries to open /dev/urandom for writing in
121 129
		# seedrandom. And we don't do client/server testing yet anyway (bug #964307)
122 130
		-DDROPBEAR_EXECUTABLE=
123
		# TODO: try enabling {CLIENT,SERVER}_TESTING
131
		# TODO: Still needs some work, some tests hang and some fail
132
		# Would need net-misc/openssh and net-misc/putty too
133
		#-DCLIENT_TESTING=$(multilib_native_usex test)
134
		#-DSERVER_TESTING=$(multilib_native_usex test)
135
		-DCLIENT_TESTING=OFF
136
		-DSERVER_TESTING=OFF
124 137
		-DUNIT_TESTING=$(usex test)
138

  
125 139
		-DWITH_ZLIB=$(usex zlib)
126 140
	)
127 141

  
......
130 144
	cmake_src_configure
131 145
}
132 146

  
133
multilib_src_compile() {
134
	cmake_src_compile
135
	multilib_is_native_abi && use doc && cmake_src_compile docs
136
}
137

  
138 147
multilib_src_test() {
139
	cmake_src_test --timeout 3000
148
	# torture_server_direct_tcpip fails in parallel
149
	cmake_src_test -j1 --timeout 3000
140 150
}
141 151

  
142 152
multilib_src_install() {
143 153
	cmake_src_install
144
	multilib_is_native_abi && use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
145 154

  
146 155
	use static-libs && dolib.a src/libssh.a
147 156

  
Thank you!