mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
- Update to 2.10.
Please take a look at CHANGES after QS extract, online changelog is broken. Submitted by: garga Reported by: William Olson
This commit is contained in:
Felippe de Meirelles Motta
parent
582a95ec10
commit
d86286b131
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=297461
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= qmail-scanner
|
||||
PORTVERSION= 2.01
|
||||
PORTREVISION= 6
|
||||
PORTVERSION= 2.10
|
||||
CATEGORIES= mail security
|
||||
MASTER_SITES= SF
|
||||
EXTRACT_SUFX= .tgz
|
||||
@ -20,7 +19,8 @@ RUN_DEPENDS+= reformime:${PORTSDIR}/mail/maildrop \
|
||||
setuidgid:${PORTSDIR}/sysutils/daemontools
|
||||
BUILD_DEPENDS+= reformime:${PORTSDIR}/mail/maildrop \
|
||||
unzip:${PORTSDIR}/archivers/unzip \
|
||||
setuidgid:${PORTSDIR}/sysutils/daemontools
|
||||
setuidgid:${PORTSDIR}/sysutils/daemontools \
|
||||
bash:${PORTSDIR}/shells/bash
|
||||
|
||||
CONFLICTS= qmail-scanner-1.*
|
||||
|
||||
@ -36,6 +36,8 @@ HAS_CONFIGURE= yes
|
||||
CONFIGURE_ARGS+= \
|
||||
--qmaildir "${QMAIL_PREFIX}" \
|
||||
--spooldir "${SPOOLDIR}" \
|
||||
--etcdir "${SPOOLDIR}" \
|
||||
--logdir "${SPOOLDIR}" \
|
||||
--bindir "${PREFIX}/bin" \
|
||||
--qmail-queue-binary "${QMAIL_QUEUE}" \
|
||||
--mime-unpacker "reformime" \
|
||||
@ -67,13 +69,10 @@ SUB_LIST+= QS_USER=${QS_USER} \
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${OSVERSION} >= 900000
|
||||
BROKEN= does not build
|
||||
.endif
|
||||
|
||||
# Options
|
||||
.if defined(WITH_TNEF)
|
||||
BUILD_DEPENDS+= ${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
|
||||
RUN_DEPENDS+= ${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef
|
||||
.endif
|
||||
|
||||
.if !defined(WITH_FIX_MIME)
|
||||
@ -93,6 +92,7 @@ SUB_LIST+= CWRAPPER=yes
|
||||
SUB_LIST+= QSQ_TARGET=qmail-scanner-queue
|
||||
CWRAPPER_FLG= yes
|
||||
PLIST_SUB+= CWRAPPER=""
|
||||
CONFIGURE_ARGS+=--skip-setuid-test
|
||||
.else
|
||||
SUB_LIST+= CWRAPPER=no
|
||||
SUB_LIST+= QSQ_TARGET=qmail-scanner-queue.pl
|
||||
@ -108,6 +108,10 @@ CONFIGURE_ARGS+= --qs-user "${QS_USER}"
|
||||
CONFIGURE_ARGS+= --admin "${QS_ADMIN}"
|
||||
.endif
|
||||
|
||||
.if defined(QS_DOMAIN)
|
||||
CONFIGURE_ARGS+= --domain "${QS_DOMAIN}"
|
||||
.endif
|
||||
|
||||
.if defined(QS_ADMIN_DESC)
|
||||
CONFIGURE_ARGS+= --admin-description "${QS_ADMIN_DESC}"
|
||||
.endif
|
||||
@ -130,10 +134,26 @@ CONFIGURE_ARGS+= --notify psender,precips
|
||||
CONFIGURE_ARGS+= --local-domains "${QS_LOCALDOMAINS}"
|
||||
.endif
|
||||
|
||||
.if defined(QS_DLPMONITOR)
|
||||
CONFIGURE_ARGS+= --dlp-monitor "${QS_DLPMONITOR}"
|
||||
.endif
|
||||
|
||||
.if defined(QS_SA_QUARANTINE)
|
||||
CONFIGURE_ARGS+= --sa-quarantine "${QS_SA_QUARANTINE}"
|
||||
.endif
|
||||
|
||||
.if defined(QS_SA_TIMEOUT)
|
||||
CONFIGURE_ARGS+= --sa-timeout "${QS_SA_TIMEOUT}"
|
||||
.endif
|
||||
|
||||
.if defined(QS_SA_FT)
|
||||
CONFIGURE_ARGS+= --sa-faulttolerant "${QS_SA_FT}"
|
||||
.endif
|
||||
|
||||
.if defined(QS_SA_MAXSIZE)
|
||||
CONFIGURE_ARGS+= --sa-maxsize "${QS_SA_MAXSIZE}"
|
||||
.endif
|
||||
|
||||
.if defined(QS_LANG)
|
||||
CONFIGURE_ARGS+= --lang "${QS_LANG}"
|
||||
.endif
|
||||
@ -177,8 +197,10 @@ pre-configure:
|
||||
@${ECHO_MSG} ""
|
||||
@${ECHO_MSG} "QS_USER User to run Q-S"
|
||||
@${ECHO_MSG} " (Default: qscand)"
|
||||
@${ECHO_MSG} "QS_ADMIN Administrator Q-S Address"
|
||||
@${ECHO_MSG} "QS_ADMIN Administrator Q-S Address (just username)"
|
||||
@${ECHO_MSG} " (Default: postmaster)"
|
||||
@${ECHO_MSG} "QS_DOMAIN Administrator Domain (QS_ADMIN@QS_DOMAIN)"
|
||||
@${ECHO_MSG} " (Default: hostname)"
|
||||
@${ECHO_MSG} "QS_ADMIN_DESC Real Name of Administrator Q-S"
|
||||
@${ECHO_MSG} " (Default: System Anti-Virus Administrator)"
|
||||
@${ECHO_MSG} "QS_SCANNERS List of scanners installed, e.g. bitdefender,nod32"
|
||||
@ -188,8 +210,18 @@ pre-configure:
|
||||
@${ECHO_MSG} " (Default: yes|no)"
|
||||
@${ECHO_MSG} "QS_NOTIFY Who has to be notify of viruses/spams"
|
||||
@${ECHO_MSG} " (Default: 'psender|precips')"
|
||||
@${ECHO_MSG} "QS_LOCALDOMAINS Domains classified as local domains preventing alerts"
|
||||
@${ECHO_MSG} "QS_LOCALDOMAINS Domains classified as local domains preventing alerts"
|
||||
@${ECHO_MSG} " of externals users (and mailing-lists...)"
|
||||
@${ECHO_MSG} "QS_DLPMONITOR Using this will cause Q-S to *not* block events that match"
|
||||
@${ECHO_MSG} " this regex."
|
||||
@${ECHO_MSG} "QS_SA_TIMEOUT This is the max number of seconds you will allow spamc to"
|
||||
@${ECHO_MSG} " take on processing a mail message."
|
||||
@${ECHO_MSG} "QS_SA_FT This can be used in addition to sa-timeout as a way of"
|
||||
@${ECHO_MSG} " telling Qmail-Scanner to let SA 'have another go'"
|
||||
@${ECHO_MSG} " at processing a message if it was unable to get it right"
|
||||
@${ECHO_MSG} " the first time."
|
||||
@${ECHO_MSG} "QS_SA_MAXSIZE This size (in bytes) sets the max size email that will be"
|
||||
@${ECHO_MSG} " processed by SpamAssassin."
|
||||
@${ECHO_MSG} "QS_SA_QUARANTINE If SA tags a message as having a score higher than"
|
||||
@${ECHO_MSG} " 'required_hits', then that message will be quarantined"
|
||||
@${ECHO_MSG} " into a new maildir '/.spam/' and not delivered to end-user"
|
||||
@ -246,7 +278,7 @@ do-build:
|
||||
@${REINPLACE_CMD} -E 's|^(#define REAL_PATH ")/var/qmail/bin/qmail-scanner-queue.pl(".*)$$|\1${PREFIX}/bin/qmail-scanner-queue.pl\2|' \
|
||||
${WRKSRC}/contrib/qmail-scanner-queue.c
|
||||
# compile the c wrapper:
|
||||
@${CC} ${CFLAGS} -o ${WRKSRC}/contrib/qmail-scanner-queue ${WRKSRC}/contrib/qmail-scanner-queue.c
|
||||
@${MAKE} -C ${WRKSRC}/contrib
|
||||
.endif
|
||||
|
||||
do-install:
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (qmail-scanner-2.01.tgz) = 4bf69d3581c23b552deffafcfca49f325c5fe6c5ee6012055f201b8535243472
|
||||
SIZE (qmail-scanner-2.01.tgz) = 226699
|
||||
SHA256 (qmail-scanner-2.10.tgz) = b6c430c81efd41bd28e56fb60e6e1ecbd98e44346c2faad69ff164960f042247
|
||||
SIZE (qmail-scanner-2.10.tgz) = 244402
|
||||
|
||||
@ -1,34 +1,11 @@
|
||||
--- configure.orig 2006-04-04 21:37:03.000000000 +0000
|
||||
+++ configure 2009-07-04 12:37:16.225280000 +0000
|
||||
@@ -1,13 +1,6 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
|
||||
-#Pipe into bash if it's present
|
||||
-
|
||||
-if [ "`bash --version 2>&1|grep 'GNU bash'`" != "" -a "$BASH_VERSION" = "" ]; then
|
||||
- exec bash $0 $*
|
||||
- exit
|
||||
-fi
|
||||
-
|
||||
umask 007
|
||||
|
||||
OLD_LANG="$LANG"
|
||||
@@ -73,7 +66,7 @@
|
||||
LANGUAGES="`ls -d locale/[a-z]*|sed 's?^locale\/??g'`"
|
||||
LANGUAGES=`echo $LANGUAGES`
|
||||
|
||||
-SPOOLDIR="/var/spool/qscan"
|
||||
+SPOOLDIR="/var/spool/qscand"
|
||||
QMAILDIR="/var/qmail"
|
||||
|
||||
BINDIR="$QMAILDIR/bin"
|
||||
@@ -1276,7 +1269,7 @@
|
||||
if [ "$MIME_UNPACKER" = "reformime" ]; then
|
||||
#Check version of maildrop to ensure it's not the buggy version
|
||||
|
||||
-DD="`$MAILDROP_BINARY -v 2>&1|grep '^maildrop'|grep '1\.0'`"
|
||||
+DD="`$MAILDROP_BINARY -v 2>&1|grep '^maildrop 1\.0'`"
|
||||
if [ "$DD" != "" ]; then
|
||||
cat<<EOF
|
||||
|
||||
--- configure.old 2012-05-25 16:16:34.000000000 -0300
|
||||
+++ configure 2012-05-25 16:16:51.000000000 -0300
|
||||
@@ -817,7 +817,7 @@
|
||||
UNZIP_OPTIONS=""
|
||||
fi
|
||||
#Now check we can get filesizes out
|
||||
- EE=`unzip -Ptest -lv contrib/test_password.zip 2>&1|egrep '80688.*test/ls'`
|
||||
+ EE=`unzip -lv contrib/test_password.zip 2>&1|egrep '80688.*test/ls'`
|
||||
if [ "$EE" = "" ]; then
|
||||
echo "**FATAL ERROR ***"
|
||||
echo ""
|
||||
|
||||
@ -18,7 +18,7 @@ PRE-INSTALL)
|
||||
${PW} groupshow -n ${QS_USER} >/dev/null 2>&1 \
|
||||
|| ${PW} groupadd -n ${QS_USER} -g ${QS_ID}
|
||||
${PW} usershow -n ${QS_USER} >/dev/null 2>&1 \
|
||||
|| ${PW} useradd ${QS_USER} -g ${QS_USER} -u ${QS_ID} -s ${NOLOGIN}
|
||||
|| ${PW} useradd ${QS_USER} -g ${QS_USER} -u ${QS_ID} -s ${NOLOGIN} -d ${SPOOLDIR}
|
||||
;;
|
||||
POST-INSTALL)
|
||||
# Directories
|
||||
|
||||
Loading…
Reference in New Issue
Block a user