Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Jan 2016 18:12:11 +1100
From:      Kubilay Kocak <koobs@FreeBSD.org>
To:        Alexey Dokuchaev <danfe@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r407194 - head/mail/qsheff
Message-ID:  <56A5CACB.3050001@FreeBSD.org>
In-Reply-To: <201601250702.u0P72qSZ084419@repo.freebsd.org>
References:  <201601250702.u0P72qSZ084419@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On 25/01/2016 6:02 PM, Alexey Dokuchaev wrote:
> Author: danfe
> Date: Mon Jan 25 07:02:51 2016
> New Revision: 407194
> URL: https://svnweb.freebsd.org/changeset/ports/407194
> 
> Log:
>   - Unbreak the build on 9.x (against GCC 4.2): it was failing due to -ansi
>     option passed by default, which does not allow C++-style comments in C
>     source code (Clang is more forgiving):
>   
>       /usr/local/include/clamav.h:170: error: expected identifier or '('
>       before '/' token
>       /usr/local/include/clamav.h:170: error: stray '#' in program
>   
>   - Really respect CFLAGS by fixing configure script

Probably want a PORTREVISION bump for this for builds on 10+ due to
changed binaries, no?

>   - Do not hardcode DISTVERSION in MASTER_SITES
>   - Do not install COPYING file as part of portdocs: it's installed via
>     LICENSE_FILE already
>   - Convert the port to use option helpers, fix a typo (VIRUSTAGSC ->
>     VIRUSTAG_DESC), wrap overly long lines
>   - Augment port description text while I'm at it
> 
> Modified:
>   head/mail/qsheff/Makefile
>   head/mail/qsheff/pkg-descr
>   head/mail/qsheff/pkg-plist
> 
> Modified: head/mail/qsheff/Makefile
> ==============================================================================
> --- head/mail/qsheff/Makefile	Mon Jan 25 06:48:27 2016	(r407193)
> +++ head/mail/qsheff/Makefile	Mon Jan 25 07:02:51 2016	(r407194)
> @@ -6,7 +6,7 @@ DISTVERSION=	2.1-r3
>  PORTREVISION=	7
>  CATEGORIES=	mail
>  MASTER_SITES=	http://www.enderunix.org/qsheff/ \
> -		SF/qsheff/qsheff/II-2.1-r3
> +		SF/qsheff/qsheff/II-${DISTVERSION}
>  
>  MAINTAINER=	ports@FreeBSD.org
>  COMMENT=	Qmail-queue replacement to filter mail traffic
> @@ -17,13 +17,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
>  BUILD_DEPENDS=	${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime
>  RUN_DEPENDS:=	${BUILD_DEPENDS}
>  
> -BROKEN_FreeBSD_9=	does not build on FreeBSD < 10.x
> -
> -GNU_CONFIGURE=	yes
> -
>  USES=		qmail
> +GNU_CONFIGURE=	yes
> +CONFIGURE_ARGS=	--with-qmaildir=${QMAIL_PREFIX}
>  
> -DOCS=		README COPYING AUTHORS ChangeLog INSTALL THANKS TODO
> +DOCS=		README AUTHORS ChangeLog INSTALL THANKS TODO
>  EXAMPLES=	sample-OK.msg sample-SPAM.msg sample-VIRUS.msg
>  CONTRIB=	README qq-custom-error-patch.diff qq-patch.diff \
>  		qsheff-patch.diff
> @@ -31,72 +29,52 @@ FILES=		handbook.en.txt handbook.tr.txt 
>  ETCFILES=	install-wrapper.sh uninstall-wrapper.sh qsheff.attach-default \
>  		qsheff.conf-default qsheff.ignore-default qsheff.rules-default
>  
> -CONFIGURE_ARGS+=	--with-qmaildir=${QMAIL_PREFIX}
> -
> -OPTIONS_DEFINE=	CLAMAV SPAMTAG VIRUSTAG DISABLELOCAL SYSLOG BACKUP CUSTOMERROR DEBUG DOCS EXAMPLES
> +OPTIONS_DEFINE=	CLAMAV SPAMTAG VIRUSTAG DISABLELOCAL SYSLOG BACKUP \
> +		CUSTOMERROR DEBUG DOCS EXAMPLES
>  OPTIONS_DEFAULT=	CLAMAV
> -CLAMAV_DESC=		Integrate with Clam AntiVirus
> -SPAMTAG_DESC=		Spam Tagging
> -VIRUSTAGSC=		Virus Tagging
> -DISABLELOCAL_DESC=	Disable Filters For Local Users
> -BACKUP_DESC=		Logging Incoming/Outgoing Mail
> -CUSTOMERROR_DESC=	Custom Error Patch
> -
> -.include <bsd.port.options.mk>
> -
> -.if ${PORT_OPTIONS:MCLAMAV}
> -RUN_DEPENDS+=	${LOCALBASE}/bin/clamdscan:${PORTSDIR}/security/clamav
> -BUILD_DEPENDS+=	${LOCALBASE}/bin/clamdscan:${PORTSDIR}/security/clamav
> -CONFIGURE_ARGS+=	--with-clamav
> -CONFIGURE_ARGS+=	--with-clamd-socket=/var/run/clamav/clamd
> -.endif
> -
> -.if ${PORT_OPTIONS:MSPAMTAG}
> -CONFIGURE_ARGS+=	--enable-spam-tag
> -.endif
> -
> -.if ${PORT_OPTIONS:MVIRUSTAG}
> -CONFIGURE_ARGS+=	--enable-virus-tag
> -.endif
> -
> -.if ${PORT_OPTIONS:MSYSLOG}
> -CONFIGURE_ARGS+=	--enable-syslog
> -.endif
> -
> -.if ${PORT_OPTIONS:MDISABLELOCAL}
> -CONFIGURE_ARGS+=	--disable-local-users
> -.endif
> -
> -.if ${PORT_OPTIONS:MBACKUP}
> -CONFIGURE_ARGS+=	--enable-backup
> -.endif
> -
> -.if ${PORT_OPTIONS:MCUSTOMERROR}
> -CONFIGURE_ARGS+=	--enable-custom-error
> -.endif
> -
> -.if ${PORT_OPTIONS:MDEBUG}
> -CONFIGURE_ARGS+=	--enable-debug
> -.endif
> +
> +CLAMAV_DESC=		Integrate with ClamAV
> +SPAMTAG_DESC=		Spam tagging
> +VIRUSTAG_DESC=		Virus tagging
> +DISABLELOCAL_DESC=	Disable filters for local users
> +BACKUP_DESC=		Logging of incoming/outgoing mail
> +CUSTOMERROR_DESC=	Custom error patch
> +
> +CLAMAV_BUILD_DEPENDS=	${LOCALBASE}/bin/clamdscan:${PORTSDIR}/security/clamav
> +CLAMAV_RUN_DEPENDS=	${CLAMAV_BUILD_DEPENDS}
> +CLAMAV_CONFIGURE_ON=	--with-clamav --with-clamd-socket=/var/run/clamav/clamd
> +
> +SPAMTAG_CONFIGURE_ON=	--enable-spam-tag
> +VIRUSTAG_CONFIGURE_ON=	--enable-virus-tag
> +SYSLOG_CONFIGURE_ON=	--enable-syslog
> +DISABLELOCAL_CONFIGURE_ON=--disable-local-users
> +BACKUP_CONFIGURE_ON=	--enable-backup
> +CUSTOMERROR_CONFIGURE_ON=--enable-custom-error
> +DEBUG_CONFIGURE_ON=	--enable-debug
>  
>  post-patch:
> -	@${REINPLACE_CMD} -e "s|^CFLAGS =|CFLAGS +=|" ${WRKSRC}/Makefile.in
> +	@${REINPLACE_CMD} -e '/^CFLAGS=""/d' ${WRKSRC}/configure
> +	@${REINPLACE_CMD} -e 's/ -ansi//' ${WRKSRC}/src/Makefile.in
>  
> -post-build:
> -.if ! ${PORT_OPTIONS:MCLAMAV}
> -	@${REINPLACE_CMD} -e 's|enable_virus_prog = 1|enable_virus_prog = 0|g' \
> +post-build-CLAMAV-off:
> +	@${REINPLACE_CMD} -e '/enable_clamd/s|1|0|' \
>  		${WRKSRC}/etc/qsheff.conf-default
> -.endif
>  
>  do-install:
> +	${INSTALL_PROGRAM} ${WRKSRC}/src/qsheff ${STAGEDIR}${PREFIX}/bin
> +	@${MKDIR} ${STAGEDIR}${ETCDIR}
> +	${INSTALL_DATA} ${ETCFILES:S,^,${WRKSRC}/etc/,} ${STAGEDIR}${ETCDIR}
> +
> +do-install-DOCS-on:
>  	@${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
> -	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
> -	${INSTALL_DATA} ${FILES:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}/doc/
> +	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
> +	${INSTALL_DATA} ${FILES:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}/doc
> +
> +do-install-EXAMPLES-on:
>  	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
> -	${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/samples/,} ${STAGEDIR}${EXAMPLESDIR}/
> -	${INSTALL_DATA} ${CONTRIB:S,^,${WRKSRC}/contrib/,} ${STAGEDIR}${EXAMPLESDIR}/contrib
> -	@${MKDIR} ${STAGEDIR}${ETCDIR}
> -	${INSTALL_DATA} ${ETCFILES:S,^,${WRKSRC}/etc/,} ${STAGEDIR}${ETCDIR}/
> -	${INSTALL_PROGRAM} ${WRKSRC}/src/qsheff ${STAGEDIR}${PREFIX}/bin/qsheff
> +	${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/samples/,} \
> +		${STAGEDIR}${EXAMPLESDIR}/
> +	${INSTALL_DATA} ${CONTRIB:S,^,${WRKSRC}/contrib/,} \
> +		${STAGEDIR}${EXAMPLESDIR}/contrib
>  
>  .include <bsd.port.mk>
> 
> Modified: head/mail/qsheff/pkg-descr
> ==============================================================================
> --- head/mail/qsheff/pkg-descr	Mon Jan 25 06:48:27 2016	(r407193)
> +++ head/mail/qsheff/pkg-descr	Mon Jan 25 07:02:51 2016	(r407194)
> @@ -1,11 +1,16 @@
> -A qmail-queue replacement to filter mail traffic and more.
> -It supports:
> -	* Antivirus executing
> -	* body filtering
> -	* subject filtering
> -	* attachment blocking
> -	* quarantine
> -	* white/black list
> -	* single line logging for qmail and many features.
> +qSheff is a wrapper for the qmail queue that scans email for viruses and
> +spam.  Infected messages are rejected before they reach the queue, so the
> +server doesn't perform any job for them.  After checking the message, it
> +will wake the qmail queue.  Some of the supported features:
>  
> -WWW: http://www.enderunix.org/qsheff
> +  - Antivirus executing (ClamAV)
> +  - Header and body filtering
> +  - Subject filtering
> +  - Attachment blocking
> +  - Quarantine support
> +  - White/black lists
> +  - Single line logging for qmail
> +  - Basic DoS attack prevention
> +  - And much more...
> +
> +WWW: http://www.enderunix.org/qsheff/
> 
> Modified: head/mail/qsheff/pkg-plist
> ==============================================================================
> --- head/mail/qsheff/pkg-plist	Mon Jan 25 06:48:27 2016	(r407193)
> +++ head/mail/qsheff/pkg-plist	Mon Jan 25 07:02:51 2016	(r407194)
> @@ -13,7 +13,6 @@ bin/qsheff
>  %%ETCDIR%%/install-wrapper.sh
>  %%ETCDIR%%/uninstall-wrapper.sh
>  %%PORTDOCS%%%%DOCSDIR%%/README
> -%%PORTDOCS%%%%DOCSDIR%%/COPYING
>  %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>  %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>  %%PORTDOCS%%%%DOCSDIR%%/INSTALL
> 




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?56A5CACB.3050001>