git: a688127ffac4 - 2025Q3 - mail/simscan: Update 1.4.0 => 1.4.6.2, set maintainer
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 29 Jul 2025 10:43:36 UTC
The branch 2025Q3 has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a688127ffac467de3f4f22adc33b3b081f9e35f5
commit a688127ffac467de3f4f22adc33b3b081f9e35f5
Author: Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-07-29 10:30:43 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-07-29 10:43:19 +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 <bedreddinsahbaz@gmail.com> (new maintainer)
MFH: 2025Q3
(cherry picked from commit 785d62cc22d10205d1a8ff4830b1cd39d2ce2ad5)
---
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%%