Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 10 Dec 2016 16:10:43 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r428305 - in head/multimedia/oscam: . files
Message-ID:  <201612101610.uBAGAhKQ029885@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Sat Dec 10 16:10:43 2016
New Revision: 428305
URL: https://svnweb.freebsd.org/changeset/ports/428305

Log:
  multimedia/oscam: Fix build without SSLv3
  
    - Add patch to fix build without SSLv3
    - Register OpenSSL dependency in USES

Added:
  head/multimedia/oscam/files/patch-module-webif-lib.c   (contents, props changed)
Modified:
  head/multimedia/oscam/Makefile

Modified: head/multimedia/oscam/Makefile
==============================================================================
--- head/multimedia/oscam/Makefile	Sat Dec 10 16:04:43 2016	(r428304)
+++ head/multimedia/oscam/Makefile	Sat Dec 10 16:10:43 2016	(r428305)
@@ -14,7 +14,7 @@ LICENSE=	GPLv3
 
 BROKEN_powerpc64=	Does not build
 
-USES=		gmake tar:bzip2
+USES=		gmake ssl tar:bzip2
 USE_RC_SUBR=	oscam
 MAKE_ARGS+=	HOSTCC=clang CC=clang
 

Added: head/multimedia/oscam/files/patch-module-webif-lib.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/oscam/files/patch-module-webif-lib.c	Sat Dec 10 16:10:43 2016	(r428305)
@@ -0,0 +1,18 @@
+--- module-webif-lib.c.orig	2015-06-30 13:06:41 UTC
++++ module-webif-lib.c
+@@ -864,6 +864,7 @@ SSL_CTX *SSL_Webif_Init(void)
+ 	CRYPTO_set_dynlock_lock_callback(SSL_dyn_lock_function);
+ 	CRYPTO_set_dynlock_destroy_callback(SSL_dyn_destroy_function);
+ 
++#ifndef OPENSSL_NO_SSL3
+ 	if(cfg.http_force_sslv3)
+ 	{
+ 		ctx = SSL_CTX_new(SSLv3_server_method());
+@@ -876,6 +877,7 @@ SSL_CTX *SSL_Webif_Init(void)
+ 		SSL_CTX_set_cipher_list(ctx, SSL_TXT_RC4);
+ 	}
+ 	else
++#endif
+ 		{ ctx = SSL_CTX_new(SSLv23_server_method()); }
+ 
+ 	char path[128];



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612101610.uBAGAhKQ029885>