aboutsummaryrefslogtreecommitdiff
path: root/mail/imap-uw
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2001-04-25 05:43:33 +0000
committerDoug Barton <dougb@FreeBSD.org>2001-04-25 05:43:33 +0000
commit79ba115da82388d097ef5d5db6c167e5d063b949 (patch)
tree86b577dbeb2192714b5deb3eaaa281b2f55c819d /mail/imap-uw
parente62943f72a39c6ab60be0518e1e1aa1af33f3f12 (diff)
downloadports-79ba115da82388d097ef5d5db6c167e5d063b949.tar.gz
ports-79ba115da82388d097ef5d5db6c167e5d063b949.zip
Notes
Diffstat (limited to 'mail/imap-uw')
-rw-r--r--mail/imap-uw/Makefile2
-rw-r--r--mail/imap-uw/distinfo2
-rw-r--r--mail/imap-uw/files/patch-ac8
-rw-r--r--mail/imap-uw/files/patch-ah12
-rw-r--r--mail/imap-uw/files/patch-ai152
-rw-r--r--mail/imap-uw/pkg-message13
6 files changed, 99 insertions, 90 deletions
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 203ee6bbcc38..b7802ae69ebd 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= imap
-PORTVERSION= 0104101757
+PORTVERSION= 0104241750
CATEGORIES= mail
MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
ftp://ftp.nuug.no/pub/anders/distfiles/%SUBDIR%/ \
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 168744c73048..9eacc3374ace 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,2 +1,2 @@
-MD5 (imap-2001.BETA.SNAP-0104101757.tar.Z) = 11c0611d1d7b4190f78b8daddd61c3d9
+MD5 (imap-2001.BETA.SNAP-0104241750.tar.Z) = b28ed6662344d7552078f53fbc20362b
MD5 (imap-utils.tar.Z) = a6453029f201b32e9ed761e662c47b0f
diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-ac
index 5529938f0d1c..32d2ca1e16fa 100644
--- a/mail/imap-uw/files/patch-ac
+++ b/mail/imap-uw/files/patch-ac
@@ -1,5 +1,5 @@
---- src/imapd/Makefile.orig Tue Apr 3 23:54:13 2001
-+++ src/imapd/Makefile Wed Apr 4 00:05:39 2001
+--- src/imapd/Makefile.orig Tue Apr 24 01:23:43 2001
++++ src/imapd/Makefile Tue Apr 24 01:30:06 2001
@@ -18,10 +18,10 @@
# CPYRIGHT, included with this Distribution.
@@ -13,14 +13,14 @@
SHELL= /bin/sh
-@@ -40,22 +40,24 @@
+@@ -49,22 +49,24 @@
# Get local definitions from c-client directory
C = ../c-client
-CCLIENTLIB = $C/c-client.a
+#CCLIENTLIB = $C/c-client.a
CC = `cat $C/CCTYPE`
--CFLAGS = -I$C `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
+-CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(MSBD) -DANOFILE=\"$(ANO)\" \
+.if defined(WITH_DRAC)
+CFLAGS = `cat $C/CFLAGS` -DANOFILE=\"$(ANO)\" -DETC_DIR=\"$(PREFIX)/etc\" \
+ -DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\" -DDRAC_AUTH \
diff --git a/mail/imap-uw/files/patch-ah b/mail/imap-uw/files/patch-ah
index 05b092fcba40..0deadaf20155 100644
--- a/mail/imap-uw/files/patch-ah
+++ b/mail/imap-uw/files/patch-ah
@@ -1,5 +1,5 @@
---- src/ipopd/ipop3d.c.orig Wed Feb 21 03:23:01 2001
-+++ src/ipopd/ipop3d.c Wed Apr 11 12:02:25 2001
+--- src/ipopd/ipop3d.c.orig Tue Apr 24 01:31:57 2001
++++ src/ipopd/ipop3d.c Tue Apr 24 01:34:34 2001
@@ -28,6 +28,11 @@
#include <time.h>
#include "c-client.h"
@@ -22,15 +22,15 @@
+extern char *getenv ();
+#endif /* DRAC_AUTH */
+
- char *version = "2001.75"; /* server version */
+ char *version = "2001.76"; /* server version */
short state = AUTHORIZATION; /* server state */
short critical = NIL; /* non-zero if in critical code */
@@ -100,7 +111,7 @@
#include "linkage.c"
/* initialize server */
- server_init ((s = strrchr (argv[0],'/')) ? s + 1 : argv[0],
-- "pop3","pop3s","pop",clkint,kodint,hupint,trmint);
-+ "pop3","pop3s","pop3",clkint,kodint,hupint,trmint);
+ server_init (((s = strrchr (argv[0],'/')) || (s = strrchr (argv[0],'\\'))) ?
+- s+1 : argv[0],"pop3","pop3s","pop",clkint,kodint,hupint,trmint);
++ s+1 : argv[0],"pop3","pop3s","pop3",clkint,kodint,hupint,trmint);
challenge[0] = '\0'; /* find the CRAM-MD5 authenticator */
if (i = mail_lookup_auth_name ("CRAM-MD5",NIL)) {
AUTHENTICATOR *a = mail_lookup_auth (i);
diff --git a/mail/imap-uw/files/patch-ai b/mail/imap-uw/files/patch-ai
index 0639372fd582..86c043173b17 100644
--- a/mail/imap-uw/files/patch-ai
+++ b/mail/imap-uw/files/patch-ai
@@ -1,73 +1,79 @@
---- src/imapd/imapd.c.orig Sat Apr 7 00:27:30 2001
-+++ src/imapd/imapd.c Wed Apr 11 12:00:44 2001
-@@ -29,6 +29,11 @@
- #include "c-client.h"
- #include <sys/stat.h>
-
-+#ifdef DRAC_AUTH
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-+#include <stdlib.h>
-+#endif /* DRAC_AUTH */
-
- #define CRLF PSOUT ("\015\012") /* primary output terpri */
-
-@@ -173,6 +178,12 @@
-
- /* Global storage */
-
-+#ifdef DRAC_AUTH
-+#define DRACTIMEOUT 10*60 /* check every 10 minutes */
-+time_t lastdrac = 0; /* time of last drac check */
-+extern char *getenv ();
-+#endif /* DRAC_AUTH */
-+
- char *version = "2001.299"; /* version number of this server */
- time_t alerttime = 0; /* time of last alert */
- time_t sysalerttime = 0; /* time of last system alert */
-@@ -1161,6 +1172,45 @@
- lasterror ());
- return;
- }
-+
-+#ifdef DRAC_AUTH
-+ if (time (0) > lastdrac + DRACTIMEOUT)
-+ {
-+ FILE *dracconf;
-+ char host[100];
-+ char *drachost;
-+ char *err;
-+ char *p;
-+
-+ if ( (dracconf = fopen(ETC_DIR "/dracd.host", "r")) == NULL)
-+ {
-+ syslog (LOG_INFO, "dracd: error opening %s/dracd.host config file",ETC_DIR);
-+ exit(1);
-+ }
-+
-+ fgets(host, 100, dracconf);
-+ p = strchr(host, '\n');
-+ if(p != NULL)
-+ *p = '\0';
-+ fclose(dracconf);
-+
-+ if( drachost = (host) )
-+ {
-+ struct sockaddr_in sin;
-+ int sinlen = sizeof (struct sockaddr_in);
-+ char *client = getpeername (0,(struct sockaddr *) &sin,(void *) &sinlen) ?
-+ "UNKNOWN" : inet_ntoa (sin.sin_addr);
-+
-+ lastdrac = time(0);
-+
-+ if (dracauth(drachost, inet_addr(client), &err) != 0)
-+ syslog (LOG_INFO, err);
-+ else
-+ syslog (LOG_INFO, "dracd: authorized ip %s", client);
-+ }
-+ }
-+#endif /* DRAC_AUTH */
-+
- /* change in number of messages? */
- if (existsquelled || (nmsgs != stream->nmsgs)) {
- PSOUT ("* ");
+*** src/imapd/imapd.c.orig Mon Apr 23 16:45:41 2001
+--- src/imapd/imapd.c Tue Apr 24 22:14:38 2001
+***************
+*** 29,34 ****
+--- 29,39 ----
+ #include "c-client.h"
+ #include <sys/stat.h>
+
++ #ifdef DRAC_AUTH
++ #include <netinet/in.h>
++ #include <arpa/inet.h>
++ #include <stdlib.h>
++ #endif /* DRAC_AUTH */
+
+ #define CRLF PSOUT ("\015\012") /* primary output terpri */
+
+***************
+*** 173,178 ****
+--- 178,189 ----
+
+ /* Global storage */
+
++ #ifdef DRAC_AUTH
++ #define DRACTIMEOUT 10*60 /* check every 10 minutes */
++ time_t lastdrac = 0; /* time of last drac check */
++ extern char *getenv ();
++ #endif /* DRAC_AUTH */
++
+ char *version = "2001.303"; /* version number of this server */
+ time_t alerttime = 0; /* time of last alert */
+ time_t sysalerttime = 0; /* time of last system alert */
+***************
+*** 1167,1172 ****
+--- 1178,1222 ----
+ lasterror ());
+ return;
+ }
++
++ #ifdef DRAC_AUTH
++ if (time (0) > lastdrac + DRACTIMEOUT)
++ {
++ FILE *dracconf;
++ char host[100];
++ char *drachost;
++ char *err;
++ char *p;
++
++ if ( (dracconf = fopen(ETC_DIR "/dracd.host", "r")) == NULL)
++ {
++ syslog (LOG_INFO, "dracd: error opening %s/dracd.host config file",ETC_DIR);
++ exit(1);
++ }
++
++ fgets(host, 100, dracconf);
++ p = strchr(host, '\n');
++ if(p != NULL)
++ *p = '\0';
++ fclose(dracconf);
++
++ if( drachost = (host) )
++ {
++ struct sockaddr_in sin;
++ int sinlen = sizeof (struct sockaddr_in);
++ char *client = getpeername (0,(struct sockaddr *) &sin,(void *) &sinlen) ?
++ "UNKNOWN" : inet_ntoa (sin.sin_addr);
++
++ lastdrac = time(0);
++
++ if (dracauth(drachost, inet_addr(client), &err) != 0)
++ syslog (LOG_INFO, err);
++ else
++ syslog (LOG_INFO, "dracd: authorized ip %s", client);
++ }
++ }
++ #endif /* DRAC_AUTH */
++
+ /* change in number of messages? */
+ if (existsquelled || (nmsgs != stream->nmsgs)) {
+ PSOUT ("* ");
diff --git a/mail/imap-uw/pkg-message b/mail/imap-uw/pkg-message
index 550396dfa8e4..d3dabd93576a 100644
--- a/mail/imap-uw/pkg-message
+++ b/mail/imap-uw/pkg-message
@@ -5,13 +5,16 @@ 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 PAM authentication support has been compiled in you may need to add
+If PAM authentication support has been compiled in you will need to add
something like the following lines to /etc/pam.conf (PAM authentication is
default):
-imap auth required pam_unix.so try_first_pass
+imap auth required pam_unix.so
imap account required pam_unix.so try_first_pass
-imap session required pam_unix.so try_first_pass
-pop3 auth required pam_unix.so try_first_pass
+imap session required pam_deny.so
+pop3 auth required pam_unix.so
pop3 account required pam_unix.so try_first_pass
-pop3 session required pam_unix.so try_first_pass
+pop3 session required pam_deny.so
+
+The pam_unix module does not have session support, so we do not use it for
+session management. Be sure to read up on pam.conf(5).