cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable ssh tunnel config built-in to pgadmin3, it uses an ancient libssh2

Browse Source 
that is hard to patch for opaque structs in newer OpenSSL/LibreSSL.

While this port has been patched to _build_ against current postgresql
it hasn't been patched to _run_ with a newer version since 2018 (11.x)
so seems unlikely to really be used; this has no longer been maintained
upstream for even longer so I intend to remove the port soon.
This commit is contained in:
sthen 2022-01-15 12:15:22 +00:00
parent bef5b13a94
commit 0e8d3784a2
3 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
databases/pgadmin3/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.46 2021/07/06 16:55:32 daniel Exp $
# $OpenBSD: Makefile,v 1.47 2022/01/15 12:15:22 sthen Exp $
COMMENT= administration and development platform for PostgreSQL
V= 1.22.1
DISTNAME= pgadmin3-$V
CATEGORIES= databases devel
REVISION= 6
REVISION= 7
HOMEPAGE= https://www.pgadmin.org/
@ -21,7 +21,7 @@ WANTLIB += wx_gtk3u_xrc-3.0 xml2 xslt z
MASTER_SITES= https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v$V/src/
COMPILER = base-clang ports-gcc base-gcc
COMPILER= base-clang ports-gcc base-gcc
LIB_DEPENDS= x11/wxWidgets>=3.0.4 \
databases/postgresql \
@ -31,8 +31,11 @@ LIB_DEPENDS= x11/wxWidgets>=3.0.4 \
BUILD_DEPENDS += databases/postgresql,-server \
textproc/py-sphinx,python3>=4.0.2
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS}"
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS}" \
BUILD_SSH_TUNNEL=no
CONFIGURE_ARGS= --with-pgsql=${LOCALBASE} \
--with-wx-version=3.0

21
databases/pgadmin3/patches/patch-configure
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-configure,v 1.5 2016/07/15 14:43:40 pea Exp $
--- configure.orig Mon Feb 8 02:27:13 2016
+++ configure Sat Jul 2 17:10:19 2016
@@ -5743,7 +5743,7 @@ if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl $LIBS"
+LIBS="-lcrypto -lssl $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6210,7 +6210,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$PG_SSL" = "yes"
then
- LIBS="${PG_LIB}/libpq.a $CRYPT_LIB $LIBS -lssl $CRYPTO_LIB"
+ LIBS="${PG_LIB}/libpq.a $CRYPT_LIB $LIBS -lcrypto -lssl $CRYPTO_LIB"
else
LIBS="${PG_LIB}/libpq.a $CRYPT_LIB $LIBS $CRYPTO_LIB"
fi

14
databases/pgadmin3/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-configure_ac,v 1.1 2022/01/15 12:15:23 sthen Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -99,7 +99,7 @@ if test "$ac_cv_libssl" != "yes" && test "$ac_cv_libgc
AC_MSG_NOTICE([cannot find OpenSSL or Libgcrypt, try --with-libssl-prefix=PATH or --with-libgcrypt-prefix=PATH])
BUILD_SSH_TUNNEL="no"
else
- BUILD_SSH_TUNNEL="yes"
+ BUILD_SSH_TUNNEL="${BUILD_SSH_TUNNEL:=yes}"
fi
AM_CONDITIONAL([BUILD_SSH_TUNNEL], [test x$BUILD_SSH_TUNNEL = xyes])