The package rpms/caddy.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/caddy.git/commit/?id=4759c7e6bc33...
https://src.fedoraproject.org/cgit/rpms/caddy.git/commit/?id=c25c9bb6c838....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64
ppc64le s390x %{mips}}
+ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64
ppc64le s390x %{mips}}
Thanks.
Full change:
============
commit c493730dee9a9b08cf3900dcbaaa901abd64e5e6
Author: Carl George <carl(a)george.computer>
Date: Sat Sep 7 00:08:16 2019 -0500
Disable all plugins for bootstrap build
diff --git a/caddy.spec b/caddy.spec
index 6631a0b..43bc3f6 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -1,3 +1,6 @@
+%bcond_without bootstrap
+
+%if %{without bootstrap}
%bcond_without check
# http plugins
%bcond_without geoip
@@ -10,6 +13,7 @@
%bcond_without pdns
%bcond_without rackspace
%bcond_without route53
+%endif
#
https://github.com/caddyserver/caddy
%global goipath
github.com/caddyserver/caddy
@@ -257,6 +261,7 @@ fi
- Add patch1 to adjust blackfriday import path
- Add devel subpackages
- Run test suite
+- Disable all plugins for bootstrap build
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit a8925e4acb4a441d75545edcb5f70bb379cc6358
Author: Carl George <carl(a)george.computer>
Date: Sat Sep 7 00:07:17 2019 -0500
Run test suite
diff --git a/caddy.spec b/caddy.spec
index 67f0398..6631a0b 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -1,3 +1,4 @@
+%bcond_without check
# http plugins
%bcond_without geoip
%bcond_without realip
@@ -65,6 +66,12 @@ BuildRequires:
golang(golang.org/x/net/http2)
BuildRequires: golang(gopkg.in/natefinch/lumberjack.v2)
BuildRequires: golang(gopkg.in/yaml.v2)
+%if %{with check}
+BuildRequires:
golang(golang.org/x/net/websocket)
+BuildRequires: golang(gopkg.in/mcuadros/go-syslog.v2)
+BuildRequires: golang(gopkg.in/mcuadros/go-syslog.v2/format)
+%endif
+
# http plugins
%if %{with geoip}
BuildRequires:
golang(github.com/aablinov/caddy-geoip)
@@ -161,6 +168,12 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/caddy/conf.d
install -d -m 0750 %{buildroot}%{_sharedstatedir}/caddy
+%if %{with check}
+%check
+%gocheck
+%endif
+
+
%pre
getent group caddy &> /dev/null || \
groupadd -r caddy &> /dev/null
@@ -243,6 +256,7 @@ fi
- Add patch0 to fix `-version` flag
- Add patch1 to adjust blackfriday import path
- Add devel subpackages
+- Run test suite
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit 3f7fb4d2f0b3b952d3d707b91c33ed5f5af9399f
Author: Carl George <carl(a)george.computer>
Date: Fri Sep 6 23:43:51 2019 -0500
Add devel subpackages
diff --git a/caddy.spec b/caddy.spec
index e26ad87..67f0398 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -12,13 +12,22 @@
#
https://github.com/caddyserver/caddy
%global goipath
github.com/caddyserver/caddy
+%global goaltipaths
github.com/mholt/caddy
Version: 1.0.3
%gometa
+%global common_description %{expand:
+Caddy is the HTTP/2 web server with automatic HTTPS.}
+
%global golicenses LICENSE.txt
%global godocs dist/README.txt dist/CHANGES.txt
+# added in F32, remove in F34
+%global godevelheader %{expand:
+Obsoletes: golang-github-mholt-caddy-devel < 1.0.0-3
+}
+
Name: caddy
Release: 1%{?dist}
Summary: HTTP/2 web server with automatic HTTPS
@@ -100,10 +109,9 @@ BuildRequires: systemd
Provides: webserver
-%description
-Caddy is the HTTP/2 web server with automatic HTTPS. Official Caddy builds
-with customized plugins can be downloaded from
https://caddyserver.com. This
-package is an unofficial build with the following plugins:
+%description %{common_description}
+
+This package was built with the following plugins:
%{?with_geoip: http.geoip
}%{?with_realip: http.realip
@@ -117,6 +125,9 @@ package is an unofficial build with the following plugins:
}
+%gopkg
+
+
%prep
%goprep
%patch0 -p 1
@@ -141,6 +152,7 @@ export LDFLAGS="${LDFLAGS:-} -X
%{goipath}/caddy/caddymain.appVersion=v%{version
%install
+%gopkginstall
install -D -m 0755 %{gobuilddir}/bin/caddy %{buildroot}%{_bindir}/caddy
install -D -m 0644 %{S:1} %{buildroot}%{_sysconfdir}/caddy/caddy.conf
install -D -m 0644 %{S:2} %{buildroot}%{_unitdir}/caddy.service
@@ -220,6 +232,9 @@ fi
%attr(0750,caddy,caddy) %dir %{_sharedstatedir}/caddy
+%gopkgfiles
+
+
%changelog
* Sat Sep 07 2019 Carl George <carl(a)george.computer> - 1.0.3-1
- Latest upstream
@@ -227,6 +242,7 @@ fi
- Remove dyn, gandi, namecheap, and rfc2136 dns providers
- Add patch0 to fix `-version` flag
- Add patch1 to adjust blackfriday import path
+- Add devel subpackages
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit d6fa51f5a2243fd81c9fbfb5bcaa0a81b66c31fb
Author: Carl George <carl(a)george.computer>
Date: Fri Sep 6 23:42:37 2019 -0500
Add patch1 to adjust blackfriday import path
diff --git a/caddy.spec b/caddy.spec
index 5b9b6e4..e26ad87 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -30,6 +30,8 @@ Source2: caddy.service
Source3: index.html
#
https://github.com/caddyserver/caddy/issues/2584
Patch0: enable-appVersion-ldflag.patch
+#
https://github.com/caddyserver/caddy/pull/2728
+Patch1: use-gopkgin-blackfriday-import-path.patch
#
https://github.com/mholt/caddy/commit/80dfb8b2a7f89b120a627bc4d866a1dc5ed...
BuildRequires: golang >= 1.12
@@ -118,6 +120,7 @@ package is an unofficial build with the following plugins:
%prep
%goprep
%patch0 -p 1
+%patch1 -p 1
sed -e '/where other plugins get plugged in/ a \\t// plugins
added during rpmbuild' \
%{?with_geoip: -e '/where other plugins get plugged in/ a \\t_
"github.com/aablinov/caddy-geoip"'} \
@@ -223,6 +226,7 @@ fi
- Remove bundled lego and plugins
- Remove dyn, gandi, namecheap, and rfc2136 dns providers
- Add patch0 to fix `-version` flag
+- Add patch1 to adjust blackfriday import path
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/use-gopkgin-blackfriday-import-path.patch
b/use-gopkgin-blackfriday-import-path.patch
new file mode 100644
index 0000000..e0e6f40
--- /dev/null
+++ b/use-gopkgin-blackfriday-import-path.patch
@@ -0,0 +1,126 @@
+From c86d6f5af5fb85ae9de10d10138557304499ef05 Mon Sep 17 00:00:00 2001
+From: Carl George <carl(a)george.computer>
+Date: Mon, 26 Aug 2019 21:09:05 -0500
+Subject: [PATCH] Use gopkg.in/russross/blackfriday.v1 import path
+
+Blackfriday's README recommends using the gopkg.in import path.
+Additionally, in Fedora the
github.com/russross/blackfriday import path
+is owned by the v2 RPM package, so this change makes Fedora packaging
+easier.
+---
+ caddyhttp/httpserver/tplcontext.go | 2 +-
+ caddyhttp/markdown/markdown.go | 2 +-
+ caddyhttp/markdown/markdown_test.go | 2 +-
+ caddyhttp/markdown/process.go | 2 +-
+ caddyhttp/markdown/setup.go | 2 +-
+ caddyhttp/markdown/summary/render.go | 2 +-
+ caddyhttp/markdown/summary/summary.go | 2 +-
+ go.mod | 2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/caddyhttp/httpserver/tplcontext.go b/caddyhttp/httpserver/tplcontext.go
+index 5688679c1..b4965edf3 100644
+--- a/caddyhttp/httpserver/tplcontext.go
++++ b/caddyhttp/httpserver/tplcontext.go
+@@ -35,7 +35,7 @@ import (
+
+ "github.com/caddyserver/caddy/caddytls"
+ "github.com/mholt/certmagic"
+- "github.com/russross/blackfriday"
++ "gopkg.in/russross/blackfriday.v1"
+ )
+
+ // This file contains the context and functions available for
+diff --git a/caddyhttp/markdown/markdown.go b/caddyhttp/markdown/markdown.go
+index 4f688efd1..70b52a375 100644
+--- a/caddyhttp/markdown/markdown.go
++++ b/caddyhttp/markdown/markdown.go
+@@ -27,7 +27,7 @@ import (
+ "time"
+
+ "github.com/caddyserver/caddy/caddyhttp/httpserver"
+- "github.com/russross/blackfriday"
++ "gopkg.in/russross/blackfriday.v1"
+ )
+
+ // Markdown implements a layer of middleware that serves
+diff --git a/caddyhttp/markdown/markdown_test.go b/caddyhttp/markdown/markdown_test.go
+index 87a5a164b..f6bfaf09e 100644
+--- a/caddyhttp/markdown/markdown_test.go
++++ b/caddyhttp/markdown/markdown_test.go
+@@ -25,7 +25,7 @@ import (
+
+ "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/caddyhttp/httpserver"
+- "github.com/russross/blackfriday"
++ "gopkg.in/russross/blackfriday.v1"
+ )
+
+ func TestMarkdown(t *testing.T) {
+diff --git a/caddyhttp/markdown/process.go b/caddyhttp/markdown/process.go
+index 7880a4c67..b9e27b0f0 100644
+--- a/caddyhttp/markdown/process.go
++++ b/caddyhttp/markdown/process.go
+@@ -22,7 +22,7 @@ import (
+ "github.com/caddyserver/caddy/caddyhttp/httpserver"
+ "github.com/caddyserver/caddy/caddyhttp/markdown/metadata"
+ "github.com/caddyserver/caddy/caddyhttp/markdown/summary"
+- "github.com/russross/blackfriday"
++ "gopkg.in/russross/blackfriday.v1"
+ )
+
+ // FileInfo represents a file in a particular server context. It wraps the os.FileInfo
struct.
+diff --git a/caddyhttp/markdown/setup.go b/caddyhttp/markdown/setup.go
+index deda20189..0d453847a 100644
+--- a/caddyhttp/markdown/setup.go
++++ b/caddyhttp/markdown/setup.go
+@@ -20,7 +20,7 @@ import (
+
+ "github.com/caddyserver/caddy"
+ "github.com/caddyserver/caddy/caddyhttp/httpserver"
+- "github.com/russross/blackfriday"
++ "gopkg.in/russross/blackfriday.v1"
+ )
+
+ func init() {
+diff --git a/caddyhttp/markdown/summary/render.go b/caddyhttp/markdown/summary/render.go
+index 95e375105..12d04ff75 100644
+--- a/caddyhttp/markdown/summary/render.go
++++ b/caddyhttp/markdown/summary/render.go
+@@ -17,7 +17,7 @@ package summary
+ import (
+ "bytes"
+
+- "github.com/russross/blackfriday"
++ "gopkg.in/russross/blackfriday.v1"
+ )
+
+ // Ensure we implement the Blackfriday Markdown Renderer interface
+diff --git a/caddyhttp/markdown/summary/summary.go
b/caddyhttp/markdown/summary/summary.go
+index 18d1db3b0..b850d95a1 100644
+--- a/caddyhttp/markdown/summary/summary.go
++++ b/caddyhttp/markdown/summary/summary.go
+@@ -17,7 +17,7 @@ package summary
+ import (
+ "bytes"
+
+- "github.com/russross/blackfriday"
++ "gopkg.in/russross/blackfriday.v1"
+ )
+
+ // Markdown formats input using a plain-text renderer, and
+diff --git a/go.mod b/go.mod
+index 987f8dccc..23cce2069 100644
+--- a/go.mod
++++ b/go.mod
+@@ -17,9 +17,9 @@ require (
+
github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2
+
github.com/naoina/go-stringutil v0.1.0 // indirect
+
github.com/naoina/toml v0.1.1
+-
github.com/russross/blackfriday v0.0.0-20170610170232-067529f716f4
+
golang.org/x/net v0.0.0-20190328230028-74de082e2cca
+ gopkg.in/mcuadros/go-syslog.v2 v2.2.1
+ gopkg.in/natefinch/lumberjack.v2 v2.0.0
++ gopkg.in/russross/blackfriday.v1 v1.5
+ gopkg.in/yaml.v2 v2.2.2
+ )
commit ba5896a8a94665a60d9f7cd7b4834cdf847d02bf
Author: Carl George <carl(a)george.computer>
Date: Fri Sep 6 23:40:47 2019 -0500
Add patch0 to fix `-version` flag
diff --git a/caddy.spec b/caddy.spec
index f424f12..5b9b6e4 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -28,6 +28,8 @@ Source0: %{gosource}
Source1: caddy.conf
Source2: caddy.service
Source3: index.html
+#
https://github.com/caddyserver/caddy/issues/2584
+Patch0: enable-appVersion-ldflag.patch
#
https://github.com/mholt/caddy/commit/80dfb8b2a7f89b120a627bc4d866a1dc5ed...
BuildRequires: golang >= 1.12
@@ -115,6 +117,7 @@ package is an unofficial build with the following plugins:
%prep
%goprep
+%patch0 -p 1
sed -e '/where other plugins get plugged in/ a \\t// plugins
added during rpmbuild' \
%{?with_geoip: -e '/where other plugins get plugged in/ a \\t_
"github.com/aablinov/caddy-geoip"'} \
@@ -130,7 +133,7 @@ sed -e '/where other plugins get plugged in/ a
\\t// plugins
%build
-export LDFLAGS="${LDFLAGS:-} -X
%{goipath}/caddy/caddymain.appVersion=%{version}"
+export LDFLAGS="${LDFLAGS:-} -X %{goipath}/caddy/caddymain.appVersion=v%{version}
"
%gobuild -o %{gobuilddir}/bin/caddy %{goipath}/caddy
@@ -219,6 +222,7 @@ fi
- Latest upstream
- Remove bundled lego and plugins
- Remove dyn, gandi, namecheap, and rfc2136 dns providers
+- Add patch0 to fix `-version` flag
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/enable-appVersion-ldflag.patch b/enable-appVersion-ldflag.patch
new file mode 100644
index 0000000..359bdfd
--- /dev/null
+++ b/enable-appVersion-ldflag.patch
@@ -0,0 +1,88 @@
+diff -Nurp caddy-1.0.3.orig/caddy/caddymain/run.go caddy-1.0.3/caddy/caddymain/run.go
+--- caddy-1.0.3.orig/caddy/caddymain/run.go 2019-08-14 14:45:42.000000000 -0500
++++ caddy-1.0.3/caddy/caddymain/run.go 2019-08-26 19:46:28.041828503 -0500
+@@ -25,7 +25,6 @@ import (
+ "os"
+ "path/filepath"
+ "runtime"
+- "runtime/debug"
+ "strconv"
+ "strings"
+
+@@ -78,12 +77,10 @@ func init() {
+ func Run() {
+ flag.Parse()
+
+- module := getBuildModule()
+- cleanModVersion := strings.TrimPrefix(module.Version, "v")
+-
+ caddy.AppName = appName
+- caddy.AppVersion = module.Version
+- certmagic.UserAgent = appName + "/" + cleanModVersion
++ caddy.AppVersion = appVersion
++ cleanVersion := strings.TrimPrefix(appVersion, "v")
++ certmagic.UserAgent = appName + "/" + cleanVersion
+
+ // Set up process log before anything bad happens
+ switch logfile {
+@@ -147,12 +144,7 @@ func Run() {
+ os.Exit(0)
+ }
+ if version {
+- if module.Sum != "" {
+- // a build with a known version will also have a checksum
+- fmt.Printf("Caddy %s (%s)\n", module.Version, module.Sum)
+- } else {
+- fmt.Println(module.Version)
+- }
++ fmt.Println(appVersion)
+ os.Exit(0)
+ }
+ if plugins {
+@@ -196,7 +188,7 @@ func Run() {
+ }
+
+ // Begin telemetry (these are no-ops if telemetry disabled)
+- telemetry.Set("caddy_version", module.Version)
++ telemetry.Set("caddy_version", appVersion)
+ telemetry.Set("num_listeners", len(instance.Servers()))
+ telemetry.Set("server_type", serverType)
+ telemetry.Set("os", runtime.GOOS)
+@@ -277,27 +269,6 @@ func defaultLoader(serverType string) (c
+ }, nil
+ }
+
+-// getBuildModule returns the build info of Caddy
+-// from debug.BuildInfo (requires Go modules). If
+-// no version information is available, a non-nil
+-// value will still be returned, but with an
+-// unknown version.
+-func getBuildModule() *debug.Module {
+- bi, ok := debug.ReadBuildInfo()
+- if ok {
+- // The recommended way to build Caddy involves
+- // creating a separate main module, which
+- // preserves caddy a read-only dependency
+- // TODO: track related Go issue:
https://github.com/golang/go/issues/29228
+- for _, mod := range bi.Deps {
+- if mod.Path == "github.com/caddyserver/caddy" {
+- return mod
+- }
+- }
+- }
+- return &debug.Module{Version: "unknown"}
+-}
+-
+ func checkJSONCaddyfile() {
+ if fromJSON {
+ jsonBytes, err := ioutil.ReadAll(os.Stdin)
+@@ -578,6 +549,9 @@ func ParseEnvFile(envInput io.Reader) (m
+
+ const appName = "Caddy"
+
++// Build information
++var appVersion = "unknown"
++
+ // Flags that control program flow or startup
+ var (
+ serverType string
commit 4759c7e6bc3310f42e13450e1b0257ec231e200e
Author: Carl George <carl(a)george.computer>
Date: Fri Sep 6 22:58:52 2019 -0500
Switch to new go macros
diff --git a/caddy.spec b/caddy.spec
index 128ee63..f424f12 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -10,36 +10,27 @@
%bcond_without rackspace
%bcond_without route53
-%bcond_with debug
+#
https://github.com/caddyserver/caddy
+%global goipath
github.com/caddyserver/caddy
+Version: 1.0.3
-%if %{with debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
+%gometa
-%if %{undefined gobuild}
-%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od
-An -tx1|tr -d ' \\n')" -a -v -x %{?**};
-%endif
+%global golicenses LICENSE.txt
+%global godocs dist/README.txt dist/CHANGES.txt
Name: caddy
-Version: 1.0.3
Release: 1%{?dist}
Summary: HTTP/2 web server with automatic HTTPS
License: ASL 2.0
URL:
https://caddyserver.com
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64
ppc64le s390x %{mips}}
-
-# caddy
-%global import_path
github.com/mholt/caddy
-Source0: https://%{import_path}/archive/v%{version}/caddy-%{version}.tar.gz
-Source1: caddy.conf
-Source2: caddy.service
-Source3: index.html
+Source0: %{gosource}
+Source1: caddy.conf
+Source2: caddy.service
+Source3: index.html
#
https://github.com/mholt/caddy/commit/80dfb8b2a7f89b120a627bc4d866a1dc5ed...
BuildRequires: golang >= 1.12
-%{?go_compiler:BuildRequires: compiler(go-compiler)}
BuildRequires:
golang(github.com/dustin/go-humanize)
BuildRequires:
golang(github.com/flynn/go-shlex)
BuildRequires:
golang(github.com/go-acme/lego/certcrypto)
@@ -123,12 +114,7 @@ package is an unofficial build with the following plugins:
%prep
-%setup -q -c
-
-cp caddy-%{version}/LICENSE.txt LICENSE.txt
-cp caddy-%{version}/dist/README.txt README.txt
-mkdir -p $(dirname _build/src/%{import_path})
-mv caddy-%{version} _build/src/%{import_path}
+%goprep
sed -e '/where other plugins get plugged in/ a \\t// plugins
added during rpmbuild' \
%{?with_geoip: -e '/where other plugins get plugged in/ a \\t_
"github.com/aablinov/caddy-geoip"'} \
@@ -140,17 +126,16 @@ sed -e '/where other plugins get plugged in/
a \\t// plugins
%{?with_pdns: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/pdns"'} \
%{?with_rackspace: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/rackspace"'} \
%{?with_route53: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/route53"'} \
- -i _build/src/%{import_path}/caddy/caddymain/run.go
+ -i caddy/caddymain/run.go
%build
-export GOPATH="$PWD/_build:%{gopath}"
-export LDFLAGS="${LDFLAGS:-} -X
%{import_path}/caddy/caddymain.appVersion=%{version}"
-%gobuild -o _bin/caddy %{import_path}/caddy
+export LDFLAGS="${LDFLAGS:-} -X
%{goipath}/caddy/caddymain.appVersion=%{version}"
+%gobuild -o %{gobuilddir}/bin/caddy %{goipath}/caddy
%install
-install -D -m 0755 _bin/caddy %{buildroot}%{_bindir}/caddy
+install -D -m 0755 %{gobuilddir}/bin/caddy %{buildroot}%{_bindir}/caddy
install -D -m 0644 %{S:1} %{buildroot}%{_sysconfdir}/caddy/caddy.conf
install -D -m 0644 %{S:2} %{buildroot}%{_unitdir}/caddy.service
install -D -m 0644 %{S:3} %{buildroot}%{_datadir}/caddy/index.html
@@ -218,8 +203,8 @@ fi
%files
-%license LICENSE.txt
-%doc README.txt
+%license %{golicenses}
+%doc %{godocs}
%{_bindir}/caddy
%{_datadir}/caddy
%{_unitdir}/caddy.service
commit 74c6a0da33bdacb6b686f0a6f6a15c94d2d003cb
Author: Carl George <carl(a)george.computer>
Date: Fri Sep 6 22:44:23 2019 -0500
Remove dyn, gandi, namecheap, and rfc2136 dns providers
diff --git a/caddy.spec b/caddy.spec
index 981e180..128ee63 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -5,13 +5,9 @@
%bcond_without azure
%bcond_without cloudflare
%bcond_without digitalocean
-%bcond_without dyn
-%bcond_without gandi
%bcond_without googlecloud
-%bcond_without namecheap
%bcond_without pdns
%bcond_without rackspace
-%bcond_without rfc2136
%bcond_without route53
%bcond_with debug
@@ -86,22 +82,10 @@ BuildRequires:
golang(github.com/go-acme/lego/providers/dns/cloudflare)
BuildRequires:
golang(github.com/caddyserver/dnsproviders/digitalocean)
BuildRequires:
golang(github.com/go-acme/lego/providers/dns/digitalocean)
%endif
-%if %{with dyn}
-BuildRequires:
golang(github.com/caddyserver/dnsproviders/dyn)
-BuildRequires:
golang(github.com/go-acme/lego/providers/dns/dyn)
-%endif
-%if %{with gandi}
-BuildRequires:
golang(github.com/caddyserver/dnsproviders/gandi)
-BuildRequires:
golang(github.com/go-acme/lego/providers/dns/gandi)
-%endif
%if %{with googlecloud}
BuildRequires:
golang(github.com/caddyserver/dnsproviders/googlecloud)
BuildRequires:
golang(github.com/go-acme/lego/providers/dns/gcloud)
%endif
-%if %{with namecheap}
-BuildRequires:
golang(github.com/caddyserver/dnsproviders/namecheap)
-BuildRequires:
golang(github.com/go-acme/lego/providers/dns/namecheap)
-%endif
%if %{with pdns}
BuildRequires:
golang(github.com/caddyserver/dnsproviders/pdns)
BuildRequires:
golang(github.com/go-acme/lego/providers/dns/pdns)
@@ -110,10 +94,6 @@ BuildRequires:
golang(github.com/go-acme/lego/providers/dns/pdns)
BuildRequires:
golang(github.com/caddyserver/dnsproviders/rackspace)
BuildRequires:
golang(github.com/go-acme/lego/providers/dns/rackspace)
%endif
-%if %{with rfc2136}
-BuildRequires:
golang(github.com/caddyserver/dnsproviders/rfc2136)
-BuildRequires:
golang(github.com/go-acme/lego/providers/dns/rfc2136)
-%endif
%if %{with route53}
BuildRequires:
golang(github.com/caddyserver/dnsproviders/route53)
BuildRequires:
golang(github.com/go-acme/lego/providers/dns/route53)
@@ -135,13 +115,9 @@ package is an unofficial build with the following plugins:
}%{?with_azure: tls.dns.azure
}%{?with_cloudflare: tls.dns.cloudflare
}%{?with_digitalocean: tls.dns.digitalocean
-}%{?with_dyn: tls.dns.dyn
-}%{?with_gandi: tls.dns.gandi
}%{?with_googlecloud: tls.dns.googlecloud
-}%{?with_namecheap: tls.dns.namecheap
}%{?with_pdns: tls.dns.powerdns
}%{?with_rackspace: tls.dns.rackspace
-}%{?with_rfc2136: tls.dns.rfc2136
}%{?with_route53: tls.dns.route53
}
@@ -160,13 +136,9 @@ sed -e '/where other plugins get plugged in/
a \\t// plugins
%{?with_azure: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/azure"'} \
%{?with_cloudflare: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/cloudflare"'} \
%{?with_digitalocean: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/digitalocean"'} \
-%{?with_dyn: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/dyn"'} \
-%{?with_gandi: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/gandi"'} \
%{?with_googlecloud: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/googlecloud"'} \
-%{?with_namecheap: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/namecheap"'} \
%{?with_pdns: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/pdns"'} \
%{?with_rackspace: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/rackspace"'} \
-%{?with_rfc2136: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/rfc2136"'} \
%{?with_route53: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/route53"'} \
-i _build/src/%{import_path}/caddy/caddymain/run.go
@@ -261,6 +233,7 @@ fi
* Sat Sep 07 2019 Carl George <carl(a)george.computer> - 1.0.3-1
- Latest upstream
- Remove bundled lego and plugins
+- Remove dyn, gandi, namecheap, and rfc2136 dns providers
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit e1d736ca64360d7be258970e67686bdb5debee58
Author: Carl George <carl(a)george.computer>
Date: Fri Sep 6 22:22:46 2019 -0500
Remove bundled lego and plugins
diff --git a/caddy.spec b/caddy.spec
index 9665f1a..981e180 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -1,21 +1,18 @@
-# plugins
+# http plugins
%bcond_without geoip
%bcond_without realip
+# dns plugins
+%bcond_without azure
%bcond_without cloudflare
%bcond_without digitalocean
%bcond_without dyn
%bcond_without gandi
+%bcond_without googlecloud
%bcond_without namecheap
%bcond_without pdns
%bcond_without rackspace
%bcond_without rfc2136
-%bcond_without googlecloud
%bcond_without route53
-%bcond_without azure
-
-%if %{with azure}%{with cloudflare}%{with digitalocean}%{with dyn}%{with gandi}%{with
googlecloud}%{with namecheap}%{with pdns}%{with rackspace}%{with rfc2136}%{with route53}
-%bcond_without dnsproviders
-%endif
%bcond_with debug
@@ -33,7 +30,7 @@ Name: caddy
Version: 1.0.3
Release: 1%{?dist}
Summary: HTTP/2 web server with automatic HTTPS
-License: ASL 2.0 and MIT
+License: ASL 2.0
URL:
https://caddyserver.com
ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64
ppc64le s390x %{mips}}
@@ -68,76 +65,58 @@ BuildRequires:
golang(golang.org/x/net/http2)
BuildRequires: golang(gopkg.in/natefinch/lumberjack.v2)
BuildRequires: golang(gopkg.in/yaml.v2)
-# dnsproviders
-%global import_path_dnsproviders
github.com/caddyserver/dnsproviders
-%global version_dnsproviders 0.1.3
-Source10:
https://%{import_path_dnsproviders}/archive/v%{version_dnsproviders}/dnsproviders-%{version_dnsproviders}.tar.gz
-
-# lego
-%global import_path_lego
github.com/xenolf/lego
-%global version_lego 2.2.0
-Source11:
https://%{import_path_lego}/archive/v%{version_lego}/lego-%{version_lego}.tar.gz
+# http plugins
+%if %{with geoip}
+BuildRequires:
golang(github.com/aablinov/caddy-geoip)
+%endif
+%if %{with realip}
+BuildRequires:
golang(github.com/captncraig/caddy-realip)
+%endif
+# dns plugins
%if %{with azure}
-Provides: bundled(golang(%{import_path_dnsproviders}/azure)) = %{version_dnsproviders}
-Provides: bundled(golang(%{import_path_lego}/providers/dns/azure)) = %{version_lego}
+BuildRequires:
golang(github.com/caddyserver/dnsproviders/azure)
+BuildRequires:
golang(github.com/go-acme/lego/providers/dns/azure)
%endif
%if %{with cloudflare}
-Provides: bundled(golang(%{import_path_dnsproviders}/cloudflare)) =
%{version_dnsproviders}
-Provides: bundled(golang(%{import_path_lego}/providers/dns/cloudflare)) =
%{version_lego}
+BuildRequires:
golang(github.com/caddyserver/dnsproviders/cloudflare)
+BuildRequires:
golang(github.com/go-acme/lego/providers/dns/cloudflare)
%endif
%if %{with digitalocean}
-Provides: bundled(golang(%{import_path_dnsproviders}/digitalocean)) =
%{version_dnsproviders}
-Provides: bundled(golang(%{import_path_lego}/providers/dns/digitalocean)) =
%{version_lego}
+BuildRequires:
golang(github.com/caddyserver/dnsproviders/digitalocean)
+BuildRequires:
golang(github.com/go-acme/lego/providers/dns/digitalocean)
%endif
%if %{with dyn}
-Provides: bundled(golang(%{import_path_dnsproviders}/dyn)) = %{version_dnsproviders}
-Provides: bundled(golang(%{import_path_lego}/providers/dns/dyn)) = %{version_lego}
+BuildRequires:
golang(github.com/caddyserver/dnsproviders/dyn)
+BuildRequires:
golang(github.com/go-acme/lego/providers/dns/dyn)
%endif
%if %{with gandi}
-Provides: bundled(golang(%{import_path_dnsproviders}/gandi)) = %{version_dnsproviders}
-Provides: bundled(golang(%{import_path_lego}/providers/dns/gandi)) = %{version_lego}
+BuildRequires:
golang(github.com/caddyserver/dnsproviders/gandi)
+BuildRequires:
golang(github.com/go-acme/lego/providers/dns/gandi)
%endif
%if %{with googlecloud}
-Provides: bundled(golang(%{import_path_dnsproviders}/googlecloud)) =
%{version_dnsproviders}
-Provides: bundled(golang(%{import_path_lego}/providers/dns/googlecloud)) =
%{version_lego}
+BuildRequires:
golang(github.com/caddyserver/dnsproviders/googlecloud)
+BuildRequires:
golang(github.com/go-acme/lego/providers/dns/gcloud)
%endif
%if %{with namecheap}
-Provides: bundled(golang(%{import_path_dnsproviders}/namecheap)) =
%{version_dnsproviders}
-Provides: bundled(golang(%{import_path_lego}/providers/dns/namecheap)) = %{version_lego}
+BuildRequires:
golang(github.com/caddyserver/dnsproviders/namecheap)
+BuildRequires:
golang(github.com/go-acme/lego/providers/dns/namecheap)
%endif
%if %{with pdns}
-Provides: bundled(golang(%{import_path_dnsproviders}/pdns)) = %{version_dnsproviders}
-Provides: bundled(golang(%{import_path_lego}/providers/dns/pdns)) = %{version_lego}
+BuildRequires:
golang(github.com/caddyserver/dnsproviders/pdns)
+BuildRequires:
golang(github.com/go-acme/lego/providers/dns/pdns)
%endif
%if %{with rackspace}
-Provides: bundled(golang(%{import_path_dnsproviders}/rackspace)) =
%{version_dnsproviders}
-Provides: bundled(golang(%{import_path_lego}/providers/dns/rackspace)) = %{version_lego}
+BuildRequires:
golang(github.com/caddyserver/dnsproviders/rackspace)
+BuildRequires:
golang(github.com/go-acme/lego/providers/dns/rackspace)
%endif
%if %{with rfc2136}
-Provides: bundled(golang(%{import_path_dnsproviders}/rfc2136)) = %{version_dnsproviders}
-Provides: bundled(golang(%{import_path_lego}/providers/dns/rfc2136)) = %{version_lego}
+BuildRequires:
golang(github.com/caddyserver/dnsproviders/rfc2136)
+BuildRequires:
golang(github.com/go-acme/lego/providers/dns/rfc2136)
%endif
%if %{with route53}
-Provides: bundled(golang(%{import_path_dnsproviders}/route53)) = %{version_dnsproviders}
-Provides: bundled(golang(%{import_path_lego}/providers/dns/route53)) = %{version_lego}
-%endif
-
-# geoip
-%global import_path_geoip
github.com/kodnaplakal/caddy-geoip
-%global commit_geoip 6af15b436fdcb08a743c30f9bad044ad32b53b49
-Source20:
https://%{import_path_geoip}/archive/%{commit_geoip}/geoip-%{commit_geoip}.tar.gz
-%if %{with geoip}
-Provides: bundled(golang(%{import_path_geoip})) = %{commit_geoip}
-BuildRequires:
golang(github.com/oschwald/maxminddb-golang)
-%endif
-
-# realip
-%global import_path_realip
github.com/captncraig/caddy-realip
-%global commit_realip 5dd1f4047d0f649f21ba9f8d7e491d712be9a5b0
-Source21:
https://%{import_path_realip}/archive/%{commit_realip}/realip-%{commit_realip}.tar.gz
-%if %{with realip}
-Provides: bundled(golang(%{import_path_realip})) = %{commit_realip}
+BuildRequires:
golang(github.com/caddyserver/dnsproviders/route53)
+BuildRequires:
golang(github.com/go-acme/lego/providers/dns/route53)
%endif
BuildRequires: systemd
@@ -145,191 +124,6 @@ BuildRequires: systemd
Provides: webserver
-# vendored libraries (Source11)
-Provides:
bundled(golang(cloud.google.com/go/compute/metadata)) = 0.26.0
-Provides:
bundled(golang(github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2017-0... =
19.1.0
-Provides:
bundled(golang(github.com/Azure/azure-sdk-for-go/version)) = 19.1.0
-Provides:
bundled(golang(github.com/Azure/go-autorest/autorest)) = 10.15.2
-Provides:
bundled(golang(github.com/Azure/go-autorest/autorest/adal)) = 10.15.2
-Provides:
bundled(golang(github.com/Azure/go-autorest/autorest/azure)) = 10.15.2
-Provides:
bundled(golang(github.com/Azure/go-autorest/autorest/azure/auth)) =
10.15.2
-Provides:
bundled(golang(github.com/Azure/go-autorest/autorest/date)) = 10.15.2
-Provides:
bundled(golang(github.com/Azure/go-autorest/autorest/to)) = 10.15.2
-Provides:
bundled(golang(github.com/Azure/go-autorest/autorest/validation)) =
10.15.2
-Provides:
bundled(golang(github.com/Azure/go-autorest/logger)) = 10.15.2
-Provides:
bundled(golang(github.com/Azure/go-autorest/version)) = 10.15.2
-Provides:
bundled(golang(github.com/JamesClonk/vultr/lib)) = 1.15.0
-Provides:
bundled(golang(github.com/OpenDNS/vegadns2client)) =
a3fa4a771d87bda2514a90a157e1fed1b6897d2e
-Provides:
bundled(golang(github.com/akamai/AkamaiOPEN-edgegrid-golang/client-v1)) =
0.7.3
-Provides:
bundled(golang(github.com/akamai/AkamaiOPEN-edgegrid-golang/configdns-v1)) = 0.7.3
-Provides:
bundled(golang(github.com/akamai/AkamaiOPEN-edgegrid-golang/edgegrid)) =
0.7.3
-Provides:
bundled(golang(github.com/akamai/AkamaiOPEN-edgegrid-golang/jsonhooks-v1)) = 0.7.3
-Provides:
bundled(golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk)) = 1.27.7
-Provides:
bundled(golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth)) =
1.27.7
-Provides:
bundled(golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/credentials)) = 1.27.7
-Provides:
bundled(golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/signers))
= 1.27.7
-Provides:
bundled(golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk/endpoints)) =
1.27.7
-Provides:
bundled(golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors)) =
1.27.7
-Provides:
bundled(golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests)) =
1.27.7
-Provides:
bundled(golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses)) =
1.27.7
-Provides:
bundled(golang(github.com/aliyun/alibaba-cloud-sdk-go/sdk/utils)) =
1.27.7
-Provides:
bundled(golang(github.com/aliyun/alibaba-cloud-sdk-go/services/alidns)) =
1.27.7
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) =
1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds))
= 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) =
1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) =
1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil))
= 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) =
1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) =
1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) =
1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) =
1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) =
1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/service/lightsail)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/service/route53)) = 1.15.23
-Provides:
bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.15.23
-Provides:
bundled(golang(github.com/cenkalti/backoff)) = 2.1.1
-Provides:
bundled(golang(github.com/cloudflare/cloudflare-go)) = 0.8.5
-Provides:
bundled(golang(github.com/cpu/goacmedns)) =
565ecf2a84df654865cc102705ac160a3b04fc01
-Provides:
bundled(golang(github.com/davecgh/go-spew/spew)) = 1.1.1
-Provides:
bundled(golang(github.com/decker502/dnspod-go)) =
83a3ba562b048c9fc88229408e593494b7774684
-Provides:
bundled(golang(github.com/dgrijalva/jwt-go)) = 3.2.0
-Provides:
bundled(golang(github.com/dimchansky/utfbom)) =
5448fe645cb1964ba70ac8f9f2ffe975e61a536c
-Provides:
bundled(golang(github.com/dnsimple/dnsimple-go/dnsimple)) = 0.21.0
-Provides:
bundled(golang(github.com/exoscale/egoscale)) = 0.11.6
-Provides:
bundled(golang(github.com/fatih/structs)) = 1.1.0
-Provides:
bundled(golang(github.com/go-ini/ini)) = 1.38.2
-Provides:
bundled(golang(github.com/go-resty/resty)) = 1.8.0
-Provides:
bundled(golang(github.com/golang/protobuf/proto)) = 1.2.0
-Provides:
bundled(golang(github.com/google/go-querystring/query)) =
53e6ce116135b80d037921a7fdd5138cf32d7a8a
-Provides:
bundled(golang(github.com/google/uuid)) = 0.2
-Provides:
bundled(golang(github.com/gophercloud/gophercloud)) =
a2b0ad6ce68c8302027db1a5f9dbb03b0c8ab072
-Provides:
bundled(golang(github.com/gophercloud/gophercloud/openstack)) =
a2b0ad6ce68c8302027db1a5f9dbb03b0c8ab072
-Provides:
bundled(golang(github.com/gophercloud/gophercloud/openstack/dns/v2/record... =
a2b0ad6ce68c8302027db1a5f9dbb03b0c8ab072
-Provides:
bundled(golang(github.com/gophercloud/gophercloud/openstack/dns/v2/zones)) =
a2b0ad6ce68c8302027db1a5f9dbb03b0c8ab072
-Provides:
bundled(golang(github.com/gophercloud/gophercloud/openstack/identity/v2/t... =
a2b0ad6ce68c8302027db1a5f9dbb03b0c8ab072
-Provides:
bundled(golang(github.com/gophercloud/gophercloud/openstack/identity/v2/t... =
a2b0ad6ce68c8302027db1a5f9dbb03b0c8ab072
-Provides:
bundled(golang(github.com/gophercloud/gophercloud/openstack/identity/v3/t... =
a2b0ad6ce68c8302027db1a5f9dbb03b0c8ab072
-Provides:
bundled(golang(github.com/gophercloud/gophercloud/openstack/utils)) =
a2b0ad6ce68c8302027db1a5f9dbb03b0c8ab072
-Provides:
bundled(golang(github.com/gophercloud/gophercloud/pagination)) =
a2b0ad6ce68c8302027db1a5f9dbb03b0c8ab072
-Provides:
bundled(golang(github.com/iij/doapi)) =
8803795a9b7b938fa88ddbd63a77893beee14cd8
-Provides:
bundled(golang(github.com/iij/doapi/protocol)) =
8803795a9b7b938fa88ddbd63a77893beee14cd8
-Provides:
bundled(golang(github.com/jmespath/go-jmespath)) = 0b12d6b5
-Provides:
bundled(golang(github.com/json-iterator/go)) = 1.1.5
-Provides:
bundled(golang(github.com/juju/ratelimit)) = 1.0.1
-Provides:
bundled(golang(github.com/kolo/xmlrpc)) =
16bdd962781df9696f40cc2bab924f1a855a7f89
-Provides:
bundled(golang(github.com/linode/linodego)) = 0.5.1
-Provides:
bundled(golang(github.com/miekg/dns)) = 1.1.0
-Provides:
bundled(golang(github.com/mitchellh/go-homedir)) = 1.0.0
-Provides:
bundled(golang(github.com/mitchellh/mapstructure)) = 1.1.2
-Provides:
bundled(golang(github.com/modern-go/concurrent)) = 1.0.3
-Provides:
bundled(golang(github.com/modern-go/reflect2)) = 1.0.1
-Provides:
bundled(golang(github.com/namedotcom/go/namecom)) =
08470befbe04613bd4b44cb6978b05d50294c4d4
-Provides:
bundled(golang(github.com/nrdcg/auroradns)) = 1.0.0
-Provides:
bundled(golang(github.com/nrdcg/goinwx)) = 0.6.0
-Provides:
bundled(golang(github.com/ovh/go-ovh/ovh)) =
c3e61035ea66f5c637719c90140da4e3ac3b1bf0
-Provides:
bundled(golang(github.com/pkg/errors)) = 0.8.0
-Provides:
bundled(golang(github.com/pmezard/go-difflib/difflib)) = 1.0.0
-Provides:
bundled(golang(github.com/rainycape/memcache)) =
1031fa0ce2f20c1c0e1e1b51951d8ea02c84fa05
-Provides:
bundled(golang(github.com/sacloud/libsacloud)) =
108b1efe4b4d106fee6760bdf1847c4f92e1a92e
-Provides:
bundled(golang(github.com/sacloud/libsacloud/api)) =
108b1efe4b4d106fee6760bdf1847c4f92e1a92e
-Provides:
bundled(golang(github.com/sacloud/libsacloud/sacloud)) =
108b1efe4b4d106fee6760bdf1847c4f92e1a92e
-Provides:
bundled(golang(github.com/sacloud/libsacloud/sacloud/ostype)) =
108b1efe4b4d106fee6760bdf1847c4f92e1a92e
-Provides:
bundled(golang(github.com/satori/go.uuid)) = 1.2.0
-Provides:
bundled(golang(github.com/sirupsen/logrus)) = 1.0.6
-Provides:
bundled(golang(github.com/stretchr/objx)) = 0.1.1
-Provides:
bundled(golang(github.com/stretchr/testify/assert)) = 1.2.2
-Provides:
bundled(golang(github.com/stretchr/testify/mock)) = 1.2.2
-Provides:
bundled(golang(github.com/stretchr/testify/require)) = 1.2.2
-Provides:
bundled(golang(github.com/stretchr/testify/suite)) = 1.2.2
-Provides:
bundled(golang(github.com/timewasted/linode)) =
37e84520dcf74488f67654f9c775b9752c232dc1
-Provides:
bundled(golang(github.com/timewasted/linode/dns)) =
37e84520dcf74488f67654f9c775b9752c232dc1
-Provides:
bundled(golang(github.com/transip/gotransip)) =
1dc93a7db3567a5ccf865106afac88278ba940cf
-Provides:
bundled(golang(github.com/transip/gotransip/domain)) =
1dc93a7db3567a5ccf865106afac88278ba940cf
-Provides:
bundled(golang(github.com/transip/gotransip/util)) =
1dc93a7db3567a5ccf865106afac88278ba940cf
-Provides:
bundled(golang(github.com/urfave/cli)) = 1.20.0
-Provides:
bundled(golang(golang.org/x/crypto/ed25519)) =
614d502a4dac94afa3a6ce146bd1736da82514c6
-Provides:
bundled(golang(golang.org/x/crypto/ed25519/internal/edwards25519)) =
614d502a4dac94afa3a6ce146bd1736da82514c6
-Provides:
bundled(golang(golang.org/x/crypto/ocsp)) =
614d502a4dac94afa3a6ce146bd1736da82514c6
-Provides:
bundled(golang(golang.org/x/crypto/pbkdf2)) =
614d502a4dac94afa3a6ce146bd1736da82514c6
-Provides:
bundled(golang(golang.org/x/crypto/pkcs12)) =
614d502a4dac94afa3a6ce146bd1736da82514c6
-Provides:
bundled(golang(golang.org/x/crypto/pkcs12/internal/rc2)) =
614d502a4dac94afa3a6ce146bd1736da82514c6
-Provides:
bundled(golang(golang.org/x/crypto/ssh/terminal)) =
614d502a4dac94afa3a6ce146bd1736da82514c6
-Provides:
bundled(golang(golang.org/x/net/bpf)) =
8a410e7b638dca158bf9e766925842f6651ff828
-Provides:
bundled(golang(golang.org/x/net/context)) =
8a410e7b638dca158bf9e766925842f6651ff828
-Provides:
bundled(golang(golang.org/x/net/context/ctxhttp)) =
8a410e7b638dca158bf9e766925842f6651ff828
-Provides:
bundled(golang(golang.org/x/net/idna)) =
8a410e7b638dca158bf9e766925842f6651ff828
-Provides:
bundled(golang(golang.org/x/net/internal/iana)) =
8a410e7b638dca158bf9e766925842f6651ff828
-Provides:
bundled(golang(golang.org/x/net/internal/socket)) =
8a410e7b638dca158bf9e766925842f6651ff828
-Provides:
bundled(golang(golang.org/x/net/ipv4)) =
8a410e7b638dca158bf9e766925842f6651ff828
-Provides:
bundled(golang(golang.org/x/net/ipv6)) =
8a410e7b638dca158bf9e766925842f6651ff828
-Provides:
bundled(golang(golang.org/x/net/publicsuffix)) =
8a410e7b638dca158bf9e766925842f6651ff828
-Provides:
bundled(golang(golang.org/x/oauth2)) =
d2e6202438beef2727060aa7cabdd924d92ebfd9
-Provides:
bundled(golang(golang.org/x/oauth2/clientcredentials)) =
d2e6202438beef2727060aa7cabdd924d92ebfd9
-Provides:
bundled(golang(golang.org/x/oauth2/google)) =
d2e6202438beef2727060aa7cabdd924d92ebfd9
-Provides:
bundled(golang(golang.org/x/oauth2/internal)) =
d2e6202438beef2727060aa7cabdd924d92ebfd9
-Provides:
bundled(golang(golang.org/x/oauth2/jws)) =
d2e6202438beef2727060aa7cabdd924d92ebfd9
-Provides:
bundled(golang(golang.org/x/oauth2/jwt)) =
d2e6202438beef2727060aa7cabdd924d92ebfd9
-Provides:
bundled(golang(golang.org/x/sys/unix)) =
d99a578cf41bfccdeaf48b0845c823a4b8b0ad5e
-Provides:
bundled(golang(golang.org/x/sys/windows)) =
d99a578cf41bfccdeaf48b0845c823a4b8b0ad5e
-Provides:
bundled(golang(golang.org/x/text/collate)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/text/collate/build)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/text/internal/colltab)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/text/internal/gen)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/text/internal/tag)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/text/internal/triegen)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/text/internal/ucd)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/text/language)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/text/secure/bidirule)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/text/transform)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/text/unicode/bidi)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/text/unicode/cldr)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/text/unicode/norm)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/text/unicode/rangetable)) = 0.3.0
-Provides:
bundled(golang(golang.org/x/time/rate)) =
fbb02b2291d28baffd63558aa44b4b56f178d650
-Provides:
bundled(golang(google.golang.org/api/dns/v1)) =
087779f1d2c96357d4c45bd04c4d10d7b5f22736
-Provides:
bundled(golang(google.golang.org/api/gensupport)) =
087779f1d2c96357d4c45bd04c4d10d7b5f22736
-Provides:
bundled(golang(google.golang.org/api/googleapi)) =
087779f1d2c96357d4c45bd04c4d10d7b5f22736
-Provides:
bundled(golang(google.golang.org/api/googleapi/internal/uritemplates)) =
087779f1d2c96357d4c45bd04c4d10d7b5f22736
-Provides:
bundled(golang(google.golang.org/appengine)) = 1.1.0
-Provides:
bundled(golang(google.golang.org/appengine/internal)) = 1.1.0
-Provides:
bundled(golang(google.golang.org/appengine/internal/app_identity)) =
1.1.0
-Provides:
bundled(golang(google.golang.org/appengine/internal/base)) = 1.1.0
-Provides:
bundled(golang(google.golang.org/appengine/internal/datastore)) = 1.1.0
-Provides:
bundled(golang(google.golang.org/appengine/internal/log)) = 1.1.0
-Provides:
bundled(golang(google.golang.org/appengine/internal/modules)) = 1.1.0
-Provides:
bundled(golang(google.golang.org/appengine/internal/remote_api)) = 1.1.0
-Provides:
bundled(golang(google.golang.org/appengine/internal/urlfetch)) = 1.1.0
-Provides:
bundled(golang(google.golang.org/appengine/urlfetch)) = 1.1.0
-Provides: bundled(golang(gopkg.in/ini.v1)) = 1.38.2
-Provides: bundled(golang(gopkg.in/ns1/ns1-go.v2/rest)) =
028658c6d9be774b6d103a923d8c4b2715135c3f
-Provides: bundled(golang(gopkg.in/ns1/ns1-go.v2/rest/model/account)) =
028658c6d9be774b6d103a923d8c4b2715135c3f
-Provides: bundled(golang(gopkg.in/ns1/ns1-go.v2/rest/model/data)) =
028658c6d9be774b6d103a923d8c4b2715135c3f
-Provides: bundled(golang(gopkg.in/ns1/ns1-go.v2/rest/model/dns)) =
028658c6d9be774b6d103a923d8c4b2715135c3f
-Provides: bundled(golang(gopkg.in/ns1/ns1-go.v2/rest/model/filter)) =
028658c6d9be774b6d103a923d8c4b2715135c3f
-Provides: bundled(golang(gopkg.in/ns1/ns1-go.v2/rest/model/monitor)) =
028658c6d9be774b6d103a923d8c4b2715135c3f
-Provides: bundled(golang(gopkg.in/square/go-jose.v2)) = 2.1.9
-Provides: bundled(golang(gopkg.in/square/go-jose.v2/cipher)) = 2.1.9
-Provides: bundled(golang(gopkg.in/square/go-jose.v2/json)) = 2.1.9
-
%description
Caddy is the HTTP/2 web server with automatic HTTPS. Official Caddy builds
@@ -353,48 +147,27 @@ package is an unofficial build with the following plugins:
%prep
-%setup -q -c -a 10 -a 11 -a 20 -a 21
+%setup -q -c
cp caddy-%{version}/LICENSE.txt LICENSE.txt
cp caddy-%{version}/dist/README.txt README.txt
mkdir -p $(dirname _build/src/%{import_path})
mv caddy-%{version} _build/src/%{import_path}
-%if %{with dnsproviders}
-cp dnsproviders-%{version_dnsproviders}/LICENSE LICENSE-dnsproviders
-mkdir -p $(dirname _build/src/%{import_path_dnsproviders})
-mv dnsproviders-%{version_dnsproviders} _build/src/%{import_path_dnsproviders}
-cp lego-%{version_lego}/LICENSE LICENSE-lego
-mkdir -p $(dirname _build/src/%{import_path_lego})
-mv lego-%{version_lego} _build/src/%{import_path_lego}
-%endif
-
-%if %{with geoip}
-cp caddy-geoip-%{commit_geoip}/LICENSE LICENSE-geoip
-mkdir -p $(dirname _build/src/%{import_path_geoip})
-mv caddy-geoip-%{commit_geoip} _build/src/%{import_path_geoip}
-%endif
-
-%if %{with realip}
-cp caddy-realip-%{commit_realip}/LICENSE LICENSE-realip
-mkdir -p $(dirname _build/src/%{import_path_realip})
-mv caddy-realip-%{commit_realip} _build/src/%{import_path_realip}
-%endif
-
-sed -e '/other plugins/ a \\t// plugins added during rpmbuild' \
-%{?with_geoip: -e '/other plugins/ a \\t_
"%{import_path_geoip}"'} \
-%{?with_realip: -e '/other plugins/ a \\t_
"%{import_path_realip}"'} \
-%{?with_azure: -e '/other plugins/ a \\t_
"%{import_path_dnsproviders}/azure"'} \
-%{?with_cloudflare: -e '/other plugins/ a \\t_
"%{import_path_dnsproviders}/cloudflare"'} \
-%{?with_digitalocean: -e '/other plugins/ a \\t_
"%{import_path_dnsproviders}/digitalocean"'} \
-%{?with_dyn: -e '/other plugins/ a \\t_
"%{import_path_dnsproviders}/dyn"'} \
-%{?with_gandi: -e '/other plugins/ a \\t_
"%{import_path_dnsproviders}/gandi"'} \
-%{?with_googlecloud: -e '/other plugins/ a \\t_
"%{import_path_dnsproviders}/googlecloud"'} \
-%{?with_namecheap: -e '/other plugins/ a \\t_
"%{import_path_dnsproviders}/namecheap"'} \
-%{?with_pdns: -e '/other plugins/ a \\t_
"%{import_path_dnsproviders}/pdns"'} \
-%{?with_rackspace: -e '/other plugins/ a \\t_
"%{import_path_dnsproviders}/rackspace"'} \
-%{?with_rfc2136: -e '/other plugins/ a \\t_
"%{import_path_dnsproviders}/rfc2136"'} \
-%{?with_route53: -e '/other plugins/ a \\t_
"%{import_path_dnsproviders}/route53"'} \
+sed -e '/where other plugins get plugged in/ a \\t// plugins
added during rpmbuild' \
+%{?with_geoip: -e '/where other plugins get plugged in/ a \\t_
"github.com/aablinov/caddy-geoip"'} \
+%{?with_realip: -e '/where other plugins get plugged in/ a \\t_
"github.com/captncraig/caddy-realip"'} \
+%{?with_azure: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/azure"'} \
+%{?with_cloudflare: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/cloudflare"'} \
+%{?with_digitalocean: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/digitalocean"'} \
+%{?with_dyn: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/dyn"'} \
+%{?with_gandi: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/gandi"'} \
+%{?with_googlecloud: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/googlecloud"'} \
+%{?with_namecheap: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/namecheap"'} \
+%{?with_pdns: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/pdns"'} \
+%{?with_rackspace: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/rackspace"'} \
+%{?with_rfc2136: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/rfc2136"'} \
+%{?with_route53: -e '/where other plugins get plugged in/ a \\t_
"github.com/caddyserver/dnsproviders/route53"'} \
-i _build/src/%{import_path}/caddy/caddymain/run.go
@@ -474,10 +247,6 @@ fi
%files
%license LICENSE.txt
-%{?with_geoip:%license LICENSE-geoip}
-%{?with_realip:%license LICENSE-realip}
-%{?with_dnsproviders:%license LICENSE-dnsproviders}
-%{?with_dnsproviders:%license LICENSE-lego}
%doc README.txt
%{_bindir}/caddy
%{_datadir}/caddy
@@ -491,6 +260,7 @@ fi
%changelog
* Sat Sep 07 2019 Carl George <carl(a)george.computer> - 1.0.3-1
- Latest upstream
+- Remove bundled lego and plugins
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index c44d2b7..06b1d53 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
SHA512 (caddy-1.0.3.tar.gz) =
5fa015268ccfcc7439ce688798630b6d2ed30c92e0e828ca524dd373bdacf88be5435807cec3bddca712d2643e14d5bc314d6e488f280cc529d0f85279ff5f40
-SHA512 (dnsproviders-0.1.3.tar.gz) =
8f8b1199f5c41ceee06221d2e79260d90e02e91af77fb90c2a2bad8a6c630311c4880ea94f5f570d9d89132c1b81c5f1b1599eecfc24a9dd3f0f3254def7f48f
-SHA512 (geoip-6af15b436fdcb08a743c30f9bad044ad32b53b49.tar.gz) =
34ccea181cfd17e05c5fb0dc3ebe04440ef62fe57c8ec585e61d69f2c8ebd9a20be3ead9e879517b5adcec0f135836ad6979d49942ee3d5bae6a5d6428d3442d
-SHA512 (lego-2.2.0.tar.gz) =
8f071131c6379daeb2800730d798145516912b747636245d1738a76aefa06ecd8a8b32aceb80b7785b1a118ea4bbe90853d2ec182ce60e8f7179efd1727758dc
-SHA512 (realip-5dd1f4047d0f649f21ba9f8d7e491d712be9a5b0.tar.gz) =
98dc0d55a19f599dab58fcffcea2945db43ee3ebf31bdaf183cdf44ede5341ecded073690bc90b5cdfdef13ad0b4d6841df18efa164652c2e27496d4e5cd9535
commit c25c9bb6c838267cb4ad0d07a0a8eb9e5904e632
Author: Carl George <carl(a)george.computer>
Date: Fri Sep 6 22:14:19 2019 -0500
Latest upstream 1.0.3
diff --git a/caddy.spec b/caddy.spec
index bb5ccf0..9665f1a 100644
--- a/caddy.spec
+++ b/caddy.spec
@@ -29,19 +29,13 @@
%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od
-An -tx1|tr -d ' \\n')" -a -v -x %{?**};
%endif
-Name: caddy
-Version: 0.11.4
-Release: 3%{?dist}
-Summary: HTTP/2 web server with automatic HTTPS
-License: ASL 2.0 and MIT
-URL:
https://caddyserver.com
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64
ppc64le s390x %{mips}}
-%{?go_compiler:BuildRequires: compiler(go-compiler)}
-#
https://github.com/mholt/caddy/pull/2267
-BuildRequires: golang >= 1.10
-BuildRequires: systemd
-%{?systemd_requires}
-Provides: webserver
+Name: caddy
+Version: 1.0.3
+Release: 1%{?dist}
+Summary: HTTP/2 web server with automatic HTTPS
+License: ASL 2.0 and MIT
+URL:
https://caddyserver.com
+ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64
ppc64le s390x %{mips}}
# caddy
%global import_path
github.com/mholt/caddy
@@ -50,6 +44,30 @@ Source1: caddy.conf
Source2: caddy.service
Source3: index.html
+#
https://github.com/mholt/caddy/commit/80dfb8b2a7f89b120a627bc4d866a1dc5ed...
+BuildRequires: golang >= 1.12
+%{?go_compiler:BuildRequires: compiler(go-compiler)}
+BuildRequires:
golang(github.com/dustin/go-humanize)
+BuildRequires:
golang(github.com/flynn/go-shlex)
+BuildRequires:
golang(github.com/go-acme/lego/certcrypto)
+BuildRequires:
golang(github.com/go-acme/lego/challenge)
+BuildRequires:
golang(github.com/go-acme/lego/challenge/tlsalpn01)
+BuildRequires:
golang(github.com/google/uuid)
+BuildRequires:
golang(github.com/gorilla/websocket)
+BuildRequires:
golang(github.com/hashicorp/go-syslog)
+BuildRequires:
golang(github.com/jimstudt/http-authentication/basic)
+BuildRequires:
golang(github.com/klauspost/cpuid)
+BuildRequires:
golang(github.com/lucas-clemente/quic-go)
+BuildRequires:
golang(github.com/lucas-clemente/quic-go/h2quic)
+#
https://github.com/caddyserver/caddy/commit/0b2e054
+#
https://github.com/mholt/certmagic/commit/6a42ef9
+BuildRequires:
golang(github.com/mholt/certmagic) >= 0.6.2
+BuildRequires:
golang(github.com/naoina/toml)
+BuildRequires: golang(gopkg.in/russross/blackfriday.v1)
+BuildRequires:
golang(golang.org/x/net/http2)
+BuildRequires: golang(gopkg.in/natefinch/lumberjack.v2)
+BuildRequires: golang(gopkg.in/yaml.v2)
+
# dnsproviders
%global import_path_dnsproviders
github.com/caddyserver/dnsproviders
%global version_dnsproviders 0.1.3
@@ -122,93 +140,10 @@ Source21:
https://%{import_path_realip}/archive/%{commit_realip}/realip-%{commit
Provides: bundled(golang(%{import_path_realip})) = %{commit_realip}
%endif
-# vendored libraries (Source0)
-Provides:
bundled(golang(cloud.google.com/go/compute/metadata)) =
7a4ba9f439fbc50061834a4063b57cf7222ba83f
-Provides:
bundled(golang(github.com/aead/chacha20)) =
8b13a72661dae6e9e5dea04f344f0dc95ea29547
-Provides:
bundled(golang(github.com/alecthomas/template)) =
a0175ee3bccc567396460bf5acd36800cb10c49c
-Provides:
bundled(golang(github.com/alecthomas/units)) =
2efee857e7cfd4f3d0138cc3cbb1b4966962b93a
-Provides:
bundled(golang(github.com/codahale/aesnicheck)) =
349fcc471aaccc29cd074e1275f1a494323826cd
-Provides:
bundled(golang(github.com/dustin/go-humanize)) =
259d2a102b871d17f30e3cd9881a642961a1e486
-Provides:
bundled(golang(github.com/flynn/go-shlex)) =
3f9db97f856818214da2e1057f8ad84803971cff
-Provides:
bundled(golang(github.com/golang/mock/gomock)) =
600781dde9cca80734169b9e969d9054ccc57937
-Provides:
bundled(golang(github.com/golang/protobuf/proto)) =
748d386b5c1ea99658fd69fe9f03991ce86a90c1
-Provides:
bundled(golang(github.com/golang/protobuf/ptypes/any)) =
748d386b5c1ea99658fd69fe9f03991ce86a90c1
-Provides:
bundled(golang(github.com/google/uuid)) =
dec09d789f3dba190787f8b4454c7d3c936fed9e
-Provides:
bundled(golang(github.com/gorilla/websocket)) =
a69d9f6de432e2c6b296a947d8a5ee88f68522cf
-Provides:
bundled(golang(github.com/hashicorp/go-syslog)) =
326bf4a7f709d263f964a6a96558676b103f3534
-Provides:
bundled(golang(github.com/jimstudt/http-authentication/basic)) =
3eca13d6893afd7ecabe15f4445f5d2872a1b012
-Provides:
bundled(golang(github.com/klauspost/cpuid)) =
ae832f27941af41db13bd6d8efd2493e3b22415a
-Provides:
bundled(golang(github.com/lucas-clemente/quic-go)) =
f90751eabaa39364e3861ee5a8b179f140847d7e
-Provides:
bundled(golang(github.com/mholt/certmagic)) =
a7f18a937c080b88693cd4e14d48e42cc067b268
-Provides:
bundled(golang(github.com/miekg/dns)) =
0f3adef2e2201d72e50309a36fc99d8a9d1a4960
-Provides:
bundled(golang(github.com/naoina/go-stringutil)) =
6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
-Provides:
bundled(golang(github.com/naoina/toml)) =
e6f5723bf2a66af014955e0888881314cf294129
-Provides:
bundled(golang(github.com/russross/blackfriday)) =
067529f716f4c3f5e37c8c95ddd59df1007290ae
-Provides:
bundled(golang(github.com/xenolf/lego/acme)) =
a43ec709e8034f388aab28d14b97aeed0e7aa98c
-Provides:
bundled(golang(github.com/xenolf/lego/certcrypto)) =
a43ec709e8034f388aab28d14b97aeed0e7aa98c
-Provides:
bundled(golang(github.com/xenolf/lego/certificate)) =
a43ec709e8034f388aab28d14b97aeed0e7aa98c
-Provides:
bundled(golang(github.com/xenolf/lego/challenge)) =
a43ec709e8034f388aab28d14b97aeed0e7aa98c
-Provides:
bundled(golang(github.com/xenolf/lego/lego)) =
f05aa4c241fd8b43da9dc8cab8c8965e5b3c1b55
-Provides:
bundled(golang(github.com/xenolf/lego/log)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/platform/wait)) =
a43ec709e8034f388aab28d14b97aeed0e7aa98c
-Provides:
bundled(golang(github.com/xenolf/lego/registration)) =
a43ec709e8034f388aab28d14b97aeed0e7aa98c
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/github.com/miekg/dns)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/crypto/ed25519)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/crypto/ocsp)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/crypto/pbkdf2)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/net/bpf)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/net/idna)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/net/internal/ia... =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/net/internal/so...
= b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/net/ipv4)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/net/ipv6)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/sys/unix)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/collate)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/c... =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/g... =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/t... =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/t... =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/u... =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/language)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/secure/bid... =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/transform)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/unicode/bi... =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/unicode/cl... =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/unicode/no... =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/unicode/ra... =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(github.com/xenolf/lego/vendor/gopkg.in/square/go-jose.v2)) =
b05b54d1f69a31ceed92e2995243c5b17821c9e4
-Provides:
bundled(golang(go4.org/syncutil/singleflight)) =
034d17a462f7b2dcd1a4a73553ec5357ff6e6c6e
-Provides:
bundled(golang(golang.org/x/crypto/curve25519)) =
94eea52f7b742c7cbe0b03b22f0c4c8631ece122
-Provides:
bundled(golang(golang.org/x/crypto/ed25519)) =
c4a91bd4f524f10d064139674cf55852e055ad01
-Provides:
bundled(golang(golang.org/x/crypto/hkdf)) =
2faea1465de239e4babd8f5905cc25b781712442
-Provides:
bundled(golang(golang.org/x/crypto/ocsp)) =
2faea1465de239e4babd8f5905cc25b781712442
-Provides:
bundled(golang(golang.org/x/crypto/ssh/terminal)) =
2faea1465de239e4babd8f5905cc25b781712442
-Provides:
bundled(golang(golang.org/x/net/context)) =
f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f
-Provides:
bundled(golang(golang.org/x/net/http/httpguts)) =
8a410e7b638dca158bf9e766925842f6651ff828
-Provides:
bundled(golang(golang.org/x/net/http2)) =
f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f
-Provides:
bundled(golang(golang.org/x/net/idna)) =
f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f
-Provides:
bundled(golang(golang.org/x/net/lex/httplex)) =
f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f
-Provides:
bundled(golang(golang.org/x/net/publicsuffix)) =
f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f
-Provides:
bundled(golang(golang.org/x/oauth2)) =
b53b38ad8a6435bd399ea76d0fa74f23149cca4e
-Provides:
bundled(golang(golang.org/x/sys/cpu)) =
49385e6e15226593f68b26af201feec29d5bba22
-Provides:
bundled(golang(golang.org/x/sys/unix)) =
35ef4487ce0a1ea5d4b616ffe71e34febe723695
-Provides:
bundled(golang(golang.org/x/text/internal/gen)) =
836efe42bb4aa16aaa17b9c155d8813d336ed720
-Provides:
bundled(golang(golang.org/x/text/internal/triegen)) =
836efe42bb4aa16aaa17b9c155d8813d336ed720
-Provides:
bundled(golang(golang.org/x/text/internal/ucd)) =
836efe42bb4aa16aaa17b9c155d8813d336ed720
-Provides:
bundled(golang(golang.org/x/text/secure/bidirule)) =
836efe42bb4aa16aaa17b9c155d8813d336ed720
-Provides:
bundled(golang(golang.org/x/text/transform)) =
836efe42bb4aa16aaa17b9c155d8813d336ed720
-Provides:
bundled(golang(golang.org/x/text/unicode/bidi)) =
836efe42bb4aa16aaa17b9c155d8813d336ed720
-Provides:
bundled(golang(golang.org/x/text/unicode/cldr)) =
836efe42bb4aa16aaa17b9c155d8813d336ed720
-Provides:
bundled(golang(golang.org/x/text/unicode/norm)) =
836efe42bb4aa16aaa17b9c155d8813d336ed720
-Provides:
bundled(golang(golang.org/x/text/unicode/rangetable)) =
836efe42bb4aa16aaa17b9c155d8813d336ed720
-Provides:
bundled(golang(google.golang.org/api/compute/v1)) =
66dba45b06824cbfe030e696b156d562994531e1
-Provides:
bundled(golang(google.golang.org/api/gensupport)) =
66dba45b06824cbfe030e696b156d562994531e1
-Provides:
bundled(golang(google.golang.org/api/googleapi)) =
66dba45b06824cbfe030e696b156d562994531e1
-Provides:
bundled(golang(google.golang.org/appengine)) =
ad2570cd3913654e00c5f0183b39d2f998e54046
-Provides: bundled(golang(gopkg.in/alecthomas/kingpin.v2)) =
1087e65c9441605df944fb12c33f0fe7072d18ca
-Provides: bundled(golang(gopkg.in/natefinch/lumberjack.v2)) =
7d6a1875575e09256dc552b4c0e450dcd02bd10e
-Provides: bundled(golang(gopkg.in/square/go-jose.v2)) =
6ee92191fea850cdcab9a18867abf5f521cdbadb
-Provides: bundled(golang(gopkg.in/yaml.v2)) = 25c4ec802a7d637f88d584ab26798e94ad14c13b
+BuildRequires: systemd
+%{?systemd_requires}
+
+Provides: webserver
# vendored libraries (Source11)
Provides:
bundled(golang(cloud.google.com/go/compute/metadata)) = 0.26.0
@@ -554,6 +489,9 @@ fi
%changelog
+* Sat Sep 07 2019 Carl George <carl(a)george.computer> - 1.0.3-1
+- Latest upstream
+
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.4-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index 990cebe..c44d2b7 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (caddy-0.11.4.tar.gz) =
463c1e570292c042ffc959c2bf0c20df55477843deeef2f782030fe681ab8c5317505fdb00659662d52ffc8a56b5b1a7b7e6fc72b7f737d4950331ac781f239a
+SHA512 (caddy-1.0.3.tar.gz) =
5fa015268ccfcc7439ce688798630b6d2ed30c92e0e828ca524dd373bdacf88be5435807cec3bddca712d2643e14d5bc314d6e488f280cc529d0f85279ff5f40
SHA512 (dnsproviders-0.1.3.tar.gz) =
8f8b1199f5c41ceee06221d2e79260d90e02e91af77fb90c2a2bad8a6c630311c4880ea94f5f570d9d89132c1b81c5f1b1599eecfc24a9dd3f0f3254def7f48f
SHA512 (geoip-6af15b436fdcb08a743c30f9bad044ad32b53b49.tar.gz) =
34ccea181cfd17e05c5fb0dc3ebe04440ef62fe57c8ec585e61d69f2c8ebd9a20be3ead9e879517b5adcec0f135836ad6979d49942ee3d5bae6a5d6428d3442d
SHA512 (lego-2.2.0.tar.gz) =
8f071131c6379daeb2800730d798145516912b747636245d1738a76aefa06ecd8a8b32aceb80b7785b1a118ea4bbe90853d2ec182ce60e8f7179efd1727758dc
commit d70febfa45a6ab5433545af64c1a051b2a21213b
Author: Carl George <carl(a)george.computer>
Date: Fri Sep 6 20:10:23 2019 -0500
Remove `-log stdout` from ExecStart
The `-log` flag is not the same thing as the `log` configuration
directive. While the latter is for the access log, the former is
actually for the process log, which essentially amounts to debug
information that is overkill for the general use case.
diff --git a/caddy.service b/caddy.service
index f0293b0..89503b2 100644
--- a/caddy.service
+++ b/caddy.service
@@ -9,7 +9,7 @@ Group=caddy
Environment=CADDYPATH=/var/lib/caddy
EnvironmentFile=-/etc/caddy/envfile
ExecStartPre=/usr/bin/caddy -conf /etc/caddy/caddy.conf -validate
-ExecStart=/usr/bin/caddy -conf /etc/caddy/caddy.conf -log stdout -root /tmp -agree
+ExecStart=/usr/bin/caddy -conf /etc/caddy/caddy.conf -root /tmp -agree
ExecReload=/usr/bin/kill -USR1 $MAINPID
KillMode=mixed
KillSignal=SIGQUIT