Attachment #222545 for bug #253609

View | Details | Raw Unified | Return to bug 253609
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	openconnect-gui
PORTVERSION=	1.5.3
DISTVERSIONPREFIX=v
MASTER_SITES=	https://gitlab.com/openconnect/openconnect-gui/-/archive/v${PORTVERSION}/
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
CATEGORIES=	security net-vpn

MAINTAINER=	pkubaj@FreeBSD.org

LICENSE_FILE=	${WRKSRC}/LICENSE.txt

BUILD_DEPENDS=	openconnect:security/openconnect
LIB_DEPENDS=	libgnutls.so:security/gnutls \
		libspdlog.so:devel/spdlog \
		libfmt.so:devel/libfmt
RUN_DEPENDS=	openconnect:security/openconnect \
		vpnc-scripts>=0:sysutils/vpnc-scripts

USES=		cmake:insource compiler:c++11-lang pkgconfig qt:5
USE_GITHUB=	nodefault
GH_TUPLE=	qtproject:qt-solutions:a8dda66d:qtsolutions/external/src/qt-solutions-master

USE_QT=		buildtools_build concurrent core gui network qmake_build widgets
CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
PLIST_FILES=	bin/openconnect-gui

Lines 1-3 Link Here

(-)security/openconnect-gui/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1611572481	1	TIMESTAMP = 1613608872
2	SHA256 (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = 5f609e10eafc8885699e503c1dca9d9154d18741cfd09c1222d05b8af448c1d1	2	SHA256 (openconnect-gui-v1.5.3.tar.gz) = 339858502dfa808155c854b47da32a6c0e9ea315d028d2cadd9dcf84a952ae42
3	SIZE (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = 10026785	3	SIZE (openconnect-gui-v1.5.3.tar.gz) = 14672366
		4	SHA256 (qtproject-qt-solutions-a8dda66d_GH0.tar.gz) = 24d1a47ed0d2cc1f3a858c40c57482080cdbf88441386cfb0628b7e81de69800
		5	SIZE (qtproject-qt-solutions-a8dda66d_GH0.tar.gz) = 1410481

Added Link Here

(-)security/openconnect-gui/files/patch-CMake_Includes_ProjectDependencies.cmake (+11 lines)
1	--- CMake/Includes/ProjectDependencies.cmake.orig 2021-02-18 00:27:05 UTC
2	+++ CMake/Includes/ProjectDependencies.cmake
3	@@ -36,7 +36,7 @@ if(UNIX)
4	message(FATAL_ERROR "Libraru 'OpenConnect' not found! Install it vie e.g. 'brew install openconnect or 'dnf install openconnect'")
5	endif()
6
7	- #find_package(spdlog CONFIG REQUIRED)
8	+ find_package(spdlog CONFIG REQUIRED)
9
10	set(CMAKE_THREAD_PREFER_PTHREAD ON)
11	find_package(Threads REQUIRED)

Added Link Here

(-)security/openconnect-gui/files/patch-CMake_Includes_ProjectExternals.cmake (+10 lines)
1	--- CMake/Includes/ProjectExternals.cmake.orig 2018-03-25 21:49:15 UTC
2	+++ CMake/Includes/ProjectExternals.cmake
3	@@ -22,7 +22,6 @@ include(ExternalProject)
4
5	file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/external/include)
6
7	-include(ProjectExternals_spdlog)
8	include(ProjectExternals_qt-solutions)
9	if(MINGW)
10	include(ProjectExternals_openconnect)




--- CMake/Includes/ProjectExternals_qt-solutions.cmake.orig	2018-03-25 21:49:15 UTC
+++ CMake/Includes/ProjectExternals_qt-solutions.cmake
@@ -9,10 +9,7 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG}
     UPDATE_DISCONNECTED 0
     UPDATE_COMMAND ""
     
-    GIT_REPOSITORY https://code.qt.io/qt-solutions/qt-solutions.git
-    GIT_TAG ${qt-solutions-TAG}
-    GIT_SHALLOW 1
-    
+    SOURCE_DIR ${CMAKE_BINARY_DIR}/external/src/qt-solutions-master
     BUILD_IN_SOURCE 1
         
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different
@@ -21,14 +18,14 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG}
         CMAKE_COMMAND ${CMAKE_CROSS_COMMAND} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
 
     # Note: ninja-1.8.2 & cmake-3.10.2 failed in find/install this dependency wo next 2 lines :(
