From nobody Fri Sep 15 08:58:15 2023 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 4Rn7Pz5zYwz4tMkq; Fri, 15 Sep 2023 08:58:15 +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 4Rn7Pz5J5gz4Vp0; Fri, 15 Sep 2023 08:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694768295; 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=aVv/qj/j9gsvtIbyYTFtPIzb0ZcHPEM0E++SsrwsuZc=; b=uiL/DDB9+JQqDfIaMjL6KyCrRWVfVLNiMwl4M1/PV3q8Rn5YQGgyHLBVggOik6eZ91NXNV 2mtSDtsukpDPc5NijCOSngS7Cw5bawJgwf4b4zOqet/lxdhX8JgPd7BeQwX5L7uzqlNi47 DErPVxl+fEsghrNCmSHUQpzpZlDZas9/dBBA27Xi9JKXXcRPYWNFMCamNZD1Me0Eo4d7Gw YKSozLBstZ4fot37y3moO5jfsmI6h/2aSkGGwohfxlUOED/rS3JXxt+HFIHUmBseyvWa6s 4WaqsKFE/OlTG4wJwPHMLyKPgkKkRvRnjrQr4fPWG6ZqHVgz6T6MCZRRZNsWzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694768295; a=rsa-sha256; cv=none; b=pDLHJTU0SvPQ3raSzNd8bjq09ApDx08L8Ovy0oV8DZquhhhh+in89V61Zo/5fokOke7pAK h0xxAMaOfrc/yAokpa1/vS8Pt61uudyx4dAm6v+hQo2NrSXFgXbpCi9djqr1U8Gu4raTVu Qn4m1aR493pH/RAzrpsLmBXjbavYTIltRoIZYt1nQ55p5CQV1z1c4ZfylvY36R6pRAtLpe 335ttk3RiA+zX5mmU/1287ZLCPCfbtcIDsakTxdcZJrmmMaYbLmNFXaK5jRmJ0Cjd8EJHP 9tnZWDr8ApL965lAGteECBemf7r9YmZ34QksfELHJfNBOS/yrYaLV6Mt8OqYrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694768295; 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=aVv/qj/j9gsvtIbyYTFtPIzb0ZcHPEM0E++SsrwsuZc=; b=BBYka7SBasMC8e1Y1jQmLP3EAhsqQSBh2RlNckMb852GD0+Ntk+ianuTDDK8UPBQIFvFvB SMXZkbDqX44kxnA8fxN71imulTac5htD1ynwysWW8LHKJq/0X8aIu8HdpaSPEkd1QLKEX5 Z/A7P82a3iI1VBKqSsjfrKdgVsGsHNMfhUeX0SgqiUQ8r54GWhg52PoyS7o2YGKstdtAXe CCkbsxEUbrvsem+OzmzmZ7HjV2gnjUcNcNuadX7W9FtIDJKmxVcS/CggxOEm2Ph82NZAAq rnpD8qaaKJ6WxDcZWddutur97YOvU5dI4l/bJqSQK/UDBp2OQquS8izrG9c6Tg== 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 4Rn7Pz4MS5z30v; Fri, 15 Sep 2023 08:58:15 +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 38F8wFw5074607; Fri, 15 Sep 2023 08:58:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38F8wFl2074604; Fri, 15 Sep 2023 08:58:15 GMT (envelope-from git) Date: Fri, 15 Sep 2023 08:58:15 GMT Message-Id: <202309150858.38F8wFl2074604@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 2cf1aff49679 - main - benchmarks/postal: update to 0.76 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: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2cf1aff496796ba20029b9952cc82d01b166a402 Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=2cf1aff496796ba20029b9952cc82d01b166a402 commit 2cf1aff496796ba20029b9952cc82d01b166a402 Author: Rodrigo Osorio AuthorDate: 2023-09-14 14:04:11 +0000 Commit: Rodrigo Osorio CommitDate: 2023-09-15 08:57:44 +0000 benchmarks/postal: update to 0.76 Major changes: * Fix buffer underrun * Add -b option to bind to an address to bhm * Improve build Port changes: * Update MASTER_SITE and WWW --- benchmarks/postal/Makefile | 9 +++--- benchmarks/postal/distinfo | 5 ++-- benchmarks/postal/files/patch-bhm.cpp | 47 ++++---------------------------- benchmarks/postal/files/patch-bhmusers.h | 36 ++++-------------------- benchmarks/postal/files/patch-postal.cpp | 21 -------------- benchmarks/postal/files/patch-rabid.cpp | 22 --------------- benchmarks/postal/files/patch-smtp.h | 26 ++++-------------- 7 files changed, 25 insertions(+), 141 deletions(-) diff --git a/benchmarks/postal/Makefile b/benchmarks/postal/Makefile index 1d58d3bbb4fa..c5ac9cd1ca92 100644 --- a/benchmarks/postal/Makefile +++ b/benchmarks/postal/Makefile @@ -1,12 +1,11 @@ PORTNAME= postal -PORTVERSION= 0.73 -PORTREVISION= 3 +PORTVERSION= 0.76 CATEGORIES= benchmarks mail -MASTER_SITES= http://www.coker.com.au/postal/ +MASTER_SITES= https://www.coker.com.au/postal/ MAINTAINER= ports@FreeBSD.org COMMENT= Benchmark SMTP/POP servers -WWW= https://www.coker.com.au/postal/ +WWW= https://doc.coker.com.au/projects/postal/ LICENSE= GPLv3 @@ -22,9 +21,9 @@ PLIST_FILES= bin/postal-list \ sbin/postal \ sbin/rabid +OPTIONS_DEFAULT= OPENSSL OPTIONS_RADIO= TLS OPTIONS_RADIO_TLS= GNUTLS OPENSSL -OPTIONS_DEFAULT= OPENSSL GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_USES= pkgconfig diff --git a/benchmarks/postal/distinfo b/benchmarks/postal/distinfo index d791d21c619d..ab0513ecfdbf 100644 --- a/benchmarks/postal/distinfo +++ b/benchmarks/postal/distinfo @@ -1,2 +1,3 @@ -SHA256 (postal-0.73.tgz) = 25cc208f5a86d393707164d33a8dfb6ca5b9f586d0d401d549fc15179b766030 -SIZE (postal-0.73.tgz) = 106171 +TIMESTAMP = 1694465477 +SHA256 (postal-0.76.tgz) = 0cc13df48d7e3355289088fbe9ce01fb80ba16fca309d54918c36223b84bf0df +SIZE (postal-0.76.tgz) = 100260 diff --git a/benchmarks/postal/files/patch-bhm.cpp b/benchmarks/postal/files/patch-bhm.cpp index 7d49a99c97a4..2c61d2f21756 100644 --- a/benchmarks/postal/files/patch-bhm.cpp +++ b/benchmarks/postal/files/patch-bhm.cpp @@ -1,41 +1,6 @@ ---- bhm.cpp.orig 2012-01-14 12:09:31 UTC +--- bhm.cpp.orig 2016-06-30 09:04:24 UTC +++ bhm.cpp -@@ -3,27 +3,25 @@ - #endif - - #include "bhmusers.h" --#include --#include -+#include -+#include - #include - #include --#include --#include -+#include -+#include -+#include - #include - #include - #include - #include -+#ifndef __FreeBSD__ - #include -+#endif - - #include "postal.h" - #include "logit.h" - #include "results.h" - #include "basictcp.h" --#ifdef USE_GNUTLS --#include --#include --GCRY_THREAD_OPTION_PTHREAD_IMPL; --#endif - - int processes = 0; - int *thread_status; -@@ -47,7 +45,7 @@ void usage(CPCCHAR msg = NULL) +@@ -50,7 +50,7 @@ int maxMsgSize = 10240; results res; @@ -44,7 +9,7 @@ int exitCount = 0; -@@ -261,7 +259,7 @@ int readCommand(base_tcp &t, char *buf, int bufSize, b +@@ -264,7 +264,7 @@ void do_work(thread_data *td) { @@ -53,7 +18,7 @@ #ifdef USE_SSL , td->ssl #endif -@@ -408,7 +406,7 @@ int main(int argc, char **argv) +@@ -414,7 +414,7 @@ #endif "\n"); @@ -62,10 +27,10 @@ Logit *debug = NULL; if(debugName) -@@ -419,7 +417,7 @@ int main(int argc, char **argv) +@@ -425,7 +425,7 @@ in.sin_family = AF_INET; in.sin_port = htons(port); - in.sin_addr.s_addr = INADDR_ANY; + memcpy(&in.sin_addr, &sin_addr, sizeof(sin_addr)); - if(listen_fd == -1 || bind(listen_fd, (sockaddr *)&in, sizeof(in)) + if(listen_fd == -1 || ::bind(listen_fd, (sockaddr *)&in, sizeof(in)) || listen(listen_fd, 10)) diff --git a/benchmarks/postal/files/patch-bhmusers.h b/benchmarks/postal/files/patch-bhmusers.h index 5feaa1234e19..7d1bcde83da9 100644 --- a/benchmarks/postal/files/patch-bhmusers.h +++ b/benchmarks/postal/files/patch-bhmusers.h @@ -1,44 +1,20 @@ ---- bhmusers.h.orig 2006-09-28 15:20:28 UTC +--- bhmusers.h.orig 2016-06-30 08:57:25 UTC +++ bhmusers.h -@@ -6,12 +6,16 @@ using namespace std; +@@ -6,7 +6,7 @@ #include #include "conf.h" -+#if defined(_LIBCPP_VERSION) +-#include +#include -+#else - #ifdef HAVE_EXT_HASH_MAP - using namespace __gnu_cxx; - #include - #else - #include - #endif -+#endif #include "postal.h" -@@ -23,7 +27,12 @@ typedef struct +@@ -18,7 +18,7 @@ int sync_time; } BHM_DATA; -+ -+#if defined(_LIBCPP_VERSION) -+namespace std -+#else - namespace __gnu_cxx -+#endif - { - template<> struct hash< std::string > - { -@@ -34,7 +43,11 @@ namespace __gnu_cxx - }; - } - -+#if defined(_LIBCPP_VERSION) -+typedef std::unordered_map > NAME_MAP; -+#else - typedef hash_map > NAME_MAP; -+#endif +-typedef std::tr1::unordered_map > NAME_MAP; ++typedef std::unordered_map > NAME_MAP; class BHMUsers { diff --git a/benchmarks/postal/files/patch-postal.cpp b/benchmarks/postal/files/patch-postal.cpp deleted file mode 100644 index ff6f908d592e..000000000000 --- a/benchmarks/postal/files/patch-postal.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- postal.cpp.orig 2012-01-14 12:08:12 UTC -+++ postal.cpp -@@ -6,15 +6,11 @@ - #include "smtp.h" - #include - #include --#include --#include -+#include -+#include -+#include - #include "postal.h" - #include "logit.h" --#ifdef USE_GNUTLS --#include --#include --GCRY_THREAD_OPTION_PTHREAD_IMPL; --#endif - - void usage() - { diff --git a/benchmarks/postal/files/patch-rabid.cpp b/benchmarks/postal/files/patch-rabid.cpp deleted file mode 100644 index cc7526af3e0e..000000000000 --- a/benchmarks/postal/files/patch-rabid.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- rabid.cpp.orig 2012-01-14 12:08:49 UTC -+++ rabid.cpp -@@ -7,15 +7,14 @@ - #include - #include - #include --#include --#include -+#include -+#include -+#include - #include - #include "postal.h" - #include "logit.h" - #ifdef USE_GNUTLS --#include --#include --GCRY_THREAD_OPTION_PTHREAD_IMPL; -+#include - #endif - - void usage() diff --git a/benchmarks/postal/files/patch-smtp.h b/benchmarks/postal/files/patch-smtp.h index 0be7c57dba19..a100a39dc434 100644 --- a/benchmarks/postal/files/patch-smtp.h +++ b/benchmarks/postal/files/patch-smtp.h @@ -1,34 +1,20 @@ ---- smtp.h.orig 2012-01-14 12:36:56 UTC +--- smtp.h.orig 2016-06-30 08:51:27 UTC +++ smtp.h -@@ -4,14 +4,18 @@ - using namespace std; - #include +@@ -6,7 +6,7 @@ #include --#include -+#include + #include #include "conf.h" -+#if defined(_LIBCPP_VERSION) +-#include +#include -+#else - #ifdef HAVE_EXT_HASH_MAP - using namespace __gnu_cxx; - #include - #else - #include - #endif -+#endif #include "tcp.h" #include "mutex.h" -@@ -30,7 +34,11 @@ struct eqlng +@@ -25,7 +25,7 @@ } }; -+#if defined(_LIBCPP_VERSION) +-typedef std::tr1::unordered_map, eqlng> NAME_MAP; +typedef std::unordered_map, eqlng> NAME_MAP; -+#else - typedef hash_map, eqlng> NAME_MAP; -+#endif class smtpData {