[packages/smokeping.git] / fix-paths.patch

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;
 
-use lib (split /:/, q{}); # PERL5LIB
-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
+use lib "/usr/share/smokeping";
 
 use Smokeping::Info;
 use Getopt::Long 2.25 qw(:config no_ignore_case);
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 FindBin;
-use lib (split /:/, q{}); # PERL5LIB
-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
+use lib "/usr/share/smokeping";
 
 use Smokeping;
  
-Smokeping::main("$FindBin::RealBin/../etc/config");
+Smokeping::main("/etc/smokeping/config");
 
 =head1 NAME
 
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 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,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) {
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
 
-use lib (split /:/, q{}); # PERL5LIB
-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
-
+use lib "/usr/share/smokeping";
 
 use Smokeping;
 use Net::SMTP;
@@ -63,7 +61,7 @@
 use RRDs;
 
 # Point to your Smokeping config file
-my $cfgfile = (shift @ARGV) || "$FindBin::Bin/../etc/config";
+my $cfgfile = (shift @ARGV) || "/etc/smokeping/config";
 
 # global variables
 my $cfg;
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##>">
     <title>SmokePing Latency Page for <##title##></title>
-    <link rel="stylesheet" type="text/css" href="css/smokeping-print.css" media="print">
-    <link rel="stylesheet" type="text/css" href="css/smokeping-screen.css" media="screen">
+    <link rel="stylesheet" type="text/css" href="/smokeping/css/smokeping-print.css" media="print">
+    <link rel="stylesheet" type="text/css" href="/smokeping/css/smokeping-screen.css" media="screen">
 </head>
 <body id="body">
 
@@ -47,10 +47,10 @@
     <p><small>Maintained by <a href="mailto:<##contact##>"><##owner##></a></small></p>
 </div>
 
-<script src="js/prototype.js" type="text/javascript"></script>
-<script src="js/scriptaculous/scriptaculous.js?load=builder,effects,dragdrop" type="text/javascript"></script>
-<script src="js/cropper/cropper.js" type="text/javascript"></script>
-<script src="js/smokeping.js" type="text/javascript"></script>
+<script src="/smokeping/js/prototype.js" type="text/javascript"></script>
+<script src="/smokeping/js/scriptaculous/scriptaculous.js?load=builder,effects,dragdrop" type="text/javascript"></script>
+<script src="/smokeping/js/cropper/cropper.js" type="text/javascript"></script>
+<script src="/smokeping/js/smokeping.js" type="text/javascript"></script>
 
 </body>
 </html>
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
 invoked from the smokeping distribution top directory, as it will need
-the C<etc/config.dist> template configuration file and will create files
+the C</etc/smokeping/config> template configuration file and will create files
 in the directories C<doc> and C<doc/examples>.
 
 =head1 DESCRIPTION
@@ -107,7 +107,7 @@
 ${e}head1 DESCRIPTION
 
 Currently the examples differ only in the C<Probes> and C<Targets>
-sections. The other sections are taken from the C<etc/config.dist>
+sections. The other sections are taken from the C</etc/smokeping/config>
 configuration template in the Smokeping distribution so that the example
 files are complete.
 
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
- binary = /usr/sepp/bin/fping
+ binary = /usr/bin/fping
 
 You can override it for a particular slave like this:
Commit	Line	Data
7e394848 AM	1	diff -ur smokeping-2.8.2.org/bin/smokeinfo smokeping-2.8.2/bin/smokeinfo
	2	--- smokeping-2.8.2.org/bin/smokeinfo 2021-08-10 12:00:33.000000000 +0200
	3	+++ smokeping-2.8.2/bin/smokeinfo 2023-04-02 18:16:09.223051686 +0200
f0aa5ed4 AM	4	@@ -2,8 +2,7 @@
	5	use strict;
	6	use warnings;
c235887a	7
f0aa5ed4 AM	8	-use lib (split /:/, q{}); # PERL5LIB
	9	-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
	10	+use lib "/usr/share/smokeping";
c235887a	11
f0aa5ed4 AM	12	use Smokeping::Info;
f0aa5ed4 AM	13	use Getopt::Long 2.25 qw(:config no_ignore_case);
7e394848 AM	14	diff -ur smokeping-2.8.2.org/bin/smokeping smokeping-2.8.2/bin/smokeping
	15	--- smokeping-2.8.2.org/bin/smokeping 2021-08-13 08:11:39.000000000 +0200
	16	+++ smokeping-2.8.2/bin/smokeping 2023-04-02 18:16:09.223051686 +0200
f0aa5ed4	17	@@ -4,13 +4,11 @@
c235887a MM	18	use strict;
	19	use warnings;
	20
	21	-use FindBin;
7e394848	22	-use lib (split /:/, q{}); # PERL5LIB
f0aa5ed4	23	-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
c235887a MM	24	+use lib "/usr/share/smokeping";
	25
	26	use Smokeping;
	27
f0aa5ed4	28	-Smokeping::main("$FindBin::RealBin/../etc/config");
c235887a MM	29	+Smokeping::main("/etc/smokeping/config");
	30
	31	=head1 NAME
	32
7e394848 AM	33	diff -ur smokeping-2.8.2.org/bin/smokeping_cgi smokeping-2.8.2/bin/smokeping_cgi
	34	--- smokeping-2.8.2.org/bin/smokeping_cgi 2021-08-13 08:11:39.000000000 +0200
	35	+++ smokeping-2.8.2/bin/smokeping_cgi 2023-04-02 18:16:58.269718358 +0200
f0aa5ed4 AM	36	@@ -4,9 +4,7 @@
	37	use strict;
	38	use warnings;
	39
f0aa5ed4	40	-use FindBin;
7e394848	41	-use lib (split /:/, q{}); # PERL5LIB
f0aa5ed4 AM	42	-use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
	43	+use lib "/usr/share/smokeping";
	44
	45	# don't bother with zombies
	46	$SIG{CHLD} = 'IGNORE';
7e394848	47	@@ -17,7 +15,7 @@
f0aa5ed4 AM	48
	49	use CGI::Fast;
	50
	51	-my $cfg = (shift @ARGV) \|\| "$FindBin::Bin/../etc/config";
f0aa5ed4 AM	52	+my $cfg = (shift @ARGV) \|\| "/etc/smokeping/config";
f0aa5ed4 AM	53
7e394848	54
f0aa5ed4	55	while (my $q = new CGI::Fast) {
7e394848 AM	56	diff -ur smokeping-2.8.2.org/bin/tSmoke smokeping-2.8.2/bin/tSmoke
	57	--- smokeping-2.8.2.org/bin/tSmoke 2021-08-13 08:11:39.000000000 +0200
	58	+++ smokeping-2.8.2/bin/tSmoke 2023-04-02 18:16:09.223051686 +0200
f0aa5ed4	59	@@ -52,9 +52,7 @@
c235887a MM	60	#
c235887a MM	61	# Point the lib variables to your implementation
f0aa5ed4 AM	62
	63	-use lib (split /:/, q{}); # PERL5LIB
	64	-use FindBin;use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
	65	-
c235887a MM	66	+use lib "/usr/share/smokeping";
	67
	68	use Smokeping;
	69	use Net::SMTP;
f0aa5ed4	70	@@ -63,7 +61,7 @@
c235887a MM	71	use RRDs;
	72
	73	# Point to your Smokeping config file
7e394848 AM	74	-my $cfgfile = (shift @ARGV) \|\| "$FindBin::Bin/../etc/config";
7e394848 AM	75	+my $cfgfile = (shift @ARGV) \|\| "/etc/smokeping/config";
c235887a MM	76
	77	# global variables
	78	my $cfg;
7e394848 AM	79	diff -ur smokeping-2.8.2.org/etc/basepage.html.dist smokeping-2.8.2/etc/basepage.html.dist
	80	--- smokeping-2.8.2.org/etc/basepage.html.dist 2019-09-23 09:46:17.000000000 +0200
	81	+++ smokeping-2.8.2/etc/basepage.html.dist 2023-04-02 18:16:09.226385019 +0200
6ab81efc AM	82	@@ -4,8 +4,8 @@
	83	<meta name="viewport" content="width=device-width, initial-scale=1">
	84	<META http-equiv="Refresh" content="<##step##>">
	85	<title>SmokePing Latency Page for <##title##></title>
	86	- <link rel="stylesheet" type="text/css" href="css/smokeping-print.css" media="print">
	87	- <link rel="stylesheet" type="text/css" href="css/smokeping-screen.css" media="screen">
	88	+ <link rel="stylesheet" type="text/css" href="/smokeping/css/smokeping-print.css" media="print">
	89	+ <link rel="stylesheet" type="text/css" href="/smokeping/css/smokeping-screen.css" media="screen">
	90	</head>
	91	<body id="body">
	92
	93	@@ -47,10 +47,10 @@
	94	<p><small>Maintained by <a href="mailto:<##contact##>"><##owner##></a></small></p>
	95	</div>
	96
	97	-<script src="js/prototype.js" type="text/javascript"></script>
	98	-<script src="js/scriptaculous/scriptaculous.js?load=builder,effects,dragdrop" type="text/javascript"></script>
	99	-<script src="js/cropper/cropper.js" type="text/javascript"></script>
	100	-<script src="js/smokeping.js" type="text/javascript"></script>
	101	+<script src="/smokeping/js/prototype.js" type="text/javascript"></script>
	102	+<script src="/smokeping/js/scriptaculous/scriptaculous.js?load=builder,effects,dragdrop" type="text/javascript"></script>
	103	+<script src="/smokeping/js/cropper/cropper.js" type="text/javascript"></script>
	104	+<script src="/smokeping/js/smokeping.js" type="text/javascript"></script>
	105
	106	</body>
	107	</html>
7e394848 AM	108	diff -ur smokeping-2.8.2.org/lib/Smokeping/Examples.pm smokeping-2.8.2/lib/Smokeping/Examples.pm
	109	--- smokeping-2.8.2.org/lib/Smokeping/Examples.pm 2011-10-05 11:51:46.000000000 +0200
	110	+++ smokeping-2.8.2/lib/Smokeping/Examples.pm 2023-04-02 18:16:42.016385025 +0200
f0aa5ed4 AM	111	@@ -12,7 +12,7 @@
	112	This module generates L<smokeping_examples> and the example
	113	configuration files distributed with Smokeping. It is supposed to be
	114	invoked from the smokeping distribution top directory, as it will need
	115	-the C<etc/config.dist> template configuration file and will create files
	116	+the C</etc/smokeping/config> template configuration file and will create files
	117	in the directories C<doc> and C<doc/examples>.
c235887a	118
f0aa5ed4 AM	119	=head1 DESCRIPTION
	120	@@ -107,7 +107,7 @@
	121	${e}head1 DESCRIPTION
c235887a	122
f0aa5ed4 AM	123	Currently the examples differ only in the C<Probes> and C<Targets>
	124	-sections. The other sections are taken from the C<etc/config.dist>
	125	+sections. The other sections are taken from the C</etc/smokeping/config>
	126	configuration template in the Smokeping distribution so that the example
	127	files are complete.
c235887a	128
7e394848 AM	129	diff -ur smokeping-2.8.2.org/lib/Smokeping.pm smokeping-2.8.2/lib/Smokeping.pm
	130	--- smokeping-2.8.2.org/lib/Smokeping.pm 2021-08-13 08:19:27.000000000 +0200
	131	+++ smokeping-2.8.2/lib/Smokeping.pm 2023-04-02 18:16:09.226385019 +0200
	132	@@ -3871,7 +3871,7 @@
c235887a	133
f0aa5ed4 AM	134	* Probes *
	135	+FPing
	136	- binary = /usr/sepp/bin/fping
	137	+ binary = /usr/bin/fping
	138
	139	You can override it for a particular slave like this:
c235887a	140