Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4476fc9

Browse files
committed
Merge branch 'REL9_6_STABLE' into PGPRO9_6
2 parentsc2bae10 +e06728d commit4476fc9

File tree

56 files changed

+817
-585
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+817
-585
lines changed

‎configure‎

Lines changed: 53 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9595,9 +9595,9 @@ else
95959595
as_fn_error $? "library 'crypto' is required for OpenSSL" "$LINENO" 5
95969596
fi
95979597

9598-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking forSSL_library_init in -lssl" >&5
9599-
$as_echo_n "checking forSSL_library_init in -lssl... " >&6; }
9600-
if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
9598+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking forSSL_new in -lssl" >&5
9599+
$as_echo_n "checking forSSL_new in -lssl... " >&6; }
9600+
if ${ac_cv_lib_ssl_SSL_new+:} false; then :
96019601
$as_echo_n "(cached) " >&6
96029602
else
96039603
ac_check_lib_save_LIBS=$LIBS
@@ -9611,27 +9611,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
96119611
#ifdef __cplusplus
96129612
extern "C"
96139613
#endif
9614-
charSSL_library_init ();
9614+
charSSL_new ();
96159615
int
96169616
main ()
96179617
{
9618-
returnSSL_library_init ();
9618+
returnSSL_new ();
96199619
;
96209620
return 0;
96219621
}
96229622
_ACEOF
96239623
if ac_fn_c_try_link "$LINENO"; then :
9624-
ac_cv_lib_ssl_SSL_library_init=yes
9624+
ac_cv_lib_ssl_SSL_new=yes
96259625
else
9626-
ac_cv_lib_ssl_SSL_library_init=no
9626+
ac_cv_lib_ssl_SSL_new=no
96279627
fi
96289628
rm -f core conftest.err conftest.$ac_objext \
96299629
conftest$ac_exeext conftest.$ac_ext
96309630
LIBS=$ac_check_lib_save_LIBS
96319631
fi
9632-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5
9633-
$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
9634-
if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
9632+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_new" >&5
9633+
$as_echo "$ac_cv_lib_ssl_SSL_new" >&6; }
9634+
if test "x$ac_cv_lib_ssl_SSL_new" = xyes; then :
96359635
cat >>confdefs.h <<_ACEOF
96369636
#define HAVE_LIBSSL 1
96379637
_ACEOF
@@ -9701,9 +9701,9 @@ else
97019701
as_fn_error $? "library 'eay32' or 'crypto' is required for OpenSSL" "$LINENO" 5
97029702
fi
97039703

9704-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containingSSL_library_init" >&5
9705-
$as_echo_n "checking for library containingSSL_library_init... " >&6; }
9706-
if ${ac_cv_search_SSL_library_init+:} false; then :
9704+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containingSSL_new" >&5
9705+
$as_echo_n "checking for library containingSSL_new... " >&6; }
9706+
if ${ac_cv_search_SSL_new+:} false; then :
97079707
$as_echo_n "(cached) " >&6
97089708
else
97099709
ac_func_search_save_LIBS=$LIBS
@@ -9716,11 +9716,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
97169716
#ifdef __cplusplus
97179717
extern "C"
97189718
#endif
9719-
charSSL_library_init ();
9719+
charSSL_new ();
97209720
int
97219721
main ()
97229722
{
9723-
returnSSL_library_init ();
9723+
returnSSL_new ();
97249724
;
97259725
return 0;
97269726
}
@@ -9733,25 +9733,25 @@ for ac_lib in '' ssleay32 ssl; do
97339733
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
97349734
fi
97359735
if ac_fn_c_try_link "$LINENO"; then :
9736-
ac_cv_search_SSL_library_init=$ac_res
9736+
ac_cv_search_SSL_new=$ac_res
97379737
fi
97389738
rm -f core conftest.err conftest.$ac_objext \
97399739
conftest$ac_exeext
9740-
if ${ac_cv_search_SSL_library_init+:} false; then :
9740+
if ${ac_cv_search_SSL_new+:} false; then :
97419741
break
97429742
fi
97439743
done
9744-
if ${ac_cv_search_SSL_library_init+:} false; then :
9744+
if ${ac_cv_search_SSL_new+:} false; then :
97459745

