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=d16fc045a933abf....
Change: -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le
Thanks.
Full change: ============
commit afe845328a702c2cdb3e35b8fc9ce0f7b791be66 Merge: b85070c d95c5a0 Author: Carl George carl@george.computer Date: Fri Mar 30 18:36:01 2018 -0500
Merge branch 'f27'
commit b85070ce0561800bcb5a2eeec08f5896786e2f68 Author: Carl George carl@george.computer Date: Fri Mar 30 18:07:10 2018 -0500
Set selinux labels in scriptlets
diff --git a/caddy.spec b/caddy.spec index edf3654..b23c9d7 100644 --- a/caddy.spec +++ b/caddy.spec @@ -216,6 +216,13 @@ exit 0
%post %systemd_post caddy.service +if [ -x /usr/sbin/semanage -a -x /usr/sbin/restorecon ]; then + semanage fcontext --add --type httpd_exec_t '%{_bindir}/caddy' 2> /dev/null || : + semanage fcontext --add --type httpd_sys_content_t '%{_datadir}/caddy(/.*)?' 2> /dev/null || : + semanage fcontext --add --type httpd_config_t '%{_sysconfdir}/caddy(/.*)?' 2> /dev/null || : + semanage fcontext --add --type httpd_var_lib_t '%{_sharedstatedir}/caddy(/.*)?' 2> /dev/null || : + restorecon -r %{_bindir}/caddy %{_datadir}/caddy %{_sysconfdir}/caddy %{_sharedstatedir}/caddy || : +fi
%preun @@ -224,6 +231,14 @@ exit 0
%postun %systemd_postun_with_restart caddy.service +if [ $1 -eq 0 ]; then + if [ -x /usr/sbin/semanage ]; then + semanage fcontext --delete --type httpd_exec_t '%{_bindir}/caddy' 2> /dev/null || : + semanage fcontext --delete --type httpd_sys_content_t '%{_datadir}/caddy(/.*)?' 2> /dev/null || : + semanage fcontext --delete --type httpd_config_t '%{_sysconfdir}/caddy(/.*)?' 2> /dev/null || : + semanage fcontext --delete --type httpd_var_lib_t '%{_sharedstatedir}/caddy(/.*)?' 2> /dev/null || : + fi +fi
%files @@ -247,6 +262,7 @@ exit 0 - Add googlecloud dns provider - Add route53 dns provider - Set minimum golang version to 1.9 +- Set selinux labels in scriptlets
* Sat Feb 24 2018 Carl George carl@george.computer - 0.10.11-1 - Latest upstream
commit 92091e9a847198144e002d131529059b55b53669 Author: Carl George carl@george.computer Date: Fri Mar 30 18:05:17 2018 -0500
Set minimum golang version to 1.9
diff --git a/caddy.spec b/caddy.spec index ec37c5c..edf3654 100644 --- a/caddy.spec +++ b/caddy.spec @@ -60,7 +60,8 @@ Source11: caddy.service Source12: index.html
%{?go_compiler:BuildRequires: compiler(go-compiler)} -BuildRequires: golang >= 1.8 +# https://github.com/mholt/caddy/pull/2024 +BuildRequires: golang >= 1.9
%if %{with googlecloud} BuildRequires: golang(google.golang.org/api/dns/v1) @@ -245,6 +246,7 @@ exit 0 * Fri Mar 30 2018 Carl George carl@george.computer - 0.10.11-2 - Add googlecloud dns provider - Add route53 dns provider +- Set minimum golang version to 1.9
* Sat Feb 24 2018 Carl George carl@george.computer - 0.10.11-1 - Latest upstream
commit e4bffa3ad1a43e09a3d89eb1e00ce65ef7a9b8f1 Author: Carl George carl@george.computer Date: Fri Mar 30 18:04:31 2018 -0500
Add route53 dns provider
diff --git a/caddy.spec b/caddy.spec index 096c7ee..ec37c5c 100644 --- a/caddy.spec +++ b/caddy.spec @@ -9,6 +9,7 @@ %bcond_without powerdns %bcond_without rackspace %bcond_without rfc2136 +%bcond_without route53
%bcond_with debug
@@ -64,6 +65,13 @@ BuildRequires: golang >= 1.8 %if %{with googlecloud} BuildRequires: golang(google.golang.org/api/dns/v1) %endif +%if %{with route53} +BuildRequires: golang(github.com/aws/aws-sdk-go/aws) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/client) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/request) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) +BuildRequires: golang(github.com/aws/aws-sdk-go/service/route53) +%endif
BuildRequires: systemd %{?systemd_requires} @@ -141,6 +149,7 @@ package is an unofficial build with the following plugins: %{?with_powerdns: tls.dns.powerdns} %{?with_rackspace: tls.dns.rackspace} %{?with_rfc2136: tls.dns.rfc2136} +%{?with_route53: tls.dns.route53}
%prep @@ -152,7 +161,7 @@ tar -C vendor/%{import_path_realip} --strip-components 1 -x -f %{S:1} cp vendor/%{import_path_realip}/LICENSE LICENSE-realip %endif
-%if %{with cloudflare}%{with digitalocean}%{with dyn}%{with gandi}%{with googlecloud}%{with namecheap}%{with powerdns}%{with rackspace}%{with rfc2136} +%if %{with cloudflare}%{with digitalocean}%{with dyn}%{with gandi}%{with googlecloud}%{with namecheap}%{with powerdns}%{with rackspace}%{with rfc2136}%{with route53} mkdir -p vendor/%{import_path_dnsproviders} tar -C vendor/%{import_path_dnsproviders} --strip-components 1 -x -f %{S:2} cp vendor/%{import_path_dnsproviders}/LICENSE LICENSE-dnsproviders @@ -172,6 +181,7 @@ sed -e '/other plugins/ a \t// plugins added during rpmbuild' \ %{?with_powerdns: -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 caddy/caddymain/run.go
@@ -218,7 +228,7 @@ exit 0 %files %license LICENSE.txt %{?with_realip:%license LICENSE-realip} -%if %{with cloudflare}%{with digitalocean}%{with dyn}%{with gandi}%{with googlecloud}%{with namecheap}%{with powerdns}%{with rackspace}%{with rfc2136} +%if %{with cloudflare}%{with digitalocean}%{with dyn}%{with gandi}%{with googlecloud}%{with namecheap}%{with powerdns}%{with rackspace}%{with rfc2136}%{with route53} %license LICENSE-dnsproviders LICENSE-lego %endif %doc dist/README.txt @@ -234,6 +244,7 @@ exit 0 %changelog * Fri Mar 30 2018 Carl George carl@george.computer - 0.10.11-2 - Add googlecloud dns provider +- Add route53 dns provider
* Sat Feb 24 2018 Carl George carl@george.computer - 0.10.11-1 - Latest upstream
commit 8fa712de04a369836235e784e529b3aead769691 Author: Carl George carl@george.computer Date: Fri Mar 30 18:03:50 2018 -0500
Add googlecloud dns provider
diff --git a/caddy.spec b/caddy.spec index 91b966e..096c7ee 100644 --- a/caddy.spec +++ b/caddy.spec @@ -4,6 +4,7 @@ %bcond_without digitalocean %bcond_without dyn %bcond_without gandi +%bcond_without googlecloud %bcond_without namecheap %bcond_without powerdns %bcond_without rackspace @@ -23,7 +24,7 @@
Name: caddy Version: 0.10.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: HTTP/2 web server with automatic HTTPS License: ASL 2.0 and MIT URL: https://caddyserver.com @@ -60,6 +61,10 @@ Source12: index.html %{?go_compiler:BuildRequires: compiler(go-compiler)} BuildRequires: golang >= 1.8
+%if %{with googlecloud} +BuildRequires: golang(google.golang.org/api/dns/v1) +%endif + BuildRequires: systemd %{?systemd_requires} Provides: webserver @@ -131,6 +136,7 @@ package is an unofficial build with the following plugins: %{?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_powerdns: tls.dns.powerdns} %{?with_rackspace: tls.dns.rackspace} @@ -146,7 +152,7 @@ tar -C vendor/%{import_path_realip} --strip-components 1 -x -f %{S:1} cp vendor/%{import_path_realip}/LICENSE LICENSE-realip %endif
-%if %{with cloudflare}%{with digitalocean}%{with dyn}%{with gandi}%{with namecheap}%{with powerdns}%{with rackspace}%{with rfc2136} +%if %{with cloudflare}%{with digitalocean}%{with dyn}%{with gandi}%{with googlecloud}%{with namecheap}%{with powerdns}%{with rackspace}%{with rfc2136} mkdir -p vendor/%{import_path_dnsproviders} tar -C vendor/%{import_path_dnsproviders} --strip-components 1 -x -f %{S:2} cp vendor/%{import_path_dnsproviders}/LICENSE LICENSE-dnsproviders @@ -161,6 +167,7 @@ sed -e '/other plugins/ a \t// plugins added during rpmbuild' \ %{?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_powerdns: -e '/other plugins/ a \t_ "%{import_path_dnsproviders}/pdns"'} \ %{?with_rackspace: -e '/other plugins/ a \t_ "%{import_path_dnsproviders}/rackspace"'} \ @@ -211,7 +218,7 @@ exit 0 %files %license LICENSE.txt %{?with_realip:%license LICENSE-realip} -%if %{with cloudflare}%{with digitalocean}%{with dyn}%{with gandi}%{with namecheap}%{with powerdns}%{with rackspace}%{with rfc2136} +%if %{with cloudflare}%{with digitalocean}%{with dyn}%{with gandi}%{with googlecloud}%{with namecheap}%{with powerdns}%{with rackspace}%{with rfc2136} %license LICENSE-dnsproviders LICENSE-lego %endif %doc dist/README.txt @@ -225,6 +232,9 @@ exit 0
%changelog +* Fri Mar 30 2018 Carl George carl@george.computer - 0.10.11-2 +- Add googlecloud dns provider + * Sat Feb 24 2018 Carl George carl@george.computer - 0.10.11-1 - Latest upstream
commit d16fc045a933abf007531a02c2dac9bb27ec129a Author: Carl George carl@george.computer Date: Fri Mar 30 18:00:48 2018 -0500
cleanup
diff --git a/caddy.spec b/caddy.spec index 915ccfe..91b966e 100644 --- a/caddy.spec +++ b/caddy.spec @@ -21,42 +21,49 @@ %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.10.11 +Release: 1%{?dist} +Summary: HTTP/2 web server with automatic HTTPS +License: ASL 2.0 and MIT +URL: https://caddyserver.com +#ExclusiveArch: %%{go_arches} +# fails to build on s390x +ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le + # caddy %global import_path github.com/mholt/caddy +Source0: https://%%7Bimport_path%7D/archive/v%%7Bversion%7D/caddy-%%7Bversion%7D.tar....
# realip %global import_path_realip github.com/captncraig/caddy-realip %global commit_realip 5dd1f4047d0f649f21ba9f8d7e491d712be9a5b0 +Source1: https://%%7Bimport_path_realip%7D/archive/%%7Bcommit_realip%7D/realip-%%7Bco... +Provides: bundled(golang(%{import_path_realip})) = %{commit_realip}
# dnsproviders %global import_path_dnsproviders github.com/caddyserver/dnsproviders %global commit_dnsproviders 3fb56b86673f53871a9da68aeec2f2bdec06163c +Source2: https://%%7Bimport_path_dnsproviders%7D/archive/%%7Bcommit_dnsproviders%7D/d... +Provides: bundled(golang(%{import_path_dnsproviders})) = %{commit_dnsproviders}
# lego %global import_path_lego github.com/xenolf/lego %global commit_lego 4dde48a9b9916926a8dd4f69639c8dba40930355 - -Name: caddy -Version: 0.10.11 -Release: 1%{?dist} -Summary: HTTP/2 web server with automatic HTTPS -License: ASL 2.0 and MIT -URL: https://caddyserver.com -Source0: https://%%7Bimport_path%7D/archive/v%%7Bversion%7D/caddy-%%7Bversion%7D.tar.... -Source1: https://%%7Bimport_path_realip%7D/archive/%%7Bcommit_realip%7D/realip-%%7Bco... -Source2: https://%%7Bimport_path_dnsproviders%7D/archive/%%7Bcommit_dnsproviders%7D/d... Source3: https://%%7Bimport_path_lego%7D/archive/%%7Bcommit_lego%7D/lego-%%7Bcommit_l... +Provides: bundled(golang(%{import_path_lego})) = %{commit_lego} + Source10: caddy.conf Source11: caddy.service Source12: index.html -#ExclusiveArch: %%{go_arches} -# fails to build on s390x -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le + %{?go_compiler:BuildRequires: compiler(go-compiler)} BuildRequires: golang >= 1.8 + BuildRequires: systemd %{?systemd_requires} Provides: webserver + # vendored libraries (Source0) Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 7a4ba9f439fbc50061834a4063b57cf7222ba83f Provides: bundled(golang(github.com/aead/chacha20)) = 8d6ce0550041f9d97e7f15ec27ed489f8bbbb0fb @@ -112,10 +119,6 @@ Provides: bundled(golang(gopkg.in/alecthomas/kingpin.v2)) = 1087e65c9441605df944 Provides: bundled(golang(gopkg.in/natefinch/lumberjack.v2)) = df99d62fd42d8b3752c8a42c6723555372c02a03 Provides: bundled(golang(gopkg.in/square/go-jose.v1)) = aa2e30fdd1fe9dd3394119af66451ae790d50e0d Provides: bundled(golang(gopkg.in/yaml.v2)) = 25c4ec802a7d637f88d584ab26798e94ad14c13b -# additional plugin libraries (Source1, Source2, Source3) -Provides: bundled(golang(github.com/captncraig/caddy-realip)) = %{commit_realip} -Provides: bundled(golang(github.com/caddyserver/dnsproviders)) = %{commit_dnsproviders} -Provides: bundled(golang(github.com/xenolf/lego)) = %{commit_lego}
%description
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org