Attachment #52818 for bug #79974

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




#

PORTNAME=	esmtp
PORTVERSION=	0.5.1
PORTREVISION=	2
CATEGORIES=	mail
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

LIB_DEPENDS=	esmtp.6:${PORTSDIR}/mail/libesmtp

USE_BZIP2=	yes
GNU_CONFIGURE=	yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
USE_GETOPT_LONG=	yes
USE_OPENSSL=	yes
USE_REINPLACE=	yes
USE_BISON=	yes
USE_GETOPT_LONG=	yes
USE_REINPLACE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"

DOC_FILES=	README
MAN1=		esmtp.1
MAN5=		esmtprc.5
PORTDOCS=	README
PLIST_FILES=	bin/esmtp etc/esmtprc.sample

CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}

post-patch:
	@${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|g' \


do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
	${INSTALL_MAN} ${WRKSRC}/esmtprc.5 ${MANPREFIX}/man/man5
	${INSTALL_DATA} ${WRKSRC}/sample.esmtprc \
		${PREFIX}/etc/esmtprc.sample
	@${ECHO_MSG} "------------------------------------------------------------"
	@${ECHO_MSG} "Sample of configuration file placed at"
	@${ECHO_MSG} "${PREFIX}/etc/esmtprc.sample"
	@${ECHO_MSG} "------------------------------------------------------------"

post-install:
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for doc in ${PORTDOCS}
	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
.endfor
.endif


Lines 1-2 Link Here

(-)mail/esmtp/distinfo (-2 / +2 lines)
1	MD5 (esmtp-0.5.0.tar.bz2) = b22933aa12167080959b42b025047639	1	MD5 (esmtp-0.5.1.tar.bz2) = 9f0b809e891a548910f099efc4315b02
2	SIZE (esmtp-0.5.0.tar.bz2) = 125494	2	SIZE (esmtp-0.5.1.tar.bz2) = 127355

Lines 1-11 Link Here

(-)mail/esmtp/files/patch-esmtprc.5 (-6 / +6 lines)
1	--- esmtprc.5.orig Tue Jul 15 07:57:07 2003	1	--- esmtprc.5.orig Wed Feb 16 04:07:57 2005
2	+++ esmtprc.5 Tue Jul 15 07:58:05 2003	2	+++ esmtprc.5 Sun Apr 10 10:04:14 2005
3	@@ -96,8 +96,8 @@	3	@@ -137,8 +137,8 @@
4	place a %T. The mail message's \fBFrom\fR address will be inserted where you	4	place a %T. The mail message's \fBFrom\fR address will be inserted where you
5	place an %F.	5	place an %F.
6		6
7	-Some common MDAs are "/usr/bin/procmail -d %T",	7	-Some common MDAs are "/usr/bin/procmail -d %T", "/usr/bin/deliver" and
8	-"/usr/bin/deliver" and "/usr/lib/mail.local %T".	8	-"/usr/lib/mail.local %T".
9	+Some common MDAs are "/usr/local/bin/procmail -d %T"	9	+Some common MDAs are "/usr/local/bin/procmail -d %T"
10	+and "/usr/libexec/mail.local %T".	10	+and "/usr/libexec/mail.local %T".
11		11





$FreeBSD: ports/mail/esmtp/files/patch-smtp.c,v 1.1 2004/06/29 13:33:41 krion Exp $

--- smtp.c.orig	Fri Nov  7 12:47:16 2003
+++ smtp.c	Tue Jun 29 15:27:29 2004
@@ -426,9 +426,14 @@
 		goto failure;
 
 	/* Do what's needed at application level to use authentication. */
-	authctx = auth_create_context ();
-	auth_set_mechanism_flags (authctx, AUTH_PLUGIN_PLAIN, 0);
-	auth_set_interact_cb (authctx, authinteract, identity);
+	if(identity->user || identity->pass)
+	{
+		authctx = auth_create_context ();
+		auth_set_mechanism_flags (authctx, AUTH_PLUGIN_PLAIN, 0);
+		auth_set_interact_cb (authctx, authinteract, identity);
+	}
+	else
+		authctx = NULL;
 
 	/* Use our callback for X.509 certificate passwords.  If STARTTLS is not in
 	 * use or disabled in configure, the following is harmless.
@@ -560,7 +565,8 @@
 		fputc('\n', log_fp);
 
 	smtp_destroy_session (session);
-	auth_destroy_context (authctx);
+	if(authctx)
+		auth_destroy_context (authctx);
 	auth_client_exit ();
 
 	return;

Lines 1-4 Link Here

(-)mail/esmtp/pkg-plist (-4 lines)
1	bin/esmtp
2	etc/esmtprc.sample
3	%%PORTDOCS%%%%DOCSDIR%%/README
4	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 79974

Lines 6-13 Link Here

(-)mail/esmtp/Makefile (-17 / +19 lines)
6	#	6	#
7		7
8	PORTNAME= esmtp	8	PORTNAME= esmtp
9	PORTVERSION= 0.5.0	9	PORTVERSION= 0.5.1
10	PORTREVISION= 2
11	CATEGORIES= mail	10	CATEGORIES= mail
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 18-35 Link Here
18	LIB_DEPENDS= esmtp.6:${PORTSDIR}/mail/libesmtp	17	LIB_DEPENDS= esmtp.6:${PORTSDIR}/mail/libesmtp
19		18
20	USE_BZIP2= yes	19	USE_BZIP2= yes
21	GNU_CONFIGURE= yes
22	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
23	USE_GETOPT_LONG= yes
24	USE_OPENSSL= yes	20	USE_OPENSSL= yes
25	USE_REINPLACE= yes
26	USE_BISON= yes	21	USE_BISON= yes
27	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	22	USE_GETOPT_LONG= yes
28	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"	23	USE_REINPLACE= yes
		24	GNU_CONFIGURE= yes
		25	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
		26	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
29		27
30	DOC_FILES= README
31	MAN1= esmtp.1	28	MAN1= esmtp.1
32	MAN5= esmtprc.5	29	MAN5= esmtprc.5
		30	PORTDOCS= README
		31	PLIST_FILES= bin/esmtp etc/esmtprc.sample
		32
		33	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
		34	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
33		35
34	post-patch:	36	post-patch:
35	@${REINPLACE_CMD} -e 's\|/usr/bin\|${LOCALBASE}/bin\|g' \	37	@${REINPLACE_CMD} -e 's\|/usr/bin\|${LOCALBASE}/bin\|g' \
Lines 41-60 Link Here
41		43
42	do-install:	44	do-install:
43	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin	45	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
44	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1	46	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
45	${INSTALL_MAN} ${WRKSRC}/esmtprc.5 ${PREFIX}/man/man5	47	${INSTALL_MAN} ${WRKSRC}/esmtprc.5 ${MANPREFIX}/man/man5
46	${INSTALL_DATA} ${WRKSRC}/sample.esmtprc \	48	${INSTALL_DATA} ${WRKSRC}/sample.esmtprc \
47	${PREFIX}/etc/esmtprc.sample	49	${PREFIX}/etc/esmtprc.sample
48	@${ECHO} "------------------------------------------------------------"	50	@${ECHO_MSG} "------------------------------------------------------------"
49	@${ECHO} "Sample of configuration file placed at"	51	@${ECHO_MSG} "Sample of configuration file placed at"
50	@${ECHO} "${PREFIX}/etc/esmtprc.sample"	52	@${ECHO_MSG} "${PREFIX}/etc/esmtprc.sample"
51	@${ECHO} "------------------------------------------------------------"	53	@${ECHO_MSG} "------------------------------------------------------------"
52		54
53	post-install:	55	post-install:
54	.if !defined(NOPORTDOCS)	56	.if !defined(NOPORTDOCS)
55	@${MKDIR} ${DOCSDIR}	57	@${MKDIR} ${DOCSDIR}
56	.for doc in ${DOC_FILES}	58	.for doc in ${PORTDOCS}
57	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}	59	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
58	.endfor	60	.endfor
59	.endif	61	.endif
60		62

Lines 1-33 Link Here

(-)mail/esmtp/files/patch-smtp.c (-33 lines)
1
2	$FreeBSD: ports/mail/esmtp/files/patch-smtp.c,v 1.1 2004/06/29 13:33:41 krion Exp $
3
4	--- smtp.c.orig Fri Nov 7 12:47:16 2003
5	+++ smtp.c Tue Jun 29 15:27:29 2004
6	@@ -426,9 +426,14 @@
7	goto failure;
8
9	/* Do what's needed at application level to use authentication. */
10	- authctx = auth_create_context ();
11	- auth_set_mechanism_flags (authctx, AUTH_PLUGIN_PLAIN, 0);
12	- auth_set_interact_cb (authctx, authinteract, identity);
13	+ if(identity->user \|\| identity->pass)
14	+ {
15	+ authctx = auth_create_context ();
16	+ auth_set_mechanism_flags (authctx, AUTH_PLUGIN_PLAIN, 0);
17	+ auth_set_interact_cb (authctx, authinteract, identity);
18	+ }
19	+ else
20	+ authctx = NULL;
21
22	/* Use our callback for X.509 certificate passwords. If STARTTLS is not in
23	* use or disabled in configure, the following is harmless.
24	@@ -560,7 +565,8 @@
25	fputc('\n', log_fp);
26
27	smtp_destroy_session (session);
28	- auth_destroy_context (authctx);
29	+ if(authctx)
30	+ auth_destroy_context (authctx);
31	auth_client_exit ();
32
33	return;