Up to 2.8.2

diff --git a/fix-paths.patch b/fix-paths.patch
index db7893f75aa8c5993fe1f6b5667a7a0af047699f..892095a6f72e97b30872bcb92d8d643ad1a21988 100644 (file)
--- a/fix-paths.patch
+++ b/fix-paths.patch
@@ -1,6 +1,6 @@
-diff -urN smokeping-2.7.3.org/bin/smokeinfo smokeping-2.7.3/bin/smokeinfo
---- smokeping-2.7.3.org/bin/smokeinfo  2018-04-13 14:13:05.000000000 +0200
-+++ smokeping-2.7.3/bin/smokeinfo      2019-03-15 09:59:38.301385321 +0100
+diff -ur smokeping-2.8.2.org/bin/smokeinfo smokeping-2.8.2/bin/smokeinfo
+--- smokeping-2.8.2.org/bin/smokeinfo  2021-08-10 12:00:33.000000000 +0200
++++ smokeping-2.8.2/bin/smokeinfo      2023-04-02 18:16:09.223051686 +0200
 @@ -2,8 +2,7 @@
  use strict;
  use warnings;
@@ -11,15 +11,15 @@ diff -urN smokeping-2.7.3.org/bin/smokeinfo smokeping-2.7.3/bin/smokeinfo
  
  use Smokeping::Info;
  use Getopt::Long 2.25 qw(:config no_ignore_case);
-diff -urN smokeping-2.7.3.org/bin/smokeping smokeping-2.7.3/bin/smokeping
---- smokeping-2.7.3.org/bin/smokeping  2018-04-13 14:13:05.000000000 +0200
-+++ smokeping-2.7.3/bin/smokeping      2019-03-15 09:59:38.301385321 +0100
+diff -ur smokeping-2.8.2.org/bin/smokeping smokeping-2.8.2/bin/smokeping
+--- smokeping-2.8.2.org/bin/smokeping  2021-08-13 08:11:39.000000000 +0200
++++ smokeping-2.8.2/bin/smokeping      2023-04-02 18:16:09.223051686 +0200
 @@ -4,13 +4,11 @@
  use strict;
  use warnings;
  
--use lib (split /:/, q{}); # PERL5LIB
 -use FindBin;
+-use lib (split /:/, q{}); # PERL5LIB
 -use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
 +use lib "/usr/share/smokeping";
  
@@ -30,33 +30,32 @@ diff -urN smokeping-2.7.3.org/bin/smokeping smokeping-2.7.3/bin/smokeping
  
  =head1 NAME
  
-diff -urN smokeping-2.7.3.org/bin/smokeping_cgi smokeping-2.7.3/bin/smokeping_cgi
---- smokeping-2.7.3.org/bin/smokeping_cgi      2018-04-13 14:13:05.000000000 +0200
-+++ smokeping-2.7.3/bin/smokeping_cgi  2019-03-15 09:59:38.304718754 +0100
+diff -ur smokeping-2.8.2.org/bin/smokeping_cgi smokeping-2.8.2/bin/smokeping_cgi
+--- smokeping-2.8.2.org/bin/smokeping_cgi      2021-08-13 08:11:39.000000000 +0200
++++ smokeping-2.8.2/bin/smokeping_cgi  2023-04-02 18:16:58.269718358 +0200
 @@ -4,9 +4,7 @@
  use strict;
  use warnings;
  
--use lib (split /:/, q{}); # PERL5LIB
 -use FindBin;
+-use lib (split /:/, q{}); # PERL5LIB
 -use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
 +use lib "/usr/share/smokeping";
  
  # don't bother with zombies
  $SIG{CHLD} = 'IGNORE';
-@@ -17,8 +15,7 @@
+@@ -17,7 +15,7 @@
  
  use CGI::Fast;
  
 -my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config";
--
 +my $cfg = (shift @ARGV) || "/etc/smokeping/config";
  
