From nobody Wed Apr 29 02:26:50 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g51Qf5MVLz6cRLp for ; Wed, 29 Apr 2026 02:26:50 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g51Qf4144z3wj7 for ; Wed, 29 Apr 2026 02:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777429610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zyBgHYBp0CmYEO0f7bC9EEbR2sqd42JPZhlpgVZrE2c=; b=NxedF7nPQVcJbnhpSZGkbl4309g+WsEzYwDbm0RVrLAKeKkf5T6DDEitd2iZ4lf0mWZm6I 1G3rceLgqquXZdM69EtfELV64kwn19nr0tkoBvfzwQJbm0Lmr5xL9UWXe6ppycJXXBPX0+ 08wlsBVJcRNz1FJTIa4N1KNkvFFE5p3WUMDnh1VdV11gVbD3fGNAnNwfGw7UppQfh/VQma A70ya48MADeotxK1lsYKhB9m6s1tJmeFPo18/U3SoxH8l9IRsUk+UByiaoOwDSqrPv6TCf QaQgYfqxdgTThHDTaWa91qmt1AIJTvW1yEIrd4A/vOdQSe87/zpBltR8V5DM6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777429610; a=rsa-sha256; cv=none; b=XWuHSNSrCnlXzW892kJqB8fKfPNwBpn02H8ATaQ7cepd0OId1pFZiXHaGOItAsr3lYUg1U c5weOGuSKLf1xr4GvzIco87qA3t0rzRbrU+0lG4bN41VVMrz8pvnYfimAg2fIyEfem+zJX sq/zb1mtMd3gwqizRfRpP6OD8rfS1rBv3oJBb3cBEo0ebx2XFvyWFgbSDMFyFgSCeL7pcA +crvNwheqyIUcyCC67kcwFfvz+bbEepFfcFRHXOrGOXgdxzSOT7l2TbCMoxn6AF5GdOIR8 qwOprUiCyg64IIldsvWgvoawZ8MuYAIx9eDN30/5Gu3st7Wxy2WDXOyCyV5YJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777429610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zyBgHYBp0CmYEO0f7bC9EEbR2sqd42JPZhlpgVZrE2c=; b=d3J4EpQ3mAy0g1czenPjXCg/9U4tpiISJtyix1hlUENINyE4IIBs/ElhoVX+xwQ5it9pye FquiNU93CgT+1PmWHM2APwD+zYXvTNhcZTOKsuzSVclLw4deait6DMpquIrkIsDXHB768F SFsaI3AoRVyz9cwE7QLA0VE+LJPWZ0KowoBD3AIT8BnxtN4fmlw+fp0I3UqASlULRxl+KJ X8e9owYOtSojNm30JCe2WJmdnSxhQbAYoLGFhJrJgfnZg5lWH5fvaaGBo6Df39LVzycJO9 K9GaXc4yXgswxMdJGGWA7UdqeaTvu5t02AomdHZc8oX2rtB+UrWAN69oav1WXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g51Qf3Br6z5VV for ; Wed, 29 Apr 2026 02:26:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e608 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 02:26:50 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: e6ca093236cd - main - news/cleanfeed: Clean up the port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6ca093236cdb74c1399b5284f11bc0d08d5cc70 Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 02:26:50 +0000 Message-Id: <69f16c6a.3e608.5a535c22@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6ca093236cdb74c1399b5284f11bc0d08d5cc70 commit e6ca093236cdb74c1399b5284f11bc0d08d5cc70 Author: Kevin Bowling AuthorDate: 2026-04-29 02:24:39 +0000 Commit: Kevin Bowling CommitDate: 2026-04-29 02:26:36 +0000 news/cleanfeed: Clean up the port - Use plist to handle ownerships and installation to filter_innd.pl - Install bad_ files as sample so the admin can edit them --- news/cleanfeed/Makefile | 37 +++++++++++++++++-------------------- news/cleanfeed/pkg-install | 26 -------------------------- news/cleanfeed/pkg-plist | 25 +++++++++++++++---------- 3 files changed, 32 insertions(+), 56 deletions(-) diff --git a/news/cleanfeed/Makefile b/news/cleanfeed/Makefile index 1e2f8330740b..2fc351703c1f 100644 --- a/news/cleanfeed/Makefile +++ b/news/cleanfeed/Makefile @@ -1,47 +1,44 @@ PORTNAME= cleanfeed DISTVERSION= 20200402 +PORTREVISION= 1 CATEGORIES= news -USE_GITHUB= yes -GH_ACCOUNT= crooks -GH_TAGNAME= dd177d4a3b6ea2e538da17bbb2a74772cea4a49a - MAINTAINER= kbowling@FreeBSD.org COMMENT= Spam filter for Usenet news servers WWW= https://github.com/crooks/cleanfeed +LICENSE= ART10 + FLAVORS= inn inncurrent FLAVOR?= ${FLAVORS:[1]} -inn_CONFLICTS_INSTALL= cleanfeed-current inn_RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:news/inn +inn_CONFLICTS_INSTALL= cleanfeed-current inncurrent_PKGNAMESUFFIX= -current -inncurrent_CONFLICTS_INSTALL= cleanfeed inncurrent_RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:news/inn-current +inncurrent_CONFLICTS_INSTALL= cleanfeed + +USES= perl5 +USE_GITHUB= yes +GH_ACCOUNT= crooks +GH_TAGNAME= dd177d4a3b6ea2e538da17bbb2a74772cea4a49a NO_ARCH= yes NO_BUILD= yes -USES= perl5 -BINOWN= news -BINGRP= news -SHAREOWN= news -SHAREGRP= news -INSTALL+= -b -PKGDEINSTALL= ${PKGINSTALL} post-patch: @${REINPLACE_CMD} -e "/debug_batch_directory/s:'.*':'/var/log/cleanfeed':" ${WRKSRC}/samples/cleanfeed.local do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/news/cleanfeed/etc + ${MKDIR} ${STAGEDIR}${PREFIX}/news/cleanfeed/etc .for f in bad_adult_paths bad_body bad_cancel_paths bad_from bad_groups \ - bad_hosts bad_paths bad_subject bad_url - @${INSTALL_DATA} ${WRKSRC}/samples/${f} ${STAGEDIR}${PREFIX}/news/cleanfeed/etc + bad_hosts bad_paths bad_subject bad_url cleanfeed.local + ${INSTALL_DATA} ${WRKSRC}/samples/${f} \ + ${STAGEDIR}${PREFIX}/news/cleanfeed/etc/${f}.sample .endfor - @${INSTALL_DATA} ${WRKSRC}/samples/cleanfeed.local \ - ${STAGEDIR}${PREFIX}/news/cleanfeed/etc/cleanfeed.local.sample - @${MKDIR} ${STAGEDIR}${PREFIX}/news/bin/filter - @${INSTALL_DATA} ${WRKSRC}/cleanfeed ${STAGEDIR}${PREFIX}/news/bin/filter + ${MKDIR} ${STAGEDIR}${PREFIX}/news/bin/filter + ${INSTALL_DATA} ${WRKSRC}/cleanfeed ${STAGEDIR}${PREFIX}/news/bin/filter + ${MKDIR} ${STAGEDIR}/var/log/cleanfeed .include diff --git a/news/cleanfeed/pkg-install b/news/cleanfeed/pkg-install deleted file mode 100644 index b86daaaa90b9..000000000000 --- a/news/cleanfeed/pkg-install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -PKGNAME=$1 -[ ! -n "${PKG_PREFIX}" ] && exit 1 - -CONFFILE="${PKG_PREFIX}/news/cleanfeed/etc/cleanfeed.local" - -case $2 in - POST-INSTALL) - cd ${PKG_PREFIX}/news/bin/filter \ - && mv filter_innd.pl filter_innd.pl.orig \ - && ln -s cleanfeed filter_innd.pl - mkdir -p /var/log/cleanfeed - chown news:news /var/log/cleanfeed - test -f ${CONFFILE} || cp -p ${CONFFILE}.sample ${CONFFILE} - ;; - DEINSTALL) - cmp -s ${CONFFILE}.sample ${CONFFILE} && rm -f ${CONFFILE} - ;; - POST-DEINSTALL) - cd ${PKG_PREFIX}/news/bin/filter \ - && mv filter_innd.pl.orig filter_innd.pl - rmdir /var/log/cleanfeed - ;; -esac -exit 0 diff --git a/news/cleanfeed/pkg-plist b/news/cleanfeed/pkg-plist index f3193c74f89a..a9a32ab3bfce 100644 --- a/news/cleanfeed/pkg-plist +++ b/news/cleanfeed/pkg-plist @@ -1,11 +1,16 @@ +@owner news +@group news news/bin/filter/cleanfeed -news/cleanfeed/etc/bad_adult_paths -news/cleanfeed/etc/bad_body -news/cleanfeed/etc/bad_cancel_paths -news/cleanfeed/etc/bad_from -news/cleanfeed/etc/bad_groups -news/cleanfeed/etc/bad_hosts -news/cleanfeed/etc/bad_paths -news/cleanfeed/etc/bad_subject -news/cleanfeed/etc/bad_url -news/cleanfeed/etc/cleanfeed.local.sample +@sample news/cleanfeed/etc/bad_adult_paths.sample +@sample news/cleanfeed/etc/bad_body.sample +@sample news/cleanfeed/etc/bad_cancel_paths.sample +@sample news/cleanfeed/etc/bad_from.sample +@sample news/cleanfeed/etc/bad_groups.sample +@sample news/cleanfeed/etc/bad_hosts.sample +@sample news/cleanfeed/etc/bad_paths.sample +@sample news/cleanfeed/etc/bad_subject.sample +@sample news/cleanfeed/etc/bad_url.sample +@sample news/cleanfeed/etc/cleanfeed.local.sample +@dir(news,news,) /var/log/cleanfeed +@postexec ln -sf cleanfeed %D/news/bin/filter/filter_innd.pl +@preunexec cp -pf %D/news/bin/filter/filter_innd.pl.sample %D/news/bin/filter/filter_innd.pl 2>/dev/null || true