Attachment #212978 for bug #245280

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

Lines 11788-11794 Link Here

(-)MOVED (-1 lines)
11788	games/kardsgt\|\|2019-03-16\|Has expired: Qt4 has been EOL since december 2015	11788	games/kardsgt\|\|2019-03-16\|Has expired: Qt4 has been EOL since december 2015
11789	games/kcheckers\|\|2019-03-16\|Has expired: Qt4 has been EOL since december 2015	11789	games/kcheckers\|\|2019-03-16\|Has expired: Qt4 has been EOL since december 2015
11790	games/openpref\|\|2019-03-16\|Has expired: Qt4 has been EOL since december 2015	11790	games/openpref\|\|2019-03-16\|Has expired: Qt4 has been EOL since december 2015
11791	games/pokerth\|\|2019-03-16\|Has expired: Qt4 has been EOL since december 2015
11792	games/qgo\|\|2019-03-16\|Has expired: Qt4 has been EOL since december 2015	11791	games/qgo\|\|2019-03-16\|Has expired: Qt4 has been EOL since december 2015
11793	games/qtads\|\|2019-03-16\|Has expired: Qt4 has been EOL since december 2015	11792	games/qtads\|\|2019-03-16\|Has expired: Qt4 has been EOL since december 2015
11794	games/quackle\|\|2019-03-16\|Has expired: Qt4 has been EOL since december 2015	11793	games/quackle\|\|2019-03-16\|Has expired: Qt4 has been EOL since december 2015

Lines 701-706 Link Here

(-)games/Makefile (+1 lines)
701	SUBDIR += pmars	701	SUBDIR += pmars
702	SUBDIR += pmars-sdl	702	SUBDIR += pmars-sdl
703	SUBDIR += poker-eval	703	SUBDIR += poker-eval
		704	SUBDIR += pokerth
704	SUBDIR += polyglot	705	SUBDIR += polyglot
705	SUBDIR += pongix	706	SUBDIR += pongix
706	SUBDIR += ponscripter-sekai	707	SUBDIR += ponscripter-sekai





PORTNAME=	pokerth
PORTVERSION=	1.1.2
PORTREVISION=	9
CATEGORIES=	games
MASTER_SITES=	SF

MAINTAINER=	tobias.rehbein@web.de
COMMENT=	Poker game written in C++/Qt

LICENSE=	AGPLv3+
LICENSE_FILE=	${WRKSRC}/COPYING

DEPRECATED=		Qt4 has been EOL since december 2015
EXPIRATION_DATE=	2019-03-15

BROKEN_SSL=	openssl111
BROKEN_SSL_REASON=	Does not build with OpenSSL 1.1, variable has incomplete type 'EVP_CIPHER_CTX'

LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
		libmikmod.so:audio/libmikmod \
		libgnutls.so:security/gnutls \

		libtinyxml.so:textproc/tinyxml \
		libprotobuf.so:devel/protobuf
BUILD_DEPENDS=	${LOCALBASE}/include/libircclient.h:irc/libircclient \
		${LOCALBASE}/include/websocketpp/client.hpp:devel/websocketpp \
		protoc:devel/protobuf

USES=		compiler:c++11-lang iconv gmake qmake qt:5 sdl sqlite ssl
USE_CXXSTD=	c++11
USE_QT=		buildtools_build gui network sql sql-sqlite3 widgets
		moc_build rcc_build uic_build
USE_SDL=	mixer

QMAKE_SOURCE_PATH=	pokerth.pro

OPTIONS_DEFINE=	DOCS

.include <bsd.port.options.mk>

.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base
BROKEN=		${BROKEN_SSL_REASON}
.endif

post-patch:
	@${REINPLACE_CMD} -E \

Line 0 Link Here

(-)/home/blabber/data/hacks/freebsd-ports-wip/games/pokerth/files/patch-pokerth__lib.pro (+11 lines)
	1	--- pokerth_lib.pro.orig 2020-04-01 19:13:37 UTC
	2	+++ pokerth_lib.pro
	3	@@ -31,7 +31,7 @@ INCLUDEPATH += . \
	4	src/engine/network_engine \
	5	src/config \
	6	src/core \
	7	- src/third_party/websocketpp
	8	+ $${PREFIX}/include/websocketpp
	9
	10	DEPENDPATH += . \
	11	src \

Lines 1-6 Link Here

