diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile index e51c2da7fd2d..083f84c918b4 100644 --- a/net-mgmt/smokeping/Makefile +++ b/net-mgmt/smokeping/Makefile @@ -1,100 +1,101 @@ # Created by: Lars Thegler PORTNAME= smokeping PORTVERSION= 2.8.2 +PORTREVISION= 1 CATEGORIES= net-mgmt www MAINTAINER= rodrigo@FreeBSD.org COMMENT= Latency logging and graphing system LICENSE= GPLv2 LIB_DEPENDS= librrd.so:databases/rrdtool BUILD_DEPENDS= p5-CGI-Fast>=0:www/p5-CGI-Fast \ p5-CGI-Session>=0:www/p5-CGI-Session \ p5-Digest-HMAC>=0:security/p5-Digest-HMAC \ p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \ p5-Net-DNS>=0:dns/p5-Net-DNS \ p5-IO-Pty-Easy>=0:devel/p5-IO-Pty-Easy \ p5-SNMP_Session>=0:net-mgmt/p5-SNMP_Session \ p5-libwww>=0:www/p5-libwww \ p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \ p5-CGI>=0:www/p5-CGI \ p5-FCGI>=0:www/p5-FCGI \ p5-Config-Grammar>=0:devel/p5-Config-Grammar \ p5-Socket6>=0:net/p5-Socket6 \ p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \ p5-Net-Telnet>=0:net/p5-Net-Telnet \ p5-Net-OpenSSH>=0:net/p5-Net-OpenSSH \ p5-perl-ldap>=0:net/p5-perl-ldap \ p5-OrePAN2>=0:devel/p5-OrePAN2 \ curl>=0:ftp/curl RUN_DEPENDS:= ${BUILD_DEPENDS} USES= cpe gmake perl5 autoreconf CONFLICTS_INSTALL= nfsping SUB_FILES= pkg-deinstall pkg-message SUB_LIST= USERS=${USERS} \ GROUPS=${GROUPS} NO_ARCH= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= PERL=${PERL} PERL5LIB=${PREFIX}/smokeping/lib CONFIGURE_ARGS+= \ --sysconfdir=${ETCDIR} \ --localstatedir="${PREFIX}/var" \ --with-htdocs-dir=${PREFIX}/smokeping/htdocs \ --libdir=${PREFIX}/smokeping/lib HTDOCSDIR= ${PREFIX}/smokeping/htdocs USE_RC_SUBR= smokeping PKGDEINSTALL= ${WRKDIR}/pkg-deinstall USERS= smokeping GROUPS= smokeping OPTIONS_DEFINE= ECHOPING RADIUS TELNET DNS FPING EXAMPLES OPTIONS_DEFAULT= FPING FPING_DESC= Support for fping probes FPING_RUN_DEPENDS= ${LOCALBASE}/sbin/fping:net/fping ECHOPING_DESC= Support for EchoPing probes ECHOPING_RUN_DEPENDS= ${LOCALBASE}/bin/echoping:net/echoping RADIUS_DESC= Support for Radius probes RADIUS_RUN_DEPENDS= p5-Authen-Radius>=0:security/p5-Authen-Radius TELNET_DESC= Support for TelnetIOSPing probes TELNET_RUN_DEPENDS= p5-Net-Telnet>=0:net/p5-Net-Telnet DNS_DESC= Support for AnotherDNS probes DNS_RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS USE_GITHUB= yes GH_ACCOUNT= oetiker GH_PROJECT= SmokePing # We will take these from CPAN instead post-extract: cd ${WRKSRC}/lib ; ${RM} BER.pm SNMP_util.pm SNMP_Session.pm post-patch: ${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/doc/Makefile.am \ ${WRKSRC}/bin/smokeping \ ${WRKSRC}/bin/smokeping_cgi \ ${WRKSRC}/bin/tSmoke @for a in ${WRKSRC}/etc/*.dist; do \ ${MV} $$a $${a%.dist}.sample; \ done ${MV} ${WRKSRC}/etc/config.dist.in ${WRKSRC}/etc/config.sample.in post-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/smokeping/htdocs/img ${MKDIR} ${STAGEDIR}/${PREFIX}/var/smokeping .include diff --git a/net-mgmt/smokeping/files/patch-bin_smokeping b/net-mgmt/smokeping/files/patch-bin_smokeping index c456336ecf28..73d5e7578332 100644 --- a/net-mgmt/smokeping/files/patch-bin_smokeping +++ b/net-mgmt/smokeping/files/patch-bin_smokeping @@ -1,18 +1,18 @@ ---- /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/bin/smokeping.orig 2021-11-14 17:05:16.825182000 +0000 -+++ /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/bin/smokeping 2021-11-14 17:06:25.201316000 +0000 +--- bin/smokeping.orig 2021-11-14 17:05:16 UTC ++++ bin/smokeping @@ -4,13 +4,12 @@ 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/local/smokeping/lib"; use Smokeping; -Smokeping::main("$FindBin::RealBin/../etc/config"); +Smokeping::main("/usr/local/etc/smokeping/config"); =head1 NAME diff --git a/net-mgmt/smokeping/files/patch-bin_smokeping__cgi b/net-mgmt/smokeping/files/patch-bin_smokeping__cgi index a84fc44a2ed2..093fd6a8c207 100644 --- a/net-mgmt/smokeping/files/patch-bin_smokeping__cgi +++ b/net-mgmt/smokeping/files/patch-bin_smokeping__cgi @@ -1,22 +1,22 @@ ---- /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/bin/smokeping_cgi.orig 2021-11-14 17:14:45.367218000 +0000 -+++ /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/bin/smokeping_cgi 2021-11-14 17:15:26.603427000 +0000 +--- bin/smokeping_cgi.orig 2021-11-14 17:05:16 UTC ++++ bin/smokeping_cgi @@ -4,9 +4,8 @@ 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/local/smokeping/lib"; # don't bother with zombies $SIG{CHLD} = 'IGNORE'; @@ -17,7 +16,7 @@ use CGI::Fast; -my $cfg = (shift @ARGV) || "$FindBin::Bin/../etc/config"; +My $cfg = (shift @ARGV) || "/usr/local/etc/smokeping/config"; while (my $q = new CGI::Fast) { diff --git a/net-mgmt/smokeping/files/patch-bin_tSmoke b/net-mgmt/smokeping/files/patch-bin_tSmoke index 88b3fe14ebbc..9f4d0916aa21 100644 --- a/net-mgmt/smokeping/files/patch-bin_tSmoke +++ b/net-mgmt/smokeping/files/patch-bin_tSmoke @@ -1,20 +1,20 @@ ---- /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/bin/tSmoke.orig 2021-11-14 17:17:07.113198000 +0000 -+++ /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/bin/tSmoke 2021-11-14 17:18:49.556960000 +0000 +--- bin/tSmoke.orig 2021-11-14 17:05:16 UTC ++++ bin/tSmoke @@ -53,7 +53,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/local/smokeping/lib"; use Smokeping; @@ -63,7 +63,7 @@ use RRDs; # Point to your Smokeping config file -my $cfgfile = (shift @ARGV) || "$FindBin::Bin/../etc/config"; +my $cfgfile = "/usr/local/etc/smokeping/config"; # global variables my $cfg; diff --git a/net-mgmt/smokeping/files/patch-lib_Smokeping.pm b/net-mgmt/smokeping/files/patch-lib_Smokeping.pm index 2b9b501e330e..10c4d0e8c168 100644 --- a/net-mgmt/smokeping/files/patch-lib_Smokeping.pm +++ b/net-mgmt/smokeping/files/patch-lib_Smokeping.pm @@ -1,38 +1,38 @@ ---- /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/lib/Smokeping.pm.orig 2021-11-14 17:22:44.574583000 +0000 -+++ /wrkdirs/usr/ports/net-mgmt/smokeping/work/SmokePing-2.8.2/lib/Smokeping.pm 2021-11-14 17:26:17.422305000 +0000 +--- lib/Smokeping.pm.orig 2021-11-14 17:05:16 UTC ++++ lib/Smokeping.pm @@ -4631,7 +4631,7 @@ if(defined $opt{'check'}) { verify_cfg($cfgfile); exit 0; } if($opt{reload}) { load_cfg $cfgfile, 'noinit'; # we need just the piddir - kill_smoke $cfg->{General}{piddir}."/smokeping.pid", SIGHUP; + kill_smoke $cfg->{General}{piddir}."/pid", SIGHUP; print "HUP signal sent to the running SmokePing process, exiting.\n"; exit 0; }; @@ -4640,7 +4640,7 @@ if(defined $opt{'static-pages'}) { makestaticpages $cfg, $opt{'static-pages'}; exit 0 }; if($opt{email}) { enable_dynamic $cfg, $cfg->{Targets},"",""; exit 0 }; } - if($opt{restart}) { kill_smoke $cfg->{General}{piddir}."/smokeping.pid", SIGINT;}; + if($opt{restart}) { kill_smoke $cfg->{General}{piddir}."/pid", SIGINT;}; if($opt{logfile}) { initialize_filelog($opt{logfile}) }; @@ -4653,7 +4653,7 @@ initialize_syslog($cfg->{General}{syslogfacility}, $cfg->{General}{syslogpriority}); } - daemonize_me $cfg->{General}{piddir}."/smokeping.pid"; + daemonize_me $cfg->{General}{piddir}."/pid"; } do_log "Smokeping version $VERSION successfully launched."; @@ -4839,7 +4839,7 @@ my $new_conf = Smokeping::Slave::submit_results $slave_cfg,$cfg,$myprobe,$probes; if ($new_conf && !$gothup){ do_log('server has new config for me ... HUPing the parent'); - kill_smoke $cfg->{General}{piddir}."/smokeping.pid", SIGHUP; + kill_smoke $cfg->{General}{piddir}."/pid", SIGHUP; # wait until the parent signals back if it didn't already sleep if (!$gothup); if (!$gothup) { diff --git a/security/clamav/Makefile b/security/clamav/Makefile index 1ba7ad8b2daf..376cd8700a4e 100644 --- a/security/clamav/Makefile +++ b/security/clamav/Makefile @@ -1,133 +1,134 @@ PORTNAME= clamav DISTVERSION= 0.104.1 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= https://www.clamav.net/downloads/production/ MAINTAINER= yasu@FreeBSD.org COMMENT= Open-source (GPL) anti-virus engine (Regular Feature Release) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING.txt LIB_DEPENDS= libcurl.so:ftp/curl \ libjson-c.so:devel/json-c \ libmspack.so:archivers/libmspack \ libpcre2-8.so:devel/pcre2 USES= cmake cpe gnome iconv ncurses pkgconfig ssl USE_GNOME= libxml2 USE_LDCONFIG= yes USE_RC_SUBR= clamav-clamd clamav-freshclam CMAKE_ARGS= -DDATABASE_DIRECTORY:STRING=${_DBDIR} CMAKE_ON= ENABLE_EXTERNAL_MSPACK TEST_TARGET= check CONFLICTS_INSTALL= clamav-[0-9]* +FETCH_ARGS= --user-agent=Mozilla/5.0 SUB_FILES= pkg-message SUB_LIST+= CHMOD=${CHMOD} \ CHOWN=${CHOWN} \ CLAMAV_CLAMD_PIDFILE=${_CLAMAV_CLAMD_PIDFILE} \ CLAMAV_CLAMD_SOCKET=${_CLAMAV_CLAMD_SOCKET} \ CLAMAV_MILTER_SOCKET=${_CLAMAV_MILTER_SOCKET} \ CLAMAVGROUP=${_CLAMAVGROUP} \ CLAMAVUSER=${_CLAMAVUSER} \ DBDIR=${_DBDIR} \ LOGDIR=${_LOGDIR} \ RUNDIR=${_RUNDIR} USERS= ${_CLAMAVUSER} GROUPS= ${_CLAMAVGROUP} mail PLIST_SUB+= CLAMAVGROUP=${_CLAMAVGROUP} \ CLAMAVUSER=${_CLAMAVUSER} \ DBDIR=${_DBDIR} \ LOGDIR=${_LOGDIR} \ RUNDIR=${_RUNDIR} OPTIONS_DEFINE= ARC ARJ DOCS EXPERIMENTAL LHA MILTER STDERR TESTS UNRAR UNZOO OPTIONS_DEFAULT= ARC ARJ MILTER UNRAR UNZOO OPTIONS_SUB= yes ARC_DESC= Enable arch archives support ARJ_DESC= Enable arj archives support EXPERIMENTAL_DESC= Build experimental code LHA_DESC= Enable lha archives support MILTER_DESC= Compile the milter interface STDERR_DESC= Print logs to stderr instead of stdout TESTS_DESC= Build with test enabled (`make test` requires it) UNZOO_DESC= Enable zoo archives support ARC_RUN_DEPENDS= arc:archivers/arc ARJ_RUN_DEPENDS= arj:archivers/arj EXPERIMENTAL_CMAKE_BOOL= ENABLE_EXPERIMENTAL LHA_RUN_DEPENDS= lha:archivers/lha .if !exists(/usr/lib/libmilter.so) MILTER_LIB_DEPENDS= libmilter.so:mail/libmilter .endif MILTER_USE= RC_SUBR=clamav-milter .if !exists(/usr/lib/libmilter.so) MILTER_USE+= localbase .endif MILTER_CMAKE_BOOL= ENABLE_MILTER STDERR_EXTRA_PATCHES= ${FILESDIR}/extra-patch-common_output.c TESTS_BUILD_DEPENDS= ${LOCALBASE}/include/check.h:devel/check TESTS_USES= python:build TESTS_CMAKE_BOOL= ENABLE_TESTS UNRAR_CMAKE_BOOL= ENABLE_UNRAR UNZOO_RUN_DEPENDS= unzoo:archivers/unzoo _CLAMAVUSER= clamav _CLAMAVGROUP= clamav _CLAMAV_CLAMD_SOCKET?= ${_RUNDIR}/clamd.sock _CLAMAV_CLAMD_PIDFILE?= ${_RUNDIR}/clamd.pid _CLAMAV_MILTER_SOCKET?= ${_RUNDIR}/clmilter.sock _DBDIR= /var/db/clamav _LOGDIR= /var/log/clamav _RUNDIR= /var/run/clamav _SED_CONF= -E -e 's|^\#?(Example)$$|\#\1|' -e \ 's|^\#?((Update)?LogFile) .*/([a-z]+\.log)$$|\1 ${_LOGDIR}/\3|' \ -e 's|^\#?(PidFile) .*/([a-z\-]+\.pid)$$|\1 ${_RUNDIR}/\2|' -e \ 's|^\#?(LocalSocket) .*$$|\1 ${_CLAMAV_CLAMD_SOCKET}|' -e \ 's|^\#?(User) .*$$|\1 ${_CLAMAVUSER}|' -e \ 's|^\#?(AllowSupplementaryGroups).*$$|\1 yes|' -e \ 's|^\#?(ScanMail).*$$|\1 yes|' -e \ 's|^\#?(DatabaseDirectory) .*$$|\1 ${_DBDIR}|' -e \ 's|^\#?(DatabaseOwner) .*$$|\1 ${_CLAMAVUSER}|' -e \ 's|^\#?(FixStaleSocket).*$$|\1 yes|' -e \ 's|^\#?(NotifyClamd) .*$$|\1 ${PREFIX}/etc/clamd.conf|' -e \ 's|^\#?(MilterSocket) */tmp.*$$|\1 ${_CLAMAV_MILTER_SOCKET}|' \ -e 's|^\#?(ClamdSocket).*$$|\1 unix:${_CLAMAV_CLAMD_SOCKET}|' post-patch: @${REINPLACE_CMD} ${_SED_CONF} \ ${WRKSRC}/etc/clamd.conf.sample \ ${WRKSRC}/etc/freshclam.conf.sample \ ${WRKSRC}/etc/clamav-milter.conf.sample post-install: ${INSTALL_DATA} ${INSTALL_WRKSRC}/clamav-config.h ${STAGEDIR}${PREFIX}/include @${MKDIR} ${STAGEDIR}${_DBDIR} \ ${STAGEDIR}${_LOGDIR} \ ${STAGEDIR}${_RUNDIR} post-install-DOCS-on: ${MV} ${STAGEDIR}${PREFIX}/share/doc/ClamAV ${STAGEDIR}${DOCSDIR} post-install-DOCS-off: ${RM} -r ${STAGEDIR}${PREFIX}/share/doc/ClamAV pre-test-TESTS-off: @${ECHO_MSG} '******************************************************************' && \ ${ECHO_MSG} '***** You need to enable TESTS option to execute `make test` *****' && \ ${ECHO_MSG} '******************************************************************' && \ ${FALSE} .include