diff --git a/security/proxytunnel/Makefile b/security/proxytunnel/Makefile index c61aac84265b..e078b77cd0c2 100644 --- a/security/proxytunnel/Makefile +++ b/security/proxytunnel/Makefile @@ -1,31 +1,32 @@ # Created by: Hammurabi Mendes # $FreeBSD$ PORTNAME= proxytunnel -PORTVERSION= 1.9.1 +PORTVERSION= 1.10.20200507 +DISTVERSIONPREFIX= v CATEGORIES= security MAINTAINER= ehaupt@FreeBSD.org COMMENT= Connects stdin and stdout to an origin server through an HTTPS proxy LICENSE= GPLv2+ BSD3CLAUSE MIT LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= asciidoc:textproc/asciidoc \ minixmlto:textproc/minixmlto USES= pkgconfig gmake ssl USE_GITHUB= yes PLIST_FILES= bin/proxytunnel man/man1/proxytunnel.1.gz post-patch: ${REINPLACE_CMD} -e "s/xmlto/minixmlto/g" ${WRKSRC}/docs/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/docs/${PORTNAME}.1 \ ${STAGEDIR}${MANPREFIX}/man/man1 .include diff --git a/security/proxytunnel/distinfo b/security/proxytunnel/distinfo index 8f3b289ac4cc..9f4243f9ed06 100644 --- a/security/proxytunnel/distinfo +++ b/security/proxytunnel/distinfo @@ -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 diff --git a/security/proxytunnel/files/patch-Makefile b/security/proxytunnel/files/patch-Makefile index 0d54d38bf170..3d2c1a6b233e 100644 --- a/security/proxytunnel/files/patch-Makefile +++ b/security/proxytunnel/files/patch-Makefile @@ -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 diff --git a/security/proxytunnel/files/patch-ptstream.c b/security/proxytunnel/files/patch-ptstream.c index b0b49feb6b82..0b986e24b5bb 100644 --- a/security/proxytunnel/files/patch-ptstream.c +++ b/security/proxytunnel/files/patch-ptstream.c @@ -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