upgrade to c-client 2000

This commit is contained in:
brad 2000-11-11 16:32:45 +00:00
parent a1a737aba6
commit 7b416ba91c
6 changed files with 41 additions and 54 deletions

View File

@ -1,31 +1,29 @@
# $OpenBSD: Makefile,v 1.5 2000/10/16 23:23:10 brad Exp $
# $OpenBSD: Makefile,v 1.6 2000/11/11 16:32:45 brad Exp $
DISTNAME= imap-4.7c2
PKGNAME= c-client-4.7c2
DISTNAME= imap-2000
PKGNAME= c-client-2000
CATEGORIES= mail devel
NEED_VERSION= 1.330
MASTER_SITES= ftp://ftp.cac.washington.edu/imap/old/
NEED_VERSION= 1.336
MASTER_SITES= ftp://ftp.cac.washington.edu/imap/
EXTRACT_SUFX= .tar.Z
MAINTAINER= Jakob Schlyter <jakob@openbsd.org>
MAINTAINER= Brad Smith <brad@openbsd.org>
PERMIT_PACKAGE_CDROM= No
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= No
PERMIT_DISTFILES_FTP= Yes
SHLIB= libc-client.so.1.0
SHLIB= libc-client.so.2.0
SUBST_VARS= SHLIB
MAKE_FLAGS= EXTRACFLAGS="${CFLAGS}" SHLIB="${SHLIB}"
ALL_TARGET= bso
WRKDIST= ${WRKDIR}/imap-4.7c
HEADERS= dummy.h env.h env_unix.h fdstring.h flstring.h fs.h ftl.h \
imap4r1.h linkage.c linkage.h mail.h misc.h nl.h nntp.h \
osdep.h pop3.h rfc822.h smtp.h tcp.h
osdep.h pop3.h rfc822.h smtp.h tcp.h utf8.h
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/c-client

View File

@ -1,3 +1,3 @@
MD5 (imap-4.7c2.tar.Z) = 1a27c7684094a8c94baf294552467060
RMD160 (imap-4.7c2.tar.Z) = 5356c247ebe1dead867a6b0cd5df39d0447d9085
SHA1 (imap-4.7c2.tar.Z) = e4c70470b52e3a5b8338929b0147afc21de07b1f
MD5 (imap-2000.tar.Z) = 7b5f2cfcad528bad2e79800d083821a5
RMD160 (imap-2000.tar.Z) = 3712c3e698e401c39501bf99498d918fe959bba0
SHA1 (imap-2000.tar.Z) = 382ebe620314b9a7187295371dba18b2ea7ee40b

View File

@ -1,6 +1,6 @@
--- Makefile.orig Tue Sep 19 16:14:10 2000
+++ Makefile Tue Sep 19 16:14:51 2000
@@ -283,7 +283,7 @@
--- Makefile.orig Tue Oct 24 19:52:21 2000
+++ Makefile Wed Nov 1 18:20:44 2000
@@ -305,7 +305,7 @@
# Make the IMAP Toolkit
@ -9,7 +9,7 @@
c-client:
@echo Not processed yet. In a first-time build, you must specify
@@ -394,7 +394,7 @@
@@ -417,7 +417,7 @@
$(TOOLS)/$@ "$(LN)" src/imapd imapd
$(LN) $(TOOLS)/$@ .

View File

