diff --git a/.etcd.metadata b/.etcd.metadata index e13ab16..ed9fa18 100644 --- a/.etcd.metadata +++ b/.etcd.metadata @@ -1 +1,2 @@ -784834f2637486ad9d9ba86443e16241f5e7643e SOURCES/etcd-bb66589.tar.gz +df18de8f54bfa0ba1dbb73d3b0fdf051c149d17d SOURCES/etcd-f1d7dd8.tar.gz +e5b5bd4b54ba94f001965321e9e64331b9e17985 SOURCES/man-3.2.9-1.tar.gz diff --git a/.gitignore b/.gitignore index 9f418d9..3905985 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/etcd-bb66589.tar.gz +SOURCES/etcd-f1d7dd8.tar.gz +SOURCES/man-3.2.9-1.tar.gz diff --git a/SOURCES/etcd.conf b/SOURCES/etcd.conf index b4f4e2b..fd3d934 100644 --- a/SOURCES/etcd.conf +++ b/SOURCES/etcd.conf @@ -1,32 +1,31 @@ -# [member] -ETCD_NAME=default +#[Member] +#ETCD_CORS="" ETCD_DATA_DIR="/var/lib/etcd/default.etcd" #ETCD_WAL_DIR="" -#ETCD_SNAPSHOT_COUNT="10000" -#ETCD_HEARTBEAT_INTERVAL="100" -#ETCD_ELECTION_TIMEOUT="1000" #ETCD_LISTEN_PEER_URLS="http://localhost:2380" ETCD_LISTEN_CLIENT_URLS="http://localhost:2379" #ETCD_MAX_SNAPSHOTS="5" #ETCD_MAX_WALS="5" -#ETCD_CORS="" +ETCD_NAME="default" +#ETCD_SNAPSHOT_COUNT="100000" +#ETCD_HEARTBEAT_INTERVAL="100" +#ETCD_ELECTION_TIMEOUT="1000" +#ETCD_QUOTA_BACKEND_BYTES="0" # -#[cluster] +#[Clustering] #ETCD_INITIAL_ADVERTISE_PEER_URLS="http://localhost:2380" -# if you use different ETCD_NAME (e.g. test), set ETCD_INITIAL_CLUSTER value for this name, i.e. "test=http://..." -#ETCD_INITIAL_CLUSTER="default=http://localhost:2380" -#ETCD_INITIAL_CLUSTER_STATE="new" -#ETCD_INITIAL_CLUSTER_TOKEN="etcd-cluster" ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379" #ETCD_DISCOVERY="" -#ETCD_DISCOVERY_SRV="" #ETCD_DISCOVERY_FALLBACK="proxy" #ETCD_DISCOVERY_PROXY="" -#ETCD_STRICT_RECONFIG_CHECK="false" -#ETCD_AUTO_COMPACTION_RETENTION="0" +#ETCD_DISCOVERY_SRV="" +#ETCD_INITIAL_CLUSTER="default=http://localhost:2380" +#ETCD_INITIAL_CLUSTER_TOKEN="etcd-cluster" +#ETCD_INITIAL_CLUSTER_STATE="new" +#ETCD_STRICT_RECONFIG_CHECK="true" #ETCD_ENABLE_V2="true" # -#[proxy] +#[Proxy] #ETCD_PROXY="off" #ETCD_PROXY_FAILURE_WAIT="5000" #ETCD_PROXY_REFRESH_INTERVAL="30000" @@ -34,7 +33,7 @@ ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379" #ETCD_PROXY_WRITE_TIMEOUT="5000" #ETCD_PROXY_READ_TIMEOUT="0" # -#[security] +#[Security] #ETCD_CERT_FILE="" #ETCD_KEY_FILE="" #ETCD_CLIENT_CERT_AUTH="false" @@ -46,14 +45,21 @@ ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379" #ETCD_PEER_TRUSTED_CA_FILE="" #ETCD_PEER_AUTO_TLS="false" # -#[logging] +#[Logging] #ETCD_DEBUG="false" -# examples for -log-package-levels etcdserver=WARNING,security=DEBUG #ETCD_LOG_PACKAGE_LEVELS="" +#ETCD_LOG_OUTPUT="default" +# +#[Unsafe] +#ETCD_FORCE_NEW_CLUSTER="false" +# +#[Version] +#ETCD_VERSION="false" +#ETCD_AUTO_COMPACTION_RETENTION="0" # -#[profiling] +#[Profiling] #ETCD_ENABLE_PPROF="false" #ETCD_METRICS="basic" # -#[auth] +#[Auth] #ETCD_AUTH_TOKEN="simple" diff --git a/SPECS/etcd.spec b/SPECS/etcd.spec index 4123eae..fd249a5 100644 --- a/SPECS/etcd.spec +++ b/SPECS/etcd.spec @@ -11,7 +11,7 @@ %endif %if ! 0%{?gobuild:1} -%define gobuild(o:) go build -buildmode pie -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; +%define gobuild(o:) go build -buildmode pie -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro'" -a -v -x %{?**}; %endif %global provider github @@ -21,20 +21,21 @@ # https://github.com/coreos/etcd %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit bb66589f8cf18960c7f3d56b1b83753caeed9c7a +%global commit f1d7dd87da3e8feab4aaf675b8e29c6a5ed5f58b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global system_name etcd Name: etcd -Version: 3.2.7 -Release: 1%{?dist} +Version: 3.2.9 +Release: 3%{?dist} Summary: A highly-available key value store for shared configuration License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: %{system_name}.service Source2: %{system_name}.conf +Source3: man-%{version}-1.tar.gz Patch2: 0001-change-import-paths.patch Patch3: bz1350875-disaster-recovery-with-copies.patch Patch4: expand-etcd-arch-validation.patch @@ -263,7 +264,11 @@ providing packages with %{import_path} prefix. %endif %prep +%setup -q -n man-%{version} -T -b 3 %setup -q -n %{repo}-%{commit} +mkdir -p man/man1 +cp ../man-%{version}/*.1 man/man1/. + # move content of vendor under Godeps as has been so far mkdir -p Godeps/_workspace/src mv cmd/vendor/* Godeps/_workspace/src/. @@ -301,6 +306,10 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{system_name}.service install -d -m 0755 %{buildroot}%{_sysconfdir}/%{system_name} install -m 644 -t %{buildroot}%{_sysconfdir}/%{system_name} %{SOURCE2} +# install manpages +install -d %{buildroot}%{_mandir}/man1 +install -p -m 644 man/man1/* %{buildroot}%{_mandir}/man1 + # And create /var/lib/etcd install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{system_name} @@ -419,6 +428,7 @@ getent passwd %{system_name} >/dev/null || useradd -r -g %{system_name} -d %{_sh %{_bindir}/%{system_name}ctl %dir %attr(-,%{system_name},%{system_name}) %{_sharedstatedir}/%{system_name} %{_unitdir}/%{system_name}.service +%{_mandir}/man1/*.1* %if 0%{?with_devel} %files devel -f devel.file-list @@ -435,6 +445,24 @@ getent passwd %{system_name} >/dev/null || useradd -r -g %{system_name} -d %{_sh %endif %changelog +* Mon Nov 20 2017 Jan Chaloupka - 3.2.9-3 +- Bump man-pages tarball + related: #1510480 + +* Mon Nov 20 2017 Jan Chaloupka - 3.2.9-2 +- Fix Synopsis of etcdctl3 man pages + related: #1510480 + +* Tue Nov 07 2017 Jan Chaloupka - 3.2.9-1 +- Update to 3.2.9 + resolves: #1510480 +- Generate etcd and etcdctl man-pages + resolves: #1444336 + +* Fri Sep 29 2017 Jan Chaloupka - 3.2.7-2 +- Rebuild with correct hardening flags + resolves: #1420783 + * Tue Sep 19 2017 Jan Chaloupka - 3.2.7-1 - Update to 3.2.7 resolves: #1493165