diff --git a/mon-1.2.0-Port-to-libtirpc.patch b/mon-1.2.0-Port-to-libtirpc.patch new file mode 100644 index 0000000..0421c3b --- /dev/null +++ b/mon-1.2.0-Port-to-libtirpc.patch @@ -0,0 +1,29 @@ +From bf573fe98b5073e2a5285e3866541ea9e3d54d05 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Wed, 10 Jul 2019 16:11:22 +0200 +Subject: [PATCH] Port to libtirpc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař +--- + mon.d/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mon.d/Makefile b/mon.d/Makefile +index af216dc..6f20a00 100644 +--- a/mon.d/Makefile ++++ b/mon.d/Makefile +@@ -18,7 +18,7 @@ PROGS = rpc.monitor dialin.monitor.wrap + all: $(PROGS) + + rpc.monitor: rpc.monitor.c +- $(CC) -o rpc.monitor $(CFLAGS) $(LDFLAGS) rpc.monitor.c $(LDLIBS) ++ $(CC) -o rpc.monitor $(CFLAGS) `pkg-config --cflags --libs libtirpc` $(LDFLAGS) rpc.monitor.c $(LDLIBS) + + dialin.monitor.wrap: dialin.monitor.wrap.c + $(CC) -o dialin.monitor.wrap $(CFLAGS) $(LDFLAGS) \ +-- +2.20.1 + diff --git a/mon-1.2.0-fix_signal.patch b/mon-1.2.0-fix_signal.patch new file mode 100644 index 0000000..2362ae7 --- /dev/null +++ b/mon-1.2.0-fix_signal.patch @@ -0,0 +1,20 @@ +diff -ru mon-1.2.0-orig/mon.d/rpc.monitor.c mon-1.2.0/mon.d/rpc.monitor.c +--- mon-1.2.0-orig/mon.d/rpc.monitor.c 2004-06-09 07:18:04.000000000 +0200 ++++ mon-1.2.0/mon.d/rpc.monitor.c 2025-01-28 10:50:58.646048623 +0100 +@@ -82,7 +82,7 @@ + int get_inet_address(struct sockaddr_in *, char *); + #endif + void usage(); +-void alarm_nop(); ++void alarm_nop(int signal); + + /* global variables */ + int opt_all; /* test all registered programs */ +@@ -439,6 +439,6 @@ + exit(0); + } + +-void alarm_nop() { ++void alarm_nop(int signal) { + return; + } diff --git a/mon.spec b/mon.spec index a88bc34..cba3ad3 100644 --- a/mon.spec +++ b/mon.spec @@ -7,9 +7,8 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 24%{?dist} -License: GPLv2+ -Group: Applications/Internet +Release: 42%{?dist} +License: GPL-2.0-or-later URL: http://www.kernel.org/software/mon/ Source0: ftp://ftp.kernel.org/pub/software/admin/mon/mon-%{version}.tar.bz2 @@ -22,6 +21,9 @@ Source5: userfile Patch0: mon-1.2.0-perl.patch Patch1: mon-1.2.0-uucp.patch +# Use libtirpc instead of rpc/rpc.h from glibc, bug #1675405 +Patch2: mon-1.2.0-Port-to-libtirpc.patch +Patch3: mon-1.2.0-fix_signal.patch Requires: perl(Authen::PAM) Requires: iputils @@ -31,9 +33,13 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units +BuildRequires: make BuildRequires: gcc BuildRequires: dos2unix BuildRequires: perl-generators +# pkgconfig(libtirpc) for Port-to-libtirpc.patch, bug #1675405, +# +BuildRequires: pkgconfig(libtirpc) BuildRequires: systemd-units @@ -53,8 +59,10 @@ required, the mon server will not need to be changed. %prep %setup -q -a 1 -a 2 -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 # Filter out unwanted requires cat << \EOF > %{name}-req @@ -156,7 +164,8 @@ fi %files -%doc CHANGES COPYING COPYRIGHT CREDITS README TODO doc/README.* +%license COPYING COPYRIGHT +%doc CHANGES CREDITS README TODO doc/README.* %doc KNOWN-PROBLEMS utils/ VERSION %doc alerts/*/*.README mon.cgi-1.52/ %doc clients/{skymon,batch-example} etc/*.cf etc/example.m4 etc/example.monshowrc @@ -188,6 +197,61 @@ fi %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.2.0-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Jan 28 2025 Michal Josef Špaček - 1.2.0-41 +- Fix incompatible pointer type (rhbz#2340877) + +* Fri Jan 17 2025 Fedora Release Engineering - 1.2.0-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 18 2024 Fedora Release Engineering - 1.2.0-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.2.0-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.2.0-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.2.0-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.2.0-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Dec 21 2022 Michal Josef Špaček - 1.2.0-34 +- Update license to SPDX format +- Use %license macro + +* Thu Jul 21 2022 Fedora Release Engineering - 1.2.0-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.2.0-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.2.0-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.2.0-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.2.0-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 1.2.0-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.2.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jul 10 2019 Petr Pisar - 1.2.0-26 +- Use libtirpc instead of rpc/rpc.h from glibc (bug #1675405) + +* Fri Feb 01 2019 Fedora Release Engineering - 1.2.0-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.2.0-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild