.gear/rules | 3 ++ .gear/tags/list | 1 + .gear/upstream/remotes | 3 ++ Makefile | 10 +++--- conmon.spec | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++ docs/Makefile | 2 +- 6 files changed, 106 insertions(+), 6 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..ea85247 --- /dev/null +++ b/.gear/rules @@ -0,0 +1,3 @@ +tar: v@version@:. +diff: v@version@:. . name=@name@-@version@.patch + diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..80112c2 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +00e08f4a9ca5420de733bf542b930ad58e1a7e7d v2.1.8 diff --git a/.gear/upstream/remotes b/.gear/upstream/remotes new file mode 100644 index 0000000..3f2d76b --- /dev/null +++ b/.gear/upstream/remotes @@ -0,0 +1,3 @@ +[remote "upstream"] + url = https://github.com/containers/conmon.git + fetch = +refs/heads/*:refs/remotes/upstream/* diff --git a/Makefile b/Makefile index 5e6c0d3..0086d36 100644 --- a/Makefile +++ b/Makefile @@ -21,10 +21,10 @@ ifeq ($(shell bash -c '[[ `command -v git` && `git rev-parse --git-dir 2>/dev/nu $(eval GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)) $(eval GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")) else - $(eval COMMIT_NO := unknown) - $(eval GIT_COMMIT := unknown) - $(eval GIT_BRANCH := unknown) - $(eval GIT_BRANCH_CLEAN := unknown) + $(eval COMMIT_NO ?= unknown) + $(eval GIT_COMMIT ?= unknown) + $(eval GIT_BRANCH ?= unknown) + $(eval GIT_BRANCH_CLEAN ?= unknown) endif override LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0) @@ -95,7 +95,7 @@ vendor: GO111MODULE=on $(GO) mod verify .PHONY: docs -docs: install.tools +docs: $(MAKE) -C docs .PHONY: clean diff --git a/conmon.spec b/conmon.spec new file mode 100644 index 0000000..aeff610 --- /dev/null +++ b/conmon.spec @@ -0,0 +1,93 @@ +Name: conmon +Version: 2.1.8 +Release: alt1 +# due to typo in version :( +Epoch: 1 + +Summary: OCI container runtime monitor +License: Apache-2.0 +Group: System/Configuration/Other + +Url: https://github.com/containers/conmon +Source: %name-%version.tar +Patch: %name-%version.patch + +BuildRequires: go-md2man +BuildRequires: glibc-devel +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libseccomp) >= 2.5.2 + +%description +%summary. + +%prep +%setup +%patch -p1 + +%build +export GIT_COMMIT=%release +%make_build CFLAGS+="%(getconf LFS_CFLAGS) -Wno-error=deprecated-declarations" + +%install +%makeinstall_std PREFIX=%_usr + +%files +%doc README.md +%_bindir/conmon +%_man8dir/conmon.* + +%changelog +* Fri Sep 01 2023 Alexey Shabalin 1:2.1.8-alt1 +- New version 2.1.8. + +* Thu Mar 16 2023 Alexey Shabalin 1:2.1.7-alt1 +- New version 2.1.7. + +* Tue Jan 10 2023 Alexey Shabalin 1:2.1.5-alt1 +- new version 2.1.5 + +* Mon Sep 26 2022 Alexey Shabalin 1:2.1.4-alt1 +- new version 2.1.4 + +* Wed Jun 15 2022 Alexey Shabalin 1:2.1.2-alt1 +- new version 2.1.2 + +* Fri Jun 03 2022 Alexey Shabalin 1:2.1.1-alt1 +- new version 2.1.1 + +* Fri Apr 08 2022 Alexey Shabalin 1:2.1.0-alt1 +- new version 2.1.0 + +* Thu Dec 09 2021 Alexey Shabalin 1:2.0.31-alt1 +- new version 2.0.31 + +* Sat Nov 06 2021 Alexey Shabalin 1:2.0.30-alt1 +- new version 2.0.30 +- build with seccomp support + +* Thu Apr 22 2021 Alexey Shabalin 1:2.0.27-alt1 +- new version 2.0.27 + +* Thu Sep 10 2020 Alexey Shabalin 1:2.0.21-alt1 +- new version 2.0.21 + +* Thu Jul 09 2020 Michael Shigorin 1:2.0.18-alt2 +- E2K: ftbfs workaround (might be the new glib2) +- i586: LFS fix (thx aris@ either) +- minor spec cleanup + +* Thu Jun 18 2020 Alexey Shabalin 1:2.0.18-alt1 +- new version 2.0.18 + +* Fri May 15 2020 Alexey Shabalin 1:2.0.16-alt1 +- new version 2.0.16 + +* Tue Apr 21 2020 Mikhail Gordeev 1:2.0.15-alt1 +- Update to 2.0.15 + +* Fri Sep 20 2019 Mikhail Gordeev 2.1-alt1 +- Update to 2.1 + +* Tue Jan 08 2019 Mikhail Gordeev 0-alt1.8fba2062.1 +- Initial build for Sisyphus diff --git a/docs/Makefile b/docs/Makefile index af20d2b..9c762da 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,7 +1,7 @@ PREFIX ?= /usr/local DATADIR := ${PREFIX}/share MANDIR := $(DATADIR)/man -GOMD2MAN = ../tools/build/go-md2man +GOMD2MAN = go-md2man docs: $(patsubst %.md,%,$(wildcard *.8.md))