Commit4d3db13

committed

Define OPENSSL_API_COMPAT

This avoids deprecation warnings from newer OpenSSL versions (3.0.0 inparticular).Discussion:https://www.postgresql.org/message-id/flat/FEF81714-D479-4512-839B-C769D2605F8A%40yesql.se

1 parent9b14280 commit4d3db13Copy full SHA for 4d3db13

File tree

+21

-2

lines changed

+21

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12174,7 +12174,11 @@ fi`
`12174`	`12174`	`fi`
`12175`	`12175`
`12176`	`12176`	`if test "$with_openssl" = yes ; then`
`12177`		`- if test "$PORTNAME" != "win32"; then`
	`12177`	`+ # Minimum required OpenSSL version is 1.0.1`
	`12178`	`+`
	`12179`	`+$as_echo "#define OPENSSL_API_COMPAT 0x10001000L" >>confdefs.h`
	`12180`	`+`
	`12181`	`+ if test "$PORTNAME" != "win32"; then`
`12178`	`12182`	`{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_new_ex_data in -lcrypto" >&5`
`12179`	`12183`	`$as_echo_n "checking for CRYPTO_new_ex_data in -lcrypto... " >&6; }`
`12180`	`12184`	`if ${ac_cv_lib_crypto_CRYPTO_new_ex_data+:} false; then :`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1206,6 +1206,9 @@ fi`
`1206`	`1206`
`1207`	`1207`	`if test "$with_openssl" = yes ; then`
`1208`	`1208`	`dnl Order matters!`
	`1209`	`+ # Minimum required OpenSSL version is 1.0.1`
	`1210`	`+ AC_DEFINE(OPENSSL_API_COMPAT, [0x10001000L],`
	`1211`	`+ [Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.])`
`1209`	`1212`	`if test "$PORTNAME" != "win32"; then`
`1210`	`1213`	`AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])`
`1211`	`1214`	`AC_CHECK_LIB(ssl, SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -749,6 +749,10 @@`
`749`	`749`	`/* Define bytes to use libc memset(). */`
`750`	`750`	`#undef MEMSET_LOOP_LIMIT`
`751`	`751`
	`752`	`+/* Define to the OpenSSL API version in use. This avoids deprecation warnings`
	`753`	`+ from newer OpenSSL versions. */`
	`754`	`+#undef OPENSSL_API_COMPAT`
	`755`	`+`
`752`	`756`	`/* Define to the address where bug reports for this package should be sent. */`
`753`	`757`	`#undef PACKAGE_BUGREPORT`
`754`	`758`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,8 @@ sub GenerateFiles`
`152`	`152`	`my$package_bugreport;`
`153`	`153`	`my$package_url;`
`154`	`154`	`my ($majorver,$minorver);`
	`155`	`+my$ac_define_openssl_api_compat_found = 0;`
	`156`	`+my$openssl_api_compat;`
`155`	`157`
`156`	`158`	`# Parse configure.in to get version numbers`
`157`	`159`	`open(my$c,'<',"configure.in")`
`@@ -176,10 +178,15 @@ sub GenerateFiles`
`176`	`178`	`$majorver =sprintf("%d",$1);`
`177`	`179`	`$minorver =sprintf("%d",$2 ?$2 : 0);`
`178`	`180`	`}`
	`181`	`+elsif (/\bAC_DEFINE\(OPENSSL_API_COMPAT,\[([0-9xL]+)\]/)`
	`182`	`+{`
	`183`	`+$ac_define_openssl_api_compat_found = 1;`
	`184`	`+$openssl_api_compat =$1;`
	`185`	`+}`
`179`	`186`	`}`
`180`	`187`	`close($c);`
`181`	`188`	`confess"Unable to parse configure.in for all variables!"`
`182`		`-unless$ac_init_found;`
	`189`	`+unless$ac_init_found &&$ac_define_openssl_api_compat_found;`
`183`	`190`
`184`	`191`	`if (IsNewer("src/include/pg_config_os.h","src/include/port/win32.h"))`
`185`	`192`	`{`
`@@ -433,6 +440,7 @@ sub GenerateFiles`
`433`	`440`	`LOCALE_T_IN_XLOCALE=>undef,`
`434`	`441`	`MAXIMUM_ALIGNOF=> 8,`
`435`	`442`	`MEMSET_LOOP_LIMIT=> 1024,`
	`443`	`+OPENSSL_API_COMPAT=>$openssl_api_compat,`
`436`	`444`	`PACKAGE_BUGREPORT=>qq{"$package_bugreport"},`
`437`	`445`	`PACKAGE_NAME=>qq{"$package_name"},`
`438`	`446`	`PACKAGE_STRING=>qq{"$package_name$package_version"},`

Comments

(0)