97469746
else
9747-
ac_cv_search_SSL_library_init=no
9747+
ac_cv_search_SSL_new=no
97489748
fi
97499749
rm conftest.$ac_ext
97509750
LIBS=$ac_func_search_save_LIBS
97519751
fi
9752-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_library_init" >&5
9753-
$as_echo "$ac_cv_search_SSL_library_init" >&6; }
9754-
ac_res=$ac_cv_search_SSL_library_init
9752+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_new" >&5
9753+
$as_echo "$ac_cv_search_SSL_new" >&6; }
9754+
ac_res=$ac_cv_search_SSL_new
97559755
if test "$ac_res" != no; then :
97569756
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
97579757

@@ -9768,6 +9768,37 @@ if test "x$ac_cv_func_SSL_get_current_compression" = xyes; then :
97689768
#define HAVE_SSL_GET_CURRENT_COMPRESSION 1
97699769
_ACEOF
97709770

9771+
fi
9772+
done
9773+
9774+
# Functions introduced in OpenSSL 1.1.0. We used to check for
9775+
# OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL
9776+
# defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
9777+
# doesn't have these OpenSSL 1.1.0 functions. So check for individual
9778+
# functions.
9779+
for ac_func in OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data RAND_OpenSSL
9780+
do :
9781+
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
9782+
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
9783+
if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
9784+
cat >>confdefs.h <<_ACEOF
9785+
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
9786+
_ACEOF
9787+
9788+
fi
9789+
done
9790+
9791+
# OpenSSL versions before 1.1.0 required setting callback functions, for
9792+
# thread-safety. In 1.1.0, it's no longer required, and CRYPTO_lock()
9793+
# function was removed.
9794+
for ac_func in CRYPTO_lock
9795+
do :
9796+
ac_fn_c_check_func "$LINENO" "CRYPTO_lock" "ac_cv_func_CRYPTO_lock"
9797+
if test "x$ac_cv_func_CRYPTO_lock" = xyes; then :
9798+
cat >>confdefs.h <<_ACEOF
9799+
#define HAVE_CRYPTO_LOCK 1
9800+
_ACEOF
9801+
97719802
fi
97729803
done
97739804

‎configure.in‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,12 +1129,22 @@ if test "$with_openssl" = yes ; then
11291129
dnl Order matters!
11301130
if test "$PORTNAME" != "win32"; then
11311131
AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
1132-
AC_CHECK_LIB(ssl,SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
1132+
AC_CHECK_LIB(ssl,SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
11331133
else
11341134
AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
1135-
AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
1135+
AC_SEARCH_LIBS(SSL_new, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
11361136
fi
11371137
AC_CHECK_FUNCS([SSL_get_current_compression])
1138+
# Functions introduced in OpenSSL 1.1.0. We used to check for
1139+
# OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL
1140+
# defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
1141+
# doesn't have these OpenSSL 1.1.0 functions. So check for individual
1142+
# functions.
1143+
AC_CHECK_FUNCS([OPENSSL_init_ssl BIO_get_data BIO_meth_new ASN1_STRING_get0_data RAND_OpenSSL])
1144+
# OpenSSL versions before 1.1.0 required setting callback functions, for
1145+
# thread-safety. In 1.1.0, it's no longer required, and CRYPTO_lock()
1146+
# function was removed.
1147+
AC_CHECK_FUNCS([CRYPTO_lock])
11381148
fi
11391149

11401150
if test "$with_icu" = yes ; then

‎contrib/pg_buffercache/pg_buffercache_pages.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ pg_buffercache_pages(PG_FUNCTION_ARGS)
124124
fctx->tupdesc=BlessTupleDesc(tupledesc);
125125

126126
/* Allocate NBuffers worth of BufferCachePagesRec records. */
127-
fctx->record= (BufferCachePagesRec*)palloc(sizeof(BufferCachePagesRec)*NBuffers);
127+
fctx->record= (BufferCachePagesRec*)
128+
MemoryContextAllocHuge(CurrentMemoryContext,
129+
sizeof(BufferCachePagesRec)*NBuffers);
128130

129131
/* Set max calls and remember the user function context. */
130132
funcctx->max_calls=NBuffers;

‎contrib/pgcrypto/internal.c‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -620,15 +620,6 @@ px_find_cipher(const char *name, PX_Cipher **res)
620620
* Randomness provider
621621
*/
622622

623-
/*
624-
* Use always strong randomness.
625-
*/
626-
int
627-
px_get_pseudo_random_bytes(uint8*dst,unsignedcount)
628-
{
629-
returnpx_get_random_bytes(dst,count);
630-
}
631-
632623
statictime_tseed_time=0;
633624
statictime_tcheck_time=0;
634625

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp