folkslinux
/
CBL-Mariner
mirror of https://github.com/microsoft/CBL-Mariner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add etcd 3.5.1 and coredns 1.8.6 (#2846) 

* resolve merge conflict

* fix port from Mariner 1.0 issues

* fix extra CR in changelog

* fix merge conflict

Co-authored-by: nicolas guibourge <nicolasg@microsoft.com>
This commit is contained in:
nicolas guibourge 2022-04-25 09:19:26 -07:00 committed by GitHub
parent 86f817df4b
commit ad4e050e4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 152 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md
View File

File diff suppressed because one or more lines are too long

4
SPECS/LICENSES-AND-NOTICES/data/licenses.json
View File

@ -1952,9 +1952,9 @@
"clamav",
"cloud-hypervisor",
"cmake-fedora",
"coredns-1.7.0",
"coredns-1.8.0",
"coredns-1.8.4",
"coredns-1.8.6",
"dbus-x11",
"debugedit",
"dejavu-fonts",
@ -2293,8 +2293,8 @@
"efivar",
"elfutils",
"erlang",
"etcd-3.4.13",
"etcd-3.5.0",
"etcd-3.5.1",
"ethtool",
"expat",
"expect",

6
SPECS/coredns/coredns-1.7.0.signatures.json
View File

@ -1,6 +0,0 @@
{
"Signatures": {
"coredns-1.7.0-vendor.tar.gz": "c1bc3e8a9156f322fc8bca2fc654311d8eaa31cdbd014432fe39e775693a4db9",
"coredns-1.7.0.tar.gz": "7e436e9d0c0b84af863685e05d701b84247bb0f12b6dbf05ea87e165c1398b2b"
}
}

11
SPECS/coredns/coredns-1.8.0.spec
View File

@ -3,7 +3,7 @@
Summary: Fast and flexible DNS server
Name: coredns
Version: 1.8.0
Release: 4%{?dist}
Release: 6%{?dist}
License: Apache License 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
@ -58,11 +58,16 @@ install -p -m 755 -t %{buildroot}%{_bindir} %{name}
%{_bindir}/%{name}
%changelog
%changelog
* Tue Feb 08 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 1.8.0-4
* Fri Apr 22 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 1.8.0-6
- Remove clean section
- License verified
* Tue Mar 15 2022 Muhammad Falak <mwani@microsoft.com> - 1.8.0-5
- Bump release to force rebuild with golang 1.16.15
* Fri Feb 18 2022 Thomas Crain <thcrain@microsoft.com> - 1.8.0-4
- Bump release to force rebuild with golang 1.16.14
* Wed Jan 19 2022 Henry Li <lihl@microsoft.com> - 1.8.0-3
- Increment release for force republishing using golang 1.16.12

10
SPECS/coredns/coredns-1.8.4.spec
View File

@ -3,7 +3,7 @@
Summary: Fast and flexible DNS server
Name: coredns
Version: 1.8.4
Release: 3%{?dist}
Release: 5%{?dist}
License: Apache License 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
@ -58,10 +58,16 @@ install -p -m 755 -t %{buildroot}%{_bindir} %{name}
%{_bindir}/%{name}
%changelog
* Tue Feb 08 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 1.8.4-3
* Fri Apr 22 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 1.8.4-5
- Remove clean section
- License verified
* Tue Mar 15 2022 Muhammad Falak <mwani@microsoft.com> - 1.8.4-4
- Bump release to force rebuild with golang 1.16.15
* Fri Feb 18 2022 Thomas Crain <thcrain@microsoft.com> - 1.8.4-3
- Bump release to force rebuild with golang 1.16.14
* Wed Jan 19 2022 Henry Li <lihl@microsoft.com> - 1.8.4-2
- Increment release for force republishing using golang 1.16.12

6
SPECS/coredns/coredns-1.8.6.signatures.json Normal file
View File

@ -0,0 +1,6 @@
{
"Signatures": {
"coredns-1.8.6-vendor.tar.gz": "88df15727024c4a787d1924da0d0310526d90fe2e8358a4e056a300ddc2759dc",
"coredns-1.8.6.tar.gz": "cbe3764afe2148b8047ea7e5cbba5108c298dee3a9a0391028e2980e35beaa2b"
}
}

28
SPECS/coredns/coredns-1.7.0.spec → SPECS/coredns/coredns-1.8.6.spec
View File

@ -2,8 +2,8 @@
Summary: Fast and flexible DNS server
Name: coredns
Version: 1.7.0
Release: 7%{?dist}
Version: 1.8.6
Release: 1%{?dist}
License: Apache License 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
@ -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="f59c03d"
export GITCOMMIT="13a9191efb0574cc92ed5ffd55a1f144b840d668"
make
%install
@ -58,19 +58,29 @@ install -p -m 755 -t %{buildroot}%{_bindir} %{name}
%{_bindir}/%{name}
%changelog
%changelog
* Tue Feb 08 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 1.7.0-7
* Fri Apr 22 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 1.8.6-1
- Update to version "1.8.6".
- Remove clean section
- License verified
* Wed Jan 19 2022 Henry Li <lihl@microsoft.com> - 1.7.0-6
* Tue Mar 15 2022 Muhammad Falak <mwani@microsoft.com> - 1.8.4-4
- Bump release to force rebuild with golang 1.16.15
* Fri Feb 18 2022 Thomas Crain <thcrain@microsoft.com> - 1.8.4-3
- Bump release to force rebuild with golang 1.16.14
* Wed Jan 19 2022 Henry Li <lihl@microsoft.com> - 1.8.4-2
- Increment release for force republishing using golang 1.16.12
* Tue Nov 02 2021 Thomas Crain <thcrain@microsoft.com> - 1.7.0-5
* 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 06 2021 Nicolas Guibourge <nicolasg@microsoft.com> 1.7.0-4
- Increment release to force republishing using golang 1.16.7.
* 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

