From a8cc3d0a1ae8a350c0a7415ae3e85e203c991af4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 26 Oct 2011 19:14:15 -0500 Subject: [PATCH 01/42] - Rebuilt for glibc bug#747377 --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 659ac95..f6bff9c 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -172,6 +172,9 @@ fi %changelog +* Wed Oct 26 2011 Fedora Release Engineering - 1.2.0-8 +- Rebuilt for glibc bug#747377 + * Tue Feb 08 2011 Fedora Release Engineering - 1.2.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From f9fb24ad1d8f8eca327dc719026aaae8c2eb315b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 04:22:23 -0600 Subject: [PATCH 02/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index f6bff9c..2c3b4ce 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -172,6 +172,9 @@ fi %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Oct 26 2011 Fedora Release Engineering - 1.2.0-8 - Rebuilt for glibc bug#747377 From 2a3c3c97206ac76445d8b63e59ff5453fd899116 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Wed, 18 Apr 2012 09:32:07 -0500 Subject: [PATCH 03/42] Migrate to systemd. --- mon.service | 10 ++++++++++ mon.spec | 50 +++++++++++++++++++++++++++++++++++++------------- 2 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 mon.service diff --git a/mon.service b/mon.service new file mode 100644 index 0000000..473898d --- /dev/null +++ b/mon.service @@ -0,0 +1,10 @@ +[Unit] +Description=Mon - Service Monitor + +[Service] +Type=forking +PIDFile=/run/mon.pid +ExecStart=/usr/bin/mon -f -c /etc/mon/mon.cf -P /run/mon.pid + +[Install] +WantedBy=multi-user.target diff --git a/mon.spec b/mon.spec index 2c3b4ce..4889898 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -17,7 +17,7 @@ Source1: ftp://ftp.kernel.org/pub/software/admin/mon/contrib/cgi-bin/mon. Source2: ftp://ftp.kernel.org/pub/software/admin/mon/contrib/all-alerts.tar.bz2 Source3: mon.cf -Source4: mon.init +Source4: mon.service Source5: userfile Patch0: mon-1.2.0-perl.patch @@ -27,6 +27,9 @@ Requires: perl(Authen::PAM) Requires: iputils Requires: fping Requires: traceroute +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units BuildRequires: dos2unix BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -85,7 +88,7 @@ install -d -m0755 $RPM_BUILD_ROOT%{_bindir} \ $RPM_BUILD_ROOT%{_mandir}/man{1,8}/ \ $RPM_BUILD_ROOT%{_libdir}/mon/{alert.d,mon.d}/ \ $RPM_BUILD_ROOT%{_sysconfdir}/mon/ \ - $RPM_BUILD_ROOT%{_initrddir} \ + $RPM_BUILD_ROOT%{_unitdir} \ $RPM_BUILD_ROOT%{_localstatedir}/www/cgi-bin/ \ $RPM_BUILD_ROOT%{_localstatedir}/lib/mon/{log.d,state.d}/ @@ -100,7 +103,7 @@ install -p -m0755 alerts/*/*.alert $RPM_BUILD_ROOT%{_libdir}/mon/alert.d/ install -d $RPM_BUILD_ROOT%{_sysconfdir}/mon %{fixlib} etc/auth.cf >$RPM_BUILD_ROOT%{_sysconfdir}/mon/auth.cf %{fixlib} %{SOURCE3} >$RPM_BUILD_ROOT%{_sysconfdir}/mon/mon.cf -install -Dp -m0755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/mon +install -Dp -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/mon.service install -Dp -m0600 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/mon/userfile install -Dp -m0755 mon.cgi-%{moncgi_version}/mon.cgi $RPM_BUILD_ROOT%{_localstatedir}/www/cgi-bin/mon.cgi @@ -124,18 +127,36 @@ rm -rf $RPM_BUILD_ROOT %post -/sbin/chkconfig --add mon - - -%preun -if [ $1 -eq 0 ]; then - /sbin/service mon stop &>/dev/null || : - /sbin/chkconfig --del mon +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi +%preun +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable mon.service > /dev/null 2>&1 || : + /bin/systemctl stop mon.service > /dev/null 2>&1 || : +fi + %postun -/sbin/service mon condrestart &>/dev/null || : +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart mon.service >/dev/null 2>&1 || : +fi + +%triggerun -- mon < 1.2.0-10 +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply mon +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save mon >/dev/null 2>&1 ||: + +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del mon >/dev/null 2>&1 || : +/bin/systemctl try-restart mon.service >/dev/null 2>&1 || : + %files @@ -145,7 +166,7 @@ fi %doc alerts/*/*.README mon.cgi-1.52/ %doc clients/{skymon,batch-example} etc/*.cf etc/example.m4 etc/example.monshowrc %config(noreplace) %{_sysconfdir}/mon/ -%{_initrddir}/* +%{_unitdir}/* %{_mandir}/man?/* %{_localstatedir}/www/cgi-bin/mon.cgi %{_bindir}/* @@ -172,6 +193,9 @@ fi %changelog +* Wed Apr 18 2012 Jon Ciesla - 1.2.0-10 +- Migrate to systemd, BZ 789890. + * Fri Jan 13 2012 Fedora Release Engineering - 1.2.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From f783cc3e9965c8f999e2338fcf0be72e41e728e6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 27 Jul 2012 00:56:22 -0500 Subject: [PATCH 04/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 4889898..3fb4ab5 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -193,6 +193,9 @@ fi %changelog +* Fri Jul 27 2012 Fedora Release Engineering - 1.2.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Wed Apr 18 2012 Jon Ciesla - 1.2.0-10 - Migrate to systemd, BZ 789890. From 3bc2bf20705f0f76fca45cafb412cb81381867d9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 01:25:01 -0600 Subject: [PATCH 05/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 3fb4ab5..06feef9 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -193,6 +193,9 @@ fi %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.2.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Jul 27 2012 Fedora Release Engineering - 1.2.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 90ac00b2bf631ae9f9b7a39bae7b1c45b23b60aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 17 Jul 2013 15:42:10 +0200 Subject: [PATCH 06/42] Perl 5.18 rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 06feef9..d072337 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -193,6 +193,9 @@ fi %changelog +* Wed Jul 17 2013 Petr Pisar - 1.2.0-13 +- Perl 5.18 rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 1.2.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From deb96a2ff51bb335a77f70d57c082447b8e7aa03 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 06:38:34 -0500 Subject: [PATCH 07/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index d072337..2fbef36 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -193,6 +193,9 @@ fi %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.2.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 17 2013 Petr Pisar - 1.2.0-13 - Perl 5.18 rebuild From 6555fe3e16b82d1da94d91269deed52abcba5509 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Sun, 11 Aug 2013 13:46:04 +0100 Subject: [PATCH 08/42] BR: systemd-units for %{_unitdir} macro definition --- mon.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 2fbef36..eb0e712 100644 --- a/mon.spec +++ b/mon.spec @@ -32,6 +32,7 @@ Requires(preun): systemd-units Requires(postun): systemd-units BuildRequires: dos2unix +BuildRequires: systemd-units BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -195,6 +196,7 @@ fi %changelog * Sat Aug 03 2013 Fedora Release Engineering - 1.2.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild +- BR: systemd-units for %%{_unitdir} macro definition * Wed Jul 17 2013 Petr Pisar - 1.2.0-13 - Perl 5.18 rebuild @@ -242,7 +244,7 @@ fi * Wed Jun 27 2007 Dag Wieers - 1.2.0-1 - 4303+/dries - Updated to release 1.2.0. -* Tue Mar 06 2004 Dag Wieers - 0.99.2-1 +* Tue Mar 09 2004 Dag Wieers - 0.99.2-1 - Fixed problems with perl-modules. * Fri Jan 09 2004 Dag Wieers - 0.99.2-0 From ba7f60479370f72e1b1e4f12b99f12ba40e23d05 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 24 Oct 2013 11:39:54 +0200 Subject: [PATCH 09/42] Attempt at saner SPEC file formatting I'm doing this semi-automatically across all packages I maintain, since some are several years old and since then several have suffered bit-rot and such. I'm fixing up the following: - Old RPM relics (such as %defattr, BuildRoot or %clean sections) - Whitespace errors (such as trailing spaces) - Consistent use of %{buildroot} - Dropping useless %{name} expansions that harm legibility - Consistent spacing between RPM sections - Bad days in %changelogs --- mon.spec | 63 ++++++++++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/mon.spec b/mon.spec index eb0e712..eccbd61 100644 --- a/mon.spec +++ b/mon.spec @@ -1,5 +1,5 @@ # TODO: Split monitors and alerts into subpackages -# they drag in way too much dependencies +# they drag in way too many dependencies %global moncgi_version 1.52 %global fixlib sed 's,/usr/lib,%{_libdir},g' @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -33,7 +33,6 @@ Requires(postun): systemd-units BuildRequires: dos2unix BuildRequires: systemd-units -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -84,30 +83,29 @@ make %{?_smp_mflags} -C mon.d \ %install -rm -rf $RPM_BUILD_ROOT -install -d -m0755 $RPM_BUILD_ROOT%{_bindir} \ - $RPM_BUILD_ROOT%{_mandir}/man{1,8}/ \ - $RPM_BUILD_ROOT%{_libdir}/mon/{alert.d,mon.d}/ \ - $RPM_BUILD_ROOT%{_sysconfdir}/mon/ \ - $RPM_BUILD_ROOT%{_unitdir} \ - $RPM_BUILD_ROOT%{_localstatedir}/www/cgi-bin/ \ - $RPM_BUILD_ROOT%{_localstatedir}/lib/mon/{log.d,state.d}/ +install -d -m0755 %{buildroot}%{_bindir} \ + %{buildroot}%{_mandir}/man{1,8}/ \ + %{buildroot}%{_libdir}/mon/{alert.d,mon.d}/ \ + %{buildroot}%{_sysconfdir}/mon/ \ + %{buildroot}%{_unitdir} \ + %{buildroot}%{_localstatedir}/www/cgi-bin/ \ + %{buildroot}%{_localstatedir}/lib/mon/{log.d,state.d}/ -install -p -m0755 mon clients/moncmd clients/monshow clients/skymon/skymon $RPM_BUILD_ROOT%{_bindir} -install -p -m0644 doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/ -install -p -m0644 doc/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/ +install -p -m0755 mon clients/moncmd clients/monshow clients/skymon/skymon %{buildroot}%{_bindir} +install -p -m0644 doc/*.1 %{buildroot}%{_mandir}/man1/ +install -p -m0644 doc/*.8 %{buildroot}%{_mandir}/man8/ -install -p -m0755 mon.d/*.wrap mon.d/*.monitor $RPM_BUILD_ROOT%{_libdir}/mon/mon.d/ -install -p -m0755 alert.d/* $RPM_BUILD_ROOT%{_libdir}/mon/alert.d/ -install -p -m0755 alerts/*/*.alert $RPM_BUILD_ROOT%{_libdir}/mon/alert.d/ +install -p -m0755 mon.d/*.wrap mon.d/*.monitor %{buildroot}%{_libdir}/mon/mon.d/ +install -p -m0755 alert.d/* %{buildroot}%{_libdir}/mon/alert.d/ +install -p -m0755 alerts/*/*.alert %{buildroot}%{_libdir}/mon/alert.d/ -install -d $RPM_BUILD_ROOT%{_sysconfdir}/mon -%{fixlib} etc/auth.cf >$RPM_BUILD_ROOT%{_sysconfdir}/mon/auth.cf -%{fixlib} %{SOURCE3} >$RPM_BUILD_ROOT%{_sysconfdir}/mon/mon.cf -install -Dp -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/mon.service -install -Dp -m0600 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/mon/userfile +install -d %{buildroot}%{_sysconfdir}/mon +%{fixlib} etc/auth.cf >%{buildroot}%{_sysconfdir}/mon/auth.cf +%{fixlib} %{SOURCE3} >%{buildroot}%{_sysconfdir}/mon/mon.cf +install -Dp -m0644 %{SOURCE4} %{buildroot}%{_unitdir}/mon.service +install -Dp -m0600 %{SOURCE5} %{buildroot}%{_sysconfdir}/mon/userfile -install -Dp -m0755 mon.cgi-%{moncgi_version}/mon.cgi $RPM_BUILD_ROOT%{_localstatedir}/www/cgi-bin/mon.cgi +install -Dp -m0755 mon.cgi-%{moncgi_version}/mon.cgi %{buildroot}%{_localstatedir}/www/cgi-bin/mon.cgi # Fix permissions in examples documentation files chmod -x mon.cgi-1.52/mon.cgi \ @@ -122,14 +120,9 @@ chmod -x mon.cgi-1.52/mon.cgi \ %{fixlib} -i etc/*.cf - -%clean -rm -rf $RPM_BUILD_ROOT - - %post -if [ $1 -eq 1 ] ; then - # Initial installation +if [ $1 -eq 1 ] ; then + # Initial installation /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi @@ -141,6 +134,7 @@ if [ $1 -eq 0 ] ; then /bin/systemctl stop mon.service > /dev/null 2>&1 || : fi + %postun /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then @@ -159,9 +153,7 @@ fi /bin/systemctl try-restart mon.service >/dev/null 2>&1 || : - %files -%defattr(-, root, root, -) %doc CHANGES COPYING COPYRIGHT CREDITS README TODO doc/README.* %doc KNOWN-PROBLEMS utils/ VERSION %doc alerts/*/*.README mon.cgi-1.52/ @@ -194,6 +186,9 @@ fi %changelog +* Thu Oct 24 2013 Lubomir Rintel (GoodData) - 1.2.0-15 +- Bulk sad and useless attempt at consistent SPEC file formatting + * Sat Aug 03 2013 Fedora Release Engineering - 1.2.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - BR: systemd-units for %%{_unitdir} macro definition @@ -229,11 +224,11 @@ fi * Wed Feb 25 2009 Fedora Release Engineering - 1.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Fri Feb 20 2009 Lubomir Rintel (Good Data) - 1.2.0-3 +* Fri Feb 20 2009 Lubomir Rintel (GoodData) - 1.2.0-3 - Remove AOL::TOC - Add most of shipped monitors (GDC #581) -* Sun Jul 13 2008 Lubomir Rintel (Good Data) - 1.2.0-2 +* Sun Jul 13 2008 Lubomir Rintel (GoodData) - 1.2.0-2 - Refactor a bit, to fit Fedora customs and guidelines - Fix use of optflags - Fix file encodings From 3e36051e1f9375a33bae1c86c8679b4b608cef8d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 05:54:05 -0500 Subject: [PATCH 10/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index eccbd61..7955de7 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -186,6 +186,9 @@ fi %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.2.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Oct 24 2013 Lubomir Rintel (GoodData) - 1.2.0-15 - Bulk sad and useless attempt at consistent SPEC file formatting From 9fa9a39316321f85a77e36a7f40fef3e3c5eb2b2 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 10:06:03 +0000 Subject: [PATCH 11/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 7955de7..58fab48 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -186,6 +186,9 @@ fi %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 1.2.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.2.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From b6fb03584b2fbf77954d79f6a502c7d53b3f849d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 20:56:05 +0000 Subject: [PATCH 12/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 58fab48..78d405f 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -186,6 +186,9 @@ fi %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.2.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Aug 17 2014 Fedora Release Engineering - 1.2.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From b3fc1980a5e08bc4d2ef8317d472841dd1154948 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 08:38:21 +0000 Subject: [PATCH 13/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 78d405f..d88db0c 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -186,6 +186,9 @@ fi %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.2.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 1.2.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 558d54eca2144c765a23f348a148948e125b6fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 10:16:55 +0200 Subject: [PATCH 14/42] Mandatory Perl build-requires added --- mon.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mon.spec b/mon.spec index d88db0c..48aa28d 100644 --- a/mon.spec +++ b/mon.spec @@ -32,6 +32,7 @@ Requires(preun): systemd-units Requires(postun): systemd-units BuildRequires: dos2unix +BuildRequires: perl-generators BuildRequires: systemd-units From 1852909d7137d414e62a21c364883916ac93b725 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 21:37:07 +0000 Subject: [PATCH 15/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 48aa28d..e8cefb6 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -187,6 +187,9 @@ fi %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.2.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 1.2.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 8bc806b62a49e08758919c2e1c1124bf0ffd3956 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 22:09:08 +0000 Subject: [PATCH 16/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index e8cefb6..bbf041f 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -187,6 +187,9 @@ fi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.2.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.2.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From eeaec1286dcf1924421668a82bb60e1053b98356 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 03:30:18 +0000 Subject: [PATCH 17/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index bbf041f..597a990 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -187,6 +187,9 @@ fi %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.2.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.2.0-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From de4ee42848b8b632e19dcca7268266b4264c7968 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 03:05:55 +0000 Subject: [PATCH 18/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 597a990..72f6abd 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -187,6 +187,9 @@ fi %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 1.2.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.2.0-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 74fc49912f777667fed59acbb9e901920ef19a3b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 10:56:45 +0000 Subject: [PATCH 19/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 72f6abd..86411de 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 23%{?dist} +Release: 24%{?dist} License: GPLv2+ Group: Applications/Internet URL: http://www.kernel.org/software/mon/ @@ -187,6 +187,9 @@ fi %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.2.0-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 1.2.0-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b2a7a37cd491ffd4709c409134484981ecb73f38 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 24 Jul 2018 16:31:29 +0200 Subject: [PATCH 20/42] Add missing BuildRequires on gcc make: gcc: Command not found References: https://bugzilla.redhat.com/show_bug.cgi?id=1604872 Signed-off-by: Igor Gnatenko --- mon.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mon.spec b/mon.spec index 86411de..a88bc34 100644 --- a/mon.spec +++ b/mon.spec @@ -31,6 +31,7 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units +BuildRequires: gcc BuildRequires: dos2unix BuildRequires: perl-generators BuildRequires: systemd-units From 860de559d9fce8aef3a56dc81d0232a425eb8c49 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:54 +0100 Subject: [PATCH 21/42] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- mon.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/mon.spec b/mon.spec index a88bc34..0542222 100644 --- a/mon.spec +++ b/mon.spec @@ -9,7 +9,6 @@ Summary: General-purpose resource monitoring system Version: 1.2.0 Release: 24%{?dist} License: GPLv2+ -Group: Applications/Internet URL: http://www.kernel.org/software/mon/ Source0: ftp://ftp.kernel.org/pub/software/admin/mon/mon-%{version}.tar.bz2 From c130e3fae37fb4fe6ca195bd37f0de2b302a9904 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 11:21:50 +0000 Subject: [PATCH 22/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 0542222..e200207 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2+ URL: http://www.kernel.org/software/mon/ @@ -187,6 +187,9 @@ fi %changelog +* 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 From 46a2d214c845aecc4b68c3d724486365700c8ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 10 Jul 2019 16:26:59 +0200 Subject: [PATCH 23/42] Use libtirpc instead of rpc/rpc.h from glibc --- mon-1.2.0-Port-to-libtirpc.patch | 29 +++++++++++++++++++++++++++++ mon.spec | 11 ++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 mon-1.2.0-Port-to-libtirpc.patch 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.spec b/mon.spec index e200207..0e05532 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 25%{?dist} +Release: 26%{?dist} License: GPLv2+ URL: http://www.kernel.org/software/mon/ @@ -21,6 +21,8 @@ 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 Requires: perl(Authen::PAM) Requires: iputils @@ -33,6 +35,9 @@ Requires(postun): systemd-units BuildRequires: gcc BuildRequires: dos2unix BuildRequires: perl-generators +# pkgconfig(libtirpc) for Port-to-libtirpc.patch, bug #1675405, +# +BuildRequires: pkgconfig(libtirpc) BuildRequires: systemd-units @@ -54,6 +59,7 @@ required, the mon server will not need to be changed. %setup -q -a 1 -a 2 %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Filter out unwanted requires cat << \EOF > %{name}-req @@ -187,6 +193,9 @@ fi %changelog +* 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 From 5a5e7e03dc868cdb89f93e0643fe2942d7ff8a37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 17:35:42 +0000 Subject: [PATCH 24/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 0e05532..5769f17 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv2+ URL: http://www.kernel.org/software/mon/ @@ -193,6 +193,9 @@ fi %changelog +* 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) From 8adf8b484f7a97d4a8754f07a054b29fbaf05a35 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 13:55:45 +0000 Subject: [PATCH 25/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 5769f17..5979f2c 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 27%{?dist} +Release: 28%{?dist} License: GPLv2+ URL: http://www.kernel.org/software/mon/ @@ -193,6 +193,9 @@ fi %changelog +* 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 From 23f97d8a74fba2f3639690963d75eb01321f0fc3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 08:21:20 +0000 Subject: [PATCH 26/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 5979f2c..e444b30 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 28%{?dist} +Release: 29%{?dist} License: GPLv2+ URL: http://www.kernel.org/software/mon/ @@ -193,6 +193,9 @@ fi %changelog +* 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 From 8da1d2180a40fd37a5066e397c948900121ed6b9 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 01:54:23 +0000 Subject: [PATCH 27/42] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- mon.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mon.spec b/mon.spec index e444b30..a4c4416 100644 --- a/mon.spec +++ b/mon.spec @@ -32,6 +32,7 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units +BuildRequires: make BuildRequires: gcc BuildRequires: dos2unix BuildRequires: perl-generators From cde89fea980b3ad8b683d3b177e6cab71cbe6588 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 20:44:11 +0000 Subject: [PATCH 28/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index a4c4416..46a4c9c 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 29%{?dist} +Release: 30%{?dist} License: GPLv2+ URL: http://www.kernel.org/software/mon/ @@ -194,6 +194,9 @@ fi %changelog +* 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 From 71cf025f29b0377ad370d31eb7326f5d88acfe23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:17:38 +0000 Subject: [PATCH 29/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 46a4c9c..d51cf26 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 30%{?dist} +Release: 31%{?dist} License: GPLv2+ URL: http://www.kernel.org/software/mon/ @@ -194,6 +194,9 @@ fi %changelog +* 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 From 699e1066d39e90b0003732a6133f87de4124d9a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 20:19:45 +0000 Subject: [PATCH 30/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index d51cf26..1b8db44 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 31%{?dist} +Release: 32%{?dist} License: GPLv2+ URL: http://www.kernel.org/software/mon/ @@ -194,6 +194,9 @@ fi %changelog +* 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 From 0edb33016ffddf25129ea4a974bcfe94e247bb8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 23:38:49 +0000 Subject: [PATCH 31/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 1b8db44..f9cee63 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 32%{?dist} +Release: 33%{?dist} License: GPLv2+ URL: http://www.kernel.org/software/mon/ @@ -194,6 +194,9 @@ fi %changelog +* 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 From e2aa178013f5e6617052c42bc1fbc28bac8ab0e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= Date: Wed, 21 Dec 2022 09:40:32 +0100 Subject: [PATCH 32/42] Update license to SPDX format --- mon.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mon.spec b/mon.spec index f9cee63..622d8c2 100644 --- a/mon.spec +++ b/mon.spec @@ -7,8 +7,8 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 33%{?dist} -License: GPLv2+ +Release: 34%{?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 @@ -194,6 +194,9 @@ fi %changelog +* Wed Dec 21 2022 Michal Josef Špaček - 1.2.0-34 +- Update license to SPDX format + * Thu Jul 21 2022 Fedora Release Engineering - 1.2.0-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 9b7a277ee7aa4b5b89b2128c2205e54f1f3c1f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= Date: Wed, 21 Dec 2022 09:41:53 +0100 Subject: [PATCH 33/42] Use %license macro --- mon.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 622d8c2..9221ad3 100644 --- a/mon.spec +++ b/mon.spec @@ -162,7 +162,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 @@ -196,6 +197,7 @@ fi %changelog * 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 From ee7a0f4bd3783d33881b77caf960489329e1a0e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 20:37:52 +0000 Subject: [PATCH 34/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 9221ad3..0b2bbc2 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 34%{?dist} +Release: 35%{?dist} License: GPL-2.0-or-later URL: http://www.kernel.org/software/mon/ @@ -195,6 +195,9 @@ fi %changelog +* 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 From d13b73844c1b7b91a555fe5db924710fc7d9d5ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 15:41:57 +0000 Subject: [PATCH 35/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 0b2bbc2..45b98ac 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 35%{?dist} +Release: 36%{?dist} License: GPL-2.0-or-later URL: http://www.kernel.org/software/mon/ @@ -195,6 +195,9 @@ fi %changelog +* 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 From 06fb8a63a964489cbfb7071d60da4c66fa10df7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 08:33:34 +0000 Subject: [PATCH 36/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 45b98ac..4c0e642 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 36%{?dist} +Release: 37%{?dist} License: GPL-2.0-or-later URL: http://www.kernel.org/software/mon/ @@ -195,6 +195,9 @@ fi %changelog +* 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 From 7519a5814ad4cb1c67907286acef00d647c35491 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 07:55:09 +0000 Subject: [PATCH 37/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 4c0e642..eceecb4 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 37%{?dist} +Release: 38%{?dist} License: GPL-2.0-or-later URL: http://www.kernel.org/software/mon/ @@ -195,6 +195,9 @@ fi %changelog +* 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 From 78fe5cb4fe57b01886c28960e61a7973a7066821 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 38/42] Eliminate use of obsolete %patchN syntax (#2283636) --- mon.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mon.spec b/mon.spec index eceecb4..9e114dc 100644 --- a/mon.spec +++ b/mon.spec @@ -58,9 +58,9 @@ required, the mon server will not need to be changed. %prep %setup -q -a 1 -a 2 -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 # Filter out unwanted requires cat << \EOF > %{name}-req From af7e96fdcc7d055d78f4340e5dfee1d3f8694263 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 18:33:41 +0000 Subject: [PATCH 39/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 9e114dc..e6e7352 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 38%{?dist} +Release: 39%{?dist} License: GPL-2.0-or-later URL: http://www.kernel.org/software/mon/ @@ -195,6 +195,9 @@ fi %changelog +* 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 From fb7bcb4848f986319895749395dcfeb155cbd1db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 18:59:46 +0000 Subject: [PATCH 40/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index e6e7352..f78fb94 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 39%{?dist} +Release: 40%{?dist} License: GPL-2.0-or-later URL: http://www.kernel.org/software/mon/ @@ -195,6 +195,9 @@ fi %changelog +* 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 From 75553b58b378c1fb41acc44e52da3304816cde04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= Date: Tue, 28 Jan 2025 10:56:10 +0100 Subject: [PATCH 41/42] Fix incompatible pointer type (rhbz#2340877) --- mon-1.2.0-fix_signal.patch | 20 ++++++++++++++++++++ mon.spec | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 mon-1.2.0-fix_signal.patch 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 f78fb94..00f490c 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 40%{?dist} +Release: 41%{?dist} License: GPL-2.0-or-later URL: http://www.kernel.org/software/mon/ @@ -23,6 +23,7 @@ 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 @@ -61,6 +62,7 @@ required, the mon server will not need to be changed. %patch -P0 -p1 %patch -P1 -p1 %patch -P2 -p1 +%patch -P3 -p1 # Filter out unwanted requires cat << \EOF > %{name}-req @@ -195,6 +197,9 @@ fi %changelog +* 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 From f7360a8ed6afe19c71756e9db9542b3be1dc2efb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:17:35 +0000 Subject: [PATCH 42/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- mon.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mon.spec b/mon.spec index 00f490c..cba3ad3 100644 --- a/mon.spec +++ b/mon.spec @@ -7,7 +7,7 @@ Name: mon Summary: General-purpose resource monitoring system Version: 1.2.0 -Release: 41%{?dist} +Release: 42%{?dist} License: GPL-2.0-or-later URL: http://www.kernel.org/software/mon/ @@ -197,6 +197,9 @@ 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)