a08d1dc4ee
includes: CVE-2021-22945: clear the leftovers pointer when sending succeeds CVE-2021-22946: do not ignore --ssl-reqd CVE-2021-22947: reject STARTTLS server response pipelining Change-Id: I0047bdaa7e6e3aed1317eb014d2051a4d5ac5964 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123883 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
90 lines
1.9 KiB
Text
90 lines
1.9 KiB
Text
--- configure
|
|
+++ configure
|
|
@@ -22699,7 +22699,6 @@
|
|
clean_CPPFLAGS=$CPPFLAGS
|
|
clean_LDFLAGS=$LDFLAGS
|
|
clean_LIBS=$LIBS
|
|
-ZLIB_LIBS=""
|
|
|
|
# Check whether --with-zlib was given.
|
|
if test ${with_zlib+y}
|
|
@@ -22709,6 +22708,7 @@
|
|
|
|
|
|
if test "$OPT_ZLIB" = "no" ; then
|
|
+ ZLIB_LIBS=""
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib disabled" >&5
|
|
printf "%s\n" "$as_me: WARNING: zlib disabled" >&2;}
|
|
else
|
|
@@ -22716,6 +22716,21 @@
|
|
OPT_ZLIB=""
|
|
fi
|
|
|
|
+ if test -n "$ZLIB_CFLAGS$ZLIB_LIBS"; then
|
|
+ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
|
|
+ LIBS="$ZLIB_LIBS $LIBS"
|
|
+ HAVE_LIBZ="1"
|
|
+
|
|
+
|
|
+$as_echo "#define HAVE_ZLIB_H 1" >>confdefs.h
|
|
+
|
|
+
|
|
+$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
|
|
+
|
|
+ AMFIXLIB="1"
|
|
+ else
|
|
+ ZLIB_LIBS=""
|
|
+
|
|
if test -z "$OPT_ZLIB" ; then
|
|
|
|
if test -n "$PKG_CONFIG"; then
|
|
@@ -23011,6 +23026,7 @@
|
|
printf "%s\n" "$as_me: found both libz and libz.h header" >&6;}
|
|
curl_zlib_msg="enabled"
|
|
fi
|
|
+ fi
|
|
fi
|
|
|
|
if test x"$AMFIXLIB" = x1; then
|
|
--- configure.ac
|
|
+++ configure.ac
|
|
@@ -880,19 +880,30 @@
|
|
clean_CPPFLAGS=$CPPFLAGS
|
|
clean_LDFLAGS=$LDFLAGS
|
|
clean_LIBS=$LIBS
|
|
-ZLIB_LIBS=""
|
|
AC_ARG_WITH(zlib,
|
|
AS_HELP_STRING([--with-zlib=PATH],[search for zlib in PATH])
|
|
AS_HELP_STRING([--without-zlib],[disable use of zlib]),
|
|
[OPT_ZLIB="$withval"])
|
|
|
|
if test "$OPT_ZLIB" = "no" ; then
|
|
+ ZLIB_LIBS=""
|
|
AC_MSG_WARN([zlib disabled])
|
|
else
|
|
if test "$OPT_ZLIB" = "yes" ; then
|
|
OPT_ZLIB=""
|
|
fi
|
|
|
|
+ if test -n "$ZLIB_CFLAGS$ZLIB_LIBS"; then
|
|
+ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
|
|
+ LIBS="$ZLIB_LIBS $LIBS"
|
|
+ HAVE_LIBZ="1"
|
|
+ AC_SUBST(HAVE_LIBZ)
|
|
+ AC_DEFINE(HAVE_ZLIB_H, 1, [if you have the zlib.h header file])
|
|
+ AC_DEFINE(HAVE_LIBZ, 1, [if zlib is available])
|
|
+ AMFIXLIB="1"
|
|
+ else
|
|
+ ZLIB_LIBS=""
|
|
+
|
|
if test -z "$OPT_ZLIB" ; then
|
|
CURL_CHECK_PKGCONFIG(zlib)
|
|
|
|
@@ -975,6 +986,7 @@
|
|
AC_MSG_NOTICE([found both libz and libz.h header])
|
|
curl_zlib_msg="enabled"
|
|
fi
|
|
+ fi
|
|
fi
|
|
|
|
dnl set variable for use in automakefile(s)
|