cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the plaintext FLAVOR and add a SYSCONFDIR/c-client.cf which can

Browse Source 
be edited to bring plaintext support back.

"looks fine" to sthen@ who also corrected my Old English ;-)
This commit is contained in:
ajacoutot 2009-11-07 12:53:17 +00:00
parent 223099f3a9
commit bc454a64c2
9 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mail/imap-uw/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.61 2009/01/15 16:39:37 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.62 2009/11/07 12:53:17 ajacoutot Exp $
COMMENT-server= University of Washington IMAP4rev1/POP2/POP3 mail servers
COMMENT-mailutil=University of Washington IMAP4rev1/POP2/POP3 mail utility
@ -7,9 +7,9 @@ COMMENT-c-client=University of Washington's c-client mail access routines
V= 2007e
DISTNAME= imap-${V}
PKGNAME-server= imap-uw-${V}
PKGNAME-mailutil=mailutil-uw-${V}
PKGNAME-c-client=c-client-${V}
PKGNAME-server= imap-uw-${V}p0
PKGNAME-mailutil=mailutil-uw-${V}p0
PKGNAME-c-client=c-client-${V}p0
#WRKDIST= ${WRKDIR}/imap-2007b
@ -41,20 +41,12 @@ WANTLIB-c-client=
ALL_TARGET= bso
SHLIB= libc-client.so.${LIBc-client_VERSION}
MAKE_FLAGS= EXTRACFLAGS="${CFLAGS}" EXTRAAUTHENTICATORS="gss" IP=6 \
SHLIB="${SHLIB}" SHLIBNAME=${SHLIB} CC="${CC}"
SSLTYPE="unix.nopwd" SHLIB="${SHLIB}" SHLIBNAME=${SHLIB} \
CC="${CC}"
MULTI_PACKAGES= -server -mailutil -c-client
SUBPACKAGE?= -server
FLAVORS= plaintext
FLAVOR?=
.if ${FLAVOR:L:Mplaintext}
MAKE_FLAGS+= SSLTYPE="unix"
.else
MAKE_FLAGS+= SSLTYPE="unix.nopwd"
.endif
NO_REGRESS= Yes
HEADERS= c-client.h dummy.h env.h env_unix.h fdstring.h flockcyg.h \
@ -77,8 +69,11 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imap-uw
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/imap-uw
${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD \
${PREFIX}/share/doc/imap-uw/README.OpenBSD
${INSTALL_DATA} ${FILESDIR}/c-client.cf \
${PREFIX}/share/examples/imap-uw
tar -C ${WRKSRC}/docs -cf - . | \
tar -C ${PREFIX}/share/doc/imap-uw -xf -
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/imap-uw

7
mail/imap-uw/files/README.OpenBSD
View File

@ -1,4 +1,4 @@
$OpenBSD: README.OpenBSD,v 1.2 2008/10/15 14:29:04 ajacoutot Exp $
$OpenBSD: README.OpenBSD,v 1.3 2009/11/07 12:53:17 ajacoutot Exp $
The ipop2d, ipop3d, and imapd daemons should be invoked by your
/etc/inetd.conf file with lines such as:
@ -32,3 +32,8 @@ permission on the /var/mail directory. As root:
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.

9
mail/imap-uw/files/c-client.cf Normal file
View File

@ -0,0 +1,9 @@
#I accept the risk
# $OpenBSD: c-client.cf,v 1.1 2009/11/07 12:53:17 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

3
mail/imap-uw/pkg/DESCR-c-client
View File

@ -1,6 +1,3 @@
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.
Flavors
plaintext Enable unencrypted plaintext passwords

3
mail/imap-uw/pkg/DESCR-mailutil
View File

@ -1,4 +1 @@
This is the IMAP4rev1 server utility from the University of Washington.
Flavors
plaintext Enable unencrypted plaintext passwords

3
mail/imap-uw/pkg/DESCR-server
View File

@ -4,6 +4,3 @@ Included are backwards-compatible (almost) POP2 and POP3 servers.
ipop2d POP2 daemon
ipop3d POP3 daemon
imapd IMAP4rev1 daemon
Flavors
plaintext Enable unencrypted plaintext passwords

3
mail/imap-uw/pkg/PLIST-c-client
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-c-client,v 1.1 2007/10/30 10:12:41 ajacoutot Exp $
@comment $OpenBSD: PLIST-c-client,v 1.2 2009/11/07 12:53:17 ajacoutot Exp $
@pkgpath mail/c-client
@pkgpath mail/imap-uw,-c-client,plaintext
%%SHARED%%
include/c-client/
include/c-client/c-client.h

3
mail/imap-uw/pkg/PLIST-mailutil
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-mailutil,v 1.5 2008/10/15 14:29:04 ajacoutot Exp $
@comment $OpenBSD: PLIST-mailutil,v 1.6 2009/11/07 12:53:17 ajacoutot Exp $
@pkgpath mail/imap-uw,-mailutil,plaintext
@bin bin/mailutil
@man man/man1/mailutil.1

6
mail/imap-uw/pkg/PLIST-server
View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST-server,v 1.7 2008/10/15 14:29:04 ajacoutot Exp $
@comment $OpenBSD: PLIST-server,v 1.8 2009/11/07 12:53:17 ajacoutot Exp $
@conflict courier-imap-*
@conflict courier-pop3-*
@pkgpath ${BASE_PKGPATH}
@pkgpath mail/imap-uw,-server,plaintext
@bin bin/dmail
@bin bin/tmail
@bin libexec/imapd
@ -84,3 +85,6 @@ share/doc/imap-uw/rfc/rfc5092.txt
share/doc/imap-uw/rfc/rfc5161.txt
share/doc/imap-uw/rfc/rfc5162.txt
share/doc/imap-uw/rfc/rfc5234.txt
share/examples/imap-uw/
share/examples/imap-uw/c-client.cf
@sample ${SYSCONFDIR}/c-client.cf