-    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/external/lib/libqtsingleapplication.a
-    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
+    BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/external/src/qt-solutions-master/libqtsingleapplication.a
+    INSTALL_COMMAND ${CMAKE_COMMAND} --build .
 )
 
 add_library(qt-solutions::qtsingleapplication STATIC IMPORTED)
 set_target_properties(qt-solutions::qtsingleapplication PROPERTIES
-    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/external/include"
-    IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/external/lib/libqtsingleapplication.a
+    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/external/src/qt-solutions-master/qtsingleapplication/src"
+    IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/external/src/qt-solutions-master/libqtsingleapplication.a
 )
 set_property(TARGET qt-solutions::qtsingleapplication PROPERTY
     DEPENDS qt-solutions-${qt-solutions-TAG}




--- CMake/Includes/ProjectSettings.cmake.orig	2021-02-18 00:06:43 UTC
+++ CMake/Includes/ProjectSettings.cmake
@@ -1,13 +1,5 @@
 set(PRODUCT_NAME_COPYRIGHT "Copyright (C) 2015-2016 Red Hat Inc.")
 
 option(PROJ_GNUTLS_DEBUG "Enable GnuTLS debug mode" OFF)
-if(MINGW)
-    option(PROJ_UAC_ON "Enable UAC (don't turn it off in production)" ON)
-
-    set(DEFAULT_VPNC_SCRIPT "vpnc-script.js")
-elseif(APPLE)
-    set(DEFAULT_VPNC_SCRIPT "../Resources/vpnc-script")
-else()
-    set(DEFAULT_VPNC_SCRIPT "/etc/vpnc/vpnc-script")




--- CMake/Includes/git_revision_main.cmake.orig	2021-02-18 00:09:34 UTC
is not recognized as a dependency and not generated before it is
#included from other code.

--- CMake/Includes/git_revision_main.cmake.orig	2016-08-28 20:11:26 UTC
+++ CMake/Includes/git_revision_main.cmake
@@ -4,9 +4,8 @@ if(IS_DIRECTORY ${PROJECT_SOURCE_DIR}/.git)
     find_package(Git 2.7 REQUIRED)
 endif()
 
-add_custom_target(git_revision ALL)
 add_custom_command(
-    TARGET git_revision
+#    TARGET git_revision
+    OUTPUT ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}.cpp
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src
 
     COMMAND ${CMAKE_COMMAND}
@@ -35,6 +34,11 @@ add_custom_command(
         -DAPPLE=${APPLE}
         -P ${CMAKE_SOURCE_DIR}/CMake/Includes/git_revision_generate.cmake
         COMMENT "Analyzing Git revision/tag changes..." VERBATIM
+)
+
+add_custom_target(
+        git_revision
+        DEPENDS ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}.cpp
 )
 
 # explicitly say that the executable depends on the git_revision

Added Link Here

(-)security/openconnect-gui/files/patch-src_FileLogger.h (+10 lines)
1	--- src/FileLogger.h.orig 2021-02-18 01:03:58 UTC
2	+++ src/FileLogger.h
3	@@ -1,6 +1,7 @@
4	#pragma once
5
6	#include "spdlog/spdlog.h"
7	+#include "spdlog/sinks/rotating_file_sink.h"
8
9	#include <QObject>
10	#include <QStandardPaths>

Added Link Here

