diff options
| author | Michael Haro <mharo@FreeBSD.org> | 2000-02-14 23:45:56 +0000 |
|---|---|---|
| committer | Michael Haro <mharo@FreeBSD.org> | 2000-02-14 23:45:56 +0000 |
| commit | 3a622b01fa17ba83ea00a74e918bb928cf8d1404 (patch) | |
| tree | 5ed2075a72e0542aa190e876f5d11fca4312cc16 /mail/imap-uw | |
| parent | 9c5c19048f5f8a7ebcd12935742f2e8ef866ff9e (diff) | |
| download | freebsd-ports-3a622b01fa17ba83ea00a74e918bb928cf8d1404.zip | |
Update using proper patch from PR 16545.
Diffstat (limited to 'mail/imap-uw')
| -rw-r--r-- | mail/imap-uw/Makefile | 5 | ||||
| -rw-r--r-- | mail/imap-uw/files/patch-ab | 24 | ||||
| -rw-r--r-- | mail/imap-uw/pkg-descr | 4 |
3 files changed, 20 insertions, 13 deletions
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index 4bd5d7e8854d..84f558a5e5e6 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -21,7 +21,7 @@ MAINTAINER= imap-uw@freebsd.ady.ro Y2K= http://www.washington.edu/imap/IMAP-FAQs/FAQ-00002.html -PAMAUTH?= no +PAMAUTH?= yes .if ${PAMAUTH} != "no" ALL_TARGET= bfp .else @@ -48,8 +48,7 @@ post-configure: @${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}" .if ${PAMAUTH} != "no" @${ECHO_MSG} ">> Building with PAM support" -.else - @${ECHO_MSG} ">> You can use PAM authentication building with \"PAMAUTH=yes\"" + @${ECHO_MSG} ">> You can disable PAM support building with \"PAMAUTH=no\"" .endif post-build: diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-ab index 4b04174ab4d7..f7ff4debaed3 100644 --- a/mail/imap-uw/files/patch-ab +++ b/mail/imap-uw/files/patch-ab @@ -1,5 +1,14 @@ --- src/osdep/unix/Makefile.orig Wed Nov 17 04:05:48 1999 -+++ src/osdep/unix/Makefile Wed Dec 22 00:43:23 1999 ++++ src/osdep/unix/Makefile Sun Feb 13 14:06:11 2000 +@@ -86,7 +86,7 @@ + # Commands possibly overriden by the individual port + + ARRC=ar rc +-CC=cc ++#CC=cc + LN=ln -s + RANLIB=ranlib + @@ -104,7 +104,7 @@ dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ @@ -20,13 +29,12 @@ # Here if no make argument established missing: osdep.h -@@ -178,6 +182,16 @@ +@@ -178,6 +182,15 @@ BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst= -DNFSKLUDGE" \ RANLIB=true ARRC="ar -rc" +bfp: # FreeBSD Pluggable Authentication Modules -+ $(BUILD) `cat EXTRASPECIALS` OS=bsi SIGTYPE=psx \ -+ CHECKPW=pam \ ++ $(BUILD) `cat EXTRASPECIALS` OS=bsi SIGTYPE=psx CHECKPW=pam \ + SPOOLDIR=/var \ + ACTIVEFILE=/usr/local/news/lib/active \ + RSHPATH=/usr/bin/rsh \ @@ -37,7 +45,7 @@ bs3: # BSD/i386 3.0 or higher $(BUILD) `cat EXTRASPECIALS` OS=bsi CHECKPW=bsi LOGINPW=bsi \ SPOOLDIR=/var NEWSSPOOL=/var/news/spool \ -@@ -194,7 +208,8 @@ +@@ -194,7 +207,8 @@ SPOOLDIR=/var \ ACTIVEFILE=/usr/local/news/lib/active \ RSHPATH=/usr/bin/rsh \ @@ -47,7 +55,7 @@ BASELDFLAGS="-lcrypt" bsi: # BSD/i386 -@@ -627,19 +642,31 @@ +@@ -627,19 +641,31 @@ # Build it! @@ -81,7 +89,7 @@ # Dependencies -@@ -673,7 +700,7 @@ +@@ -673,7 +699,7 @@ # OS-dependent @@ -90,7 +98,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 \ -@@ -685,7 +712,12 @@ +@@ -685,7 +711,12 @@ write.c \ strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ OSCFLAGS diff --git a/mail/imap-uw/pkg-descr b/mail/imap-uw/pkg-descr index 6f0b9e72e9e9..136328fcccce 100644 --- a/mail/imap-uw/pkg-descr +++ b/mail/imap-uw/pkg-descr @@ -12,8 +12,8 @@ pop2 stream tcp nowait root /usr/local/libexec/ipop2d ipop2d pop3 stream tcp nowait root /usr/local/libexec/ipop3d ipop3d imap4 stream tcp nowait root /usr/local/libexec/imapd imapd -If you compiled in PAM authentication support then you also have to add the -following lines to your /etc/pam.conf: +If PAM authentication support has been compiled in you may need to add the +following lines to /etc/pam.conf: imap auth required pam_unix.so try_first_pass imap account required pam_unix.so try_first_pass |