From 89b20c4179e680a570c6294aff7b89fec5d51253 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Thu, 27 Sep 2012 15:09:53 +0000 Subject: [PATCH] Import alpine-2.02. This is the continuation of the Alpine email client from University of Washington. This port will be used to build the following packages: - alpine - c-client - imap-uw - mailutil-uw - pico - pilot ok jasper@ --- mail/re-alpine/Makefile | 138 ++++++++++++++++++ mail/re-alpine/distinfo | 2 + mail/re-alpine/files/c-client.cf | 9 ++ .../re-alpine/patches/patch-alpine_pine-use_c | 12 ++ mail/re-alpine/patches/patch-configure | 30 ++++ mail/re-alpine/patches/patch-doc_alpine_1 | 21 +++ mail/re-alpine/patches/patch-imap_Makefile | 23 +++ .../patches/patch-imap_src_imapd_imapd_8 | 12 ++ .../patches/patch-imap_src_ipopd_ipopd_8 | 15 ++ .../patches/patch-imap_src_mlock_mlock_c | 17 +++ .../patch-imap_src_osdep_unix_Makefile | 135 +++++++++++++++++ .../patch-imap_src_osdep_unix_Makefile_gss | 18 +++ .../patch-imap_src_osdep_unix_env_unix_c | 19 +++ .../patch-imap_src_osdep_unix_kerb_mit_c | 17 +++ .../patches/patch-imap_src_tmail_tmail_c | 11 ++ .../patches/patch-pith_charconv_utf8_c | 13 ++ mail/re-alpine/patches/patch-pith_conf_c | 15 ++ mail/re-alpine/patches/patch-pith_pine_hlp | 30 ++++ mail/re-alpine/pkg/DESCR-c-client | 6 + mail/re-alpine/pkg/DESCR-imap | 9 ++ mail/re-alpine/pkg/DESCR-mailutil | 4 + mail/re-alpine/pkg/DESCR-main | 11 ++ mail/re-alpine/pkg/DESCR-pico | 7 + mail/re-alpine/pkg/DESCR-pilot | 6 + mail/re-alpine/pkg/PFRAG.shared-c-client | 2 + mail/re-alpine/pkg/PLIST-c-client | 36 +++++ mail/re-alpine/pkg/PLIST-imap | 46 ++++++ mail/re-alpine/pkg/PLIST-mailutil | 4 + mail/re-alpine/pkg/PLIST-main | 19 +++ mail/re-alpine/pkg/PLIST-pico | 5 + mail/re-alpine/pkg/PLIST-pilot | 5 + mail/re-alpine/pkg/README-imap | 43 ++++++ mail/re-alpine/pkg/README-main | 73 +++++++++ 33 files changed, 813 insertions(+) create mode 100644 mail/re-alpine/Makefile create mode 100644 mail/re-alpine/distinfo create mode 100644 mail/re-alpine/files/c-client.cf create mode 100644 mail/re-alpine/patches/patch-alpine_pine-use_c create mode 100644 mail/re-alpine/patches/patch-configure create mode 100644 mail/re-alpine/patches/patch-doc_alpine_1 create mode 100644 mail/re-alpine/patches/patch-imap_Makefile create mode 100644 mail/re-alpine/patches/patch-imap_src_imapd_imapd_8 create mode 100644 mail/re-alpine/patches/patch-imap_src_ipopd_ipopd_8 create mode 100644 mail/re-alpine/patches/patch-imap_src_mlock_mlock_c create mode 100644 mail/re-alpine/patches/patch-imap_src_osdep_unix_Makefile create mode 100644 mail/re-alpine/patches/patch-imap_src_osdep_unix_Makefile_gss create mode 100644 mail/re-alpine/patches/patch-imap_src_osdep_unix_env_unix_c create mode 100644 mail/re-alpine/patches/patch-imap_src_osdep_unix_kerb_mit_c create mode 100644 mail/re-alpine/patches/patch-imap_src_tmail_tmail_c create mode 100644 mail/re-alpine/patches/patch-pith_charconv_utf8_c create mode 100644 mail/re-alpine/patches/patch-pith_conf_c create mode 100644 mail/re-alpine/patches/patch-pith_pine_hlp create mode 100644 mail/re-alpine/pkg/DESCR-c-client create mode 100644 mail/re-alpine/pkg/DESCR-imap create mode 100644 mail/re-alpine/pkg/DESCR-mailutil create mode 100644 mail/re-alpine/pkg/DESCR-main create mode 100644 mail/re-alpine/pkg/DESCR-pico create mode 100644 mail/re-alpine/pkg/DESCR-pilot create mode 100644 mail/re-alpine/pkg/PFRAG.shared-c-client create mode 100644 mail/re-alpine/pkg/PLIST-c-client create mode 100644 mail/re-alpine/pkg/PLIST-imap create mode 100644 mail/re-alpine/pkg/PLIST-mailutil create mode 100644 mail/re-alpine/pkg/PLIST-main create mode 100644 mail/re-alpine/pkg/PLIST-pico create mode 100644 mail/re-alpine/pkg/PLIST-pilot create mode 100644 mail/re-alpine/pkg/README-imap create mode 100644 mail/re-alpine/pkg/README-main diff --git a/mail/re-alpine/Makefile b/mail/re-alpine/Makefile new file mode 100644 index 00000000000..f3cd3ca8916 --- /dev/null +++ b/mail/re-alpine/Makefile @@ -0,0 +1,138 @@ +# $OpenBSD: Makefile,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ + +COMMENT-main= UW e-mail client +COMMENT-c-client= UW c-client mail access routines +COMMENT-imap= UW IMAP4rev1/POP2/POP3 mail servers +COMMENT-mailutil= UW IMAP4rev1/POP2/POP3 mail utility +COMMENT-pico= UW text editor +COMMENT-pilot= UW file system navigator + +V= 2.02 +DISTNAME= re-alpine-${V} +EXTRACT_SUFX= .tar.bz2 + +SHARED_LIBS= c-client 5.1 + +PICO_V= 5.05 # grep "PICO version" ${WRKSRC}/pico/pico.h +PILOT_V= 2.99 # grep PILOT_VERSION ${WRKSRC}/pico/pilot.c + +PKGNAME-main= alpine-${V} +PKGNAME-c-client= c-client-${V} +PKGNAME-imap= imap-uw-${V} +PKGNAME-mailutil= mailutil-uw-${V} +PKGNAME-pico= pico-${PICO_V} +PKGNAME-pilot= pilot-${PILOT_V} + +EPOCH-c-client= 0 +EPOCH-imap= 0 +EPOCH-mailutil= 0 + +REVISION-pilot= 0 + +CATEGORIES= mail +CATEGORIES-main= mail news +CATEGORIES-c-client= devel mail +CATEGORIES-pico= editors +CATEGORIES-pilot= sysutils + +HOMEPAGE= http://www.washington.edu/alpine/ + +# Apache 2.0 +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes + +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=re-alpine/} + +MULTI_PACKAGES= -main -c-client -imap -mailutil -pico -pilot + +WANTLIB= asn1 c crypto gssapi krb5 ncurses ssl +WANTLIB-main= ${WANTLIB} com_err crypto kafs pthread ssl +WANTLIB-c-client= # empty +WANTLIB-imap= ${WANTLIB} com_err crypto kafs ssl +WANTLIB-mailutil= ${WANTLIB} com_err crypto kafs ssl +WANTLIB-pico= ${WANTLIB} pthread +WANTLIB-pilot= ${WANTLIB} pthread + +MODULES= devel/gettext +BUILD_DEPENDS= textproc/aspell/core +RUN_DEPENDS= textproc/aspell/core + +# Link error: c-client not found! +USE_LIBTOOL= gnu + +SHLIB= libc-client.so.${LIBc-client_VERSION} +MAKE_FLAGS= EXTRACFLAGS="${CFLAGS}" SHLIB="${SHLIB}" SHLIBNAME=${SHLIB} CC="${CC}" EXTRAAUTHENTICATORS="gss" + +CONFIGURE_STYLE= gnu +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" \ + LIBS="-lgssapi -lkrb5 -lasn1 -lcrypto" \ + ac_cv_search_regcomp=-lc +CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --with-krb5-include-dir=/usr/include/kerberosV \ + --with-system-pinerc=${SYSCONFDIR}/pine.conf \ + --with-system-fixed-pinerc=${SYSCONFDIR}/pine.conf.fixed \ + --with-system-mail-directory=/var/mail \ + --with-ssl-certs-dir=/etc/ssl \ + --with-simple-spellcheck=aspell \ + --with-interactive-spellcheck=aspell \ + --with-c-client-target=bso \ + --with-debug-level=0 \ + --without-ldap \ + --without-tcl \ + --enable-quotas \ + --disable-debug + +HEADERS= c-client.h dummy.h env.h env_unix.h fdstring.h \ + flockcyg.h flocksim.h flstring.h fs.h ftl.h \ + imap4r1.h linkage.c linkage.h mail.h misc.h \ + netmsg.h newsrc.h nl.h nntp.h osdep.h pseudo.h \ + rfc822.h smtp.h sslio.h tcp.h tcp_unix.h unix.h \ + utf8.h utf8aux.h + +post-install: + # alpine, pico, pilot + ${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/alpine + ${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt \ + ${WRKSRC}/doc/mailcap.unx \ + ${WRKSRC}/doc/mime.types \ + ${PREFIX}/share/doc/alpine + ${WRKBUILD}/alpine/alpine -conf > \ + ${PREFIX}/share/examples/alpine/pine.conf + # c-client + ${INSTALL_DATA_DIR} ${PREFIX}/include/c-client + cd ${WRKSRC}/c-client; ${INSTALL_DATA} ${HEADERS} \ + ${PREFIX}/include/c-client + ${INSTALL_DATA} ${WRKBUILD}/c-client/c-client.a \ + ${PREFIX}/lib/libc-client.a + @if [ -f ${WRKBUILD}/imap/c-client/${SHLIB} ]; then \ + ${INSTALL_DATA} ${WRKSRC}/c-client/${SHLIB} ${PREFIX}/lib; \ + fi + # imap-uw + ${INSTALL_PROGRAM} ${WRKBUILD}/imap/imapd/imapd ${PREFIX}/libexec + ${INSTALL_PROGRAM} ${WRKBUILD}/imap/ipopd/ipop2d ${PREFIX}/libexec + ${INSTALL_PROGRAM} ${WRKBUILD}/imap/ipopd/ipop3d ${PREFIX}/libexec + ${INSTALL_PROGRAM} ${WRKBUILD}/imap/mlock/mlock ${PREFIX}/libexec + ${INSTALL_PROGRAM} ${WRKBUILD}/imap/dmail/dmail ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKBUILD}/imap/tmail/tmail ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/imap/src/{imapd,ipopd}/*.8 \ + ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/imap/src/{dmail,tmail}/*.1 \ + ${PREFIX}/man/man1 + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imap-uw + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/imap-uw + ${INSTALL_DATA} ${FILESDIR}/c-client.cf \ + ${PREFIX}/share/examples/imap-uw + tar -C ${WRKSRC}/imap/docs -cf - . | \ + tar -C ${PREFIX}/share/doc/imap-uw -xf - + # mailutil + ${INSTALL_PROGRAM} ${WRKBUILD}/imap/mailutil/mailutil ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/imap/src/mailutil/mailutil.1 ${PREFIX}/man/man1 + +.include + +.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes" +MAKE_ENV += NO_SHARED_LIBS=Yes +.endif diff --git a/mail/re-alpine/distinfo b/mail/re-alpine/distinfo new file mode 100644 index 00000000000..a55bfcdba20 --- /dev/null +++ b/mail/re-alpine/distinfo @@ -0,0 +1,2 @@ +SHA256 (re-alpine-2.02.tar.bz2) = Dy5vVqeIyzWGidcnOcTZP7rIMEKhD3h8ZUJTFXErIHs= +SIZE (re-alpine-2.02.tar.bz2) = 5589414 diff --git a/mail/re-alpine/files/c-client.cf b/mail/re-alpine/files/c-client.cf new file mode 100644 index 00000000000..e6650507096 --- /dev/null +++ b/mail/re-alpine/files/c-client.cf @@ -0,0 +1,9 @@ +#I accept the risk + +# $OpenBSD: c-client.cf,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +# +# uw-imap RC: uncomment first line to enable + +# uncomment the following line to enable plaintext authentication over +# non-encrypted connection +#set disable-plaintext nil diff --git a/mail/re-alpine/patches/patch-alpine_pine-use_c b/mail/re-alpine/patches/patch-alpine_pine-use_c new file mode 100644 index 00000000000..266e975d6be --- /dev/null +++ b/mail/re-alpine/patches/patch-alpine_pine-use_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-alpine_pine-use_c,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- alpine/pine-use.c.orig Sat Oct 2 10:37:57 2010 ++++ alpine/pine-use.c Sun Sep 23 09:52:20 2012 +@@ -21,7 +21,7 @@ static char rcsid[] = "$Id: pine-use.c 761 2007-10-23 + #include + + #ifndef MAILSPOOLPCTS +-#define MAILSPOOLPCTS "/usr/spool/mail/%s" ++#define MAILSPOOLPCTS "/var/mail/%s" + /* #define MAILSPOOLPCTS "/usr/mail/%s" */ + #endif + diff --git a/mail/re-alpine/patches/patch-configure b/mail/re-alpine/patches/patch-configure new file mode 100644 index 00000000000..7592a935095 --- /dev/null +++ b/mail/re-alpine/patches/patch-configure @@ -0,0 +1,30 @@ +$OpenBSD: patch-configure,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- configure.orig Sat Oct 2 10:39:41 2010 ++++ configure Sun Sep 23 12:03:50 2012 +@@ -12854,6 +12854,7 @@ $as_echo "$LIBICONV" >&6; } + fi + + ++LIBICONV="$LTLIBICONV" + + + +@@ -13333,6 +13334,7 @@ $as_echo "$ac_res" >&6; } + INCINTL= + fi + ++LIBINTL="$LTLIBINTL" + + + if test -n "$INTL_MACOSX_LIBS"; then +@@ -16422,8 +16424,8 @@ ac_res=$ac_cv_search_gss_init_sec_context + if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +- ac_fn_c_check_header_mongrel "$LINENO" "gssapi/gssapi_generic.h" "ac_cv_header_gssapi_gssapi_generic_h" "$ac_includes_default" +-if test "x$ac_cv_header_gssapi_gssapi_generic_h" = x""yes; then : ++ ac_fn_c_check_header_mongrel "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default" ++if test "x$ac_cv_header_gssapi_h" = x""yes; then : + + else + diff --git a/mail/re-alpine/patches/patch-doc_alpine_1 b/mail/re-alpine/patches/patch-doc_alpine_1 new file mode 100644 index 00000000000..94e69b9e097 --- /dev/null +++ b/mail/re-alpine/patches/patch-doc_alpine_1 @@ -0,0 +1,21 @@ +$OpenBSD: patch-doc_alpine_1,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- doc/alpine.1.orig Tue Nov 20 13:17:45 2007 ++++ doc/alpine.1 Tue Nov 20 13:20:11 2007 +@@ -285,7 +285,7 @@ uses the following environment variables: + .if n .ta 2.8i + .if t .ta 2.1i + +-/usr/spool/mail/xxxx Default folder for incoming mail. ++/var/mail Default folder for incoming mail. + .br + ~/mail Default directory for mail folders. + .br +@@ -311,7 +311,7 @@ uses the following environment variables: + .br + /usr/local/lib/pine.conf.fixed Non-overridable configuration file. + .br +-/tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files. ++/tmp/.\\var\\mail\\xxxx Per-folder mailbox lock files. + .br + ~/.pine-interrupted-mail Message which was interrupted. + .br diff --git a/mail/re-alpine/patches/patch-imap_Makefile b/mail/re-alpine/patches/patch-imap_Makefile new file mode 100644 index 00000000000..4b6157c25c6 --- /dev/null +++ b/mail/re-alpine/patches/patch-imap_Makefile @@ -0,0 +1,23 @@ +$OpenBSD: patch-imap_Makefile,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- imap/Makefile.orig Sat Oct 2 10:37:57 2010 ++++ imap/Makefile Sun Sep 23 11:29:12 2012 +@@ -333,7 +333,7 @@ bsf: an + bso: an + $(TOUCH) ip6 + $(BUILD) BUILDTYPE=$@ IP=$(IP6) \ +- SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/etc/ssl SSLKEYS=/etc/ssl/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib" ++ SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/etc/ssl SSLKEYS=/etc/ssl/private GSSINCLUDE=/usr/include/kerberosV GSSLIB=/usr/lib" + + # Info from Joel Reicher about NetBSD SSL paths. I assume it has PAM because pam is in NetBSD sources... + +@@ -587,8 +587,8 @@ sslunix sslsco: + @echo ++ SSLTYPE=$(SSLTYPE).nopwd + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + @echo +- @echo Do you want to continue this build anyway? Type y or n please: +- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac' ++ #@echo Do you want to continue this build anyway? Type y or n please: ++ #@$(SH) -c 'read x; case "$$x" in y) exit 0;; *) (make nounenc;exit 1);; esac' + + nounenc: + @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/mail/re-alpine/patches/patch-imap_src_imapd_imapd_8 b/mail/re-alpine/patches/patch-imap_src_imapd_imapd_8 new file mode 100644 index 00000000000..6a7bea8fb85 --- /dev/null +++ b/mail/re-alpine/patches/patch-imap_src_imapd_imapd_8 @@ -0,0 +1,12 @@ +$OpenBSD: patch-imap_src_imapd_imapd_8,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- imap/src/imapd/imapd.8.orig Sat Oct 2 10:37:57 2010 ++++ imap/src/imapd/imapd.8 Sun Sep 23 11:28:14 2012 +@@ -16,7 +16,7 @@ + .SH NAME + IMAPd \- Internet Message Access Protocol server + .SH SYNOPSIS +-.B /usr/etc/imapd ++.B imapd + .SH DESCRIPTION + .I imapd + is a server which supports the diff --git a/mail/re-alpine/patches/patch-imap_src_ipopd_ipopd_8 b/mail/re-alpine/patches/patch-imap_src_ipopd_ipopd_8 new file mode 100644 index 00000000000..bf172cd11cf --- /dev/null +++ b/mail/re-alpine/patches/patch-imap_src_ipopd_ipopd_8 @@ -0,0 +1,15 @@ +$OpenBSD: patch-imap_src_ipopd_ipopd_8,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- imap/src/ipopd/ipopd.8.orig Sat Oct 2 10:37:57 2010 ++++ imap/src/ipopd/ipopd.8 Sun Sep 23 11:28:22 2012 +@@ -16,9 +16,9 @@ + .SH NAME + IPOPd \- Post Office Protocol server + .SH SYNOPSIS +-.B /usr/etc/ipop2d ++.B ipop2d + .PP +-.B /usr/etc/ipop3d ++.B ipop3d + .SH DESCRIPTION + .I ipop2d + and diff --git a/mail/re-alpine/patches/patch-imap_src_mlock_mlock_c b/mail/re-alpine/patches/patch-imap_src_mlock_mlock_c new file mode 100644 index 00000000000..a32904125ca --- /dev/null +++ b/mail/re-alpine/patches/patch-imap_src_mlock_mlock_c @@ -0,0 +1,17 @@ +$OpenBSD: patch-imap_src_mlock_mlock_c,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- imap/src/mlock/mlock.c.orig Sat Oct 2 10:37:57 2010 ++++ imap/src/mlock/mlock.c Sun Sep 23 11:28:30 2012 +@@ -69,11 +69,11 @@ int main (int argc,char *argv[]) + char *s,*dir,*file,*lock,*hitch,tmp[1024]; + size_t dlen,len; + struct stat sb,fsb; +- struct group *grp = getgrnam ("mail"); ++ struct group *grp = getgrnam ("smmsp"); + /* get syslog */ + openlog (argv[0],LOG_PID,LOG_MAIL); + if (!grp || (grp->gr_gid != getegid ())) +- return die ("not setgid mail",EX_USAGE); ++ return die ("not setgid smmsp",EX_USAGE); + if (argc != 3) return die ("invalid arguments",EX_USAGE); + for (s = argv[1]; *s; s++) + if (!isdigit (*s)) return die ("invalid fd",EX_USAGE); diff --git a/mail/re-alpine/patches/patch-imap_src_osdep_unix_Makefile b/mail/re-alpine/patches/patch-imap_src_osdep_unix_Makefile new file mode 100644 index 00000000000..011b28584f4 --- /dev/null +++ b/mail/re-alpine/patches/patch-imap_src_osdep_unix_Makefile @@ -0,0 +1,135 @@ +$OpenBSD: patch-imap_src_osdep_unix_Makefile,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- imap/src/osdep/unix/Makefile.orig Sat Oct 2 10:37:57 2010 ++++ imap/src/osdep/unix/Makefile Sun Sep 23 11:30:30 2012 +@@ -42,7 +42,7 @@ IP=4 + # -O3 seems to be safe, but empirical observation from our local expert + # indicates that in some (many?) cases -O3 code runs slower than -O2. + +-GCCOPTLEVEL= -O2 ++GCCOPTLEVEL= + + + # Try to have some consistency in GCC builds. We want optimization, but we +@@ -54,9 +54,9 @@ GCC4CFLAGS= $(GCCCFLAGS) -Wno-pointer-sign + + # Extended flags needed for SSL. You may need to modify. + +-SSLDIR=/usr/local/ssl +-SSLCERTS=$(SSLDIR)/certs +-SSLKEYS=$(SSLCERTS) ++SSLDIR=/usr ++SSLCERTS=/etc/ssl ++SSLKEYS=$(SSLCERTS)/private + SSLINCLUDE=$(SSLDIR)/include + SSLLIB=$(SSLDIR)/lib + +@@ -82,7 +82,7 @@ AFSDIR=/usr/afsws + AFSCFLAGS=-I$(AFSDIR)/include + AFSLIB=$(AFSDIR)/lib + AFSLDFLAGS=-L$(AFSLIB)/afs -L$(AFSLIB) -L$(AFSDIR)/domestic/lib\ +- -lkauth -lprot -lubik -lauth -lrxkad -lrx -llwp -ldes -lcom_err\ ++ -lkauth -lprot -lubik -lauth -lrxkad -lrx -llwp -lcom_err\ + $(AFSLIB)/afs/util.a -laudit -lsys + # AFSLDFLAGS may also need -L/usr/ucblib -lucb + DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\" +@@ -147,6 +147,8 @@ DEFAULTAUTHENTICATORS=ext md5 pla log + DEFAULTDRIVERS=imap nntp pop3 mix mx mbx tenex mtx mh mmdf unix news phile + CHUNKSIZE=65536 + ++.SUFFIXES: .o .so ++ + # Normally no need to change any of these + + ARCHIVE=c-client.a +@@ -154,6 +156,7 @@ BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf + 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 ++SOBINARIES=$(BINARIES:.o=.so) + CFLAGS=-g + + CAT=cat +@@ -162,6 +165,11 @@ MV=mv + RM=rm -rf + SH=sh + ++.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc" ++PICFLAG= -fPIC ++.else ++PICFLAG= -fpic ++.endif + + # Primary build command + +@@ -281,6 +289,7 @@ bso: # OpenBSD + SPOOLDIR=/var \ + ACTIVEFILE=/usr/local/news/lib/active \ + RSHPATH=/usr/bin/rsh \ ++ LOCKPGM=$(PREFIX)/libexec/mlock \ + BASECFLAGS="$(GCCCFLAGS)" + + cvx: # Convex +@@ -853,23 +862,33 @@ vu2: # VAX Ultrix 2.3, etc. + + # Build it! + ++.if defined(NO_SHARED_LIBS) && ${NO_SHARED_LIBS:L} == "yes" + build: clean once $(ARCHIVE) +- + all: $(ARCHIVE) ++.else ++build: clean once $(ARCHIVE) $(SHLIB) ++all: $(ARCHIVE) $(SHLIB) ++.endif + + $(ARCHIVE): $(BINARIES) + sh -c '$(RM) $(ARCHIVE) || true' + @$(CAT) ARCHIVE + @$(SH) ARCHIVE + ++$(SHLIB): $(SOBINARIES) ++ $(CC) -shared $(PICFLAG) -o $(SHLIB) $(SOBINARIES) ++ ++ + .c.o: + `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c + ++.c.so: ++ `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $(PICFLAG) -DPIC $(@:.so=.c) -o $@ + + # 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) auths.c crexcl.c linkage.[ch] siglocal.c osdep*.[ch] *.o *.so ARCHIVE *FLAGS *TYPE $(ARCHIVE) $(SHLIB) || true' + + + # Dependencies +@@ -904,7 +923,7 @@ utf8aux.o: mail.h misc.h osdep.h utf8.h + + # 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 \ +@@ -918,12 +937,12 @@ osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \ + 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.o: $(OSDEPS) ++ `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` osdep.c ++ ++osdep.so: $(OSDEPS) ++ `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` $(PICFLAG) -DPIC 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 --git a/mail/re-alpine/patches/patch-imap_src_osdep_unix_Makefile_gss b/mail/re-alpine/patches/patch-imap_src_osdep_unix_Makefile_gss new file mode 100644 index 00000000000..8263fbfd4d1 --- /dev/null +++ b/mail/re-alpine/patches/patch-imap_src_osdep_unix_Makefile_gss @@ -0,0 +1,18 @@ +$OpenBSD: patch-imap_src_osdep_unix_Makefile_gss,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- imap/src/osdep/unix/Makefile.gss.orig Sat Oct 2 10:37:57 2010 ++++ imap/src/osdep/unix/Makefile.gss Sun Sep 23 11:30:34 2012 +@@ -29,11 +29,12 @@ + GSSDIR=/usr/local + GSSINCLUDE=$(GSSDIR)/include + GSSLIB=$(GSSDIR)/lib +-GSSCFLAGS= -I$(GSSINCLUDE) -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name -DKRB5_DEPRECATED=1 ++GSSCFLAGS= -I$(GSSINCLUDE) -DHEIMDAL ++GSSLDFLAGS= -L$(GSSLIB) -lkafs -lgssapi -lkrb5 -lasn1 -lcom_err -lcrypto + GSSOLDLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err + GSSNEWLDFLAGS= -L$(GSSLIB) -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err + + gss: # GSSAPI Kerberos V flags + echo $(GSSCFLAGS) >> OSCFLAGS +- sh -c '(test -f $(GSSLIB)/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS ++ echo $(GSSLDFLAGS) >> LDFLAGS + echo "#include \"kerb_mit.c\"" >> auths.c diff --git a/mail/re-alpine/patches/patch-imap_src_osdep_unix_env_unix_c b/mail/re-alpine/patches/patch-imap_src_osdep_unix_env_unix_c new file mode 100644 index 00000000000..ed71250d57b --- /dev/null +++ b/mail/re-alpine/patches/patch-imap_src_osdep_unix_env_unix_c @@ -0,0 +1,19 @@ +$OpenBSD: patch-imap_src_osdep_unix_env_unix_c,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- imap/src/osdep/unix/env_unix.c.orig Sat Oct 2 10:37:57 2010 ++++ imap/src/osdep/unix/env_unix.c Sun Sep 23 11:28:37 2012 +@@ -963,15 +963,12 @@ char *myhomedir () + static char *mymailboxdir () + { + char *home = myhomedir (); +- /* initialize if first time */ +- if (!myMailboxDir && myHomeDir) { + if (mailsubdir) { + char tmp[MAILTMPLEN]; + sprintf (tmp,"%s/%s",home,mailsubdir); + myMailboxDir = cpystr (tmp);/* use pre-defined subdirectory of home */ + } + else myMailboxDir = cpystr (home); +- } + return myMailboxDir ? myMailboxDir : ""; + } + diff --git a/mail/re-alpine/patches/patch-imap_src_osdep_unix_kerb_mit_c b/mail/re-alpine/patches/patch-imap_src_osdep_unix_kerb_mit_c new file mode 100644 index 00000000000..85f02ef876a --- /dev/null +++ b/mail/re-alpine/patches/patch-imap_src_osdep_unix_kerb_mit_c @@ -0,0 +1,17 @@ +$OpenBSD: patch-imap_src_osdep_unix_kerb_mit_c,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- imap/src/osdep/unix/kerb_mit.c.orig Sat Oct 2 10:37:57 2010 ++++ imap/src/osdep/unix/kerb_mit.c Sun Sep 23 11:28:41 2012 +@@ -27,8 +27,13 @@ + */ + + #define PROTOTYPE(x) x ++#ifdef HEIMDAL ++#include ++#include ++#else + #include + #include ++#endif + + + long kerberos_server_valid (void); diff --git a/mail/re-alpine/patches/patch-imap_src_tmail_tmail_c b/mail/re-alpine/patches/patch-imap_src_tmail_tmail_c new file mode 100644 index 00000000000..2924188bfd7 --- /dev/null +++ b/mail/re-alpine/patches/patch-imap_src_tmail_tmail_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-imap_src_tmail_tmail_c,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- imap/src/tmail/tmail.c.orig Sat Oct 2 10:37:57 2010 ++++ imap/src/tmail/tmail.c Sun Sep 23 11:28:47 2012 +@@ -227,7 +227,6 @@ int main (int argc,char *argv[]) + while ((c = getchar ()) != EOF) putc (c,f); + } + else { +- mm_log ("tmail called with LF-only newlines",WARN); + if ((tmp[0] != 'F') || (tmp[1] != 'r') || (tmp[2] != 'o') || + (tmp[3] != 'm') || (tmp[4] != ' ')) { + *s++ = '\015'; /* overwrite NL with CRLF */ diff --git a/mail/re-alpine/patches/patch-pith_charconv_utf8_c b/mail/re-alpine/patches/patch-pith_charconv_utf8_c new file mode 100644 index 00000000000..bfc413a7dab --- /dev/null +++ b/mail/re-alpine/patches/patch-pith_charconv_utf8_c @@ -0,0 +1,13 @@ +$OpenBSD: patch-pith_charconv_utf8_c,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- pith/charconv/utf8.c.orig Sat Oct 2 10:37:57 2010 ++++ pith/charconv/utf8.c Sun Sep 23 09:52:20 2012 +@@ -2142,7 +2142,8 @@ nl_langinfo_codeset_wrapper(void) + || !strcmp("646", ret) + || !strcmp("ASCII", ret) + || !strcmp("C", ret) +- || !strcmp("POSIX", ret)) ++ || !strcmp("POSIX", ret) ++ || !strcmp("646", ret)) + ret = "US-ASCII"; + else if(!strucmp(ret, "UTF8")) + ret = "UTF-8"; diff --git a/mail/re-alpine/patches/patch-pith_conf_c b/mail/re-alpine/patches/patch-pith_conf_c new file mode 100644 index 00000000000..a7cddac034c --- /dev/null +++ b/mail/re-alpine/patches/patch-pith_conf_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-pith_conf_c,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ + +By default, check "Do Not Send Flowed Text". + +--- pith/conf.c.orig Sat Oct 2 10:37:57 2010 ++++ pith/conf.c Sun Sep 23 09:52:20 2012 +@@ -2806,7 +2806,7 @@ feature_list(int index) + {"use-sender-not-x-sender", "Use Sender Instead of X-X-Sender", + F_USE_SENDER_NOT_X, h_config_use_sender_not_x, PREF_SEND, 0}, + {"quell-flowed-text", "Do Not Send Flowed Text", +- F_QUELL_FLOWED_TEXT, h_config_quell_flowed_text, PREF_SEND, 0}, ++ F_QUELL_FLOWED_TEXT, h_config_quell_flowed_text, PREF_SEND, 1}, + {"downgrade-multipart-to-text", "Downgrade Multipart to Text", + F_COMPOSE_ALWAYS_DOWNGRADE, h_downgrade_multipart_to_text, PREF_SEND, 0}, + {"enable-8bit-esmtp-negotiation", "Enable 8bit ESMTP Negotiation", diff --git a/mail/re-alpine/patches/patch-pith_pine_hlp b/mail/re-alpine/patches/patch-pith_pine_hlp new file mode 100644 index 00000000000..a1c4fe1ccf5 --- /dev/null +++ b/mail/re-alpine/patches/patch-pith_pine_hlp @@ -0,0 +1,30 @@ +$OpenBSD: patch-pith_pine_hlp,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +--- pith/pine.hlp.orig Sat Oct 2 10:37:57 2010 ++++ pith/pine.hlp Sun Sep 23 09:52:20 2012 +@@ -26351,7 +26351,7 @@ argument (see the "lynx" example below). + So, here are some example entries: + 
+ url-viewers = _TEST("test -n '${DISPLAY}'")_  /usr/local/bin/netscape
+-              "/usr/local/bin/lynx _URL_"
++              "/usr/bin/lynx _URL_"
+               C:\BIN\NETSCAPE.BAT
+
+