(-)security/openconnect-gui/files/patch-src_dialog_mainwindow.cpp (+11 lines)
1	--- src/dialog/mainwindow.cpp.orig 2021-02-18 01:06:48 UTC
2	+++ src/dialog/mainwindow.cpp
3	@@ -934,7 +934,7 @@ void MainWindow::on_actionAbout_triggered()
4	txt += tr("<br>Based on");
5	txt += tr("<br>- <a href=\"https://www.infradead.org/openconnect\">OpenConnect</a> ") + QLatin1String(openconnect_get_version());
6	txt += tr("<br>- <a href=\"https://www.gnutls.org\">GnuTLS</a> v") + QLatin1String(gnutls_check_version(nullptr));
7	- txt += tr("<br>- <a href=\"https://github.com/gabime/spdlog\">spdlog</a> v") + QLatin1String(SPDLOG_VERSION);
8	+ txt += tr("<br>- <a href=\"https://github.com/gabime/spdlog\">spdlog</a>");
9	txt += tr("<br>- <a href=\"https://www.qt.io\">Qt</a> v%1").arg(QT_VERSION_STR);
10	txt += tr("<br><br>%1<br>").arg(appCopyright);
11	txt += tr("<br><i>%1</i> comes with ABSOLUTELY NO WARRANTY. This is free software, "

Removed Link Here

(-)security/openconnect-gui/files/patch-src_vpninfo.cpp (-11 lines)
1	--- src/vpninfo.cpp.orig 2016-09-21 11:15:03 UTC
2	+++ src/vpninfo.cpp
3	@@ -427,6 +427,8 @@ int VpnInfo::connect()
4	const QString osName{"mac-intel"};
5	#elif defined Q_OS_LINUX
6	const QString osName = QString("linux%1").arg(QSysInfo::buildCpuArchitecture() == "i386" ? "" : "-64").toStdString().c_str();
7	+#elif defined Q_OS_FREEBSD
8	+ const QString osName = QString("freebsd%1").arg(QSysInfo::buildCpuArchitecture() == "i386" ? "" : "-64").toStdString().c_str();
9	#else
10	#error Define OS string of other platforms...
11	#endif

Removed Link Here

(-)security/openconnect-gui/files/patch-src_vpninfo.h (-11 lines)
1	--- src/vpninfo.h.orig 2016-08-28 20:11:26 UTC
2	+++ src/vpninfo.h
3	@@ -23,7 +23,7 @@
4	#ifdef _WIN32
5	#include <winsock2.h>
6	#endif
7	-#ifdef __linux__
8	+#if defined(__linux__) \|\| defined(__FreeBSD__)
9	#define SOCKET int
10	#endif
11

Return to bug 253609

Lines 2-10 Link Here

(-)security/openconnect-gui/Makefile (-6 / +8 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= openconnect-gui	4	PORTNAME= openconnect-gui
5	PORTVERSION= 1.4.1	5	PORTVERSION= 1.5.3
6	DISTVERSIONPREFIX=v	6	DISTVERSIONPREFIX=v
7	PORTREVISION= 4	7	MASTER_SITES= https://gitlab.com/openconnect/openconnect-gui/-/archive/v${PORTVERSION}/
		8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
8	CATEGORIES= security net-vpn	9	CATEGORIES= security net-vpn
9		10
10	MAINTAINER= pkubaj@FreeBSD.org	11	MAINTAINER= pkubaj@FreeBSD.org
Lines 14-27 LICENSE= GPLv2 Link Here
14	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	15	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
15		16
16	BUILD_DEPENDS= openconnect:security/openconnect	17	BUILD_DEPENDS= openconnect:security/openconnect
17	LIB_DEPENDS= libgnutls.so:security/gnutls	18	LIB_DEPENDS= libgnutls.so:security/gnutls \
		19	libspdlog.so:devel/spdlog \
		20	libfmt.so:devel/libfmt
18	RUN_DEPENDS= openconnect:security/openconnect \	21	RUN_DEPENDS= openconnect:security/openconnect \
19	vpnc-scripts>=0:sysutils/vpnc-scripts	22	vpnc-scripts>=0:sysutils/vpnc-scripts
20		23
21	USES= cmake:insource compiler:c++11-lang pkgconfig qt:5	24	USES= cmake:insource compiler:c++11-lang pkgconfig qt:5
22	USE_GITHUB= yes	25	USE_GITHUB= nodefault
23	GH_ACCOUNT= ${PORTNAME:C/-gui//}	26	GH_TUPLE= qtproject:qt-solutions:a8dda66d:qtsolutions/external/src/qt-solutions-master
24
25	USE_QT= buildtools_build concurrent core gui network qmake_build widgets	27	USE_QT= buildtools_build concurrent core gui network qmake_build widgets
26	CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release	28	CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
27	PLIST_FILES= bin/openconnect-gui	29	PLIST_FILES= bin/openconnect-gui

Added Link Here

(-)security/openconnect-gui/files/patch-CMake_Includes_ProjectExternals__qt-solutions.cmake (+33 lines)
1	--- CMake/Includes/ProjectExternals_qt-solutions.cmake.orig 2018-03-25 21:49:15 UTC
2	+++ CMake/Includes/ProjectExternals_qt-solutions.cmake
3	@@ -9,10 +9,7 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG}
4	UPDATE_DISCONNECTED 0
5	UPDATE_COMMAND ""
6
7	- GIT_REPOSITORY https://code.qt.io/qt-solutions/qt-solutions.git
8	- GIT_TAG ${qt-solutions-TAG}
9	- GIT_SHALLOW 1
10	-
11	+ SOURCE_DIR ${CMAKE_BINARY_DIR}/external/src/qt-solutions-master
12	BUILD_IN_SOURCE 1
13
14	PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different
15	@@ -21,14 +18,14 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG}
16	CMAKE_COMMAND ${CMAKE_CROSS_COMMAND} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
17
18	# Note: ninja-1.8.2 & cmake-3.10.2 failed in find/install this dependency wo next 2 lines :(
19	- BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/external/lib/libqtsingleapplication.a
20	- INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
21	+ BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/external/src/qt-solutions-master/libqtsingleapplication.a
22	+ INSTALL_COMMAND ${CMAKE_COMMAND} --build .
23	)
24
25	add_library(qt-solutions::qtsingleapplication STATIC IMPORTED)
26	set_target_properties(qt-solutions::qtsingleapplication PROPERTIES
27	- INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/external/include"
28	- IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/external/lib/libqtsingleapplication.a
29	+ INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/external/src/qt-solutions-master/qtsingleapplication/src"
30	+ IMPORTED_LOCATION ${CMAKE_BINARY_DIR}/external/src/qt-solutions-master/libqtsingleapplication.a
31	)
32	set_property(TARGET qt-solutions::qtsingleapplication PROPERTY
33	DEPENDS qt-solutions-${qt-solutions-TAG}

Lines 1-14 Link Here

(-)security/openconnect-gui/files/patch-CMake_Includes_ProjectSettings.cmake (-7 / +5 lines)
1	--- CMakeLists.txt.orig 2017-07-18 18:47:18.951816000 +0000	1	--- CMake/Includes/ProjectSettings.cmake.orig 2021-02-18 00:06:43 UTC
2	+++ CMakeLists.txt 2017-07-18 18:49:23.953701000 +0000	2	+++ CMake/Includes/ProjectSettings.cmake
3	@@ -13,15 +13,7 @@ set(PRODUCT_NAME_COMPANY_DOMAIN "redhat.com")	3	@@ -1,13 +1,5 @@
4	set(PRODUCT_NAME_COPYRIGHT "Copyright (C) 2015-2016 Red Hat Inc.")
5
6	option(PROJ_GNUTLS_DEBUG "Enable GnuTLS debug mode" OFF)	4	option(PROJ_GNUTLS_DEBUG "Enable GnuTLS debug mode" OFF)
7	-if(WIN32 AND MINGW)	5	-if(MINGW)
8	- option(PROJ_UAC_ON "Enable UAC (don't turn it off in production)" ON)	6	- option(PROJ_UAC_ON "Enable UAC (don't turn it off in production)" ON)
9	-	7	-
10	- set(DEFAULT_VPNC_SCRIPT "vpnc-script.js")	8	- set(DEFAULT_VPNC_SCRIPT "vpnc-script.js")
11	-else(APPLE)	9	-elseif(APPLE)
12	- set(DEFAULT_VPNC_SCRIPT "../Resources/vpnc-script")	10	- set(DEFAULT_VPNC_SCRIPT "../Resources/vpnc-script")
13	-else()	11	-else()
14	- set(DEFAULT_VPNC_SCRIPT "/etc/vpnc/vpnc-script")	12	- set(DEFAULT_VPNC_SCRIPT "/etc/vpnc/vpnc-script")

Lines 1-28 Link Here

(-)security/openconnect-gui/files/patch-CMake_Includes_git__revision__main.cmake (-12 / +9 lines)
1	Has been submitted upstream. With ninja, the generated file	1	--- CMake/Includes/git_revision_main.cmake.orig 2021-02-18 00:09:34 UTC
2	is not recognized as a dependency and not generated before it is
3	#included from other code.
4
5	--- CMake/Includes/git_revision_main.cmake.orig 2016-08-28 20:11:26 UTC
6	+++ CMake/Includes/git_revision_main.cmake	2	+++ CMake/Includes/git_revision_main.cmake
7	@@ -4,9 +4,9 @@ if(IS_DIRECTORY ${PROJECT_SOURCE_DIR}/.git)	3	@@ -4,9 +4,8 @@ if(IS_DIRECTORY ${PROJECT_SOURCE_DIR}/.git)
8	find_package(Git 2.7 REQUIRED)	4	find_package(Git 2.7 REQUIRED)
9	endif()	5	endif()
10		6
11	-add_custom_target(git_revision ALL)	7	-add_custom_target(git_revision ALL)
12	add_custom_command(	8	add_custom_command(
13	- TARGET git_revision	9	- TARGET git_revision
14	+# TARGET git_revision
15	+ OUTPUT ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}.cpp	10	+ OUTPUT ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}.cpp
16	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src	11	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src
17		12
18	COMMAND ${CMAKE_COMMAND}	13	COMMAND ${CMAKE_COMMAND}
19	@@ -35,5 +35,8 @@ add_custom_command(	14	@@ -35,6 +34,11 @@ add_custom_command(
		15	-DAPPLE=${APPLE}
20	-P ${CMAKE_SOURCE_DIR}/CMake/Includes/git_revision_generate.cmake	16	-P ${CMAKE_SOURCE_DIR}/CMake/Includes/git_revision_generate.cmake
21	COMMENT "Analyzing Git revision/tag changes..." VERBATIM	17	COMMENT "Analyzing Git revision/tag changes..." VERBATIM
22	)	18	+)
23	-	19	+
24	+add_custom_target(	20	+add_custom_target(
25	+ git_revision	21	+ git_revision
26	+ DEPENDS ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}.cpp	22	+ DEPENDS ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}.cpp
27	+)	23	)
28	add_dependencies(${PROJECT_NAME} git_revision)	24
		25	# explicitly say that the executable depends on the git_revision