6
SPECS/etcd/etcd-3.4.13.signatures.json
View File

@ -1,6 +0,0 @@
{
"Signatures": {
"etcd-3.4.13.tar.gz": "2c19f286909a746c4be3b220c8b39474bd5edc33dde92b990ac47765e25f2089",
"etcd.service": "4550a4967ba35670051cbfd9b4edf1fc57c0f1d7a07e51f88351ac44c76d8066"
}
}

7
SPECS/etcd/etcd-3.5.1.signatures.json Normal file
View File

@ -0,0 +1,7 @@
{
"Signatures": {
"etcd-3.5.1-vendor.tar.gz": "91ba4d443a3ba481a4283eed754c4bc1688c2807a28141bfdc6225f49581a6a2",
"etcd-3.5.1.tar.gz": "249aef9cb93db359c584e8c2c69d3b35243364e28250ba98b231e02ae8ee040d",
"etcd.service": "4550a4967ba35670051cbfd9b4edf1fc57c0f1d7a07e51f88351ac44c76d8066"
}
}

112
SPECS/etcd/etcd-3.4.13.spec → SPECS/etcd/etcd-3.5.1.spec
View File

@ -1,7 +1,7 @@
Summary: A highly-available key value store for shared configuration
Name: etcd
Version: 3.4.13
Release: 8%{?dist}
Version: 3.5.1
Release: 1%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
Distribution: Mariner
@ -9,8 +9,40 @@ 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: git
BuildRequires: golang >= 1.13
# 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 'tools/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. add the following (and remove them from require section):
# replace (
# go.etcd.io/etcd/api/v3 v3.5.1 => ../../api
# go.etcd.io/etcd/server/v3 v3.5.1 => ../../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/
# - You can use the following tar command to create the tarballs
# tar --sort=name --mtime="2021-11-10 00:00Z" \
# --owner=0 --group=0 --numeric-owner \
# --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
# -cJf [tarball name] [folder to tar]
Source2: %{name}-%{version}-vendor.tar.gz
BuildRequires: golang >= 1.16
%description
A highly-available key value store for shared configuration and service discovery.
@ -27,23 +59,33 @@ tools.
%prep
%setup -q
tar --no-same-owner -xf %{SOURCE2}
%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 ETCD_OUT_DIR %{_builddir}/%{name}-%{version}/bin
mkdir -p %{ETCD_OUT_DIR}
%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
# 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
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
# 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}
@ -55,14 +97,25 @@ install -vpm 0755 -T etcd.conf.yml.sample %{buildroot}%{_sysconfdir}/etcd/etcd-d
chown -R root:root %{buildroot}%{_bindir}
chown -R root:root %{buildroot}/%{_docdir}/%{name}-%{version}
mv %{_builddir}/%{name}-%{version}/bin/etcd %{buildroot}%{_bindir}/
# 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
@ -77,6 +130,7 @@ install -vdm755 %{buildroot}%{_sharedstatedir}/etcd
%license LICENSE
%{_bindir}/etcd
%{_bindir}/etcdctl
%{_bindir}/etcdutl
/%{_docdir}/%{name}-%{version}/*
/lib/systemd/system/etcd.service
/lib/systemd/system-preset/50-etcd.preset
@ -84,19 +138,25 @@ install -vdm755 %{buildroot}%{_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.4.13-8
- Remove clean section
* Thu Apr 21 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 3.5.1-1
- Upgrade to 3.5.1
* 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 Feb 08 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 3.5.0-3
- Remove clean section
* Tue Nov 02 2021 Thomas Crain <thcrain@microsoft.com> - 3.4.13-6
- Increment release for force republishing using golang 1.16.9
* 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.

28
cgmanifest.json
View File

@ -1682,16 +1682,6 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "coredns",
"version": "1.7.0",
"downloadUrl": "https://github.com/coredns/coredns/archive/v1.7.0.tar.gz"
}
}
},
{
"component": {
"type": "other",
@ -1712,6 +1702,16 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "coredns",
"version": "1.8.6",
"downloadUrl": "https://github.com/coredns/coredns/archive/v1.8.6.tar.gz"
}
}
},
{
"component": {
"type": "other",
@ -2818,8 +2818,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"
}
}
},
@ -2828,8 +2828,8 @@
"type": "other",
"other": {
"name": "etcd",
"version": "3.5.0",
"downloadUrl": "https://github.com/etcd-io/etcd/archive/v3.5.0.tar.gz"
"version": "3.5.1",
"downloadUrl": "https://github.com/etcd-io/etcd/archive/v3.5.1.tar.gz"
}
}
},