You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2021/10/12 16:26:35 UTC
svn commit: r1894170 - in /apr/apr/branches/1.7.x: ./ CHANGES build/
build/apr_network.m4
Author: jorton
Date: Tue Oct 12 16:26:35 2021
New Revision: 1894170
URL: http://svn.apache.org/viewvc?rev=1894170&view=rev
Log:
Merge r1894167 from trunk:
Since runtime SCTP detection is dependent on kernel configuration, add
flags to make SCTP support reliable:
* build/apr_network.m4 (APR_CHECK_SCTP): Add --disable-sctp flag to
forcibly disable SCTP support, and --enable-sctp to fail configure
if is SCTP support is requested but not available.
Submitted by: Lubos Uhliarik <luhliari redhat.com>, jorton
Github: closes #28
Modified:
apr/apr/branches/1.7.x/ (props changed)
apr/apr/branches/1.7.x/CHANGES
apr/apr/branches/1.7.x/build/ (props changed)
apr/apr/branches/1.7.x/build/apr_network.m4
Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1894167
Modified: apr/apr/branches/1.7.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/CHANGES?rev=1894170&r1=1894169&r2=1894170&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.7.x/CHANGES [utf-8] Tue Oct 12 16:26:35 2021
@@ -6,6 +6,10 @@ Changes for APR 1.7.1
(This issue was addressed as CVE-2017-12613 in APR 1.6.3 and
later 1.6.x releases, but was missing in 1.7.0.) [Stefan Sperling]
+ *) configure: Add --disable-sctp argument to forcibly disable SCTP
+ support, or --enable-sctp which fails if SCTP support is not
+ detected. [Lubos Uhliarik <luhliari redhat.com>, Joe Orton]
+
*) Fix handle leak in the Win32 apr_uid_current implementation.
PR 61165. [Ivan Zhakov]
Propchange: apr/apr/branches/1.7.x/build/
------------------------------------------------------------------------------
Merged /apr/apr/trunk/build:r1894167
Modified: apr/apr/branches/1.7.x/build/apr_network.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/build/apr_network.m4?rev=1894170&r1=1894169&r2=1894170&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/build/apr_network.m4 (original)
+++ apr/apr/branches/1.7.x/build/apr_network.m4 Tue Oct 12 16:26:35 2021
@@ -906,8 +906,16 @@ dnl check for presence of SCTP protocol
dnl
AC_DEFUN([APR_CHECK_SCTP],
[
- AC_CACHE_CHECK([whether SCTP is supported], [apr_cv_sctp], [
- AC_TRY_RUN([
+AC_ARG_ENABLE([sctp],
+ APR_HELP_STRING([--disable-sctp], [disable SCTP protocol support]),
+ [apr_wants_sctp=$enableval],
+ [apr_wants_sctp=any])
+
+if test "$apr_wants_sctp" = no; then
+ apr_cv_sctp=no
+else
+ AC_CACHE_CHECK([whether SCTP is supported], [apr_cv_sctp], [
+ AC_TRY_RUN([
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
@@ -932,6 +940,11 @@ int main(void) {
exit(2);
exit(0);
}], [apr_cv_sctp=yes], [apr_cv_sctp=no], [apr_cv_sctp=no])])
+fi
+
+if test "${apr_wants_sctp}X${apr_cv_sctp}" = yesXno; then
+ AC_MSG_ERROR([SCTP support requested but not available])
+fi
if test "$apr_cv_sctp" = "yes"; then
have_sctp=1