From owner-freebsd-ports Wed Feb 23 22:20: 9 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 812AB37BB16 for ; Wed, 23 Feb 2000 22:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id WAA68063; Wed, 23 Feb 2000 22:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from cummings.uol.com.br (cummings.uol.com.br [200.230.198.69]) by hub.freebsd.org (Postfix) with ESMTP id 04E9637BB17 for ; Wed, 23 Feb 2000 22:14:56 -0800 (PST) (envelope-from lioux-alias-ppp-FreeBSD-gnats-submit=freebsd.org@uol.com.br) Received: from 200.197.112.65 (bsa-1-as01-7-a22.gd.uol.com.br [200.197.118.22]) by cummings.uol.com.br (8.9.1/8.9.1) with ESMTP id EAA04092 for ; Thu, 24 Feb 2000 04:14:47 -0200 (BRST) Received: (qmail 63259 invoked by uid 1001); 24 Feb 2000 07:14:24 -0000 Message-Id: <20000224071424.63258.qmail@Fedaykin.here> Date: 24 Feb 2000 07:14:24 -0000 From: lioux@uol.com.br Reply-To: lioux@linf.unb.br To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/16952: Update port mail/fetchmail to 5.3.0 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 16952 >Category: ports >Synopsis: Update port mail/fetchmail to 5.3.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 23 22:20:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: Mario Sergio Fujikawa Ferreira >Release: FreeBSD 4.0-CURRENT i386 >Organization: >Environment: FreeBSD Here.here 4.0-CURRENT FreeBSD 4.0-CURRENT #3: Wed Feb 23 11:34:03 EST 2000 lioux@Fedaykin.here:/usr/current/src/sys/compile/LIOUX i386 >Description: Updated from version 5.2.8 to 5.3.0 + Files added: 1 files/patch-ac + Files removed: 3 files/patch-ae files/patch-af files/patch-ag >How-To-Repeat: Build the port. Hopefully. >Fix: diff -ruN /usr/ports/mail/fetchmail/Makefile ./Makefile --- /usr/ports/mail/fetchmail/Makefile Sat Feb 19 23:00:27 2000 +++ ./Makefile Thu Feb 24 04:10:45 2000 @@ -11,7 +11,7 @@ # does not need Python, so there is no RUN_DEPENDS for Python in # this Makefile. -DISTNAME= fetchmail-5.2.8 +DISTNAME= fetchmail-5.3.0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.ccil.org/pub/esr/fetchmail/ @@ -27,6 +27,12 @@ .if ${OSVERSION} >= 400014 CONFIGURE_ARGS+=--enable-inet6 +.if exists(${OPENSSLBASE}/lib/libssl.a) && exists(${OPENSSLBASE}/lib/libcrypto.a) +CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE} +.endif +.if exists(/usr/lib/libssl.a) && exists(/usr/lib/libcrypto.a) +CONFIGURE_ARGS+=--with-ssl=/usr +.endif .endif .if exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4) diff -ruN /usr/ports/mail/fetchmail/files/md5 ./files/md5 --- /usr/ports/mail/fetchmail/files/md5 Sun Feb 20 01:57:21 2000 +++ ./files/md5 Wed Feb 23 23:37:23 2000 @@ -1 +1 @@ -MD5 (fetchmail-5.2.8.tar.gz) = 4f4a31bfb31ca66532448c05ee29011c +MD5 (fetchmail-5.3.0.tar.gz) = a5656aaf9410c1f712bd63fd9e18a5cb diff -ruN /usr/ports/mail/fetchmail/patches/patch-aa ./patches/patch-aa --- /usr/ports/mail/fetchmail/patches/patch-aa Sun Jun 13 23:18:42 1999 +++ ./patches/patch-aa Thu Feb 24 00:31:12 2000 @@ -1,20 +1,21 @@ -*** md5ify.c.orig Sun Nov 22 07:37:48 1998 ---- md5ify.c Sat Jun 12 08:12:32 1999 -*************** -*** 17,23 **** - #include - #endif - -! #include "md5.h" - - char * - MD5Digest (unsigned char *s) ---- 17,24 ---- - #include - #endif - -! #include -! #include - - char * - MD5Digest (unsigned char *s) +diff -ruN ../fetchmail-5.3.0.OLD/Makefile.in ./Makefile.in +--- ../fetchmail-5.3.0.OLD/Makefile.in Tue Feb 22 13:48:21 2000 ++++ ./Makefile.in Wed Feb 23 23:40:25 2000 +@@ -70,6 +70,8 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + # Program to install the man page. + INSTALL_DATA = @INSTALL_DATA@ ++# Program to install scripts ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + # Generic install program. + INSTALL = @INSTALL@ + +@@ -152,7 +154,7 @@ + @echo "Installing fetchmail binary..." + $(INSTALL_PROGRAM) ./fetchmail $(bindir)/fetchmail + @echo "Installing fetchmail configurator..." +- $(INSTALL_PROGRAM) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf ++ $(INSTALL_SCRIPT) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf + @echo "Installing manual page..." + $(INSTALL_DATA) $(srcdir)/fetchmail.man $(mandir)/fetchmail.$(manext) + rm -f $(mandir)/fetchmailconf.$(manext) diff -ruN /usr/ports/mail/fetchmail/patches/patch-ab ./patches/patch-ab --- /usr/ports/mail/fetchmail/patches/patch-ab Mon Jan 17 23:52:47 2000 +++ ./patches/patch-ab Wed Feb 23 23:51:33 2000 @@ -1,20 +1,15 @@ ---- Makefile.in.orig Tue Jan 4 15:58:45 2000 -+++ Makefile.in Wed Jan 12 09:03:38 2000 -@@ -70,6 +70,8 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - # Program to install the man page. - INSTALL_DATA = @INSTALL_DATA@ -+# Program to install scripts -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - # Generic install program. - INSTALL = @INSTALL@ - -@@ -152,7 +154,7 @@ - @echo "Installing fetchmail binary..." - $(INSTALL_PROGRAM) ./fetchmail $(bindir)/fetchmail - @echo "Installing fetchmail configurator..." -- $(INSTALL_PROGRAM) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf -+ $(INSTALL_SCRIPT) ${srcdir}/fetchmailconf $(bindir)/fetchmailconf - @echo "Installing manual page..." - $(INSTALL_DATA) $(srcdir)/fetchmail.man $(mandir)/fetchmail.$(manext) - rm -f $(mandir)/fetchmailconf.$(manext) +diff -ruN ../fetchmail-5.3.0.OLD/conf.c ./conf.c +--- ../fetchmail-5.3.0.OLD/conf.c Fri Feb 18 01:31:22 2000 ++++ ./conf.c Wed Feb 23 23:48:58 2000 +@@ -249,9 +249,10 @@ + stringdump("via", ctl->server.via); + stringdump("protocol", + using_kpop ? "KPOP" : showproto(ctl->server.protocol)); +- numdump("port", ctl->server.port); + #if INET6_ENABLE + stringdump("service", ctl->server.service); ++#else ++ numdump("port", ctl->server.port); + #endif + numdump("timeout", ctl->server.timeout); + numdump("interval", ctl->server.interval); diff -ruN /usr/ports/mail/fetchmail/patches/patch-ac ./patches/patch-ac --- /usr/ports/mail/fetchmail/patches/patch-ac Wed Dec 31 21:00:00 1969 +++ ./patches/patch-ac Wed Feb 23 23:51:33 2000 @@ -0,0 +1,39 @@ +diff -ruN ../fetchmail-5.3.0.OLD/configure ./configure +--- ../fetchmail-5.3.0.OLD/configure Wed Feb 16 11:27:00 2000 ++++ ./configure Wed Feb 23 23:42:25 2000 +@@ -1595,7 +1595,7 @@ + if test `uname` = "FreeBSD" + then + echo "Adding -lkvm to standard libraries" +- LIBS="$LIBS -lkvm" ++ LIBS="$LIBS -lmd -lkvm" + fi + + # Check for Rhapsody special case: it doesn't like -s +@@ -5555,7 +5555,7 @@ + then + echo "Configuring kerberosIV for `uname`" + CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I/usr/include/kerberosIV" +- LIBS="$LIBS -lkrb -ldes" ++ LIBS="$LIBS -lkrb -ldes -lcom_err" + elif test -n "$with_kerberos" -a -n "$with_kerberos5" -a "$with_kerberos" != "no" + then + CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include" +@@ -5586,7 +5586,7 @@ + then + CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include" + LDEFLAGS="$LDEFLAGS -L$with_kerberos/lib" +- LIBS="$LIBS -lkrb -ldes" ++ LIBS="$LIBS -lkrb -ldes -lcom_err" + else + if test "$with_kerberos" != "no" + then +@@ -5596,7 +5596,7 @@ + then + CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$dir/include" + LDEFLAGS="$LDEFLAGS -L$dir/lib" +- LIBS="$LIBS -lkrb -ldes" ++ LIBS="$LIBS -lkrb -ldes -lcom_err" + break + fi + done diff -ruN /usr/ports/mail/fetchmail/patches/patch-ad ./patches/patch-ad --- /usr/ports/mail/fetchmail/patches/patch-ad Fri Feb 4 00:07:56 2000 +++ ./patches/patch-ad Wed Feb 23 23:58:18 2000 @@ -1,38 +1,9 @@ ---- configure.orig Sun Jan 16 10:07:09 2000 -+++ configure Sun Jan 30 21:03:36 2000 -@@ -1595,7 +1595,7 @@ - if test `uname` = "FreeBSD" - then - echo "Adding -lkvm to standard libraries" -- LIBS="$LIBS -lkvm" -+ LIBS="$LIBS -lmd -lkvm" - fi - - # Check for Rhapsody special case: it doesn't like -s -@@ -5555,7 +5555,7 @@ - then - echo "Configuring kerberosIV for `uname`" - CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I/usr/include/kerberosIV" -- LIBS="$LIBS -lkrb -ldes" -+ LIBS="$LIBS -lkrb -ldes -lcom_err" - elif test -n "$with_kerberos" -a -n "$with_kerberos5" -a "$with_kerberos" != "no" - then - CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include" -@@ -5586,7 +5586,7 @@ - then - CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include" - LDEFLAGS="$LDEFLAGS -L$with_kerberos/lib" -- LIBS="$LIBS -lkrb -ldes" -+ LIBS="$LIBS -lkrb -ldes -lcom_err" - else - if test "$with_kerberos" != "no" - then -@@ -5596,7 +5596,7 @@ - then - CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$dir/include" - LDEFLAGS="$LDEFLAGS -L$dir/lib" -- LIBS="$LIBS -lkrb -ldes" -+ LIBS="$LIBS -lkrb -ldes -lcom_err" - break - fi - done +diff -ruN ../fetchmail-5.3.0.OLD/md5.h ./md5.h +--- ../fetchmail-5.3.0.OLD/md5.h Sun Dec 19 15:18:14 1999 ++++ ./md5.h Wed Feb 23 23:46:56 2000 +@@ -1,4 +1,5 @@ + #ifndef _MD5_H_ + #define _MD5_H_ ++#include + #include + #endif /* _MD5_H_ */ diff -ruN /usr/ports/mail/fetchmail/patches/patch-ae ./patches/patch-ae --- /usr/ports/mail/fetchmail/patches/patch-ae Sun Jun 13 23:18:49 1999 +++ ./patches/patch-ae Wed Dec 31 21:00:00 1969 @@ -1,10 +0,0 @@ -*** md5.h.orig Sat Jun 12 08:25:56 1999 ---- md5.h Sat Jun 12 08:26:06 1999 -*************** -*** 1,4 **** ---- 1,5 ---- - #ifndef _MD5_H_ - #define _MD5_H_ -+ #include - #include - #endif /* _MD5_H_ */ diff -ruN /usr/ports/mail/fetchmail/patches/patch-af ./patches/patch-af --- /usr/ports/mail/fetchmail/patches/patch-af Tue Feb 22 13:45:19 2000 +++ ./patches/patch-af Wed Dec 31 21:00:00 1969 @@ -1,16 +0,0 @@ ---- conf.c.orig Sat Feb 5 13:06:12 2000 -+++ conf.c Mon Feb 21 03:00:57 2000 -@@ -249,10 +249,10 @@ - stringdump("via", ctl->server.via); - stringdump("protocol", - using_kpop ? "KPOP" : showproto(ctl->server.protocol)); --#if !INET6_ENABLE -- numdump("port", ctl->server.port); -+#if INET6_ENABLE -+ stringdump("service", ctl->server.service); - #else -- stringdump("service", ctl->server.service); -+ numdump("port", ctl->server.port); - #endif - numdump("timeout", ctl->server.timeout); - numdump("interval", ctl->server.interval); diff -ruN /usr/ports/mail/fetchmail/patches/patch-ag ./patches/patch-ag --- /usr/ports/mail/fetchmail/patches/patch-ag Tue Feb 22 13:45:19 2000 +++ ./patches/patch-ag Wed Dec 31 21:00:00 1969 @@ -1,21 +0,0 @@ ---- rcfile_y.y.orig Sat Feb 5 13:08:46 2000 -+++ rcfile_y.y Mon Feb 21 02:57:43 2000 -@@ -162,10 +162,15 @@ - #endif /* INET6_ENABLE */ - } - | PORT NUMBER { --#if !INET6_ENABLE -+#if INET6_ENABLE -+ int port = $2; -+ char buf[10]; -+ sprintf(buf, "%d", port); -+ current.server.service = xstrdup(buf); -+#else - current.server.port = $2; --#endif /* !INET6_ENABLE */ -- } -+#endif /* INET6_ENABLE */ -+ } - | INTERVAL NUMBER {current.server.interval = $2;} - | PREAUTHENTICATE PASSWORD {current.server.preauthenticate = A_PASSWORD;} - | PREAUTHENTICATE KERBEROS4 {current.server.preauthenticate = A_KERBEROS_V4;} >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message