From nobody Sun May 14 21:27:41 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 4QKFvx559tz499nP; Sun, 14 May 2023 21:27:41 +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 4QKFvx4ZfKz3wQx; Sun, 14 May 2023 21:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684099661; 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=N1bpMA+aF4HkWXo7trMvOHMfNn3qdJ3cffk22nughcE=; b=u0C0/+BU3LZysPq1nz/k80YFUGpH2fs58eQWWSa70SXgrOEdfX9nH5RTiy0V0+V4BKmZJg hUUKokJDhpXCayRege+vVrshO0AcB2AxrOm8BaRZCJ0HlwTLEt9NlChcK7swZ4zOxAI+OD sGi7eX/ln7OUCPe/uAHhVctFrkebMvvrkiMwBd1/Ru6jtBDxRc/d5jkVEM0R+AKSjcXrw5 OI/2fRtHMuiLGUrqyMs7gzFop7TBHRpzLg+pooKYojF0SQiH/9yTjbs01AJh9HGoUmzWN7 FDqLzJBEwRlhRH6q9yhqD+JKRTUdQihzr6jb4i9dZZhAzxnev1qYAGPyNvj4nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684099661; 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=N1bpMA+aF4HkWXo7trMvOHMfNn3qdJ3cffk22nughcE=; b=l8J1jw3LCiY0uEPziem/4D1O9dy3ogiEJUj/SZmQJbEctoDeSrgpt9uhmwzg/L2WEydPgy iwU7ONDcY5Hfm6PP5PgFKk3jKGYjisxWryer22cpSNHaNKVwXJWgmkgg5SyMohb5QTo8V7 PxhQh7AH2jv7kGuWKR06+sdIM4JiJL092dIfAfLnaDAsD0bjI9NSIt9C7uAU6wDZMqx3gU AxJVRp/RExIJH9Q/XXlc0pc7+2XxPOEhSdIjWAsqi72lKgb+h9NffbFQk/zy+XpS9Ryhr+ ILF/h0FB7Xt+MjWUBiQOJKWxh792wbz3x3BZqvrkp24kX27llZbxFurY/AM72g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684099661; a=rsa-sha256; cv=none; b=qKeFA0CPlOujHLYrsSKZeiEi2ykDI/6zM9o+JMNaW1PPLxk7c+eCleY4FFqo9p6fH4ZOVw /bBePBPSUZgQF65OHIDVLmTEdZdM5Uz/xKrvPtMnqgkrSeDjMIxDwSGn0pRJ3a3q5iFF9g 35B1FVZcxmbkZ5YDj2ju62bNNAXmJ3JEH6PGRY9X21F24D+PR0TkR2u22q6193tA+0i4G6 RiQhJLP7YSkh/bWFtvx1MB6jyiD58IOdj5am3VZvL/yi5ByS5an1b7IPTcvKKOjsk2uEK/ KlHTzFzuCp/CCNC8Rf6KR+nrH/E4HWOQ6ZiC7v2KvQc7RJcpwbPpV4RWk+ndYg== 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 4QKFvx3XRjzFQC; Sun, 14 May 2023 21:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34ELRfma064214; Sun, 14 May 2023 21:27:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ELRfFY064213; Sun, 14 May 2023 21:27:41 GMT (envelope-from git) Date: Sun, 14 May 2023 21:27:41 GMT Message-Id: <202305142127.34ELRfFY064213@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikhail Teterin Subject: git: 8f8d3f33217d - main - www/websh: report errors parsing cookie-expiration date 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: mi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f8d3f33217d4e66fd420f8460422e726d3cf855 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mi: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f8d3f33217d4e66fd420f8460422e726d3cf855 commit 8f8d3f33217d4e66fd420f8460422e726d3cf855 Author: Mikhail Teterin AuthorDate: 2023-05-14 21:27:16 +0000 Commit: Mikhail Teterin CommitDate: 2023-05-14 21:27:16 +0000 www/websh: report errors parsing cookie-expiration date Original code would ignore such errors -- and would simply skip the expiration-clause of any cookie. This MIGHT explain the test-failures reported by Poudriere, even though I cannot reproduce this problem locally. Fix another minor problem, while I'm here -- and bump PORTREVISION. --- www/websh/Makefile | 4 ++-- www/websh/files/pkgIndex.tcl.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/websh/Makefile b/www/websh/Makefile index f4c83d23a329..7e71259fe02d 100644 --- a/www/websh/Makefile +++ b/www/websh/Makefile @@ -1,6 +1,6 @@ PORTNAME= websh PORTVERSION= 3.6.0b5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www tcl MASTER_SITES= https://archive.apache.org/dist/tcl/${PORTNAME}/source/ EXTRACT_SUFX= -src.tar.gz @@ -43,7 +43,7 @@ post-patch: done ${REINPLACE_CMD} -e 's,\.html,.whtml,g' ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.ws3 ${REINPLACE_CMD} -e 's|__declspec(dllexport)|DLLEXPORT|' \ - ${WRKSRC}/../generic/*.[ch] + ${WRKSRC:H}/generic/*.[ch] post-configure: # Remove the "STUBS" and the PACKAGE_* defines, which may conflict diff --git a/www/websh/files/pkgIndex.tcl.in b/www/websh/files/pkgIndex.tcl.in index 2c6a688fad6e..39aa4c08819b 100644 --- a/www/websh/files/pkgIndex.tcl.in +++ b/www/websh/files/pkgIndex.tcl.in @@ -1,3 +1,3 @@ if {[package vcompare [info tclversion] 8.3] < 0} return -package ifneeded websh %%WS_VER%% [list load [file join [file dirname $dir] libwebsh%%TCL_DVER%%.so.1]] +package ifneeded websh %%WS_VER%% [list load [file join [file dirname $dir] libwebsh%%LIBSUF%%.so.1]]