+ 
  while (my $q = new CGI::Fast) {
-    Smokeping::cgi($cfg,$q);
-diff -urN smokeping-2.7.3.org/bin/tSmoke smokeping-2.7.3/bin/tSmoke
---- smokeping-2.7.3.org/bin/tSmoke     2018-04-13 14:13:05.000000000 +0200
-+++ smokeping-2.7.3/bin/tSmoke 2019-03-15 09:59:38.304718754 +0100
+diff -ur smokeping-2.8.2.org/bin/tSmoke smokeping-2.8.2/bin/tSmoke
+--- smokeping-2.8.2.org/bin/tSmoke     2021-08-13 08:11:39.000000000 +0200
++++ smokeping-2.8.2/bin/tSmoke 2023-04-02 18:16:09.223051686 +0200
 @@ -52,9 +52,7 @@
  #
  # Point the lib variables to your implementation
@@ -72,26 +71,14 @@ diff -urN smokeping-2.7.3.org/bin/tSmoke smokeping-2.7.3/bin/tSmoke
  use RRDs;
  
  # Point to your Smokeping config file
--my $cfgfile = "etc/config.dist";
-+my $cfgfile = "/etc/smokeping/config";
+-my $cfgfile = (shift @ARGV) || "$FindBin::Bin/../etc/config";
++my $cfgfile = (shift @ARGV) || "/etc/smokeping/config";
  
  # global variables
  my $cfg;
-diff -urN smokeping-2.7.3.org/doc/smokeping_install.pod smokeping-2.7.3/doc/smokeping_install.pod
---- smokeping-2.7.3.org/doc/smokeping_install.pod      2018-01-30 21:40:07.000000000 +0100
-+++ smokeping-2.7.3/doc/smokeping_install.pod  2019-03-15 09:59:38.304718754 +0100
-@@ -108,7 +108,7 @@
- 
- =head2 Configuration
- 
--Use the F<etc/config.dist> file as a template to create your own smokeping configuration file.
-+Use the F</etc/smokeping/config> file as a template to create your own smokeping configuration file.
- See L<smokeping_config> for details.
- 
- =over
-diff -urN smokeping-2.7.3.org/etc/basepage.html.dist smokeping-2.7.3/etc/basepage.html.dist
---- smokeping-2.7.3.org/etc/basepage.html.dist 2017-06-25 20:18:25.000000000 +0200
-+++ smokeping-2.7.3/etc/basepage.html.dist     2019-03-15 10:00:33.033019175 +0100
+diff -ur smokeping-2.8.2.org/etc/basepage.html.dist smokeping-2.8.2/etc/basepage.html.dist
+--- smokeping-2.8.2.org/etc/basepage.html.dist 2019-09-23 09:46:17.000000000 +0200
++++ smokeping-2.8.2/etc/basepage.html.dist     2023-04-02 18:16:09.226385019 +0200
 @@ -4,8 +4,8 @@
      <meta name="viewport" content="width=device-width, initial-scale=1">
      <META http-equiv="Refresh" content="<##step##>">
@@ -118,9 +105,9 @@ diff -urN smokeping-2.7.3.org/etc/basepage.html.dist smokeping-2.7.3/etc/basepag
  
  </body>
  </html>
-diff -urN smokeping-2.7.3.org/lib/Smokeping/Examples.pm smokeping-2.7.3/lib/Smokeping/Examples.pm
---- smokeping-2.7.3.org/lib/Smokeping/Examples.pm      2011-10-05 11:51:46.000000000 +0200
-+++ smokeping-2.7.3/lib/Smokeping/Examples.pm  2019-03-15 09:59:38.304718754 +0100
+diff -ur smokeping-2.8.2.org/lib/Smokeping/Examples.pm smokeping-2.8.2/lib/Smokeping/Examples.pm
+--- smokeping-2.8.2.org/lib/Smokeping/Examples.pm      2011-10-05 11:51:46.000000000 +0200
++++ smokeping-2.8.2/lib/Smokeping/Examples.pm  2023-04-02 18:16:42.016385025 +0200
 @@ -12,7 +12,7 @@
  This module generates L<smokeping_examples> and the example
  configuration files distributed with Smokeping. It is supposed to be
@@ -139,10 +126,10 @@ diff -urN smokeping-2.7.3.org/lib/Smokeping/Examples.pm smokeping-2.7.3/lib/Smok
  configuration template in the Smokeping distribution so that the example
  files are complete.
  
-diff -urN smokeping-2.7.3.org/lib/Smokeping.pm smokeping-2.7.3/lib/Smokeping.pm
---- smokeping-2.7.3.org/lib/Smokeping.pm       2018-12-20 11:24:44.000000000 +0100
-+++ smokeping-2.7.3/lib/Smokeping.pm   2019-03-15 09:59:38.304718754 +0100
-@@ -3620,7 +3620,7 @@
+diff -ur smokeping-2.8.2.org/lib/Smokeping.pm smokeping-2.8.2/lib/Smokeping.pm
+--- smokeping-2.8.2.org/lib/Smokeping.pm       2021-08-13 08:19:27.000000000 +0200
++++ smokeping-2.8.2/lib/Smokeping.pm   2023-04-02 18:16:09.226385019 +0200
+@@ -3871,7 +3871,7 @@
  
   *** Probes ***
   +FPing

diff --git a/no-thirdparty.patch b/no-thirdparty.patch
index cafbe8f963852655ce7e83930da2b3fae73395d5..15828f49a3d78d13602d7900fdab395464167cfe 100644 (file)
--- a/no-thirdparty.patch
+++ b/no-thirdparty.patch
@@ -1,18 +1,12 @@
---- smokeping-2.7.3.org/Makefile.am    2018-01-30 20:33:12.000000000 +0100
-+++ smokeping-2.7.3/Makefile.am        2019-03-15 09:19:52.679624811 +0100
-@@ -16,14 +16,9 @@
+diff -ur smokeping-2.8.2.org/Makefile.am smokeping-2.8.2/Makefile.am
+--- smokeping-2.8.2.org/Makefile.am    2021-08-13 08:11:43.000000000 +0200
++++ smokeping-2.8.2/Makefile.am        2023-04-02 18:10:54.489718313 +0200
+@@ -16,7 +16,7 @@
  
  AUTOMAKE_OPTIONS =  foreign
  
--SUBDIRS = thirdparty doc etc htdocs lib bin
-+SUBDIRS = doc etc htdocs lib bin
+-SUBDIRS = lib thirdparty bin doc etc htdocs
++SUBDIRS = lib bin doc etc htdocs
  
- EXTRA_DIST = COPYRIGHT CHANGES CONTRIBUTORS LICENSE PERL_MODULES
+ EXTRA_DIST = COPYRIGHT CHANGES CONTRIBUTORS LICENSE cpanfile VERSION README.md
  
--THIRDPARTY_DIR := $(shell pwd)/thirdparty
--
- dist-hook:
-       $(PERL) -i -p -e '"$(PACKAGE_VERSION)" =~ /(\d+)\.(\d+)\.(\d+)/ and $$v = sprintf("%d.%03d%03d",$$1,$$2,$$3) and s/^\$$VERSION\s*=\s*".*?"/\$$VERSION = "$$v"/'  $(distdir)/lib/Smokeping.pm
--
--install-exec-hook:
--      [ ! -d $(THIRDPARTY_DIR)/lib/perl5 ] || $(CP) -fr $(THIRDPARTY_DIR)/lib/perl5/* $(DESTDIR)$(libdir)

diff --git a/smokeping.spec b/smokeping.spec
index 39bf1aea152e4f0cb4e722d57d4121deca01e2ce..c4171b61202223b9b8f250129faa0f68dfe7999c 100644 (file)
--- a/smokeping.spec
+++ b/smokeping.spec
@@ -1,12 +1,12 @@
 Summary:       Smokeping - a latency grapher that uses rrdtool
 Summary(pl.UTF-8):     Smokeping - narzędzie do tworzenia wykresów opóźnień sieci
 Name:          smokeping
-Version:       2.7.3
-Release:       3
+Version:       2.8.2
+Release:       1
 License:       GPL v2+
 Group:         Networking/Utilities
 Source0:       http://oss.oetiker.ch/smokeping/pub/%{name}-%{version}.tar.gz
-# Source0-md5: e0a8657241182f6c8bdb91cfca2589c7
+# Source0-md5: cce2bf3f59736ecf77e59d64db60e3fb
 Source1:       %{name}.init
 Source2:       %{name}-apache.conf
 Source3:       %{name}-config
@@ -34,7 +34,7 @@ Requires(pre):        /usr/lib/rpm/user_group.sh
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(pre): /usr/sbin/usermod
-Requires(triggerpostun):       findutils
+Requires(postun):      findutils
 Requires:      perl-Config-Grammar
 Requires:      rc-scripts >= 0.4.1.23
 Requires:      rrdtool >= 1.2
@@ -207,7 +207,7 @@ find /var/lib/smokeping/rrd -type d -user root -group root -exec chown smokeping
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES CONTRIBUTORS COPYRIGHT README TODO doc/*.txt doc/examples
+%doc CHANGES CONTRIBUTORS COPYRIGHT README.md TODO doc/*.txt doc/examples
 %attr(755,root,root) %{_bindir}/smokeinfo
 %attr(755,root,root) %{_bindir}/smokeping
 %attr(755,root,root) %{_bindir}/tSmoke
@@ -215,6 +215,7 @@ find /var/lib/smokeping/rrd -type d -user root -group root -exec chown smokeping
 %exclude %{_cgi_bindir}/css
 %exclude %{_cgi_bindir}/js
 %exclude %{_datadir}/smokeping/smokeping.*cgi
+%{_mandir}/man1/smokeinfo.1*
 %{_mandir}/man1/smokeping.1*
 %{_mandir}/man1/smokeping.cgi.1*
 %{_mandir}/man1/tSmoke.1*