@ -1,6 +1,6 @@
--- src/osdep/unix/Makefile.orig Tue Nov 16 21:05:48 1999
+++ src/osdep/unix/Makefile Mon Oct 16 18:27:36 2000
@@ -96,6 +96,7 @@
--- src/osdep/unix/Makefile.orig Tue Oct 24 19:59:24 2000
+++ src/osdep/unix/Makefile Wed Nov 1 18:55:57 2000
@@ -84,6 +84,7 @@
DEFAULTAUTHENTICATORS=md5 $(SPECIALAUTHENTICATORS) log
DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf unix news phile
@ -8,14 +8,15 @@
# Normally no need to change any of these
@@ -104,12 +105,14 @@
@@ -92,6 +93,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
+SOBINARIES=${BINARIES:.o=.so}
+SOBINARIES=$(BINARIES:.o=.so)
CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
MAKE=make
MV=mv
CAT=cat
@@ -100,6 +102,7 @@
RM=rm -rf
SH=sh
@ -23,16 +24,16 @@
# Primary build command
@@ -209,7 +212,7 @@
@@ -211,7 +214,7 @@
SPOOLDIR=/var \
ACTIVEFILE=/usr/local/news/lib/active \
RSHPATH=/usr/bin/rsh \
- BASECFLAGS="-O2 -pipe -DNFSKLUDGE"
+ BASECFLAGS="-pipe -DNFSKLUDGE -DIGNORE_LOCK_EACCES_ERRORS=1"
- BASECFLAGS="-O2 -pipe"
+ BASECFLAGS="-pipe"
cvx: # Convex
$(BUILD) `cat EXTRASPECIALS` OS=$@ \
@@ -627,19 +630,26 @@
$(BUILD) `$(CAT) SPECIALS` OS=$@ \
@@ -707,19 +710,26 @@
# Build it!
@ -47,7 +48,7 @@
$(ARCHIVE): $(BINARIES)
sh -c '$(RM) $(ARCHIVE) || true'
@cat ARCHIVE
@$(CAT) ARCHIVE
@$(SH) ARCHIVE
+$(SHLIB): $(SOBINARIES)
@ -56,12 +57,12 @@
# Cleanup
clean:
- sh -c '$(RM) auths.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
+ sh -c '$(RM) auths.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o *.so ARCHIVE *FLAGS *TYPE $(ARCHIVE) $(SHLIB) || true'
- sh -c '$(RM) auths.c crexcl.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
+ sh -c '$(RM) auths.c crexcl.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o *.so ARCHIVE *FLAGS *TYPE $(ARCHIVE) $(SHLIB) || true'
# Dependencies
@@ -673,7 +683,7 @@
@@ -753,7 +763,7 @@
# OS-dependent
@ -69,23 +70,20 @@
+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,10 +695,18 @@
auths.c crexcl.c flock.c flockbsd.c flcksafe.c fsync.c gethstid.c \
@@ -765,7 +775,15 @@
write.c \
strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
OSCFLAGS
+
+osdep.o: $(OSDEPS)
$(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c
+osdep.so: $(OSDEPS)
+ $(CC) $(CFLAGS) `cat OSCFLAGS` $(PICFLAG) -DPIC -c osdep.c -o $@
$(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
+
osdep.c: osdepbas.c osdepckp.c osdeplog.c
cat osdepbas.c osdepckp.c osdeplog.c > osdep.c
+osdep.so: $(OSDEPS)
+ $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` $(PICFLAG) -DPIC -c osdep.c -o $@
+
+.c.so: osdep.h
+ $(CC) $(CFLAGS) $(PICFLAG) -DPIC -c $(@:.so=.c) -o $@
flockbsd.c: # cretin Linux
osdep.c: osdepbas.c osdepckp.c osdeplog.c
$(CAT) osdepbas.c osdepckp.c osdeplog.c > osdep.c

View File

@ -1,10 +0,0 @@
--- src/osdep/unix/mx.c.orig Fri Sep 15 04:33:34 2000
+++ src/osdep/unix/mx.c Fri Sep 15 04:34:51 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 {

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2000/09/15 09:44:12 brad Exp $
@comment $OpenBSD: PLIST,v 1.3 2000/11/11 16:32:46 brad Exp $
include/c-client/dummy.h
include/c-client/env.h
include/c-client/env_unix.h
@ -18,6 +18,7 @@ include/c-client/pop3.h
include/c-client/rfc822.h
include/c-client/smtp.h
include/c-client/tcp.h
include/c-client/utf8.h
lib/libc-client.a
%%SHARED%%
@dirrm include/c-client