ports/66518: updates imap-uw from 2002d to 2004
Christian Kratzer
ck at cksoft.de
Tue May 11 10:20:24 UTC 2004
>Number: 66518
>Category: ports
>Synopsis: updates imap-uw from 2002d to 2004
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue May 11 03:20:17 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: Christian Kratzer
>Release: FreeBSD 5.2-RELEASE i386
>Organization:
CK Software GmbH
>Environment:
System: FreeBSD hirvi.cksoft.de 5.2-RELEASE FreeBSD 5.2-RELEASE #0: Sun Jan 11 04:21:45 GMT 2004 root at wv1u.btc.adaptec.com:/usr/obj/usr/src/sys/GENERIC i386
<precise description of the problem (multiple lines)>
Updates imap-uw port to 2004 version released May 10, 2004.
>Description:
>How-To-Repeat:
>Fix:
diff -urN -x work imap-uw.orig/Makefile imap-uw/Makefile
--- imap-uw.orig/Makefile Wed Jul 23 03:00:14 2003
+++ imap-uw/Makefile Tue May 11 09:22:34 2004
@@ -6,7 +6,7 @@
#
PORTNAME= imap
-PORTVERSION= 2002d
+PORTVERSION= 2004
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
diff -urN -x work imap-uw.orig/distinfo imap-uw/distinfo
--- imap-uw.orig/distinfo Thu Apr 1 03:02:09 2004
+++ imap-uw/distinfo Tue May 11 09:22:46 2004
@@ -1,2 +1,2 @@
-MD5 (imap-2002d.tar.Z) = 64e82a195d21481fc4c54c4ed9fe0527
-SIZE (imap-2002d.tar.Z) = 2155224
+MD5 (imap-2004.tar.Z) = ec3dafeeae320457a1d098157e9bf969
+SIZE (imap-2004.tar.Z) = 2220333
diff -urN -x work imap-uw.orig/files/patch-ab imap-uw/files/patch-ab
--- imap-uw.orig/files/patch-ab Mon Apr 16 20:49:39 2001
+++ imap-uw/files/patch-ab Tue May 11 09:22:27 2004
@@ -1,15 +1,26 @@
---- src/osdep/unix/Makefile.orig Wed Apr 11 00:02:06 2001
-+++ src/osdep/unix/Makefile Sat Apr 14 03:20:57 2001
-@@ -28,12 +28,12 @@
+--- src/osdep/unix/Makefile.orig Fri Apr 30 04:08:48 2004
++++ src/osdep/unix/Makefile Tue May 11 08:34:26 2004
+@@ -22,20 +22,20 @@
+
+ EXTRAAUTHENTICATORS=
+ EXTRADRIVERS=mbox
+-PASSWDTYPE=std
+-SSLTYPE=nopwd
+-IP=4
++PASSWDTYPE=pam
++SSLTYPE=unix.nopwd
++IP=6
+
# Extended flags needed for SSL. You may need to modify.
-SSLDIR=/usr/local/ssl
-SSLCERTS=$(SSLDIR)/certs
--SSLINCLUDE=$(SSLDIR)/include
--SSLLIB=$(SSLDIR)/lib
+SSLDIR=$(OPENSSLBASE)
+SSLCERTS=$(PREFIX)/certs
+ SSLKEYS=$(SSLCERTS)
+-SSLINCLUDE=$(SSLDIR)/include
+-SSLLIB=$(SSLDIR)/lib
+SSLINCLUDE=$(OPENSSLINC)
+SSLLIB=$(OPENSSLLIB)
@@ -18,16 +29,7 @@
# Older versions of MIT Kerberos also have a libcrypto. If so, you may need
# to use this instead
-@@ -46,7 +46,7 @@
-
- SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
- -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\"
--SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
-+SSLLDFLAGS= # -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
-
-
- # Extended flags needed for non-standard passwd types. You may need to modify.
-@@ -60,7 +60,7 @@
+@@ -62,7 +62,7 @@
# AFSLDFLAGS may also need -L/usr/ucblib -lucb
DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
DCELDFLAGS= -ldce
@@ -36,41 +38,42 @@
# Build parameters normally set by the individual port
-@@ -97,7 +97,7 @@
+@@ -99,7 +99,7 @@
# Commands possibly overriden by the individual port
ARRC=ar rc
-CC=cc
-+CC?=cc
++#CC=cc
LN=ln -s
RANLIB=ranlib
-@@ -115,7 +115,7 @@
+@@ -117,7 +117,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
+ unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
-CFLAGS=-g
-+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
++CFLAGS+=-g $(BASECFLAGS) $(EXTRACFLAGS)
CAT=cat
MAKE=make
-@@ -198,6 +198,15 @@
- BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst=" \
- RANLIB=true ARRC="ar -rc"
-
-+bfp: # FreeBSD Pluggable Authentication Modules
-+ $(BUILD) `cat SPECIALS` 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"
+@@ -134,6 +134,10 @@
+ PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE)
+
+
++# Need this for the shared library rule to work correctly
++.SUFFIXES: .o .so
++SOFILES=${BINARIES:.o=.so}
+
- bs3: # BSD/i386 3.0 or higher
- $(BUILD) `$(CAT) SPECIALS` OS=bsi \
- CHECKPW=bsi LOGINPW=bsi CRXTYPE=nfs \
-@@ -217,8 +226,9 @@
+ # Here if no make argument established
+
+ missing: osdep.h
+@@ -214,13 +218,14 @@
+ BASECFLAGS="-g -Dconst="
+
+ bsf: # FreeBSD
+- $(BUILD) `$(CAT) SPECIALS` OS=$@ \
++ $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \
+ SIGTYPE=psx CRXTYPE=nfs \
SPOOLDIR=/var \
ACTIVEFILE=/usr/local/news/lib/active \
RSHPATH=/usr/bin/rsh \
@@ -78,16 +81,76 @@
- BASELDFLAGS="-lcrypt"
+ LOCKPGM=$(PREFIX)/libexec/mlock \
+ BASECFLAGS="-DNFSKLUDGE" \
-+ BASELDFLAGS=""
++ BASELDFLAGS="-lpam"
bsi: # BSD/i386
$(BUILD) `$(CAT) SPECIALS` OS=$@ \
-@@ -764,7 +774,7 @@
+@@ -786,23 +791,35 @@
+
+ # Build it!
- build: clean once $(ARCHIVE)
+-build: clean once $(ARCHIVE)
++build: clean once $(ARCHIVE) $(SHLIBNAME)
-all: $(ARCHIVE)
-+all: onceenv
++all: $(ARCHIVE) $(SHLIBNAME)
$(ARCHIVE): $(BINARIES)
sh -c '$(RM) $(ARCHIVE) || true'
+ @$(CAT) ARCHIVE
+ @$(SH) ARCHIVE
+
++$(SHLIBNAME): $(SOFILES)
++.if $(PORTOBJFORMAT) == "elf"
++ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
++.else
++ ld -Bshareable -x -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS`
++.endif
++ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so
++
++.c.so: osdep.h
++ $(CC) -fPIC -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
++
+ .c.o:
+- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c
++ $(CC) -c $(CFLAGS) $*.c
+
+
+ # Cleanup
+
+ clean:
+ sh -c '$(RM) auths.c crexcl.c nfstest.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
++ sh -c '$(RM) *.so $(SHLIBNAME)'
+
+
+ # Dependencies
+@@ -835,7 +852,7 @@
+
+ # OS-dependent
+
+-osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
++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 ip_unix.c\
+ auths.c crexcl.c flocksim.c nfstest.c flcksafe.c fsync.c gethstid.c \
+@@ -848,12 +865,19 @@
+ write.c sslstdio.c \
+ strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
+ OSCFLAGS
++
++osdep.o: $(OSDEPS)
++ $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
++ @echo ========================================================================
+ @echo Building OS-dependent module
+ @echo If you get No such file error messages for files x509.h, ssl.h,
+ @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL
+ @echo is not installed on your system. Either install OpenSSL first
+ @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none
+- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c
++ @echo ========================================================================
++
++osdep.so: $(OSDEPS)
++ $(CC) -fPIC -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@
+
+ osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c
+ $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c
diff -urN -x work imap-uw.orig/files/patch-ah imap-uw/files/patch-ah
--- imap-uw.orig/files/patch-ah Mon Jun 2 13:58:12 2003
+++ imap-uw/files/patch-ah Tue May 11 09:25:28 2004
@@ -1,5 +1,5 @@
---- src/ipopd/ipop3d.c.orig Fri Jan 17 18:17:58 2003
-+++ src/ipopd/ipop3d.c Mon Jun 2 02:47:10 2003
+--- src/ipopd/ipop3d.c.orig Tue Apr 27 23:50:29 2004
++++ src/ipopd/ipop3d.c Tue May 11 09:24:43 2004
@@ -28,6 +28,11 @@
#include <time.h>
#include "c-client.h"
@@ -22,7 +22,7 @@
+extern char *getenv ();
+#endif /* DRAC_AUTH */
+
- char *version = "2003.83"; /* server version */
+ char *version = "2004.87"; /* server version */
short state = AUTHORIZATION; /* server state */
short critical = NIL; /* non-zero if in critical code */
@@ -88,7 +99,53 @@
@@ -89,7 +89,7 @@
#include "linkage.c"
/* initialize server */
server_init (pgmname,"pop3","pop3s",clkint,kodint,hupint,trmint);
-@@ -209,9 +266,13 @@
+@@ -201,9 +258,13 @@
syslog (LOG_INFO,"AUTHENTICATE %s failure host=%.80s",s,
tcp_clienthost ());
}
@@ -104,7 +104,7 @@
else syslog (LOG_INFO,"Auth user=%.80s host=%.80s no mailbox",
user,tcp_clienthost ());
}
-@@ -248,9 +309,13 @@
+@@ -231,9 +292,13 @@
PSOUT ("-ERR Missing APOP argument\015\012");
else if (!(user = apop_login (challenge,s,t,argc,argv)))
PSOUT ("-ERR Bad APOP\015\012");
@@ -119,7 +119,7 @@
else syslog (LOG_INFO,"APOP user=%.80s host=%.80s no mailbox",
user,tcp_clienthost ());
}
-@@ -580,6 +645,9 @@
+@@ -564,6 +629,9 @@
/* attempt the login */
if (server_login (user,pass,t,argc,argv)) {
int ret = mbxopen ("INBOX");
diff -urN -x work imap-uw.orig/files/patch-ai imap-uw/files/patch-ai
--- imap-uw.orig/files/patch-ai Wed Jul 23 03:00:14 2003
+++ imap-uw/files/patch-ai Tue May 11 09:26:44 2004
@@ -22,7 +22,7 @@
+extern char *getenv ();
+#endif /* DRAC_AUTH */
+
- char *version = "2003.338"; /* version number of this server */
+ char *version = "2004.350"; /* version number of this server */
time_t alerttime = 0; /* time of last alert */
time_t sysalerttime = 0; /* time of last system alert */
@@ -238,7 +249,50 @@
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list