Index: head/databases/pgpool-II-33/Makefile =================================================================== --- head/databases/pgpool-II-33/Makefile (revision 470210) +++ head/databases/pgpool-II-33/Makefile (revision 470211) @@ -1,92 +1,93 @@ # $FreeBSD$ PORTNAME= pgpool-II PORTVERSION= 3.3.20 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://www.pgpool.net/mediawiki/images/ PKGNAMESUFFIX= 33 MAINTAINER= michelle@sorbs.net COMMENT= Connection pool server for PostgreSQL LICENSE= MIT BROKEN_SSL= openssl-devel BROKEN_SSL_REASON_openssl-devel= library 'ssl' is required for OpenSSL DEPRECATED= Will be deprecated by upstream, please switch to newer pgpool versions EXPIRATION_DATE= 2018-07-31 RUN_DEPENDS= rsync:net/rsync USES= gmake libtool perl5 pgsql WANT_PGSQL= client USE_PERL5= run GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_ENV= INSTALL_STRIP_FLAG=${STRIP} CONFLICTS= pgpool-3.* pgpool-II-30-3.* pgpool-II-3.* USE_RC_SUBR= pgpool DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp \ TODO doc/pgpool-en.html doc/pgpool-ja.html doc/pgpool.css \ doc/tutorial-en.html doc/tutorial-ja.html OPTIONS_DEFINE+= DOCS SSL LIBMEMCACHED PAM OPTIONS_DEFAULT= SSL PAM # Buggy configure: adding eg. --without-pam to CONFIGURE_ARGS causes # USE_PAM to be *defined* in config.h Omit the --with-pam or # --without-pam flags entirely to leave PAM turned off. Similarly for # --with-memcached. LIBMEMCACHED_DESC= Build with MemCached support LIBMEMCACHED_BUILD_DEPENDS= libmemcached>=1.0:databases/libmemcached LIBMEMCACHED_CONFIGURE_ON= --with-memcached=${LOCALBASE}/lib/libmemcached LIBMEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached SSL_CONFIGURE_WITH= openssl SSL_USES= ssl PAM_DESC= Build with PAM support PAM_CONFIGURE_ON= --with-pam PAM_USE= PAM=yes FUNC_CONTRIB_DIR= ${PREFIX}/share/postgresql/contrib FUNC_LIB_DIR= ${PREFIX}/lib/postgresql FUNCTIONS= pgpool-recovery pgpool-regclass FUNC_CONTRIB= pgpool-recovery/uninstall_pgpool-recovery.sql \ pgpool-recovery/pgpool-recovery.sql \ pgpool-regclass/uninstall_pgpool-regclass.sql \ pgpool-regclass/pgpool-regclass.sql FUNC_LIB= pgpool-recovery/pgpool-recovery.so \ pgpool-regclass/pgpool-regclass.so post-build: .for f in ${FUNCTIONS} cd ${WRKSRC}/sql/${f} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} .endfor post-install: ${MKDIR} ${STAGEDIR}${FUNC_CONTRIB_DIR} .for f in ${FUNC_CONTRIB} ${INSTALL_DATA} ${WRKSRC}/sql/${f} ${STAGEDIR}${FUNC_CONTRIB_DIR} .endfor ${MKDIR} ${STAGEDIR}${FUNC_LIB_DIR} .for f in ${FUNC_LIB} ${INSTALL_LIB} ${WRKSRC}/sql/${f} ${STAGEDIR}${FUNC_LIB_DIR} .endfor ${INSTALL_DATA} ${WRKSRC}/sample/dist_def_pgbench.sql \ ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/sample/replicate_def_pgbench.sql \ ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR} .for f in pgpool_recovery pgpool_recovery_pitr pgpool_remote_start ${INSTALL_SCRIPT} ${WRKSRC}/sample/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${DOCS} ${INSTALL_MAN} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/databases/pgpool-II-33/files/patch-main.c =================================================================== --- head/databases/pgpool-II-33/files/patch-main.c (nonexistent) +++ head/databases/pgpool-II-33/files/patch-main.c (revision 470211) @@ -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(); Property changes on: head/databases/pgpool-II-33/files/patch-main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/pgpool-II-33/files/patch-pool__config.l =================================================================== --- head/databases/pgpool-II-33/files/patch-pool__config.l (nonexistent) +++ head/databases/pgpool-II-33/files/patch-pool__config.l (revision 470211) @@ -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 Property changes on: head/databases/pgpool-II-33/files/patch-pool__config.l ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/pgpool-II-33/files/patch-wd__packet.c =================================================================== --- head/databases/pgpool-II-33/files/patch-wd__packet.c (nonexistent) +++ head/databases/pgpool-II-33/files/patch-wd__packet.c (revision 470211) @@ -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 Property changes on: head/databases/pgpool-II-33/files/patch-wd__packet.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property