aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbarner <barner@FreeBSD.org>2005-10-31 03:06:46 +0800
committerbarner <barner@FreeBSD.org>2005-10-31 03:06:46 +0800
commit5f22502c3eae5df2ea37b729a3043078c9a1ae30 (patch)
treec019285bad93826d7db11c92c2d00dfa88e999fa
parentb9feb12e46d747411113dacebc38beb82fc31370 (diff)
downloadfreebsd-ports-gnome-5f22502c3eae5df2ea37b729a3043078c9a1ae30.tar.gz
freebsd-ports-gnome-5f22502c3eae5df2ea37b729a3043078c9a1ae30.tar.zst
freebsd-ports-gnome-5f22502c3eae5df2ea37b729a3043078c9a1ae30.zip
- Use fetchmailconf-1.43.2 in order to fix a password exposure caused by
insecure file creation. - While here, move berlios.de to the top of the MASTERSITEs, since development takes place there. - Bump PORTREVISION Security: CVE-2005-3088 Security: http://fetchmail.berlios.de/fetchmail-SA-2005-02.txt
-rw-r--r--mail/fetchmail/Makefile25
-rw-r--r--mail/fetchmail/distinfo2
2 files changed, 19 insertions, 8 deletions
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 8d484ed58c67..e9f15e58a26d 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -11,14 +11,18 @@
PORTNAME= fetchmail
PORTVERSION= 6.2.5.2
+PORTREVISION= 1
CATEGORIES= mail ipv6
-MASTER_SITES= http://www.catb.org/~esr/%SUBDIR%/ \
- http://download.berlios.de/%SUBDIR%/ \
- ftp://ftp.ayamura.org/pub/%SUBDIR%/ \
- ftp://ftp.win.jp/pub/%SUBDIR%/ \
- ftp://ftp.dti.ad.jp/pub/net/mail/%SUBDIR%/
-MASTER_SITE_SUBDIR= fetchmail
+MASTER_SITES= http://download.berlios.de/%SUBDIR%/:fetchmail_site,fetchmailconf_site \
+ http://www.catb.org/~esr/%SUBDIR%/:fetchmail_site \
+ ftp://ftp.ayamura.org/pub/%SUBDIR%/:fetchmail_site \
+ ftp://ftp.win.jp/pub/%SUBDIR%/:fetchmail \
+ ftp://ftp.dti.ad.jp/pub/net/mail/%SUBDIR%/:fetchmail_site
+MASTER_SITE_SUBDIR= fetchmail/:fetchmail_site,fetchmailconf_site
DISTNAME= ${PORTNAME}-6.2.5
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:fetchmail_site \
+ fetchmailconf-${FETCHMAILCONF_VER}.gz:fetchmailconf_site
+EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES= http://download.berlios.de/%SUBDIR%/
PATCH_SITE_SUBDIR= fetchmail
@@ -28,6 +32,8 @@ PATCH_DIST_STRIP=-p1
MAINTAINER= barner@FreeBSD.org
COMMENT= Batch mail retrieval utility for IMAP/POP2/POP3/APOP/KPOP/ETRN/ODMR
+FETCHMAILCONF_VER=1.43.2
+
.if defined(WITH_X11)
RUN_DEPENDS= ${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
.endif
@@ -103,8 +109,11 @@ PLIST_SUB+= NTLMDOCS="%%PORTDOCS%%@comment "
pre-patch:
@${CP} -f /usr/include/md5.h ${WRKSRC}
- @${SED} -e "s,^#!/.*/python,#!${PREFIX}/bin/python,g" \
- ${WRKSRC}/fetchmailconf > ${WRKDIR}/fetchmailconf.temp
+ # Use fetchmailconf-1.43.2 to avoid a password exposure
+ # caused by insecure file creation
+ @${GZCAT} ${DISTDIR}/fetchmailconf-${FETCHMAILCONF_VER}.gz | \
+ ${SED} -e "s,^#!/.*/python,#!${PREFIX}/bin/python,g" \
+ > ${WRKDIR}/fetchmailconf.temp
@${MV} -f ${WRKDIR}/fetchmailconf.temp ${WRKSRC}/fetchmailconf
@${SED} -e "s,@PREFIX@,${PREFIX},g" \
${FILESDIR}/fetchmailconf > ${WRKDIR}/fetchmailconf
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index da2e6361aecf..4409a9328937 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1,4 +1,6 @@
MD5 (fetchmail-6.2.5.tar.gz) = 9956b30139edaa4f5f77c4d0dbd80225
SIZE (fetchmail-6.2.5.tar.gz) = 1257376
+MD5 (fetchmailconf-1.43.2.gz) = 804bcae14431941c8b2c5e8f0011da7b
+SIZE (fetchmailconf-1.43.2.gz) = 24010
MD5 (fetchmail-patch-6.2.5.2.gz) = be18f89b94e937a22560aa452e524c4b
SIZE (fetchmail-patch-6.2.5.2.gz) = 2000