From owner-svn-ports-head@freebsd.org Fri May 8 15:51:33 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E72632DA716; Fri, 8 May 2020 15:51:33 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49JZZF5slbz3xsn; Fri, 8 May 2020 15:51:33 +0000 (UTC) (envelope-from ehaupt@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C4B424C1F; Fri, 8 May 2020 15:51:33 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 048FpXTC003204; Fri, 8 May 2020 15:51:33 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 048FpXRt003201; Fri, 8 May 2020 15:51:33 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <202005081551.048FpXRt003201@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Fri, 8 May 2020 15:51:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534409 - in head/security/proxytunnel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ehaupt X-SVN-Commit-Paths: in head/security/proxytunnel: . files X-SVN-Commit-Revision: 534409 X-SVN-Commit-Repository: ports 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.32 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2020 15:51:34 -0000 Author: ehaupt Date: Fri May 8 15:51:32 2020 New Revision: 534409 URL: https://svnweb.freebsd.org/changeset/ports/534409 Log: Update to 1.10.20200507 Modified: head/security/proxytunnel/Makefile head/security/proxytunnel/distinfo head/security/proxytunnel/files/patch-Makefile head/security/proxytunnel/files/patch-ptstream.c Modified: head/security/proxytunnel/Makefile ============================================================================== --- head/security/proxytunnel/Makefile Fri May 8 15:34:01 2020 (r534408) +++ head/security/proxytunnel/Makefile Fri May 8 15:51:32 2020 (r534409) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= proxytunnel -PORTVERSION= 1.9.1 +PORTVERSION= 1.10.20200507 +DISTVERSIONPREFIX= v CATEGORIES= security MAINTAINER= ehaupt@FreeBSD.org Modified: head/security/proxytunnel/distinfo ============================================================================== --- head/security/proxytunnel/distinfo Fri May 8 15:34:01 2020 (r534408) +++ head/security/proxytunnel/distinfo Fri May 8 15:51:32 2020 (r534409) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471969383 -SHA256 (proxytunnel-proxytunnel-1.9.1_GH0.tar.gz) = 4a68d2c33bf53c290346b0a76e2c3d25556e954ba346be68cf65ae8f73ae8007 -SIZE (proxytunnel-proxytunnel-1.9.1_GH0.tar.gz) = 48025 +TIMESTAMP = 1588952210 +SHA256 (proxytunnel-proxytunnel-v1.10.20200507_GH0.tar.gz) = 6495430e9c60d3df53824a7a0f3bea9953a89d083a3718c72db04dc4d40755ac +SIZE (proxytunnel-proxytunnel-v1.10.20200507_GH0.tar.gz) = 52286 Modified: head/security/proxytunnel/files/patch-Makefile ============================================================================== --- head/security/proxytunnel/files/patch-Makefile Fri May 8 15:34:01 2020 (r534408) +++ head/security/proxytunnel/files/patch-Makefile Fri May 8 15:51:32 2020 (r534409) @@ -1,16 +1,11 @@ ---- Makefile.orig 2012-01-23 18:13:41 UTC +--- Makefile.orig 2020-05-07 15:17:41 UTC +++ Makefile -@@ -46,9 +46,11 @@ OPTFLAGS += -DSO_REUSEPORT +@@ -75,7 +75,7 @@ endif - # END system dependant block + .PHONY: all clean docs install --SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null) --ifeq ($(SSL_LIBS),) - SSL_LIBS := $(shell pkg-config --libs openssl 2>/dev/null) -+CFLAGS += $(shell pkg-config --cflags openssl 2>/dev/null) -+ifeq ($(SSL_LIBS),) -+SSL_LIBS := $(shell pkg-config --libs libssl 2>/dev/null) -+CFLAGS += $(shell pkg-config --cflags libssl 2>/dev/null) - endif - ifeq ($(SSL_LIBS),) - SSL_LIBS := -lssl -lcrypto +-all: proxytunnel ++all: proxytunnel docs + + docs: + $(MAKE) -C docs Modified: head/security/proxytunnel/files/patch-ptstream.c ============================================================================== --- head/security/proxytunnel/files/patch-ptstream.c Fri May 8 15:34:01 2020 (r534408) +++ head/security/proxytunnel/files/patch-ptstream.c Fri May 8 15:51:32 2020 (r534409) @@ -1,14 +1,10 @@ ---- ptstream.c.orig 2012-01-23 18:13:41 UTC +--- ptstream.c.orig 2020-05-07 15:17:41 UTC +++ ptstream.c -@@ -151,7 +151,11 @@ int stream_enable_ssl(PTSTREAM *pts) { - - /* Initialise the connection */ - SSLeay_add_ssl_algorithms(); -+#ifndef OPENSSL_NO_SSL3 - meth = SSLv3_client_method(); -+#else -+ meth = SSLv23_client_method(); -+#endif - SSL_load_error_strings(); +@@ -20,6 +20,7 @@ + /* ptstream.c */ - ctx = SSL_CTX_new (meth); + #include ++#include + #include + #include + #include