Date: Thu, 25 Jul 2002 03:56:48 +0200 (CEST) From: Cyrille Lefevre <cyrille.lefevre@laposte.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ve@sci.fi, esr@snark.thyrsus.com Subject: ports/40961: Update: mail/fetchmail (5.9.13) Message-ID: <200207250156.g6P1umQR051485@gits.gits.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 40961
>Category: ports
>Synopsis: Update: mail/fetchmail (5.9.13)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 24 19:00:04 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Cyrille Lefevre
>Release: FreeBSD 4.6-STABLE i386
>Organization:
ACME
>Environment:
System: FreeBSD gits 4.6-STABLE FreeBSD 4.6-STABLE #17: Tue Jul 23 08:29:49 CEST 2002 root@gits:/disk2/freebsd/stable/src/sys/compile/CUSTOM i386
>Description:
Makefile
PORTVERSION bumped
FDOC -> DOCSDIR
DOCS -> DOC_FILES and HTML_FILES
CONFIGURE_ARGS+=-with-includes -> CONFIGURE_ARGS+=--with-includes
check for MAKE_KERBEROS5 added
contrib files installed
html files installed in DOCSDIR/html
distinfo
updated
pkg-plist
contrib files added
html files moved to DOCSDIR/html
locale updated
files/fetchmailconf
typo
files/patch-ai
deleted
files/patch-configure
updated
files/patch-kerberos.c
new file (PS: des_pcbc_encrypt manual entry doesn't
match <des.h> declaration)
>How-To-Repeat:
n/a
>Fix:
take care, this patch set is in two parts. the first one is
a diff against /dev/null and the second part a cvs diff.
--- /dev/null Thu Jul 25 03:40:11 2002
+++ files/patch-kerberos.c Thu Jul 25 03:17:17 2002
@@ -0,0 +1,22 @@
+--- kerberos.c.orig Thu Nov 8 17:39:18 2001
++++ kerberos.c Thu Jul 25 03:17:09 2002
+@@ -121,7 +121,7 @@
+
+ memcpy(session, credentials.session, sizeof session);
+ memset(&credentials, 0, sizeof credentials);
+- des_key_sched(session, schedule);
++ des_key_sched(&session, schedule);
+
+ result = krb_get_tf_fullname(TKT_FILE, tktuser, tktinst, tktrealm);
+ if (result) {
+@@ -241,8 +241,8 @@
+ while (authenticator.length & 7) {
+ authenticator.length++;
+ }
+- des_pcbc_encrypt((des_cblock *)authenticator.dat,
+- (des_cblock *)authenticator.dat, authenticator.length, schedule,
++ des_pcbc_encrypt(authenticator.dat,
++ authenticator.dat, authenticator.length, schedule,
+ &session, 1);
+
+ to64frombits(buf1, authenticator.dat, authenticator.length);
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/fetchmail/Makefile,v
retrieving revision 1.133
diff -u -r1.133 Makefile
--- Makefile 23 May 2002 04:29:10 -0000 1.133
+++ Makefile 25 Jul 2002 01:50:04 -0000
@@ -10,7 +10,7 @@
# want fetchmailconf to work, define WITH_X11
PORTNAME= fetchmail
-PORTVERSION= 5.9.11
+PORTVERSION= 5.9.13
CATEGORIES= mail ipv6
MASTER_SITES= http://www.tuxedo.org/~esr/fetchmail/ \
ftp://ftp.ccil.org/pub/esr/fetchmail/
@@ -34,9 +34,8 @@
MAN1= fetchmail.1
MLINKS= fetchmail.1 fetchmailconf.1
-FDOC= ${PREFIX}/share/doc/fetchmail
-DOCS= COPYING FAQ FEATURES NOTES README \
- design-notes.html fetchmail-FAQ.html fetchmail-features.html
+DOC_FILES= COPYING FAQ FEATURES NOTES README
+HTML_FILES= design-notes.html fetchmail-FAQ.html fetchmail-features.html
.include <bsd.port.pre.mk>
@@ -49,7 +48,8 @@
DOCS+= README.SSL
PLIST_SUB+= SSLDOCS="%%PORTDOCS%%"
.elif exists(${LOCALBASE}/lib/libssl.a) && exists(${LOCALBASE}/lib/libcrypto.a)
-CONFIGURE_ARGS+=-with-includes=${LOCALBASE}/include/openssl --with-ssl=${LOCALBASE}
+CONFIGURE_ARGS+=--with-includes=${LOCALBASE}/include/openssl \
+ --with-ssl=${LOCALBASE}
CONFIGURE_ENV+= RSAGLUE=-lRSAglue
DOCS+= README.SSL
PLIST_SUB+= SSLDOCS="%%PORTDOCS%%"
@@ -58,35 +58,55 @@
.endif
.if exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
-CONFIGURE_ARGS += --with-kerberos=/usr
+CONFIGURE_ARGS+=--with-kerberos=/usr
.endif
.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libkrb5.a)
-CONFIGURE_ARGS += --with-kerberos5=${KRB5_HOME}
+CONFIGURE_ARGS+=--with-kerberos5=${KRB5_HOME}
+.elif exists(/usr/lib/libkrb5.a) && defined(MAKE_KERBEROS5)
+CONFIGURE_ARGS+=--with-kerberos5=/usr
.endif
.if defined(WITH_NTLM)
-CONFIGURE_ARGS += --enable-NTLM
+CONFIGURE_ARGS+=--enable-NTLM
DOCS+= README.NTLM
PLIST_SUB+= NTLMDOCS="%%PORTDOCS%%"
.else
PLIST_SUB+= NTLMDOCS="%%PORTDOCS%%@comment "
.endif
+CPIO?= cpio
+
pre-patch:
- @${CP} -f /usr/include/md5.h ${WRKSRC}
- @${SED} -e "s,^#!/.*/python,#!${PREFIX}/bin/python,g" \
- ${WRKSRC}/fetchmailconf > ${WRKDIR}/fetchmailconf.temp
- @${MV} -f ${WRKDIR}/fetchmailconf.temp ${WRKSRC}/fetchmailconf
- @${SED} -e "s,@PREFIX@,${PREFIX},g" \
+ @${CP} -f /usr/include/md5.h ${WRKSRC}
+ @${SED} -e 's|^#!/.*/python|#!${LOCALBASE}/bin/python|g' \
+ -e "s|@PREFIX@|${PREFIX}|g" \
${FILESDIR}/fetchmailconf > ${WRKDIR}/fetchmailconf
-post-install:
+post-install: install-script install-contrib install-doc
+
+install-script:
+ @${INSTALL_SCRIPT} ${PREFIX}/bin/fetchmailconf \
+ ${PREFIX}/libexec/fetchmailconf.bin
+ @${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
+
+install-contrib:
+ @${MKDIR} ${EXAMPLESDIR}
+ @cd ${WRKSRC}/contrib && \
+ ${FIND} . -name RCS -prune -o -print | ${XARGS} ${CHMOD} a+r
+ @cd ${WRKSRC}/contrib && \
+ ${FIND} . -name RCS -prune -o -print | ${CPIO} -pdmu ${EXAMPLESDIR}
+
+install-doc:
.if !defined(NOPORTDOCS)
- ${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${FDOC}
- cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${FDOC}
+ @${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}/html
+.for file in ${DOC_FILES}
+ @${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.for file in ${HTML_FILES}
+ @${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}/html
+.endfor
.endif
- ${MV} ${PREFIX}/bin/fetchmailconf ${PREFIX}/libexec/fetchmailconf.bin
- ${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/fetchmail/distinfo,v
retrieving revision 1.107
diff -u -r1.107 distinfo
--- distinfo 23 May 2002 04:29:10 -0000 1.107
+++ distinfo 24 Jul 2002 11:42:02 -0000
@@ -1 +1 @@
-MD5 (fetchmail-5.9.11.tar.gz) = fff00cbf7be1d01a17605fee23ac96dd
+MD5 (fetchmail-5.9.13.tar.gz) = da6fbd034bf9af1e2ec078fa3141f06c
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/fetchmail/pkg-plist,v
retrieving revision 1.15
diff -u -r1.15 pkg-plist
--- pkg-plist 15 Jun 2001 07:51:44 -0000 1.15
+++ pkg-plist 25 Jul 2002 01:31:56 -0000
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
bin/fetchmail
bin/fetchmailconf
libexec/fetchmailconf.bin
@@ -8,17 +9,56 @@
%%PORTDOCS%%share/doc/fetchmail/README
%%NTLMDOCS%%share/doc/fetchmail/README.NTLM
%%SSLDOCS%%share/doc/fetchmail/README.SSL
-%%PORTDOCS%%share/doc/fetchmail/design-notes.html
-%%PORTDOCS%%share/doc/fetchmail/fetchmail-FAQ.html
-%%PORTDOCS%%share/doc/fetchmail/fetchmail-features.html
+%%PORTDOCS%%share/doc/fetchmail/html/design-notes.html
+%%PORTDOCS%%share/doc/fetchmail/html/fetchmail-FAQ.html
+%%PORTDOCS%%share/doc/fetchmail/html/fetchmail-features.html
+%%PORTDOCS%%@dirrm share/doc/fetchmail/html
%%PORTDOCS%%@dirrm share/doc/fetchmail
+share/examples/fetchmail/PopDel.manual
+share/examples/fetchmail/PopDel.py
+share/examples/fetchmail/README
+share/examples/fetchmail/README.getmail
+share/examples/fetchmail/debian_rc
+share/examples/fetchmail/domino
+share/examples/fetchmail/fetchmail-mode.el
+share/examples/fetchmail/fetchmaildistrib
+share/examples/fetchmail/fetchmailnochda.pl
+share/examples/fetchmail/fetchsetup
+share/examples/fetchmail/fetchspool
+share/examples/fetchmail/getfetchmail
+share/examples/fetchmail/getfetchmail.pl
+share/examples/fetchmail/getmail
+share/examples/fetchmail/gotmail
+share/examples/fetchmail/gotmail.awk
+share/examples/fetchmail/gotmail.conf
+share/examples/fetchmail/gotmail.html.awk
+share/examples/fetchmail/ip-up
+share/examples/fetchmail/login
+share/examples/fetchmail/logout
+share/examples/fetchmail/maildaemon
+share/examples/fetchmail/mailqueue.pl
+share/examples/fetchmail/multidrop
+share/examples/fetchmail/novell
+share/examples/fetchmail/poptest
+share/examples/fetchmail/preauth-harness
+share/examples/fetchmail/redhat_rc
+share/examples/fetchmail/runfetchmail
+share/examples/fetchmail/sm-hybrid
+share/examples/fetchmail/start_dynamic_ppp
+share/examples/fetchmail/toprocmail
+share/examples/fetchmail/zsh-completion
+@dirrm share/examples/fetchmail
+share/locale/ca/LC_MESSAGES/fetchmail.mo
share/locale/cs/LC_MESSAGES/fetchmail.mo
share/locale/da/LC_MESSAGES/fetchmail.mo
+share/locale/de/LC_MESSAGES/fetchmail.mo
share/locale/es/LC_MESSAGES/fetchmail.mo
share/locale/fr/LC_MESSAGES/fetchmail.mo
share/locale/gl/LC_MESSAGES/fetchmail.mo
+share/locale/ja/LC_MESSAGES/fetchmail.mo
share/locale/pl/LC_MESSAGES/fetchmail.mo
share/locale/pt_BR/LC_MESSAGES/fetchmail.mo
+share/locale/tr/LC_MESSAGES/fetchmail.mo
@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/share/locale/* 2>/dev/null || true
@unexec rmdir %D/share/locale 2>/dev/null || true
Index: files/fetchmailconf
===================================================================
RCS file: /home/ncvs/ports/mail/fetchmail/files/fetchmailconf,v
retrieving revision 1.4
diff -u -r1.4 fetchmailconf
--- files/fetchmailconf 30 May 2001 05:14:45 -0000 1.4
+++ files/fetchmailconf 25 Jul 2002 00:00:05 -0000
@@ -11,7 +11,7 @@
exec $PREFIX/libexec/fetchmailconf.bin
else
cat <<EOF
-The fetchmailconf program requires Python with Tkinter , which does not
+The fetchmailconf program requires Python with Tkinter, which does not
appear to be installed on this system. Python/Tkinter can be found in
the FreeBSD Ports Collection under x11-toolkits/py-tkinter.
EOF
Index: files/patch-configure
===================================================================
RCS file: /home/ncvs/ports/mail/fetchmail/files/patch-configure,v
retrieving revision 1.3
diff -u -r1.3 patch-configure
--- files/patch-configure 24 Apr 2001 06:24:45 -0000 1.3
+++ files/patch-configure 25 Jul 2002 00:59:59 -0000
@@ -1,9 +1,15 @@
-
-$FreeBSD: ports/mail/fetchmail/files/patch-configure,v 1.3 2001/04/24 06:24:45 roam Exp $
-
---- configure.orig Sun Mar 18 06:26:42 2001
-+++ configure Tue Mar 27 11:21:57 2001
-@@ -6240,7 +6240,7 @@
+--- configure.orig Fri Jun 7 17:44:49 2002
++++ configure Thu Jul 25 02:56:28 2002
+@@ -6090,7 +6090,7 @@
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lkrb5 ${LDEFLAGS} ${ac_krblibs} $LIBS"
++LIBS="-lkrb5 ${LDEFLAGS} ${ac_krblibs} ${libk5crypto} $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 6096 "configure"
+ #include "confdefs.h"
+@@ -6455,7 +6455,7 @@
CEFLAGS="$CEFLAGS -I$with_ssl/include"
fi
LDEFLAGS="$LDEFLAGS -L$with_ssl/lib"
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207250156.g6P1umQR051485>