Date: Sun, 19 Nov 2017 09:05:18 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454480 - in head/net-im/ejabberd: . files Message-ID: <201711190905.vAJ95Ihp057561@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ashish Date: Sun Nov 19 09:05:18 2017 New Revision: 454480 URL: https://svnweb.freebsd.org/changeset/ports/454480 Log: - Fix CAPTCHA functionality Reported by: Martin Meyer <martin.meyer@zuglufttier.de> Modified: head/net-im/ejabberd/Makefile head/net-im/ejabberd/files/pkg-message.in head/net-im/ejabberd/pkg-plist Modified: head/net-im/ejabberd/Makefile ============================================================================== --- head/net-im/ejabberd/Makefile Sun Nov 19 09:00:14 2017 (r454479) +++ head/net-im/ejabberd/Makefile Sun Nov 19 09:05:18 2017 (r454480) @@ -2,6 +2,7 @@ PORTNAME= ejabberd PORTVERSION= 17.09 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://www.process-one.net/downloads/${PORTNAME}/${PORTVERSION}/:p1 \ http://distfiles.pirateparty.in/ashish/:deps \ @@ -86,6 +87,9 @@ DOCS_MAKE_ARGS_OFF= NOPORTDOCS=yes post-extract: @${LN} -s ${WRKDIR}/deps ${WRKSRC}/ +post-patch: + @${REINPLACE_CMD} -e 's,^convert,${LOCALBASE}/bin/convert,' ${WRKSRC}/tools/captcha.sh + pre-configure: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ @@ -106,5 +110,9 @@ post-install-PAM-on: post-install: @${FIND} ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR} -type f \ -name '*.so' -exec ${STRIP_CMD} {} \; + @${MKDIR} ${STAGEDIR}${DATADIR} + @${INSTALL} -m 0755 ${STAGEDIR}${PREFIX}/${EJABBERD_LIBDIR}/${PORTNAME}-${PORTVERSION}/priv/bin/captcha.sh \ + ${STAGEDIR}${DATADIR} + @${REINPLACE_CMD} -r -e '/captcha_cmd:/s,"[^"]+","${DATADIR}/captcha.sh",' ${STAGEDIR}${ETCDIR}/${PORTNAME}.yml.example .include <bsd.port.post.mk> Modified: head/net-im/ejabberd/files/pkg-message.in ============================================================================== --- head/net-im/ejabberd/files/pkg-message.in Sun Nov 19 09:00:14 2017 (r454479) +++ head/net-im/ejabberd/files/pkg-message.in Sun Nov 19 09:05:18 2017 (r454480) @@ -12,5 +12,6 @@ Congratulations, you have installed %%PORTNAME%%! o PLEASE NOTE! "ejabberd" user UID and GID have changed from version 2.0.3 of this port! Users are advised to check all configuration files and data in /var/spool/ejabberd to ensure everything has the correct owner/group. + o To start using CAPTCHA functionality, please install ImageMagick port. ------------------------------------------------------------------------ Modified: head/net-im/ejabberd/pkg-plist ============================================================================== --- head/net-im/ejabberd/pkg-plist Sun Nov 19 09:00:14 2017 (r454479) +++ head/net-im/ejabberd/pkg-plist Sun Nov 19 09:05:18 2017 (r454480) @@ -730,6 +730,7 @@ %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/zh.msg %%EJABBERD_LIBDIR%%/%%PORTNAME%%-%%PORTVERSION%%/priv/sql/lite.sql sbin/%%PORTNAME%%ctl +%%DATADIR%%/captcha.sh %%PORTDOCS%%%%DOCSDIR%%/COPYING @dir /var/log/%%PORTNAME%% @dir /var/run/%%PORTNAME%%ctl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711190905.vAJ95Ihp057561>