From 401856a2615ff0b6e5fc28d9866cd95a50be2ea3 Mon Sep 17 00:00:00 2001 From: Cheng-Lung Sung Date: Fri, 13 Jan 2006 07:24:34 +0000 Subject: [PATCH] - Update to 1.6 - Use USE_RC_SUBR=clamsmtpd.sh instead =YES - Use PORTDOCS=* not need test NOPORTDOCS - Only depend of security/clamav if already installed. clamsmtp can run in another machine then clamav. Tinderbox test: http://marcus.grupos.com.br:8080/logs/4-STABLE-FreeBSD/clamsmtp-1.6.log http://marcus.grupos.com.br:8080/logs/6-STABLE-FreeBSD/clamsmtp-1.6.log PR: 91713 Submitted by: mnag --- security/clamsmtp/Makefile | 25 ++++---- security/clamsmtp/distinfo | 5 +- .../{clamsmtpd.sh.tmpl => clamsmtpd.sh.in} | 2 +- security/clamsmtp/files/patch-smtppass.c | 57 ------------------- security/clamsmtp/pkg-plist | 1 - 5 files changed, 15 insertions(+), 75 deletions(-) rename security/clamsmtp/files/{clamsmtpd.sh.tmpl => clamsmtpd.sh.in} (97%) delete mode 100644 security/clamsmtp/files/patch-smtppass.c diff --git a/security/clamsmtp/Makefile b/security/clamsmtp/Makefile index 154c92157d56..b9d2a192d3c7 100644 --- a/security/clamsmtp/Makefile +++ b/security/clamsmtp/Makefile @@ -6,37 +6,37 @@ # PORTNAME= clamsmtp -PORTVERSION= 1.5 -PORTREVISION= 2 +PORTVERSION= 1.6 CATEGORIES= security MASTER_SITES= http://memberwebs.com/nielsen/software/clamsmtp/ MAINTAINER= clsung@FreeBSD.org COMMENT= An ClamAV anti-virus SMTP Filter -RUN_DEPENDS= ${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav - GNU_CONFIGURE= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_RC_SUBR= yes -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} CLAMAV_PID_DIR=${CLAMAV_PID_DIR} -STARTUP_FILE= ${PREFIX}/etc/rc.d/clamsmtpd.sh +USE_RC_SUBR= clamsmtpd.sh +SUB_LIST= CLAMAV_PID_DIR=${CLAMAV_PID_DIR} + +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CLAMAV_PID_DIR?= /var/run/clamav MAN5= clamsmtpd.conf.5 MAN8= clamsmtpd.8 -.if !defined(NOPORTDOCS) PORTDOCS= * + +.if exists(${LOCALBASE}/sbin/clamd) +RUN_DEPENDS+= ${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav .endif +post-patch: + @${REINPLACE_CMD} -e "s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS}," ${WRKSRC}/configure + post-install: - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/clamsmtpd.sh.tmpl > ${STARTUP_FILE} @${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${PREFIX}/etc/clamsmtpd.conf-sample - @${CHMOD} 755 ${STARTUP_FILE} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} @@ -44,7 +44,4 @@ post-install: .endif @${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGMESSAGE} -post-patch: - @${REINPLACE_CMD} -e "s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS}," ${WRKSRC}/configure - .include diff --git a/security/clamsmtp/distinfo b/security/clamsmtp/distinfo index e5bfd0f3ba56..7ede1412c147 100644 --- a/security/clamsmtp/distinfo +++ b/security/clamsmtp/distinfo @@ -1,2 +1,3 @@ -MD5 (clamsmtp-1.5.tar.gz) = 521e43f5872cab8e53c21285041a759f -SIZE (clamsmtp-1.5.tar.gz) = 148067 +MD5 (clamsmtp-1.6.tar.gz) = 19fed666c77bb26039c5412c2559249d +SHA256 (clamsmtp-1.6.tar.gz) = b1e2c8144821bb305e659ce9ff71fa202a911ad9819e95d5f2b4e0dee2d3cbbb +SIZE (clamsmtp-1.6.tar.gz) = 149113 diff --git a/security/clamsmtp/files/clamsmtpd.sh.tmpl b/security/clamsmtp/files/clamsmtpd.sh.in similarity index 97% rename from security/clamsmtp/files/clamsmtpd.sh.tmpl rename to security/clamsmtp/files/clamsmtpd.sh.in index 2db6f5fa963e..682b9dbb7ad5 100644 --- a/security/clamsmtp/files/clamsmtpd.sh.tmpl +++ b/security/clamsmtp/files/clamsmtpd.sh.in @@ -13,7 +13,7 @@ . %%RC_SUBR%% -name=clamsmtpd +name="clamsmtpd" rcvar=`set_rcvar` command=%%PREFIX%%/sbin/${name} diff --git a/security/clamsmtp/files/patch-smtppass.c b/security/clamsmtp/files/patch-smtppass.c deleted file mode 100644 index 484d4f825a96..000000000000 --- a/security/clamsmtp/files/patch-smtppass.c +++ /dev/null @@ -1,57 +0,0 @@ -diff -ur ../clamsmtp-1.5-orig/common/smtppass.c common/smtppass.c ---- common/smtppass.c Tue Aug 2 01:23:05 2005 -+++ common/smtppass.c Sun Sep 4 11:52:13 2005 -@@ -275,6 +275,26 @@ - - sp_messagex(NULL, LOG_DEBUG, "starting up (%s)...", VERSION); - -+ /* Drop privileges before daemonizing */ -+ drop_privileges(); -+ -+ /* When set to this we daemonize */ -+ if(g_state.debug_level == -1) -+ { -+ /* Fork a daemon nicely here */ -+ if(daemon(0, 0) == -1) -+ { -+ sp_message(NULL, LOG_ERR, "couldn't run as daemon"); -+ exit(1); -+ } -+ -+ sp_messagex(NULL, LOG_DEBUG, "running as a daemon"); -+ g_state.daemonized = 1; -+ -+ /* Open the system log */ -+ openlog(g_state.name, 0, LOG_MAIL); -+ } -+ - /* Create the socket */ - sock = socket(SANY_TYPE(g_state.listenaddr), SOCK_STREAM, 0); - if(sock < 0) -@@ -297,26 +317,6 @@ - exit(1); - } - -- /* Drop privileges before daemonizing */ -- drop_privileges(); -- -- /* When set to this we daemonize */ -- if(g_state.debug_level == -1) -- { -- /* Fork a daemon nicely here */ -- if(daemon(0, 0) == -1) -- { -- sp_message(NULL, LOG_ERR, "couldn't run as daemon"); -- exit(1); -- } -- -- sp_messagex(NULL, LOG_DEBUG, "running as a daemon"); -- g_state.daemonized = 1; -- -- /* Open the system log */ -- openlog(g_state.name, 0, LOG_MAIL); -- } -- - sp_messagex(NULL, LOG_DEBUG, "created socket: %s", g_state.listenname); - - /* Handle some signals */ diff --git a/security/clamsmtp/pkg-plist b/security/clamsmtp/pkg-plist index e492f7d3b397..9c6c9ac9e369 100644 --- a/security/clamsmtp/pkg-plist +++ b/security/clamsmtp/pkg-plist @@ -1,5 +1,4 @@ @comment $FreeBSD$ @unexec [ ! -f %%CLAMAV_PID_DIR%%/clamsmtpd.pid ] || %%PREFIX%%/etc/rc.d/clamsmtpd.sh stop || true sbin/clamsmtpd -etc/rc.d/clamsmtpd.sh etc/clamsmtpd.conf-sample