From owner-freebsd-ports Sun Dec 12 8:34:13 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 635BE14E4C for ; Sun, 12 Dec 1999 08:34:00 -0800 (PST) (envelope-from musha@ms.tokyo.jcom.ne.jp) Received: from daemon.local.idaemons.org (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 BAA13620; Mon, 13 Dec 1999 01:32:24 +0900 (JST) Received: by daemon.local.idaemons.org (8.9.3/3.7W) id BAA66876; Mon, 13 Dec 1999 01:31:52 +0900 (JST) Date: Mon, 13 Dec 1999 01:31:50 +0900 Message-ID: <86g0x85de1.wl@localhost.local.idaemons.org> From: Akinori MUSHA aka knu To: sprice@hiwaay.net, ady@warpnet.ro, freebsd-ports@freebsd.org Subject: Re: ports/14359: Update port: mail/imap-uw In-Reply-To: In your message of "Sun, 12 Dec 1999 00:58:40 +0900" <86bt7x1nbj.wl@localhost.local.idaemons.org> References: <86bt7x1nbj.wl@localhost.local.idaemons.org> User-Agent: Wanderlust/2.2.12 (Joyride) SEMI/1.13.7 (Awazu) PGPGPG FLIM/1.13.2 (Kasanui) MULE XEmacs/21.1 (patch 8) (Bryce Canyon) (i386--freebsd) Organization: A.I.D. MIME-Version: 1.0 (generated by SEMI 1.13.7 - "Awazu") Content-Type: multipart/mixed; boundary="Multipart_Mon_Dec_13_01:31:50_1999-1" Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org --Multipart_Mon_Dec_13_01:31:50_1999-1 Content-Type: text/plain; charset=US-ASCII I could test my patch on the latest -CURRENT to see there's no problem. Of course I also tested it on the latest -STABLE (-RC) and everything seems very good. I attached a new patch which should supersede all that I sent previously. Steve, please commit it after the unfreeze. Thanks. -- / /__ __ / ) ) ) ) / http://www.idaemons.org/knu/ Akinori MUSHA aka / (_ / ( (__( mailto:knu@idaemons.org "We are but hungry.. Associated Ita-meshi Daemons!" http://www.idaemons.org/ --Multipart_Mon_Dec_13_01:31:50_1999-1 Content-Type: application/octet-stream; type=patch Content-Disposition: attachment; filename="imap-uw.diff" Content-Transfer-Encoding: 7bit diff -ruN imap-uw.old/Makefile imap-uw/Makefile --- imap-uw.old/Makefile Sun Sep 19 02:29:19 1999 +++ imap-uw/Makefile Mon Dec 13 01:00:37 1999 @@ -1,16 +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/ \ + http://mirror.nucba.ac.jp/mirror/imap/old/ \ ftp://ftp.uni-halle.de/pub/mail/pine/ EXTRACT_SUFX= .tar.Z @@ -36,6 +37,9 @@ post-configure: @${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}" +post-patch: + @${CP} ${FILESDIR}/safegets.[ch] ${WRKSRC}/src/mtest/ + do-install: ${INSTALL_DATA} ${WRKSRC}/c-client/mail.h ${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/c-client/rfc822.h ${PREFIX}/include @@ -53,6 +57,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 diff -ruN imap-uw.old/files/md5 imap-uw/files/md5 --- imap-uw.old/files/md5 Mon Mar 15 10:38:38 1999 +++ imap-uw/files/md5 Mon Dec 13 00:47:05 1999 @@ -1,2 +1 @@ -MD5 (imap-4.5.tar.Z) = 24e5ff01e0f14ecc647f10a9148a9dbd -SIZE (imap-4.5.tar.Z) = 1656569 +MD5 (imap-4.6.tar.Z) = d5d7e5ebbdace57eed7706d4fd2ffc09 diff -ruN imap-uw.old/files/safegets.c imap-uw/files/safegets.c --- imap-uw.old/files/safegets.c Thu Jan 1 09:00:00 1970 +++ imap-uw/files/safegets.c Mon Dec 13 00:47:05 1999 @@ -0,0 +1,19 @@ +#include +#include +#include "mail.h" /* MAILTMPLEN */ + +static char buf[MAILTMPLEN]; + +char *safegets(char *buf) { + char *p; + + if (!fgets(buf, MAILTMPLEN, stdin)) { + return NULL; + } + + if (NULL != (p = strchr(buf, '\n'))) { + *p = '\0'; + } + + return buf; +} diff -ruN imap-uw.old/files/safegets.h imap-uw/files/safegets.h --- imap-uw.old/files/safegets.h Thu Jan 1 09:00:00 1970 +++ imap-uw/files/safegets.h Mon Dec 13 00:47:05 1999 @@ -0,0 +1 @@ +char *safegets(char *buf); diff -ruN imap-uw.old/patches/patch-ab imap-uw/patches/patch-ab --- imap-uw.old/patches/patch-ab Tue May 4 23:41:36 1999 +++ imap-uw/patches/patch-ab Mon Dec 13 00:47:05 1999 @@ -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 diff -ruN imap-uw.old/patches/patch-ac imap-uw/patches/patch-ac --- imap-uw.old/patches/patch-ac Mon Mar 15 10:38:38 1999 +++ imap-uw/patches/patch-ac Mon Dec 13 00:47:05 1999 @@ -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` @@ -31,15 +31,4 @@ +LDFLAGS = -L$C -l$(SHLIBBASE) `cat $C/LDFLAGS` ipopd: ipop2d ipop3d - ---- src/mtest/Makefile.orig Wed Apr 15 01:42:04 1998 -+++ src/mtest/Makefile Sat Oct 10 21:48:18 1998 -@@ -39,7 +39,7 @@ - - CC = `cat $C/CCTYPE` - CFLAGS = -I$C `cat $C/CFLAGS` --LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` -+LDFLAGS = -L$C -l$(SHLIBBASE) `cat $C/LDFLAGS` - - all: mtest diff -ruN imap-uw.old/patches/patch-ad imap-uw/patches/patch-ad --- imap-uw.old/patches/patch-ad Thu Jan 1 09:00:00 1970 +++ imap-uw/patches/patch-ad Mon Dec 13 00:47:05 1999 @@ -0,0 +1,22 @@ +--- src/mtest/Makefile.orig Wed Apr 15 07:42:04 1998 ++++ src/mtest/Makefile Mon Oct 25 21:37:51 1999 +@@ -39,14 +39,16 @@ + + CC = `cat $C/CCTYPE` + CFLAGS = -I$C `cat $C/CFLAGS` +-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` ++LDFLAGS = -L$C -l$(SHLIBBASE) `cat $C/LDFLAGS` + + all: mtest + +-mtest: $(CCLIENTLIB) mtest.o +- $(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS) ++mtest: $(CCLIENTLIB) mtest.o safegets.o ++ $(CC) $(CFLAGS) -o mtest mtest.o safegets.o $(LDFLAGS) + + mtest.o: $C/mail.h $C/misc.h $C/osdep.h $C/rfc822.h $C/smtp.h $C/nntp.h ++ ++safegets.o: $C/mail.h + + $(CCLIENTLIB): + cd $C;make diff -ruN imap-uw.old/patches/patch-ae imap-uw/patches/patch-ae --- imap-uw.old/patches/patch-ae Thu Jan 1 09:00:00 1970 +++ imap-uw/patches/patch-ae Mon Dec 13 00:47:05 1999 @@ -0,0 +1,28 @@ +--- src/mtest/mtest.c.orig Sat May 29 14:07:06 1999 ++++ src/mtest/mtest.c Mon Oct 25 21:36:50 1999 +@@ -49,6 +49,7 @@ + #include "rfc822.h" + #include "smtp.h" + #include "nntp.h" ++#include "safegets.h" + + /* Excellent reasons to hate ifdefs, and why my real code never uses them */ + +@@ -528,7 +529,7 @@ + void prompt (char *msg,char *txt) + { + printf ("%s",msg); +- gets (txt); ++ safegets (txt); + } + + /* Interfaces to C-client */ +@@ -713,7 +714,7 @@ + puts (" Msg (end with a line with only a '.'):"); + body->type = TYPETEXT; + *text = '\0'; +- while (gets (line)) { ++ while (safegets (line)) { + if (line[0] == '.') { + if (line[1] == '\0') break; + else strcat (text,"."); diff -ruN imap-uw.old/pkg/DESCR imap-uw/pkg/DESCR --- imap-uw.old/pkg/DESCR Sun Nov 22 05:01:56 1998 +++ imap-uw/pkg/DESCR Mon Dec 13 00:47:05 1999 @@ -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 diff -ruN imap-uw.old/pkg/MESSAGE imap-uw/pkg/MESSAGE --- imap-uw.old/pkg/MESSAGE Thu Jan 1 09:00:00 1970 +++ imap-uw/pkg/MESSAGE Mon Dec 13 00:47:05 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_Dec_13_01:31:50_1999-1-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message