From c115ef4e35bd367a4e6b77194a37e33fe98e6c0d Mon Sep 17 00:00:00 2001 From: Carl George Date: Tue, 22 Oct 2019 21:01:18 -0500 Subject: [PATCH 1/7] Fix indentation --- caddy.spec | 260 ++++++++++++++++++++++++++--------------------------- 1 file changed, 130 insertions(+), 130 deletions(-) diff --git a/caddy.spec b/caddy.spec index bb5ccf0..9432b9e 100644 --- a/caddy.spec +++ b/caddy.spec @@ -29,186 +29,186 @@ %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}} +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 +BuildRequires: golang >= 1.10 +BuildRequires: systemd %{?systemd_requires} -Provides: webserver +Provides: webserver # 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: https://%{import_path}/archive/v%{version}/caddy-%{version}.tar.gz +Source1: caddy.conf +Source2: caddy.service +Source3: index.html # 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 +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 +Source11: https://%{import_path_lego}/archive/v%{version_lego}/lego-%{version_lego}.tar.gz %if %{with azure} -Provides: bundled(golang(%{import_path_dnsproviders}/azure)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/azure)) = %{version_lego} +Provides: bundled(golang(%{import_path_dnsproviders}/azure)) = %{version_dnsproviders} +Provides: bundled(golang(%{import_path_lego}/providers/dns/azure)) = %{version_lego} %endif %if %{with cloudflare} -Provides: bundled(golang(%{import_path_dnsproviders}/cloudflare)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/cloudflare)) = %{version_lego} +Provides: bundled(golang(%{import_path_dnsproviders}/cloudflare)) = %{version_dnsproviders} +Provides: bundled(golang(%{import_path_lego}/providers/dns/cloudflare)) = %{version_lego} %endif %if %{with digitalocean} -Provides: bundled(golang(%{import_path_dnsproviders}/digitalocean)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/digitalocean)) = %{version_lego} +Provides: bundled(golang(%{import_path_dnsproviders}/digitalocean)) = %{version_dnsproviders} +Provides: bundled(golang(%{import_path_lego}/providers/dns/digitalocean)) = %{version_lego} %endif %if %{with dyn} -Provides: bundled(golang(%{import_path_dnsproviders}/dyn)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/dyn)) = %{version_lego} +Provides: bundled(golang(%{import_path_dnsproviders}/dyn)) = %{version_dnsproviders} +Provides: bundled(golang(%{import_path_lego}/providers/dns/dyn)) = %{version_lego} %endif %if %{with gandi} -Provides: bundled(golang(%{import_path_dnsproviders}/gandi)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/gandi)) = %{version_lego} +Provides: bundled(golang(%{import_path_dnsproviders}/gandi)) = %{version_dnsproviders} +Provides: bundled(golang(%{import_path_lego}/providers/dns/gandi)) = %{version_lego} %endif %if %{with googlecloud} -Provides: bundled(golang(%{import_path_dnsproviders}/googlecloud)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/googlecloud)) = %{version_lego} +Provides: bundled(golang(%{import_path_dnsproviders}/googlecloud)) = %{version_dnsproviders} +Provides: bundled(golang(%{import_path_lego}/providers/dns/googlecloud)) = %{version_lego} %endif %if %{with namecheap} -Provides: bundled(golang(%{import_path_dnsproviders}/namecheap)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/namecheap)) = %{version_lego} +Provides: bundled(golang(%{import_path_dnsproviders}/namecheap)) = %{version_dnsproviders} +Provides: bundled(golang(%{import_path_lego}/providers/dns/namecheap)) = %{version_lego} %endif %if %{with pdns} -Provides: bundled(golang(%{import_path_dnsproviders}/pdns)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/pdns)) = %{version_lego} +Provides: bundled(golang(%{import_path_dnsproviders}/pdns)) = %{version_dnsproviders} +Provides: bundled(golang(%{import_path_lego}/providers/dns/pdns)) = %{version_lego} %endif %if %{with rackspace} -Provides: bundled(golang(%{import_path_dnsproviders}/rackspace)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/rackspace)) = %{version_lego} +Provides: bundled(golang(%{import_path_dnsproviders}/rackspace)) = %{version_dnsproviders} +Provides: bundled(golang(%{import_path_lego}/providers/dns/rackspace)) = %{version_lego} %endif %if %{with rfc2136} -Provides: bundled(golang(%{import_path_dnsproviders}/rfc2136)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/rfc2136)) = %{version_lego} +Provides: bundled(golang(%{import_path_dnsproviders}/rfc2136)) = %{version_dnsproviders} +Provides: bundled(golang(%{import_path_lego}/providers/dns/rfc2136)) = %{version_lego} %endif %if %{with route53} -Provides: bundled(golang(%{import_path_dnsproviders}/route53)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/route53)) = %{version_lego} +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 +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) +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 +Source21: https://%{import_path_realip}/archive/%{commit_realip}/realip-%{commit_realip}.tar.gz %if %{with realip} -Provides: bundled(golang(%{import_path_realip})) = %{commit_realip} +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/iana)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/net/internal/socket)) = 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/colltab)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/gen)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/tag)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/triegen)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/ucd)) = 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/bidirule)) = 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/bidi)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/unicode/cldr)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/unicode/norm)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/unicode/rangetable)) = 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 +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/iana)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 +Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/net/internal/socket)) = 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/colltab)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 +Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/gen)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 +Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/tag)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 +Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/triegen)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 +Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/ucd)) = 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/bidirule)) = 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/bidi)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 +Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/unicode/cldr)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 +Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/unicode/norm)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 +Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/unicode/rangetable)) = 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 # vendored libraries (Source11) Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.26.0 @@ -446,7 +446,7 @@ 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' \ +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"'} \ From e71bd8b648ee8b468c300950bb10acec15c01345 Mon Sep 17 00:00:00 2001 From: Carl George Date: Tue, 22 Oct 2019 21:13:06 -0500 Subject: [PATCH 2/7] Update to v1 (1.0.3) Upstream stopped vendoring dependencies in 1.0.0. F31+ has those dependencies packaged, but in order to update earlier branches we must generate our own tarball with vendored dependencies. Additionally this commit updates the plugins to v1 compatible versions: - dnsproviders 0.3.0 - geoip c06787a76821ab7852dc1a5219dd5c05d904dce4 - realip 6df827e22ab8cd5ea90e0844ff29cf62b95127f9 The geoip plugin gained a dependency on github.com/mmcloughlin/geohash, which is also not packaged until F31. We will bundle it. --- .gitignore | 1 + caddy.spec | 182 +++++++++++++++++++++-------------------------------- sources | 9 +-- 3 files changed, 77 insertions(+), 115 deletions(-) diff --git a/.gitignore b/.gitignore index fe3e41d..7ae9cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ dnsproviders-*.tar.gz geoip-*.tar.gz lego-*.tar.gz realip-*.tar.gz +geohash-*.tar.gz diff --git a/caddy.spec b/caddy.spec index 9432b9e..eb36336 100644 --- a/caddy.spec +++ b/caddy.spec @@ -17,42 +17,48 @@ %bcond_without dnsproviders %endif -%bcond_with debug - -%if %{with debug} +# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12 %global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif %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 Name: caddy -Version: 0.11.4 -Release: 3%{?dist} -Summary: HTTP/2 web server with automatic HTTPS +Version: 1.0.3 +Release: 1%{?dist} +Summary: 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 +# https://github.com/mholt/caddy/commit/80dfb8b2a7f89b120a627bc4d866a1dc5ed3d92f#diff-04c6e90faac2675aa89e2176d2eec7d8 +BuildRequires: golang >= 1.12 BuildRequires: systemd %{?systemd_requires} Provides: webserver # caddy -%global import_path github.com/mholt/caddy -Source0: https://%{import_path}/archive/v%{version}/caddy-%{version}.tar.gz +%global import_path github.com/caddyserver/caddy +# Upstream stopped vendoring dependencies in 1.0.0. F31+ has those +# dependencies packaged, but in order to update earlier branches we must +# generate our own tarball with vendored dependencies. +# +# git clone https://github.com/caddyserver/caddy.git +# cd caddy +# git checkout v%%{version} +# go mod vendor +# git add vendor +# git commit -m vendor +# git archive --format=tar.gz --prefix=caddy-%%{version}/ HEAD > caddy-%%{version}-vendor.tar.gz +Source0: caddy-%{version}-vendor.tar.gz Source1: caddy.conf Source2: caddy.service Source3: index.html # dnsproviders %global import_path_dnsproviders github.com/caddyserver/dnsproviders -%global version_dnsproviders 0.1.3 +%global version_dnsproviders 0.3.0 Source10: https://%{import_path_dnsproviders}/archive/v%{version_dnsproviders}/dnsproviders-%{version_dnsproviders}.tar.gz # lego @@ -106,109 +112,55 @@ Provides: bundled(golang(%{import_path_lego}/providers/dns/route53)) = %{v %endif # geoip -%global import_path_geoip github.com/kodnaplakal/caddy-geoip -%global commit_geoip 6af15b436fdcb08a743c30f9bad044ad32b53b49 +%global import_path_geoip github.com/aablinov/caddy-geoip +%global commit_geoip c06787a76821ab7852dc1a5219dd5c05d904dce4 Source20: https://%{import_path_geoip}/archive/%{commit_geoip}/geoip-%{commit_geoip}.tar.gz +%global import_path_geohash github.com/mmcloughlin/geohash +%global version_geohash 0.9.0 +Source21: https://%{import_path_geohash}/archive/v%{version_geohash}/geohash-%{version_geohash}.tar.gz %if %{with geoip} -Provides: bundled(golang(%{import_path_geoip})) = %{commit_geoip} +Provides: bundled(golang(%{import_path_geoip})) +Provides: bundled(golang(%{import_path_geohash})) 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 +%global commit_realip 6df827e22ab8cd5ea90e0844ff29cf62b95127f9 +Source22: https://%{import_path_realip}/archive/%{commit_realip}/realip-%{commit_realip}.tar.gz %if %{with realip} -Provides: bundled(golang(%{import_path_realip})) = %{commit_realip} +Provides: bundled(golang(%{import_path_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/iana)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/net/internal/socket)) = 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/colltab)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/gen)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/tag)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/triegen)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/internal/ucd)) = 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/bidirule)) = 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/bidi)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/unicode/cldr)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/unicode/norm)) = b05b54d1f69a31ceed92e2995243c5b17821c9e4 -Provides: bundled(golang(github.com/xenolf/lego/vendor/golang.org/x/text/unicode/rangetable)) = 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 +Provides: bundled(golang(github.com/bifurcation/mint)) +Provides: bundled(golang(github.com/cenkalti/backoff)) = 2.1.1 +Provides: bundled(golang(github.com/cheekybits/genny)) +Provides: bundled(golang(github.com/dustin/go-humanize)) = 1.0.0 +Provides: bundled(golang(github.com/flynn/go-shlex)) +Provides: bundled(golang(github.com/go-acme/lego)) = 2.5.0 +Provides: bundled(golang(github.com/google/uuid)) = 1.1.1 +Provides: bundled(golang(github.com/gorilla/websocket)) = 1.4.0 +Provides: bundled(golang(github.com/hashicorp/go-syslog)) = 1.0.0 +Provides: bundled(golang(github.com/hashicorp/golang-lru)) +Provides: bundled(golang(github.com/jimstudt/http-authentication)) +Provides: bundled(golang(github.com/klauspost/cpuid)) = 1.2.0 +Provides: bundled(golang(github.com/lucas-clemente/aes12)) +Provides: bundled(golang(github.com/lucas-clemente/quic-go)) = 0.10.2 +Provides: bundled(golang(github.com/lucas-clemente/quic-go-certificates)) +Provides: bundled(golang(github.com/mholt/certmagic)) = 0.6.2 +Provides: bundled(golang(github.com/miekg/dns)) = 1.1.3 +Provides: bundled(golang(github.com/naoina/go-stringutil)) = 0.1.0 +Provides: bundled(golang(github.com/naoina/toml)) = 0.1.1 +Provides: bundled(golang(github.com/russross/blackfriday)) +Provides: bundled(golang(golang.org/x/crypto)) +Provides: bundled(golang(golang.org/x/net)) +Provides: bundled(golang(golang.org/x/sys)) +Provides: bundled(golang(golang.org/x/text)) = 0.3.0 +Provides: bundled(golang(gopkg.in/mcuadros/go-syslog.v2)) = 2.2.1 +Provides: bundled(golang(gopkg.in/natefinch/lumberjack.v2)) = 2.0.0 +Provides: bundled(golang(gopkg.in/square/go-jose.v2)) = 2.2.2 +Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.2.2 # vendored libraries (Source11) Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.26.0 @@ -397,9 +349,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 -with customized plugins can be downloaded from https://caddyserver.com. This -package is an unofficial build with the following plugins: +Caddy is the web server with automatic HTTPS. + +This package was built with the following plugins: %{?with_geoip: http.geoip }%{?with_realip: http.realip @@ -418,10 +370,11 @@ package is an unofficial build with the following plugins: %prep -%setup -q -c -a 10 -a 11 -a 20 -a 21 +%setup -q -c -a 10 -a 11 -a 20 -a 21 -a 22 cp caddy-%{version}/LICENSE.txt LICENSE.txt cp caddy-%{version}/dist/README.txt README.txt +cp caddy-%{version}/dist/CHANGES.txt CHANGES.txt mkdir -p $(dirname _build/src/%{import_path}) mv caddy-%{version} _build/src/%{import_path} @@ -438,6 +391,9 @@ mv lego-%{version_lego} _build/src/%{import_path_lego} 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} +cp geohash-%{version_geohash}/LICENSE LICENSE-geohash +mkdir -p $(dirname _build/src/%{import_path_geohash}) +mv geohash-%{version_geohash} _build/src/%{import_path_geohash} %endif %if %{with realip} @@ -540,10 +496,11 @@ fi %files %license LICENSE.txt %{?with_geoip:%license LICENSE-geoip} +%{?with_geoip:%license LICENSE-geohash} %{?with_realip:%license LICENSE-realip} %{?with_dnsproviders:%license LICENSE-dnsproviders} %{?with_dnsproviders:%license LICENSE-lego} -%doc README.txt +%doc README.txt CHANGES.txt %{_bindir}/caddy %{_datadir}/caddy %{_unitdir}/caddy.service @@ -554,6 +511,9 @@ fi %changelog +* Wed Oct 23 2019 Carl George - 1.0.3-1 +- Update to v1 + * Wed Jul 24 2019 Fedora Release Engineering - 0.11.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 990cebe..f2b16f9 100644 --- a/sources +++ b/sources @@ -1,5 +1,6 @@ -SHA512 (caddy-0.11.4.tar.gz) = 463c1e570292c042ffc959c2bf0c20df55477843deeef2f782030fe681ab8c5317505fdb00659662d52ffc8a56b5b1a7b7e6fc72b7f737d4950331ac781f239a -SHA512 (dnsproviders-0.1.3.tar.gz) = 8f8b1199f5c41ceee06221d2e79260d90e02e91af77fb90c2a2bad8a6c630311c4880ea94f5f570d9d89132c1b81c5f1b1599eecfc24a9dd3f0f3254def7f48f -SHA512 (geoip-6af15b436fdcb08a743c30f9bad044ad32b53b49.tar.gz) = 34ccea181cfd17e05c5fb0dc3ebe04440ef62fe57c8ec585e61d69f2c8ebd9a20be3ead9e879517b5adcec0f135836ad6979d49942ee3d5bae6a5d6428d3442d +SHA512 (caddy-1.0.3-vendor.tar.gz) = 83a95df7a09b1ed78f94a81d0f2e715beec66ce329a5907b664419b8fd7711a252a5db6533cff175f5a751a0d749d630f54e2cb923b3d632fa2c2c86a4b07fe1 +SHA512 (dnsproviders-0.3.0.tar.gz) = 1732089afc1babc9d1ded6a95c07fb80b280e42b2f9944b6dcac25e2cb5e08a163c6049d63eb0ceca7c9d07968b3c46ff55f1333590ad4f57d8338be729af53d +SHA512 (geoip-c06787a76821ab7852dc1a5219dd5c05d904dce4.tar.gz) = a168a6cf4dbc2fdc634b7009dc6f6842652224d396df0090090acbc062530d65308632cfd50a43a238a67733b5240e0c472092d734d7c2d83012ecb972ecbbdb SHA512 (lego-2.2.0.tar.gz) = 8f071131c6379daeb2800730d798145516912b747636245d1738a76aefa06ecd8a8b32aceb80b7785b1a118ea4bbe90853d2ec182ce60e8f7179efd1727758dc -SHA512 (realip-5dd1f4047d0f649f21ba9f8d7e491d712be9a5b0.tar.gz) = 98dc0d55a19f599dab58fcffcea2945db43ee3ebf31bdaf183cdf44ede5341ecded073690bc90b5cdfdef13ad0b4d6841df18efa164652c2e27496d4e5cd9535 +SHA512 (realip-6df827e22ab8cd5ea90e0844ff29cf62b95127f9.tar.gz) = fc3589cd4252e2dcffe7e2abb6a12bb150e7fc3a0870122e3bcdd17bd6bd81d7547656d9790b39338edccd91586ddabe29252d570d5fc14a1d96ebfc1134684c +SHA512 (geohash-0.9.0.tar.gz) = f717b6a366108a231e0c679841e25c051e8425c6e97c2d7095c3d15c6c4bc2d60dbf57e3cbe253885f303a00e261350de5726b544f3e44cdbb25727dfc79d5b2 From d9dc9a17e58caa51de38bfde8c8fd29ad04361d6 Mon Sep 17 00:00:00 2001 From: Carl George Date: Tue, 22 Oct 2019 21:30:15 -0500 Subject: [PATCH 3/7] Update bundled lego to match vendored lego --- caddy.spec | 224 +++++++++-------------------------------------------- sources | 2 +- 2 files changed, 39 insertions(+), 187 deletions(-) diff --git a/caddy.spec b/caddy.spec index eb36336..e5a82f2 100644 --- a/caddy.spec +++ b/caddy.spec @@ -62,8 +62,8 @@ Source3: index.html 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 +%global import_path_lego github.com/go-acme/lego +%global version_lego 2.5.0 Source11: https://%{import_path_lego}/archive/v%{version_lego}/lego-%{version_lego}.tar.gz %if %{with azure} @@ -88,7 +88,7 @@ Provides: bundled(golang(%{import_path_lego}/providers/dns/gandi)) = %{ver %endif %if %{with googlecloud} Provides: bundled(golang(%{import_path_dnsproviders}/googlecloud)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/googlecloud)) = %{version_lego} +Provides: bundled(golang(%{import_path_lego}/providers/dns/gcloud)) = %{version_lego} %endif %if %{with namecheap} Provides: bundled(golang(%{import_path_dnsproviders}/namecheap)) = %{version_dnsproviders} @@ -163,189 +163,41 @@ Provides: bundled(golang(gopkg.in/square/go-jose.v2)) = 2.2.2 Provides: bundled(golang(gopkg.in/yaml.v2)) = 2.2.2 # 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-09-01/dns)) = 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/recordsets)) = a2b0ad6ce68c8302027db1a5f9dbb03b0c8ab072 -Provides: bundled(golang(github.com/gophercloud/gophercloud/openstack/dns/v2/zones)) = a2b0ad6ce68c8302027db1a5f9dbb03b0c8ab072 -Provides: bundled(golang(github.com/gophercloud/gophercloud/openstack/identity/v2/tenants)) = a2b0ad6ce68c8302027db1a5f9dbb03b0c8ab072 -Provides: bundled(golang(github.com/gophercloud/gophercloud/openstack/identity/v2/tokens)) = a2b0ad6ce68c8302027db1a5f9dbb03b0c8ab072 -Provides: bundled(golang(github.com/gophercloud/gophercloud/openstack/identity/v3/tokens)) = 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 +Provides: bundled(golang(github.com/akamai/AkamaiOPEN-edgegrid-golang)) +Provides: bundled(golang(github.com/aliyun/alibaba-cloud-sdk-go)) +Provides: bundled(golang(github.com/aws/aws-sdk-go)) +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go)) +Provides: bundled(golang(github.com/Azure/go-autorest)) +Provides: bundled(golang(github.com/BurntSushi/toml)) +Provides: bundled(golang(github.com/cenkalti/backoff)) +Provides: bundled(golang(github.com/cloudflare/cloudflare-go)) +Provides: bundled(golang(github.com/cpu/goacmedns)) +Provides: bundled(golang(github.com/decker502/dnspod-go)) +Provides: bundled(golang(github.com/dnsimple/dnsimple-go)) +Provides: bundled(golang(github.com/exoscale/egoscale)) +Provides: bundled(golang(github.com/gophercloud/gophercloud)) +Provides: bundled(golang(github.com/iij/doapi)) +Provides: bundled(golang(github.com/JamesClonk/vultr)) +Provides: bundled(golang(github.com/linode/linodego)) +Provides: bundled(golang(github.com/miekg/dns)) +Provides: bundled(golang(github.com/namedotcom/go)) +Provides: bundled(golang(github.com/nrdcg/auroradns)) +Provides: bundled(golang(github.com/nrdcg/goinwx)) +Provides: bundled(golang(github.com/OpenDNS/vegadns2client)) +Provides: bundled(golang(github.com/oracle/oci-go-sdk)) +Provides: bundled(golang(github.com/ovh/go-ovh)) +Provides: bundled(golang(github.com/rainycape/memcache)) +Provides: bundled(golang(github.com/sacloud/libsacloud)) +Provides: bundled(golang(github.com/stretchr/testify)) +Provides: bundled(golang(github.com/timewasted/linode)) +Provides: bundled(golang(github.com/transip/gotransip)) +Provides: bundled(golang(github.com/urfave/cli)) +Provides: bundled(golang(golang.org/x/crypto)) +Provides: bundled(golang(golang.org/x/net)) +Provides: bundled(golang(golang.org/x/oauth2)) +Provides: bundled(golang(google.golang.org/api)) +Provides: bundled(golang(gopkg.in/ns1/ns1-go.v2)) +Provides: bundled(golang(gopkg.in/square/go-jose.v2)) %description diff --git a/sources b/sources index f2b16f9..64c6690 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ SHA512 (caddy-1.0.3-vendor.tar.gz) = 83a95df7a09b1ed78f94a81d0f2e715beec66ce329a5907b664419b8fd7711a252a5db6533cff175f5a751a0d749d630f54e2cb923b3d632fa2c2c86a4b07fe1 SHA512 (dnsproviders-0.3.0.tar.gz) = 1732089afc1babc9d1ded6a95c07fb80b280e42b2f9944b6dcac25e2cb5e08a163c6049d63eb0ceca7c9d07968b3c46ff55f1333590ad4f57d8338be729af53d SHA512 (geoip-c06787a76821ab7852dc1a5219dd5c05d904dce4.tar.gz) = a168a6cf4dbc2fdc634b7009dc6f6842652224d396df0090090acbc062530d65308632cfd50a43a238a67733b5240e0c472092d734d7c2d83012ecb972ecbbdb -SHA512 (lego-2.2.0.tar.gz) = 8f071131c6379daeb2800730d798145516912b747636245d1738a76aefa06ecd8a8b32aceb80b7785b1a118ea4bbe90853d2ec182ce60e8f7179efd1727758dc +SHA512 (lego-2.5.0.tar.gz) = 173bd25eb6621a3d3131ad1d14574e59fa10dee0414c487f8202850b9e2c93fe07ea8690eb12e7f22ecd4d951a852eede22fc17bcbdd9ed46ce71f923e73d70d SHA512 (realip-6df827e22ab8cd5ea90e0844ff29cf62b95127f9.tar.gz) = fc3589cd4252e2dcffe7e2abb6a12bb150e7fc3a0870122e3bcdd17bd6bd81d7547656d9790b39338edccd91586ddabe29252d570d5fc14a1d96ebfc1134684c SHA512 (geohash-0.9.0.tar.gz) = f717b6a366108a231e0c679841e25c051e8425c6e97c2d7095c3d15c6c4bc2d60dbf57e3cbe253885f303a00e261350de5726b544f3e44cdbb25727dfc79d5b2 From cc094cc99ec7a8aac7d4c15ab68d4ccf7a5736a3 Mon Sep 17 00:00:00 2001 From: Carl George Date: Tue, 22 Oct 2019 21:32:44 -0500 Subject: [PATCH 4/7] Remove dyn, gandi, namecheap, and rfc2136 dns providers --- caddy.spec | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/caddy.spec b/caddy.spec index e5a82f2..f6076f4 100644 --- a/caddy.spec +++ b/caddy.spec @@ -1,19 +1,16 @@ -# 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 namecheap +%bcond_without googlecloud %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} +%if %{with azure}%{with cloudflare}%{with digitalocean}%{with googlecloud}%{with pdns}%{with rackspace}%{with route53} %bcond_without dnsproviders %endif @@ -78,22 +75,10 @@ Provides: bundled(golang(%{import_path_lego}/providers/dns/cloudflare)) = Provides: bundled(golang(%{import_path_dnsproviders}/digitalocean)) = %{version_dnsproviders} Provides: bundled(golang(%{import_path_lego}/providers/dns/digitalocean)) = %{version_lego} %endif -%if %{with dyn} -Provides: bundled(golang(%{import_path_dnsproviders}/dyn)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/dyn)) = %{version_lego} -%endif -%if %{with gandi} -Provides: bundled(golang(%{import_path_dnsproviders}/gandi)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/gandi)) = %{version_lego} -%endif %if %{with googlecloud} Provides: bundled(golang(%{import_path_dnsproviders}/googlecloud)) = %{version_dnsproviders} Provides: bundled(golang(%{import_path_lego}/providers/dns/gcloud)) = %{version_lego} %endif -%if %{with namecheap} -Provides: bundled(golang(%{import_path_dnsproviders}/namecheap)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/namecheap)) = %{version_lego} -%endif %if %{with pdns} Provides: bundled(golang(%{import_path_dnsproviders}/pdns)) = %{version_dnsproviders} Provides: bundled(golang(%{import_path_lego}/providers/dns/pdns)) = %{version_lego} @@ -102,10 +87,6 @@ Provides: bundled(golang(%{import_path_lego}/providers/dns/pdns)) = %{vers Provides: bundled(golang(%{import_path_dnsproviders}/rackspace)) = %{version_dnsproviders} Provides: bundled(golang(%{import_path_lego}/providers/dns/rackspace)) = %{version_lego} %endif -%if %{with rfc2136} -Provides: bundled(golang(%{import_path_dnsproviders}/rfc2136)) = %{version_dnsproviders} -Provides: bundled(golang(%{import_path_lego}/providers/dns/rfc2136)) = %{version_lego} -%endif %if %{with route53} Provides: bundled(golang(%{import_path_dnsproviders}/route53)) = %{version_dnsproviders} Provides: bundled(golang(%{import_path_lego}/providers/dns/route53)) = %{version_lego} @@ -210,13 +191,9 @@ This package was built 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 } @@ -260,13 +237,9 @@ sed -e '/other plugins/ a \\t// plugins added during rpmbuil %{?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"'} \ -i _build/src/%{import_path}/caddy/caddymain/run.go @@ -365,6 +338,7 @@ fi %changelog * Wed Oct 23 2019 Carl George - 1.0.3-1 - Update to v1 +- Remove dyn, gandi, namecheap, and rfc2136 dns providers * Wed Jul 24 2019 Fedora Release Engineering - 0.11.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 47a5d88272feebea18d009403ae5132169068749 Mon Sep 17 00:00:00 2001 From: Carl George Date: Tue, 22 Oct 2019 21:33:52 -0500 Subject: [PATCH 5/7] Add patch0 to fix `-version` flag --- caddy.spec | 9 +++- enable-appVersion-ldflag.patch | 88 ++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 enable-appVersion-ldflag.patch diff --git a/caddy.spec b/caddy.spec index f6076f4..e40ac5b 100644 --- a/caddy.spec +++ b/caddy.spec @@ -52,6 +52,8 @@ Source0: caddy-%{version}-vendor.tar.gz Source1: caddy.conf Source2: caddy.service Source3: index.html +# https://github.com/caddyserver/caddy/issues/2584 +Patch0: enable-appVersion-ldflag.patch # dnsproviders %global import_path_dnsproviders github.com/caddyserver/dnsproviders @@ -201,6 +203,10 @@ This package was built with the following plugins: %prep %setup -q -c -a 10 -a 11 -a 20 -a 21 -a 22 +pushd caddy-%{version} +%patch0 -p 1 +popd + cp caddy-%{version}/LICENSE.txt LICENSE.txt cp caddy-%{version}/dist/README.txt README.txt cp caddy-%{version}/dist/CHANGES.txt CHANGES.txt @@ -246,7 +252,7 @@ sed -e '/other plugins/ a \\t// plugins added during rpmbuil %build export GOPATH="$PWD/_build:%{gopath}" -export LDFLAGS="${LDFLAGS:-} -X %{import_path}/caddy/caddymain.appVersion=%{version}" +export LDFLAGS="${LDFLAGS:-} -X %{import_path}/caddy/caddymain.appVersion=v%{version} " %gobuild -o _bin/caddy %{import_path}/caddy @@ -339,6 +345,7 @@ fi * Wed Oct 23 2019 Carl George - 1.0.3-1 - Update to v1 - Remove dyn, gandi, namecheap, and rfc2136 dns providers +- Add patch0 to fix `-version` flag * Wed Jul 24 2019 Fedora Release Engineering - 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 From 2f3d1559e4a6116f4c873deb5f23ea6ae261ae81 Mon Sep 17 00:00:00 2001 From: Carl George Date: Tue, 22 Oct 2019 21:34:32 -0500 Subject: [PATCH 6/7] Update %gobuild fallback definition This brings it in line with the F31+ definition of that macro. * `-buildmode pie` * `-compiler gc` * `-tags="rpm_crashtraceback ${BUILDTAGS:-}"` * `-extldflags '%__global_ldflags'` --- caddy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caddy.spec b/caddy.spec index e40ac5b..e3fcbd3 100644 --- a/caddy.spec +++ b/caddy.spec @@ -18,7 +18,7 @@ %global _dwz_low_mem_die_limit 0 %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 %{?**}; +%define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; %endif Name: caddy From 62feea844cdd6c70eb6b0cd0818c3dba7cceeee6 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Mon, 17 Feb 2020 03:23:33 -0500 Subject: [PATCH 7/7] Rebuilt for GHSA-jf24-p9p9-4rjh. --- caddy.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/caddy.spec b/caddy.spec index e3fcbd3..aa41859 100644 --- a/caddy.spec +++ b/caddy.spec @@ -23,7 +23,7 @@ Name: caddy Version: 1.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Web server with automatic HTTPS License: ASL 2.0 and MIT URL: https://caddyserver.com @@ -342,6 +342,9 @@ fi %changelog +* Mon Feb 17 2020 Elliott Sales de Andrade - 1.0.3-2 +- Rebuilt for GHSA-jf24-p9p9-4rjh + * Wed Oct 23 2019 Carl George - 1.0.3-1 - Update to v1 - Remove dyn, gandi, namecheap, and rfc2136 dns providers