CVS commit: pkgsrc/net/smokeping

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/smokeping
From: "Manuel Bouyer" <bouyer%netbsd.org@localhost>
Date: Mon, 27 Apr 2020 18:05:18 +0000

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Mon Apr 27 18:05:18 UTC 2020

Modified Files:
        pkgsrc/net/smokeping: Makefile PLIST distinfo
        pkgsrc/net/smokeping/files: smokeping.conf
        pkgsrc/net/smokeping/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae patch-af patch-ag
Added Files:
        pkgsrc/net/smokeping/patches: patch-Makefile.in patch-bin_Makefile.in

Log Message:
Update to 2.7.3
pkgsrc change: js/css files are now installed in share/smokeping/{js,css}
Changes since 2.6.7:
handle servers actually implementing OPTIONS
fork alert handlers, so that smokeping does not block
HTTP auth user template support
Added new probe SendEmail
A probe to use the EOS "ping" cli command
Adds a Qstat probe plugin
Added IPv6 (ipversion) and TCP (protocol) support
Add a custom Curl probe.
New TraceroutePing probe module
Add the FPingContinuous probe
Initial revision of IRTT probe


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/net/smokeping/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/smokeping/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/smokeping/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/smokeping/files/smokeping.conf
cvs rdiff -u -r0 -r1.1 pkgsrc/net/smokeping/patches/patch-Makefile.in \
    pkgsrc/net/smokeping/patches/patch-bin_Makefile.in
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/smokeping/patches/patch-aa \
    pkgsrc/net/smokeping/patches/patch-ab
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/smokeping/patches/patch-ac
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/smokeping/patches/patch-ad
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/smokeping/patches/patch-ae
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/smokeping/patches/patch-af \
    pkgsrc/net/smokeping/patches/patch-ag

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/smokeping/Makefile
diff -u pkgsrc/net/smokeping/Makefile:1.43 pkgsrc/net/smokeping/Makefile:1.44
--- pkgsrc/net/smokeping/Makefile:1.43  Sun Nov  3 11:45:53 2019
+++ pkgsrc/net/smokeping/Makefile       Mon Apr 27 18:05:18 2020
@@ -1,28 +1,36 @@
-# $NetBSD: Makefile,v 1.43 2019/11/03 11:45:53 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2020/04/27 18:05:18 bouyer Exp $
 
-DISTNAME=      smokeping-2.6.7
-PKGREVISION=   8
+DISTNAME=      smokeping-2.7.3
 CATEGORIES=    net
 MASTER_SITES=  http://oss.oetiker.ch/smokeping/pub/
 
 MAINTAINER=    bouyer%NetBSD.org@localhost
 HOMEPAGE=      https://oss.oetiker.ch/smokeping/index.en.html
 COMMENT=       Latency/packet loss monitoring/graphing tool
+LICENSE=       gnu-gpl-v2
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}/db/smokeping
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --with-htdocs-dir=${PREFIX}/share/httpd/htdocs
+CONFIGURE_ARGS+=       --with-htdocs-dir=${PREFIX}/share/smokeping
 
 DEPENDS+=      rrdtool>=1.0:../../databases/rrdtool
 DEPENDS+=      fping>=2.4b2:../../net/fping
 #DEPENDS+=     {perl>=5.8.0,p5-Digest-MD5>=2.20}:../../security/p5-Digest-MD5
+DEPENDS+=      p5-Config-Grammar>=1.10:../../devel/p5-Config-Grammar
+DEPENDS+=      p5-Path-Tiny>=0.108:../../filesystems/p5-Path-Tiny
+DEPENDS+=      p5-Socket6>=0.29:../../net/p5-Socket6
+DEPENDS+=      p5-Net-Telnet>=3.04:../../net/p5-Net-Telnet
+DEPENDS+=      p5-Net-SNMP>=v6.0.1:../../net/p5-Net-SNMP
+DEPENDS+=      p5-Net-DNS>=1.23:../../net/p5-Net-DNS
+DEPENDS+=      p5-Digest-HMAC>=1.03:../../security/p5-Digest-HMAC
+DEPENDS+=      p5-Net-OpenSSH>=0.78:../../security/p5-Net-OpenSSH
+DEPENDS+=      p5-IO-Socket-SSL>=2.067:../../security/p5-IO-Socket-SSL
 DEPENDS+=      p5-Digest-HMAC>=1.03:../../security/p5-Digest-HMAC
-DEPENDS+=      p5-libwww>=5.64:../../www/p5-libwww
 DEPENDS+=      p5-FCGI>=0.74:../../www/p5-FCGI
 DEPENDS+=      p5-CGI>=4.20:../../www/p5-CGI
 DEPENDS+=      p5-CGI-Fast>=2.09:../../www/p5-CGI-Fast
-DEPENDS+=      p5-Config-Grammar>=1.10:../../devel/p5-Config-Grammar
+DEPENDS+=      p5-libwww>=6.43:../../www/p5-libwww
 
 USE_TOOLS+=    pax gmake perl:run
 
@@ -68,7 +76,7 @@ SUBST_MESSAGE.libs=   Fixing library path
 OWN_DIRS+=             ${SMOKEPING_HOME}
 OWN_DIRS+=             ${SPDIR}/.simg
 
-INSTALLATION_DIRS=     bin libexec/cgi-bin share/httpd/htdocs
+INSTALLATION_DIRS=     bin libexec/cgi-bin share/smokeping
 
 post-extract:
        ${CP} ${FILESDIR}/smokeping.conf ${WRKSRC}
@@ -81,7 +89,7 @@ post-install:
 
        ${INSTALL_DATA} ${WRKSRC}/smokeping.conf ${DESTDIR}${EGDIR}
 