(-)/home/blabber/data/hacks/freebsd-ports-wip/games/pokerth/files/patch-pokerth_server.pro (-2 / +2 lines)
1	--- pokerth_server.pro.orig 2014-01-10 21:18:20 UTC	1	--- pokerth_server.pro.orig 2017-08-16 12:24:03 UTC
2	+++ pokerth_server.pro	2	+++ pokerth_server.pro
3	@@ -264,7 +264,7 @@ unix : !mac {	3	@@ -288,7 +288,7 @@ unix : !mac {
4	-lprotobuf	4	-lprotobuf
5	LIBS += -lgsasl	5	LIBS += -lgsasl
6	!isEmpty( BSD ): isEmpty( kFreeBSD ){	6	!isEmpty( BSD ): isEmpty( kFreeBSD ){




--- src/core/common/crypthelper.cpp.orig	2017-08-16 12:24:03 UTC
+++ src/core/common/crypthelper.cpp
@@ -291,22 +291,33 @@ CryptHelper::AES128Encrypt(const unsigned char *keyDat
 		outCipher.resize(cipherSize);
 
 #ifdef HAVE_OPENSSL
-		EVP_CIPHER_CTX encryptCtx;
-		EVP_CIPHER_CTX_init(&encryptCtx);
+	#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+		EVP_CIPHER_CTX *encryptCtx = EVP_CIPHER_CTX_new();  
+	#else
+		EVP_CIPHER_CTX _encryptCtx; 
+		EVP_CIPHER_CTX *encryptCtx; 
+		encryptCtx = &_encryptCtx; 
+	#endif // OPENSSL_VERSION_NUMBER >= 0x10100000L 
+
+		EVP_CIPHER_CTX_init(encryptCtx);
 		int outCipherSize = cipherSize;
 
-		int success = EVP_EncryptInit(&encryptCtx, EVP_aes_128_cbc(), key, iv);
-		EVP_CIPHER_CTX_set_padding(&encryptCtx, 0);
+		int success = EVP_EncryptInit(encryptCtx, EVP_aes_128_cbc(), key, iv);
+		EVP_CIPHER_CTX_set_padding(encryptCtx, 0);
 		if (success) {
-			success = EVP_EncryptUpdate(&encryptCtx, &outCipher[0], &outCipherSize, paddedPlainStr, paddedPlainSize);
+			success = EVP_EncryptUpdate(encryptCtx, &outCipher[0], &outCipherSize, paddedPlainStr, paddedPlainSize);
 
 			if (success && outCipherSize) {
 				// Since padding is off, this will not modify the cipher. However, parameters need to be set.
-				EVP_EncryptFinal(&encryptCtx, &outCipher[0], &outCipherSize);
+				EVP_EncryptFinal(encryptCtx, &outCipher[0], &outCipherSize);
 				retVal = true;
 			}
 		} else
 			outCipher.clear();
+		
+	#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+		EVP_CIPHER_CTX_free(encryptCtx);
+	#endif // OPENSSL_VERSION_NUMBER >= 0x10100000L 
 #else
 		gcry_cipher_hd_t hd;
 		gcry_error_t err = gcry_cipher_open(&hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CBC, 0);
@@ -338,22 +349,33 @@ CryptHelper::AES128Decrypt(const unsigned char *keyDat
 		BytesToKey(keyData, keySize, key, iv);
 		outPlain.resize(cipherSize);
 #ifdef HAVE_OPENSSL
-		EVP_CIPHER_CTX decryptCtx;
-		EVP_CIPHER_CTX_init(&decryptCtx);
+	#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+		EVP_CIPHER_CTX *decryptCtx = EVP_CIPHER_CTX_new();  
+	#else
+		EVP_CIPHER_CTX _decryptCtx; 
+		EVP_CIPHER_CTX *decryptCtx; 
+		decryptCtx = &_decryptCtx; 
+	#endif // OPENSSL_VERSION_NUMBER >= 0x10100000L 
+
+		EVP_CIPHER_CTX_init(decryptCtx);
 		int outPlainSize = cipherSize;
 
-		int success = EVP_DecryptInit(&decryptCtx, EVP_aes_128_cbc(), key, iv);
-		EVP_CIPHER_CTX_set_padding(&decryptCtx, 0);
+		int success = EVP_DecryptInit(decryptCtx, EVP_aes_128_cbc(), key, iv);
+		EVP_CIPHER_CTX_set_padding(decryptCtx, 0);
 		if (success) {
-			success = EVP_DecryptUpdate(&decryptCtx, (unsigned char *)&outPlain[0], &outPlainSize, cipher, cipherSize);
+			success = EVP_DecryptUpdate(decryptCtx, (unsigned char *)&outPlain[0], &outPlainSize, cipher, cipherSize);
 
 			if (success && outPlainSize) {
 				// Since padding is off, this will not modify the plain text. However, parameters need to be set.
-				EVP_DecryptFinal(&decryptCtx, (unsigned char *)outPlain.c_str(), &outPlainSize);
+				EVP_DecryptFinal(decryptCtx, (unsigned char *)outPlain.c_str(), &outPlainSize);
 				retVal = true;
 			}
 		} else
 			outPlain.clear();
+		
+	#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+		EVP_CIPHER_CTX_free(decryptCtx);
+	#endif // OPENSSL_VERSION_NUMBER >= 0x10100000L 
 #else
 		gcry_cipher_hd_t hd;
 		gcry_error_t err = gcry_cipher_open(&hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CBC, 0);

Lines 1-5 Link Here

(-)/home/blabber/data/hacks/freebsd-ports-wip/games/pokerth/pkg-descr (-3 / +3 lines)
1	PokerTH is a poker game written in C++/QT4. You can play the popular	1	PokerTH is a poker game written in C++/Qt. You can play the popular
2	"Texas Hold'em" poker variant against up to six computer-opponents	2	"Texas Hold'em" poker variant against up to nine computer-opponents
3	or play network games with people all over the world.	3	or play internet games with people all over the world.
4		4
5	WWW: https://www.pokerth.net/	5	WWW: https://www.pokerth.net/

Return to bug 245280

Lines 3-24 Link Here

(-)/home/blabber/data/hacks/freebsd-ports-wip/games/pokerth/Makefile (-16 / +6 lines)
3		3
4	PORTNAME= pokerth	4	PORTNAME= pokerth
5	PORTVERSION= 1.1.2	5	PORTVERSION= 1.1.2
6	PORTREVISION= 8	6	PORTREVISION= 9
7	CATEGORIES= games	7	CATEGORIES= games
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9		9
10	MAINTAINER= madpilot@FreeBSD.org	10	MAINTAINER= tobias.rehbein@web.de
11	COMMENT= Poker game written in C++/Qt4	11	COMMENT= Poker game written in C++/Qt
12		12
13	LICENSE= AGPLv3+	13	LICENSE= AGPLv3+
14	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
15		15
16	DEPRECATED= Qt4 has been EOL since december 2015
17	EXPIRATION_DATE= 2019-03-15
18
19	BROKEN_SSL= openssl111
20	BROKEN_SSL_REASON= Does not build with OpenSSL 1.1, variable has incomplete type 'EVP_CIPHER_CTX'
21
22	LIB_DEPENDS= libboost_thread.so:devel/boost-libs \	16	LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
23	libmikmod.so:audio/libmikmod \	17	libmikmod.so:audio/libmikmod \
24	libgnutls.so:security/gnutls \	18	libgnutls.so:security/gnutls \
Lines 27-38 Link Here
27	libtinyxml.so:textproc/tinyxml \	21	libtinyxml.so:textproc/tinyxml \
28	libprotobuf.so:devel/protobuf	22	libprotobuf.so:devel/protobuf
29	BUILD_DEPENDS= ${LOCALBASE}/include/libircclient.h:irc/libircclient \	23	BUILD_DEPENDS= ${LOCALBASE}/include/libircclient.h:irc/libircclient \
		24	${LOCALBASE}/include/websocketpp/client.hpp:devel/websocketpp \
30	protoc:devel/protobuf	25	protoc:devel/protobuf
31		26
32	USES= compiler:c++11-lang iconv gmake qmake qt:4 sqlite ssl	27	USES= compiler:c++11-lang iconv gmake qmake qt:5 sdl sqlite ssl
33	USE_CXXSTD= c++11	28	USE_CXXSTD= c++11
34	USE_QT= gui corelib network sql sql-sqlite3 \	29	USE_QT= buildtools_build gui network sql sql-sqlite3 widgets
35	moc_build rcc_build uic_build
36	USE_SDL= mixer	30	USE_SDL= mixer
37		31
38	QMAKE_SOURCE_PATH= pokerth.pro	32	QMAKE_SOURCE_PATH= pokerth.pro
Lines 44-53 Link Here
44	OPTIONS_DEFINE= DOCS	38	OPTIONS_DEFINE= DOCS
45		39
46	.include <bsd.port.options.mk>	40	.include <bsd.port.options.mk>
47
48	.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base
49	BROKEN= ${BROKEN_SSL_REASON}
50	.endif
51		41
52	post-patch:	42	post-patch:
53	@${REINPLACE_CMD} -E \	43	@${REINPLACE_CMD} -E \

Line 0 Link Here

(-)/home/blabber/data/hacks/freebsd-ports-wip/games/pokerth/files/patch-src_core_common_crypthelper.cpp (+82 lines)
		1	--- src/core/common/crypthelper.cpp.orig 2017-08-16 12:24:03 UTC
		2	+++ src/core/common/crypthelper.cpp
		3	@@ -291,22 +291,33 @@ CryptHelper::AES128Encrypt(const unsigned char *keyDat
		4	outCipher.resize(cipherSize);
		5
		6	#ifdef HAVE_OPENSSL
		7	- EVP_CIPHER_CTX encryptCtx;
		8	- EVP_CIPHER_CTX_init(&encryptCtx);
		9	+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L
		10	+ EVP_CIPHER_CTX *encryptCtx = EVP_CIPHER_CTX_new();
		11	+ #else
		12	+ EVP_CIPHER_CTX _encryptCtx;
		13	+ EVP_CIPHER_CTX *encryptCtx;
		14	+ encryptCtx = &_encryptCtx;
		15	+ #endif // OPENSSL_VERSION_NUMBER >= 0x10100000L
		16	+
		17	+ EVP_CIPHER_CTX_init(encryptCtx);
		18	int outCipherSize = cipherSize;
		19
		20	- int success = EVP_EncryptInit(&encryptCtx, EVP_aes_128_cbc(), key, iv);
		21	- EVP_CIPHER_CTX_set_padding(&encryptCtx, 0);
		22	+ int success = EVP_EncryptInit(encryptCtx, EVP_aes_128_cbc(), key, iv);
		23	+ EVP_CIPHER_CTX_set_padding(encryptCtx, 0);
		24	if (success) {
		25	- success = EVP_EncryptUpdate(&encryptCtx, &outCipher[0], &outCipherSize, paddedPlainStr, paddedPlainSize);
		26	+ success = EVP_EncryptUpdate(encryptCtx, &outCipher[0], &outCipherSize, paddedPlainStr, paddedPlainSize);
		27
		28	if (success && outCipherSize) {
		29	// Since padding is off, this will not modify the cipher. However, parameters need to be set.
		30	- EVP_EncryptFinal(&encryptCtx, &outCipher[0], &outCipherSize);
		31	+ EVP_EncryptFinal(encryptCtx, &outCipher[0], &outCipherSize);
		32	retVal = true;
		33	}
		34	} else
		35	outCipher.clear();
		36	+
		37	+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L
		38	+ EVP_CIPHER_CTX_free(encryptCtx);
		39	+ #endif // OPENSSL_VERSION_NUMBER >= 0x10100000L
		40	#else
		41	gcry_cipher_hd_t hd;
		42	gcry_error_t err = gcry_cipher_open(&hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CBC, 0);
		43	@@ -338,22 +349,33 @@ CryptHelper::AES128Decrypt(const unsigned char *keyDat
		44	BytesToKey(keyData, keySize, key, iv);
		45	outPlain.resize(cipherSize);
		46	#ifdef HAVE_OPENSSL
		47	- EVP_CIPHER_CTX decryptCtx;
		48	- EVP_CIPHER_CTX_init(&decryptCtx);
		49	+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L
		50	+ EVP_CIPHER_CTX *decryptCtx = EVP_CIPHER_CTX_new();
		51	+ #else
		52	+ EVP_CIPHER_CTX _decryptCtx;
		53	+ EVP_CIPHER_CTX *decryptCtx;
		54	+ decryptCtx = &_decryptCtx;
		55	+ #endif // OPENSSL_VERSION_NUMBER >= 0x10100000L
		56	+
		57	+ EVP_CIPHER_CTX_init(decryptCtx);
		58	int outPlainSize = cipherSize;
		59
		60	- int success = EVP_DecryptInit(&decryptCtx, EVP_aes_128_cbc(), key, iv);
		61	- EVP_CIPHER_CTX_set_padding(&decryptCtx, 0);
		62	+ int success = EVP_DecryptInit(decryptCtx, EVP_aes_128_cbc(), key, iv);
		63	+ EVP_CIPHER_CTX_set_padding(decryptCtx, 0);
		64	if (success) {
65	- success = EVP_DecryptUpdate(&decryptCtx, (unsigned char *)&outPlain[0], &outPlainSize, cipher, cipherSize);
66	+ success = EVP_DecryptUpdate(decryptCtx, (unsigned char *)&outPlain[0], &outPlainSize, cipher, cipherSize);
67
68	if (success && outPlainSize) {
69	// Since padding is off, this will not modify the plain text. However, parameters need to be set.
70	- EVP_DecryptFinal(&decryptCtx, (unsigned char *)outPlain.c_str(), &outPlainSize);
71	+ EVP_DecryptFinal(decryptCtx, (unsigned char *)outPlain.c_str(), &outPlainSize);
72	retVal = true;
73	}
74	} else
75	outPlain.clear();
76	+
77	+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L
78	+ EVP_CIPHER_CTX_free(decryptCtx);
79	+ #endif // OPENSSL_VERSION_NUMBER >= 0x10100000L
80	#else
81	gcry_cipher_hd_t hd;
82	gcry_error_t err = gcry_cipher_open(&hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CBC, 0);