diff --git a/net-dns/c_ares/c_ares-1.17.1.recipe b/net-dns/c_ares/c_ares-1.17.2.recipe similarity index 77% rename from net-dns/c_ares/c_ares-1.17.1.recipe rename to net-dns/c_ares/c_ares-1.17.2.recipe index 737bb4dd9..450136f6d 100644 --- a/net-dns/c_ares/c_ares-1.17.1.recipe +++ b/net-dns/c_ares/c_ares-1.17.2.recipe @@ -16,14 +16,14 @@ COPYRIGHT="2004-2018 by Daniel Stenberg et al LICENSE="MIT" REVISION="1" SOURCE_URI="https://c-ares.haxx.se/download/c-ares-$portVersion.tar.gz" -CHECKSUM_SHA256="d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40" +CHECKSUM_SHA256="4803c844ce20ce510ef0eb83f8ea41fa24ecaae9d280c468c582d2bb25b3913d" SOURCE_DIR="c-ares-$portVersion" PATCHES="c_ares-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" -libVersion="2.4.2" +libVersion="2.4.3" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -49,11 +49,9 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf + cmd:cmake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:libtoolize$secondaryArchSuffix cmd:make " @@ -62,19 +60,16 @@ defineDebugInfoPackage c_ares$secondaryArchSuffix \ BUILD() { - autoreconf -fi - curl_cv_func_recvfrom_args="int,void *,size_t,int,struct sockaddr *,socklen_t *,ssize_t" \ - curl_cv_func_send_args="int,const void *,size_t,int,ssize_t" \ - runConfigure ./configure - make $jobArgs + cmake $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE='None' \ + -DHAVE_ARPA_NAMESER_H=TRUE \ + -Wno-dev -B build -S . + make -C build $jobArgs } INSTALL() { - make install - - # remove libtool file - rm $libDir/libcares.la + make -C build install prepareInstalledDevelLibs libcares fixPkgconfig @@ -82,7 +77,4 @@ INSTALL() packageEntries devel \ "$developDir" \ "$manDir/man3" - - install -d -m 755 $binDir - install -m 755 -t $binDir src/tools/acountry src/tools/adig src/tools/ahost } diff --git a/net-dns/c_ares/patches/c_ares-1.17.1.patchset b/net-dns/c_ares/patches/c_ares-1.17.1.patchset deleted file mode 100644 index 8af212f28..000000000 --- a/net-dns/c_ares/patches/c_ares-1.17.1.patchset +++ /dev/null @@ -1,52 +0,0 @@ -From 8b3841b3566b177db69126ad493971e0e6aa3e0c Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 4 Jun 2018 13:06:38 +0200 -Subject: applying patch c_ares-1.10.0.patch - - -diff --git a/include/ares.h b/include/ares.h -index 65a82cb..6e19217 100644 ---- a/include/ares.h -+++ b/include/ares.h -@@ -39,7 +39,7 @@ - #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \ - defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \ - defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \ -- defined(__QNXNTO__) -+ defined(__QNXNTO__) || defined(__HAIKU__) - #include - #endif - #if (defined(NETWARE) && !defined(__NOVELL_LIBC__)) --- -2.16.4 - - - - -From 460d373c1cf4bdfcbc7c74833e94d473d89bc0a1 Mon Sep 17 00:00:00 2001 -From: Chris Roberts -Date: Mon, 4 Jun 2018 13:07:28 +0200 -Subject: Search for libnetwork - - -diff --git a/configure.ac b/configure.ac -index 4516796..5f43e1c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -216,10 +216,10 @@ AC_CHECK_FUNC(gethostbyname, - - if test "$HAVE_GETHOSTBYNAME" != "1" - then -- dnl gethostbyname in the socket lib? -- AC_CHECK_LIB(socket, gethostbyname, -+ dnl gethostbyname in the network lib? -+ AC_CHECK_LIB(network, gethostbyname, - [HAVE_GETHOSTBYNAME="1" -- LIBS="$LIBS -lsocket" -+ LIBS="$LIBS -lnetwork" - ]) - fi - --- -2.30.0 - diff --git a/net-dns/c_ares/patches/c_ares-1.17.2.patchset b/net-dns/c_ares/patches/c_ares-1.17.2.patchset new file mode 100644 index 000000000..28bce0708 --- /dev/null +++ b/net-dns/c_ares/patches/c_ares-1.17.2.patchset @@ -0,0 +1,100 @@ +From 68e38dcc85c4c1390a0303d45931042c83fd2625 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 15 Oct 2021 12:05:03 +0200 +Subject: Haiku: port + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 54c54aa..b6b495d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,16 +146,19 @@ ENDIF() + + CARES_FUNCTION_IN_LIBRARY (gethostbyname nsl HAVE_LIBNSL) + CARES_FUNCTION_IN_LIBRARY (gethostbyname socket HAVE_GHBN_LIBSOCKET) ++CARES_FUNCTION_IN_LIBRARY (gethostbyname network HAVE_LIBNETWORK) + CARES_FUNCTION_IN_LIBRARY (socket socket HAVE_SOCKET_LIBSOCKET) + IF (HAVE_GHBN_LIBSOCKET OR HAVE_SOCKET_LIBSOCKET) + SET(HAVE_LIBSOCKET TRUE) + ENDIF () ++CARES_FUNCTION_IN_LIBRARY (socket network HAVE_LIBNETWORK) + CARES_FUNCTION_IN_LIBRARY (clock_gettime rt HAVE_LIBRT) + + + # Look for necessary includes + CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H) + CHECK_INCLUDE_FILES (sys/socket.h HAVE_SYS_SOCKET_H) ++CHECK_INCLUDE_FILES (sys/sockio.h HAVE_SYS_SOCKIO_H) + CHECK_INCLUDE_FILES (arpa/inet.h HAVE_ARPA_INET_H) + CHECK_INCLUDE_FILES (arpa/nameser_compat.h HAVE_ARPA_NAMESER_COMPAT_H) + CHECK_INCLUDE_FILES (arpa/nameser.h HAVE_ARPA_NAMESER_H) +@@ -229,6 +232,9 @@ ENDIF () + IF (HAVE_LIBSOCKET) + LIST (APPEND CARES_DEPENDENT_LIBS socket) + ENDIF () ++IF (HAVE_LIBNETWORK) ++ LIST (APPEND CARES_DEPENDENT_LIBS network) ++ENDIF () + IF (HAVE_LIBRT) + LIST (APPEND CARES_DEPENDENT_LIBS rt) + ENDIF () +@@ -267,6 +273,7 @@ CARES_EXTRAINCLUDE_IFSET (HAVE_STRINGS_H strings.h) + CARES_EXTRAINCLUDE_IFSET (HAVE_SYS_IOCTL_H sys/ioctl.h) + CARES_EXTRAINCLUDE_IFSET (HAVE_SYS_SELECT_H sys/select.h) + CARES_EXTRAINCLUDE_IFSET (HAVE_SYS_SOCKET_H sys/socket.h) ++CARES_EXTRAINCLUDE_IFSET (HAVE_SYS_SOCKIO_H sys/sockio.h) + CARES_EXTRAINCLUDE_IFSET (HAVE_SYS_TIME_H sys/time.h) + CARES_EXTRAINCLUDE_IFSET (HAVE_SYS_UIO_H sys/uio.h) + CARES_EXTRAINCLUDE_IFSET (HAVE_TIME_H time.h) +@@ -520,7 +527,8 @@ IF (HAVE_GETSERVBYPORT_R) + IF (CMAKE_SYSTEM_NAME STREQUAL "SunOS") + SET (GETSERVBYPORT_R_ARGS 5) + ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "AIX" OR +- CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") ++ CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR ++ HAIKU) + SET (GETSERVBYPORT_R_ARGS 4) + ELSE () + # Probably linux +@@ -533,7 +541,8 @@ IF (HAVE_GETSERVBYNAME_R) + IF (CMAKE_SYSTEM_NAME STREQUAL "SunOS") + SET (GETSERVBYNAME_R_ARGS 5) + ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "AIX" OR +- CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") ++ CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR ++ HAIKU) + SET (GETSERVBYNAME_R_ARGS 4) + ELSE () + # Probably linux +diff --git a/include/ares.h b/include/ares.h +index b341d60..649b5a3 100644 +--- a/include/ares.h ++++ b/include/ares.h +@@ -39,7 +39,7 @@ + #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \ + defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \ + defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \ +- defined(__QNXNTO__) || defined(__MVS__) ++ defined(__QNXNTO__) || defined(__MVS__) || defined(__HAIKU__) + #include + #endif + #if (defined(NETWARE) && !defined(__NOVELL_LIBC__)) +diff --git a/src/lib/ares_private.h b/src/lib/ares_private.h +index 09f6506..0a59b5b 100644 +--- a/src/lib/ares_private.h ++++ b/src/lib/ares_private.h +@@ -85,6 +85,11 @@ W32_FUNC const char *_w32_GetHostsFile (void); + + #define PATH_HOSTS "InetDBase:Hosts" + ++#elif defined(__HAIKU__) ++ ++#define PATH_RESOLV_CONF "/system/settings/network/resolv.conf" ++#define PATH_HOSTS "/system/settings/network/hosts" ++ + #else + + #define PATH_RESOLV_CONF "/etc/resolv.conf" +-- +2.30.2 +