Attachment #61181 for bug #91713

View | Details | Raw Unified | Return to bug 91713
Collapse All | Expand All




#

PORTNAME=	clamsmtp
PORTVERSION=	1.6
PORTREVISION=	2
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=	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}

.endif
	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGMESSAGE}

post-patch:
	@${REINPLACE_CMD} -e "s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS}," ${WRKSRC}/configure

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	MD5 (clamsmtp-1.5.tar.gz) = 521e43f5872cab8e53c21285041a759f	1	MD5 (clamsmtp-1.6.tar.gz) = 19fed666c77bb26039c5412c2559249d
2	SIZE (clamsmtp-1.5.tar.gz) = 148067	2	SHA256 (clamsmtp-1.6.tar.gz) = b1e2c8144821bb305e659ce9ff71fa202a911ad9819e95d5f2b4e0dee2d3cbbb
		3	SIZE (clamsmtp-1.6.tar.gz) = 149113

Lines 1-5 Link Here

(-)pkg-plist (-1 lines)
1	@comment $FreeBSD: ports/security/clamsmtp/pkg-plist,v 1.2 2004/10/14 02:28:24 clsung Exp $	1	@comment $FreeBSD: ports/security/clamsmtp/pkg-plist,v 1.2 2004/10/14 02:28:24 clsung Exp $
2	@unexec [ ! -f %%CLAMAV_PID_DIR%%/clamsmtpd.pid ] \|\| %%PREFIX%%/etc/rc.d/clamsmtpd.sh stop \|\| true	2	@unexec [ ! -f %%CLAMAV_PID_DIR%%/clamsmtpd.pid ] \|\| %%PREFIX%%/etc/rc.d/clamsmtpd.sh stop \|\| true
3	sbin/clamsmtpd	3	sbin/clamsmtpd
4	etc/rc.d/clamsmtpd.sh
5	etc/clamsmtpd.conf-sample	4	etc/clamsmtpd.conf-sample




#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: clamsmtpd
# REQUIRE: DAEMON
# KEYWORD: FreeBSD
#
# Add the fellowing line to /etc/rc.conf to enable clamsmtpd:
#
# clamsmtpd_enable="YES"
#

. %%RC_SUBR%%

name="clamsmtpd"
rcvar=`set_rcvar`

command=%%PREFIX%%/sbin/${name}
sig_stop=-KILL

load_rc_config ${name}

clamsmtpd_enable=${clamsmtpd_enable-"NO"}
clamsmtpd_conf=${clamsmtpd_conf-"%%PREFIX%%/etc/clamsmtpd.conf"}
clamsmtpd_pid=${clamsmtpd_pid-"%%CLAMAV_PID_DIR%%/clamsmtpd.pid"}
clamsmtpd_debug=${clamsmtpd_debug-"0"}

command_args="-f ${clamsmtpd_conf} -p ${clamsmtpd_pid}"

pidfile=${clamsmtpd_pid}

run_rc_command "$1"




#!/bin/sh
#
# $FreeBSD: ports/security/clamsmtp/files/clamsmtpd.sh.tmpl,v 1.5 2005/09/05 03:16:20 clsung Exp $
#
# PROVIDE: clamsmtpd
# REQUIRE: DAEMON
# KEYWORD: FreeBSD
#
# Add the fellowing line to /etc/rc.conf to enable clamsmtpd:
#
# clamsmtpd_enable="YES"
#

. %%RC_SUBR%%

name=clamsmtpd
rcvar=`set_rcvar`

command=%%PREFIX%%/sbin/${name}
sig_stop=-KILL

load_rc_config ${name}

clamsmtpd_enable=${clamsmtpd_enable-"NO"}
clamsmtpd_conf=${clamsmtpd_conf-"%%PREFIX%%/etc/clamsmtpd.conf"}
clamsmtpd_pid=${clamsmtpd_pid-"%%CLAMAV_PID_DIR%%/clamsmtpd.pid"}
clamsmtpd_debug=${clamsmtpd_debug-"0"}

command_args="-f ${clamsmtpd_conf} -p ${clamsmtpd_pid}"

