From owner-svn-ports-all@freebsd.org Fri Aug 17 17:00:56 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B862A10758C6; Fri, 17 Aug 2018 17:00:56 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6EB8D89E62; Fri, 17 Aug 2018 17:00:56 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5147A3261; Fri, 17 Aug 2018 17:00:56 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7HH0ufE036713; Fri, 17 Aug 2018 17:00:56 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7HH0uK3036712; Fri, 17 Aug 2018 17:00:56 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201808171700.w7HH0uK3036712@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Fri, 17 Aug 2018 17:00:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477436 - in head/comms/cqrlog: . files X-SVN-Group: ports-head X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: in head/comms/cqrlog: . files X-SVN-Commit-Revision: 477436 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Aug 2018 17:00:57 -0000 Author: shurd Date: Fri Aug 17 17:00:55 2018 New Revision: 477436 URL: https://svnweb.freebsd.org/changeset/ports/477436 Log: Fix LoTW integration again. If the MySQL library isn't explicitly initialized, the mysql library will end up calling EVP_cleanup() while detecting the MySQL version, which clobbers the OpenSSL context, preventing LoTW (and perhaps ClubLog) integration from working properly. Look in ${LOCALBASE}/lib/mysql/ for MySQL and MariaDB libraries. Only look for .so file, don't look for "any" SONAME. Modified: head/comms/cqrlog/Makefile head/comms/cqrlog/files/patch-src_dData.pas Modified: head/comms/cqrlog/Makefile ============================================================================== --- head/comms/cqrlog/Makefile Fri Aug 17 16:07:08 2018 (r477435) +++ head/comms/cqrlog/Makefile Fri Aug 17 17:00:55 2018 (r477436) @@ -4,6 +4,7 @@ PORTNAME= cqrlog PORTVERSION= 2.3.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= comms hamradio PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} @@ -14,7 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libhamlib.so:comms/hamlib -USES= fpc lazarus:flavors shebangfix ssl:run dos2unix +USES= fpc lazarus:flavors shebangfix ssl:run dos2unix mysql USE_GITHUB= yes GH_ACCOUNT= ok2cqr Modified: head/comms/cqrlog/files/patch-src_dData.pas ============================================================================== --- head/comms/cqrlog/files/patch-src_dData.pas Fri Aug 17 16:07:08 2018 (r477435) +++ head/comms/cqrlog/files/patch-src_dData.pas Fri Aug 17 17:00:55 2018 (r477436) @@ -1,4 +1,4 @@ ---- src/dData.pas.orig 2018-07-11 03:36:41 UTC +--- src/dData.pas.orig 2018-06-17 12:42:42 UTC +++ src/dData.pas @@ -904,22 +904,22 @@ begin if not DirectoryExistsUTF8(fHomeDir+'members') then @@ -73,7 +73,7 @@ if Result = '' then //don't know where mysqld is, so hopefully will be in $PATH Result := 'mysqld' end; -@@ -4209,17 +4209,7 @@ begin +@@ -4209,22 +4209,13 @@ begin Result := ''; Paths := TStringList.Create; try @@ -88,7 +88,15 @@ - Paths.Add('/usr/lib/'); - Paths.Add('/lib/'); - Paths.Add('/usr/lib/mysql/'); ++ Paths.Add('%%LOCALBASE%%/lib/mysql/'); + Paths.Add('%%LOCALBASE%%/lib/'); - Result := MyFindFile('libmariadbclient.so*', Paths); +- Result := MyFindFile('libmariadbclient.so*', Paths); ++ Result := MyFindFile('libmariadbclient.so', Paths); if (Result='') then + begin +- Result := MyFindFile('libmysqlclient.so*', Paths) ++ Result := MyFindFile('libmysqlclient.so', Paths) + end + finally + FreeAndNil(Paths)