.gear/proxmox-mini-journalreader.spec | 44 +++++++++++++++++++++++++++++++++++ .gear/rules | 3 +++ .gear/tags/list | 1 + src/Makefile | 2 +- src/mini-journalreader.c | 5 ++-- 5 files changed, 51 insertions(+), 4 deletions(-) diff --git a/.gear/proxmox-mini-journalreader.spec b/.gear/proxmox-mini-journalreader.spec new file mode 100644 index 0000000..a775ed9 --- /dev/null +++ b/.gear/proxmox-mini-journalreader.spec @@ -0,0 +1,44 @@ +%define _unpackaged_files_terminate_build 1 + +Name: proxmox-mini-journalreader +Summary: Minimal systemd Journal Reader +Version: 1.3 +Release: alt2 +License: AGPL-3.0+ +Group: System/Servers +Url: https://www.proxmox.com +Vcs: git://git.proxmox.com/git/proxmox-mini-journalreader.git +Source: %name-%version.tar +Patch: %name-%version.patch + +Provides: pve-mini-journalreader = %EVR +Obsoletes: pve-mini-journalreader < %EVR + +BuildRequires: libsystemd-devel + +%description +A minimal application to read the last X lines of the systemd journal or the +last X lines before a cursor. + +%prep +%setup +%patch -p1 +# Already have _FORTIFY_SOURCE=3 +sed -i 's/-D_FORTIFY_SOURCE=2//' src/Makefile + +%build +%make_build -C src + +%install +%makeinstall_std -C src + +%files +%_bindir/* + +%changelog +* Fri Apr 28 2023 Andrew A. Vasilyev 1.3-alt2 +- FTBS: fix for _FORTIFY_SOURCE. + +* Mon Jan 24 2022 Alexey Shabalin 1.3-alt1 +- Initial build as separate package. + diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..03fef9a --- /dev/null +++ b/.gear/rules @@ -0,0 +1,3 @@ +spec: .gear/proxmox-mini-journalreader.spec +tar: upstream:. +diff: upstream:. . name=@name@-@version@.patch diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..74053de --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +d9a159ee7e3226ca1123a93956ec1cd334725539 upstream diff --git a/src/Makefile b/src/Makefile index ea8af24..6aed003 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,7 +2,7 @@ PROGRAM=mini-journalreader SOURCES=mini-journalreader.c LIBS := libsystemd -CFLAGS += -Werror -Wall -Wextra -Wl,-z,relro -g -O2 +CFLAGS += -Werror -Wall -Wextra -Wno-type-limits -Wl,-z,relro -g -O2 CFLAGS += -fstack-protector-strong -D_FORTIFY_SOURCE=2 CFLAGS += $(shell pkg-config --cflags ${LIBS}) LFLAGS += $(shell pkg-config --libs ${LIBS}) diff --git a/src/mini-journalreader.c b/src/mini-journalreader.c index 7ce7857..29b243d 100644 --- a/src/mini-journalreader.c +++ b/src/mini-journalreader.c @@ -262,11 +262,11 @@ int main(int argc, char *argv[]) { const char *endcursor = NULL; uint64_t begin = 0; uint64_t end = 0; - char c; + int c; progname = argv[0]; - while ((c = (char)getopt (argc, argv, "b:e:d:n:f:t:jh")) != -1) { + while ((c = getopt (argc, argv, "b:e:d:n:f:t:jh")) != -1) { switch (c) { case 'b': begin = arg_to_uint64(optarg); @@ -293,7 +293,6 @@ int main(int argc, char *argv[]) { break; case 'h': usage(NULL); - case '?': default: usage("invalid option or missing argument"); }