pidfile=${clamsmtpd_pid}

run_rc_command "$1"




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 */

Return to bug 91713

Lines 6-42 Link Here

(-)Makefile (-14 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= clamsmtp	8	PORTNAME= clamsmtp
9	PORTVERSION= 1.5	9	PORTVERSION= 1.6
10	PORTREVISION= 2
11	CATEGORIES= security	10	CATEGORIES= security
12	MASTER_SITES= http://memberwebs.com/nielsen/software/clamsmtp/	11	MASTER_SITES= http://memberwebs.com/nielsen/software/clamsmtp/
13		12
14	MAINTAINER= clsung@FreeBSD.org	13	MAINTAINER= clsung@FreeBSD.org
15	COMMENT= An ClamAV anti-virus SMTP Filter	14	COMMENT= An ClamAV anti-virus SMTP Filter
16		15
17	RUN_DEPENDS= ${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav
18
19	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
20	USE_GMAKE= yes	17	USE_GMAKE= yes
21	USE_REINPLACE= yes	18	USE_REINPLACE= yes
22	USE_RC_SUBR= yes	19	USE_RC_SUBR= clamsmtpd.sh
23	RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} CLAMAV_PID_DIR=${CLAMAV_PID_DIR}	20	SUB_LIST= CLAMAV_PID_DIR=${CLAMAV_PID_DIR}
24	STARTUP_FILE= ${PREFIX}/etc/rc.d/clamsmtpd.sh	21
		22	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
25		23
26	CLAMAV_PID_DIR?= /var/run/clamav	24	CLAMAV_PID_DIR?= /var/run/clamav
27		25
28	MAN5= clamsmtpd.conf.5	26	MAN5= clamsmtpd.conf.5
29	MAN8= clamsmtpd.8	27	MAN8= clamsmtpd.8
30		28
31	.if !defined(NOPORTDOCS)
32	PORTDOCS= *	29	PORTDOCS= *
		30
		31	.if exists(${LOCALBASE}/sbin/clamd)
		32	RUN_DEPENDS+= ${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav
33	.endif	33	.endif
34		34
		35	post-patch:
		36	@${REINPLACE_CMD} -e "s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS}," ${WRKSRC}/configure
		37
35	post-install:	38	post-install:
36	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
37	${FILESDIR}/clamsmtpd.sh.tmpl > ${STARTUP_FILE}
38	@${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${PREFIX}/etc/clamsmtpd.conf-sample	39	@${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${PREFIX}/etc/clamsmtpd.conf-sample
39	@${CHMOD} 755 ${STARTUP_FILE}
40	.if !defined(NOPORTDOCS)	40	.if !defined(NOPORTDOCS)
41	@${MKDIR} ${DOCSDIR}	41	@${MKDIR} ${DOCSDIR}
42	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}	42	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
Lines 44-50 Link Here
44	.endif	44	.endif
45	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGMESSAGE}	45	@${SED} -e "s,%%PREFIX%%,${PREFIX},g" ${PKGMESSAGE}
46		46
47	post-patch:
48	@${REINPLACE_CMD} -e "s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS}," ${WRKSRC}/configure
49
50	.include <bsd.port.mk>	47	.include <bsd.port.mk>

Added Link Here

(-)files/clamsmtpd.sh.in (+33 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD$
4	#
5	# PROVIDE: clamsmtpd
6	# REQUIRE: DAEMON
7	# KEYWORD: FreeBSD
8	#
9	# Add the fellowing line to /etc/rc.conf to enable clamsmtpd:
10	#
11	# clamsmtpd_enable="YES"
12	#
13
14	. %%RC_SUBR%%
15
16	name="clamsmtpd"
17	rcvar=`set_rcvar`
18
19	command=%%PREFIX%%/sbin/${name}
20	sig_stop=-KILL
21
22	load_rc_config ${name}
23
24	clamsmtpd_enable=${clamsmtpd_enable-"NO"}
25	clamsmtpd_conf=${clamsmtpd_conf-"%%PREFIX%%/etc/clamsmtpd.conf"}
26	clamsmtpd_pid=${clamsmtpd_pid-"%%CLAMAV_PID_DIR%%/clamsmtpd.pid"}
27	clamsmtpd_debug=${clamsmtpd_debug-"0"}
28
29	command_args="-f ${clamsmtpd_conf} -p ${clamsmtpd_pid}"
30
31	pidfile=${clamsmtpd_pid}
32
33	run_rc_command "$1"

Removed Link Here

(-)files/clamsmtpd.sh.tmpl (-33 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD: ports/security/clamsmtp/files/clamsmtpd.sh.tmpl,v 1.5 2005/09/05 03:16:20 clsung Exp $
4	#
5	# PROVIDE: clamsmtpd
6	# REQUIRE: DAEMON
7	# KEYWORD: FreeBSD
8	#
9	# Add the fellowing line to /etc/rc.conf to enable clamsmtpd:
10	#
11	# clamsmtpd_enable="YES"
12	#
13
14	. %%RC_SUBR%%
15
16	name=clamsmtpd
17	rcvar=`set_rcvar`
18
19	command=%%PREFIX%%/sbin/${name}
20	sig_stop=-KILL
21
22	load_rc_config ${name}
23
24	clamsmtpd_enable=${clamsmtpd_enable-"NO"}
25	clamsmtpd_conf=${clamsmtpd_conf-"%%PREFIX%%/etc/clamsmtpd.conf"}
26	clamsmtpd_pid=${clamsmtpd_pid-"%%CLAMAV_PID_DIR%%/clamsmtpd.pid"}
27	clamsmtpd_debug=${clamsmtpd_debug-"0"}
28
29	command_args="-f ${clamsmtpd_conf} -p ${clamsmtpd_pid}"
30
31	pidfile=${clamsmtpd_pid}
32
33	run_rc_command "$1"

Removed Link Here

(-)files/patch-smtppass.c (-57 lines)
1	diff -ur ../clamsmtp-1.5-orig/common/smtppass.c common/smtppass.c
2	--- common/smtppass.c Tue Aug 2 01:23:05 2005
3	+++ common/smtppass.c Sun Sep 4 11:52:13 2005
4	@@ -275,6 +275,26 @@
5
6	sp_messagex(NULL, LOG_DEBUG, "starting up (%s)...", VERSION);
7
8	+ /* Drop privileges before daemonizing */
9	+ drop_privileges();
10	+
11	+ /* When set to this we daemonize */
12	+ if(g_state.debug_level == -1)
13	+ {
14	+ /* Fork a daemon nicely here */
15	+ if(daemon(0, 0) == -1)
16	+ {
17	+ sp_message(NULL, LOG_ERR, "couldn't run as daemon");
18	+ exit(1);
19	+ }
20	+
21	+ sp_messagex(NULL, LOG_DEBUG, "running as a daemon");
22	+ g_state.daemonized = 1;
23	+
24	+ /* Open the system log */
25	+ openlog(g_state.name, 0, LOG_MAIL);
26	+ }
27	+
28	/* Create the socket */
29	sock = socket(SANY_TYPE(g_state.listenaddr), SOCK_STREAM, 0);
30	if(sock < 0)
31	@@ -297,26 +317,6 @@
32	exit(1);
33	}
34
35	- /* Drop privileges before daemonizing */
36	- drop_privileges();
37	-
38	- /* When set to this we daemonize */
39	- if(g_state.debug_level == -1)
40	- {
41	- /* Fork a daemon nicely here */
42	- if(daemon(0, 0) == -1)
43	- {
44	- sp_message(NULL, LOG_ERR, "couldn't run as daemon");
45	- exit(1);
46	- }
47	-
48	- sp_messagex(NULL, LOG_DEBUG, "running as a daemon");
49	- g_state.daemonized = 1;
50	-
51	- /* Open the system log */
52	- openlog(g_state.name, 0, LOG_MAIL);
53	- }
54	-
55	sp_messagex(NULL, LOG_DEBUG, "created socket: %s", g_state.listenname);
56
57	/* Handle some signals */