Update to 1.10.20200507

This commit is contained in:
Emanuel Haupt 2020-05-08 15:51:32 +00:00
parent 429e033fdf
commit c9a2394df7
4 changed files with 21 additions and 29 deletions

View file

@ -2,7 +2,8 @@
# $FreeBSD$
PORTNAME= proxytunnel
PORTVERSION= 1.9.1
PORTVERSION= 1.10.20200507
DISTVERSIONPREFIX= v
CATEGORIES= security
MAINTAINER= ehaupt@FreeBSD.org

View file

@ -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

View file

@ -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

View file

@ -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 <arpa/inet.h>
+#include <netinet/in.h>
#include <openssl/x509v3.h>
#include <stdio.h>
#include <stdlib.h>