1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

- Fix for CVE-2007-4565 [1]

- Manually include bsd.python.mk if WITH_X11 is set (after bsd.port.pre.mk) [2]

Security:	http://www.vuxml.org/freebsd/45500f74-5947-11dc-87c1-000e2e5785ad.html
Security:	http://fetchmail.berlios.de/fetchmail-SA-2007-02.txt
Submitted by:	Matthias Andree <matthias.andree@gmx.de> [1]
PR:		ports/116011 [1]
Submitted by:	Jacula Modyun <jacula@gmail.com> [2]
PR:		ports/115714 [2]
This commit is contained in:
Simon Barner 2007-09-03 19:22:28 +00:00
parent 3c005206b9
commit 3017d8ada2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=198702
2 changed files with 15 additions and 3 deletions

View File

@ -11,7 +11,7 @@
PORTNAME= fetchmail
PORTVERSION= 6.3.8
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_BERLIOS} \
${MASTER_SITE_SUNSITE:S/$/:sunsite/}\
@ -51,13 +51,14 @@ OPTIONS= X11 "Python/Tkinter dependencies for fetchmailconf" off \
POP2 "Build pop2 support (obsolete)." off \
GSSAPI "Build GSSAPI support (requires KRB5_HOME to be set)" off
.include <bsd.port.pre.mk>
.if defined(WITH_X11)
USE_PYTHON= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
RUN_DEPENDS+= ${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
.endif
.include <bsd.port.pre.mk>
# Pop2 is obsolete
.if defined(WITH_POP2)
CONFIGURE_ARGS+=--enable-POP2

View File

@ -0,0 +1,11 @@
--- sink.c (revision 5118)
+++ sink.c (revision 5119)
@@ -262,7 +262,7 @@
const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
/* don't bounce in reply to undeliverable bounces */
- if (!msg->return_path[0] ||
+ if (!msg || !msg->return_path[0] ||
strcmp(msg->return_path, "<>") == 0 ||
strcasecmp(msg->return_path, md1) == 0 ||
strncasecmp(msg->return_path, md2, strlen(md2)) == 0)