From owner-freebsd-ports Mon Oct 25 2:46:26 1999 Delivered-To: freebsd-ports@freebsd.org Received: from ms.tokyo.jcom.ne.jp (ms.tokyo.jcom.ne.jp [210.234.123.18]) by hub.freebsd.org (Postfix) with ESMTP id 3ADD715111 for ; Mon, 25 Oct 1999 02:46:20 -0700 (PDT) (envelope-from musha@ms.tokyo.jcom.ne.jp) Received: from daemon.my.domain (pc343031.tokyo.jcom.ne.jp [203.140.143.31]) by ms.tokyo.jcom.ne.jp (8.9.1/3.7W 06/01/99) with ESMTP id SAA03789; Mon, 25 Oct 1999 18:46:17 +0900 (JST) Received: by daemon.my.domain (8.9.3/3.7W) id SAA13574; Mon, 25 Oct 1999 18:45:45 +0900 (JST) Date: Mon, 25 Oct 1999 18:45:44 +0900 Message-ID: <14356.9928.366891.72159A@archon.my.domain> From: Akinori MUSHA aka knu To: freebsd-ports@freebsd.org Cc: imap-uw@freebsd.ady.ro Subject: Re: ports/14359: Update port: mail/imap-uw In-Reply-To: In your message of "Sat, 16 Oct 1999 15:32:09 +0900" <14344.7145.148375.72159A@archon.my.domain> References: <14344.7145.148375.72159A@archon.my.domain> User-Agent: Wanderlust/2.2.5 (Come Undone) SEMI/1.13.7 (Awazu) PGPGPG FLIM/1.13.2 (Kasanui) MULE XEmacs/21.1 (patch 6) (Big Bend) (i386--freebsd) Organization: A.I.D. MIME-Version: 1.0 (generated by SEMI 1.13.7 - "Awazu") Content-Type: multipart/mixed; boundary="Multipart_Mon_Oct_25_18:45:44_1999-1" Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org --Multipart_Mon_Oct_25_18:45:44_1999-1 Content-Type: text/plain; charset=US-ASCII Here is a total patch for upgrading mail/imap-uw from 4.5 to 4.6. This patch includes previously attached patches of both ports/14359 and its followup that I originated. Beware lest you forget to setup /etc/pam.conf as mentioned on pkg/{DESCR,MESSAGE}. I hope this will be tested and commited soon. Thanks. -- / /__ __ / ) ) ) ) / http://www.idaemons.org/knu/ Akinori MUSHA aka / (_ / ( (__( mailto:knu@idaemons.org --Multipart_Mon_Oct_25_18:45:44_1999-1 Content-Type: text/plain; charset=US-ASCII Content-Disposition: attachment; filename="imap-uw.diff" Content-Transfer-Encoding: 7bit Index: Makefile =================================================================== RCS file: /home/cvs/imap-uw/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- Makefile 1999/10/24 18:13:26 1.1.1.1 +++ Makefile 1999/10/24 18:23:26 1.1.1.1.2.1 @@ -1,17 +1,17 @@ # New ports collection makefile for: imap-uw -# Version required: 4.5 +# Version required: 4.6 # Date created: 9 Jan 1997 # Whom: pst # # $FreeBSD: ports/mail/imap-uw/Makefile,v 1.30 1999/09/18 17:29:19 steve Exp $ # -DISTNAME= imap-4.5 -PKGNAME= imap-uw-4.5 +DISTNAME= imap-4.6 +PKGNAME= imap-uw-4.6 CATEGORIES= mail -MASTER_SITES= ftp://ftp.cac.washington.edu/imap/old/ \ - ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/old/ \ - ftp://ftp.uni-halle.de/pub/mail/pine/ +MASTER_SITES= ftp://ftp.cac.washington.edu/imap/ \ + http://mirror.nucba.ac.jp/mirror/imap/ \ + ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/ EXTRACT_SUFX= .tar.Z MAINTAINER= imap-uw@freebsd.ady.ro @@ -53,6 +53,8 @@ ${WRKSRC}/src/imapd/imapd.8c ${PREFIX}/man/man8/imapd.8 ${INSTALL_MAN} \ ${WRKSRC}/src/ipopd/ipopd.8c ${PREFIX}/man/man8/ipopd.8 + + @${CAT} ${PKGMESSAGE} post-install: ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib Index: files/md5 =================================================================== RCS file: /home/cvs/imap-uw/files/md5,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- md5 1999/10/24 18:13:26 1.1.1.1 +++ md5 1999/10/24 18:23:53 1.1.1.1.2.1 @@ -1,2 +1 @@ -MD5 (imap-4.5.tar.Z) = 24e5ff01e0f14ecc647f10a9148a9dbd -SIZE (imap-4.5.tar.Z) = 1656569 +MD5 (imap-4.6.tar.Z) = d5d7e5ebbdace57eed7706d4fd2ffc09 Index: patches/patch-ab =================================================================== RCS file: /home/cvs/imap-uw/patches/patch-ab,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1 -r1.1.1.1.2.2 --- patch-ab 1999/10/24 18:13:26 1.1.1.1 +++ patch-ab 1999/10/25 09:25:22 1.1.1.1.2.2 @@ -1,6 +1,6 @@ ---- src/osdep/unix/Makefile.orig Wed Jan 27 01:17:39 1999 -+++ src/osdep/unix/Makefile Sat Feb 27 17:16:00 1999 -@@ -100,7 +100,7 @@ +--- src/osdep/unix/Makefile.orig Thu Sep 30 14:52:54 1999 ++++ src/osdep/unix/Makefile Mon Oct 25 16:49:02 1999 +@@ -104,7 +104,7 @@ dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o @@ -9,8 +9,8 @@ MAKE=make MV=mv RM=rm -rf -@@ -115,6 +115,10 @@ - PASSWDTYPE=$(PASSWDTYPE) +@@ -119,6 +119,10 @@ + PASSWDTYPE=$(PASSWDTYPE) SPECIALAUTHENTICATORS="$(SPECIALAUTHENTICATORS)" BUILD=$(MAKE) build $(BUILDOPTIONS) +# Need this for the shared library rule to work correctly @@ -20,16 +20,23 @@ # Here if no make argument established missing: osdep.h -@@ -190,7 +194,7 @@ +@@ -191,11 +195,13 @@ + + bsf: # FreeBSD + $(BUILD) `cat EXTRASPECIALS` OS=bsi SIGTYPE=psx \ ++ CHECKPW=pam \ SPOOLDIR=/var \ ACTIVEFILE=/usr/local/news/lib/active \ RSHPATH=/usr/bin/rsh \ - BASECFLAGS="-g -O -pipe -DNFSKLUDGE" \ +- BASELDFLAGS="-lcrypt" ++ LOCKPGM=/etc/mlock \ + BASECFLAGS="-DNFSKLUDGE -DIGNORE_LOCK_EACCES_ERRORS" \ - BASELDFLAGS="-lcrypt" ++ BASELDFLAGS="-lpam -lcrypt" bsi: # BSD/i386 -@@ -606,19 +610,31 @@ + $(BUILD) `cat EXTRASPECIALS` OS=$@ \ +@@ -620,19 +626,31 @@ # Build it! @@ -63,7 +70,7 @@ # Dependencies -@@ -652,7 +668,7 @@ +@@ -666,7 +684,7 @@ # OS-dependent @@ -72,7 +79,7 @@ osdep.h env_unix.h tcp_unix.h \ osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \ auths.c flock.c flockbsd.c flcksafe.c fsync.c gethstid.c \ -@@ -664,7 +680,12 @@ +@@ -678,7 +696,12 @@ write.c \ strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ OSCFLAGS Index: patches/patch-ac =================================================================== RCS file: /home/cvs/imap-uw/patches/patch-ac,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- patch-ac 1999/10/24 18:13:26 1.1.1.1 +++ patch-ac 1999/10/24 18:24:01 1.1.1.1.2.1 @@ -1,5 +1,5 @@ ---- src/imapd/Makefile.orig Sat Nov 21 05:26:03 1998 -+++ src/imapd/Makefile Sat Feb 27 17:19:33 1999 +--- src/imapd/Makefile.orig Tue Oct 5 15:13:35 1999 ++++ src/imapd/Makefile Sat Oct 16 03:17:51 1999 @@ -31,9 +31,9 @@ # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -12,10 +12,10 @@ SHELL= /bin/sh # The "Manage Mail" menu item of Netscape Messager puts up an error message -@@ -56,7 +56,7 @@ - CC = `cat $C/CCTYPE` +@@ -59,7 +59,7 @@ CFLAGS = -I$C `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \ - -DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\" + -DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\" \ + -DWEBEXPRESS_BRAIN_DAMAGE=1 -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` +LDFLAGS = -L$C -l$(SHLIBBASE) `cat $C/LDFLAGS` Index: patches/patch-ad =================================================================== RCS file: patch-ad diff -N patch-ad --- /dev/null Mon Oct 25 16:45:26 1999 +++ /tmp/cvsw28470 Mon Oct 25 18:26:41 1999 @@ -0,0 +1,20 @@ +--- src/mtest/mtest.c.orig Sat May 29 14:07:06 1999 ++++ src/mtest/mtest.c Sat Oct 16 03:34:25 1999 +@@ -528,7 +528,7 @@ + void prompt (char *msg,char *txt) + { + printf ("%s",msg); +- gets (txt); ++ fgets (txt, MAILTMPLEN - 1, stdin); + } + + /* Interfaces to C-client */ +@@ -713,7 +713,7 @@ + puts (" Msg (end with a line with only a '.'):"); + body->type = TYPETEXT; + *text = '\0'; +- while (gets (line)) { ++ while (fgets (line, MAILTMPLEN - 1, stdin)) { + if (line[0] == '.') { + if (line[1] == '\0') break; + else strcat (text,"."); Index: pkg/DESCR =================================================================== RCS file: /home/cvs/imap-uw/pkg/DESCR,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- DESCR 1999/10/24 18:13:26 1.1.1.1 +++ DESCR 1999/10/24 18:25:02 1.1.1.1.2.1 @@ -12,9 +12,9 @@ pop3 stream tcp nowait root /usr/local/libexec/ipop3d ipop3d imap4 stream tcp nowait root /usr/local/libexec/imapd imapd -You may also have to edit your /etc/services (or Yellow Pages, -NetInfo, etc. equivalent) to register these services, such as: +and /etc/pam.conf file with lines such as: -pop 109/tcp -pop3 110/tcp -imap4 143/tcp [imap2 and imap4 share the same port again] +imap auth required pam_unix.so try_first_pass +imap account required pam_unix.so try_first_pass +pop auth required pam_unix.so try_first_pass +pop account required pam_unix.so try_first_pass Index: pkg/MESSAGE =================================================================== RCS file: MESSAGE diff -N MESSAGE --- /dev/null Mon Oct 25 16:45:26 1999 +++ /tmp/cvsb28470 Mon Oct 25 18:26:41 1999 @@ -0,0 +1,9 @@ +### +As of imap-uw 4.6 and later, you need to edit /etc/pam.conf to add support +for IMAP/POP. To do so, add the following four lines to this file: + +imap auth required pam_unix.so try_first_pass +imap account required pam_unix.so try_first_pass +pop auth required pam_unix.so try_first_pass +pop account required pam_unix.so try_first_pass +### --Multipart_Mon_Oct_25_18:45:44_1999-1-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message