+@@ -26359,7 +26359,7 @@ This example shows that for the first viewer in the li + the environment variable "DISPLAY" must be defined. If it + is, then the path and file "/usr/local/bin/netscape" must exist. + If neither condition is met, +-then the path and file "/usr/local/bin/lynx" must exist. ++then the path and file "/usr/bin/lynx" must exist. + If it does, then the "_URL_" token is replaced by the selected URL. + If the path to "lynx" is invalid, + then the final path and file C:\BIN\NETSCAPE.BAT must exist. +@@ -26455,7 +26455,7 @@ because of its length, but should all appear on one li + url-viewers = _TEST("test -L /myhomedir/.netscape/lock")_ "/usr/local/bin/netscape -remote 'openURL(_URL_, new-window)' &"
+ + _TEST("test -n '${DISPLAY}'")_ "/usr/local/bin/netscape &"
+- "/usr/local/bin/lynx '_URL_'" ++ "/usr/bin/lynx '_URL_'" +

+ +

diff --git a/mail/re-alpine/pkg/DESCR-c-client b/mail/re-alpine/pkg/DESCR-c-client new file mode 100644 index 00000000000..d2e67eb249f --- /dev/null +++ b/mail/re-alpine/pkg/DESCR-c-client @@ -0,0 +1,6 @@ +c-client is a common API for accessing mailboxes. It is used internally by +the popular PINE mail reader as well as the University of Washington's +IMAP server. + +This package is built using the re-alpine source, the continuation of +the Alpine email client from University of Washington. diff --git a/mail/re-alpine/pkg/DESCR-imap b/mail/re-alpine/pkg/DESCR-imap new file mode 100644 index 00000000000..6e3b7747137 --- /dev/null +++ b/mail/re-alpine/pkg/DESCR-imap @@ -0,0 +1,9 @@ +This is the IMAP4rev1 server from the University of Washington. +Included are backwards-compatible (almost) POP2 and POP3 servers: + + ipop2d POP2 daemon + ipop3d POP3 daemon + imapd IMAP4rev1 daemon + +This package is built using the re-alpine source, the continuation of +the Alpine email client from University of Washington. diff --git a/mail/re-alpine/pkg/DESCR-mailutil b/mail/re-alpine/pkg/DESCR-mailutil new file mode 100644 index 00000000000..e0288344187 --- /dev/null +++ b/mail/re-alpine/pkg/DESCR-mailutil @@ -0,0 +1,4 @@ +This is the IMAP4rev1 server utility from the University of Washington. + +This package is built using the re-alpine source, the continuation of +the Alpine email client from University of Washington. diff --git a/mail/re-alpine/pkg/DESCR-main b/mail/re-alpine/pkg/DESCR-main new file mode 100644 index 00000000000..fcca29fd9cb --- /dev/null +++ b/mail/re-alpine/pkg/DESCR-main @@ -0,0 +1,11 @@ +Alpine is a screen-oriented message-handling tool. In its default +configuration, Alpine offers an intentionally limited set of functions +geared toward the novice user, but it also has a large list of optional +"power-user" and personal-preference features. + +An optional configuration file "pine.conf" can be put into /etc to set +system wide defaults. The format of this file is identical to the .pinerc +file that is auto-generated by Alpine in your home directory. + +This package is built using the re-alpine source, the continuation of +the Alpine email client from University of Washington. diff --git a/mail/re-alpine/pkg/DESCR-pico b/mail/re-alpine/pkg/DESCR-pico new file mode 100644 index 00000000000..d68daf018bb --- /dev/null +++ b/mail/re-alpine/pkg/DESCR-pico @@ -0,0 +1,7 @@ +Pico is a simple, display-oriented text editor based on the Alpine +message system composer. As with Alpine, commands are displayed at the +bottom of the screen, and context-sensitive help is provided. As +characters are typed they are immediately inserted into the text. + +This package is built using the re-alpine source, the continuation of +the Alpine email client from University of Washington. diff --git a/mail/re-alpine/pkg/DESCR-pilot b/mail/re-alpine/pkg/DESCR-pilot new file mode 100644 index 00000000000..be310f481d0 --- /dev/null +++ b/mail/re-alpine/pkg/DESCR-pilot @@ -0,0 +1,6 @@ +Pilot is a simple, display-oriented file system browser based on the +Alpine message system composer. As with Alpine, commands are displayed +at the bottom of the screen, and context-sensitive help is provided. + +This package is built using the re-alpine source, the continuation of +the Alpine email client from University of Washington. diff --git a/mail/re-alpine/pkg/PFRAG.shared-c-client b/mail/re-alpine/pkg/PFRAG.shared-c-client new file mode 100644 index 00000000000..62cf50ba108 --- /dev/null +++ b/mail/re-alpine/pkg/PFRAG.shared-c-client @@ -0,0 +1,2 @@ +@comment $OpenBSD: PFRAG.shared-c-client,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +@lib lib/libc-client.so.${LIBc-client_VERSION} diff --git a/mail/re-alpine/pkg/PLIST-c-client b/mail/re-alpine/pkg/PLIST-c-client new file mode 100644 index 00000000000..5b772ae6060 --- /dev/null +++ b/mail/re-alpine/pkg/PLIST-c-client @@ -0,0 +1,36 @@ +@comment $OpenBSD: PLIST-c-client,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +@pkgpath mail/c-client +@pkgpath mail/imap-uw,-c-client +@pkgpath mail/imap-uw,-c-client,plaintext +%%SHARED%% +include/c-client/ +include/c-client/c-client.h +include/c-client/dummy.h +include/c-client/env.h +include/c-client/env_unix.h +include/c-client/fdstring.h +include/c-client/flockcyg.h +include/c-client/flocksim.h +include/c-client/flstring.h +include/c-client/fs.h +include/c-client/ftl.h +include/c-client/imap4r1.h +include/c-client/linkage.c +include/c-client/linkage.h +include/c-client/mail.h +include/c-client/misc.h +include/c-client/netmsg.h +include/c-client/newsrc.h +include/c-client/nl.h +include/c-client/nntp.h +include/c-client/osdep.h +include/c-client/pseudo.h +include/c-client/rfc822.h +include/c-client/smtp.h +include/c-client/sslio.h +include/c-client/tcp.h +include/c-client/tcp_unix.h +include/c-client/unix.h +include/c-client/utf8.h +include/c-client/utf8aux.h +lib/libc-client.a diff --git a/mail/re-alpine/pkg/PLIST-imap b/mail/re-alpine/pkg/PLIST-imap new file mode 100644 index 00000000000..3fa13c4761a --- /dev/null +++ b/mail/re-alpine/pkg/PLIST-imap @@ -0,0 +1,46 @@ +@comment $OpenBSD: PLIST-imap,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +@conflict courier-imap-* +@conflict courier-pop3-* +@pkgpath mail/imap-uw,-server,plaintext +@pkgpath mail/imap-uw,-server +@bin bin/dmail +@bin bin/tmail +@bin libexec/imapd +@bin libexec/ipop2d +@bin libexec/ipop3d +@group smmsp +@bin libexec/mlock +@group +@man man/man1/dmail.1 +@man man/man1/tmail.1 +@man man/man8/imapd.8 +@man man/man8/ipopd.8 +share/doc/imap-uw/ +share/doc/imap-uw/BUILD +share/doc/imap-uw/CONFIG +share/doc/imap-uw/FAQ.html +share/doc/imap-uw/FAQ.txt +share/doc/imap-uw/IPv6.txt +share/doc/imap-uw/RELNOTES +share/doc/imap-uw/SSLBUILD +share/doc/imap-uw/Y2K +share/doc/imap-uw/bugs.txt +share/doc/imap-uw/calendar.txt +share/doc/imap-uw/commndmt.txt +share/doc/imap-uw/draft/ +share/doc/imap-uw/draft/README +share/doc/imap-uw/draft/i18n.txt +share/doc/imap-uw/draft/sort.txt +share/doc/imap-uw/drivers.txt +share/doc/imap-uw/formats.txt +share/doc/imap-uw/imaprc.txt +share/doc/imap-uw/internal.txt +share/doc/imap-uw/locking.txt +share/doc/imap-uw/md5.txt +share/doc/imap-uw/mixfmt.txt +share/doc/imap-uw/naming.txt +share/doc/imap-uw/rfc.txt +share/doc/pkg-readmes/${FULLPKGNAME} +share/examples/imap-uw/ +share/examples/imap-uw/c-client.cf +@sample ${SYSCONFDIR}/c-client.cf diff --git a/mail/re-alpine/pkg/PLIST-mailutil b/mail/re-alpine/pkg/PLIST-mailutil new file mode 100644 index 00000000000..8e37f67ee17 --- /dev/null +++ b/mail/re-alpine/pkg/PLIST-mailutil @@ -0,0 +1,4 @@ +@comment $OpenBSD: PLIST-mailutil,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +@pkgpath mail/imap-uw,-mailutil,plaintext +@bin bin/mailutil +@man man/man1/mailutil.1 diff --git a/mail/re-alpine/pkg/PLIST-main b/mail/re-alpine/pkg/PLIST-main new file mode 100644 index 00000000000..cec2a7e19dc --- /dev/null +++ b/mail/re-alpine/pkg/PLIST-main @@ -0,0 +1,19 @@ +@comment $OpenBSD: PLIST-main,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +@conflict pine-* +@pkgpath mail/pine +@pkgpath mail/alpine,-main +@pkgpath mail/alpine,-main,ldap +@bin bin/alpine +@bin bin/rpdump +@bin bin/rpload +@man man/man1/alpine.1 +@man man/man1/rpdump.1 +@man man/man1/rpload.1 +share/doc/alpine/ +share/doc/alpine/mailcap.unx +share/doc/alpine/mime.types +share/doc/alpine/tech-notes.txt +share/doc/pkg-readmes/${FULLPKGNAME} +share/examples/alpine/ +share/examples/alpine/pine.conf +@sample ${SYSCONFDIR}/pine.conf diff --git a/mail/re-alpine/pkg/PLIST-pico b/mail/re-alpine/pkg/PLIST-pico new file mode 100644 index 00000000000..3806dcbb093 --- /dev/null +++ b/mail/re-alpine/pkg/PLIST-pico @@ -0,0 +1,5 @@ +@comment $OpenBSD: PLIST-pico,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +@pkgpath mail/pine,-pico +@pkgpath mail/alpine,-pico +@bin bin/pico +@man man/man1/pico.1 diff --git a/mail/re-alpine/pkg/PLIST-pilot b/mail/re-alpine/pkg/PLIST-pilot new file mode 100644 index 00000000000..d68b6a82cd5 --- /dev/null +++ b/mail/re-alpine/pkg/PLIST-pilot @@ -0,0 +1,5 @@ +@comment $OpenBSD: PLIST-pilot,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ +@pkgpath mail/pine,-pilot +@pkgpath mail/alpine,-pilot +@bin bin/pilot +@man man/man1/pilot.1 diff --git a/mail/re-alpine/pkg/README-imap b/mail/re-alpine/pkg/README-imap new file mode 100644 index 00000000000..dd816d82f25 --- /dev/null +++ b/mail/re-alpine/pkg/README-imap @@ -0,0 +1,43 @@ +$OpenBSD: README-imap,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ + ++----------------------------------------------------------------------- +| Running ${FULLPKGNAME} on OpenBSD ++----------------------------------------------------------------------- + +The ipop2d, ipop3d, and imapd daemons should be invoked by your +/etc/inetd.conf file with lines such as: + + pop2 stream tcp nowait root ${TRUEPREFIX}/libexec/ipop2d ipop2d + pop2 stream tcp6 nowait root ${TRUEPREFIX}/libexec/ipop2d ipop2d + pop3 stream tcp nowait root ${TRUEPREFIX}/libexec/ipop3d ipop3d + pop3 stream tcp6 nowait root ${TRUEPREFIX}/libexec/ipop3d ipop3d + imap stream tcp nowait root ${TRUEPREFIX}/libexec/imapd imapd + imap stream tcp6 nowait root ${TRUEPREFIX}/libexec/imapd imapd + + +To use SSL as default transport you need to add the lines below to +/etc/inetd.conf. + + pop3s stream tcp nowait root ${TRUEPREFIX}/libexec/ipop3d ipop3d + pop3s stream tcp6 nowait root ${TRUEPREFIX}/libexec/ipop3d ipop3d + imaps stream tcp nowait root ${TRUEPREFIX}/libexec/imapd imapd + imaps stream tcp6 nowait root ${TRUEPREFIX}/libexec/imapd imapd + +You also need to install your certificates to +/etc/ssl/{imapd,ipop3d}.pem and files containing the corresponding private +keys to /etc/ssl/private/{imapd,ipop3d}.pem. See ssl(8) for how to do this. + + +If you want to use the included mailbox lock program, you need to enable +the setgid bit on the mlock binary, then give the "smmsp" group write +permission on the /var/mail directory. As root: + chmod 2555 ${TRUEPREFIX}/libexec/mlock + chgrp smmsp /var/mail + chmod 775 /var/mail + +Note that there are security implications to this! + + +By default, plaintext authentication over clear connection is disabled. +While it is highly recommended not to do so, you may enable it in the +${SYSCONFDIR}/c-client.cf file. diff --git a/mail/re-alpine/pkg/README-main b/mail/re-alpine/pkg/README-main new file mode 100644 index 00000000000..081d6b5733f --- /dev/null +++ b/mail/re-alpine/pkg/README-main @@ -0,0 +1,73 @@ +$OpenBSD: README-main,v 1.1.1.1 2012/09/27 15:09:53 ajacoutot Exp $ + ++----------------------------------------------------------------------- +| Running ${FULLPKGNAME} on OpenBSD ++----------------------------------------------------------------------- + +Below is a quick start guide to show how to set up Alpine to use IMAP or +POP3 for accessing your email and SMTP for sending email. + +IMAP +==== + +1. Make sure your email provider has IMAP support enabled (some +providers require you to explicitly enable IMAP support). + +2. From alpine's main screen enter (S)etup, collection(L)ists, and +press (A) to add a new collection + +3. Fill in the fields as follows: + + Nickname: Example + Server: imap.example.com/qualifier/user=user@example.com + +where: + - imap.example.com is the fully qualified server name + - qualifier is something like ssl or tls (add /novalidate-cert when + using a self-signed certificate) + - user@example.com is your email address + +As a concrete example, here's how this would look for gmail: + imap.gmail.com/ssl/user=yourname@gmail.com + +4. Press Ctrl-X to exit and save, enter your password when prompted and +(E)xit back to the main screen. + +POP3 +==== + +1. Follow the same instructions as above for IMAP, except for step 3 +Use the following: + + Nickname: Example + Server: pop.example.com:port/qualifier/user=username@example.com + +where: + - pop.example.com is the fully qualified server name + - qualifier is something like pop3, ssl... (add /novalidate-cert + when using a self-signed certificate) + - user@example.com is your email address + +As a concrete example, here's how this would look for gmail: + pop.gmail.com:995/novalidate-cert/user=yourname@gmail.com/pop3/ssl + +SMTP +==== + +1. Make sure you are back at alpine's main screen. + +2. Enter (S)etup, (C)onfig + +3. Modify the setting for "SMTP Server (for sending)" as follows: + + smtp.example.com:port/qualifier/user=user@example.com + +where: + - smtp.example.com is the fully qualified server name + - port is the smtp server port + - qualifier is something like ssl or tls (add /novalidate-cert when + using a self-signed certificate) + - user@example.com is your email address + + As a concrete example, here's how this would look for gmail: + smtp.gmail.com:587/tls/user=yourname@gmail.com