diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..50876d0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/rhc-0.2.0.tar.gz diff --git a/.rhc.metadata b/.rhc.metadata new file mode 100644 index 0000000..b1110d3 --- /dev/null +++ b/.rhc.metadata @@ -0,0 +1 @@ +8f9f437c9d7ee2afe09b2000aa77fd384fc91d2f SOURCES/rhc-0.2.0.tar.gz diff --git a/SOURCES/Use-gzip-c-instead-of-k.patch b/SOURCES/Use-gzip-c-instead-of-k.patch new file mode 100644 index 0000000..812f152 --- /dev/null +++ b/SOURCES/Use-gzip-c-instead-of-k.patch @@ -0,0 +1,25 @@ +From 975b142e53608f3b218ee964bd28e1f4dfdde335 Mon Sep 17 00:00:00 2001 +From: Link Dupont +Date: Fri, 14 May 2021 14:54:44 -0400 +Subject: [PATCH] build: Use gzip -c instead of -k + +The '-k' option was added in a later version of gzip. + +Signed-off-by: Link Dupont +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 2cf6b88..0bc0efc 100644 +--- a/Makefile ++++ b/Makefile +@@ -95,7 +95,7 @@ data: $(DATA) + go run $(BUILDFLAGS) -ldflags "$(LDFLAGS)" ./cmd/$(patsubst %.1,%,$@) --generate-man-page > $@ + + %.1.gz: %.1 +- gzip -k $^ ++ gzip -c $^ > $@.tmp && mv $@.tmp $@ + + %-USAGE.md: $(GOSRC) + go run $(BUILDFLAGS) -ldflags "$(LDFLAGS)" ./cmd/$(patsubst %-USAGE.md,%,$@) --generate-markdown > $@ diff --git a/SOURCES/build-Remove-the-Makefile-preamble.patch b/SOURCES/build-Remove-the-Makefile-preamble.patch new file mode 100644 index 0000000..bb503b9 --- /dev/null +++ b/SOURCES/build-Remove-the-Makefile-preamble.patch @@ -0,0 +1,27 @@ +From 56f26e01049ddfad13ded0edbbf5c60a3246720d Mon Sep 17 00:00:00 2001 +From: Link Dupont +Date: Fri, 14 May 2021 14:55:06 -0400 +Subject: [PATCH] build: Remove the Makefile preamble + +Signed-off-by: Link Dupont +--- + Makefile | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/Makefile b/Makefile +index 0bc0efc..f1f4380 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,12 +1,3 @@ +-SHELL := bash +-.ONESHELL: +-.SHELLFLAGS := -eu -o pipefail -c +-.DELETE_ON_ERROR: +-MAKEFLAGS += --warn-undefined-variables +-MAKEFLAGS += --no-builtin-rules +-.POSIX: +-.SUFFIXES: +- + # Project variables + + # Used as a prefix to binary names. Cannot contain spaces. diff --git a/SOURCES/config.toml b/SOURCES/config.toml new file mode 100644 index 0000000..b6fc5be --- /dev/null +++ b/SOURCES/config.toml @@ -0,0 +1,6 @@ +# yggdrasil global configuration settings + +broker = ["wss://connect.cloud.redhat.com:443"] +cert-file = "/etc/pki/consumer/cert.pem" +key-file = "/etc/pki/consumer/key.pem" +log-level = "error" diff --git a/SPECS/rhc.spec b/SPECS/rhc.spec new file mode 100644 index 0000000..a92d05e --- /dev/null +++ b/SPECS/rhc.spec @@ -0,0 +1,108 @@ +%define debug_package %{nil} + +%global go_arches x86_64 s390x ppc64le + +Name: rhc +Version: 0.2.0 +Release: 2%{?dist} +Epoch: 1 +Summary: Message dispatch agent for cloud-connected systems +License: GPLv3 +URL: https://github.com/redhatinsights/yggdrasil + +Source0: %{name}-%{version}.tar.gz +Source1: config.toml + +Patch0: Use-gzip-c-instead-of-k.patch +Patch1: build-Remove-the-Makefile-preamble.patch + +ExclusiveArch: %{go_arches} + +BuildRequires: git +BuildRequires: go-toolset-1.15-golang +BuildRequires: dbus-devel +BuildRequires: systemd-devel + + +%description +%{name} is pair of utilities that register systems with RHSM and establishes +a receiving queue for instructions to be sent to the system via a broker. + +%prep +%autosetup -p1 + +%global ldflags %{expand:-linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'} +%global buildflags %{expand:-compiler gc -buildmode pie -tags=\\"rpm_crashtraceback libtrust_openssl\\" -ldflags \\"%ldflags\\" -a -v -x %{?**}} + +%build +CGO_CPPFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-all" \ +BUILDFLAGS="%buildflags" \ +scl enable go-toolset-1.15 -- \ +make PREFIX=%{_prefix} \ + SYSCONFDIR=%{_sysconfdir} \ + LOCALSTATEDIR=%{_localstatedir} \ + SHORTNAME=%{name} \ + LONGNAME=%{name} \ + PKGNAME=%{name} \ + 'BRANDNAME=Red Hat connector' \ + TOPICPREFIX=redhat/insights \ + VERSION=%{version} \ + DATAHOST=cert.cloud.redhat.com \ + 'PROVIDER=Red Hat' + + +%install +CGO_CPPFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-all" \ +BUILDFLAGS="%buildflags" \ +scl enable go-toolset-1.15 -- \ +make PREFIX=%{_prefix} \ + SYSCONFDIR=%{_sysconfdir} \ + LOCALSTATEDIR=%{_localstatedir} \ + DESTDIR=%{buildroot} \ + SHORTNAME=%{name} \ + LONGNAME=%{name} \ + PKGNAME=%{name} \ + 'BRANDNAME=Red Hat connector' \ + TOPICPREFIX=redhat/insights \ + VERSION=%{version} \ + DATAHOST=cert.cloud.redhat.com \ + 'PROVIDER=Red Hat' \ + install +%{__install} -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/ + + +%files +%doc README.md +%{_bindir}/%{name} +%{_sbindir}/%{name}d +%config(noreplace) %{_sysconfdir}/%{name}/config.toml +%{_unitdir}/%{name}d.service +%{_datadir}/bash-completion/completions/* +%{_mandir}/man1/* +%{_prefix}/share/pkgconfig/%{name}.pc +%{_libexecdir}/%{name} + + +%changelog +* Wed Aug 25 2021 Link Dupont - 0.2.0-2 +- Rebuild for new build target + +* Mon Jun 28 2021 Link Dupont - 0.2.0-1 +- New upstream release +- Mark config file as a noreplace config file + +* Fri Apr 9 2021 Link Dupont - 0.1.4-1 +- New upstream release + +* Fri Feb 19 2021 Link Dupont - 0.1.2-2 +- Update default broker URI +- Set Epoch to 1 + +* Thu Feb 18 2021 Link Dupont - 0.1.2-1 +- New upstream release + +* Wed Feb 17 2021 Link Dupont - 0.1.1-1 +- New upstream release + +* Fri Feb 12 2021 Link Dupont - 0.1-1 +- Initial release