From owner-svn-ports-head@freebsd.org  Sat Dec 10 16:10:44 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93A94C7075B;
 Sat, 10 Dec 2016 16:10:44 +0000 (UTC)
 (envelope-from brnrd@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 mx1.freebsd.org (Postfix) with ESMTPS id 5388C188C;
 Sat, 10 Dec 2016 16:10:44 +0000 (UTC)
 (envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBAGAhUU029887;
 Sat, 10 Dec 2016 16:10:43 GMT (envelope-from brnrd@FreeBSD.org)
Received: (from brnrd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBAGAhKQ029885;
 Sat, 10 Dec 2016 16:10:43 GMT (envelope-from brnrd@FreeBSD.org)
Message-Id: <201612101610.uBAGAhKQ029885@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brnrd set sender to
 brnrd@FreeBSD.org using -f
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Sat, 10 Dec 2016 16:10:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r428305 - in head/multimedia/oscam: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Dec 2016 16:10:44 -0000

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];