align etcd and coredns version with k8s (#2144)
* align etcd and coredns version with k8s * align etcd and coredns with k8s * fix PR tooling alarm * update licenses * address pb detected by PR tools Co-authored-by: nicolas guibourge <nicolasg@microsoft.com>
This commit is contained in:
nicolas guibourge
GitHub
Родитель
92913699d7
Коммит
d0940a3053
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
|
@ -2328,8 +2328,9 @@
|
|||
"cloud-hypervisor",
|
||||
"cloud-init-vmware-guestinfo",
|
||||
"cmake-fedora",
|
||||
"coredns-1.6.7",
|
||||
"coredns-1.7.0",
|
||||
"coredns-1.8.0",
|
||||
"coredns-1.8.4",
|
||||
"dbus-x11",
|
||||
"debugedit",
|
||||
"dejavu-fonts",
|
||||
|
|
@ -2753,7 +2754,7 @@
|
|||
"elfutils",
|
||||
"erlang",
|
||||
"etcd-3.4.13",
|
||||
"etcd-3.4.3",
|
||||
"etcd-3.5.0",
|
||||
"ethtool",
|
||||
"expat",
|
||||
"expect",
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"coredns-1.6.7-vendor.tar.gz": "b66685ad4546b80920fd97b124194eeaf121784787e4d06d22af2754b933d6de",
|
||||
"coredns-1.6.7.tar.gz": "36460bac70c04cdf9c89c2b930ec4faa2c0dc4cb6573097883f54670a707c818"
|
||||
}
|
||||
}
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
Summary: Fast and flexible DNS server
|
||||
Name: coredns
|
||||
Version: 1.7.0
|
||||
Release: 4%{?dist}
|
||||
License: ASL 2.0
|
||||
Release: 7%{?dist}
|
||||
License: Apache License 2.0
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Group: System Environment/Libraries
|
||||
|
|
@ -58,10 +58,19 @@ install -p -m 755 -t %{buildroot}%{_bindir} %{name}
|
|||
%{_bindir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Thu Dec 16 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.7.0-4
|
||||
- Removing the explicit %%clean stage.
|
||||
- License verified.
|
||||
%changelog
|
||||
* Tue Feb 08 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 1.7.0-7
|
||||
- Remove clean section
|
||||
- License verified
|
||||
|
||||
* Wed Jan 19 2022 Henry Li <lihl@microsoft.com> - 1.7.0-6
|
||||
- Increment release for force republishing using golang 1.16.12
|
||||
|
||||
* Tue Nov 02 2021 Thomas Crain <thcrain@microsoft.com> - 1.7.0-5
|
||||
- Increment release for force republishing using golang 1.16.9
|
||||
|
||||
* Fri Aug 06 2021 Nicolas Guibourge <nicolasg@microsoft.com> 1.7.0-4
|
||||
- Increment release to force republishing using golang 1.16.7.
|
||||
* Tue Jun 08 2021 Henry Beberman <henry.beberman@microsoft.com> 1.7.0-3
|
||||
- Increment release to force republishing using golang 1.15.13.
|
||||
* Mon Apr 26 2021 Nicolas Guibourge <nicolasg@microsoft.com> 1.7.0-2
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"coredns-1.8.0-vendor.tar.gz": "ed45c1e5ed8501dd8edce13cb06dd84b2765f92ecbe82c57f855bfaabe76dfec",
|
||||
"coredns-1.8.0.tar.gz": "74bdfdd0bc314d2191159b6782f678989aa0cff1af993a1d384f62d1585070d8"
|
||||
}
|
||||
}
|
||||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
Summary: Fast and flexible DNS server
|
||||
Name: coredns
|
||||
Version: 1.6.7
|
||||
Version: 1.8.0
|
||||
Release: 4%{?dist}
|
||||
License: ASL 2.0
|
||||
License: Apache License 2.0
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Group: System Environment/Libraries
|
||||
|
|
@ -45,7 +45,7 @@ CoreDNS is a fast and flexible DNS server.
|
|||
tar -xf %{SOURCE1} --no-same-owner
|
||||
export BUILDOPTS="-mod=vendor -v"
|
||||
# set commit number that correspond to the github tag for that version
|
||||
export GITCOMMIT="da7f65b"
|
||||
export GITCOMMIT="054c9ae1fbea39d586652664fbc9a5cedbd97618"
|
||||
make
|
||||
|
||||
%install
|
||||
|
|
@ -58,13 +58,23 @@ install -p -m 755 -t %{buildroot}%{_bindir} %{name}
|
|||
%{_bindir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Thu Dec 16 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.6.7-4
|
||||
- Removing the explicit %%clean stage.
|
||||
- License verified.
|
||||
%changelog
|
||||
* Tue Feb 08 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 1.8.0-4
|
||||
- Remove clean section
|
||||
- License verified
|
||||
|
||||
* Tue Jun 08 2021 Henry Beberman <henry.beberman@microsoft.com> 1.6.7-3
|
||||
* Wed Jan 19 2022 Henry Li <lihl@microsoft.com> - 1.8.0-3
|
||||
- Increment release for force republishing using golang 1.16.12
|
||||
|
||||
* Tue Nov 02 2021 Thomas Crain <thcrain@microsoft.com> - 1.8.0-2
|
||||
- Increment release for force republishing using golang 1.16.9
|
||||
|
||||
* Fri Aug 20 2021 CBL-Mariner Service Account <cblmargh@microsoft.com> - 1.8.0-1
|
||||
- Update to version "1.8.0".
|
||||
|
||||
* Tue Jun 08 2021 Henry Beberman <henry.beberman@microsoft.com> 1.7.0-3
|
||||
- Increment release to force republishing using golang 1.15.13.
|
||||
* Mon Apr 26 2021 Nicolas Guibourge <nicolasg@microsoft.com> 1.6.7-2
|
||||
* Mon Apr 26 2021 Nicolas Guibourge <nicolasg@microsoft.com> 1.7.0-2
|
||||
- Increment release to force republishing using golang 1.15.11.
|
||||
* Wed Jan 20 2021 Nicolas Guibourge <nicolasg@microsoft.com> 1.6.7-1
|
||||
* Wed Jan 20 2021 Nicolas Guibourge <nicolasg@microsoft.com> 1.7.0-1
|
||||
- Original version for CBL-Mariner.
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"coredns-1.8.4-vendor.tar.gz": "ef3f29b6604ab42793ef09ad7dbe49edce9fd81729995ec18f42335aa733f42e",
|
||||
"coredns-1.8.4.tar.gz": "d85c8c52f4d38ab1915eb60523b4e5241ffa19d20e4f7bbce8b0f4fb59171f2a"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,82 @@
|
|||
%global debug_package %{nil}
|
||||
|
||||
Summary: Fast and flexible DNS server
|
||||
Name: coredns
|
||||
Version: 1.8.4
|
||||
Release: 3%{?dist}
|
||||
License: Apache License 2.0
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Group: System Environment/Libraries
|
||||
URL: https://github.com/coredns/coredns
|
||||
#Source0: https://github.com/coredns/coredns/archive/v%%{version}.tar.gz
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
# Below is a manually created tarball, no download link.
|
||||
# We're using pre-populated Go modules from this tarball, since network is disabled during build time.
|
||||
# How to re-build this file:
|
||||
# 1. wget https://github.com/coredns/coredns/archive/v%%{version}.tar.gz -O %%{name}-%%{version}.tar.gz
|
||||
# 2. tar -xf %%{name}-%%{version}.tar.gz
|
||||
# 3. cd %%{name}-%%{version}
|
||||
# 4. go mod vendor
|
||||
# 5. tar --sort=name \
|
||||
# --mtime="2021-04-26 00:00Z" \
|
||||
# --owner=0 --group=0 --numeric-owner \
|
||||
# --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
|
||||
# -cf %%{name}-%%{version}-vendor.tar.gz vendor
|
||||
#
|
||||
# NOTES:
|
||||
# - You require GNU tar version 1.28+.
|
||||
# - The additional options enable generation of a tarball with the same hash every time regardless of the environment.
|
||||
# See: https://reproducible-builds.org/docs/archives/
|
||||
# - For the value of "--mtime" use the date "2021-04-26 00:00Z" to simplify future updates.
|
||||
Source1: %{name}-%{version}-vendor.tar.gz
|
||||
Patch0: makefile-buildoption-commitnb.patch
|
||||
|
||||
BuildRequires: golang >= 1.12
|
||||
|
||||
%description
|
||||
CoreDNS is a fast and flexible DNS server.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
# create vendor folder from the vendor tarball and set vendor mode
|
||||
tar -xf %{SOURCE1} --no-same-owner
|
||||
export BUILDOPTS="-mod=vendor -v"
|
||||
# set commit number that correspond to the github tag for that version
|
||||
export GITCOMMIT="053c4d5ca1772517746a854e87ffa971249df14b"
|
||||
make
|
||||
|
||||
%install
|
||||
install -m 755 -d %{buildroot}%{_bindir}
|
||||
install -p -m 755 -t %{buildroot}%{_bindir} %{name}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%license LICENSE
|
||||
%{_bindir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Tue Feb 08 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 1.8.4-3
|
||||
- Remove clean section
|
||||
- License verified
|
||||
|
||||
* Wed Jan 19 2022 Henry Li <lihl@microsoft.com> - 1.8.4-2
|
||||
- Increment release for force republishing using golang 1.16.12
|
||||
|
||||
* Tue Dec 28 2021 Nicolas Guibourge <nicolasg@microsoft.com> - 1.8.4-1
|
||||
- Update to version "1.8.4".
|
||||
|
||||
* Tue Nov 02 2021 Thomas Crain <thcrain@microsoft.com> - 1.8.0-2
|
||||
- Increment release for force republishing using golang 1.16.9
|
||||
|
||||
* Fri Aug 20 2021 CBL-Mariner Service Account <cblmargh@microsoft.com> - 1.8.0-1
|
||||
- Update to version "1.8.0".
|
||||
|
||||
* Tue Jun 08 2021 Henry Beberman <henry.beberman@microsoft.com> 1.7.0-3
|
||||
- Increment release to force republishing using golang 1.15.13.
|
||||
* Mon Apr 26 2021 Nicolas Guibourge <nicolasg@microsoft.com> 1.7.0-2
|
||||
- Increment release to force republishing using golang 1.15.11.
|
||||
* Wed Jan 20 2021 Nicolas Guibourge <nicolasg@microsoft.com> 1.7.0-1
|
||||
- Original version for CBL-Mariner.
|
||||
|
|
@ -1,22 +1,30 @@
|
|||
Summary: A highly-available key value store for shared configuration
|
||||
Name: etcd
|
||||
Version: 3.4.13
|
||||
Release: 4%{?dist}
|
||||
Release: 8%{?dist}
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/etcd-io/etcd/
|
||||
Group: System Environment/Security
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
#Source0: https://github.com/etcd-io/%{name}/archive/v%{version}.tar.gz
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Group: System Environment/Security
|
||||
URL: https://github.com/etcd-io/etcd/
|
||||
Source0: https://github.com/etcd-io/etcd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source1: etcd.service
|
||||
|
||||
BuildRequires: golang >= 1.13
|
||||
BuildRequires: git
|
||||
BuildRequires: golang >= 1.13
|
||||
|
||||
%description
|
||||
A highly-available key value store for shared configuration and service discovery.
|
||||
|
||||
%package tools
|
||||
Summary: Diagnostic tools for etcd
|
||||
Group: System Environment/Security
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description tools
|
||||
A highly-available key value store for shared configuration and service discovery.
|
||||
The etcd-tools package contains the etcd-dump-db and etcd-dump-logs diagnostic
|
||||
tools.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
|
|
@ -32,8 +40,10 @@ export GOPATH=%{OUR_GOPATH}/vendor:%{OUR_GOPATH}/etcd_src
|
|||
|
||||
ln -s "%{_builddir}/%{name}-%{version}/vendor" "%{OUR_GOPATH}/vendor/src"
|
||||
ln -s "%{_builddir}/%{name}-%{version}" "%{OUR_GOPATH}/etcd_src/src/go.etcd.io/etcd"
|
||||
|
||||
./build
|
||||
# Now build the etcd-dump* tools
|
||||
source ./build
|
||||
tools_build
|
||||
|
||||
%install
|
||||
install -vdm755 %{buildroot}%{_bindir}
|
||||
|
|
@ -50,6 +60,9 @@ mv %{_builddir}/%{name}-%{version}/bin/etcdctl %{buildroot}%{_bindir}/
|
|||
mv %{_builddir}/%{name}-%{version}/README.md %{buildroot}/%{_docdir}/%{name}-%{version}/
|
||||
mv %{_builddir}/%{name}-%{version}/etcdctl/README.md %{buildroot}/%{_docdir}/%{name}-%{version}/README-etcdctl.md
|
||||
mv %{_builddir}/%{name}-%{version}/etcdctl/READMEv2.md %{buildroot}/%{_docdir}/%{name}-%{version}/READMEv2-etcdctl.md
|
||||
mv %{_builddir}/%{name}-%{version}/bin/tools/etcd-dump-logs %{buildroot}%{_bindir}/
|
||||
mv %{_builddir}/%{name}-%{version}/bin/tools/etcd-dump-db %{buildroot}%{_bindir}/
|
||||
|
||||
|
||||
install -vdm755 %{buildroot}/lib/systemd/system-preset
|
||||
echo "disable etcd.service" > %{buildroot}/lib/systemd/system-preset/50-etcd.preset
|
||||
|
|
@ -58,68 +71,107 @@ cp %{SOURCE1} %{buildroot}/lib/systemd/system
|
|||
install -vdm755 %{buildroot}%{_sharedstatedir}/etcd
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%{_bindir}/etcd*
|
||||
%{_bindir}/etcd
|
||||
%{_bindir}/etcdctl
|
||||
/%{_docdir}/%{name}-%{version}/*
|
||||
/lib/systemd/system/etcd.service
|
||||
/lib/systemd/system-preset/50-etcd.preset
|
||||
%dir %{_sharedstatedir}/etcd
|
||||
%config(noreplace) %{_sysconfdir}/etcd/etcd-default-conf.yml
|
||||
|
||||
%files tools
|
||||
%{_bindir}/etcd-dump-*
|
||||
|
||||
%changelog
|
||||
* Thu Dec 16 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.4.13-4
|
||||
- Removing the explicit %%clean stage.
|
||||
%changelog
|
||||
* Tue Feb 08 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 3.4.13-8
|
||||
- Remove clean section
|
||||
|
||||
* Wed Jan 19 2022 Henry Li <lihl@microsoft.com> - 3.4.13-7
|
||||
- Increment release for force republishing using golang 1.16.12
|
||||
- Update Source0 URL
|
||||
|
||||
* Tue Nov 02 2021 Thomas Crain <thcrain@microsoft.com> - 3.4.13-6
|
||||
- Increment release for force republishing using golang 1.16.9
|
||||
|
||||
* Fri Aug 06 2021 Nicolas Guibourge <nicolasg@microsoft.com> 3.4.13-5
|
||||
- Increment release to force republishing using golang 1.16.7.
|
||||
|
||||
* Thu Aug 05 2021 Tom Fay <tomfay@microsoft.com> - 3.4.13-4
|
||||
- Add etcd-tools package.
|
||||
|
||||
* Tue Jun 08 2021 Henry Beberman <henry.beberman@microsoft.com> 3.4.13-3
|
||||
- Increment release to force republishing using golang 1.15.13.
|
||||
|
||||
* Mon Apr 26 2021 Nicolas Guibourge <nicolasg@microsoft.com> 3.4.13-2
|
||||
- Increment release to force republishing using golang 1.15.11.
|
||||
|
||||
* Mon Jan 25 2021 Nicolas Guibourge <nicolasg@microsoft.com> 3.4.13-1
|
||||
- Update to version 3.4.13.
|
||||
|
||||
* Thu Dec 10 2020 Andrew Phelps <anphel@microsoft.com> 3.3.25-2
|
||||
- Increment release to force republishing using golang 1.15.
|
||||
|
||||
* Thu Sep 03 2020 Joe Schmitt <joschmit@microsoft.com> 3.3.25-1
|
||||
- Update to version 3.3.25 which fixes CVE-2020-15106, CVE-2020-15112, CVE-2020-15114, and CVE-2020-15115.
|
||||
|
||||
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 3.3.11-2
|
||||
- Added %%license line automatically
|
||||
|
||||
* Thu May 07 2020 Nicolas Ontiveros <niontive@microsoft.com> 3.3.11-1
|
||||
- Upgrade to version 3.3.11, which fixes CVE-2018-16886.
|
||||
- Update summary.
|
||||
|
||||
* Thu Apr 30 2020 Emre Girgin <mrgirgin@microsoft.com> 3.3.9-4
|
||||
- Renaming go to golang
|
||||
|
||||
* Wed Apr 08 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 3.3.9-3
|
||||
- Fixed "Source0" tag.
|
||||
- License verified and "License" tag updated.
|
||||
- Removed "%%define sha1".
|
||||
|
||||
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 3.3.9-2
|
||||
- Initial CBL-Mariner import from Photon (license: Apache2).
|
||||
|
||||
* Fri Sep 21 2018 Sujay G <gsujay@vmware.com> 3.3.9-1
|
||||
- Bump etcd version to 3.3.9
|
||||
|
||||
* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.1.5-4
|
||||
- Remove shadow requires
|
||||
|
||||
* Sun Aug 27 2017 Vinay Kulkarni <kulkarniv@vmware.com> 3.1.5-3
|
||||
- File based configuration for etcd service.
|
||||
|
||||
* Wed May 31 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.1.5-2
|
||||
- Provide preset file to disable service by default
|
||||
|
||||
* Thu Apr 06 2017 Anish Swaminathan <anishs@vmware.com> 3.1.5-1
|
||||
- Upgraded to version 3.1.5, build from sources
|
||||
|
||||
* Fri Sep 2 2016 Xiaolin Li <xiaolinl@vmware.com> 3.0.9-1
|
||||
- Upgraded to version 3.0.9
|
||||
|
||||
* Fri Jun 24 2016 Xiaolin Li <xiaolinl@vmware.com> 2.3.7-1
|
||||
- Upgraded to version 2.3.7
|
||||
|
||||
* Wed May 25 2016 Nick Shi <nshi@vmware.com> 2.2.5-3
|
||||
- Changing etcd service type from simple to notify
|
||||
|
||||
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.2.5-2
|
||||
- GA - Bump release of all rpms
|
||||
|
||||
* Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.2.5-1
|
||||
- Upgraded to version 2.2.5
|
||||
|
||||
* Tue Jul 28 2015 Divya Thaluru <dthaluru@vmware.com> 2.1.1-2
|
||||
- Adding etcd service file
|
||||
|
||||
* Tue Jul 21 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.1.1-1
|
||||
- Update to version etcd v2.1.1
|
||||
|
||||
* Tue Mar 10 2015 Divya Thaluru <dthaluru@vmware.com> 2.0.4-1
|
||||
- Initial build. First version
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"etcd-3.4.3.tar.gz": "957cafe18599b97943e8ef3e95a50f751b79a235c45c12896a98b7299f725ad9",
|
||||
"etcd.service": "4550a4967ba35670051cbfd9b4edf1fc57c0f1d7a07e51f88351ac44c76d8066"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,125 +0,0 @@
|
|||
Summary: A highly-available key value store for shared configuration
|
||||
Name: etcd
|
||||
Version: 3.4.3
|
||||
Release: 4%{?dist}
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/etcd-io/etcd/
|
||||
Group: System Environment/Security
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
#Source0: https://github.com/etcd-io/%{name}/archive/v%{version}.tar.gz
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Source1: etcd.service
|
||||
|
||||
BuildRequires: golang >= 1.13
|
||||
BuildRequires: git
|
||||
|
||||
%description
|
||||
A highly-available key value store for shared configuration and service discovery.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%build
|
||||
# Turn off auto moduling. golang 1.13 does not automatically consider the vendor folder (it does as of 1.14).
|
||||
# To successfully build, manually hydrate the go package cache (GOPATH) with the included vendor folder and
|
||||
# etcd's source code before invoking the build script.
|
||||
export GO111MODULE=off
|
||||
|
||||
%define OUR_GOPATH %{_topdir}/.gopath
|
||||
mkdir -p "%{OUR_GOPATH}/vendor" "%{OUR_GOPATH}/etcd_src/src/go.etcd.io"
|
||||
export GOPATH=%{OUR_GOPATH}/vendor:%{OUR_GOPATH}/etcd_src
|
||||
|
||||
ln -s "%{_builddir}/%{name}-%{version}/vendor" "%{OUR_GOPATH}/vendor/src"
|
||||
ln -s "%{_builddir}/%{name}-%{version}" "%{OUR_GOPATH}/etcd_src/src/go.etcd.io/etcd"
|
||||
|
||||
./build
|
||||
|
||||
%install
|
||||
install -vdm755 %{buildroot}%{_bindir}
|
||||
install -vdm755 %{buildroot}/%{_docdir}/%{name}-%{version}
|
||||
install -vdm755 %{buildroot}/lib/systemd/system
|
||||
install -vdm 0755 %{buildroot}%{_sysconfdir}/etcd
|
||||
install -vpm 0755 -T etcd.conf.yml.sample %{buildroot}%{_sysconfdir}/etcd/etcd-default-conf.yml
|
||||
|
||||
chown -R root:root %{buildroot}%{_bindir}
|
||||
chown -R root:root %{buildroot}/%{_docdir}/%{name}-%{version}
|
||||
|
||||
mv %{_builddir}/%{name}-%{version}/bin/etcd %{buildroot}%{_bindir}/
|
||||
mv %{_builddir}/%{name}-%{version}/bin/etcdctl %{buildroot}%{_bindir}/
|
||||
mv %{_builddir}/%{name}-%{version}/README.md %{buildroot}/%{_docdir}/%{name}-%{version}/
|
||||
mv %{_builddir}/%{name}-%{version}/etcdctl/README.md %{buildroot}/%{_docdir}/%{name}-%{version}/README-etcdctl.md
|
||||
mv %{_builddir}/%{name}-%{version}/etcdctl/READMEv2.md %{buildroot}/%{_docdir}/%{name}-%{version}/READMEv2-etcdctl.md
|
||||
|
||||
install -vdm755 %{buildroot}/lib/systemd/system-preset
|
||||
echo "disable etcd.service" > %{buildroot}/lib/systemd/system-preset/50-etcd.preset
|
||||
|
||||
cp %{SOURCE1} %{buildroot}/lib/systemd/system
|
||||
install -vdm755 %{buildroot}%{_sharedstatedir}/etcd
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%{_bindir}/etcd*
|
||||
/%{_docdir}/%{name}-%{version}/*
|
||||
/lib/systemd/system/etcd.service
|
||||
/lib/systemd/system-preset/50-etcd.preset
|
||||
%dir %{_sharedstatedir}/etcd
|
||||
%config(noreplace) %{_sysconfdir}/etcd/etcd-default-conf.yml
|
||||
|
||||
%changelog
|
||||
* Thu Dec 16 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.4.3-4
|
||||
- Removing the explicit %%clean stage.
|
||||
|
||||
* Tue Jun 08 2021 Henry Beberman <henry.beberman@microsoft.com> 3.4.3-3
|
||||
- Increment release to force republishing using golang 1.15.13.
|
||||
* Mon Apr 26 2021 Nicolas Guibourge <nicolasg@microsoft.com> 3.4.3-2
|
||||
- Increment release to force republishing using golang 1.15.11.
|
||||
* Mon Jan 25 2021 Nicolas Guibourge <nicolasg@microsoft.com> 3.4.3-1
|
||||
- Update to version 3.4.3.
|
||||
* Thu Dec 10 2020 Andrew Phelps <anphel@microsoft.com> 3.3.25-2
|
||||
- Increment release to force republishing using golang 1.15.
|
||||
* Thu Sep 03 2020 Joe Schmitt <joschmit@microsoft.com> 3.3.25-1
|
||||
- Update to version 3.3.25 which fixes CVE-2020-15106, CVE-2020-15112, CVE-2020-15114, and CVE-2020-15115.
|
||||
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 3.3.11-2
|
||||
- Added %%license line automatically
|
||||
* Thu May 07 2020 Nicolas Ontiveros <niontive@microsoft.com> 3.3.11-1
|
||||
- Upgrade to version 3.3.11, which fixes CVE-2018-16886.
|
||||
- Update summary.
|
||||
* Thu Apr 30 2020 Emre Girgin <mrgirgin@microsoft.com> 3.3.9-4
|
||||
- Renaming go to golang
|
||||
* Wed Apr 08 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 3.3.9-3
|
||||
- Fixed "Source0" tag.
|
||||
- License verified and "License" tag updated.
|
||||
- Removed "%%define sha1".
|
||||
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 3.3.9-2
|
||||
- Initial CBL-Mariner import from Photon (license: Apache2).
|
||||
* Fri Sep 21 2018 Sujay G <gsujay@vmware.com> 3.3.9-1
|
||||
- Bump etcd version to 3.3.9
|
||||
* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.1.5-4
|
||||
- Remove shadow requires
|
||||
* Sun Aug 27 2017 Vinay Kulkarni <kulkarniv@vmware.com> 3.1.5-3
|
||||
- File based configuration for etcd service.
|
||||
* Wed May 31 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.1.5-2
|
||||
- Provide preset file to disable service by default
|
||||
* Thu Apr 06 2017 Anish Swaminathan <anishs@vmware.com> 3.1.5-1
|
||||
- Upgraded to version 3.1.5, build from sources
|
||||
* Fri Sep 2 2016 Xiaolin Li <xiaolinl@vmware.com> 3.0.9-1
|
||||
- Upgraded to version 3.0.9
|
||||
* Fri Jun 24 2016 Xiaolin Li <xiaolinl@vmware.com> 2.3.7-1
|
||||
- Upgraded to version 2.3.7
|
||||
* Wed May 25 2016 Nick Shi <nshi@vmware.com> 2.2.5-3
|
||||
- Changing etcd service type from simple to notify
|
||||
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.2.5-2
|
||||
- GA - Bump release of all rpms
|
||||
* Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.2.5-1
|
||||
- Upgraded to version 2.2.5
|
||||
* Tue Jul 28 2015 Divya Thaluru <dthaluru@vmware.com> 2.1.1-2
|
||||
- Adding etcd service file
|
||||
* Tue Jul 21 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.1.1-1
|
||||
- Update to version etcd v2.1.1
|
||||
* Tue Mar 10 2015 Divya Thaluru <dthaluru@vmware.com> 2.0.4-1
|
||||
- Initial build. First version
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"etcd-3.5.0-vendor.tar.gz": "3561ca71f2a29f405115088ca355399b23a6c63d47c398e621322bc98f7b28b9",
|
||||
"etcd-3.5.0.tar.gz": "f30f68c52a7547af08be7d166884c94885ea8a593c1c1e814c89b24148ee1921",
|
||||
"etcd.service": "4550a4967ba35670051cbfd9b4edf1fc57c0f1d7a07e51f88351ac44c76d8066"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,230 @@
|
|||
Summary: A highly-available key value store for shared configuration
|
||||
Name: etcd
|
||||
Version: 3.5.0
|
||||
Release: 3%{?dist}
|
||||
License: ASL 2.0
|
||||
Vendor: Microsoft Corporation
|
||||
Distribution: Mariner
|
||||
Group: System Environment/Security
|
||||
URL: https://github.com/etcd-io/etcd/
|
||||
Source0: https://github.com/etcd-io/etcd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source1: etcd.service
|
||||
# Below is a manually created tarball, no download link.
|
||||
# We're using vendored Go modules from this tarball, since network is disabled during build time.
|
||||
#
|
||||
# How to re-build this file:
|
||||
# 1. either download etcd source tarball or git clone etcd repo from github and checkout relevant tag
|
||||
# 2. execute 'go mod vendor' in 'server', 'etcdctl' and 'etcdutl' folders
|
||||
# and create tarball containting 'vendor' folder for each
|
||||
# (naming rule for tarball is 'vendor-[component].tar.gz', e.g.: 'vendor-server.tar.gz')
|
||||
# 3. create 'vendor' tarballs for dump tools
|
||||
# a. cd 'etcd-dump-db' folder, create 'go.mod' file ('go mod init go.etcd.io/etcd/tools/etcd-dump-db/v3')
|
||||
# b. populate 'go.mod' file ('go mod tidy')
|
||||
# c. add replace rules in 'go.mod' making sure that each etcd dependency is taken locally, e.g.:
|
||||
# replace (
|
||||
# go.etcd.io/etcd/api/v3 => ../../api
|
||||
# go.etcd.io/etcd/server/v3 => ../../server
|
||||
# )
|
||||
# d. create vendor folder ('go mod vendor')
|
||||
# e. create tarball containing 'vendor' folder and 'go.mod' and 'go.sum' files
|
||||
# (same naming rules than described above)
|
||||
# f. repeat above operations for 'etcd-dump-logs' folder
|
||||
# 4. create 'etcd-%{version}-vendor.tar.gz' tarball containing all tarballs created above
|
||||
#
|
||||
# NOTES:
|
||||
# - You require GNU tar version 1.28+.
|
||||
# - The additional options enable generation of a tarball with the same hash every time regardless of the environment.
|
||||
# See: https://reproducible-builds.org/docs/archives/
|
||||
# - For the value of "--mtime" use the date "2021-04-26 00:00Z" to simplify future updates.
|
||||
Source2: %{name}-%{version}-vendor.tar.gz
|
||||
BuildRequires: golang >= 1.16
|
||||
|
||||
%description
|
||||
A highly-available key value store for shared configuration and service discovery.
|
||||
|
||||
%package tools
|
||||
Summary: Diagnostic tools for etcd
|
||||
Group: System Environment/Security
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description tools
|
||||
A highly-available key value store for shared configuration and service discovery.
|
||||
The etcd-tools package contains the etcd-dump-db and etcd-dump-logs diagnostic
|
||||
tools.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
tar --no-same-owner -xf %{SOURCE2}
|
||||
|
||||
%build
|
||||
%define ETCD_OUT_DIR %{_builddir}/%{name}-%{version}/bin
|
||||
mkdir -p %{ETCD_OUT_DIR}
|
||||
|
||||
# build etcd
|
||||
for component in server etcdctl etcdutl; do
|
||||
pushd $component
|
||||
tar --no-same-owner -xf %{_builddir}/%{name}-%{version}/vendor-$component.tar.gz
|
||||
go build \
|
||||
-o %{ETCD_OUT_DIR} \
|
||||
-ldflags=-X=go.etcd.io/etcd/api/v3/version.GitSHA=v%{version}
|
||||
popd
|
||||
done
|
||||
|
||||
# build tools
|
||||
%define ETCD_TOOLS_OUT_DIR %{_builddir}/%{name}-%{version}/bin/tools
|
||||
mkdir -p %{ETCD_TOOLS_OUT_DIR}
|
||||
|
||||
for component in etcd-dump-db etcd-dump-logs; do
|
||||
pushd tools/$component
|
||||
tar --no-same-owner -xf %{_builddir}/%{name}-%{version}/vendor-$component.tar.gz
|
||||
go build \
|
||||
-o %{ETCD_TOOLS_OUT_DIR}
|
||||
popd
|
||||
done
|
||||
|
||||
%install
|
||||
install -vdm755 %{buildroot}%{_bindir}
|
||||
install -vdm755 %{buildroot}/%{_docdir}/%{name}-%{version}
|
||||
install -vdm755 %{buildroot}/lib/systemd/system
|
||||
install -vdm 0755 %{buildroot}%{_sysconfdir}/etcd
|
||||
install -vpm 0755 -T etcd.conf.yml.sample %{buildroot}%{_sysconfdir}/etcd/etcd-default-conf.yml
|
||||
|
||||
chown -R root:root %{buildroot}%{_bindir}
|
||||
chown -R root:root %{buildroot}/%{_docdir}/%{name}-%{version}
|
||||
|
||||
# note that 'server' should be renamed 'etcd'
|
||||
mv %{_builddir}/%{name}-%{version}/bin/server %{buildroot}%{_bindir}/etcd
|
||||
mv %{_builddir}/%{name}-%{version}/bin/etcdctl %{buildroot}%{_bindir}/
|
||||
mv %{_builddir}/%{name}-%{version}/bin/etcdutl %{buildroot}%{_bindir}/
|
||||
|
||||
mv %{_builddir}/%{name}-%{version}/README.md %{buildroot}/%{_docdir}/%{name}-%{version}/
|
||||
mv %{_builddir}/%{name}-%{version}/etcdctl/README.md %{buildroot}/%{_docdir}/%{name}-%{version}/README-etcdctl.md
|
||||
mv %{_builddir}/%{name}-%{version}/etcdctl/READMEv2.md %{buildroot}/%{_docdir}/%{name}-%{version}/READMEv2-etcdctl.md
|
||||
mv %{_builddir}/%{name}-%{version}/etcdutl/README.md %{buildroot}/%{_docdir}/%{name}-%{version}/README-etcdutl.md
|
||||
|
||||
# tools
|
||||
install -vdm755 %{buildroot}/%{_docdir}/%{name}-%{version}-tools
|
||||
chown -R root:root %{buildroot}/%{_docdir}/%{name}-%{version}-tools
|
||||
|
||||
mv %{_builddir}/%{name}-%{version}/bin/tools/etcd-dump-logs %{buildroot}%{_bindir}/
|
||||
mv %{_builddir}/%{name}-%{version}/bin/tools/etcd-dump-db %{buildroot}%{_bindir}/
|
||||
|
||||
mv %{_builddir}/%{name}-%{version}/tools/etcd-dump-db/README.md %{buildroot}/%{_docdir}/%{name}-%{version}-tools/README-etcd-dump-db.md
|
||||
mv %{_builddir}/%{name}-%{version}/tools/etcd-dump-logs/README.md %{buildroot}/%{_docdir}/%{name}-%{version}-tools/README-etcd-dump-logs.md
|
||||
|
||||
install -vdm755 %{buildroot}/lib/systemd/system-preset
|
||||
echo "disable etcd.service" > %{buildroot}/lib/systemd/system-preset/50-etcd.preset
|
||||
|
||||
cp %{SOURCE1} %{buildroot}/lib/systemd/system
|
||||
install -vdm755 %{buildroot}%{_sharedstatedir}/etcd
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%{_bindir}/etcd
|
||||
%{_bindir}/etcdctl
|
||||
%{_bindir}/etcdutl
|
||||
/%{_docdir}/%{name}-%{version}/*
|
||||
/lib/systemd/system/etcd.service
|
||||
/lib/systemd/system-preset/50-etcd.preset
|
||||
%dir %{_sharedstatedir}/etcd
|
||||
%config(noreplace) %{_sysconfdir}/etcd/etcd-default-conf.yml
|
||||
|
||||
%files tools
|
||||
%license LICENSE
|
||||
%{_bindir}/etcd-dump-*
|
||||
/%{_docdir}/%{name}-%{version}-tools/*
|
||||
|
||||
%changelog
|
||||
%changelog
|
||||
* Tue Feb 08 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 3.5.0-3
|
||||
- Remove clean section
|
||||
|
||||
* Wed Jan 19 2022 Henry Li <lihl@microsoft.com> - 3.5.0-2
|
||||
- Increment release for force republishing using golang 1.16.12
|
||||
|
||||
* Tue Dec 28 2021 Nicolas Guibourge <nicolasg@microsoft.com> - 3.5.0-1
|
||||
- Upgrade to version 3.5.0
|
||||
|
||||
* Tue Nov 02 2021 Thomas Crain <thcrain@microsoft.com> - 3.4.13-6
|
||||
- Increment release for force republishing using golang 1.16.9
|
||||
|
||||
* Fri Aug 06 2021 Nicolas Guibourge <nicolasg@microsoft.com> 3.4.13-5
|
||||
- Increment release to force republishing using golang 1.16.7.
|
||||
|
||||
* Thu Aug 05 2021 Tom Fay <tomfay@microsoft.com> - 3.4.13-4
|
||||
- Add etcd-tools package.
|
||||
|
||||
* Tue Jun 08 2021 Henry Beberman <henry.beberman@microsoft.com> 3.4.13-3
|
||||
- Increment release to force republishing using golang 1.15.13.
|
||||
|
||||
* Mon Apr 26 2021 Nicolas Guibourge <nicolasg@microsoft.com> 3.4.13-2
|
||||
- Increment release to force republishing using golang 1.15.11.
|
||||
|
||||
* Mon Jan 25 2021 Nicolas Guibourge <nicolasg@microsoft.com> 3.4.13-1
|
||||
- Update to version 3.4.13.
|
||||
|
||||
* Thu Dec 10 2020 Andrew Phelps <anphel@microsoft.com> 3.3.25-2
|
||||
- Increment release to force republishing using golang 1.15.
|
||||
|
||||
* Thu Sep 03 2020 Joe Schmitt <joschmit@microsoft.com> 3.3.25-1
|
||||
- Update to version 3.3.25 which fixes CVE-2020-15106, CVE-2020-15112, CVE-2020-15114, and CVE-2020-15115.
|
||||
|
||||
* Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 3.3.11-2
|
||||
- Added %%license line automatically
|
||||
|
||||
* Thu May 07 2020 Nicolas Ontiveros <niontive@microsoft.com> 3.3.11-1
|
||||
- Upgrade to version 3.3.11, which fixes CVE-2018-16886.
|
||||
- Update summary.
|
||||
|
||||
* Thu Apr 30 2020 Emre Girgin <mrgirgin@microsoft.com> 3.3.9-4
|
||||
- Renaming go to golang
|
||||
|
||||
* Wed Apr 08 2020 Pawel Winogrodzki <pawelwi@microsoft.com> 3.3.9-3
|
||||
- Fixed "Source0" tag.
|
||||
- License verified and "License" tag updated.
|
||||
- Removed "%%define sha1".
|
||||
|
||||
* Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 3.3.9-2
|
||||
- Initial CBL-Mariner import from Photon (license: Apache2).
|
||||
|
||||
* Fri Sep 21 2018 Sujay G <gsujay@vmware.com> 3.3.9-1
|
||||
- Bump etcd version to 3.3.9
|
||||
|
||||
* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 3.1.5-4
|
||||
- Remove shadow requires
|
||||
|
||||
* Sun Aug 27 2017 Vinay Kulkarni <kulkarniv@vmware.com> 3.1.5-3
|
||||
- File based configuration for etcd service.
|
||||
|
||||
* Wed May 31 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.1.5-2
|
||||
- Provide preset file to disable service by default
|
||||
|
||||
* Thu Apr 06 2017 Anish Swaminathan <anishs@vmware.com> 3.1.5-1
|
||||
- Upgraded to version 3.1.5, build from sources
|
||||
|
||||
* Fri Sep 2 2016 Xiaolin Li <xiaolinl@vmware.com> 3.0.9-1
|
||||
- Upgraded to version 3.0.9
|
||||
|
||||
* Fri Jun 24 2016 Xiaolin Li <xiaolinl@vmware.com> 2.3.7-1
|
||||
- Upgraded to version 2.3.7
|
||||
|
||||
* Wed May 25 2016 Nick Shi <nshi@vmware.com> 2.2.5-3
|
||||
- Changing etcd service type from simple to notify
|
||||
|
||||
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.2.5-2
|
||||
- GA - Bump release of all rpms
|
||||
|
||||
* Tue Feb 23 2016 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2.2.5-1
|
||||
- Upgraded to version 2.2.5
|
||||
|
||||
* Tue Jul 28 2015 Divya Thaluru <dthaluru@vmware.com> 2.1.1-2
|
||||
- Adding etcd service file
|
||||
|
||||
* Tue Jul 21 2015 Vinay Kulkarni <kulkarniv@vmware.com> 2.1.1-1
|
||||
- Update to version etcd v2.1.1
|
||||
|
||||
* Tue Mar 10 2015 Divya Thaluru <dthaluru@vmware.com> 2.0.4-1
|
||||
- Initial build. First version
|
||||
|
|
@ -2137,8 +2137,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "coredns",
|
||||
"version": "1.6.7",
|
||||
"downloadUrl": "https://github.com/coredns/coredns/archive/v1.6.7.tar.gz"
|
||||
"version": "1.7.0",
|
||||
"downloadUrl": "https://github.com/coredns/coredns/archive/v1.7.0.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -2147,8 +2147,18 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "coredns",
|
||||
"version": "1.7.0",
|
||||
"downloadUrl": "https://github.com/coredns/coredns/archive/v1.7.0.tar.gz"
|
||||
"version": "1.8.0",
|
||||
"downloadUrl": "https://github.com/coredns/coredns/archive/v1.8.0.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "other",
|
||||
"other": {
|
||||
"name": "coredns",
|
||||
"version": "1.8.4",
|
||||
"downloadUrl": "https://github.com/coredns/coredns/archive/v1.8.4.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -3398,8 +3408,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "etcd",
|
||||
"version": "3.4.3",
|
||||
"downloadUrl": "https://github.com/etcd-io/etcd/archive/v3.4.3.tar.gz"
|
||||
"version": "3.4.13",
|
||||
"downloadUrl": "https://github.com/etcd-io/etcd/archive/v3.4.13.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -3408,8 +3418,8 @@
|
|||
"type": "other",
|
||||
"other": {
|
||||
"name": "etcd",
|
||||
"version": "3.4.13",
|
||||
"downloadUrl": "https://github.com/etcd-io/etcd/archive/v3.4.13.tar.gz"
|
||||
"version": "3.5.0",
|
||||
"downloadUrl": "https://github.com/etcd-io/etcd/archive/v3.5.0.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче