From nobody Thu Feb 08 02:24:29 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TVgmF2W9Rz58ch3; Thu, 8 Feb 2024 02:24:29 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TVgmF21t8z4j24; Thu, 8 Feb 2024 02:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707359069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ehwtVTk5DT3oMn0qMzb5cP8UIyHWmkR2w3+coGzBjLg=; b=OLd2LdfIGNTQJt9Vb/oIwp1SakiKakSNHUnTC7gvEjrw56woqFmxnE51Hok0/nCgg1TtwB eqESOALE8zItaPoa4fYYsDsR6EiGxaHC1H4GUfJbYQ2CowUkI6oy1xAHCQPFj4tkWz91VX aHqxvclv0EFHYda4AzeE+zIxhTx7sGw2iHhl/wbGouLqN3eCKHrDiChm1EvlGXw0tCtDWg Upf2PRBus4y/VbwUGWgY9PDARTBPPQuGgWP85KsbYCQkHGnCSWjrzaZpdvc/6rJp62LOiR S9FqOng3DVd7LgxmtSAdCf3uJOnsSJrcaVDsRCfL8rOUdW44utC7J7H3ICLq/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707359069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ehwtVTk5DT3oMn0qMzb5cP8UIyHWmkR2w3+coGzBjLg=; b=nn76XE4oc1/yJcSCxXjDDpU7G4LOwakbVxU+X24ditZ70jIe486px2QYLW9ajxcommyE3V yAqXhVqazgItsM+ovhMQWc8DjAp47PgmYB5fZdWAPegw7vkVN/xdIwQCBwiiy/q5QVjOgo GUYGOFBRw8e7akPs0bx4FFzkwUP28bJpw7ZUDdNMYvG6/HNnITBuvfiBbMDR3wZAsGPG/H md65vzY4wZRWWzbm84FoNf1sEdVlbzrqsqENV/yOw8KUgCAyQHMmO7ZjFD/hl+Sj5JhH7p VqBp/ywnj8oZrv1ypuNWP8jCR29PbG6YAj+ybjrOFWoOPtIb/PvB3bh8O1iLfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707359069; a=rsa-sha256; cv=none; b=yyB6nJNiOYtW37YwQamqQ5KMJGjteVElyUxXbglXs3RnpTp4wl0iT0rXTb6soovvANA5Gt E5caoJc9N7JDnP5beoq0KP9wYpv4S5LgzIG72TsN4BrSUV9BNrdVpY94U6Madd+Pp32MlG C/oP0OBnIuQhZPaTW4xDYrPQh3FPcUGaqLMWEx/6gYUPb2Xzej4SqWTOXAEeEnXno47jp5 gdyCT5QArcAq2oCzL+8Ax1OJJXDMjfVUWmuym+KMFT/knmTE8WF0Hn9O4F6NudyFjPqjQz 6OynyBUWD2SrBSiFaGDyfiHVfyVSauEKJ1xsAYv12BjiNNIS3ICwKdM2E690eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TVgmF0z4lzX28; Thu, 8 Feb 2024 02:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4182OTs5092052; Thu, 8 Feb 2024 02:24:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4182OT2t092049; Thu, 8 Feb 2024 02:24:29 GMT (envelope-from git) Date: Thu, 8 Feb 2024 02:24:29 GMT Message-Id: <202402080224.4182OT2t092049@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Sato Subject: git: 9b2e6bb3ac6a - main - net/http_ping: Update to 20160309 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hrs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b2e6bb3ac6af7758b56de789bad49510bccb05d Auto-Submitted: auto-generated The branch main has been updated by hrs: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b2e6bb3ac6af7758b56de789bad49510bccb05d commit 9b2e6bb3ac6af7758b56de789bad49510bccb05d Author: Hiroki Sato AuthorDate: 2024-02-08 02:17:48 +0000 Commit: Hiroki Sato CommitDate: 2024-02-08 02:17:48 +0000 net/http_ping: Update to 20160309 A patch has been added to fix a TLS negotiation failure when connecting a server with SNI. PR: 276186 --- net/http_ping/Makefile | 12 +++++++----- net/http_ping/distinfo | 5 +++-- net/http_ping/files/patch-Makefile | 37 +++++++++++++++++------------------ net/http_ping/files/patch-http_ping.c | 28 ++++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 26 deletions(-) diff --git a/net/http_ping/Makefile b/net/http_ping/Makefile index be27f6fead51..7475c2ebeeac 100644 --- a/net/http_ping/Makefile +++ b/net/http_ping/Makefile @@ -1,16 +1,15 @@ PORTNAME= http_ping -PORTVERSION= 20050629 -PORTREVISION= 2 +PORTVERSION= 20160309 CATEGORIES= net www MASTER_SITES= http://www.acme.com/software/${PORTNAME}/ -DISTNAME= ${PORTNAME}_29jun2005 +DISTNAME= ${PORTNAME}_09Mar2016 MAINTAINER= hrs@FreeBSD.org COMMENT= Measure HTTP Latency WWW= https://www.acme.com/software/http_ping/ -DEPRECATED= Supports only HTTP/1.0 -EXPIRATION_DATE=2024-02-29 +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE USES= ssl WRKSRC= ${WRKDIR}/${PORTNAME} @@ -18,4 +17,7 @@ CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} PLIST_FILES= bin/http_ping share/man/man1/http_ping.1.gz +post-extract: + cd ${WRKSRC} && ${SED} -e '/^\*\*/,/^\*\//p;d' < http_ping.c > LICENSE + .include diff --git a/net/http_ping/distinfo b/net/http_ping/distinfo index 58f6fa9f6cc8..75bd69cd4d8d 100644 --- a/net/http_ping/distinfo +++ b/net/http_ping/distinfo @@ -1,2 +1,3 @@ -SHA256 (http_ping_29jun2005.tar.gz) = f0a68c1d0c418a6333599ea6363e095867cc0472f0c89d000e3ac6f871b8c4d1 -SIZE (http_ping_29jun2005.tar.gz) = 7956 +TIMESTAMP = 1705956056 +SHA256 (http_ping_09Mar2016.tar.gz) = f8b95773aaed09839a44a1927f979a62752d57aace79da3846bfb73e6c9805e9 +SIZE (http_ping_09Mar2016.tar.gz) = 8106 diff --git a/net/http_ping/files/patch-Makefile b/net/http_ping/files/patch-Makefile index ae1c6f34244d..e0c07dca83b0 100644 --- a/net/http_ping/files/patch-Makefile +++ b/net/http_ping/files/patch-Makefile @@ -1,29 +1,28 @@ ---- Makefile.orig 2002-01-04 14:50:06.000000000 +0900 -+++ Makefile 2013-10-17 12:39:39.000000000 +0900 -@@ -14,13 +14,15 @@ - #SSL_INC = -I$(SSL_TREE)/include +--- Makefile.orig 2014-08-11 19:13:31 UTC ++++ Makefile +@@ -15,23 +15,26 @@ #SSL_LIBS = -L$(SSL_TREE)/lib -lssl -lcrypto -- + -BINDIR = /usr/local/bin -MANDIR = /usr/local/man/man1 --CC = gcc -Wall --CFLAGS = -O $(SRANDOM_DEFS) $(SSL_DEFS) $(SSL_INC) -+SSL_DEFS= -DUSE_SSL ${OPENSSL_CFLAGS} -+SSL_INC= -I${OPENSSLINC} -+SSL_LIBS= -L${OPENSSLLIB} -lssl -lcrypto -+BINDIR = ${PREFIX}/bin -+MANDIR = ${PREFIX}/share/man/man1 -+CC?= gcc -Wall -+CFLAGS+= -g $(SRANDOM_DEFS) $(SSL_DEFS) $(SSL_INC) - #CFLAGS = -g $(SRANDOM_DEFS) $(SSL_DEFS) $(SSL_INC) +-CC = cc +-CFLAGS = -O $(SRANDOM_DEFS) $(SSL_DEFS) $(SSL_INC) -ansi -pedantic -U__STRICT_ANSI__ -Wall -Wpointer-arith -Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wno-long-long -LDFLAGS = -s $(SSL_LIBS) $(SYSV_LIBS) -+LDFLAGS+= -s -lssl -lcrypto - #LDFLAGS = -g $(SSL_LIBS) $(SYSV_LIBS) ++BINDIR = ${PREFIX}/bin ++MANDIR = ${PREFIX}/share//man/man1 ++CC?= cc ++CFLAGS+= -O $(SRANDOM_DEFS) $(SSL_DEFS) $(SSL_INC) ++LDFLAGS+= -s $(SSL_LIBS) $(SYSV_LIBS) ++SSL_DEFS = -DUSE_SSL ${OPENSSL_CFLAGS} ++SSL_INC = -I${OPENSSLINC} ++SSL_LIBS = -L${OPENSSLLIB} -lssl -lcrypto ++ all: http_ping -@@ -32,11 +34,10 @@ - $(CC) $(CFLAGS) -c http_ping.c + + http_ping: http_ping.c port.h + $(CC) $(CFLAGS) http_ping.c $(LDFLAGS) -o http_ping -install: all diff --git a/net/http_ping/files/patch-http_ping.c b/net/http_ping/files/patch-http_ping.c new file mode 100644 index 000000000000..8a9d822adcb3 --- /dev/null +++ b/net/http_ping/files/patch-http_ping.c @@ -0,0 +1,28 @@ +--- http_ping.c.orig 2024-02-08 02:14:24 UTC ++++ http_ping.c +@@ -424,8 +424,8 @@ start_connection( void ) + { + SSL_load_error_strings(); + SSLeay_add_ssl_algorithms(); +- ssl_ctx = SSL_CTX_new( SSLv23_client_method() ); +- SSL_CTX_set_options( ssl_ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3 ); ++ ssl_ctx = SSL_CTX_new( TLS_client_method() ); ++ SSL_CTX_set_min_proto_version( ssl_ctx, TLS1_VERSION ); + } + if ( ! RAND_status() ) + { +@@ -437,11 +437,13 @@ start_connection( void ) + } + ssl = SSL_new( ssl_ctx ); + SSL_set_fd( ssl, conn_fd ); ++ SSL_set_tlsext_host_name(ssl, url_host); + r = SSL_connect( ssl ); + if ( r <= 0 ) + { + (void) fprintf( +- stderr, "%s: SSL connection failed - %d\n", argv0, r ); ++ stderr, "%s: SSL connection failed - %d\n", argv0, ++ SSL_get_error(ssl, r)); + ERR_print_errors_fp( stderr ); + close_connection(); + return 0;