Date: Tue, 6 Oct 2020 09:17:46 +0000 (UTC) From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551564 - in head: . sysutils/tenshi Message-ID: <202010060917.0969HkFl052960@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: 0mp Date: Tue Oct 6 09:17:46 2020 New Revision: 551564 URL: https://svnweb.freebsd.org/changeset/ports/551564 Log: sysutils/tenshi: Update to 0.17 - Assume maintainership - Drop coreutils from dependencies; tenshi works fine now with FreeBSD tail - Get tarballs from to GitHub; this is where upstream moved - Install configuration files in upstream default location Modified: head/GIDs head/UIDs head/UPDATING head/sysutils/tenshi/Makefile head/sysutils/tenshi/distinfo Modified: head/GIDs ============================================================================== --- head/GIDs Tue Oct 6 08:31:05 2020 (r551563) +++ head/GIDs Tue Oct 6 09:17:46 2020 (r551564) @@ -208,7 +208,7 @@ meta1:*:264: sshout:*:265: step:*:266: odoo:*:267: -# free: 268 +tenshi:*:268:tenshi # free: 269 _rpki-client:*:270: # free: 271 Modified: head/UIDs ============================================================================== --- head/UIDs Tue Oct 6 08:31:05 2020 (r551563) +++ head/UIDs Tue Oct 6 09:17:46 2020 (r551564) @@ -213,7 +213,7 @@ meta1:*:264:264::0:0:MeTA1 other:/nonexistent:/usr/sbi sshout:*:265:265::0:0:Secure Shout Host Oriented Unified Talk:/var/db/sshout:/usr/local/libexec/sshoutd step:*:266:266::0:0:Step CA:/nonexistent:/usr/sbin/nologin odoo:*:267:267::0:0:Odoo ERP:/nonexistent:/usr/sbin/nologin -# free: 268 +tenshi:*:268:268::0:0:Tenshi user:/var/lib/tenshi:/usr/sbin/nologin # free: 269 _rpki-client:*:270:270::0:0:rpki-client user:/nonexistent:/usr/sbin/nologin # free: 271 Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Oct 6 08:31:05 2020 (r551563) +++ head/UPDATING Tue Oct 6 09:17:46 2020 (r551564) @@ -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. +20201006: + AFFECTS: users of sysutils/tenshi + AUTHOR: 0mp@FreeBSD.org + + The default location for tenshi's configuration file has changed. It was + moved to /usr/local/etc/tenshi/tenshi.conf from /usr/local/etc/tenshi.conf + in order to follow upstream defaults. + 20201002: AFFECTS: users of mail/fetchmail beginning with 6.4.12_1 AUTHOR: mandree@FreeBSD.org Modified: head/sysutils/tenshi/Makefile ============================================================================== --- head/sysutils/tenshi/Makefile Tue Oct 6 08:31:05 2020 (r551563) +++ head/sysutils/tenshi/Makefile Tue Oct 6 09:17:46 2020 (r551564) @@ -2,50 +2,55 @@ # $FreeBSD$ PORTNAME= tenshi -PORTVERSION= 0.15 -PORTREVISION= 1 +PORTVERSION= 0.17 CATEGORIES= sysutils -MASTER_SITES= http://dev.inversepath.com/tenshi/ +PATCH_SITES= https://github.com/f-secure-foundry/tenshi/commit/ +PATCHFILES= 1c9c887.patch:-p1 \ + 50f7660.patch:-p1 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= 0mp@FreeBSD.org COMMENT= Log monitoring program, designed to watch multiple logs LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${LOCALBASE}/bin/gtail:sysutils/coreutils \ - p5-IO-BufferedSelect>=0:devel/p5-IO-BufferedSelect +RUN_DEPENDS= p5-IO-BufferedSelect>=0:devel/p5-IO-BufferedSelect -USES= perl5 -USE_PERL5= build patch run +USES= perl5 shebangfix +USE_GITHUB= yes +GH_ACCOUNT= f-secure-foundry +USE_PERL5= run USE_RC_SUBR= tenshi +SHEBANG_FILES= tenshi +MAKE_ARGS= bindir="${PREFIX}/sbin" \ + docdir="${DOCSDIR}" \ + mandir="${MAN8PREFIX}/share/man" \ + sysconfdir="${PREFIX}/etc" + NO_ARCH= yes NO_BUILD= yes -SUB_LIST= PERL=${PERL} +SUB_LIST= PERL="${PERL}" -PLIST_FILES= bin/tenshi \ - etc/tenshi.conf.sample \ +USERS= tenshi +GROUPS= tenshi + +PLIST_FILES= '@dir /var/lib' \ + '@dir(tenshi,tenshi,755) /var/lib/tenshi' \ + '@sample ${ETCDIR}/tenshi.conf.sample' \ + sbin/tenshi \ share/man/man8/tenshi.8.gz -PORTDOCS= Changelog README +PORTDOCS= Changelog README.md OPTIONS_DEFINE= DOCS post-patch: - @${PERL5} -pi.bak -e ' \ - s"/usr/bin/perl"${PERL}" if $$. == 1; \ - s"/etc/tenshi/tenshi\.conf"${PREFIX}/etc/tenshi.conf"; \ - s"/usr/bin/tail"${LOCALBASE}/bin/gtail"; \ - ' ${WRKSRC}/tenshi + @${REINPLACE_CMD} -e "s|/etc/tenshi/tenshi.conf|${ETCDIR}/tenshi.conf|" \ + ${WRKSRC}/tenshi -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/tenshi ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/tenshi.conf ${STAGEDIR}${PREFIX}/etc/tenshi.conf.sample - ${INSTALL_MAN} ${WRKSRC}/tenshi.8 ${STAGEDIR}${MAN8PREFIX}/share/man/man8 - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} +post-install: + @${RM} ${STAGEDIR}${DOCSDIR}/LICENSE + @(cd ${STAGEDIR}${ETCDIR} && ${MV} tenshi.conf tenshi.conf.sample) .include <bsd.port.mk> Modified: head/sysutils/tenshi/distinfo ============================================================================== --- head/sysutils/tenshi/distinfo Tue Oct 6 08:31:05 2020 (r551563) +++ head/sysutils/tenshi/distinfo Tue Oct 6 09:17:46 2020 (r551564) @@ -1,2 +1,7 @@ -SHA256 (tenshi-0.15.tar.gz) = 4f875db168ca53249c521ac0b5a1e2b7498613bc3ac2a23de85638e44d0006a7 -SIZE (tenshi-0.15.tar.gz) = 28405 +TIMESTAMP = 1601974143 +SHA256 (f-secure-foundry-tenshi-0.17_GH0.tar.gz) = 9b7e72b6496e2f6abd77d1dd3c4c6b77bdce61ca5531f9f1c62376b020904db7 +SIZE (f-secure-foundry-tenshi-0.17_GH0.tar.gz) = 24597 +SHA256 (1c9c887.patch) = 1787a7a45244c2c725e53022138bacc7fc304026a7060aa4c6d32fe088d5f4a3 +SIZE (1c9c887.patch) = 1187 +SHA256 (50f7660.patch) = fcd3a1f476f65a4e4b595b5330aed8aeec9e437ba82ed8edbbdcc6ee72f4a169 +SIZE (50f7660.patch) = 1457
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010060917.0969HkFl052960>