From 35f28faaf4232aa97861bc1054c15581ee90e38e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 30 2024 19:16:23 +0000 Subject: import rhc-worker-script-0.8-1.el7_9 --- diff --git a/.gitignore b/.gitignore index b39acfc..15fbdf1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rhc-worker-script-0.7.tar.gz +SOURCES/rhc-worker-script-0.8.tar.gz diff --git a/.rhc-worker-script.metadata b/.rhc-worker-script.metadata index aa3ec95..eed49ec 100644 --- a/.rhc-worker-script.metadata +++ b/.rhc-worker-script.metadata @@ -1 +1 @@ -0c2ef322d5c5fcab797135aff919794236b1866d SOURCES/rhc-worker-script-0.7.tar.gz +054f38d0f2146b4ac915af6b0d320e449015c8c8 SOURCES/rhc-worker-script-0.8.tar.gz diff --git a/SPECS/rhc-worker-script.spec b/SPECS/rhc-worker-script.spec index 940a2ff..d0ed0e7 100644 --- a/SPECS/rhc-worker-script.spec +++ b/SPECS/rhc-worker-script.spec @@ -3,6 +3,11 @@ %define debug_package %{nil} +# Flags for building the package +%global buildflags -buildmode pie -compiler gc -a -v -x +%global goldflags %{expand:-linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'} + +# Package constants %global repo_orgname oamg %global repo_name rhc-worker-script %global binary_name rhc-script-worker @@ -10,7 +15,8 @@ %{!?_root_sysconfdir:%global _root_sysconfdir %{_sysconfdir}} %global rhc_worker_conf_dir %{_root_sysconfdir}/rhc/workers -%define gobuild(o:) env GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v %{?**} +# Go toolset configuration +%global go_toolset_version 1.19 # EL7 doesn't define go_arches (it is available in go-srpm-macros which is EL8+) %if !%{defined go_arches} @@ -20,7 +26,7 @@ %global use_go_toolset_1_19 0%{?rhel} == 7 && !%{defined centos} Name: %{repo_name} -Version: 0.7 +Version: 0.8 Release: 1%{?dist} Summary: Worker executing scripts on hosts managed by Red Hat Insights @@ -29,8 +35,9 @@ URL: https://github.com/%{repo_orgname}/%{repo_name} Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz ExclusiveArch: %{go_arches} +BuildRequires: git %if %{use_go_toolset_1_19} -BuildRequires: go-toolset-1.19-golang +BuildRequires: go-toolset-%{go_toolset_version}-golang %else BuildRequires: golang %endif @@ -44,38 +51,42 @@ managed by Red Hat Insights. %setup -q %build -mkdir -p _gopath/src -ln -fs $(pwd)/src _gopath/src/%{binary_name}-%{version} -ln -fs $(pwd)/vendor _gopath/src/%{binary_name}-%{version}/vendor -export GOPATH=$(pwd)/_gopath -pushd _gopath/src/%{binary_name}-%{version} +export CGO_CPPFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-all" +export BUILDFLAGS="%{buildflags}" +export LDFLAGS="%{goldflags}" + %if %{use_go_toolset_1_19} -scl enable go-toolset-1.19 -- %{gobuild} +scl enable go-toolset-%{go_toolset_version} -- make build %else -%{gobuild} +make build %endif -strip %{binary_name}-%{version} -popd - %install # Create a temporary directory /var/lib/rhc-worker-script - used mainly for storing temporary files install -d %{buildroot}%{_sharedstatedir}/%{binary_name}/ -install -D -m 755 _gopath/src/%{binary_name}-%{version}/%{binary_name}-%{version} %{buildroot}%{rhc_libexecdir}/%{binary_name} +install -D -m 755 build/%{binary_name} %{buildroot}%{rhc_libexecdir}/%{binary_name} install -D -d -m 755 %{buildroot}%{rhc_worker_conf_dir} cat <%{buildroot}%{rhc_worker_conf_dir}/rhc-worker-script.yml -# recipient directive to register with dispatcher +# Recipient directive to register with dispatcher directive: "%{name}" -# whether to verify incoming yaml files +# Whether to verify incoming yaml files verify_yaml: true -# temporary directory in which the temporary script will be placed and executed. +# Temporary directory in which the temporary script will be placed and executed. temporary_worker_directory: "/var/lib/rhc-worker-script" -EOF +# Pass environment variables to the script being executed +# env: + # environment variables to be set for the script + # FOO: "some-string-value" + # BAR: "other-string-value" + +# Log level that will be sent to the script +script_log_level: "info" +EOF %files %{rhc_libexecdir}/%{binary_name} @@ -85,6 +96,11 @@ EOF %changelog +* Wed Apr 24 2024 Rodolfo Olivieri 0.8-1 +- Pass log level to executed script for more granular logging possibility +- Bump golang.org/x/net from 0.17.0 to 0.23.0 +- Refactor specfile for building the worker package + * Wed Apr 10 2024 Rodolfo Olivieri 0.7-1 - Load env vars from worker config file into script execution env