Skip to content

Commit

Permalink
mail/rainloop: Fix bug of SMTP AUTH PLAIN bug
Browse files Browse the repository at this point in the history
While I'm here,

* Switch to DISTVERSION
* Pet portclippy
* Re-format Makefile with portfmt

Reference:	RainLoop/rainloop-webmail#1629
PR:		257017
Reported by:	pi
Obtained from:	RainLoop/rainloop-webmail#1629 (comment)
MFH:		2021Q4
  • Loading branch information
Yasuhiro Kimura authored and Yasuhiro Kimura committed Nov 11, 2021
1 parent 7ee3d53 commit de9229a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 8 deletions.
6 changes: 3 additions & 3 deletions mail/rainloop-community/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ COMMENT= Modern and interactive webmail - community edition

LICENSE= AGPLv3

CONFLICTS_INSTALL= rainloop-[0-9]*

MASTERDIR= ${.CURDIR}/../rainloop
DISTINFO_FILE= ${.CURDIR}/distinfo
PLIST= ${.CURDIR}/pkg-plist

CONFLICTS_INSTALL= rainloop-[0-9]*
DISTINFO_FILE= ${.CURDIR}/distinfo

.include "${MASTERDIR}/Makefile"
21 changes: 16 additions & 5 deletions mail/rainloop/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
PORTNAME= rainloop
PORTVERSION= 1.16.0
DISTVERSION= 1.16.0
PORTREVISION= 1
CATEGORIES= mail www
MASTER_SITES= https://github.com/RainLoop/rainloop-webmail/releases/download/v${PORTVERSION}/
PKGNAMESUFFIX?= ${PHP_PKGNAMESUFFIX}
Expand All @@ -16,20 +17,30 @@ LICENSE_PERMS= auto-accept
.endif

USES= php:web,flavors zip
NO_BUILD= yes
USE_PHP= curl dom iconv json openssl pcre simplexml spl xml zlib

NO_ARCH= yes
NO_BUILD= yes

NO_WRKSUBDIR= yes
USE_PHP= curl dom iconv json openssl pcre simplexml spl xml zlib
PLIST_SUB= VER="${PORTVERSION}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"

PLIST_SUB= VER="${PORTVERSION}" \
WWWGRP="${WWWGRP}" \
WWWOWN="${WWWOWN}"

OPTIONS_DEFAULT= SQLITE
OPTIONS_RADIO= DB
OPTIONS_RADIO_DB= MYSQL PGSQL SQLITE
OPTIONS_DEFAULT= SQLITE

MYSQL_USE= PHP=pdo_mysql
PGSQL_USE= PHP=pdo_pgsql
SQLITE_USE= PHP=pdo_sqlite

post-patch:
${REINPLACE_CMD} 's/__USE_SINGLE_LINE_AUTH_PLAIN_COMMAND = false/__USE_SINGLE_LINE_AUTH_PLAIN_COMMAND = true/' \
${WRKSRC}/rainloop/v/${PORTVERSION}/app/libraries/MailSo/Smtp/SmtpClient.php
${RM} ${WRKSRC}/rainloop/v/${PORTVERSION}/app/libraries/MailSo/Smtp/SmtpClient.php.bak

do-install:
@${MKDIR} ${STAGEDIR}${WWWDIR}/data
${INSTALL_DATA} ${WRKSRC}/data/* ${STAGEDIR}${WWWDIR}/data
Expand Down

0 comments on commit de9229a

Please sign in to comment.