diff --git a/0001-Convert-int-to-string-using-strconv.Itoa.patch b/0001-Convert-int-to-string-using-strconv.Itoa.patch new file mode 100644 index 0000000000000000000000000000000000000000..a2178d7daf0e7c0a531a5b1b18c7720261c4d10c --- /dev/null +++ b/0001-Convert-int-to-string-using-strconv.Itoa.patch @@ -0,0 +1,61 @@ +From 80c8dfe084f44eb660aa1af5b5d49e27e1dfd11e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Mon, 10 Aug 2020 15:09:08 +0200 +Subject: [PATCH] Convert int to string using strconv.Itoa +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +See https://github.com/golang/go/issues/32479 + +Signed-off-by: Robert-André Mauchin +--- + etcdserver/api/v2store/store_test.go | 3 ++- + wal/wal_test.go | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/etcdserver/api/v2store/store_test.go b/etcdserver/api/v2store/store_test.go +index 76ec02d4e..0b1e9dad1 100644 +--- a/etcdserver/api/v2store/store_test.go ++++ b/etcdserver/api/v2store/store_test.go +@@ -15,6 +15,7 @@ + package v2store_test + + import ( ++ "strconv" + "testing" + "time" + +@@ -844,7 +845,7 @@ func TestStoreWatchSlowConsumer(t *testing.T) { + s.Watch("/foo", true, true, 0) // stream must be true + // Fill watch channel with 100 events + for i := 1; i <= 100; i++ { +- s.Set("/foo", false, string(i), v2store.TTLOptionSet{ExpireTime: v2store.Permanent}) // ok ++ s.Set("/foo", false, strconv.Itoa(i), v2store.TTLOptionSet{ExpireTime: v2store.Permanent}) // ok + } + // testutil.AssertEqual(t, s.WatcherHub.count, int64(1)) + s.Set("/foo", false, "101", v2store.TTLOptionSet{ExpireTime: v2store.Permanent}) // ok +diff --git a/wal/wal_test.go b/wal/wal_test.go +index f457dbf3c..8e8a252a0 100644 +--- a/wal/wal_test.go ++++ b/wal/wal_test.go +@@ -25,6 +25,7 @@ import ( + "path/filepath" + "reflect" + "regexp" ++ "strconv" + "testing" + + "go.etcd.io/etcd/pkg/fileutil" +@@ -239,7 +240,7 @@ func TestVerify(t *testing.T) { + + // make 5 separate files + for i := 0; i < 5; i++ { +- es := []raftpb.Entry{{Index: uint64(i), Data: []byte("waldata" + string(i+1))}} ++ es := []raftpb.Entry{{Index: uint64(i), Data: []byte("waldata" + strconv.Itoa(i+1))}} + if err = w.Save(raftpb.HardState{}, es); err != nil { + t.Fatal(err) + } +-- +2.26.2 + diff --git a/0001-hack-etcdmain-to-generate-etcd.1.patch b/0001-hack-etcdmain-to-generate-etcd.1.patch index 8f55e5072c3524ac199f3c098c698844db517e0e..6c715d77962a9229c03d3d1cb0158ecf798670c1 100644 --- a/0001-hack-etcdmain-to-generate-etcd.1.patch +++ b/0001-hack-etcdmain-to-generate-etcd.1.patch @@ -1,6 +1,6 @@ -diff -up etcd-3.4.3/etcdmain/config.go.orig etcd-3.4.3/etcdmain/config.go ---- etcd-3.4.3/etcdmain/config.go.orig 2019-10-23 19:11:46.000000000 +0200 -+++ etcd-3.4.3/etcdmain/config.go 2020-02-06 01:16:58.443641282 +0100 +diff -up etcd-3.4.13/etcdmain/config.go.orig etcd-3.4.13/etcdmain/config.go +--- etcd-3.4.13/etcdmain/config.go.orig 2020-08-24 21:11:28.000000000 +0200 ++++ etcd-3.4.13/etcdmain/config.go 2020-09-04 00:12:28.424764763 +0200 @@ -123,14 +123,15 @@ func newConfig() *config { ), } @@ -55,7 +55,7 @@ diff -up etcd-3.4.3/etcdmain/config.go.orig etcd-3.4.3/etcdmain/config.go fs.StringVar(&cfg.ec.Logger, "logger", "capnslog", "Specify 'zap' for structured logging or 'capnslog'. WARN: 'capnslog' is being deprecated in v3.5.") fs.Var(flags.NewUniqueStringsValue(embed.DefaultLogOutput), "log-output", "[TO BE DEPRECATED IN v3.5] use '--log-outputs'.") fs.Var(flags.NewUniqueStringsValue(embed.DefaultLogOutput), "log-outputs", "Specify 'stdout' or 'stderr' to skip journald logging even when running under systemd, or list of comma separated output targets.") -@@ -230,26 +231,26 @@ func newConfig() *config { +@@ -230,27 +231,27 @@ func newConfig() *config { fs.StringVar(&cfg.ec.LogLevel, "log-level", logutil.DefaultLogLevel, "Configures log level. Only supports debug, info, warn, error, panic, or fatal. Default 'info'.") fs.StringVar(&cfg.ec.LogPkgLevels, "log-package-levels", "", "[TO BE DEPRECATED IN v3.5] Specify a particular log level for each etcd package (eg: 'etcdmain=CRITICAL,etcdserver=DEBUG').") @@ -77,6 +77,7 @@ diff -up etcd-3.4.3/etcdmain/config.go.orig etcd-3.4.3/etcdmain/config.go + fs.AddGroup("auth") fs.StringVar(&cfg.ec.AuthToken, "auth-token", cfg.ec.AuthToken, "Specify auth token specific options.") fs.UintVar(&cfg.ec.BcryptCost, "bcrypt-cost", cfg.ec.BcryptCost, "Specify bcrypt algorithm cost factor for auth password hashing.") + fs.UintVar(&cfg.ec.AuthTokenTTL, "auth-token-ttl", cfg.ec.AuthTokenTTL, "The lifetime in seconds of the auth token.") - // gateway + fs.AddGroup("gateway") @@ -87,23 +88,23 @@ diff -up etcd-3.4.3/etcdmain/config.go.orig etcd-3.4.3/etcdmain/config.go fs.BoolVar(&cfg.ec.ExperimentalInitialCorruptCheck, "experimental-initial-corrupt-check", cfg.ec.ExperimentalInitialCorruptCheck, "Enable to check data corruption before serving any client/peer traffic.") fs.DurationVar(&cfg.ec.ExperimentalCorruptCheckTime, "experimental-corrupt-check-time", cfg.ec.ExperimentalCorruptCheckTime, "Duration of time between cluster corruption check passes.") fs.StringVar(&cfg.ec.ExperimentalEnableV2V3, "experimental-enable-v2v3", cfg.ec.ExperimentalEnableV2V3, "v3 prefix for serving emulated v2 state.") -@@ -257,9 +258,12 @@ func newConfig() *config { - fs.BoolVar(&cfg.ec.ExperimentalEnableLeaseCheckpoint, "experimental-enable-lease-checkpoint", false, "Enable to persist lease remaining TTL to prevent indefinite auto-renewal of long lived leases.") +@@ -259,9 +260,12 @@ func newConfig() *config { fs.IntVar(&cfg.ec.ExperimentalCompactionBatchLimit, "experimental-compaction-batch-limit", cfg.ec.ExperimentalCompactionBatchLimit, "Sets the maximum revisions deleted in each compaction batch.") + fs.DurationVar(&cfg.ec.ExperimentalWatchProgressNotifyInterval, "experimental-watch-progress-notify-interval", cfg.ec.ExperimentalWatchProgressNotifyInterval, "Duration of periodic watch progress notifications.") - // unsafe + fs.AddGroup("unsafe") + fs.BoolVar(&cfg.ec.UnsafeNoFsync, "unsafe-no-fsync", false, "Disables fsync, unsafe, will cause data loss.") fs.BoolVar(&cfg.ec.ForceNewCluster, "force-new-cluster", false, "Force to create a new one member cluster.") - ++ + fs.GenMan() + os.Exit(0) -+ + // ignored for _, f := range cfg.ignored { - fs.Var(&flags.IgnoredFlag{Name: f}, f, "") -diff -up etcd-3.4.3/etcdmain/fake_flagset.go.orig etcd-3.4.3/etcdmain/fake_flagset.go ---- etcd-3.4.3/etcdmain/fake_flagset.go.orig 2020-02-06 01:14:12.639989665 +0100 -+++ etcd-3.4.3/etcdmain/fake_flagset.go 2020-02-06 01:14:12.639989665 +0100 +diff -up etcd-3.4.13/etcdmain/fake_flagset.go.orig etcd-3.4.13/etcdmain/fake_flagset.go +--- etcd-3.4.13/etcdmain/fake_flagset.go.orig 2020-09-04 00:10:11.223684457 +0200 ++++ etcd-3.4.13/etcdmain/fake_flagset.go 2020-09-04 00:10:11.223684457 +0200 @@ -0,0 +1,157 @@ +package etcdmain + diff --git a/0001-hack-to-generate-man-pages.patch b/0001-hack-to-generate-man-pages.patch index b77a8494cb14a4d8fbdaeac0cc9d410fb075e0cc..37ea9cfd449190d5eb5a9747ffbc13cf1ee14787 100644 --- a/0001-hack-to-generate-man-pages.patch +++ b/0001-hack-to-generate-man-pages.patch @@ -1,6 +1,6 @@ -diff -up etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/etcdctl/ctlv2/ctl.go.hack2 etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/etcdctl/ctlv2/ctl.go ---- etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/etcdctl/ctlv2/ctl.go.hack2 2019-03-12 20:09:09.000000000 +0100 -+++ etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/etcdctl/ctlv2/ctl.go 2019-03-14 20:20:04.887079104 +0100 +diff -up etcd-3.4.13/etcdctl/ctlv2/ctl.go.orig2 etcd-3.4.13/etcdctl/ctlv2/ctl.go +--- etcd-3.4.13/etcdctl/ctlv2/ctl.go.orig2 2020-08-24 21:11:28.000000000 +0200 ++++ etcd-3.4.13/etcdctl/ctlv2/ctl.go 2020-09-04 00:13:47.552811076 +0200 @@ -36,6 +36,68 @@ func Start() { } app.Usage = "A simple command line client for etcd." @@ -70,9 +70,9 @@ diff -up etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/etcdctl/ctlv2/ctl.go.hack app.Flags = []cli.Flag{ cli.BoolFlag{Name: "debug", Usage: "output cURL commands which can be used to reproduce the request"}, cli.BoolFlag{Name: "no-sync", Usage: "don't synchronize cluster information before sending request"}, -diff -up etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/etcdctl/ctlv3/ctl_nocov.go.hack2 etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/etcdctl/ctlv3/ctl_nocov.go ---- etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/etcdctl/ctlv3/ctl_nocov.go.hack2 2019-03-14 20:20:04.888079103 +0100 -+++ etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/etcdctl/ctlv3/ctl_nocov.go 2019-03-14 20:32:35.376178988 +0100 +diff -up etcd-3.4.13/etcdctl/ctlv3/ctl_nocov.go.orig2 etcd-3.4.13/etcdctl/ctlv3/ctl_nocov.go +--- etcd-3.4.13/etcdctl/ctlv3/ctl_nocov.go.orig2 2020-08-24 21:11:28.000000000 +0200 ++++ etcd-3.4.13/etcdctl/ctlv3/ctl_nocov.go 2020-09-04 00:13:47.553811076 +0200 @@ -16,13 +16,20 @@ package ctlv3 @@ -97,9 +97,9 @@ diff -up etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/etcdctl/ctlv3/ctl_nocov.g + + cobra.GenManTree(rootCmd, header, "") } -diff -up etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/vendor/github.com/urfave/cli/flag.go.hack2 etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/vendor/github.com/urfave/cli/flag.go ---- etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/vendor/github.com/urfave/cli/flag.go.hack2 2019-03-12 20:09:09.000000000 +0100 -+++ etcd-e1ca3b4434945e57e8e3a451cdbde74a903cc8e1/vendor/github.com/urfave/cli/flag.go 2019-03-14 20:20:04.883079109 +0100 +diff -up etcd-3.4.13/vendor/github.com/urfave/cli/flag.go.orig2 etcd-3.4.13/vendor/github.com/urfave/cli/flag.go +--- etcd-3.4.13/vendor/github.com/urfave/cli/flag.go.orig2 2020-08-24 21:11:28.000000000 +0200 ++++ etcd-3.4.13/vendor/github.com/urfave/cli/flag.go 2020-09-04 00:13:47.555811078 +0200 @@ -670,7 +670,7 @@ func prefixedNames(fullName, placeholder parts := strings.Split(fullName, ",") for i, name := range parts { diff --git a/0001-remove-unknown-field-Etcd.Debug.patch b/0001-remove-unknown-field-Etcd.Debug.patch deleted file mode 100644 index 76ec8215301d14db4f6a07b80fd3a20ccf9c2538..0000000000000000000000000000000000000000 --- a/0001-remove-unknown-field-Etcd.Debug.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2c95b49b63651ae3e0a3f63c45c05295d1af2c42 Mon Sep 17 00:00:00 2001 -From: lsytj0413 <511121939@qq.com> -Date: Thu, 19 Sep 2019 09:51:51 +0800 -Subject: [PATCH] test(functional): remove unknown field Etcd.Debug - ---- - functional/tester/cluster_test.go | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/functional/tester/cluster_test.go b/functional/tester/cluster_test.go -index 7c7b25f2ad..2948c00e7f 100644 ---- a/functional/tester/cluster_test.go -+++ b/functional/tester/cluster_test.go -@@ -64,7 +64,6 @@ func Test_read(t *testing.T) { - InitialCorruptCheck: true, - Logger: "zap", - LogOutputs: []string{"/tmp/etcd-functional-1/etcd.log"}, -- Debug: true, - }, - ClientCertData: "", - ClientCertPath: "", -@@ -117,7 +116,6 @@ func Test_read(t *testing.T) { - InitialCorruptCheck: true, - Logger: "zap", - LogOutputs: []string{"/tmp/etcd-functional-2/etcd.log"}, -- Debug: true, - }, - ClientCertData: "", - ClientCertPath: "", -@@ -170,7 +168,6 @@ func Test_read(t *testing.T) { - InitialCorruptCheck: true, - Logger: "zap", - LogOutputs: []string{"/tmp/etcd-functional-3/etcd.log"}, -- Debug: true, - }, - ClientCertData: "", - ClientCertPath: "", diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 3f606e6a192f6577300e61f89a6afe84bc16ecfc..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# etcd - -#### Description -a strongly consistent, distributed key-value store - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 9daf32c4d3d3117b7d311e775d7d7f0ea5c39a30..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# etcd - -#### 介绍 -a strongly consistent, distributed key-value store - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/etcd-3.4.7.tar.gz b/etcd-3.4.14.tar.gz similarity index 53% rename from etcd-3.4.7.tar.gz rename to etcd-3.4.14.tar.gz index 063b0b5e0b28e57d6a9e0c0ace3ae8eacbdbbffb..c97246c9f0840a60d88f5933e27ecfdd90b7eb57 100644 Binary files a/etcd-3.4.7.tar.gz and b/etcd-3.4.14.tar.gz differ diff --git a/etcd.service b/etcd.service index 9f367d775884f61b087dcf43ebffd52840517855..c9c3afe09a1c20fbbeb53c3e472f9f9f05b73fcc 100644 --- a/etcd.service +++ b/etcd.service @@ -8,8 +8,6 @@ Wants=network-online.target Type=notify WorkingDirectory=/var/lib/etcd/ EnvironmentFile=-/etc/etcd/etcd.conf -Environment=ETCD_NAME -Environment=ETCD_UNSUPPORTED_ARCH=arm64 User=etcd # set GOMAXPROCS to number of processors ExecStart=/bin/bash -c "GOMAXPROCS=$(nproc) /usr/bin/etcd" diff --git a/etcd.spec b/etcd.spec index 5ea7282515636b2f48de53b67b491aaead7ef27e..b8d820a94ecfc1577b3d5caa8b2ae2622ff06fa3 100644 --- a/etcd.spec +++ b/etcd.spec @@ -1,20 +1,26 @@ # Generated by go2rpm %bcond_without check +%bcond_with bootstrap + +%define debug_package %{nil} # https://github.com/etcd-io/etcd %global goipath go.etcd.io/etcd %global forgeurl https://github.com/etcd-io/etcd -Version: 3.4.7 +Version: 3.4.14 %gometa -# Remove in F33 -%global godevelheader %{expand: -Obsoletes: etcd-devel < 3.3.12-5 -} +%global goipaths0 go.etcd.io/etcd +%global goipathsex0 go.etcd.io/etcd/etcdserver/api/v3rpc/ + +%if %{without bootstrap} +%global goipaths1 go.etcd.io/etcd/etcdserver/api/v3rpc/ +%endif + -%global goaltipaths github.com/coreos/etcd -%global man_version 3.4.7 +%global goaltipaths github.com/coreos/etcd go.etcd.io/etcd/v3 +%global man_version 3.4.14 %global common_description %{expand: Distributed reliable key-value store for the most critical data of a distributed @@ -26,10 +32,8 @@ system.} %global gosupfiles integration/fixtures/* etcdserver/api/v2http/testdata/* -%define debug_package %{nil} - Name: etcd -Release: 1%{?dist} +Release: 1 Summary: Distributed reliable key-value store for the most critical data of a distributed system # Upstream license specification: Apache-2.0 @@ -42,14 +46,14 @@ Source3: man-%{man_version}.tar.gz # sh genmanpages.sh path_to_built_source Source10: genmanpages.sh # Not patches to apply here, but used on the source to generate man pages -# Source11: 0001-hack-etcdmain-to-generate-etcd.1.patch -# Source12: 0001-hack-to-generate-man-pages.patch -# Fix a test -Patch0: 0001-remove-unknown-field-Etcd.Debug.patch +Source11: 0001-hack-etcdmain-to-generate-etcd.1.patch +Source12: 0001-hack-to-generate-man-pages.patch +# update grpc-go version to v1.32.0 +Patch1: 0001-Convert-int-to-string-using-strconv.Itoa.patch -BuildRequires: compiler(go-compiler) +BuildRequires: go-compilers-golang-compiler # BuildRequires: golang(github.com/bgentry/speakeasy) -# BuildRequires: golang(github.com/cockroachdb/datadriven) +# # BuildRequires: golang(github.com/cockroachdb/datadriven) # BuildRequires: golang(github.com/coreos/go-semver/semver) # BuildRequires: golang(github.com/coreos/go-systemd/daemon) # BuildRequires: golang(github.com/coreos/go-systemd/journal) @@ -63,7 +67,9 @@ BuildRequires: compiler(go-compiler) # BuildRequires: golang(github.com/golang/protobuf/proto) # BuildRequires: golang(github.com/google/btree) # BuildRequires: golang(github.com/google/uuid) +# %%if %%{without bootstrap} # BuildRequires: golang(github.com/grpc-ecosystem/go-grpc-middleware) +# %endif # BuildRequires: golang(github.com/grpc-ecosystem/go-grpc-prometheus) # BuildRequires: golang(github.com/grpc-ecosystem/grpc-gateway/runtime) # BuildRequires: golang(github.com/grpc-ecosystem/grpc-gateway/utilities) @@ -97,7 +103,7 @@ BuildRequires: compiler(go-compiler) # BuildRequires: golang(google.golang.org/grpc/health/grpc_health_v1) # BuildRequires: golang(google.golang.org/grpc/keepalive) # BuildRequires: golang(google.golang.org/grpc/metadata) -# BuildRequires: golang(google.golang.org/grpc/naming) +# # BuildRequires: golang(google.golang.org/grpc/naming) # BuildRequires: golang(google.golang.org/grpc/peer) # BuildRequires: golang(google.golang.org/grpc/resolver) # BuildRequires: golang(google.golang.org/grpc/resolver/dns) @@ -106,6 +112,7 @@ BuildRequires: compiler(go-compiler) # BuildRequires: golang(gopkg.in/cheggaaa/pb.v1) # BuildRequires: golang(gopkg.in/yaml.v2) # BuildRequires: golang(sigs.k8s.io/yaml) +BuildRequires: openEuler-rpm-config BuildRequires: python3-devel # BuildRequires: %%{py3_dist sphinx sphinx-rtd-theme} @@ -125,11 +132,8 @@ Requires(pre): shadow-utils %prep %setup -q -n man-%{man_version} -T -b 3 -#%goprep %forgesetup -%patch0 -p1 -rm -rf cmd/vendor -rm -rf raft/rafttest +%patch1 -p1 # For compatibility cp -aR etcdserver/api/snap snap cp -aR etcdserver/api/membership etcdserver/membership @@ -143,17 +147,19 @@ mv etcdctl/READMEv2.md READMEv2-etcdctl.md mkdir -p man/man1 cp ../man-%{man_version}/*.1 man/man1/. +%if %{without bootstrap} %build GO111MODULE=on GOFLAGS=-mod=vendor go build -o %{gobuilddir}/bin/etcd %{goipath} for cmd in etcdctl; do GO111MODULE=on GOFLAGS=-mod=vendor go build -o %{gobuilddir}/bin/$(basename $cmd) %{goipath}/$cmd done +%endif # make -C docs help # make -C docs html %install -#%gopkginstall +%if %{without bootstrap} install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ @@ -167,28 +173,16 @@ install -pm 644 man/man1/* %{buildroot}%{_mandir}/man1 # And create /var/lib/etcd install -dm 0755 %{buildroot}%{_sharedstatedir}/%{name} +%endif -#%if %{with check} -#%check -#%gocheck -d clientv3 \ -# -d e2e \ -# -d functional/rpcpb \ -# -d functional/tester \ -# -d tools/functional-tester/etcd-agent \ -# -d integration \ -# -d clientv3/integration \ -# -d clientv3/balancer \ -# -d clientv3/snapshot \ -# -d clientv3/ordering \ -# -d pkg/expect \ -# -d pkg/flags \ -# -d pkg/proxy \ -# -d pkg/tlsutil \ -# -d pkg/transport \ -# -t raft \ -# -t tests/e2e -#%endif +%if %{without bootstrap} +%if %{with check} +%check +go test $(go list ./... | grep -v -E "raft|tlsutil|tester|e2e|integration|expect") +%endif +%endif +%if %{without bootstrap} %pre getent group %{name} >/dev/null || groupadd -r %{name} getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/%{name} \ @@ -212,9 +206,11 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/ %dir %attr(-,%{name},%{name}) %{_sharedstatedir}/%{name} %{_unitdir}/%{name}.service %{_mandir}/man1/*.1* - -#%gopkgfiles +%endif %changelog +* Thu Jan 21 2021 jiangxinyu - 3.4.14-1 +- Update to 3.4.14 + * Thu Aug 13 2020 jiangxinyu - 3.4.7-1 - Init etcd project diff --git a/man-3.4.14.tar.gz b/man-3.4.14.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8749cb4b0431ebf13788e689d197e64f2da9bd38 Binary files /dev/null and b/man-3.4.14.tar.gz differ diff --git a/man-3.4.7.tar.gz b/man-3.4.7.tar.gz deleted file mode 100644 index 998ad95093262dd34cfc16167e879b696f60048b..0000000000000000000000000000000000000000 Binary files a/man-3.4.7.tar.gz and /dev/null differ