Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package caddy for openSUSE:Factory checked
in at 2021-10-23 00:51:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/caddy (Old)
and /work/SRC/openSUSE:Factory/.caddy.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caddy"
Sat Oct 23 00:51:43 2021 rev:5 rq:926985 version:2.4.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/caddy/caddy.changes 2021-09-07
21:22:22.093371627 +0200
+++ /work/SRC/openSUSE:Factory/.caddy.new.1890/caddy.changes 2021-10-23
00:52:27.573160653 +0200
@@ -1,0 +2,10 @@
+Fri Oct 22 11:02:07 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de>
+
+- Update to version 2.4.5:
+ * Hotfix for a regression introduced in 2.4.4 related to
+ combining the encode and reverse_proxy directives.
+ * cmd: export CaddyVersion(), Commands()
+ * encode: ignore flushing until after first write
+ * go.mod: Update CertMagic
+
+-------------------------------------------------------------------
Old:
----
caddy-2.4.4.tar.gz
New:
----
caddy-2.4.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ caddy.spec ++++++
--- /var/tmp/diff_new_pack.N4i940/_old 2021-10-23 00:52:28.505161066 +0200
+++ /var/tmp/diff_new_pack.N4i940/_new 2021-10-23 00:52:28.509161068 +0200
@@ -19,7 +19,7 @@
%define project github.com/caddyserver/caddy
Name: caddy
-Version: 2.4.4
+Version: 2.4.5
Release: 0
Summary: Fast, multi-platform web server with automatic HTTPS
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.N4i940/_old 2021-10-23 00:52:28.573161096 +0200
+++ /var/tmp/diff_new_pack.N4i940/_new 2021-10-23 00:52:28.573161096 +0200
@@ -5,7 +5,7 @@
<param name="filename">caddy</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
- <param name="revision">v2.4.4</param>
+ <param name="revision">v2.4.5</param>
<param name="changesgenerate">enable</param>
</service>
<service mode="disabled" name="set_version">
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.N4i940/_old 2021-10-23 00:52:28.593161104 +0200
+++ /var/tmp/diff_new_pack.N4i940/_new 2021-10-23 00:52:28.593161104 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/caddyserver/caddy.git</param>
- <param
name="changesrevision">f43fd6f3884d957afc391da3ca689a43ba27eccb</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">46ab93be51754ac16bd7c59443e90481acf83022</param></service></servicedata>
\ No newline at end of file
++++++ caddy-2.4.4.tar.gz -> caddy-2.4.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caddy-2.4.4/.github/workflows/ci.yml
new/caddy-2.4.5/.github/workflows/ci.yml
--- old/caddy-2.4.4/.github/workflows/ci.yml 2021-08-30 21:14:42.000000000
+0200
+++ new/caddy-2.4.5/.github/workflows/ci.yml 2021-09-03 19:42:13.000000000
+0200
@@ -156,9 +156,6 @@
steps:
- name: checkout
uses: actions/checkout@v2
-
- - name: Create 'caddy-build'
- run: mkdir -p caddy-build
- uses: goreleaser/goreleaser-action@v2
with:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caddy-2.4.4/.github/workflows/cross-build.yml
new/caddy-2.4.5/.github/workflows/cross-build.yml
--- old/caddy-2.4.4/.github/workflows/cross-build.yml 2021-08-30
21:14:42.000000000 +0200
+++ new/caddy-2.4.5/.github/workflows/cross-build.yml 2021-09-03
19:42:13.000000000 +0200
@@ -16,7 +16,7 @@
fail-fast: false
matrix:
goos: ['android', 'linux', 'solaris', 'illumos', 'dragonfly',
'freebsd', 'openbsd', 'plan9', 'windows', 'darwin', 'netbsd']
- go: [ '1.16', '1.17' ]
+ go: [ '1.17' ]
runs-on: ubuntu-latest
continue-on-error: true
steps:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caddy-2.4.4/.github/workflows/release.yml
new/caddy-2.4.5/.github/workflows/release.yml
--- old/caddy-2.4.4/.github/workflows/release.yml 2021-08-30
21:14:42.000000000 +0200
+++ new/caddy-2.4.5/.github/workflows/release.yml 2021-09-03
19:42:13.000000000 +0200
@@ -88,10 +88,6 @@
restore-keys: |
${{ runner.os }}-go${{ matrix.go }}-release
- - name: Create the 'caddy-build' dir for GoReleaser
- run: |
- mkdir -p caddy-build
-
# GoReleaser will take care of publishing those artifacts into the release
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caddy-2.4.4/.gitignore new/caddy-2.4.5/.gitignore
--- old/caddy-2.4.4/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/caddy-2.4.5/.gitignore 2021-09-03 19:42:13.000000000 +0200
@@ -0,0 +1,27 @@
+_gitignore/
+*.log
+Caddyfile
+!caddyfile/
+
+# artifacts from pprof tooling
+*.prof
+*.test
+
+# build artifacts and helpers
+cmd/caddy/caddy
+cmd/caddy/caddy.exe
+
+# mac specific
+.DS_Store
+
+# go modules
+vendor
+
+# goreleaser artifacts
+dist
+caddy-build
+caddy-dist
+
+# IDE files
+.idea/
+.vscode/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caddy-2.4.4/cmd/commandfuncs.go
new/caddy-2.4.5/cmd/commandfuncs.go
--- old/caddy-2.4.4/cmd/commandfuncs.go 2021-08-30 21:14:42.000000000 +0200
+++ new/caddy-2.4.5/cmd/commandfuncs.go 2021-09-03 19:42:13.000000000 +0200
@@ -331,7 +331,7 @@
}
func cmdVersion(_ Flags) (int, error) {
- fmt.Println(caddyVersion())
+ fmt.Println(CaddyVersion())
return caddy.ExitCodeSuccess, nil
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caddy-2.4.4/cmd/commands.go
new/caddy-2.4.5/cmd/commands.go
--- old/caddy-2.4.4/cmd/commands.go 2021-08-30 21:14:42.000000000 +0200
+++ new/caddy-2.4.5/cmd/commands.go 2021-09-03 19:42:13.000000000 +0200
@@ -61,6 +61,12 @@
// any error that occurred.
type CommandFunc func(Flags) (int, error)
+// Commands returns a list of commands initialised by
+// RegisterCommand
+func Commands() map[string]Command {
+ return commands
+}
+
var commands = make(map[string]Command)
func init() {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caddy-2.4.4/cmd/main.go new/caddy-2.4.5/cmd/main.go
--- old/caddy-2.4.4/cmd/main.go 2021-08-30 21:14:42.000000000 +0200
+++ new/caddy-2.4.5/cmd/main.go 2021-09-03 19:42:13.000000000 +0200
@@ -420,7 +420,7 @@
fmt.Printf("caddy.AppDataDir=%s\n", caddy.AppDataDir())
fmt.Printf("caddy.AppConfigDir=%s\n", caddy.AppConfigDir())
fmt.Printf("caddy.ConfigAutosavePath=%s\n", caddy.ConfigAutosavePath)
- fmt.Printf("caddy.Version=%s\n", caddyVersion())
+ fmt.Printf("caddy.Version=%s\n", CaddyVersion())
fmt.Printf("runtime.GOOS=%s\n", runtime.GOOS)
fmt.Printf("runtime.GOARCH=%s\n", runtime.GOARCH)
fmt.Printf("runtime.Compiler=%s\n", runtime.Compiler)
@@ -437,8 +437,8 @@
}
}
-// caddyVersion returns a detailed version string, if available.
-func caddyVersion() string {
+// CaddyVersion returns a detailed version string, if available.
+func CaddyVersion() string {
goModule := caddy.GoModule()
ver := goModule.Version
if goModule.Sum != "" {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caddy-2.4.4/go.mod new/caddy-2.4.5/go.mod
--- old/caddy-2.4.4/go.mod 2021-08-30 21:14:42.000000000 +0200
+++ new/caddy-2.4.5/go.mod 2021-09-03 19:42:13.000000000 +0200
@@ -6,7 +6,7 @@
github.com/Masterminds/sprig/v3 v3.2.2
github.com/alecthomas/chroma v0.9.2
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b
- github.com/caddyserver/certmagic v0.14.4
+ github.com/caddyserver/certmagic v0.14.5
github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac
github.com/go-chi/chi v4.1.2+incompatible
github.com/google/cel-go v0.7.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caddy-2.4.4/go.sum new/caddy-2.4.5/go.sum
--- old/caddy-2.4.4/go.sum 2021-08-30 21:14:42.000000000 +0200
+++ new/caddy-2.4.5/go.sum 2021-09-03 19:42:13.000000000 +0200
@@ -173,8 +173,8 @@
github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod
h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod
h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
github.com/caarlos0/ctrlc v1.0.0/go.mod
h1:CdXpj4rmq0q/1Eb44M9zi2nKB0QraNKuRGYGrrHhcQw=
-github.com/caddyserver/certmagic v0.14.4
h1:jlGiMUHOd7p3sgT8zHA/4wckZjIp/6ME2JWGAN5zh5E=
-github.com/caddyserver/certmagic v0.14.4/go.mod
h1:/0VQ5og2Jxa5yBQ8eT80wWS7fi/DgNy1uXeXRUJ1Wj0=
+github.com/caddyserver/certmagic v0.14.5
h1:y4HcFzLLBMsTv8sSlAPj5K55mvntX8e8ExcmB/lhO6w=
+github.com/caddyserver/certmagic v0.14.5/go.mod
h1:/0VQ5og2Jxa5yBQ8eT80wWS7fi/DgNy1uXeXRUJ1Wj0=
github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e/go.mod
h1:9IOqJGCPMSc6E5ydlp5NIonxObaeu/Iub/X03EKPVYo=
github.com/casbin/casbin/v2 v2.1.2/go.mod
h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod
h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/caddy-2.4.4/modules/caddyhttp/encode/encode.go
new/caddy-2.4.5/modules/caddyhttp/encode/encode.go
--- old/caddy-2.4.4/modules/caddyhttp/encode/encode.go 2021-08-30
21:14:42.000000000 +0200
+++ new/caddy-2.4.5/modules/caddyhttp/encode/encode.go 2021-09-03
19:42:13.000000000 +0200
@@ -182,6 +182,7 @@
buf *bytes.Buffer
config *Encode
statusCode int
+ wroteHeader bool
}
// WriteHeader stores the status to write when the time comes
@@ -195,6 +196,19 @@
return enc.Matcher.Match(rw.statusCode, rw.Header())
}
+// Flush implements http.Flusher. It delays the actual Flush of the underlying
ResponseWriterWrapper
+// until headers were written.
+func (rw *responseWriter) Flush() {
+ if !rw.wroteHeader {
+ // flushing the underlying ResponseWriter will write header and
status code,
+ // but we need to delay that until we can determine if we must
encode and
+ // therefore add the Content-Encoding header; this happens in
the first call
+ // to rw.Write (see bug in #4314)
+ return
+ }
+ rw.ResponseWriterWrapper.Flush()
+}
+
// Write writes to the response. If the response qualifies,
// it is encoded using the encoder, which is initialized
// if not done so already.
@@ -225,6 +239,7 @@
if rw.statusCode > 0 {
rw.ResponseWriter.WriteHeader(rw.statusCode)
rw.statusCode = 0
+ rw.wroteHeader = true
}
switch {
@@ -271,6 +286,7 @@
// that rely on If-None-Match, for example
rw.ResponseWriter.WriteHeader(rw.statusCode)
rw.statusCode = 0
+ rw.wroteHeader = true
}
if rw.w != nil {
err2 := rw.w.Close()
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/caddy/vendor.tar.gz
/work/SRC/openSUSE:Factory/.caddy.new.1890/vendor.tar.gz differ: char 5, line 1
