On Mon, Aug 27, 2018 at 08:02:23PM +0200, Theo Buehler wrote:
> These are about the BIO_meth_* family of functions which we have for
> half a year or so.
>
> The REVISION bumps are what portbump suggested. Not sure all of them are
> needed.
I've got an ok from jsing@ on the actual diff and would like to commit
soon. We're both unsure about the bumping. If it is desirable to bump
only some parts, please let me know which ones.
>
> Index: Makefile
> ===================================================================
> RCS file: /var/cvs/ports/databases/postgresql/Makefile,v
> retrieving revision 1.238
> diff -u -p -r1.238 Makefile
> --- Makefile 9 Aug 2018 15:32:36 -0000 1.238
> +++ Makefile 27 Aug 2018 17:59:10 -0000
> @@ -16,6 +16,12 @@ PKGNAME-docs= postgresql-docs-${VERSION}
> PKGNAME-contrib=postgresql-contrib-${VERSION}
> PKGNAME-plpython=postgresql-plpython-${VERSION}
> PKGNAME-pg_upgrade=postgresql-pg_upgrade-${VERSION}
> +REVISION-contrib= 0
> +REVISION-docs= 0
> +REVISION-main= 0
> +REVISION-pg_upgrade= 0
> +REVISION-plpython= 0
> +REVISION-server= 0
>
> CATEGORIES= databases
> SHARED_LIBS= ecpg 7.9 \
> Index: patches/patch-src_backend_libpq_be-secure-openssl_c
> ===================================================================
> RCS file: patches/patch-src_backend_libpq_be-secure-openssl_c
> diff -N patches/patch-src_backend_libpq_be-secure-openssl_c
> --- patches/patch-src_backend_libpq_be-secure-openssl_c 18 Feb 2018
> 17:49:08 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-src_backend_libpq_be-secure-openssl_c,v 1.1 2018/02/18
> 17:49:08 sthen Exp $
> -
> -Index: src/backend/libpq/be-secure-openssl.c
> ---- src/backend/libpq/be-secure-openssl.c.orig
> -+++ src/backend/libpq/be-secure-openssl.c
> -@@ -823,7 +823,7 @@ my_BIO_s_socket(void)
> - if (!my_bio_methods)
> - {
> - BIO_METHOD *biom = (BIO_METHOD *) BIO_s_socket();
> --#ifdef HAVE_BIO_METH_NEW
> -+#if defined(HAVE_BIO_METH_NEW) && !defined(LIBRESSL_VERSION_NUMBER)
> - int my_bio_index;
> -
> - my_bio_index = BIO_get_new_index();
> Index: patches/patch-src_interfaces_libpq_fe-secure-openssl_c
> ===================================================================
> RCS file: patches/patch-src_interfaces_libpq_fe-secure-openssl_c
> diff -N patches/patch-src_interfaces_libpq_fe-secure-openssl_c
> --- patches/patch-src_interfaces_libpq_fe-secure-openssl_c 18 Feb 2018
> 17:49:08 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-src_interfaces_libpq_fe-secure-openssl_c,v 1.1 2018/02/18
> 17:49:08 sthen Exp $
> -
> -Index: src/interfaces/libpq/fe-secure-openssl.c
> ---- src/interfaces/libpq/fe-secure-openssl.c.orig
> -+++ src/interfaces/libpq/fe-secure-openssl.c
> -@@ -1640,7 +1640,7 @@ my_BIO_s_socket(void)
> - if (!my_bio_methods)
> - {
> - BIO_METHOD *biom = (BIO_METHOD *) BIO_s_socket();
> --#ifdef HAVE_BIO_METH_NEW
> -+#if defined(HAVE_BIO_METH_NEW) && !defined(LIBRESSL_VERSION_NUMBER)
> - int my_bio_index;
> -
> - my_bio_index = BIO_get_new_index();
>
