|
 |
b86baa |
diff -ru curl-8.13.0.orig/configure.ac curl-8.13.0/configure.ac
|
|
|
b86baa |
--- curl-8.13.0.orig/configure.ac 2025-04-02 07:47:41.000000000 +0200
|
|
|
b86baa |
+++ curl-8.13.0/configure.ac 2025-05-25 11:53:42.607216472 +0200
|
|
|
b86baa |
@@ -4078,7 +4078,6 @@
|
|
|
b86baa |
CURL_CHECK_FUNC_ALARM
|
|
|
b86baa |
CURL_CHECK_FUNC_BASENAME
|
|
|
b86baa |
CURL_CHECK_FUNC_CLOSESOCKET
|
|
|
b86baa |
-CURL_CHECK_FUNC_CLOSESOCKET_CAMEL
|
|
|
b86baa |
CURL_CHECK_FUNC_FCNTL
|
|
|
b86baa |
CURL_CHECK_FUNC_FREEADDRINFO
|
|
|
b86baa |
CURL_CHECK_FUNC_FSETXATTR
|
|
|
b86baa |
@@ -4092,7 +4091,6 @@
|
|
|
b86baa |
CURL_CHECK_FUNC_GMTIME_R
|
|
|
b86baa |
CURL_CHECK_FUNC_IOCTL
|
|
|
b86baa |
CURL_CHECK_FUNC_IOCTLSOCKET
|
|
|
b86baa |
-CURL_CHECK_FUNC_IOCTLSOCKET_CAMEL
|
|
|
b86baa |
CURL_CHECK_FUNC_MEMRCHR
|
|
|
b86baa |
CURL_CHECK_FUNC_SIGACTION
|
|
|
b86baa |
CURL_CHECK_FUNC_SIGINTERRUPT
|
|
|
b86baa |
diff -ru curl-8.13.0.orig/curl-config.in curl-8.13.0/curl-config.in
|
|
|
b86baa |
--- curl-8.13.0.orig/curl-config.in 2025-04-02 07:47:41.000000000 +0200
|
|
|
b86baa |
+++ curl-8.13.0/curl-config.in 2025-05-25 11:40:06.110600368 +0200
|
|
|
b86baa |
@@ -144,13 +144,13 @@
|
|
|
b86baa |
if test "X@includedir@" = 'X/usr/include'; then
|
|
|
b86baa |
echo '@LIBCURL_PC_CFLAGS@'
|
|
|
b86baa |
else
|
|
|
b86baa |
- echo "@LIBCURL_PC_CFLAGS@ -I@includedir@"
|
|
|
b86baa |
+ echo "@LIBCURL_PC_CFLAGS@"
|
|
|
b86baa |
fi
|
|
|
b86baa |
;;
|
|
|
b86baa |
|
|
|
b86baa |
--libs)
|
|
|
b86baa |
if test "X@libdir@" != 'X/usr/lib' -a "X@libdir@" != 'X/usr/lib64'; then
|
|
|
b86baa |
- curllibdir="-L@libdir@ "
|
|
|
b86baa |
+ curllibdir=""
|
|
|
b86baa |
else
|
|
|
b86baa |
curllibdir=''
|
|
|
b86baa |
fi
|
|
|
b86baa |
diff -ru curl-8.13.0.orig/m4/curl-compilers.m4 curl-8.13.0/m4/curl-compilers.m4
|
|
|
b86baa |
--- curl-8.13.0.orig/m4/curl-compilers.m4 2025-04-02 07:47:41.000000000 +0200
|
|
|
b86baa |
+++ curl-8.13.0/m4/curl-compilers.m4 2025-05-25 12:02:19.604559677 +0200
|
|
|
b86baa |
@@ -42,37 +42,6 @@
|
|
|
b86baa |
flags_opt_off="unknown"
|
|
|
b86baa |
#
|
|
|
b86baa |
flags_prefer_cppflags="no"
|
|
|
b86baa |
- #
|
|
|
b86baa |
- CURL_CHECK_COMPILER_DEC_C
|
|
|
b86baa |
- CURL_CHECK_COMPILER_HPUX_C
|
|
|
b86baa |
- CURL_CHECK_COMPILER_IBM_C
|
|
|
b86baa |
- CURL_CHECK_COMPILER_INTEL_C
|
|
|
b86baa |
- CURL_CHECK_COMPILER_CLANG
|
|
|
b86baa |
- CURL_CHECK_COMPILER_GNU_C
|
|
|
b86baa |
- case $host in
|
|
|
b86baa |
- mips-sgi-irix*)
|
|
|
b86baa |
- CURL_CHECK_COMPILER_SGI_MIPSPRO_C
|
|
|
b86baa |
- CURL_CHECK_COMPILER_SGI_MIPS_C
|
|
|
b86baa |
- ;;
|
|
|
b86baa |
- esac
|
|
|
b86baa |
- CURL_CHECK_COMPILER_SUNPRO_C
|
|
|
b86baa |
- CURL_CHECK_COMPILER_TINY_C
|
|
|
b86baa |
- #
|
|
|
b86baa |
- if test "$compiler_id" = "unknown"; then
|
|
|
b86baa |
- cat <<_EOF 1>&2
|
|
|
b86baa |
-***
|
|
|
b86baa |
-*** Warning: This configure script does not have information about the
|
|
|
b86baa |
-*** compiler you are using, relative to the flags required to enable or
|
|
|
b86baa |
-*** disable generation of debug info, optimization options or warnings.
|
|
|
b86baa |
-***
|
|
|
b86baa |
-*** Whatever settings are present in CFLAGS will be used for this run.
|
|
|
b86baa |
-***
|
|
|
b86baa |
-*** If you wish to help the curl project to better support your compiler
|
|
|
b86baa |
-*** you can report this and the required info on the libcurl development
|
|
|
b86baa |
-*** mailing list: https://lists.haxx.selistinfo/curl-library/
|
|
|
b86baa |
-***
|
|
|
b86baa |
-_EOF
|
|
|
b86baa |
- fi
|
|
|
b86baa |
])
|
|
|
b86baa |
|
|
|
b86baa |
|
|
|
b86baa |
@@ -1419,15 +1388,13 @@
|
|
|
b86baa |
tmp_CFLAGS="-fvisibility=hidden"
|
|
|
b86baa |
supports_symbol_hiding="yes"
|
|
|
b86baa |
;;
|
|
|
b86baa |
- GNU_C)
|
|
|
b86baa |
+ *)
|
|
|
b86baa |
dnl Only gcc 3.4 or later
|
|
|
b86baa |
- if test "$compiler_num" -ge "304"; then
|
|
|
b86baa |
if $CC --help --verbose 2>/dev/null | grep fvisibility= >/dev/null ; then
|
|
|
b86baa |
tmp_EXTERN="__attribute__((__visibility__(\"default\")))"
|
|
|
b86baa |
tmp_CFLAGS="-fvisibility=hidden"
|
|
|
b86baa |
supports_symbol_hiding="yes"
|
|
|
b86baa |
fi
|
|
|
b86baa |
- fi
|
|
|
b86baa |
;;
|
|
|
b86baa |
INTEL_UNIX_C)
|
|
|
b86baa |
dnl Only icc 9.0 or later
|
|
|
b86baa |
diff -ru curl-8.13.0.orig/m4/curl-functions.m4 curl-8.13.0/m4/curl-functions.m4
|
|
|
b86baa |
--- curl-8.13.0.orig/m4/curl-functions.m4 2025-04-02 07:47:41.000000000 +0200
|
|
|
b86baa |
+++ curl-8.13.0/m4/curl-functions.m4 2025-05-25 11:40:06.111107814 +0200
|
|
|
b86baa |
@@ -709,62 +709,6 @@
|
|
|
b86baa |
])
|
|
|
b86baa |
|
|
|
b86baa |
|
|
|
b86baa |
-dnl CURL_CHECK_FUNC_CLOSESOCKET_CAMEL
|
|
|
b86baa |
-dnl -------------------------------------------------
|
|
|
b86baa |
-dnl Verify if CloseSocket is available, prototyped, and
|
|
|
b86baa |
-dnl can be compiled. If all of these are true, and
|
|
|
b86baa |
-dnl usage has not been previously disallowed with
|
|
|
b86baa |
-dnl shell variable curl_disallow_closesocket_camel,
|
|
|
b86baa |
-dnl then HAVE_CLOSESOCKET_CAMEL will be defined.
|
|
|
b86baa |
-
|
|
|
b86baa |
-AC_DEFUN([CURL_CHECK_FUNC_CLOSESOCKET_CAMEL], [
|
|
|
b86baa |
- AC_REQUIRE([CURL_INCLUDES_SYS_SOCKET])dnl
|
|
|
b86baa |
- AC_REQUIRE([CURL_INCLUDES_BSDSOCKET])dnl
|
|
|
b86baa |
- #
|
|
|
b86baa |
- tst_compi_closesocket_camel="unknown"
|
|
|
b86baa |
- tst_allow_closesocket_camel="unknown"
|
|
|
b86baa |
- #
|
|
|
b86baa |
- AC_MSG_CHECKING([if CloseSocket is compilable])
|
|
|
b86baa |
- AC_COMPILE_IFELSE([
|
|
|
b86baa |
- AC_LANG_PROGRAM([[
|
|
|
b86baa |
- $curl_includes_bsdsocket
|
|
|
b86baa |
- $curl_includes_sys_socket
|
|
|
b86baa |
- ]],[[
|
|
|
b86baa |
- if(0 != CloseSocket(0))
|
|
|
b86baa |
- return 1;
|
|
|
b86baa |
- ]])
|
|
|
b86baa |
- ],[
|
|
|
b86baa |
- AC_MSG_RESULT([yes])
|
|
|
b86baa |
- tst_compi_closesocket_camel="yes"
|
|
|
b86baa |
- ],[
|
|
|
b86baa |
- AC_MSG_RESULT([no])
|
|
|
b86baa |
- tst_compi_closesocket_camel="no"
|
|
|
b86baa |
- ])
|
|
|
b86baa |
- #
|
|
|
b86baa |
- if test "$tst_compi_closesocket_camel" = "yes"; then
|
|
|
b86baa |
- AC_MSG_CHECKING([if CloseSocket usage allowed])
|
|
|
b86baa |
- if test "x$curl_disallow_closesocket_camel" != "xyes"; then
|
|
|
b86baa |
- AC_MSG_RESULT([yes])
|
|
|
b86baa |
- tst_allow_closesocket_camel="yes"
|
|
|
b86baa |
- else
|
|
|
b86baa |
- AC_MSG_RESULT([no])
|
|
|
b86baa |
- tst_allow_closesocket_camel="no"
|
|
|
b86baa |
- fi
|
|
|
b86baa |
- fi
|
|
|
b86baa |
- #
|
|
|
b86baa |
- AC_MSG_CHECKING([if CloseSocket might be used])
|
|
|
b86baa |
- if test "$tst_compi_closesocket_camel" = "yes" &&
|
|
|
b86baa |
- test "$tst_allow_closesocket_camel" = "yes"; then
|
|
|
b86baa |
- AC_MSG_RESULT([yes])
|
|
|
b86baa |
- AC_DEFINE_UNQUOTED(HAVE_CLOSESOCKET_CAMEL, 1,
|
|
|
b86baa |
- [Define to 1 if you have the CloseSocket camel case function.])
|
|
|
b86baa |
- curl_cv_func_closesocket_camel="yes"
|
|
|
b86baa |
- else
|
|
|
b86baa |
- AC_MSG_RESULT([no])
|
|
|
b86baa |
- curl_cv_func_closesocket_camel="no"
|
|
|
b86baa |
- fi
|
|
|
b86baa |
-])
|
|
|
b86baa |
-
|
|
|
b86baa |
dnl CURL_CHECK_FUNC_FCNTL
|
|
|
b86baa |
dnl -------------------------------------------------
|
|
|
b86baa |
dnl Verify if fcntl is available, prototyped, and
|