Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Apr 2017 17:23:23 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r437947 - in head/security/sslsplit: . files
Message-ID:  <201704071723.v37HNNY0065638@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Fri Apr  7 17:23:23 2017
New Revision: 437947
URL: https://svnweb.freebsd.org/changeset/ports/437947

Log:
  security/sslsplit: fix build with libressl-devel
  
  While here, add LICENSE, USES=ssl, strip the binary
  
  PR:		216846
  Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl>

Added:
  head/security/sslsplit/files/patch-ssl.c   (contents, props changed)
Modified:
  head/security/sslsplit/Makefile

Modified: head/security/sslsplit/Makefile
==============================================================================
--- head/security/sslsplit/Makefile	Fri Apr  7 16:28:17 2017	(r437946)
+++ head/security/sslsplit/Makefile	Fri Apr  7 17:23:23 2017	(r437947)
@@ -1,20 +1,24 @@
-# Created by: Steve Wills <swills@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	sslsplit
 PORTVERSION=	0.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://mirror.roe.ch/rel/sslsplit/
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Transparent and scalable SSL/TLS interception
 
+LICENSE=	BSD2CLAUSE
+
 LIB_DEPENDS=	libevent.so:devel/libevent
 
-USES=		gmake pkgconfig tar:bzip2 uidfix
+USES=		gmake pkgconfig tar:bzip2 uidfix ssl
 MAKEFILE=	GNUmakefile
 MAKE_ENV=	DESTDIR=${STAGEDIR} MANDIR=man INSTALLUID=${UID} INSTALLGID=${GID}
 PLIST_FILES=	bin/sslsplit man/man1/sslsplit.1.gz
 
+post-stage:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sslsplit
+
 .include <bsd.port.mk>

Added: head/security/sslsplit/files/patch-ssl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/sslsplit/files/patch-ssl.c	Fri Apr  7 17:23:23 2017	(r437947)
@@ -0,0 +1,24 @@
+--- ssl.c.orig	2016-03-27 13:46:35 UTC
++++ ssl.c
+@@ -477,15 +477,14 @@ ssl_ssl_state_to_str(SSL *ssl)
+ 	int rv;
+ 
+ 	rv = asprintf(&str, "%08x = %s%s%s%04x = %s (%s) [%s]",
+-	              ssl->state,
+-	              (ssl->state & SSL_ST_CONNECT) ? "SSL_ST_CONNECT|" : "",
+-	              (ssl->state & SSL_ST_ACCEPT) ? "SSL_ST_ACCEPT|" : "",
+-	              (ssl->state & SSL_ST_BEFORE) ? "SSL_ST_BEFORE|" : "",
+-	              ssl->state & SSL_ST_MASK,
++	              SSL_get_state(ssl),
++	              (SSL_get_state(ssl) & SSL_ST_CONNECT) ? "SSL_ST_CONNECT|" : "",
++	              (SSL_get_state(ssl) & SSL_ST_ACCEPT) ? "SSL_ST_ACCEPT|" : "",
++	              (SSL_get_state(ssl) & SSL_ST_BEFORE) ? "SSL_ST_BEFORE|" : "",
++	              SSL_get_state(ssl) & SSL_ST_MASK,
+ 	              SSL_state_string(ssl),
+ 	              SSL_state_string_long(ssl),
+-	              (ssl->type == SSL_ST_CONNECT) ? "connect socket"
+-	                                            : "accept socket");
++	              "");
+ 
+ 	return (rv < 0) ? NULL : str;
+ }



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