summaryrefslogtreecommitdiff
path: root/mail/cclient/files
diff options
context:
space:
mode:
authorKelly Yancey <kbyanc@FreeBSD.org>2000-12-18 09:55:11 +0000
committerKelly Yancey <kbyanc@FreeBSD.org>2000-12-18 09:55:11 +0000
commit3c7d0e406bb3e745d8ec7e152ccc8b612f5dbf55 (patch)
treea2f49c26795f624951fd7e7b747811694a8ec730 /mail/cclient/files
parentRemove the cclient-maildir port as the third-party patches have become (diff)
Update c-client to that found in UW's imap-2000.
Update imap-uw to the latest version (imap-2000). Update pine4 to the latest version (pine-4.31). Despite the fact that the new releases of imap-uw and pine are intended to improve security, the security warnings on the pine and imap-uw ports have been left intact until they have proven themselves.
Notes
Notes: svn path=/head/; revision=36056
Diffstat (limited to 'mail/cclient/files')
-rw-r--r--mail/cclient/files/MESSAGE.PAM9
-rw-r--r--mail/cclient/files/patch-ab67
-rw-r--r--mail/cclient/files/patch-ac24
-rw-r--r--mail/cclient/files/patch-ad10
4 files changed, 38 insertions, 72 deletions
diff --git a/mail/cclient/files/MESSAGE.PAM b/mail/cclient/files/MESSAGE.PAM
deleted file mode 100644
index a5baa63b4f8d..000000000000
--- a/mail/cclient/files/MESSAGE.PAM
+++ /dev/null
@@ -1,9 +0,0 @@
-= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
-PAM authentication support is now compiled in by default; 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
-pop auth required pam_unix.so try_first_pass
-pop account required pam_unix.so try_first_pass
-= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
diff --git a/mail/cclient/files/patch-ab b/mail/cclient/files/patch-ab
index 51802e3c8345..bb9510bbe527 100644
--- a/mail/cclient/files/patch-ab
+++ b/mail/cclient/files/patch-ab
@@ -1,6 +1,6 @@
---- src/osdep/unix/Makefile.orig Mon Jul 3 22:32:37 2000
-+++ src/osdep/unix/Makefile Mon Jul 3 22:33:30 2000
-@@ -86,7 +86,7 @@
+--- src/osdep/unix/Makefile.orig Tue Oct 31 13:55:01 2000
++++ src/osdep/unix/Makefile Sun Dec 17 23:19:06 2000
+@@ -74,7 +74,7 @@
# Commands possibly overriden by the individual port
ARRC=ar rc
@@ -9,17 +9,17 @@
LN=ln -s
RANLIB=ranlib
-@@ -104,7 +104,7 @@
+@@ -92,7 +92,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
-CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
+
+ CAT=cat
MAKE=make
- MV=mv
- RM=rm -rf
-@@ -119,6 +119,10 @@
- PASSWDTYPE=$(PASSWDTYPE) SPECIALAUTHENTICATORS="$(SPECIALAUTHENTICATORS)"
+@@ -109,6 +109,10 @@
+ PASSWDTYPE=$(PASSWDTYPE) SPECIALAUTHENTICATORS='$(SPECIALAUTHENTICATORS)'
BUILD=$(MAKE) build $(BUILDOPTIONS)
+# Need this for the shared library rule to work correctly
@@ -29,33 +29,25 @@
# Here if no make argument established
missing: osdep.h
-@@ -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 \
-+ SPOOLDIR=/var \
-+ ACTIVEFILE=/usr/local/news/lib/active \
-+ RSHPATH=/usr/bin/rsh \
-+ LOCKPGM=$(PREFIX)/libexec/mlock \
-+ BASECFLAGS="-DNFSKLUDGE" \
-+ BASELDFLAGS="-lpam -lcrypt"
-+
- bs3: # BSD/i386 3.0 or higher
- $(BUILD) `cat EXTRASPECIALS` OS=bsi CHECKPW=bsi LOGINPW=bsi \
- SPOOLDIR=/var NEWSSPOOL=/var/news/spool \
-@@ -194,7 +207,8 @@
+@@ -189,13 +193,14 @@
+ BASECFLAGS="-g -Dconst="
+
+ bsf: # FreeBSD
+- $(BUILD) `$(CAT) SPECIALS` OS=bsi \
++ $(BUILD) `$(CAT) SPECIALS` OS=bsi CHECKPW=pam \
+ SIGTYPE=psx CRXTYPE=nfs \
SPOOLDIR=/var \
ACTIVEFILE=/usr/local/news/lib/active \
RSHPATH=/usr/bin/rsh \
-- BASECFLAGS="-g -O -pipe -DNFSKLUDGE" \
+- BASECFLAGS="-g -O -pipe" \
+- BASELDFLAGS="-lcrypt"
+ LOCKPGM=$(PREFIX)/libexec/mlock \
+ BASECFLAGS="-DNFSKLUDGE" \
- BASELDFLAGS="-lcrypt"
++ BASELDFLAGS="-lpam -lcrypt"
bsi: # BSD/i386
-@@ -627,19 +641,31 @@
+ $(BUILD) `$(CAT) SPECIALS` OS=$@ \
+@@ -702,19 +707,31 @@
# Build it!
@@ -67,7 +59,7 @@
$(ARCHIVE): $(BINARIES)
sh -c '$(RM) $(ARCHIVE) || true'
- @cat ARCHIVE
+ @$(CAT) ARCHIVE
@$(SH) ARCHIVE
+$(SHLIBNAME): $(SOFILES)
@@ -78,18 +70,18 @@
+.endif
+ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so
+
-+.c.so: osdep.h
++.c.so: osdep.h
+ $(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
+
# Cleanup
clean:
- sh -c '$(RM) auths.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
-+ $(RM) *.so $(SHLIBNAME)
+ sh -c '$(RM) auths.c crexcl.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
++ sh -c '$(RM) *.so $(SHLIBNAME)'
# Dependencies
-@@ -673,7 +699,7 @@
+@@ -748,7 +765,7 @@
# OS-dependent
@@ -97,17 +89,18 @@
+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
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 +711,12 @@
+ auths.c crexcl.c flock.c flockbsd.c flcksafe.c fsync.c gethstid.c \
+@@ -760,7 +777,12 @@
write.c \
strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
OSCFLAGS
+- $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
+
+osdep.o: $(OSDEPS)
- $(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c
++ $(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c
+
+osdep.so: $(OSDEPS)
+ $(CC) -fpic -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@
osdep.c: osdepbas.c osdepckp.c osdeplog.c
- cat osdepbas.c osdepckp.c osdeplog.c > osdep.c
+ $(CAT) osdepbas.c osdepckp.c osdeplog.c > osdep.c
diff --git a/mail/cclient/files/patch-ac b/mail/cclient/files/patch-ac
index 464a98cd60ec..b748b8679ca8 100644
--- a/mail/cclient/files/patch-ac
+++ b/mail/cclient/files/patch-ac
@@ -1,19 +1,11 @@
---- Makefile.orig Mon Nov 15 22:20:34 1999
-+++ Makefile Sun Dec 19 14:52:58 1999
-@@ -49,6 +49,7 @@
- # art AIX 2.2.1 for RT
- # asv Altos SVR4
- # aux A/UX
-+# bfp FreeBSD with Pluggable Authentication Modules (PAM)
- # bs3 BSD/i386 3.0 and higher
- # bsd generic BSD 4.3 (as in ancient 1980s version)
- # bsf FreeBSD
-@@ -293,7 +294,7 @@
+--- Makefile.orig Sun Dec 17 23:09:44 2000
++++ Makefile Sun Dec 17 23:08:58 2000
+@@ -314,7 +314,7 @@
- # Note on SCO you may have to set LN to "ln".
+ # Make the IMAP Toolkit
--a32 a41 aix bs3 bsf bsi bso d-g d54 do4 drs epx gas gh9 ghp gs5 gso gsu gul hpp hpx lnp lyn mct mnt neb nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx sol sos uw2: an
-+a32 a41 aix bfp bs3 bsf bsi bso d-g d54 do4 drs epx gas gh9 ghp gs5 gso gsu gul hpp hpx lnp lyn mct mnt neb nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx sol sos uw2: an
- $(BUILD) OS=$@
+-all: c-client rebuild bundled
++all: c-client rebuild
- # If you use sv4, you may find that it works to move it to use the an process.
+ c-client:
+ @echo Not processed yet. In a first-time build, you must specify
diff --git a/mail/cclient/files/patch-ad b/mail/cclient/files/patch-ad
deleted file mode 100644
index 5e64e3cffb45..000000000000
--- a/mail/cclient/files/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/osdep/unix/mx.c.orig Tue Jul 18 22:11:50 2000
-+++ src/osdep/unix/mx.c Tue Jul 18 22:13:55 2000
-@@ -882,6 +882,7 @@
- if (f&fANSWERED) elt->answered = T;
- if (f&fDRAFT) elt->draft = T;
- elt->user_flags |= uf;
-+ set_mbx_protections (mailbox,tmp);
- mx_unlockindex (astream); /* unlock index */
- }
- else {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 01:37:50 +0000