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=qeXWJwq7N6N+8IVcsAx4Bbxjlah3KoTynz9RqsuUFiI=; b=b+wJGPR0PyrILVOvkPXBIsGf4//NlWFU5RM6U6faCSCjcnteNw4Y42gSMNtrnAVSFSGYhR AwzXyhbOOU8pckzBdnOPDzwxD7Fq7vpqfQi/GnvIlhLIu3gpJGI7PzhhlC/xQu2EVUChPL 6o3Ax+XDuf7AcGSeQlUB/umSHa5e6vPBbAji+3dQWnSKjyGFWuxzu7N6tXxiRf71whF/Tl VeZFgfXfcdLbGeQReC0imFEgNomrbiDlM1GPCCevwH9VwGLW0oxFEz0eCqv9YTadX1kIhB QSk/cNaGtF74KVY60UmuEOVC1WjRSpOynZ7cK7PzkZGs2WyypkGOgorfDzKCkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753785282; 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=qeXWJwq7N6N+8IVcsAx4Bbxjlah3KoTynz9RqsuUFiI=; b=QWANxd/+nhrdzWP3Mx6VxJpkJXC1j5mAfRosH5BXfNTeEE7Uh+OUjuZ8w1PPMgmEc/CqSb 8bRbaS41nP1dp3btG6sch2sobSw9DTCn3YF9Cbd8StGjROs/sNuIw1h3QVXqYCi8XmBCM/ pLMaC9O9NGEVmWtF6H5vUMCAEFDmRLklIBmcHHuCns9s8f43sbe2O6r9pEurd1kED2fcbP 1jn7nvmyXqYed6T+bzT7t6OrfO1ta6gC1GByoSG8pLLdl+z0SajEmzedEwfz/pGtqaKzKj iRG1xy3xxLXBZoW2S1wH0yOq7YhkZ7G3KX/Bbqzd+UsWhMwas2Wld43frKYM1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753785282; a=rsa-sha256; cv=none; b=bi80rkHjRQ7Ekex3hRzyNlKpFc/fHFUaezdbsD2bongjoaNhw4nGVxIQVfveHNIj4R33RB yr3ncdl8sLlUo3nzxv1Cs77VVH2+pI3gSs9ONNtS2liYKqCHek600OQriPs6oEBojk+kLF O2Y4iNjX6DgtO1hYBvIYgbhnUlp6GEtaC0Jo8JlZ+Ka8Irw+Fag9028uFYuxNXWUvo4A0g uhak09bEAmqjGVVAIaozTTMa23rUkt9BtXfM0Y9zwWyRS1kQi6qS3s/LhYnqQz+BtLAu5l NI0P2O8cfnxC9aO2jqLWYkRfKIJEAZ8606Z/Luh3Lj2NQ7AV6JX1M2JKdJ7vKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4brsD16nBJzC4C; Tue, 29 Jul 2025 10:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56TAYfgm085250; Tue, 29 Jul 2025 10:34:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56TAYf4a085247; Tue, 29 Jul 2025 10:34:41 GMT (envelope-from git) Date: Tue, 29 Jul 2025 10:34:41 GMT Message-Id: <202507291034.56TAYf4a085247@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 785d62cc22d1 - main - mail/simscan: Update 1.4.0 => 1.4.6.2, set maintainer 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 785d62cc22d10205d1a8ff4830b1cd39d2ce2ad5 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=785d62cc22d10205d1a8ff4830b1cd39d2ce2ad5 commit 785d62cc22d10205d1a8ff4830b1cd39d2ce2ad5 Author: Vladimir Druzenko AuthorDate: 2025-07-29 10:30:43 +0000 Commit: Vladimir Druzenko CommitDate: 2025-07-29 10:34:34 +0000 mail/simscan: Update 1.4.0 => 1.4.6.2, set maintainer Upstream changed: https://notes.sagredo.eu/en/qmail-notes-185/installing-and-configuring-simscan-38.html Changelogs: https://github.com/sagredo-dev/simscan/blob/v1.4.6.2/ChangeLog Improve port: - Fix USERS/GROUPS. - Fix dirs permissions in pkg-plist. - Fix warnings from portclippy. - Remove upstreamed patch. PR: 287915 Co-authored-by: Bedreddin Sahbaz (new maintainer) MFH: 2025Q3 --- mail/simscan/Makefile | 120 +++++++++++++++---------------- mail/simscan/distinfo | 5 +- mail/simscan/files/patch-fix_clamav_0.93 | 107 --------------------------- mail/simscan/pkg-plist | 10 +-- 4 files changed, 68 insertions(+), 174 deletions(-) diff --git a/mail/simscan/Makefile b/mail/simscan/Makefile index c4b641232cc6..f06122ccb6c9 100644 --- a/mail/simscan/Makefile +++ b/mail/simscan/Makefile @@ -1,93 +1,93 @@ PORTNAME= simscan -PORTVERSION= 1.4.0 -PORTREVISION= 9 +DISTVERSIONPREFIX= v +DISTVERSION= 1.4.6.2 CATEGORIES= mail security -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bedreddinsahbaz@gmail.com COMMENT= Fast Content/Anti-virus Scanner for qmail Written in C -WWW= https://www.inter7.com/?page=simscan +WWW= https://notes.sagredo.eu/en/qmail-notes-185/installing-and-configuring-simscan-38.html + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE USES= qmail:build +USE_GITHUB= yes +GH_ACCOUNT= sagredo-dev GNU_CONFIGURE= yes - -USERS= ${PORTNAME} -GROUPS= ${USERS} - WORKDIR?= ${QMAIL_PREFIX}/${PORTNAME} QMAIL_QUEUE= ${QMAIL_PREFIX}/bin/qmail-queue - -SUB_FILES= pkg-message - -SUB_LIST= QMAIL_PREFIX=${QMAIL_PREFIX} \ - SIMSCAN_DIR=${PORTNAME} -PLIST_SUB= QMAIL_PREFIX=${QMAIL_PREFIX} \ - SIMSCAN_DIR=${PORTNAME} - -OPTIONS_DEFINE= CLAMAV RIPMIME SPAMD USER DOMAIN ATTACH DROPMSG PASSTHRU HEADERS DSPAM DOCS -OPTIONS_DEFAULT= CLAMAV RIPMIME -CLAMAV_DESC= Support for ClamAV Virus Scanning -RIPMIME_DESC= Ripmime Processing (if Clamav ScanMail disabled) -SPAMD_DESC= Support for SpamAssassin Spam Filtering -USER_DESC= Turn On Per User SpamAssassin (required SPAMD) -DOMAIN_DESC= Turn On Per Domain Based Checking -ATTACH_DESC= Turn On Attachment Scanning (required CLAMAV) -DROPMSG_DESC= Drop Message in Case of Virus Found -PASSTHRU_DESC= Pass Spam Thru, Do Not Reject (required SPAMD) -HEADERS_DESC= Add a Received Line With Versions of Scanners -DSPAM_DESC= Turn on DSPAM scanning - -CONFIGURE_ARGS=--enable-clamavdb-path=/var/db/clamav \ +CONFIGURE_ARGS= --enable-clamavdb-path=/var/db/clamav \ --enable-qmaildir=${QMAIL_PREFIX} \ + --enable-qmail-queue=${QMAIL_QUEUE} \ --enable-spamc-user=n \ --enable-workdir=${WORKDIR} \ --enable-user=nobody +.if defined(QUARANTINE_DIR) +CONFIGURE_ARGS+=--enable-quarantinedir=${QUARANTINE_DIR} +.endif +.if defined(SPAMC_ARGS) +CONFIGURE_ARGS+=--enable-spamc-args=${SPAMC_ARGS} +.endif +.if defined(SPAM_HITS) +CONFIGURE_ARGS+=--enable-spam-hits=${SPAM_HITS} +.endif -CLAMAV_CONFIGURE_OFF= --enable-clamav=n -CLAMAV_BUILD_DEPENDS= clamdscan:security/clamav +SUB_FILES= pkg-message +SUB_LIST= QMAIL_PREFIX=${QMAIL_PREFIX} \ + SIMSCAN_DIR=${PORTNAME} -RIPMIME_CONFIGURE_OFF= --disable-ripmime -RIPMIME_BUILD_DEPENDS= ripmime:mail/ripmime -RIPMIME_RUN_DEPENDS= ripmime:mail/ripmime +USERS= ${PORTNAME} +GROUPS= ${USERS:[1]} qmail -SPAMD_BUILD_DEPENDS= spamassassin:mail/spamassassin -SPAMD_CONFIGURE_ON= --enable-spam=y \ - --enable-spamassassin-path=${LOCALBASE}/bin/spamassassin +PLIST_SUB= QMAIL_PREFIX=${QMAIL_PREFIX} \ + SIMSCAN_DIR=${PORTNAME} \ + USER=${USERS:[1]} \ + GROUP=${GROUPS:[1]} \ + QMAIL_GROUP=${GROUPS:[2]} +PORTDOCS= AUTHORS ChangeLog README.md TODO + +OPTIONS_DEFINE= ATTACH CLAMAV DOCS DOMAIN DROPMSG DSPAM HEADERS \ + PASSTHRU RIPMIME SPAMD USER +OPTIONS_DEFAULT= ATTACH RIPMIME +ATTACH_DESC= Turn On Attachment Scanning (required CLAMAV) +CLAMAV_DESC= Support for ClamAV Virus Scanning +DOMAIN_DESC= Turn On Per Domain Based Checking +DROPMSG_DESC= Drop Message in Case of Virus Found +DSPAM_DESC= Turn on DSPAM scanning +HEADERS_DESC= Add a Received Line With Versions of Scanners +PASSTHRU_DESC= Pass Spam Thru, Do Not Reject (required SPAMD) +RIPMIME_DESC= Ripmime Processing (if Clamav ScanMail disabled) +SPAMD_DESC= Support for SpamAssassin Spam Filtering +USER_DESC= Turn On Per User SpamAssassin (required SPAMD) -USER_CONFIGURE_ON= --enable-spamc-user=y +ATTACH_CONFIGURE_ON= --enable-attach=y -DOMAIN_CONFIGURE_ON= --enable-per-domain=y +CLAMAV_IMPLIES= ATTACH +CLAMAV_BUILD_DEPENDS= clamdscan:security/clamav +CLAMAV_CONFIGURE_OFF= --enable-clamav=n -ATTACH_CONFIGURE_ON= --enable-attach=y +DOMAIN_CONFIGURE_ON= --enable-per-domain=y DROPMSG_CONFIGURE_ON= --enable-dropmsg=y -PASSTHRU_CONFIGURE_ON= --enable-spam-passthru=y +DSPAM_BUILD_DEPENDS= dspam:mail/dspam +DSPAM_CONFIGURE_ON= --enable-dspam=y HEADERS_CONFIGURE_ON= --enable-received=y \ --enable-sigtool-path=${LOCALBASE}/bin/sigtool -DSPAM_CONFIGURE_ON= --enable-dspam=y -DSPAM_BUILD_DEPENDS= dspam:mail/dspam - -.if defined(SPAM_HITS) -CONFIGURE_ARGS+=--enable-spam-hits=${SPAM_HITS} -.endif - -.if defined(QUARANTINE_DIR) -CONFIGURE_ARGS+=--enable-quarantinedir=${QUARANTINE_DIR} -.endif +PASSTHRU_CONFIGURE_ON= --enable-spam-passthru=y -.if defined(SPAMC_ARGS) -CONFIGURE_ARGS+=--enable-spamc-args=${SPAMC_ARGS} -.endif +RIPMIME_BUILD_DEPENDS= ripmime:mail/ripmime +RIPMIME_RUN_DEPENDS= ripmime:mail/ripmime +RIPMIME_CONFIGURE_OFF= --disable-ripmime -.if defined(QMAIL_QUEUE) -CONFIGURE_ARGS+=--enable-qmail-queue=${QMAIL_QUEUE} -.endif +SPAMD_BUILD_DEPENDS= spamassassin:mail/spamassassin +SPAMD_CONFIGURE_ON= --enable-spam=y \ + --enable-spamassassin-path=${LOCALBASE}/bin/spamassassin -PORTDOCS= AUTHORS ChangeLog README TODO +USER_CONFIGURE_ON= --enable-spamc-user=y post-patch: @${REINPLACE_CMD} -E 's,($f/daily.cvd"),\1 || test -d "$$f/daily.inc",' \ diff --git a/mail/simscan/distinfo b/mail/simscan/distinfo index 4c45024a869e..932e59acdc76 100644 --- a/mail/simscan/distinfo +++ b/mail/simscan/distinfo @@ -1,2 +1,3 @@ -SHA256 (simscan-1.4.0.tar.gz) = b89d145206ad26420cfbf2f5b25ebf52e236f8ac00cd70ae449e72f3ec935781 -SIZE (simscan-1.4.0.tar.gz) = 271617 +TIMESTAMP = 1751301949 +SHA256 (sagredo-dev-simscan-v1.4.6.2_GH0.tar.gz) = ba2db03f3f2f8c1ba79a992b3c645adc23fe7aa25e9805dbdf98041420fe8d47 +SIZE (sagredo-dev-simscan-v1.4.6.2_GH0.tar.gz) = 212220 diff --git a/mail/simscan/files/patch-fix_clamav_0.93 b/mail/simscan/files/patch-fix_clamav_0.93 deleted file mode 100644 index 73ca74c26bfb..000000000000 --- a/mail/simscan/files/patch-fix_clamav_0.93 +++ /dev/null @@ -1,107 +0,0 @@ ---- ./configure.orig 2007-10-29 09:14:25.000000000 -0500 -+++ ./configure 2012-06-26 14:20:22.000000000 -0500 -@@ -4682,13 +4682,26 @@ - clamavdb="" - for f in "$CLAMAV_DB" /usr/local/share/clamav /var/lib/clamav - do -- if test -f "$f/daily.cvd" -+ if test -f "$f/daily.cvd" || test -d "$f/daily.inc" -+ then -+ clamavdb=$f -+ break -+ elif test -f "$f/daily.cld" -+ then -+ clamavdb=$f -+ break -+ elif test -f "$f/daily.inc/daily.info" - then - clamavdb=$f - break - fi - done - -+ # Default to $f/daily.cld -+ if test "$clamavdb" = ""; then -+ clamavdb="$f/daily.cld" -+ fi -+ - if test "$clamavdb" = "" - then - echo "$as_me:$LINENO: result: no" >&5 ---- ./configure.in.orig 2007-10-29 09:13:40.000000000 -0500 -+++ ./configure.in 2012-06-26 14:20:02.000000000 -0500 -@@ -622,9 +622,22 @@ - then - clamavdb=$f - break -+ elif test -f "$f/daily.cld" -+ then -+ clamavdb=$f -+ break -+ elif test -f "$f/daily.inc/daily.info" -+ then -+ clamavdb=$f -+ break - fi - done - -+ # Default to $f/daily.cld -+ if test "$clamavdb" = ""; then -+ clamavdb="$f/daily.cld" -+ fi -+ - if test "$clamavdb" = "" - then - AC_MSG_RESULT(no) ---- simscanmk.c 2006-10-10 19:15:17.000000000 -0400 -+++ simscanmk.c 2008-07-07 14:21:46.000000000 -0400 -@@ -123,6 +123,7 @@ - char input[MAX_LINE]; - char dbpath[MAX_LINE]; - char *pos; -+ int rv; - #if ENABLE_SPAM==1 || ENABLE_TROPHIE==1 - int fnd_vsvers; - #endif -@@ -276,8 +277,18 @@ - waitpid(pid,&rmstat,0); - close(pin[0]); close(pin[1]); - } -- strncpy(dbpath,CLAMAVDBPATH,MAX_DATA); -- strcat(dbpath,"/main.cvd"); -+ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); -+ strncat(dbpath,"/main.inc/main.info",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); -+ rv=access(dbpath,F_OK); -+ if(rv) { -+ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); -+ strncat(dbpath,"/main.cld",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); -+ } -+ rv=access(dbpath,F_OK); -+ if(rv) { -+ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); -+ strncat(dbpath,"/main.cvd",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); -+ } - strcat(data,"m:"); - if (pipe(pin)){ - printf("error opening pipe for sigtool\n"); -@@ -306,8 +317,18 @@ - } - waitpid(pid,&rmstat,0); - close(pin[0]); close(pin[1]); -- strncpy(dbpath,CLAMAVDBPATH,MAX_DATA); -- strcat(dbpath,"/daily.cvd"); -+ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); -+ strncat(dbpath,"/daily.inc/daily.info",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); -+ rv=access(dbpath,F_OK); -+ if(rv) { -+ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); -+ strncat(dbpath,"/daily.cld",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); -+ } -+ rv=access(dbpath,F_OK); -+ if(rv) { -+ strncpy(dbpath,CLAMAVDBPATH,MAX_LINE); -+ strncat(dbpath,"/daily.cvd",(MAX_LINE-sizeof(CLAMAVDBPATH)-1)); -+ } - if (pipe(pin)){ - printf("error opening pipe for sigtool\n"); - } diff --git a/mail/simscan/pkg-plist b/mail/simscan/pkg-plist index 2aff1e0b0441..3ff6aaef42cc 100644 --- a/mail/simscan/pkg-plist +++ b/mail/simscan/pkg-plist @@ -1,6 +1,6 @@ @cwd %%QMAIL_PREFIX%% -@(simscan,simscan,) bin/simscanmk -@(simscan,simscan,04711) bin/simscan -@dir(simscan,simscan,2750) %%SIMSCAN_DIR%% -@dir %%QMAIL_PREFIX%%/bin -@dir %%QMAIL_PREFIX%% +@(%%USER%%,%%GROUP%%,) bin/simscanmk +@(%%USER%%,%%GROUP%%,04711) bin/simscan +@dir(%%USER%%,%%GROUP%%,2750) %%SIMSCAN_DIR%% +@dir(,%%QMAIL_GROUP%%,) %%QMAIL_PREFIX%%/bin +@dir(,%%QMAIL_GROUP%%,) %%QMAIL_PREFIX%%