[PR PATCH] caddy: update to 2.6.1.

[PR PATCH] caddy: update to 2.6.1.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/caddy
https://github.com/void-linux/void-packages/pull/39671

caddy: update to 2.6.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/39671.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/caddy-39671.patch --]
[-- Type: text/x-diff, Size: 2001 bytes --]

From 7ffff6907317ac41d4012ec594fd2005ede85f26 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 3 Oct 2022 09:29:02 -0400
Subject: [PATCH] caddy: update to 2.6.1.

---
 srcpkgs/caddy/patches/fix_version_command.patch | 17 -----------------
 srcpkgs/caddy/template                          |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/caddy/patches/fix_version_command.patch

diff --git a/srcpkgs/caddy/patches/fix_version_command.patch b/srcpkgs/caddy/patches/fix_version_command.patch
deleted file mode 100644
index 4726054f48d7..000000000000
--- a/srcpkgs/caddy/patches/fix_version_command.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/caddy.go
-+++ b/caddy.go
-@@ -712,14 +711,0 @@ func goModule(mod *debug.Module) *debug.Module {
--	bi, ok := debug.ReadBuildInfo()
--	if ok {
--		mod.Path = bi.Main.Path
--		// The recommended way to build Caddy involves
--		// creating a separate main module, which
--		// TODO: track related Go issue: https://github.com/golang/go/issues/29228
--		// once that issue is fixed, we should just be able to use bi.Main... hopefully.
--		for _, dep := range bi.Deps {
--			if dep.Path == ImportPath {
--				return dep
--			}
--		}
--		return &bi.Main
--	}
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 834375277504..394cd81bafcb 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,6 +1,6 @@
 # Template file for 'caddy'
 pkgname=caddy
-version=2.5.2
+version=2.6.1
 revision=1
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
@@ -11,7 +11,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
 distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
-checksum=6a3e03774658af8009c0ece287301d73c1ea961d01e6ef7c6f44962e4349f5e5
+checksum=ae698b4618dc6ffe7370b0607d59ee78833cb4986ca5663c50a9ae0b90072ac1
 
 system_accounts="caddy"
 caddy_homedir="/var/lib/caddy"

Re: caddy: update to 2.6.1.

[steinex]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

New comment by steinex on void-packages repository

https://github.com/void-linux/void-packages/pull/39671#issuecomment-1265529388

Comment:
Even if the patch does not apply anymore it is still needed and needs to be adapted.

Other than that I want to propose to remove the INSTALL file, we're on Caddy 2 for a very long time now.

Re: caddy: update to 2.6.1.

[steinex]

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

New comment by steinex on void-packages repository

https://github.com/void-linux/void-packages/pull/39671#issuecomment-1265529388

Comment:
Even if the patch does not apply anymore it is still needed and needs to be adapted.

Other than that I want to propose to remove the INSTALL.msg file, we're on Caddy 2 for a very long time now.

Re: [PR PATCH] [Updated] caddy: update to 2.6.1.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/caddy
https://github.com/void-linux/void-packages/pull/39671

caddy: update to 2.6.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/39671.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/caddy-39671.patch --]
[-- Type: text/x-diff, Size: 3319 bytes --]

From 0a8c5f148c4784e5cc8a1addc61255b5f61df03c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 3 Oct 2022 09:29:02 -0400
Subject: [PATCH] caddy: update to 2.6.1.

---
 .../caddy/patches/fix_version_command.patch   | 54 ++++++++++++++-----
 srcpkgs/caddy/template                        |  6 +--
 2 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/caddy/patches/fix_version_command.patch b/srcpkgs/caddy/patches/fix_version_command.patch
index 4726054f48d7..5b0735b83b8b 100644
--- a/srcpkgs/caddy/patches/fix_version_command.patch
+++ b/srcpkgs/caddy/patches/fix_version_command.patch
@@ -1,17 +1,45 @@
+diff --git a/caddy.go b/caddy.go
+index 0fda9bc..42a3b79 100644
 --- a/caddy.go
 +++ b/caddy.go
