From nobody Thu Oct 13 19:24:47 2022 X-Original-To: dev-commits-ports-main@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 4MpKGS2Wd1z4fSBl; Thu, 13 Oct 2022 19:24:48 +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 4MpKGS20Pdz40Fx; Thu, 13 Oct 2022 19:24:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665689088; 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=DHEy2kWp0cmTboXXe62/gvaV920wLXghrmC2l/EtXoI=; b=Llsy1Rq8s/nKZO6M3iIwJWHHuC0uOc9a8PQgDquBwD7Rj2SEi19lHKeQoVuboj4toGiran VFkd4MF4+kZXtAc1MBvT54D1dtjgqACufdscaq/oMsp8yDV/fgKIN7ri/L6sa9ieMCBMFm SUOKgullPTbHh4V1YD1lUqUWGoF3mM+m8row5w3ImNOvAh7s+3hqRhh3+BcwImlHeZysAg 5bl+XhB6S8muQEDarSLImgbQ3ziKPsdQWto0CwqqzeeZ+QHHMXjqnm8Yvsg1u/jjhrWw4Z H4OKaIbSy7DvqSRblnR2eol8tyCH25PnduVYaGqy67NRsYJS3EzrPn2xbOxHkQ== 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 4MpKGS0q2HzX4Y; Thu, 13 Oct 2022 19:24:48 +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 29DJOlcr097050; Thu, 13 Oct 2022 19:24:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29DJOlmb097049; Thu, 13 Oct 2022 19:24:47 GMT (envelope-from git) Date: Thu, 13 Oct 2022 19:24:47 GMT Message-Id: <202210131924.29DJOlmb097049@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: a1cc3aded1d4 - main - www/caddy: Update to v2.6.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1cc3aded1d4d286ce55ae76590be91ae0247f1b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665689088; 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=DHEy2kWp0cmTboXXe62/gvaV920wLXghrmC2l/EtXoI=; b=pbrHVRHVvvt9RfIGLbD7I9AxJ88AdfAYDnVMK+G7uAWu/1weblP791aVNNjjCHqbls4d7h c+6LSG7ka3FTNwbkx7Sow8+ZPe9TI4ptKL82zdE9t2M0jqHl77DErBAUx7puKtAKanPlie i673u6M84yPbiTy3iSZqRVwxyQaLitTq/jS6NGp7Y0gdcxPfM6nBYqv8OpEYk1F3tS4kSI k5DfWnvCp1Kc/fq94vzdU3magGIdOia2zpOspqMs0RVvHB/up4l21EZFGH6Edh/0tZlNMm WNGaeZnuoFvoeH3j9219UT+b+ito7TJASxEOoPYXWBr7hbv6pauQSumT66U5tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665689088; a=rsa-sha256; cv=none; b=pU0hirBeAjCUkT6WfL+Giz39oANTKq4CcBorrJ/2W+yetV72nzVI3rCZR0byENb0IuWdqk 9c1HGDyCdKeJDp3V3JiipdUkK24hEYO/6AOz0O698JKnkGC0JdXBslIKgg7e/ziylvRs5g Nj+cHKxhgYQvGxFNE9dI/6qwQCCRxB1KefsdXV0emsLGBuGGBE8r+6dgh4Fv71y2D+Fs87 z0KfbB8snUIi14ElDJP7sxFld+/g9NVRoJYlcd+3v+7r8aBxfA52dPxGSUT6nGUsuNR1Yi WXJWB51KYg2qUI7+OedudoMLtesivcMyq1YMDz0k7XUqYjp/D7QkPyj3t5yHCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1cc3aded1d4d286ce55ae76590be91ae0247f1b commit a1cc3aded1d4d286ce55ae76590be91ae0247f1b Author: Adam Weinberger AuthorDate: 2022-10-13 19:24:20 +0000 Commit: Adam Weinberger CommitDate: 2022-10-13 19:24:42 +0000 www/caddy: Update to v2.6.2 Changes: https://github.com/caddyserver/caddy/releases/tag/v2.6.2 --- www/caddy/Makefile | 5 ++--- www/caddy/distinfo | 10 +++++----- www/caddy/files/patch-caddy.go | 25 ------------------------- 3 files changed, 7 insertions(+), 33 deletions(-) diff --git a/www/caddy/Makefile b/www/caddy/Makefile index 6fef82b70afb..272e2ba54a1b 100644 --- a/www/caddy/Makefile +++ b/www/caddy/Makefile @@ -1,7 +1,6 @@ PORTNAME= caddy DISTVERSIONPREFIX= v -DISTVERSION= 2.6.1 -PORTREVISION= 4 +DISTVERSION= 2.6.2 CATEGORIES= www DIST_SUBDIR= caddy @@ -23,7 +22,7 @@ CONFLICTS_INSTALL= caddy-custom PLIST_FILES= bin/${PORTNAME} \ "@sample ${ETCDIR_REL}/Caddyfile.sample" -GO_BUILDFLAGS+= -ldflags='-X github.com/caddyserver/caddy/v2.VersionString=${DISTVERSIONFULL}' +GO_BUILDFLAGS+= -ldflags='-X github.com/caddyserver/caddy/v2.CustomVersion=${DISTVERSIONFULL}' GO_TARGET= ./cmd/caddy # If go.mod is sufficient: diff --git a/www/caddy/distinfo b/www/caddy/distinfo index 3144a7736936..0425720e9f14 100644 --- a/www/caddy/distinfo +++ b/www/caddy/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1663804054 -SHA256 (go/www_caddy/caddy-v2.6.1/v2.6.1.mod) = 5f51daa4f2300632f7c4c5f071bf7b699cb0e19d93531f09b2b29cfe5233cb0d -SIZE (go/www_caddy/caddy-v2.6.1/v2.6.1.mod) = 6436 -SHA256 (go/www_caddy/caddy-v2.6.1/v2.6.1.zip) = 637444d478343e7db34be675f92b82afd8be52141d228ad48eaf2c436af4495c -SIZE (go/www_caddy/caddy-v2.6.1/v2.6.1.zip) = 796937 +TIMESTAMP = 1665688601 +SHA256 (go/www_caddy/caddy-v2.6.2/v2.6.2.mod) = 66e3abc14121ef5b101c4eda4b796aeb885363cb5f24bc39f12f1a0d4059e860 +SIZE (go/www_caddy/caddy-v2.6.2/v2.6.2.mod) = 6406 +SHA256 (go/www_caddy/caddy-v2.6.2/v2.6.2.zip) = a26479dca70c6fb2e018043154c062a920085d8a6a7c24e9360edd24e16bbe17 +SIZE (go/www_caddy/caddy-v2.6.2/v2.6.2.zip) = 793368 diff --git a/www/caddy/files/patch-caddy.go b/www/caddy/files/patch-caddy.go deleted file mode 100644 index bc79644ad6b7..000000000000 --- a/www/caddy/files/patch-caddy.go +++ /dev/null @@ -1,25 +0,0 @@ ---- caddy.go.orig 2022-09-22 16:12:41 UTC -+++ caddy.go -@@ -824,6 +824,10 @@ func InstanceID() (uuid.UUID, error) { - return uuid.ParseBytes(uuidFileBytes) - } - -+// VersionString uses a predefined version string to short-circuit -+// the Version() function below, to simplify vendor packaging. -+var VersionString string -+ - // Version returns the Caddy version in a simple/short form, and - // a full version string. The short form will not have spaces and - // is intended for User-Agent strings and similar, but may be -@@ -841,6 +845,11 @@ func InstanceID() (uuid.UUID, error) { - // - // This function is experimental and subject to change or removal. - func Version() (simple, full string) { -+ // Use VersionString if provided (eg. through -ldflags -X) -+ if VersionString != "" { -+ return VersionString, VersionString -+ } -+ - // the currently-recommended way to build Caddy involves - // building it as a dependency so we can extract version - // information from go.mod tooling; once the upstream