The package rpms/golang-github-skynetservices-skydns.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/golang-github-skynetservices-skyd....
Change:
-ExclusiveArch: %{ix86} x86_64 %{arm}
Thanks.
Full change:
============
commit 9dc3a891fad8a4b851b7f1088940bae44395f8de
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Tue May 28 15:54:00 2019 +0200
Release 2.5.3a, commit 15f42ac021b1f17a8b329f409539aa1624458da0
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 7cec732..800bf9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/skydns-6c94cbe.tar.gz
/skydns-8688008.tar.gz
+/skydns-15f42ac021b1f17a8b329f409539aa1624458da0.tar.gz
diff --git a/0001-Fix-for-new-github.com-coreos-go-systemd.patch
b/0001-Fix-for-new-github.com-coreos-go-systemd.patch
new file mode 100644
index 0000000..a7d2b1b
--- /dev/null
+++ b/0001-Fix-for-new-github.com-coreos-go-systemd.patch
@@ -0,0 +1,34 @@
+From bc5ed1725695dca5c10ac4f0af122689b9f36dd7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
+Date: Tue, 28 May 2019 15:00:52 +0200
+Subject: [PATCH] Fix for new
github.com/coreos/go-systemd
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
+---
+ server/server.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/server/server.go b/server/server.go
+index 9162f94..1c01893 100644
+--- a/server/server.go
++++ b/server/server.go
+@@ -63,11 +63,11 @@ func (s *server) Run() error {
+ }
+
+ if s.config.Systemd {
+- packetConns, err := activation.PacketConns(false)
++ packetConns, err := activation.PacketConns()
+ if err != nil {
+ return err
+ }
+- listeners, err := activation.Listeners(true)
++ listeners, err := activation.Listeners()
+ if err != nil {
+ return err
+ }
+--
+2.21.0
+
diff --git a/0001-Remove-ErrTruncated.patch b/0001-Remove-ErrTruncated.patch
new file mode 100644
index 0000000..87c5468
--- /dev/null
+++ b/0001-Remove-ErrTruncated.patch
@@ -0,0 +1,29 @@
+From e6908463530c926029f6d7a977f7d147a5c8d86e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
+Date: Tue, 28 May 2019 15:24:02 +0200
+Subject: [PATCH] Remove ErrTruncated
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
+---
+ server/stub.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/stub.go b/server/stub.go
+index f7223f4..6e8b38c 100644
+--- a/server/stub.go
++++ b/server/stub.go
+@@ -103,7 +103,7 @@ Redo:
+ } else {
+ r, err = exchangeWithRetry(s.dnsUDPclient, req, ns[nsid])
+ }
+- if err == nil || err == dns.ErrTruncated {
++ if err == nil {
+ r.Compress = true
+ r.Id = req.Id
+ w.WriteMsg(r)
+--
+2.21.0
+
diff --git a/golang-github-skynetservices-skydns.spec
b/golang-github-skynetservices-skydns.spec
index adc23cd..f340ec2 100644
--- a/golang-github-skynetservices-skydns.spec
+++ b/golang-github-skynetservices-skydns.spec
@@ -1,308 +1,118 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 1
-# server test takes more them 4 minutes, skipping
-%global with_check 0
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
+# Generated by go2rpm
+%bcond_without check
-%define copying() \
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 \
-%license %{*} \
-%else \
-%doc %{*} \
-%endif
+#
https://github.com/skynetservices/skydns
+%global goipath
github.com/skynetservices/skydns
+Version: 2.5.3
+%global commit 15f42ac021b1f17a8b329f409539aa1624458da0
-%global isgccgoarch 0
-%if 0%{?gccgo_arches:1}
-%ifarch %{gccgo_arches}
-%global isgccgoarch 1
-%endif
-%endif
+%gometa
-%global provider github
-%global provider_tld com
-%global project skynetservices
-%global repo skydns
-#
https://github.com/skynetservices/skydns
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 8688008ce43981615bad361523f68f1b36af2595
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 2.5.3
-Release: 0.10.a.git%{shortcommit}%{?dist}
-Summary: DNS service discovery for etcd
-License: MIT
-URL: https://%{provider_prefix}
-Source0:
https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-Source1: %{repo}.service
-Source2: %{repo}.conf
-Source3: %{repo}.socket
-
-# If go_arches not defined fall through to implicit golang archs
-%if 0%{?go_arches:1}
-ExclusiveArch: %{go_arches}
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
-# If gccgo_arches does not fit or is not defined fall through to golang
-%if %{isgccgoarch}
-BuildRequires: gcc-go >= %{gccgo_min_vers}
-%else
-BuildRequires: golang
-%endif
+%global common_description %{expand:
+DNS service discovery for etcd.}
-%description
-%{summary}
+%global golicenses LICENSE
+%global godocs AUTHORS CONTRIBUTORS README.md
-%package -n %{repo}
-Summary: %{summary}
+Name: %{goname}
+Release: 1.a%{?dist}
+Summary: DNS service discovery for etcd
-BuildRequires: systemd
-%if ! 0%{?with_bundled}
-BuildRequires:
golang(github.com/coreos/go-etcd/etcd)
+License: MIT
+URL: %{gourl}
+Source0: %{gosource}
+Source1: skydns.service
+Source2: skydns.conf
+Source3: skydns.socket
+# Fix for new
github.com/coreos/go-systemd
+Patch0: 0001-Fix-for-new-github.com-coreos-go-systemd.patch
+# Remove ErrTruncated, obsolete in new
github.com/miekg/dns
+Patch1: 0001-Remove-ErrTruncated.patch
+
+BuildRequires: golang(go.etcd.io/etcd/client)
+BuildRequires: golang(go.etcd.io/etcd/clientv3)
+BuildRequires: golang(go.etcd.io/etcd/mvcc/mvccpb)
+BuildRequires: golang(go.etcd.io/etcd/pkg/transport)
BuildRequires:
golang(github.com/coreos/go-systemd/activation)
BuildRequires:
golang(github.com/miekg/dns)
BuildRequires:
golang(github.com/prometheus/client_golang/prometheus)
-BuildRequires:
golang(github.com/rcrowley/go-metrics)
-BuildRequires:
golang(github.com/rcrowley/go-metrics/stathat)
-%endif
-
-Requires: etcd
-Requires(pre): shadow-utils
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
-
-Provides: %{repo} = %{version}-%{release}
-
-%description -n %{repo}
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check}
-BuildRequires:
golang(github.com/coreos/go-etcd/etcd)
-BuildRequires:
golang(github.com/coreos/go-systemd/activation)
-BuildRequires:
golang(github.com/miekg/dns)
-BuildRequires:
golang(github.com/prometheus/client_golang/prometheus)
-BuildRequires:
golang(github.com/rcrowley/go-metrics)
-BuildRequires:
golang(github.com/rcrowley/go-metrics/stathat)
-%endif
+BuildRequires: systemd-rpm-macros
-Requires:
golang(github.com/coreos/go-etcd/etcd)
-Requires:
golang(github.com/coreos/go-systemd/activation)
-Requires:
golang(github.com/miekg/dns)
-Requires:
golang(github.com/prometheus/client_golang/prometheus)
-Requires:
golang(github.com/rcrowley/go-metrics)
-Requires:
golang(github.com/rcrowley/go-metrics/stathat)
-
-Provides: golang(%{import_path}/backends/etcd) = %{version}-%{release}
-Provides: golang(%{import_path}/cache) = %{version}-%{release}
-Provides: golang(%{import_path}/msg) = %{version}-%{release}
-Provides: golang(%{import_path}/server) = %{version}-%{release}
-Provides: golang(%{import_path}/stats) = %{version}-%{release}
-
-%description devel
-%{summary}
-
-This package contains library source intended for
-building other packages which use import path with
-%{import_path} prefix.
+%if %{with check}
+# Tests
+BuildRequires:
golang(golang.org/x/net/context)
%endif
-%if 0%{?with_unit_test}
-%package unit-test
-Summary: Unit tests for %{name} package
-# If go_arches not defined fall through to implicit golang archs
-%if 0%{?go_arches:1}
-ExclusiveArch: %{go_arches}
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
-# If gccgo_arches does not fit or is not defined fall through to golang
-%if %{isgccgoarch}
-BuildRequires: gcc-go >= %{gccgo_min_vers}
-%else
-BuildRequires: golang
-%endif
+%description
+%{common_description}
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
+%package -n skydns
+Summary: DNS service discovery for etcd
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
+Requires: etcd
+Requires(pre): shadow-utils
+Provides: skydns = %{version}-%{release}
-%description unit-test
-%{summary}
+%description -n skydns
+%{common_description}
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%gopkg
%prep
-%setup -q -n %{repo}-%{commit}
+%goprep
+%patch0 -p1
+%patch1 -p1
+find . -name "*.go" -exec sed -i
"s|github.com/coreos/etcd|go.etcd.io/etcd|" "{}" +;
%build
-# If gccgo_arches does not fit or is not defined fall through to golang
-# gccco arches
-%if %{isgccgoarch}
-%if 0%{?gcc_go_build:1}
-export GOCOMPILER='%{gcc_go_build}'
-%else
-echo "No compiler for SA"
-exit 1
-%endif
-# golang arches (due to ExclusiveArch)
-%else
-%if 0%{?golang_build:1}
-export GOCOMPILER='%{golang_build} -ldflags "$LDFLAGS"'
-%else
-export GOCOMPILER='go build -ldflags "$LDFLAGS"'
-%endif
-%endif
+%gobuild -o %{gobuilddir}/bin/skydns %{goipath}
-export LDFLAGS=
-%if 0%{?with_debug}
-%if %{isgccgoarch}
-export OLD_RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
-function gobuild {
-export RPM_OPT_FLAGS="$OLD_RPM_OPT_FLAGS -B 0x$(head -c20 /dev/urandom|od -An
-tx1|tr -d ' \n')"
-eval ${GOCOMPILER} -a -v -x "$@";
-}
-%else
-export OLD_LDFLAGS="$LDFLAGS"
-function gobuild {
-export LDFLAGS="$OLD_LDFLAGS -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d '
\n')"
-eval ${GOCOMPILER} -a -v -x "$@";
-}
-%endif
-%else
-function gobuild { eval ${GOCOMPILER} -a -v -x "$@"; }
-%endif
+%install
+%gopkginstall
+install -m 0755 -vd %{buildroot}%{_bindir}
+install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
-mkdir -p
src/github.com/skynetservices
-ln -s ../../../
src/github.com/skynetservices/skydns
+install -Dpm 0644 %{SOURCE1} %{buildroot}%{_unitdir}/skydns.service
+install -Dpm 0644 %{SOURCE3} %{buildroot}%{_unitdir}/skydns.socket
+install -dm 0755 %{buildroot}%{_sysconfdir}/skydns
+install -m 644 -t %{buildroot}%{_sysconfdir}/skydns %{SOURCE2}
+install -dm 0755 %{buildroot}%{_sharedstatedir}/skydns
-%if ! 0%{?with_bundled}
-export GOPATH=$(pwd):%{gopath}
-%else
-echo "Unable to build from bundled dependencies. No Godeps directory"
-exit 1
-%endif
+%pre -n skydns
+getent group skydns >/dev/null || groupadd -r skydns
+getent passwd skydns >/dev/null || useradd -r -g skydns -d %{_sharedstatedir}/skydns
\
+ -s /sbin/nologin -c "Skydns user" skydns
-gobuild -o bin/%{repo} %{import_path}
+%post -n skydns
+%systemd_post skydns.service
-%install
-install -d -p %{buildroot}%{_bindir}
-install -p -m 755 bin/%{repo} %{buildroot}%{_bindir}
-install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{repo}.service
-install -d -m 0755 %{buildroot}%{_sysconfdir}/%{repo}
-install -m 644 -t %{buildroot}%{_sysconfdir}/%{repo} %{SOURCE2}
-install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{repo}.socket
-
-
-# And create /var/lib/skydns, even if not used at the moment
-install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{repo}
-
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
+%preun -n skydns
+%systemd_preun skydns.service
-# testing files for this project
-%if 0%{?with_unit_test}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-%endif
+%postun -n skydns
+%systemd_postun skydns.service
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if %{isgccgoarch}
-function gotest { %{gcc_go_test} "$@"; }
-%else
-%if 0%{?golang_test:1}
-function gotest { %{golang_test} "$@"; }
-%else
-function gotest { go test "$@"; }
-%endif
+# server: needs network
+%gocheck -d server
%endif
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-gotest %{import_path}/cache
-gotest %{import_path}/msg
-gotest %{import_path}/server
-%endif
+%files -n skydns
+%license LICENSE
+%doc AUTHORS CONTRIBUTORS README.md
+%{_bindir}/*
+%dir %attr(-,skydns,skydns) %{_sharedstatedir}/skydns
+%{_unitdir}/skydns.service
+%{_unitdir}/skydns.socket
+%config(noreplace) %{_sysconfdir}/skydns
-%pre -n %{repo}
-getent group %{repo} >/dev/null || groupadd -r %{repo}
-getent passwd %{repo} >/dev/null || useradd -r -g %{repo} -d
%{_sharedstatedir}/%{repo} \
- -s /sbin/nologin -c "skydns user" %{repo}
-
-%post -n %{repo}
-%systemd_post %{repo}.service
-
-%preun -n %{repo}
-%systemd_preun %{repo}.service
-
-%postun -n %{repo}
-%systemd_postun %{repo}.service
-
-%files -n %{repo}
-%copying LICENSE
-%doc README.md AUTHORS CONTRIBUTORS
-%{_bindir}/%{repo}
-%dir %attr(-,%{repo},%{repo}) %{_sharedstatedir}/%{repo}
-%{_unitdir}/%{repo}.service
-%{_unitdir}/%{repo}.socket
-%config(noreplace) %{_sysconfdir}/%{repo}
-
-%if 0%{?with_devel}
-%files devel -f devel.file-list
-%copying LICENSE
-%doc README.md AUTHORS CONTRIBUTORS
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%dir %{gopath}/src/%{import_path}
-%endif
-
-%if 0%{?with_unit_test}
-%files unit-test -f unit-test.file-list
-%copying LICENSE
-%doc README.md AUTHORS CONTRIBUTORS
-%endif
+%gopkgfiles
%changelog
+* Tue May 28 14:30:45 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> -
2.5.3-1.a.20190528git15f42ac
+- Release 2.5.3a, commit 15f42ac021b1f17a8b329f409539aa1624458da0
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
2.5.3-0.10.a.git8688008
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index afec9cc..a670dfd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0a05dfdceeeaee5e7537d55cb3b79fda skydns-8688008.tar.gz
+SHA512 (skydns-15f42ac021b1f17a8b329f409539aa1624458da0.tar.gz) =
92d7889169a82c8314b8c492e83dec46c94a933522527f4cbebeaa1f599a92f9c55e499d5e944b6c0a1872648327f38d2934a5f8ffafe409febc1b4176d14b60