-@@ -712,14 +711,0 @@ func goModule(mod *debug.Module) *debug.Module {
--	bi, ok := debug.ReadBuildInfo()
--	if ok {
--		mod.Path = bi.Main.Path
--		// The recommended way to build Caddy involves
--		// creating a separate main module, which
--		// TODO: track related Go issue: https://github.com/golang/go/issues/29228
--		// once that issue is fixed, we should just be able to use bi.Main... hopefully.
--		for _, dep := range bi.Deps {
--			if dep.Path == ImportPath {
--				return dep
+@@ -875,39 +875,7 @@ func Version() (simple, full string) {
+ 	}
+ 
+ 	if full == "" {
+-		var vcsRevision string
+-		var vcsTime time.Time
+-		var vcsModified bool
+-		for _, setting := range bi.Settings {
+-			switch setting.Key {
+-			case "vcs.revision":
+-				vcsRevision = setting.Value
+-			case "vcs.time":
+-				vcsTime, _ = time.Parse(time.RFC3339, setting.Value)
+-			case "vcs.modified":
+-				vcsModified, _ = strconv.ParseBool(setting.Value)
 -			}
 -		}
--		return &bi.Main
--	}
+-
+-		if vcsRevision != "" {
+-			var modified string
+-			if vcsModified {
+-				modified = "+modified"
+-			}
+-			full = fmt.Sprintf("%s%s (%s)", vcsRevision, modified, vcsTime.Format(time.RFC822))
+-			simple = vcsRevision
+-
+-			// use short checksum for simple, if hex-only
+-			if _, err := hex.DecodeString(simple); err == nil {
+-				simple = simple[:8]
+-			}
+-
+-			// append date to simple since it can be convenient
+-			// to know the commit date as part of the version
+-			if !vcsTime.IsZero() {
+-				simple += "-" + vcsTime.Format("20060102")
+-			}
+-		}
++		full = "unknown"
+ 	}
+ 
+ 	if simple == "" || simple == "(devel)" {
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 834375277504..fc7cd97e4754 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,6 +1,6 @@
 # Template file for 'caddy'
 pkgname=caddy
-version=2.5.2
+version=2.6.1
 revision=1
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
@@ -11,7 +11,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
 distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
-checksum=6a3e03774658af8009c0ece287301d73c1ea961d01e6ef7c6f44962e4349f5e5
+checksum=ae698b4618dc6ffe7370b0607d59ee78833cb4986ca5663c50a9ae0b90072ac1
 
 system_accounts="caddy"
 caddy_homedir="/var/lib/caddy"
@@ -23,7 +23,7 @@ make_dirs="
 	/etc/caddy 0700 caddy caddy
 	/var/lib/caddy 0700 caddy caddy"
 
-post_extract() {
+post_patch() {
 	vsed -e "s,unknown,${version},g" -i ${wrksrc}/caddy.go
 }
 

Re: [PR PATCH] [Updated] caddy: update to 2.6.1.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages update/caddy
https://github.com/void-linux/void-packages/pull/39671

caddy: update to 2.6.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/39671.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/caddy-39671.patch --]
[-- Type: text/x-diff, Size: 3721 bytes --]

From 303f4d63fe245aa6e05176afc4e32e93c67cad69 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 3 Oct 2022 09:29:02 -0400
Subject: [PATCH] caddy: update to 2.6.1.

---
 srcpkgs/caddy/INSTALL.msg                     |  3 --
 .../caddy/patches/fix_version_command.patch   | 54 ++++++++++++++-----
 srcpkgs/caddy/template                        |  6 +--
 3 files changed, 44 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/caddy/INSTALL.msg

diff --git a/srcpkgs/caddy/INSTALL.msg b/srcpkgs/caddy/INSTALL.msg
deleted file mode 100644
index 2b425ede6ea6..000000000000
--- a/srcpkgs/caddy/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-WARNING: The config syntax has changed from caddy 1.x to 2.x
-
-Be sure to upgrade all your configuration files!
diff --git a/srcpkgs/caddy/patches/fix_version_command.patch b/srcpkgs/caddy/patches/fix_version_command.patch
index 4726054f48d7..5b0735b83b8b 100644
--- a/srcpkgs/caddy/patches/fix_version_command.patch
+++ b/srcpkgs/caddy/patches/fix_version_command.patch
@@ -1,17 +1,45 @@
+diff --git a/caddy.go b/caddy.go
+index 0fda9bc..42a3b79 100644
 --- a/caddy.go
 +++ b/caddy.go
-@@ -712,14 +711,0 @@ func goModule(mod *debug.Module) *debug.Module {
--	bi, ok := debug.ReadBuildInfo()
--	if ok {
--		mod.Path = bi.Main.Path
--		// The recommended way to build Caddy involves
--		// creating a separate main module, which
--		// TODO: track related Go issue: https://github.com/golang/go/issues/29228
--		// once that issue is fixed, we should just be able to use bi.Main... hopefully.
--		for _, dep := range bi.Deps {
--			if dep.Path == ImportPath {
--				return dep
+@@ -875,39 +875,7 @@ func Version() (simple, full string) {
+ 	}
+ 
+ 	if full == "" {
+-		var vcsRevision string
+-		var vcsTime time.Time
+-		var vcsModified bool
+-		for _, setting := range bi.Settings {
+-			switch setting.Key {
+-			case "vcs.revision":
+-				vcsRevision = setting.Value
+-			case "vcs.time":
+-				vcsTime, _ = time.Parse(time.RFC3339, setting.Value)
+-			case "vcs.modified":
+-				vcsModified, _ = strconv.ParseBool(setting.Value)
 -			}
 -		}
--		return &bi.Main
--	}
+-
+-		if vcsRevision != "" {
+-			var modified string
+-			if vcsModified {
+-				modified = "+modified"
+-			}
+-			full = fmt.Sprintf("%s%s (%s)", vcsRevision, modified, vcsTime.Format(time.RFC822))
+-			simple = vcsRevision
+-
+-			// use short checksum for simple, if hex-only
+-			if _, err := hex.DecodeString(simple); err == nil {
+-				simple = simple[:8]
+-			}
+-
+-			// append date to simple since it can be convenient
+-			// to know the commit date as part of the version
+-			if !vcsTime.IsZero() {
+-				simple += "-" + vcsTime.Format("20060102")
+-			}
+-		}
++		full = "unknown"
+ 	}
+ 
+ 	if simple == "" || simple == "(devel)" {
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 834375277504..fc7cd97e4754 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,6 +1,6 @@
 # Template file for 'caddy'
 pkgname=caddy
-version=2.5.2
+version=2.6.1
 revision=1
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
@@ -11,7 +11,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
 distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
-checksum=6a3e03774658af8009c0ece287301d73c1ea961d01e6ef7c6f44962e4349f5e5
+checksum=ae698b4618dc6ffe7370b0607d59ee78833cb4986ca5663c50a9ae0b90072ac1
 
 system_accounts="caddy"
 caddy_homedir="/var/lib/caddy"
@@ -23,7 +23,7 @@ make_dirs="
 	/etc/caddy 0700 caddy caddy
 	/var/lib/caddy 0700 caddy caddy"
 
-post_extract() {
+post_patch() {
 	vsed -e "s,unknown,${version},g" -i ${wrksrc}/caddy.go
 }
 

Re: caddy: update to 2.6.1.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 789 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/39671#issuecomment-1265592721

Comment:
> Even if the patch does not apply anymore it is still needed and needs to be adapted.

Thanks, fixed.

> Other than that I want to propose to remove the INSTALL.msg file, we're on Caddy 2 for a very long time now.

```
commit f9013e2b7a503570804b60b6cbdea967779b3fb7
Author: Patrick Pichler <git@patrickpichler.dev>
Date:   Thu Apr 15 15:44:37 2021 +0200

    caddy: upgrade to 2.4.3
    
    As there is currently a bug with go build info a patch is needed to
    fix printing the correct version number of the binary. Once the bug is
    fixed, the patch can be dropped.
    
    Fixes #22092
```

I agree, removed.

Re: [PR PATCH] [Merged]: caddy: update to 2.6.1.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1061 bytes --]

There's a merged pull request on the void-packages repository

caddy: update to 2.6.1.
https://github.com/void-linux/void-packages/pull/39671

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->