Date: Sun, 14 Dec 2014 17:56:15 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374717 - in head/mail: . cclient imap-uw panda-cclient panda-cclient/files panda-imap panda-imap/files Message-ID: <201412141756.sBEHuF5n010764@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Sun Dec 14 17:56:14 2014 New Revision: 374717 URL: https://svnweb.freebsd.org/changeset/ports/374717 QAT: https://qat.redports.org/buildarchive/r374717/ Log: Adding mail/panda-cclient and mail/panda-imap. Since Mark Crispin left the UW, development on UW-IMAP paused. Mark however continued developing the toolkit under the name Panda-IMAP. Since Mark passed, Jonathan Abbey created a project on GitHub, by concatenating all of the public releases of UW IMAP with the last version of Panda IMAP. Add conflict lines with the original ports. Added: head/mail/panda-cclient/ - copied from r373160, head/mail/cclient/ head/mail/panda-imap/ - copied from r373160, head/mail/imap-uw/ Modified: head/mail/Makefile head/mail/cclient/Makefile head/mail/imap-uw/Makefile head/mail/panda-cclient/Makefile head/mail/panda-cclient/distinfo head/mail/panda-cclient/files/patch-src_osdep_unix_Makefile head/mail/panda-cclient/pkg-descr head/mail/panda-imap/Makefile head/mail/panda-imap/distinfo head/mail/panda-imap/files/patch-src-osdep-unix-env_unix.c head/mail/panda-imap/files/patch-src_imapd_Makefile head/mail/panda-imap/files/patch-src_imapd_imapd.c head/mail/panda-imap/pkg-descr head/mail/panda-imap/pkg-plist Modified: head/mail/Makefile ============================================================================== --- head/mail/Makefile Sun Dec 14 17:44:35 2014 (r374716) +++ head/mail/Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -422,6 +422,8 @@ SUBDIR += p5-WWW-Hotmail SUBDIR += p5-ZConf-Mail SUBDIR += p5-qpsmtpd + SUBDIR += panda-cclient + SUBDIR += panda-imap SUBDIR += pantomime SUBDIR += pathalias SUBDIR += pear-Contact_Vcard_Build Modified: head/mail/cclient/Makefile ============================================================================== --- head/mail/cclient/Makefile Sun Dec 14 17:44:35 2014 (r374716) +++ head/mail/cclient/Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -19,6 +19,8 @@ COMMENT= Mark Crispin's C-client mail ac LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt +CONFLICTS_INSTALL= panda-cclient-20* + OPTIONS_DEFINE= SSL SSL_AND_PLAINTEXT IPV6 MBX_DEFAULT OPTIONS_DEFAULT= SSL SSL_AND_PLAINTEXT_DESC= Allow plain text passwords and SSL Modified: head/mail/imap-uw/Makefile ============================================================================== --- head/mail/imap-uw/Makefile Sun Dec 14 17:44:35 2014 (r374716) +++ head/mail/imap-uw/Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -18,7 +18,9 @@ COMMENT= University of Washington IMAP4r LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libc-client4.so:${PORTSDIR}/mail/cclient +LIB_DEPENDS= libc-client4.so.9:${PORTSDIR}/mail/cclient + +CONFLICTS_INSTALL= panda-imap-20* DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= pkg-message Modified: head/mail/panda-cclient/Makefile ============================================================================== --- head/mail/cclient/Makefile Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-cclient/Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -2,22 +2,24 @@ # $FreeBSD$ PORTNAME= cclient -PORTVERSION= 2007f -PORTREVISION= 1 -PORTEPOCH= 1 +PORTVERSION= 20130621 CATEGORIES= mail devel ipv6 -MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ - http://atreides.freenix.no/~anders/%SUBDIR%/ \ - ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/imap/%SUBDIR%/ \ - ftp://ftp.nuug.no/pub/anders/distfiles/%SUBDIR%/ -MASTER_SITE_SUBDIR= . old -DISTNAME= imap-${PORTVERSION} +PKGNAMEPREFIX= panda- +DISTNAME= panda-imap-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org -COMMENT= Mark Crispin's C-client mail access routines +MAINTAINER= thierry@FreeBSD.org +COMMENT= Mark Crispin's C-client mail access routines forked from UW LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt +LICENSE_FILE= ${WRKSRC}/LICENSE + +USE_GITHUB= yes +GH_ACCOUNT= jonabbey +GH_PROJECT= ${PORTNAME} +GH_TAGNAME= ${GH_COMMIT} +GH_COMMIT= 7905901 + +CONFLICTS_INSTALL= cclient-20* OPTIONS_DEFINE= SSL SSL_AND_PLAINTEXT IPV6 MBX_DEFAULT OPTIONS_DEFAULT= SSL @@ -47,34 +49,34 @@ MAKE_ARGS+= SSLTYPE=unix.nopwd SSLDIR=${ .endif .endif -WRKSRC= ${WRKDIR}/${DISTNAME} +WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${DISTNAME:C|${PORTVERSION}|${GH_COMMIT}|} MAKE_ARGS+= EXTRACFLAGS="${CFLAGS}" SHLIBBASE= c-client4 -SHLIBMAJ= 9 +SHLIBMAJ= 10 SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ} MAKE_ENV+= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE} PLIST_SUB= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE} -post-patch: +pre-configure: .for file in Makefile src/osdep/unix/Makefile src/osdep/unix/Makefile.gss - @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${file} + ${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/${file} .endfor - @${REINPLACE_CMD} -e "s:/etc/ssl/certs:${PREFIX}/certs:g; \ + ${REINPLACE_CMD} -e "s:/etc/ssl/certs:${PREFIX}/certs:g; \ s:/etc/ssl/private:${PREFIX}/certs:g" ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e "s:/etc/c-client.cf:${PREFIX}/etc/c-client.cf:" \ + ${REINPLACE_CMD} -e "s:/etc/c-client.cf:${PREFIX}/etc/c-client.cf:" \ ${WRKSRC}/src/osdep/unix/env_unix.h .if ${PORT_OPTIONS:MSSL} - @${REINPLACE_CMD} -e " \ + ${REINPLACE_CMD} -e " \ s:SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib:SSLINCLUDE=${OPENSSLINC} SSLLIB=${OPENSSLLIB}: \ " ${WRKSRC}/Makefile .endif .if ${PORT_OPTIONS:MIPV6} - @${REINPLACE_CMD} -e "s|^IP=4|IP=6|" ${WRKSRC}/Makefile \ + ${REINPLACE_CMD} -e "s|^IP=4|IP=6|" ${WRKSRC}/Makefile \ ${WRKSRC}/src/osdep/unix/Makefile .endif .if ${PORT_OPTIONS:MMBX_DEFAULT} - @${REINPLACE_CMD} -e "s|^CREATEPROTO=unixproto|CREATEPROTO=mbxproto|" \ + ${REINPLACE_CMD} -e "s|^CREATEPROTO=unixproto|CREATEPROTO=mbxproto|" \ ${WRKSRC}/src/osdep/unix/Makefile .endif Modified: head/mail/panda-cclient/distinfo ============================================================================== --- head/mail/cclient/distinfo Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-cclient/distinfo Sun Dec 14 17:56:14 2014 (r374717) @@ -1,2 +1,2 @@ -SHA256 (imap-2007f.tar.gz) = 53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28 -SIZE (imap-2007f.tar.gz) = 1990304 +SHA256 (panda-imap-20130621.tar.gz) = 75696352efb56ac1c652e8df4f54ea6c3160fd6aa2cf078f793fac06733bc5b1 +SIZE (panda-imap-20130621.tar.gz) = 2065425 Modified: head/mail/panda-cclient/files/patch-src_osdep_unix_Makefile ============================================================================== --- head/mail/cclient/files/patch-src_osdep_unix_Makefile Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-cclient/files/patch-src_osdep_unix_Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -1,254 +1,152 @@ -*** src/osdep/unix/Makefile.orig Sun Jun 17 17:37:44 2007 ---- src/osdep/unix/Makefile Mon Jul 23 16:30:12 2007 -*************** -*** 28,36 **** - - EXTRAAUTHENTICATORS= - EXTRADRIVERS=mbox -! PASSWDTYPE=std -! SSLTYPE=nopwd -! IP=4 - - - # The optimization level here for GCC ports is set here for a reason. It's ---- 28,36 ---- - - EXTRAAUTHENTICATORS= - EXTRADRIVERS=mbox -! PASSWDTYPE=pam -! SSLTYPE=unix.nopwd -! IP=6 - - - # The optimization level here for GCC ports is set here for a reason. It's -*************** -*** 54,66 **** - - # Extended flags needed for SSL. You may need to modify. - -! SSLDIR=/usr/local/ssl -! SSLCERTS=$(SSLDIR)/certs - SSLKEYS=$(SSLCERTS) - SSLINCLUDE=$(SSLDIR)/include - SSLLIB=$(SSLDIR)/lib - -! SSLCRYPTO=-lcrypto - - # Older versions of MIT Kerberos also have a libcrypto. If so, you may need - # to use this instead ---- 54,66 ---- - - # Extended flags needed for SSL. You may need to modify. - -! #SSLDIR=/usr/local/ssl -! SSLCERTS=$(PREFIX)/certs - SSLKEYS=$(SSLCERTS) - SSLINCLUDE=$(SSLDIR)/include - SSLLIB=$(SSLDIR)/lib - -! SSLCRYPTO=-lcrypto -lcrypt - - # Older versions of MIT Kerberos also have a libcrypto. If so, you may need - # to use this instead -*************** -*** 87,93 **** - # AFSLDFLAGS may also need -L/usr/ucblib -lucb - DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" - DCELDFLAGS= -ldce -! PAMLDFLAGS= -lpam -ldl - - - # Build parameters normally set by the individual port ---- 87,93 ---- - # AFSLDFLAGS may also need -L/usr/ucblib -lucb - DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" - DCELDFLAGS= -ldce -! PAMLDFLAGS= # -lpam -lcrypt - - - # Build parameters normally set by the individual port -*************** -*** 125,131 **** - # Commands possibly overriden by the individual port - - ARRC=ar rc -! CC=cc - LN=ln -s - RANLIB=ranlib - ---- 125,131 ---- - # Commands possibly overriden by the individual port - - ARRC=ar rc -! #CC=cc - LN=ln -s - RANLIB=ranlib - -*************** -*** 149,155 **** - dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ - rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ - unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o -! CFLAGS=-g - - CAT=cat - MAKE=make ---- 149,155 ---- - dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ - rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ - unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o -! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS) - - CAT=cat - MAKE=make -*************** -*** 166,171 **** ---- 166,175 ---- - PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP) - - -+ # Need this for the shared library rule to work correctly -+ .SUFFIXES: .o .so -+ SOFILES=${BINARIES:.o=.so} -+ - # Here if no make argument established - - missing: osdep.h -*************** -*** 246,258 **** - BASECFLAGS="-g -Dconst=" - - bsf: # FreeBSD -! $(BUILD) `$(CAT) SPECIALS` OS=$@ \ - SIGTYPE=psx CRXTYPE=nfs \ - SPOOLDIR=/var \ - ACTIVEFILE=/usr/local/news/lib/active \ - RSHPATH=/usr/bin/rsh \ - BASECFLAGS="$(GCCCFLAGS)" \ -! BASELDFLAGS="-lcrypt" - - bsi: # BSD/i386 - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ ---- 250,263 ---- - BASECFLAGS="-g -Dconst=" - - bsf: # FreeBSD -! $(BUILD) `$(CAT) SPECIALS` OS=$@ CHECKPW=pam \ - SIGTYPE=psx CRXTYPE=nfs \ - SPOOLDIR=/var \ - ACTIVEFILE=/usr/local/news/lib/active \ - RSHPATH=/usr/bin/rsh \ -+ LOCKPGM=$(PREFIX)/libexec/mlock \ - BASECFLAGS="$(GCCCFLAGS)" \ -! BASELDFLAGS="-lpam" - - bsi: # BSD/i386 - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ -*************** -*** 840,862 **** - - # Build it! - -! build: clean once $(ARCHIVE) - -! all: $(ARCHIVE) - - $(ARCHIVE): $(BINARIES) - sh -c '$(RM) $(ARCHIVE) || true' - @$(CAT) ARCHIVE - @$(SH) ARCHIVE - - .c.o: -! `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c - - - # Cleanup - - clean: - sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' - - - # Dependencies ---- 845,875 ---- - - # Build it! - -! build: clean once $(ARCHIVE) $(SHLIBNAME) - -! all: $(ARCHIVE) $(SHLIBNAME) - - $(ARCHIVE): $(BINARIES) - sh -c '$(RM) $(ARCHIVE) || true' - @$(CAT) ARCHIVE - @$(SH) ARCHIVE - -+ $(SHLIBNAME): $(SOFILES) -+ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS` -+ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so -+ -+ .c.so: osdep.h -+ $(CC) -fPIC -DPIC -c `cat CFLAGS` ${@:.so=.c} -o $@ -+ - .c.o: -! $(CC) -c `cat CFLAGS` $*.c - - - # Cleanup - - clean: - sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' -+ sh -c '$(RM) *.so $(SHLIBNAME)' - - - # Dependencies -*************** -*** 891,897 **** - - # OS-dependent - -! osdep.o: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 flockcyg.c flocklnx.c flocksim.c fsync.c \ ---- 904,910 ---- - - # OS-dependent - -! 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 flockcyg.c flocklnx.c flocksim.c fsync.c \ -*************** -*** 905,916 **** - write.c sslstdio.c \ - strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ - OSCFLAGS - @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 - - osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c - $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c ---- 918,936 ---- - write.c sslstdio.c \ - strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ - OSCFLAGS -+ -+ osdep.o: $(OSDEPS) -+ $(CC) `$(CAT) 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 -! @echo ======================================================================== -! -! osdep.so: $(OSDEPS) -! $(CC) -fPIC -DPIC -c `$(CAT) 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 +--- src/osdep/unix/Makefile.orig 2013-06-21 23:29:17.000000000 +0200 ++++ src/osdep/unix/Makefile 2014-12-01 22:35:23.000000000 +0100 +@@ -30,9 +30,9 @@ + + EXTRAAUTHENTICATORS= + EXTRADRIVERS=mbox +-PASSWDTYPE=std +-SSLTYPE=nopwd +-IP=4 ++PASSWDTYPE=pam ++SSLTYPE=unix.nopwd ++IP=6 + + + # The optimization level here for GCC ports is set here for a reason. It's +@@ -56,13 +56,13 @@ + + # Extended flags needed for SSL. You may need to modify. + +-SSLDIR=/usr/local/ssl +-SSLCERTS=$(SSLDIR)/certs ++#SSLDIR=/usr/local/ssl ++SSLCERTS=$(PREFIX)/certs + SSLKEYS=$(SSLCERTS) + SSLINCLUDE=$(SSLDIR)/include + SSLLIB=$(SSLDIR)/lib + +-SSLCRYPTO=-lcrypto ++SSLCRYPTO=-lcrypto -lcrypt + + # Older versions of MIT Kerberos also have a libcrypto. If so, you may need + # to use this instead +@@ -89,7 +89,7 @@ + # AFSLDFLAGS may also need -L/usr/ucblib -lucb + DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" + DCELDFLAGS= -ldce +-PAMLDFLAGS= -lpam -ldl ++PAMLDFLAGS= # -lpam -lcrypt + + + # Build parameters normally set by the individual port +@@ -132,7 +132,7 @@ + # Commands possibly overriden by the individual port + + ARRC=ar rc +-CC=cc ++#CC=cc + LN=ln -s + RANLIB=ranlib + +@@ -156,7 +156,7 @@ + dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ + rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ + unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o +-CFLAGS=-g ++CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS) + + CAT=cat + MAKE=make +@@ -173,6 +173,10 @@ + PASSWDTYPE=$(PASSWDTYPE) SSLTYPE=$(SSLTYPE) IP=$(IP) + + ++# Need this for the shared library rule to work correctly ++.SUFFIXES: .o .so ++SOFILES=${BINARIES:.o=.so} ++ + # Here if no make argument established + + missing: osdep.h +@@ -261,13 +265,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 \ ++ LOCKPGM=$(PREFIX)/libexec/mlock \ + BASECFLAGS="$(GCCCFLAGS)" \ +- BASELDFLAGS="-lcrypt" ++ BASELDFLAGS="-lpam" + + bsi: # BSD/i386 + $(BUILD) `$(CAT) SPECIALS` OS=$@ \ +@@ -863,23 +868,31 @@ + + # Build it! + +-build: clean once $(ARCHIVE) ++build: clean once $(ARCHIVE) $(SHLIBNAME) + +-all: $(ARCHIVE) ++all: $(ARCHIVE) $(SHLIBNAME) + + $(ARCHIVE): $(BINARIES) + sh -c '$(RM) $(ARCHIVE) || true' + @$(CAT) ./ARCHIVE + @$(SH) ./ARCHIVE + ++$(SHLIBNAME): $(SOFILES) ++ $(CC) -shared -Wl,-soname=$(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) `cat LDFLAGS` ++ $(LN) $(SHLIBNAME) lib$(SHLIBBASE).so ++ ++.c.so: osdep.h ++ $(CC) -fPIC -DPIC -c `cat CFLAGS` ${@:.so=.c} -o $@ ++ + .c.o: +- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c ++ $(CC) -c `cat CFLAGS` $*.c + + + # Cleanup + + clean: + sh -c '$(RM) auths.c crexcl.c ip_unix.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' ++ sh -c '$(RM) *.so $(SHLIBNAME)' + + + # Dependencies +@@ -914,7 +927,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 flockcyg.c flocklnx.c flocksim.c fsync.c \ +@@ -928,12 +941,19 @@ + write.c sslstdio.c \ + strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ + OSCFLAGS ++ ++osdep.o: $(OSDEPS) ++ $(CC) `$(CAT) 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 `$(CAT) 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 Modified: head/mail/panda-cclient/pkg-descr ============================================================================== --- head/mail/cclient/pkg-descr Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-cclient/pkg-descr Sun Dec 14 17:56:14 2014 (r374717) @@ -2,6 +2,8 @@ C-client is a common API for accessing m the popular PINE mail reader as well as the University of Washington's IMAP server. +This is the version forked from UW by the original author Mark Crispin. + For more information, please see the UW IMAP homepage: WWW: http://www.washington.edu/imap/ Modified: head/mail/panda-imap/Makefile ============================================================================== --- head/mail/imap-uw/Makefile Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -1,24 +1,25 @@ # Created by: pst # $FreeBSD$ -PORTNAME= imap -PORTVERSION= 2007f -PORTEPOCH= 1 +PORTNAME= panda-imap +PORTVERSION= 20130621 CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ - ftp://ftp.nuug.no/pub/anders/distfiles/%SUBDIR%/ \ - http://atreides.freenix.no/~anders/%SUBDIR%/ \ - ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/%SUBDIR%/ -MASTER_SITE_SUBDIR= . old -PKGNAMESUFFIX= -uw -MAINTAINER= ports@FreeBSD.org -COMMENT= University of Washington IMAP4rev1/POP2/POP3 mail servers +MAINTAINER= thierry@FreeBSD.org +COMMENT= IMAP4rev1/POP2/POP3 mail servers forked from imap-uw LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt +LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libc-client4.so:${PORTSDIR}/mail/cclient +LIB_DEPENDS= libc-client4.so.10:${PORTSDIR}/mail/panda-cclient + +USE_GITHUB= yes +GH_ACCOUNT= jonabbey +GH_PROJECT= ${PORTNAME} +GH_TAGNAME= ${GH_COMMIT} +GH_COMMIT= 7905901 + +CONFLICTS_INSTALL= imap-uw-20* DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= pkg-message @@ -40,7 +41,7 @@ NETSCAPE_BRAIN_DAMAGE_DESC= See Makefile .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDRAC} -BUILD_DEPENDS= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac +BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac MAKE_ARGS+= WITH_DRAC=yes .endif @@ -79,7 +80,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${STAGEDIR}${PREFIX}/libexec/ ${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${STAGEDIR}${PREFIX}/libexec/ ${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${STAGEDIR}${PREFIX}/libexec/ - ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g mail -m 2711 \ + ${INSTALL} ${COPY} ${STRIP} \ ${WRKSRC}/mlock/mlock ${STAGEDIR}${PREFIX}/libexec ${INSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${STAGEDIR}${PREFIX}/bin/mboxtest ${INSTALL_MAN} \ @@ -116,15 +117,15 @@ post-install: .endif .if ${PORT_OPTIONS:MDOCS} ${MKDIR} -m 0755 -p ${STAGEDIR}${DOCSDIR} - @${TAR} -C ${WRKSRC}/docs -cf - . | \ + ${TAR} -C ${WRKSRC}/docs -cf - . | \ (umask 022; ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -) .endif cert: - @${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/certs - @openssl req -new -x509 -days 365 -nodes -config ${FILESDIR}/imap-uw.cnf -out ${PREFIX}/certs/imapd.pem -keyout ${PREFIX}/certs/imapd.pem - @openssl x509 -subject -dates -fingerprint -noout -in ${PREFIX}/certs/imapd.pem - @${CHMOD} 700 ${PREFIX}/certs/imapd.pem - @${LN} -s ${PREFIX}/certs/imapd.pem ${PREFIX}/certs/ipop3d.pem + ${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/certs + openssl req -new -x509 -days 365 -nodes -config ${FILESDIR}/imap-uw.cnf -out ${PREFIX}/certs/imapd.pem -keyout ${PREFIX}/certs/imapd.pem + openssl x509 -subject -dates -fingerprint -noout -in ${PREFIX}/certs/imapd.pem + ${CHMOD} 700 ${PREFIX}/certs/imapd.pem + ${LN} -s ${PREFIX}/certs/imapd.pem ${PREFIX}/certs/ipop3d.pem .include <bsd.port.post.mk> Modified: head/mail/panda-imap/distinfo ============================================================================== --- head/mail/imap-uw/distinfo Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/distinfo Sun Dec 14 17:56:14 2014 (r374717) @@ -1,2 +1,2 @@ -SHA256 (imap-2007f.tar.gz) = 53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28 -SIZE (imap-2007f.tar.gz) = 1990304 +SHA256 (panda-imap-20130621.tar.gz) = 75696352efb56ac1c652e8df4f54ea6c3160fd6aa2cf078f793fac06733bc5b1 +SIZE (panda-imap-20130621.tar.gz) = 2065425 Modified: head/mail/panda-imap/files/patch-src-osdep-unix-env_unix.c ============================================================================== --- head/mail/imap-uw/files/patch-src-osdep-unix-env_unix.c Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/files/patch-src-osdep-unix-env_unix.c Sun Dec 14 17:56:14 2014 (r374717) @@ -1,19 +1,11 @@ -*** src/osdep/unix/env_unix.c.orig Tue May 29 22:29:52 2007 ---- src/osdep/unix/env_unix.c Mon Jul 23 17:50:43 2007 -*************** -*** 79,85 **** - static short anonymous = NIL; /* is anonymous */ - static short blackBox = NIL; /* is a black box */ - static short closedBox = NIL; /* is a closed box (uses chroot() jail) */ -! static short restrictBox = NIL; /* is a restricted box */ - static short has_no_life = NIL; /* is a cretin with no life */ - static short hideDotFiles = NIL;/* hide files whose names start with . */ - /* advertise filesystem root */ ---- 79,85 ---- - static short anonymous = NIL; /* is anonymous */ - static short blackBox = NIL; /* is a black box */ - static short closedBox = NIL; /* is a closed box (uses chroot() jail) */ -! static short restrictBox = -1; /* is a restricted box */ - static short has_no_life = NIL; /* is a cretin with no life */ - static short hideDotFiles = NIL;/* hide files whose names start with . */ - /* advertise filesystem root */ +--- src/osdep/unix/env_unix.c.orig 2013-06-21 23:29:17.000000000 +0200 ++++ src/osdep/unix/env_unix.c 2014-11-23 22:48:04.000000000 +0100 +@@ -76,7 +76,7 @@ + static short anonymous = NIL; /* is anonymous */ + static short blackBox = NIL; /* is a black box */ + static short closedBox = NIL; /* is a closed box (uses chroot() jail) */ +-static long restrictBox = NIL; /* is a restricted box */ ++static long restrictBox = -1; /* is a restricted box */ + static short has_no_life = NIL; /* is a cretin with no life */ + /* block environment init */ + static short block_env_init = NIL; Modified: head/mail/panda-imap/files/patch-src_imapd_Makefile ============================================================================== --- head/mail/imap-uw/files/patch-src_imapd_Makefile Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/files/patch-src_imapd_Makefile Sun Dec 14 17:56:14 2014 (r374717) @@ -1,85 +1,61 @@ -*** src/imapd/Makefile.orig Thu Aug 31 02:10:44 2006 ---- src/imapd/Makefile Mon Jul 23 18:02:12 2007 -*************** -*** 25,35 **** - # Last Edited: 30 August 2006 - - -! ALERT=/etc/imapd.alert - USERALERT=.imapalert -! SHUTDOWN=/etc/nologin -! ANO=/etc/anonymous.newsgroups -! NNTP=/etc/imapd.nntp - SHELL= /bin/sh - - ---- 25,35 ---- - # Last Edited: 30 August 2006 - - -! ALERT=$(PREFIX)/etc/imapd.alert - USERALERT=.imapalert -! SHUTDOWN=$(PREFIX)/etc/nologin -! ANO=$(PREFIX)/etc/anonymous.newsgroups -! NNTP=$(PREFIX)//etc/imapd.nntp - SHELL= /bin/sh - - -*************** -*** 37,64 **** - # causes the "Manage Mail" menu item to open the given URL, e.g. to point to - # an alternative IMAP client (e.g. Pine) or perhaps to a homebrew mail - # account management page. -! #NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://www.washington.edu/pine\" - - - # Get local definitions from c-client directory - -! C = ../c-client -! CCLIENTLIB = $C/c-client.a -! CC = `cat $C/CCTYPE` -! CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \ - -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \ - -DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\" -! LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` - - all: imapd - -! imapd: $(CCLIENTLIB) imapd.o - $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS) -- -- imapd.o: $C/mail.h $C/misc.h $C/osdep.h -- -- $(CCLIENTLIB): -- cd $C;make - - clean: - rm -f *.o imapd || true ---- 37,63 ---- - # causes the "Manage Mail" menu item to open the given URL, e.g. to point to - # an alternative IMAP client (e.g. Pine) or perhaps to a homebrew mail - # account management page. -! .if defined(WITH_NETSCAPE_BRAIN_DAMAGE) -! NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://www.washington.edu/pine\" -! .endif - - - # Get local definitions from c-client directory - -! CFLAGS = -DNFSKLUDGE -I$(LOCALBASE)/include/c-client $(NSBD) \ -! -DANOFILE=\"$(ANO)\" \ - -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \ - -DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\" -! LDFLAGS+= $(EXTRALDFLAGS) -L$(LOCALBASE)/lib -lc-client4 -! .if defined(WITH_DRAC) -! CFLAGS+= -DETC_DIR=\"$(PREFIX)/etc\" -DDRAC_AUTH -! LDFLAGS+= -ldrac -! .endif - - all: imapd - -! imapd: imapd.o - $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS) - - clean: - rm -f *.o imapd || true +--- src/imapd/Makefile.orig 2013-06-21 23:29:17.000000000 +0200 ++++ src/imapd/Makefile 2014-12-14 14:44:16.000000000 +0100 +@@ -26,11 +26,11 @@ + # http://www.apache.org/licenses/LICENSE-2.0 + + +-ALERT=/etc/imapd.alert ++ALERT=$(PREFIX)/etc/imapd.alert + USERALERT=.imapalert +-SHUTDOWN=/etc/nologin +-ANO=/etc/anonymous.newsgroups +-NNTP=/etc/imapd.nntp ++SHUTDOWN=$(PREFIX)/etc/nologin ++ANO=$(PREFIX)/etc/anonymous.newsgroups ++NNTP=$(PREFIX)//etc/imapd.nntp + SHELL= /bin/sh + + +@@ -38,7 +38,9 @@ + # causes the "Manage Mail" menu item to open the given URL, e.g. to point to + # an alternative IMAP client (e.g. Pine) or perhaps to a homebrew mail + # account management page. +-#NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://sourceforge.net/projects/re-alpine\" ++.if defined(WITH_NETSCAPE_BRAIN_DAMAGE) ++NSBD= -DNETSCAPE_BRAIN_DAMAGE=\"http://sourceforge.net/projects/re-alpine\" ++.endif + + # Un-comment to enable the ESEARCH command. Unfortunately, the iOS4 Mail + # client misinterprets the ESEARCH results due to an ambiguity in RFC 4731. +@@ -46,23 +48,21 @@ + + # Get local definitions from c-client directory + +-C = ../c-client +-CCLIENTLIB = $C/c-client.a +-CC = `cat $C/CCTYPE` +-CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ESEARCH) -DANOFILE=\"$(ANO)\" \ ++CFLAGS = -DNFSKLUDGE -I$(LOCALBASE)/include/c-client $(NSBD) \ ++ -DANOFILE=\"$(ANO)\" \ + -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \ + -DUSERALERTFILE=\"$(USERALERT)\" -DSHUTDOWNFILE=\"$(SHUTDOWN)\" +-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` ++LDFLAGS+= $(EXTRALDFLAGS) -L$(LOCALBASE)/lib -lc-client4 ++.if defined(WITH_DRAC) ++CFLAGS+= -DETC_DIR=\"$(PREFIX)/etc\" -DDRAC_AUTH ++LDFLAGS+= -ldrac ++.endif + + all: imapd + +-imapd: $(CCLIENTLIB) imapd.o ++imapd: imapd.o + $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS) + +-imapd.o: $C/mail.h $C/misc.h $C/osdep.h +- +-$(CCLIENTLIB): +- cd $C;make + + clean: + rm -f *.o imapd || true Modified: head/mail/panda-imap/files/patch-src_imapd_imapd.c ============================================================================== --- head/mail/imap-uw/files/patch-src_imapd_imapd.c Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/files/patch-src_imapd_imapd.c Sun Dec 14 17:56:14 2014 (r374717) @@ -1,5 +1,5 @@ ---- src/imapd/imapd.c.orig 2008-11-18 19:46:59.000000000 +0100 -+++ src/imapd/imapd.c 2009-01-16 10:23:02.000000000 +0100 +--- src/imapd/imapd.c.orig 2013-06-21 23:29:17.000000000 +0200 ++++ src/imapd/imapd.c 2014-11-23 22:59:07.000000000 +0100 @@ -37,6 +37,11 @@ #include "newsrc.h" #include <sys/stat.h> @@ -12,7 +12,7 @@ #define CRLF PSOUT ("\015\012") /* primary output terpri */ -@@ -207,6 +212,12 @@ +@@ -214,6 +219,12 @@ /* Global storage */ @@ -22,10 +22,10 @@ +extern char *getenv (); +#endif /* DRAC_AUTH */ + - char *version = "404"; /* edit number of this server */ + char *version = "417"; /* edit number of this server */ char *logout = "Logout"; /* syslogreason for logout */ char *goodbye = NIL; /* bye reason */ -@@ -283,7 +294,50 @@ +@@ -294,7 +305,50 @@ msg_string_next, /* get next byte in string structure */ msg_string_setpos /* set position in string structure */ }; @@ -77,7 +77,7 @@ /* Main program */ int main (int argc,char *argv[]) -@@ -1525,6 +1579,9 @@ +@@ -1613,6 +1667,9 @@ lasterror ()); return; } Modified: head/mail/panda-imap/pkg-descr ============================================================================== --- head/mail/imap-uw/pkg-descr Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/pkg-descr Sun Dec 14 17:56:14 2014 (r374717) @@ -1,4 +1,6 @@ This is the IMAP4rev1 server from the University of Washington. Included are (almost) backwards-compatible POP2 and POP3 servers. +This is the version forked from UW by the original author Mark Crispin. + WWW: http://www.washington.edu/imap/ Modified: head/mail/panda-imap/pkg-plist ============================================================================== --- head/mail/imap-uw/pkg-plist Sun Nov 23 15:34:01 2014 (r373160) +++ head/mail/panda-imap/pkg-plist Sun Dec 14 17:56:14 2014 (r374717) @@ -5,7 +5,7 @@ bin/tmail libexec/imapd libexec/ipop2d libexec/ipop3d -libexec/mlock +@(,mail,2711) libexec/mlock man/man1/dmail.1.gz man/man1/mailutil.1.gz man/man1/tmail.1.gz @@ -22,9 +22,6 @@ man/man8/imapd.8.gz %%PORTDOCS%%%%DOCSDIR%%/bugs.txt %%PORTDOCS%%%%DOCSDIR%%/calendar.txt %%PORTDOCS%%%%DOCSDIR%%/commndmt.txt -%%PORTDOCS%%%%DOCSDIR%%/draft/README -%%PORTDOCS%%%%DOCSDIR%%/draft/i18n.txt -%%PORTDOCS%%%%DOCSDIR%%/draft/sort.txt %%PORTDOCS%%%%DOCSDIR%%/drivers.txt %%PORTDOCS%%%%DOCSDIR%%/formats.txt %%PORTDOCS%%%%DOCSDIR%%/imaprc.txt @@ -33,6 +30,7 @@ man/man8/imapd.8.gz %%PORTDOCS%%%%DOCSDIR%%/md5.txt %%PORTDOCS%%%%DOCSDIR%%/mixfmt.txt %%PORTDOCS%%%%DOCSDIR%%/naming.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/README %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1732.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1733.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2061.txt @@ -72,8 +70,22 @@ man/man8/imapd.8.gz %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4978.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5032.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5051.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5234.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5092.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5161.txt %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5162.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/README +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5234.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5255.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5256.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5257.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5258.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5259.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5267.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5464.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5465.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5466.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5524.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5530.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5593.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5738.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5788.txt +%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5819.txt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412141756.sBEHuF5n010764>