svn commit: r477436 - in head/comms/cqrlog: . files
Stephen Hurd
shurd at FreeBSD.org
Fri Aug 17 17:00:57 UTC 2018
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)
More information about the svn-ports-head
mailing list