From owner-svn-ports-head@freebsd.org Tue Feb 26 08:56:32 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 7F58B151197C; Tue, 26 Feb 2019 08:56:32 +0000 (UTC) (envelope-from tobik@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 22948738FB; Tue, 26 Feb 2019 08:56:32 +0000 (UTC) (envelope-from tobik@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 ECD1C2A3E; Tue, 26 Feb 2019 08:56:31 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1Q8uVZq082454; Tue, 26 Feb 2019 08:56:31 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1Q8uV3E082453; Tue, 26 Feb 2019 08:56:31 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201902260856.x1Q8uV3E082453@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 26 Feb 2019 08:56:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493951 - head/net-mgmt/nagiosql X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/net-mgmt/nagiosql X-SVN-Commit-Revision: 493951 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 22948738FB X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.975,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: Tue, 26 Feb 2019 08:56:32 -0000 Author: tobik Date: Tue Feb 26 08:56:31 2019 New Revision: 493951 URL: https://svnweb.freebsd.org/changeset/ports/493951 Log: net-mgmt/nagiosql: Remove redundant regex escapes nagiosql's Makefile currently has some redundant escaping of single quotes in its Makefile. These get passed through as escaped single quotes to regex(3), which is an escape of an ordinary character. Such escapes will be forbidden in a future version of regex(3), so we'll get ahead of the game and remove said escapes now. While here, there are two questionable expressions: -e "s|\>/etc/nagiosql|\>${ETCDIR}|g" and the one immediately following it. \> is a word delimiter (see reformat(7)), and will only match as such. If this were to match, it would replace /etc/nagiosql with >${ETCDIR} -- this likely works as intended now, but I think it was intended that it matches a literal >/etc/nagiosql, so the included patch treats it accordingly. - While here reset MAINTAINER after a timeout of 3 months and repeated previous timeouts PR: 233458 Submitted by: kevans Approved by: chris@smartt.com (maintainer timeout, 3 months) Modified: head/net-mgmt/nagiosql/Makefile Modified: head/net-mgmt/nagiosql/Makefile ============================================================================== --- head/net-mgmt/nagiosql/Makefile Tue Feb 26 08:47:42 2019 (r493950) +++ head/net-mgmt/nagiosql/Makefile Tue Feb 26 08:56:31 2019 (r493951) @@ -3,6 +3,7 @@ PORTNAME= nagiosql PORTVERSION= 3.4.0 +PORTREVISION= 1 CATEGORIES= net-mgmt www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/NagiosQL%20${PORTVERSION}/ @@ -37,15 +38,15 @@ CURL_USE= PHP=curl FTP_USE= PHP=ftp post-patch: - ${REINPLACE_CMD} -e "s|\'/etc/nagiosql/|\'${ETCDIR}/|g" \ + ${REINPLACE_CMD} -e "s|'/etc/nagiosql/|'${ETCDIR}/|g" \ -e "s|/opt/nagios/etc/objects/|${LOCALBASE}/etc/nagios/objects/|" \ -e "s|/opt/nagios/bin/nagios|${LOCALBASE}/bin/nagios|" \ -e "s|/var/nagios/nagios.lock|/var/spool/nagios/nagios.lock|" \ -e "s|/var/nagios/rw/nagios.cmd|/var/spool/nagios/rw/nagios.cmd|" \ -e "s|nagios/etc/|etc/nagios/|" \ -e "s|nagiosql/etc/|${ETCDIR}/|" \ - -e "s|\>/etc/nagiosql|\>${ETCDIR}|g" \ - -e "s|\>/etc/nagios/|\>${LOCALBASE}/etc/nagios/|g" \ + -e "s|>/etc/nagiosql|>${ETCDIR}|g" \ + -e "s|>/etc/nagios/|>${LOCALBASE}/etc/nagios/|g" \ ${WRKSRC}-${PORTVERSION}/install/sql/nagiosQL_v32_db_mysql.sql ${REINPLACE_CMD} -e "s|\"/etc/|\"${LOCALBASE}/etc/|" \