mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
72 lines
2.2 KiB
Plaintext
72 lines
2.2 KiB
Plaintext
From fce1e481c1fcab3066ef605d22d1858553fb80a6 Mon Sep 17 00:00:00 2001
|
|
From: fbrosson <fbrosson@localhost>
|
|
Date: Thu, 18 Feb 2016 22:55:30 +0000
|
|
Subject: Fix detection of libnetwork
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index f6ed9c2..cc7861d 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -686,10 +686,12 @@ dnl for ldap, for example. If ldap libs are static (or dynamic and without
|
|
dnl ELF runtime link paths), then link will fail and LDAP support won't
|
|
dnl be detected.
|
|
|
|
-AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname,
|
|
- [NETLIBS="-lnsl $NETLIBS"]))
|
|
-AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
|
|
- [NETLIBS="-lsocket $NETLIBS"]))
|
|
+_net_save_libs=$LIBS
|
|
+LIBS=""
|
|
+AC_SEARCH_LIBS(gethostbyname, nsl network)
|
|
+AC_SEARCH_LIBS(setsockopt, network socket)
|
|
+NETLIBS="$LIBS"
|
|
+LIBS="$_net_save_libs"
|
|
|
|
dnl Now try for the resolver functions so we can use DNS for SRV, PKA,
|
|
dnl and CERT.
|
|
@@ -712,8 +714,8 @@ if test x"$use_dns_srv" = xyes || test x"$use_dns_cert" = xyes; then
|
|
_dns_save_libs=$LIBS
|
|
LIBS=""
|
|
# the double underscore thing is a glibc-ism?
|
|
- AC_SEARCH_LIBS(res_query,resolv bind socket,,
|
|
- AC_SEARCH_LIBS(__res_query,resolv bind socket,,have_resolver=no))
|
|
+ AC_SEARCH_LIBS(res_query,resolv network bind socket,,
|
|
+ AC_SEARCH_LIBS(__res_query,resolv network bind socket,,have_resolver=no))
|
|
AC_SEARCH_LIBS(dn_expand,resolv bind socket,,
|
|
AC_SEARCH_LIBS(__dn_expand,resolv bind socket,,have_resolver=no))
|
|
AC_SEARCH_LIBS(dn_skipname,resolv bind socket,,
|
|
--
|
|
2.15.1
|
|
|
|
|
|
From ca1a66a94465160bd40f337f3cc5032f304df501 Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Tue, 2 Jan 2018 10:35:34 +0100
|
|
Subject: gcc2, parse error fix
|
|
|
|
|
|
diff --git a/cipher/rsa.c b/cipher/rsa.c
|
|
index 51b7640..d076b8c 100644
|
|
--- a/cipher/rsa.c
|
|
+++ b/cipher/rsa.c
|
|
@@ -326,6 +326,7 @@ secret(MPI output, MPI input, RSA_secret_key *skey )
|
|
# endif /* USE_BLINDING */
|
|
|
|
/* RSA secret operation: */
|
|
+ {
|
|
MPI D_blind = mpi_alloc_secure (nlimbs);
|
|
MPI rr;
|
|
unsigned int rr_nbits;
|
|
@@ -386,6 +387,7 @@ secret(MPI output, MPI input, RSA_secret_key *skey )
|
|
mpi_free ( m1 );
|
|
mpi_free ( m2 );
|
|
#endif
|
|
+ }
|
|
}
|
|
|
|
|
|
--
|
|
2.15.1
|
|
|