From owner-svn-ports-head@freebsd.org Wed Sep 11 17:53:25 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2DCEEDB00C; Wed, 11 Sep 2019 17:53:25 +0000 (UTC) (envelope-from netchild@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 46T8dd0S0xz4DDr; Wed, 11 Sep 2019 17:53:25 +0000 (UTC) (envelope-from netchild@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 E6FE5A22B; Wed, 11 Sep 2019 17:53:24 +0000 (UTC) (envelope-from netchild@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8BHrOiN026142; Wed, 11 Sep 2019 17:53:24 GMT (envelope-from netchild@FreeBSD.org) Received: (from netchild@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8BHrOPm026138; Wed, 11 Sep 2019 17:53:24 GMT (envelope-from netchild@FreeBSD.org) Message-Id: <201909111753.x8BHrOPm026138@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: netchild set sender to netchild@FreeBSD.org using -f From: Alexander Leidinger Date: Wed, 11 Sep 2019 17:53:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511830 - in head: . security/bastillion security/bastillion/files X-SVN-Group: ports-head X-SVN-Commit-Author: netchild X-SVN-Commit-Paths: in head: . security/bastillion security/bastillion/files X-SVN-Commit-Revision: 511830 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Wed, 11 Sep 2019 17:53:25 -0000 Author: netchild Date: Wed Sep 11 17:53:23 2019 New Revision: 511830 URL: https://svnweb.freebsd.org/changeset/ports/511830 Log: - Add update tool. - Add update instructions (datastore needs to be updated). - Convert pkg-message to UCL format. - Rework plist generation target. Modified: head/UPDATING head/security/bastillion/Makefile head/security/bastillion/files/pkg-message.in head/security/bastillion/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Sep 11 16:51:55 2019 (r511829) +++ head/UPDATING Wed Sep 11 17:53:23 2019 (r511830) @@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20190911: + AFFECTS: users of security/bastillion + AUTHOR: netchild@FreeBSD.org + + The datastore of bastillion needs to be updated: + java -jar $PREFIX/jetty_bastillion/upgrade/bastillion-upgrade-3.08.00.jar \ + $PREFIX/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties + 20190909: AFFECTS: users of lang/ruby25 AUTHOR: mfechner@FreeBSD.org Modified: head/security/bastillion/Makefile ============================================================================== --- head/security/bastillion/Makefile Wed Sep 11 16:51:55 2019 (r511829) +++ head/security/bastillion/Makefile Wed Sep 11 17:53:23 2019 (r511830) @@ -3,7 +3,9 @@ PORTNAME= bastillion DISTVERSIONPREFIX= jetty-v DISTVERSION= 3.08_00 -PORTREVISION= 1 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + ${PORTNAME}-upgrade-${PORTVERSION}.jar +PORTREVISION= 2 CATEGORIES= security www java MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/ @@ -65,20 +67,21 @@ do-install: ${MKDIR} ${STAGEDIR}/var/log/${PORTNAME} ${MKDIR} ${STAGEDIR}/var/run/${PORTNAME} cd ${WRKSRC}; ${COPYTREE_BIN} jetty_bastillion ${STAGEDIR}${PREFIX} "! -name *\.orig" + ${MKDIR} ${STAGEDIR}${PREFIX}/jetty_bastillion/upgrade cd ${WRKSRC}; ${COPYTREE_SHARE} webapps ${STAGEDIR}${PREFIX}/${WWWDIR} "! -name *\.orig" cd ${WRKSRC}; ${COPYTREE_SHARE} etc ${STAGEDIR}${PREFIX}/${WWWDIR} "! -name *\.orig" ${RLN} ${STAGEDIR}${PREFIX}/${WWWDIR}/etc ${STAGEDIR}${PREFIX}/jetty_bastillion/etc ${INSTALL_DATA} ${WRKSRC}/start.ini ${STAGEDIR}${PREFIX}/${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${PREFIX}/${WWWDIR} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.sample ${STAGEDIR}${ETCDIR}/ + ${INSTALL_DATA} ${DISTDIR}/bastillion-upgrade-3.08.00.jar ${STAGEDIR}${PREFIX}/jetty_bastillion/upgrade/ gen-plist: ${ECHO} '@sample %%ETCDIR%%/%%APP_NAME%%.sample' >${PLIST}.new ${ECHO} '@sample(www,www,644) jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties.sample' >> ${PLIST}.new ${ECHO} '@dir(www,www,755) /var/log/%%APP_NAME%%' >> ${PLIST}.new ${ECHO} '@dir(www,www,755) /var/run/%%APP_NAME%%' >> ${PLIST}.new - ${FIND} ${WRKSRC}/jetty_bastillion -type f -a ! -name \*.orig | ${SED} -e "s:${WRKSRC}/::g" | ${SORT} >> ${PLIST}.new -# ${REINPLACE_CMD} 's:jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties$$:@(www,www,644) jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties:g' ${PLIST}.new + ${FIND} ${STAGEDIR}${PREFIX}/jetty_bastillion -type f -a ! -name \*.orig -a ! -name \*.sample | ${SED} -e "s:${STAGEDIR}${PREFIX}/::g" | ${SORT} >> ${PLIST}.new ${ECHO} '@dir(www,www,755) jetty_bastillion/bastillion/WEB-INF/classes' >> ${PLIST}.new ${ECHO} '@dir(www,www,755) %%WWWDIR%%' >> ${PLIST}.new ${ECHO} '@dir(www,www,755) %%WWWDIR%%/work' >> ${PLIST}.new @@ -86,8 +89,8 @@ gen-plist: ${ECHO} '%%WWWDIR%%/3rdPartyLicenses.md' >> ${PLIST}.new ${ECHO} '%%WWWDIR%%/LICENSE.md' >> ${PLIST}.new ${ECHO} '%%WWWDIR%%/README.md' >> ${PLIST}.new - ${FIND} ${WRKSRC}/webapps -type f -a ! -name \*.orig | ${SED} -e "s:${WRKSRC}/webapps:%%WWWDIR%%/webapps:g" | ${SORT} >> ${PLIST}.new - ${FIND} ${WRKSRC}/etc -type f -a ! -name \*.orig | ${SED} -e "s:${WRKSRC}/etc:%%WWWDIR%%/etc:g" | ${SORT} >> ${PLIST}.new + ${FIND} ${STAGEDIR}${PREFIX}/${WWWDIR}/webapps -type f -a ! -name \*.orig | ${SED} -e "s:${STAGEDIR}${PREFIX}/${WWWDIR}:%%WWWDIR%%:g" | ${SORT} >> ${PLIST}.new + ${FIND} ${STAGEDIR}${PREFIX}/${WWWDIR}/etc -type f -a ! -name \*.orig | ${SED} -e "s:${STAGEDIR}${PREFIX}/${WWWDIR}:%%WWWDIR%%:g" | ${SORT} >> ${PLIST}.new ${ECHO} 'jetty_bastillion/etc' >> ${PLIST}.new .include Modified: head/security/bastillion/files/pkg-message.in ============================================================================== --- head/security/bastillion/files/pkg-message.in Wed Sep 11 16:51:55 2019 (r511829) +++ head/security/bastillion/files/pkg-message.in Wed Sep 11 17:53:23 2019 (r511830) @@ -1,3 +1,6 @@ +[ +{ + message: <:8443/. - +EOT +} +{ + type: upgrade + maximum_version: "3.08.00" + message: <