diff options
| author | tz <tz@FreeBSD.org> | 2018-05-17 17:32:04 +0800 |
|---|---|---|
| committer | tz <tz@FreeBSD.org> | 2018-05-17 17:32:04 +0800 |
| commit | dd7bbc3541e76425e92494c57c0fbe757286964e (patch) | |
| tree | dd0a7cc064058cc36d31a7c8e3002904bd2124ee /databases | |
| parent | 6c76eb9da78c9784356f117ea41c0951b31c66af (diff) | |
| download | freebsd-ports-gnome-dd7bbc3541e76425e92494c57c0fbe757286964e.tar.gz freebsd-ports-gnome-dd7bbc3541e76425e92494c57c0fbe757286964e.tar.zst freebsd-ports-gnome-dd7bbc3541e76425e92494c57c0fbe757286964e.zip | |
databases/pgpool-II-33: Fix build with LibreSSL
The build was broken after the latest update of the port,
but only on amd64, not i386.
PR: 226099
Submitted by: w.schwarzenfeld@utanet.at
Reported by: dewayne@heuristicsystems.com.au
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/pgpool-II-33/Makefile | 1 | ||||
| -rw-r--r-- | databases/pgpool-II-33/files/patch-main.c | 11 | ||||
| -rw-r--r-- | databases/pgpool-II-33/files/patch-pool__config.l | 11 | ||||
| -rw-r--r-- | databases/pgpool-II-33/files/patch-wd__packet.c | 20 |
4 files changed, 43 insertions, 0 deletions
diff --git a/databases/pgpool-II-33/Makefile b/databases/pgpool-II-33/Makefile index 45c897c91e1d..e3308c341a12 100644 --- a/databases/pgpool-II-33/Makefile +++ b/databases/pgpool-II-33/Makefile @@ -2,6 +2,7 @@ PORTNAME= pgpool-II PORTVERSION= 3.3.20 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.pgpool.net/mediawiki/images/ PKGNAMESUFFIX= 33 diff --git a/databases/pgpool-II-33/files/patch-main.c b/databases/pgpool-II-33/files/patch-main.c new file mode 100644 index 000000000000..05de41fc8639 --- /dev/null +++ b/databases/pgpool-II-33/files/patch-main.c @@ -0,0 +1,11 @@ +--- main.c.orig 2018-02-22 11:15:58 UTC ++++ main.c +@@ -360,7 +360,7 @@ int main(int argc, char **argv) + + #ifdef USE_SSL + /* global ssl init */ +- #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++ #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + OPENSSL_init_ssl(0, NULL); + else + SSL_library_init(); diff --git a/databases/pgpool-II-33/files/patch-pool__config.l b/databases/pgpool-II-33/files/patch-pool__config.l new file mode 100644 index 000000000000..608ff64aaedf --- /dev/null +++ b/databases/pgpool-II-33/files/patch-pool__config.l @@ -0,0 +1,11 @@ +--- pool_config.l.orig 2018-02-22 11:24:41 UTC ++++ pool_config.l +@@ -2871,7 +2871,7 @@ int pool_get_config(char *confpath, POOL + pool_config->backend_desc->num_backends = local_num_backends; + + pool_debug("num_backends: %d total_weight: %f", +- pool_config->backend_desc->num_backends, total_weight); ++ (long) pool_config->backend_desc->num_backends, total_weight); + /* + * Normalize load balancing weights. What we are doing here is, + * assign 0 to RAND_MAX to each backend's weight according to the diff --git a/databases/pgpool-II-33/files/patch-wd__packet.c b/databases/pgpool-II-33/files/patch-wd__packet.c new file mode 100644 index 000000000000..a4a071ea1561 --- /dev/null +++ b/databases/pgpool-II-33/files/patch-wd__packet.c @@ -0,0 +1,20 @@ +--- watchdog/wd_packet.c.orig 2018-02-22 00:06:40 UTC ++++ watchdog/wd_packet.c +@@ -1211,7 +1211,7 @@ static void calculate_hmac_sha256(const + unsigned int res_len = WD_AUTH_HASH_LEN; + HMAC_CTX *ctx = NULL; + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + ctx = HMAC_CTX_new(); + HMAC_CTX_reset(ctx); + #else +@@ -1222,7 +1222,7 @@ static void calculate_hmac_sha256(const + HMAC_Init_ex(ctx, key, strlen(key), EVP_sha256(), NULL); + HMAC_Update(ctx, (unsigned char*)data, len); + HMAC_Final(ctx, (unsigned char*)str, &res_len); +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + HMAC_CTX_reset(ctx); + HMAC_CTX_free(ctx); + #else |