Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Oct 1999 15:32:09 +0900
From:      Akinori MUSHA aka knu <knu@idaemons.org>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/14359: Update port: mail/imap-uw
Message-ID:  <14344.7145.148375.72159A@archon.my.domain>

next in thread | raw e-mail | index | archive | help

>Number:         14359
>Category:       ports
>Synopsis:       Update port: mail/imap-uw
>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:   Fri Oct 15 23:40:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Akinori MUSHA aka knu
>Release:        FreeBSD 3.3-STABLE i386
>Organization:
A.I.D.
>Environment:

	FreeBSD 3.3-STABLE i386 + ports-current

>Description:

	UW-imap-4.6 has just released. The port should be updated.

>How-To-Repeat:

	

>Fix:
	Apply the patch below.

	UW-imap-4.6 now supports PAM.
	I added a message for users to edit /etc/pam.conf.

diff -ruN imap-uw.orig/Makefile imap-uw/Makefile
--- imap-uw.orig/Makefile	Sun Sep 19 02:29:19 1999
+++ imap-uw/Makefile	Sat Oct 16 15:20:05 1999
@@ -6,12 +6,12 @@
 # $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
diff -ruN imap-uw.orig/files/md5 imap-uw/files/md5
--- imap-uw.orig/files/md5	Mon Mar 15 10:38:38 1999
+++ imap-uw/files/md5	Sat Oct 16 04:24:18 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.orig/patches/patch-ab imap-uw/patches/patch-ab
--- imap-uw.orig/patches/patch-ab	Tue May  4 23:41:36 1999
+++ imap-uw/patches/patch-ab	Sat Oct 16 06:01:34 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	Sat Oct 16 05:58:26 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,22 @@
  # Here if no make argument established
  
  missing: osdep.h
-@@ -190,7 +194,7 @@
+@@ -191,11 +195,12 @@
+ 
+ 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"
 +	 BASECFLAGS="-DNFSKLUDGE -DIGNORE_LOCK_EACCES_ERRORS" \
- 	 BASELDFLAGS="-lcrypt"
++	 BASELDFLAGS="-lpam -lcrypt"
  
  bsi:	# BSD/i386
-@@ -606,19 +610,31 @@
+ 	$(BUILD) `cat EXTRASPECIALS` OS=$@ \
+@@ -620,19 +625,31 @@
  
  # Build it!
  
@@ -63,7 +69,7 @@
  
  
  # Dependencies
-@@ -652,7 +668,7 @@
+@@ -666,7 +683,7 @@
  
  # OS-dependent
  
@@ -72,7 +78,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 +695,12 @@
  	write.c \
  	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
  	OSCFLAGS
diff -ruN imap-uw.orig/patches/patch-ac imap-uw/patches/patch-ac
--- imap-uw.orig/patches/patch-ac	Mon Mar 15 10:38:38 1999
+++ imap-uw/patches/patch-ac	Sat Oct 16 03:23:48 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`
  
diff -ruN imap-uw.orig/patches/patch-ad imap-uw/patches/patch-ad
--- imap-uw.orig/patches/patch-ad	Thu Jan  1 09:00:00 1970
+++ imap-uw/patches/patch-ad	Sat Oct 16 03:53:30 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,".");
diff -ruN imap-uw.orig/pkg/DESCR imap-uw/pkg/DESCR
--- imap-uw.orig/pkg/DESCR	Sun Nov 22 05:01:56 1998
+++ imap-uw/pkg/DESCR	Sat Oct 16 15:24:19 1999
@@ -12,6 +12,13 @@
 pop3    stream  tcp     nowait  root    /usr/local/libexec/ipop3d   ipop3d
 imap4   stream  tcp     nowait  root    /usr/local/libexec/imapd    imapd
 
+and /etc/pam.conf file with lines such as:
+
+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
+
 You may also have to edit your /etc/services (or Yellow Pages,
 NetInfo, etc. equivalent) to register these services, such as:
 
diff -ruN imap-uw.orig/pkg/MESSAGE imap-uw/pkg/MESSAGE
--- imap-uw.orig/pkg/MESSAGE	Thu Jan  1 09:00:00 1970
+++ imap-uw/pkg/MESSAGE	Sat Oct 16 15:24:35 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
+###

>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?14344.7145.148375.72159A>