From owner-svn-ports-head@freebsd.org Sat Jan 12 11:14:14 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 851A5148F0AC; Sat, 12 Jan 2019 11:14:14 +0000 (UTC) (envelope-from bofh@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 293B182E5B; Sat, 12 Jan 2019 11:14:14 +0000 (UTC) (envelope-from bofh@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 1C0E6273C; Sat, 12 Jan 2019 11:14:14 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0CBEDGf058032; Sat, 12 Jan 2019 11:14:13 GMT (envelope-from bofh@FreeBSD.org) Received: (from bofh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0CBED2A058029; Sat, 12 Jan 2019 11:14:13 GMT (envelope-from bofh@FreeBSD.org) Message-Id: <201901121114.x0CBED2A058029@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bofh set sender to bofh@FreeBSD.org using -f From: Muhammad Moinur Rahman Date: Sat, 12 Jan 2019 11:14:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490043 - in head/net-mgmt/librenms: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bofh X-SVN-Commit-Paths: in head/net-mgmt/librenms: . files X-SVN-Commit-Revision: 490043 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 293B182E5B 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.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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: Sat, 12 Jan 2019 11:14:14 -0000 Author: bofh Date: Sat Jan 12 11:14:13 2019 New Revision: 490043 URL: https://svnweb.freebsd.org/changeset/ports/490043 Log: net-mgmt/librenms: Update version 1.45=>1.47 PR: 234645 Submitted by: dvl Relnotes: https://github.com/librenms/librenms/releases Deleted: head/net-mgmt/librenms/files/patch-LibreNMS_Validations_Dependencies.php Modified: head/net-mgmt/librenms/Makefile head/net-mgmt/librenms/distinfo head/net-mgmt/librenms/files/patch-.env.example head/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php Modified: head/net-mgmt/librenms/Makefile ============================================================================== --- head/net-mgmt/librenms/Makefile Sat Jan 12 10:38:23 2019 (r490042) +++ head/net-mgmt/librenms/Makefile Sat Jan 12 11:14:13 2019 (r490043) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= librenms -PORTVERSION= 1.45 -PORTREVISION= 2 +PORTVERSION= 1.47 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -19,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= 1539772408 +RELEASE_TIMESTAMP= 1546180156 # perhaps we also need python-memcache python-mysqldb RUN_DEPENDS+= rrdtool:databases/rrdtool \ @@ -30,7 +29,7 @@ RUN_DEPENDS+= rrdtool:databases/rrdtool \ bash:shells/bash \ sudo:security/sudo -USE_PHP= ctype curl filter gd hash json ldap mbstring mysqli openssl pdo pdo_mysql posix session simplexml snmp tokenizer xml zip +USE_PHP= ctype curl filter gd hash json ldap mbstring mysqli openssl pdo pdo_mysql phar posix session simplexml snmp tokenizer xml zip USE_GITHUB= yes GH_ACCOUNT= librenms @@ -72,8 +71,7 @@ SHEBANG_FILES= scripts/auth_test.php scripts/deploy-do scripts/Migration/XML_Conversion/convert.sh \ scripts/Migration/XML_Conversion/destwork.sh \ scripts/Migration/XML_Conversion/mkdir.sh \ - scripts/removespikes.php scripts/agent-local/nfs-stats.sh \ - scripts/removespikes.pl scripts/watchmaillog/watchmaillog.pl \ + scripts/removespikes.pl scripts/removespikes.php scripts/watchmaillog/watchmaillog.pl \ poller.php poller-wrapper.py \ ../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/generate-includes.php \ ../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/flush-definition-cache.php \ @@ -128,16 +126,15 @@ NO_ARCH= yes APACHEMOD_USES= php:mod APACHEMOD_USES_OFF= php:web -APACHEMOD_USE= USES=apache:run,22+ post-patch: - ${REINPLACE_CMD} 's|%%PORTNAME%%|${PORTNAME}|g' ${WRKSRC}/config.php.default - ${REINPLACE_CMD} 's|%%WWW_USER%%|${WWW_USER}|g' ${WRKSRC}/config.php.default - ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/poller-wrapper.py ${WRKSRC}/poller.php - ${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/includes/common.php - ${REINPLACE_CMD} 's|%%RELEASE_TIMESTAMP%%|${RELEASE_TIMESTAMP}|g' ${WRKSRC}/includes/common.php - ${REINPLACE_CMD} -e 's|/opt/librenms|${WWWDIR}|' ${WRKSRC}/html/install.php - ${RM} ${WRKSRC}/LibreNMS/Validations/Updates.php + @${REINPLACE_CMD} 's|%%PORTNAME%%|${PORTNAME}|g' ${WRKSRC}/config.php.default + @${REINPLACE_CMD} 's|%%WWW_USER%%|${WWW_USER}|g' ${WRKSRC}/config.php.default + @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/poller-wrapper.py ${WRKSRC}/poller.php + @${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/includes/common.php + @${REINPLACE_CMD} 's|%%RELEASE_TIMESTAMP%%|${RELEASE_TIMESTAMP}|g' ${WRKSRC}/includes/common.php + @${REINPLACE_CMD} -e 's|/opt/librenms|${WWWDIR}|' ${WRKSRC}/html/install.php + @${RM} ${WRKSRC}/LibreNMS/Validations/Updates.php do-install: ${MKDIR} ${STAGEDIR}/${WWWDIR} Modified: head/net-mgmt/librenms/distinfo ============================================================================== --- head/net-mgmt/librenms/distinfo Sat Jan 12 10:38:23 2019 (r490042) +++ head/net-mgmt/librenms/distinfo Sat Jan 12 11:14:13 2019 (r490043) @@ -1,5 +1,5 @@ -TIMESTAMP = 1540995479 -SHA256 (librenms-vendor-1.45.tar.gz) = 2c67feacbb448591528870d4c55448f8bcb804bdb1845902cdb2dc1b9f4846f3 -SIZE (librenms-vendor-1.45.tar.gz) = 31718828 -SHA256 (librenms-librenms-1.45_GH0.tar.gz) = b3365bf88c40c0ee098edbf2b34510e737f357c483560f04926775c4dea9954d -SIZE (librenms-librenms-1.45_GH0.tar.gz) = 30880140 +TIMESTAMP = 1547281452 +SHA256 (librenms-vendor-1.47.tar.gz) = 582ef6422dde449791c93953905d00deefe1c7f09b65167acebb49cd1f56d8a5 +SIZE (librenms-vendor-1.47.tar.gz) = 31703568 +SHA256 (librenms-librenms-1.47_GH0.tar.gz) = cbd99253845f4a4c310b8705e9bac291e91a26701f89e67fc8e165b1c5a459e4 +SIZE (librenms-librenms-1.47_GH0.tar.gz) = 32387151 Modified: head/net-mgmt/librenms/files/patch-.env.example ============================================================================== --- head/net-mgmt/librenms/files/patch-.env.example Sat Jan 12 10:38:23 2019 (r490042) +++ head/net-mgmt/librenms/files/patch-.env.example Sat Jan 12 11:14:13 2019 (r490043) @@ -1,5 +1,5 @@ ---- .env.example.orig 2018-08-29 21:46:24.417728000 +0000 -+++ .env.example 2018-08-29 21:46:59.231222000 +0000 +--- .env.example.orig 2019-01-11 21:46:24 UTC ++++ .env.example @@ -1,8 +1,12 @@ APP_KEY= Modified: head/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php ============================================================================== --- head/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php Sat Jan 12 10:38:23 2019 (r490042) +++ head/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php Sat Jan 12 11:14:13 2019 (r490043) @@ -1,10 +1,9 @@ ---- LibreNMS/Util/FileLock.php.orig 2018-01-14 15:32:35 UTC +--- LibreNMS/Util/FileLock.php.orig 2018-12-30 14:29:16 UTC +++ LibreNMS/Util/FileLock.php -@@ -45,7 +45,7 @@ class FileLock implements Lock - global $config; +@@ -47,6 +47,7 @@ class FileLock implements Lock $this->name = $lock_name; -- $this->file = "$config[install_dir]/.$lock_name.lock"; + $this->file = "$install_dir/.$lock_name.lock"; + $this->file = "/tmp/.$lock_name.lock"; $this->handle = fopen($this->file, "w+"); }