From owner-svn-ports-head@freebsd.org Sun May 12 01:02:57 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6F8B915AC14A; Sun, 12 May 2019 01:02:57 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 18E4681B48; Sun, 12 May 2019 01:02:57 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E4E67236FD; Sun, 12 May 2019 01:02:56 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4C12ucM021159; Sun, 12 May 2019 01:02:56 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4C12ujb021157; Sun, 12 May 2019 01:02:56 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <201905120102.x4C12ujb021157@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Sun, 12 May 2019 01:02:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501353 - in head/net-mgmt/librenms: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dvl X-SVN-Commit-Paths: in head/net-mgmt/librenms: . files X-SVN-Commit-Revision: 501353 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 18E4681B48 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2019 01:02:57 -0000 Author: dvl Date: Sun May 12 01:02:56 2019 New Revision: 501353 URL: https://svnweb.freebsd.org/changeset/ports/501353 Log: Upgrade to 1.51 https://github.com/librenms/librenms/releases/tag/1.51 Modified: head/net-mgmt/librenms/Makefile head/net-mgmt/librenms/distinfo head/net-mgmt/librenms/files/patch-html_install.php Modified: head/net-mgmt/librenms/Makefile ============================================================================== --- head/net-mgmt/librenms/Makefile Sun May 12 01:01:33 2019 (r501352) +++ head/net-mgmt/librenms/Makefile Sun May 12 01:02:56 2019 (r501353) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= librenms -PORTVERSION= 1.50 +PORTVERSION= 1.51 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -18,7 +18,7 @@ USES= python${PY_MYSQL} shebangfix # RELEASE_TIMESTAMP is used for a patch inside the vendor code # it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01 # It sits here so you remember to update it with each release -RELEASE_TIMESTAMP= 1554090241 +RELEASE_TIMESTAMP= 1556573781 # perhaps we also need python-memcache python-mysqldb RUN_DEPENDS+= rrdtool:databases/rrdtool \ @@ -96,12 +96,14 @@ SUB_LIST+= PHP="${PHPBASE}/bin/php" PYTHON=${PYTHON_CM ROOT_FILES= .env.example addhost.php adduser.php alerts.php artisan billing-calculate.php \ build-base.php build.sql check-services.php composer.json \ - composer.lock config.php.default config_to_json.php cronic daily.php daily.sh \ - delhost.php discovery-wrapper.py discovery.php dist-pollers.php irc.php lnms \ + composer.lock config.php.default config_to_json.php cronic daily.php \ + delhost.php discovery-wrapper.py discovery.php dist-pollers.php irc.php \ librenms-service.py mkdocs.yml pbin.sh phpunit.xml ping.php poll-billing.php poller.php poller-service.py \ poller-wrapper.py readmegen.yml renamehost.php services-wrapper.py snmp-scan.py \ snmptrap.php syslog.php validate.php +SCRIPT_FILES= daily.sh lnms + ROOT_DIRS= LibreNMS app bootstrap config contrib database doc html includes licenses logs mibs misc resources routes scripts sql-schema storage tests # these are directories which require a generic @DIR entry in pkg-plist @@ -149,12 +151,15 @@ do-install: .for f in ${ROOT_FILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR} .endfor +.for f in ${SCRIPT_FILES} + ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR} +.endfor ${MKDIR} ${STAGEDIR}/${WWWDIR}/vendor (cd ${WRKDIR}/${PORTNAME}-vendor-${PORTVERSION} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/vendor) # Make daily.sh executable - ${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/daily.sh +# ${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/daily.sh # lnms does not fall into any other +x category - ${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/lnms +# ${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/lnms # Files in scripts dir should be executable ${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \; # Ensure PHP and Python scripts are executable @@ -180,9 +185,11 @@ do-install-EXAMPLES-on: post-install: @${FIND} -s ${STAGEDIR}${WWWDIR} -type f '(' -name '*.orig' -or -name '*.bak' -or -name '.gitignore' ')' -delete @${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ - ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} + ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} @${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/logs" >> ${TMPPLIST} @${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/bootstrap/cache" >> ${TMPPLIST} +# @${ECHO_CMD} "@(www,www,0775) ${WWWDIR}/daily.sh" >> ${TMPPLIST} +# @${ECHO_CMD} "@(www,www,0775) ${WWWDIR}/lnms" >> ${TMPPLIST} @${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/storage" >> ${TMPPLIST} @${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/storage/framework/cache" >> ${TMPPLIST} @${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/storage/framework/sessions" >> ${TMPPLIST} Modified: head/net-mgmt/librenms/distinfo ============================================================================== --- head/net-mgmt/librenms/distinfo Sun May 12 01:01:33 2019 (r501352) +++ head/net-mgmt/librenms/distinfo Sun May 12 01:02:56 2019 (r501353) @@ -1,5 +1,5 @@ -TIMESTAMP = 1554405883 -SHA256 (librenms-vendor-1.50.tar.gz) = 5a86e35a93151956cb3ba8f01a76e360bdd5e80a7a80807879b1b781d18aaa03 -SIZE (librenms-vendor-1.50.tar.gz) = 32638908 -SHA256 (librenms-librenms-1.50_GH0.tar.gz) = 6b6f1b3300fabf062cfc20efc68faabd071786e6c2039c4dc2e9cd05fa3c1d86 -SIZE (librenms-librenms-1.50_GH0.tar.gz) = 35986338 +TIMESTAMP = 1556824503 +SHA256 (librenms-vendor-1.51.tar.gz) = 03e19ead3b20e8b7e820b4b8264f2d387cc132748bf71e510266b922b75e54b6 +SIZE (librenms-vendor-1.51.tar.gz) = 32641978 +SHA256 (librenms-librenms-1.51_GH0.tar.gz) = fc04635d1e86af776b5ad8c0936f54b6071e791293a88a5942cf0e23f2daffef +SIZE (librenms-librenms-1.51_GH0.tar.gz) = 36806669 Modified: head/net-mgmt/librenms/files/patch-html_install.php ============================================================================== --- head/net-mgmt/librenms/files/patch-html_install.php Sun May 12 01:01:33 2019 (r501352) +++ head/net-mgmt/librenms/files/patch-html_install.php Sun May 12 01:02:56 2019 (r501353) @@ -1,6 +1,6 @@ ---- html/install.php.orig 2018-10-17 10:33:28 UTC +--- html/install.php.orig 2019-05-12 00:03:11 UTC +++ html/install.php -@@ -358,7 +358,7 @@ $config_file = <<<"EOD" +@@ -362,7 +362,7 @@ $config_file = <<<"EOD" // This is the user LibreNMS will run as //Please ensure this user is created and has the correct permissions to your install @@ -9,18 +9,16 @@ ### Locations - it is recommended to keep the default #\$config\['install_dir'\] = "$install_dir"; -@@ -384,15 +384,15 @@ $config_file = <<<"EOD" - #\$config\['nets'\]\[\] = "192.168.0.0/16"; +@@ -389,14 +389,14 @@ $config_file = <<<"EOD" # Update configuration --#\$config\['update_channel'\] = 'release'; # uncomment to follow the monthly release channel + #\$config\['update_channel'\] = 'release'; # uncomment to follow the monthly release channel -#\$config\['update'\] = 0; # uncomment to completely disable updates -+\$config\['update_channel'\] = 'release'; # uncomment to follow the monthly release channel +\$config\['update'\] = 0; # uncomment to completely disable updates EOD; - if (!file_exists("../config.php")) { - $conf = fopen("../config.php", 'w'); + if (!file_exists("config.php")) { + $conf = fopen("config.php", 'w'); if ($conf != false) { if (fwrite($conf, "We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /opt/librenms/)"); @@ -28,7 +26,7 @@ echo("
<?php\n".stripslashes($config_file)."
"); } else { $config_file = stripslashes($config_file); -@@ -400,7 +400,7 @@ if (!file_exists("../config.php")) { +@@ -404,7 +404,7 @@ if (!file_exists("config.php")) { echo("
The config file has been created
"); } } else {