-       ${MV} ${DESTDIR}${PREFIX}/share/httpd/htdocs/smokeping.fcgi.dist \
+       ${MV} ${DESTDIR}${PREFIX}/share/smokeping/smokeping.fcgi.dist \
                 ${DESTDIR}${PREFIX}/libexec/cgi-bin/smokeping.cgi
        ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/*.dist ${DESTDIR}${EGDIR}/
        ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/examples/* ${DESTDIR}${EGDIR}/

Index: pkgsrc/net/smokeping/PLIST
diff -u pkgsrc/net/smokeping/PLIST:1.14 pkgsrc/net/smokeping/PLIST:1.15
--- pkgsrc/net/smokeping/PLIST:1.14     Mon Jan  1 22:29:49 2018
+++ pkgsrc/net/smokeping/PLIST  Mon Apr 27 18:05:18 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2018/01/01 22:29:49 rillig Exp $
+@comment $NetBSD: PLIST,v 1.15 2020/04/27 18:05:18 bouyer Exp $
 bin/smokeinfo
 bin/smokeping
 bin/smokeping_cgi
@@ -25,6 +25,7 @@ lib/smokeping/Smokeping/matchers/Median.
 lib/smokeping/Smokeping/matchers/Medratio.pm
 lib/smokeping/Smokeping/matchers/base.pm
 lib/smokeping/Smokeping/pingMIB.pm
+lib/smokeping/Smokeping/probes/AnotherCurl.pm
 lib/smokeping/Smokeping/probes/AnotherDNS.pm
 lib/smokeping/Smokeping/probes/AnotherSSH.pm
 lib/smokeping/Smokeping/probes/CiscoRTTMonDNS.pm
@@ -46,19 +47,25 @@ lib/smokeping/Smokeping/probes/EchoPingS
 lib/smokeping/Smokeping/probes/EchoPingWhois.pm
 lib/smokeping/Smokeping/probes/FPing.pm
 lib/smokeping/Smokeping/probes/FPing6.pm
+lib/smokeping/Smokeping/probes/FPingContinuous.pm
 lib/smokeping/Smokeping/probes/FTPtransfer.pm
 lib/smokeping/Smokeping/probes/IOSPing.pm
+lib/smokeping/Smokeping/probes/IRTT.pm
 lib/smokeping/Smokeping/probes/LDAP.pm
 lib/smokeping/Smokeping/probes/NFSping.pm
+lib/smokeping/Smokeping/probes/OpenSSHEOSPing.pm
 lib/smokeping/Smokeping/probes/OpenSSHJunOSPing.pm
+lib/smokeping/Smokeping/probes/Qstat.pm
 lib/smokeping/Smokeping/probes/Radius.pm
 lib/smokeping/Smokeping/probes/RemoteFPing.pm
 lib/smokeping/Smokeping/probes/SSH.pm
+lib/smokeping/Smokeping/probes/SendEmail.pm
 lib/smokeping/Smokeping/probes/SipSak.pm
 lib/smokeping/Smokeping/probes/TCPPing.pm
 lib/smokeping/Smokeping/probes/TacacsPlus.pm
 lib/smokeping/Smokeping/probes/TelnetIOSPing.pm
 lib/smokeping/Smokeping/probes/TelnetJunOSPing.pm
+lib/smokeping/Smokeping/probes/TraceroutePing.pm
 lib/smokeping/Smokeping/probes/WebProxyFilter.pm
 lib/smokeping/Smokeping/probes/base.pm
 lib/smokeping/Smokeping/probes/basefork.pm
@@ -81,6 +88,7 @@ man/man3/Smokeping_matchers_ExpLoss.3
 man/man3/Smokeping_matchers_Median.3
 man/man3/Smokeping_matchers_Medratio.3
 man/man3/Smokeping_matchers_base.3
+man/man3/Smokeping_probes_AnotherCurl.3
 man/man3/Smokeping_probes_AnotherDNS.3
 man/man3/Smokeping_probes_AnotherSSH.3
 man/man3/Smokeping_probes_CiscoRTTMonDNS.3
@@ -102,19 +110,25 @@ man/man3/Smokeping_probes_EchoPingSmtp.3
 man/man3/Smokeping_probes_EchoPingWhois.3
 man/man3/Smokeping_probes_FPing.3
 man/man3/Smokeping_probes_FPing6.3
+man/man3/Smokeping_probes_FPingContinuous.3
 man/man3/Smokeping_probes_FTPtransfer.3
 man/man3/Smokeping_probes_IOSPing.3
+man/man3/Smokeping_probes_IRTT.3
 man/man3/Smokeping_probes_LDAP.3
 man/man3/Smokeping_probes_NFSping.3
+man/man3/Smokeping_probes_OpenSSHEOSPing.3
 man/man3/Smokeping_probes_OpenSSHJunOSPing.3
+man/man3/Smokeping_probes_Qstat.3
 man/man3/Smokeping_probes_Radius.3
 man/man3/Smokeping_probes_RemoteFPing.3
 man/man3/Smokeping_probes_SSH.3
+man/man3/Smokeping_probes_SendEmail.3
 man/man3/Smokeping_probes_SipSak.3
 man/man3/Smokeping_probes_TCPPing.3
 man/man3/Smokeping_probes_TacacsPlus.3
 man/man3/Smokeping_probes_TelnetIOSPing.3
 man/man3/Smokeping_probes_TelnetJunOSPing.3
+man/man3/Smokeping_probes_TraceroutePing.3
 man/man3/Smokeping_probes_WebProxyFilter.3
 man/man3/Smokeping_probes_base.3
 man/man3/Smokeping_probes_basefork.3
@@ -150,19 +164,21 @@ share/examples/smokeping/smokemail.dist
 share/examples/smokeping/smokeping.conf
 share/examples/smokeping/smokeping_secrets.dist
 share/examples/smokeping/tmail.dist
-share/httpd/htdocs/cropper/cropper.css
-share/httpd/htdocs/cropper/cropper.js
-share/httpd/htdocs/cropper/cropper.uncompressed.js
-share/httpd/htdocs/cropper/lib/builder.js
-share/httpd/htdocs/cropper/lib/controls.js
-share/httpd/htdocs/cropper/lib/dragdrop.js
-share/httpd/htdocs/cropper/lib/effects.js
-share/httpd/htdocs/cropper/lib/prototype.js
-share/httpd/htdocs/cropper/lib/scriptaculous.js
-share/httpd/htdocs/cropper/lib/slider.js
-share/httpd/htdocs/cropper/lib/sound.js
-share/httpd/htdocs/cropper/lib/unittest.js
-share/httpd/htdocs/cropper/licence.txt
-share/httpd/htdocs/cropper/marqueeHoriz.gif
-share/httpd/htdocs/cropper/marqueeVert.gif
-share/httpd/htdocs/cropper/smokeping-zoom.js
+share/smokeping/css/smokeping-print.css
+share/smokeping/css/smokeping-screen.css
+share/smokeping/js/cropper/cropper.css
+share/smokeping/js/cropper/cropper.js
+share/smokeping/js/cropper/cropper.uncompressed.js
+share/smokeping/js/cropper/licence.txt
+share/smokeping/js/cropper/marqueeHoriz.gif
+share/smokeping/js/cropper/marqueeVert.gif
+share/smokeping/js/prototype.js
+share/smokeping/js/scriptaculous/builder.js
+share/smokeping/js/scriptaculous/controls.js
+share/smokeping/js/scriptaculous/dragdrop.js
+share/smokeping/js/scriptaculous/effects.js
+share/smokeping/js/scriptaculous/scriptaculous.js
+share/smokeping/js/scriptaculous/slider.js
+share/smokeping/js/scriptaculous/sound.js
+share/smokeping/js/scriptaculous/unittest.js
+share/smokeping/js/smokeping.js

Index: pkgsrc/net/smokeping/distinfo
diff -u pkgsrc/net/smokeping/distinfo:1.16 pkgsrc/net/smokeping/distinfo:1.17
--- pkgsrc/net/smokeping/distinfo:1.16  Wed Nov  4 00:35:37 2015
+++ pkgsrc/net/smokeping/distinfo       Mon Apr 27 18:05:18 2020
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.16 2015/11/04 00:35:37 agc Exp $
+$NetBSD: distinfo,v 1.17 2020/04/27 18:05:18 bouyer Exp $
 
-SHA1 (smokeping-2.6.7.tar.gz) = bc0b118164f00f79f6264f46ccb129acd1962dfc
-RMD160 (smokeping-2.6.7.tar.gz) = 126adae8ec55d7119ce57daf135327b56625ba3b
-SHA512 (smokeping-2.6.7.tar.gz) = 482c6e7fe5de4a3b3dd5b936eead6fca817932d032fcec7050ee258bf5e7718e677f14ad2660099661837041a5f6d4894b8cf832f248d036b3b36e8bf5737095
-Size (smokeping-2.6.7.tar.gz) = 423151 bytes
-SHA1 (patch-aa) = 1926aa6ebe13b06fc4cf2fae903f32b79b4f610a
-SHA1 (patch-ab) = 9258886479491e991408e07ebdf23b6fcb770f96
-SHA1 (patch-ac) = fdad1384d1925cc41e200e7a95834f76e6780fb4
-SHA1 (patch-ad) = 1b5581b88054182115ce4f667dbaaeea10596acd
-SHA1 (patch-ae) = 45410102cd230d4514d8d493655a3fa9302c3e0e
-SHA1 (patch-af) = ecb2c6f5beed570def7e4dd830864bb82b92654f
-SHA1 (patch-ag) = f200c0522db44e08d475f1a0895ee14e01663fd8
-SHA1 (patch-lib_Smokeping.pm) = 19ab8a169b1db99686bbe7af24dec1b5c2b6fb77
+SHA1 (smokeping-2.7.3.tar.gz) = a57dbd201b3d9142b15dcf63a906a265989a2929
+RMD160 (smokeping-2.7.3.tar.gz) = 54ebc0f840a7c52e4610a7409fa3213e1a90b647
+SHA512 (smokeping-2.7.3.tar.gz) = d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830
+Size (smokeping-2.7.3.tar.gz) = 6614710 bytes
+SHA1 (patch-Makefile.in) = 9eceb69c516a50b0b48ca5afad8fb8a8a1550d72
+SHA1 (patch-aa) = e1bec9750bcb3dfd9e38e4d5dea5e4bf6359e077
+SHA1 (patch-ab) = 9a14917909b6bfee57109d01dec4b9a89c56f448
+SHA1 (patch-ac) = e0420ee1108e3aa332c7e77970920cce3cc5dafd
+SHA1 (patch-ad) = bfc0d914ef24249dd01651caab27023ef2ac9d89
+SHA1 (patch-ae) = 9529ab685db10d7a4b19d4ccd0f10d0621d2cccf
+SHA1 (patch-af) = 95541f07c1e4bb77c58a9a215d6deae849523fec
+SHA1 (patch-ag) = cacfb3403115cbef3bb211a918482d5ed112fc9a
+SHA1 (patch-bin_Makefile.in) = 434300b628a1db9a583eb61a4389ad79428f98b3

Index: pkgsrc/net/smokeping/files/smokeping.conf
diff -u pkgsrc/net/smokeping/files/smokeping.conf:1.2 pkgsrc/net/smokeping/files/smokeping.conf:1.3
--- pkgsrc/net/smokeping/files/smokeping.conf:1.2       Thu Feb  2 18:54:35 2012
+++ pkgsrc/net/smokeping/files/smokeping.conf   Mon Apr 27 18:05:18 2020
@@ -1,13 +1,11 @@
-# $NetBSD: smokeping.conf,v 1.2 2012/02/02 18:54:35 bouyer Exp $
+# $NetBSD: smokeping.conf,v 1.3 2020/04/27 18:05:18 bouyer Exp $
 #
 # smokeping configuration file fragment for Apache
 
 <IfModule mod_alias.c>
     Alias /smokeping/ "@SPDIR@/"
-    Alias /cropper/ "@PREFIX@/share/httpd/htdocs/cropper/"
 </IfModule>
 
 <Directory "@SPDIR@">
-    Order allow,deny
-    Allow from all
+    Require all granted
 </Directory>

Index: pkgsrc/net/smokeping/patches/patch-aa
diff -u pkgsrc/net/smokeping/patches/patch-aa:1.11 pkgsrc/net/smokeping/patches/patch-aa:1.12
--- pkgsrc/net/smokeping/patches/patch-aa:1.11  Thu Feb  2 18:54:35 2012
+++ pkgsrc/net/smokeping/patches/patch-aa       Mon Apr 27 18:05:18 2020
@@ -1,12 +1,16 @@
-$NetBSD: patch-aa,v 1.11 2012/02/02 18:54:35 bouyer Exp $
+$NetBSD: patch-aa,v 1.12 2020/04/27 18:05:18 bouyer Exp $
 
---- bin/smokeping.orig 2012-02-02 15:09:15.000000000 +0100
-+++ bin/smokeping      2012-02-02 15:10:46.000000000 +0100
-@@ -11,7 +11,7 @@
+--- bin/smokeping.orig 2018-04-13 14:13:05.000000000 +0200
++++ bin/smokeping      2020-04-26 12:13:00.964611375 +0200
+@@ -6,11 +6,11 @@
+ 
+ use lib (split /:/, q{}); # PERL5LIB
+ use FindBin;
+ use lib "$FindBin::RealBin/../lib";use lib "$FindBin::RealBin/../thirdparty/lib/perl5"; # LIBDIR
  
  use Smokeping;
   
--Smokeping::main("$FindBin::Bin/../etc/config");
+-Smokeping::main("$FindBin::RealBin/../etc/config");
 +Smokeping::main("@PKG_SYSCONFDIR@/config");
  
  =head1 NAME
Index: pkgsrc/net/smokeping/patches/patch-ab
diff -u pkgsrc/net/smokeping/patches/patch-ab:1.11 pkgsrc/net/smokeping/patches/patch-ab:1.12
--- pkgsrc/net/smokeping/patches/patch-ab:1.11  Thu Feb  2 18:54:35 2012
+++ pkgsrc/net/smokeping/patches/patch-ab       Mon Apr 27 18:05:18 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2012/02/02 18:54:35 bouyer Exp $
+$NetBSD: patch-ab,v 1.12 2020/04/27 18:05:18 bouyer Exp $
 
---- bin/smokeping_cgi.orig     2012-02-02 15:12:05.000000000 +0100
-+++ bin/smokeping_cgi  2012-02-02 15:12:35.000000000 +0100
-@@ -18,7 +18,7 @@
+--- bin/smokeping_cgi.orig     2020-04-26 12:26:58.308638086 +0200
++++ bin/smokeping_cgi  2020-04-26 12:27:17.592838363 +0200
+@@ -17,7 +17,7 @@
  
  use CGI::Fast;
  

Index: pkgsrc/net/smokeping/patches/patch-ac
diff -u pkgsrc/net/smokeping/patches/patch-ac:1.9 pkgsrc/net/smokeping/patches/patch-ac:1.10
--- pkgsrc/net/smokeping/patches/patch-ac:1.9   Thu Feb  2 18:54:35 2012
+++ pkgsrc/net/smokeping/patches/patch-ac       Mon Apr 27 18:05:18 2020
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.9 2012/02/02 18:54:35 bouyer Exp $
+$NetBSD: patch-ac,v 1.10 2020/04/27 18:05:18 bouyer Exp $
 
---- etc/config.dist.in.orig    2011-10-30 11:33:11.000000000 +0100
-+++ etc/config.dist.in 2012-02-02 16:51:40.000000000 +0100
+--- etc/config.dist.in.orig    2017-06-25 20:18:25.000000000 +0200
++++ etc/config.dist.in 2020-04-23 10:20:42.223454811 +0200
 @@ -1,19 +1,19 @@
  *** General ***
  
@@ -37,10 +37,10 @@ $NetBSD: patch-ac,v 1.9 2012/02/02 18:54
  
 -template = @prefix@/etc/basepage.html.dist
 +template = @PKG_SYSCONFDIR@/basepage.html
+ htmltitle = yes
+ graphborders = no
  
- + charts
- 
-@@ -105,10 +105,10 @@
+@@ -107,10 +107,10 @@
  
  + FPing
  

Index: pkgsrc/net/smokeping/patches/patch-ad
diff -u pkgsrc/net/smokeping/patches/patch-ad:1.6 pkgsrc/net/smokeping/patches/patch-ad:1.7
--- pkgsrc/net/smokeping/patches/patch-ad:1.6   Thu Feb  2 18:54:35 2012
+++ pkgsrc/net/smokeping/patches/patch-ad       Mon Apr 27 18:05:18 2020
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.6 2012/02/02 18:54:35 bouyer Exp $
+$NetBSD: patch-ad,v 1.7 2020/04/27 18:05:18 bouyer Exp $
 
---- bin/tSmoke.orig    2012-02-02 15:16:10.000000000 +0100
-+++ bin/tSmoke 2012-02-02 15:16:31.000000000 +0100
+--- bin/tSmoke.orig    2018-04-13 14:13:05.000000000 +0200
++++ bin/tSmoke 2020-04-23 10:16:51.652216589 +0200
 @@ -63,7 +63,7 @@
  use RRDs;
  

Index: pkgsrc/net/smokeping/patches/patch-ae
diff -u pkgsrc/net/smokeping/patches/patch-ae:1.2 pkgsrc/net/smokeping/patches/patch-ae:1.3
--- pkgsrc/net/smokeping/patches/patch-ae:1.2   Thu Feb  2 18:54:35 2012
+++ pkgsrc/net/smokeping/patches/patch-ae       Mon Apr 27 18:05:18 2020
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.2 2012/02/02 18:54:35 bouyer Exp $
+$NetBSD: patch-ae,v 1.3 2020/04/27 18:05:18 bouyer Exp $
 
---- htdocs/Makefile.in.orig    2012-02-02 15:51:17.000000000 +0100
-+++ htdocs/Makefile.in 2012-02-02 15:52:04.000000000 +0100
-@@ -424,7 +424,7 @@
+--- htdocs/Makefile.in.orig    2018-12-20 11:22:43.000000000 +0100
++++ htdocs/Makefile.in 2020-04-23 10:22:45.870593346 +0200
+@@ -497,7 +497,7 @@
  install-data-local:
        $(MKDIR) -p $(DESTDIR)$(HTDOCSDIR)
        $(ECHO) "#!/bin/sh" > $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
--      $(ECHO) "$(prefix)/bin/smokeping_cgi $(prefix)/etc/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
-+      $(ECHO) "$(prefix)/bin/smokeping_cgi @PKG_SYSCONFDIR@/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
+-      $(ECHO) "exec $(bindir)/smokeping_cgi $(sysconfdir)/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
++      $(ECHO) "exec $(bindir)/smokeping_cgi  @PKG_SYSCONFDIR@/config" >> $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
        chmod +x $(DESTDIR)$(HTDOCSDIR)/smokeping.fcgi.dist
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.

Index: pkgsrc/net/smokeping/patches/patch-af
diff -u pkgsrc/net/smokeping/patches/patch-af:1.1 pkgsrc/net/smokeping/patches/patch-af:1.2
--- pkgsrc/net/smokeping/patches/patch-af:1.1   Thu Feb  2 18:54:35 2012
+++ pkgsrc/net/smokeping/patches/patch-af       Mon Apr 27 18:05:18 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2012/02/02 18:54:35 bouyer Exp $
+$NetBSD: patch-af,v 1.2 2020/04/27 18:05:18 bouyer Exp $
 
---- lib/Makefile.in.orig       2012-02-02 16:07:25.000000000 +0100
-+++ lib/Makefile.in    2012-02-02 16:07:33.000000000 +0100
-@@ -217,7 +217,7 @@
+--- lib/Makefile.in.orig       2018-12-20 11:22:43.000000000 +0100
++++ lib/Makefile.in    2020-04-23 10:16:51.668142346 +0200
+@@ -268,7 +268,7 @@
  PROBE := $(wildcard Smokeping/probes/*.pm)
  MATCH := $(wildcard Smokeping/matchers/*.pm)
  EXTRA_DIST = $(PM) $(SP) $(SORT) $(PROBE) $(MATCH)
Index: pkgsrc/net/smokeping/patches/patch-ag
diff -u pkgsrc/net/smokeping/patches/patch-ag:1.1 pkgsrc/net/smokeping/patches/patch-ag:1.2
--- pkgsrc/net/smokeping/patches/patch-ag:1.1   Thu Feb  2 18:54:35 2012
+++ pkgsrc/net/smokeping/patches/patch-ag       Mon Apr 27 18:05:18 2020
@@ -1,19 +1,30 @@
-$NetBSD: patch-ag,v 1.1 2012/02/02 18:54:35 bouyer Exp $
+$NetBSD: patch-ag,v 1.2 2020/04/27 18:05:18 bouyer Exp $
 
---- etc/basepage.html.dist.orig        2012-02-02 18:44:25.000000000 +0100
-+++ etc/basepage.html.dist     2012-02-02 18:44:37.000000000 +0100
-@@ -53,10 +53,10 @@
- -->
- </STYLE>
- 
--<script src="cropper/lib/prototype.js" type="text/javascript"></script>      
--<script src="cropper/lib/scriptaculous.js?load=builder,effects,dragdrop" type="text/javascript"></script>
--<script src="cropper/cropper.js" type="text/javascript"></script>
--<script src="cropper/smokeping-zoom.js" type="text/javascript"></script>
-+<script src="/cropper/lib/prototype.js" type="text/javascript"></script>      
-+<script src="/cropper/lib/scriptaculous.js?load=builder,effects,dragdrop" type="text/javascript"></script>
-+<script src="/cropper/cropper.js" type="text/javascript"></script>
-+<script src="/cropper/smokeping-zoom.js" type="text/javascript"></script>
+--- etc/basepage.html.dist.orig        2020-04-26 12:18:36.535286277 +0200
++++ etc/basepage.html.dist     2020-04-26 12:18:59.688451692 +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>

Added files:

Index: pkgsrc/net/smokeping/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/net/smokeping/patches/patch-Makefile.in:1.1
--- /dev/null   Mon Apr 27 18:05:18 2020
+++ pkgsrc/net/smokeping/patches/patch-Makefile.in      Mon Apr 27 18:05:18 2020
@@ -0,0 +1,21 @@
+$NetBSD: patch-Makefile.in,v 1.1 2020/04/27 18:05:18 bouyer Exp $
+
+--- Makefile.in.orig   2020-04-23 11:52:35.396108377 +0200
++++ Makefile.in        2020-04-23 11:53:14.548543368 +0200
+@@ -313,7 +313,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = thirdparty doc etc htdocs lib bin
++SUBDIRS = doc etc htdocs lib bin
+ EXTRA_DIST = COPYRIGHT CHANGES CONTRIBUTORS LICENSE PERL_MODULES
+ THIRDPARTY_DIR := $(shell pwd)/thirdparty
+ all: all-recursive
+@@ -781,7 +781,6 @@
+       $(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)
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Index: pkgsrc/net/smokeping/patches/patch-bin_Makefile.in
diff -u /dev/null pkgsrc/net/smokeping/patches/patch-bin_Makefile.in:1.1
--- /dev/null   Mon Apr 27 18:05:18 2020
+++ pkgsrc/net/smokeping/patches/patch-bin_Makefile.in  Mon Apr 27 18:05:18 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-bin_Makefile.in,v 1.1 2020/04/27 18:05:18 bouyer Exp $
+
+--- bin/Makefile.in.orig       2020-04-26 12:23:35.205934205 +0200
++++ bin/Makefile.in    2020-04-26 12:24:07.526466269 +0200
+@@ -487,7 +487,7 @@
+ 
+ install-exec-hook:
+       test "$(PERL5LIB)" = ""  || cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{^#!.*}{#!$(PERL)}; s{.*# PERL5LIB}{use lib (split /:/, q{$(PERL5LIB)}); # PERL5LIB}'  $(dist_bin_SCRIPTS)
+-      cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{.*# LIBDIR}{use lib qw($(libdir)); # LIBDIR}' $(dist_bin_SCRIPTS)
++      cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{.*# LIBDIR}{use lib qw($(pkglibdir)); # LIBDIR}' $(dist_bin_SCRIPTS)
+       cd "$(DESTDIR)$(bindir)" && $(PERL) -i -p -e 's{^#!.*perl.*}{#!$(PERL)};'  $(dist_bin_SCRIPTS)
+ 
+ # EOF

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index