diff options
author | fhajny <fhajny@pkgsrc.org> | 2013-10-11 13:32:25 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2013-10-11 13:32:25 +0000 |
commit | 143e5095ebccd7b741f290fa38faada36c1bf333 (patch) | |
tree | 707099de7edbf6829d23f4225734a0f6eef408e3 /chat/ejabberd | |
parent | 07fbc4f0a6666e0704a5ea5bb8a1dfb9f81275d7 (diff) | |
download | pkgsrc-143e5095ebccd7b741f290fa38faada36c1bf333.tar.gz |
Update ejabberd to 13.10.
Major changes since 2.1.13:
* Huge improvements regarding performances
* Optimized memory consumption
* Clean code representation of xmlel records
Release notes (yet?) unavailable, changelog points at bug tracker:
https://support.process-one.net/secure/IssueNavigator.jspa?reset=true&jqlQuery=project+%3D+EJAB+AND+fixVersion+%3D+%22ejabberd+13.10%22
Diffstat (limited to 'chat/ejabberd')
-rw-r--r-- | chat/ejabberd/Makefile | 102 | ||||
-rw-r--r-- | chat/ejabberd/PLIST | 119 | ||||
-rw-r--r-- | chat/ejabberd/distinfo | 15 | ||||
-rw-r--r-- | chat/ejabberd/files/deps_p1__iconv_rebar.config.patch | 11 | ||||
-rw-r--r-- | chat/ejabberd/files/ejabberd.sh | 4 | ||||
-rw-r--r-- | chat/ejabberd/patches/patch-aa | 169 | ||||
-rw-r--r-- | chat/ejabberd/patches/patch-ad | 63 | ||||
-rw-r--r-- | chat/ejabberd/patches/patch-ae | 48 | ||||
-rw-r--r-- | chat/ejabberd/patches/patch-configure | 23 |
9 files changed, 252 insertions, 302 deletions
diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile index 9f74378a420..8abee9f8191 100644 --- a/chat/ejabberd/Makefile +++ b/chat/ejabberd/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.33 2013/07/19 09:45:37 fhajny Exp $ +# $NetBSD: Makefile,v 1.34 2013/10/11 13:32:25 fhajny Exp $ -DISTNAME= ejabberd-2.1.13 +DISTNAME= ejabberd-13.10 CATEGORIES= chat MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tgz @@ -10,43 +10,33 @@ HOMEPAGE= http://www.ejabberd.im/ COMMENT= Free and Open Source distributed fault-tolerant Jabber server LICENSE= gnu-gpl-v2 -CONFLICTS+= jabberd-[0-9]* - -GNU_CONFIGURE= yes -USE_TOOLS+= gmake - -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -# much prefer to be explicit about the configure settings rather than -# depending on the defaults to continue to be sane or same between versions -CONFIGURE_ARGS+= --enable-odbc -CONFIGURE_ARGS+= --enable-mod_irc -CONFIGURE_ARGS+= --enable-mod_muc -CONFIGURE_ARGS+= --enable-eldap -CONFIGURE_ARGS+= --enable-web -CONFIGURE_ARGS+= --enable-tls -CONFIGURE_ARGS+= --enable-ejabberd_zlib -CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} -CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} -CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat} -CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} -CONFIGURE_ARGS+= --with-erlang=${BUILDLINK_PREFIX.erlang} +BUILD_DEPENDS+= git-base>=1.5:../../devel/git-base +CONFLICTS+= jabberd-[0-9]* + +GNU_CONFIGURE= yes +USE_LANGUAGES= c c++ +USE_TOOLS+= gmake patch + +CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --enable-iconv +CONFIGURE_ARGS+= --enable-json +CONFIGURE_ARGS+= --enable-lager +CONFIGURE_ARGS+= --enable-nif +CONFIGURE_ARGS+= --enable-stun +CONFIGURE_ARGS+= --enable-user=${EJABBERD_USER} +CONFIGURE_ARGS+= --enable-zlib CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} -CONFIGURE_DIRS+= src -BUILD_DIRS+= src - -MAKE_ENV= PKGVERSION=${PKGVERSION} -PLIST_SUBST+= DISTNAME=${DISTNAME} PKGBASE=${PKGBASE} - -FILES_SUBST+= DISTNAME=${DISTNAME} PKGBASE=${PKGBASE} -FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} -FILES_SUBST+= EGDIR=${EGDIR} +.include "../../lang/erlang/buildlink3.mk" +.if !empty(PKG_BUILD_OPTIONS.erlang:Miodbc) || \ + !empty(PKG_BUILD_OPTIONS.erlang:Munixodbc) +CONFIGURE_ARGS+= --enable-odbc +.endif RCD_SCRIPTS= ejabberd BUILD_DEFS+= EJABBERD_USER EJABBERD_GROUP EJABBERD_LOGDIR BUILD_DEFS+= EJABBERD_PIDDIR EJABBERD_DB EJABBERD_TRANSDIR -BUILD_DEFS+= EJABBERD_EXDIR BUILD_DEFS+= VARBASE PKG_SYSCONFSUBDIR= ejabberd @@ -57,35 +47,37 @@ EJABBERD_GROUP?= ejabberd EJABBERD_PIDDIR?= ${VARBASE}/run/ejabberd EJABBERD_LOGDIR?= ${VARBASE}/log/ejabberd EJABBERD_DB?= ${VARBASE}/spool/ejabberd -EJABBERD_EXDIR= share/examples/ejabberd -OWN_DIRS+= ${EJABBERD_PIDDIR} -OWN_DIRS+= ${EJABBERD_LOGDIR} -OWN_DIRS+= ${EJABBERD_DB} OWN_DIRS_PERMS+= ${EJABBERD_PIDDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770 OWN_DIRS_PERMS+= ${EJABBERD_LOGDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770 OWN_DIRS_PERMS+= ${EJABBERD_DB} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770 -FILES_SUBST+= JABBERD_USER=${EJABBERD_USER} -FILES_SUBST+= JABBERD_LOGDIR=${EJABBERD_LOGDIR} +FILES_SUBST+= DISTNAME=${DISTNAME} +FILES_SUBST+= EJABBERD_USER=${EJABBERD_USER} +PLIST_SUBST+= DISTNAME=${DISTNAME} PLIST_SUBST+= EJABBERD_EXDIR=${EJABBERD_EXDIR} PKG_GROUPS+= ${EJABBERD_GROUP} PKG_USERS+= ${EJABBERD_USER}:${EJABBERD_GROUP} PKG_GECOS.${EJABBERD_USER}= ejabberd user PKG_HOME.${EJABBERD_USER}= ${EJABBERD_DB} +PKG_SHELL.${EJABBERD_USER}= ${SH} -EGDIR= ${PREFIX}/${EJABBERD_EXDIR} +EGDIR= share/examples/ejabberd -INSTALLATION_DIRS+= ${PREFIX}/share/doc/${PKGBASE} +INSTALLATION_DIRS+= share/doc/${PKGBASE} INSTALLATION_DIRS+= ${EGDIR} -CONF_FILES= ${EGDIR}/ejabberd.cfg ${PKG_SYSCONFDIR}/ejabberd.cfg -CONF_FILES+= ${EGDIR}/ejabberdctl.cfg ${PKG_SYSCONFDIR}/ejabberdctl.cfg -CONF_FILES+= ${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc +CONF_FILES_PERMS= ${EGDIR}/ejabberd.yml ${PKG_SYSCONFDIR}/ejabberd.yml \ + ${ROOT_USER} ${EJABBERD_GROUP} 0640 +CONF_FILES_PERMS+= ${EGDIR}/ejabberdctl.cfg ${PKG_SYSCONFDIR}/ejabberdctl.cfg \ + ${ROOT_USER} ${EJABBERD_GROUP} 0640 +CONF_FILES_PERMS+= ${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc \ + ${ROOT_USER} ${EJABBERD_GROUP} 0640 +SPECIAL_PERMS+= sbin/ejabberdctl ${ROOT_USER} ${EJABBERD_GROUP} 0750 -REPLACE_SH= src/ejabberdctl.template tools/captcha.sh +REPLACE_SH= ejabberdctl.template tools/captcha.sh post-patch: ${RM} -f ${WRKSRC}/doc/guide.tex.orig @@ -98,23 +90,25 @@ post-install: SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Localizing paths SUBST_STAGE.paths= pre-configure -SUBST_FILES.paths= src/Makefile.in -SUBST_FILES.paths+= src/ejabberd.cfg.example -SUBST_FILES.paths+= src/ejabberdctl.template +SUBST_FILES.paths= Makefile.in +SUBST_FILES.paths+= ejabberd.yml.example +SUBST_FILES.paths+= ejabberdctl.template SUBST_FILES.paths+= doc/guide.tex SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' -SUBST_SED.paths+= -e 's,@JABBERD_LOGDIR@,${EJABBERD_LOGDIR},g' -SUBST_SED.paths+= -e 's,@EJABBERD_DBDIR@,${EJABBERD_DB},g' +SUBST_SED.paths+= -e 's,@EJABBERD_DB@,${EJABBERD_DB},g' SUBST_SED.paths+= -e 's,@EJABBERD_LOGDIR@,${EJABBERD_LOGDIR},g' SUBST_SED.paths+= -e 's,@EJABBERD_PIDDIR@,${EJABBERD_PIDDIR},g' -SUBST_SED.paths+= -e 's,@EJABBERD_DB@,${EJABBERD_DB},g' SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' SUBST_SED.paths+= -e 's,@DISTNAME@,${DISTNAME},g' -SUBST_SED.paths+= -e 's,@EJABBERD_VARDIR@,${VARBASE},g' + +post-configure: + cd ${WRKSRC} && ${BUILD_MAKE_CMD} deps + ${PATCH} -p0 ${WRKSRC}/deps/p1_iconv/rebar.config \ + < ${FILESDIR}/deps_p1__iconv_rebar.config.patch .include "../../converters/libiconv/buildlink3.mk" -.include "../../lang/erlang/buildlink3.mk" -.include "../../textproc/expat/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" +.include "../../textproc/expat/buildlink3.mk" +.include "../../textproc/libyaml/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST index 4bc08a2d0bb..755ce97f98c 100644 --- a/chat/ejabberd/PLIST +++ b/chat/ejabberd/PLIST @@ -1,16 +1,18 @@ -@comment $NetBSD: PLIST,v 1.20 2013/07/19 09:45:37 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.21 2013/10/11 13:32:25 fhajny Exp $ lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam lib/erlang/lib/${PKGNAME}/ebin/acl.beam lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam +lib/erlang/lib/${PKGNAME}/ebin/beam_util.beam lib/erlang/lib/${PKGNAME}/ebin/cache_tab.beam +lib/erlang/lib/${PKGNAME}/ebin/cache_tab_app.beam lib/erlang/lib/${PKGNAME}/ebin/cache_tab_sup.beam +lib/erlang/lib/${PKGNAME}/ebin/cache_tab_treap.beam lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam -lib/erlang/lib/${PKGNAME}/ebin/dynamic_compile.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_admin.beam @@ -25,7 +27,6 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_captcha.beam -lib/erlang/lib/${PKGNAME}/ebin/ejabberd_check.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_config.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_ctl.beam @@ -36,8 +37,7 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_bind.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_poll.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_listener.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_local.beam -lib/erlang/lib/${PKGNAME}/ebin/ejabberd_logger_h.beam -lib/erlang/lib/${PKGNAME}/ebin/ejabberd_loglevel.beam +lib/erlang/lib/${PKGNAME}/ebin/ejabberd_logger.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_node_groups.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_odbc.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_odbc_sup.beam @@ -52,33 +52,67 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_out.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_service.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_socket.beam -lib/erlang/lib/${PKGNAME}/ebin/ejabberd_stun.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sup.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_system_monitor.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_tmp_sup.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_update.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_web.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_web_admin.beam -lib/erlang/lib/${PKGNAME}/ebin/ejabberd_zlib.beam lib/erlang/lib/${PKGNAME}/ebin/ejd2odbc.beam lib/erlang/lib/${PKGNAME}/ebin/eldap.beam lib/erlang/lib/${PKGNAME}/ebin/eldap_filter.beam lib/erlang/lib/${PKGNAME}/ebin/eldap_filter_yecc.beam lib/erlang/lib/${PKGNAME}/ebin/eldap_pool.beam lib/erlang/lib/${PKGNAME}/ebin/eldap_utils.beam +lib/erlang/lib/${PKGNAME}/ebin/error_logger_lager_h.beam +lib/erlang/lib/${PKGNAME}/ebin/example_serv.beam lib/erlang/lib/${PKGNAME}/ebin/extauth.beam +lib/erlang/lib/${PKGNAME}/ebin/ezlib.beam +lib/erlang/lib/${PKGNAME}/ebin/ezlib_app.beam +lib/erlang/lib/${PKGNAME}/ebin/ezlib_sup.beam lib/erlang/lib/${PKGNAME}/ebin/gen_iq_handler.beam lib/erlang/lib/${PKGNAME}/ebin/gen_mod.beam lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_node.beam lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_nodetree.beam +lib/erlang/lib/${PKGNAME}/ebin/glc.beam +lib/erlang/lib/${PKGNAME}/ebin/glc_code.beam +lib/erlang/lib/${PKGNAME}/ebin/glc_lib.beam +lib/erlang/lib/${PKGNAME}/ebin/glc_ops.beam +lib/erlang/lib/${PKGNAME}/ebin/goldrush.app +lib/erlang/lib/${PKGNAME}/ebin/gr_context.beam +lib/erlang/lib/${PKGNAME}/ebin/gre.beam lib/erlang/lib/${PKGNAME}/ebin/iconv.beam +lib/erlang/lib/${PKGNAME}/ebin/iconv_app.beam +lib/erlang/lib/${PKGNAME}/ebin/iconv_sup.beam lib/erlang/lib/${PKGNAME}/ebin/idna.beam lib/erlang/lib/${PKGNAME}/ebin/jd2ejd.beam +lib/erlang/lib/${PKGNAME}/ebin/jiffy.app +lib/erlang/lib/${PKGNAME}/ebin/jiffy.beam +lib/erlang/lib/${PKGNAME}/ebin/jiffy_utf8.beam lib/erlang/lib/${PKGNAME}/ebin/jlib.beam +lib/erlang/lib/${PKGNAME}/ebin/lager.app +lib/erlang/lib/${PKGNAME}/ebin/lager.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_app.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_backend_throttle.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_config.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_console_backend.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_crash_log.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_default_formatter.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_file_backend.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_format.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_handler_watcher.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_handler_watcher_sup.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_msg.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_stdlib.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_sup.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_transform.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_trunc_io.beam +lib/erlang/lib/${PKGNAME}/ebin/lager_util.beam lib/erlang/lib/${PKGNAME}/ebin/mod_adhoc.beam lib/erlang/lib/${PKGNAME}/ebin/mod_announce.beam lib/erlang/lib/${PKGNAME}/ebin/mod_blocking.beam lib/erlang/lib/${PKGNAME}/ebin/mod_caps.beam +lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy.beam lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam lib/erlang/lib/${PKGNAME}/ebin/mod_configure2.beam lib/erlang/lib/${PKGNAME}/ebin/mod_disco.beam @@ -135,50 +169,88 @@ lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree.beam lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree_odbc.beam lib/erlang/lib/${PKGNAME}/ebin/nodetree_virtual.beam lib/erlang/lib/${PKGNAME}/ebin/odbc_queries.beam +lib/erlang/lib/${PKGNAME}/ebin/p1_cache_tab.app lib/erlang/lib/${PKGNAME}/ebin/p1_fsm.beam +lib/erlang/lib/${PKGNAME}/ebin/p1_iconv.app lib/erlang/lib/${PKGNAME}/ebin/p1_mnesia.beam -lib/erlang/lib/${PKGNAME}/ebin/pg2_backport.beam +lib/erlang/lib/${PKGNAME}/ebin/p1_sha.beam +lib/erlang/lib/${PKGNAME}/ebin/p1_stringprep.app +lib/erlang/lib/${PKGNAME}/ebin/p1_stun.app +lib/erlang/lib/${PKGNAME}/ebin/p1_tls.app +lib/erlang/lib/${PKGNAME}/ebin/p1_tls.beam +lib/erlang/lib/${PKGNAME}/ebin/p1_tls_app.beam +lib/erlang/lib/${PKGNAME}/ebin/p1_tls_sup.beam +lib/erlang/lib/${PKGNAME}/ebin/p1_xml.app +lib/erlang/lib/${PKGNAME}/ebin/p1_yaml.app +lib/erlang/lib/${PKGNAME}/ebin/p1_yaml.beam +lib/erlang/lib/${PKGNAME}/ebin/p1_yaml_app.beam +lib/erlang/lib/${PKGNAME}/ebin/p1_yaml_sup.beam +lib/erlang/lib/${PKGNAME}/ebin/p1_zlib.app lib/erlang/lib/${PKGNAME}/ebin/pubsub_db_odbc.beam lib/erlang/lib/${PKGNAME}/ebin/pubsub_index.beam lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription.beam lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription_odbc.beam lib/erlang/lib/${PKGNAME}/ebin/randoms.beam lib/erlang/lib/${PKGNAME}/ebin/scram.beam -lib/erlang/lib/${PKGNAME}/ebin/sha.beam lib/erlang/lib/${PKGNAME}/ebin/shaper.beam +lib/erlang/lib/${PKGNAME}/ebin/str.beam lib/erlang/lib/${PKGNAME}/ebin/stringprep.beam +lib/erlang/lib/${PKGNAME}/ebin/stringprep_app.beam lib/erlang/lib/${PKGNAME}/ebin/stringprep_sup.beam +lib/erlang/lib/${PKGNAME}/ebin/stun.beam +lib/erlang/lib/${PKGNAME}/ebin/stun_app.beam lib/erlang/lib/${PKGNAME}/ebin/stun_codec.beam -lib/erlang/lib/${PKGNAME}/ebin/tls.beam +lib/erlang/lib/${PKGNAME}/ebin/stun_sup.beam +lib/erlang/lib/${PKGNAME}/ebin/tcp_serv.beam lib/erlang/lib/${PKGNAME}/ebin/translate.beam lib/erlang/lib/${PKGNAME}/ebin/treap.beam +lib/erlang/lib/${PKGNAME}/ebin/url_util.beam lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam lib/erlang/lib/${PKGNAME}/ebin/xml.beam +lib/erlang/lib/${PKGNAME}/ebin/xml_app.beam +lib/erlang/lib/${PKGNAME}/ebin/xml_gen.beam lib/erlang/lib/${PKGNAME}/ebin/xml_stream.beam +lib/erlang/lib/${PKGNAME}/ebin/xml_sup.beam +lib/erlang/lib/${PKGNAME}/ebin/xmlrpc.app +lib/erlang/lib/${PKGNAME}/ebin/xmlrpc.beam +lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_decode.beam +lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_encode.beam +lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_http.beam +lib/erlang/lib/${PKGNAME}/ebin/xmlrpc_util.beam +lib/erlang/lib/${PKGNAME}/include/ELDAPv3.hrl lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl lib/erlang/lib/${PKGNAME}/include/adhoc.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_commands.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_config.hrl lib/erlang/lib/${PKGNAME}/include/ejabberd_ctl.hrl -lib/erlang/lib/${PKGNAME}/include/eldap/ELDAPv3.hrl -lib/erlang/lib/${PKGNAME}/include/eldap/eldap.hrl +lib/erlang/lib/${PKGNAME}/include/ejabberd_http.hrl +lib/erlang/lib/${PKGNAME}/include/ejabberd_web_admin.hrl +lib/erlang/lib/${PKGNAME}/include/eldap.hrl +lib/erlang/lib/${PKGNAME}/include/http_bind.hrl lib/erlang/lib/${PKGNAME}/include/jlib.hrl -lib/erlang/lib/${PKGNAME}/include/mod_muc/mod_muc_room.hrl +lib/erlang/lib/${PKGNAME}/include/lager.hrl +lib/erlang/lib/${PKGNAME}/include/logger.hrl +lib/erlang/lib/${PKGNAME}/include/mod_muc_room.hrl lib/erlang/lib/${PKGNAME}/include/mod_privacy.hrl -lib/erlang/lib/${PKGNAME}/include/mod_proxy65/mod_proxy65.hrl -lib/erlang/lib/${PKGNAME}/include/mod_pubsub/pubsub.hrl +lib/erlang/lib/${PKGNAME}/include/mod_proxy65.hrl lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl -lib/erlang/lib/${PKGNAME}/include/web/ejabberd_http.hrl -lib/erlang/lib/${PKGNAME}/include/web/ejabberd_web_admin.hrl -lib/erlang/lib/${PKGNAME}/include/web/http_bind.hrl +lib/erlang/lib/${PKGNAME}/include/ns.hrl +lib/erlang/lib/${PKGNAME}/include/pubsub.hrl +lib/erlang/lib/${PKGNAME}/include/stun.hrl +lib/erlang/lib/${PKGNAME}/include/xml.hrl +lib/erlang/lib/${PKGNAME}/include/xml_gen.hrl +lib/erlang/lib/${PKGNAME}/include/xmlrpc.hrl lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh -lib/erlang/lib/${PKGNAME}/priv/lib/ejabberd_zlib_drv.so lib/erlang/lib/${PKGNAME}/priv/lib/expat_erl.so -lib/erlang/lib/${PKGNAME}/priv/lib/iconv_erl.so -lib/erlang/lib/${PKGNAME}/priv/lib/sha_drv.so +lib/erlang/lib/${PKGNAME}/priv/lib/ezlib_drv.so +lib/erlang/lib/${PKGNAME}/priv/lib/iconv.so +lib/erlang/lib/${PKGNAME}/priv/lib/jiffy.so +lib/erlang/lib/${PKGNAME}/priv/lib/p1_sha.so +lib/erlang/lib/${PKGNAME}/priv/lib/p1_tls_drv.so +lib/erlang/lib/${PKGNAME}/priv/lib/p1_yaml.so lib/erlang/lib/${PKGNAME}/priv/lib/stringprep_drv.so -lib/erlang/lib/${PKGNAME}/priv/lib/tls_drv.so +lib/erlang/lib/${PKGNAME}/priv/lib/xml.so lib/erlang/lib/${PKGNAME}/priv/msgs/ca.msg lib/erlang/lib/${PKGNAME}/priv/msgs/cs.msg lib/erlang/lib/${PKGNAME}/priv/msgs/de.msg @@ -236,7 +308,6 @@ share/doc/ejabberd/release_notes_2.1.1.txt share/doc/ejabberd/release_notes_2.1.10.txt share/doc/ejabberd/release_notes_2.1.11.txt share/doc/ejabberd/release_notes_2.1.12.txt -share/doc/ejabberd/release_notes_${PKGVERSION}.txt share/doc/ejabberd/release_notes_2.1.2.txt share/doc/ejabberd/release_notes_2.1.3.txt share/doc/ejabberd/release_notes_2.1.4.txt @@ -248,7 +319,7 @@ share/doc/ejabberd/release_notes_2.1.9.txt share/doc/ejabberd/webadmmain.png share/doc/ejabberd/webadmmainru.png share/doc/ejabberd/yozhikheader.png -share/examples/ejabberd/ejabberd.cfg +share/examples/ejabberd/ejabberd.yml share/examples/ejabberd/ejabberdctl.cfg share/examples/ejabberd/inetrc share/examples/rc.d/ejabberd diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo index 4745de69c30..912867140c7 100644 --- a/chat/ejabberd/distinfo +++ b/chat/ejabberd/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.21 2013/07/19 09:45:37 fhajny Exp $ +$NetBSD: distinfo,v 1.22 2013/10/11 13:32:25 fhajny Exp $ -SHA1 (ejabberd-2.1.13.tgz) = 6343186be2e84824d2da32e36110b72d6673730e -RMD160 (ejabberd-2.1.13.tgz) = b8b081fcc871ce3a4daf383fb363f147987ff047 -Size (ejabberd-2.1.13.tgz) = 1999853 bytes -SHA1 (patch-aa) = 81bffd072f179713989cde0c1efc3cce8cf10944 -SHA1 (patch-ad) = ea92f93624b5d6d8fa3760d426a967a499721fe7 -SHA1 (patch-ae) = e518cb5eb67ae8feef7617ad52799af3b8e81179 +SHA1 (ejabberd-13.10.tgz) = 916775fe2ec71ceefbe88aa49698c4ba5c0d53de +RMD160 (ejabberd-13.10.tgz) = ca2eed7d6a60347af9800ba2bd83bcb556e481e6 +Size (ejabberd-13.10.tgz) = 2165967 bytes +SHA1 (patch-aa) = f573f541ae6963acffa5a470a290874b3312b787 +SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988 +SHA1 (patch-ae) = cfd7a7337410a70d38e4ef10a74db91ca512874c +SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe diff --git a/chat/ejabberd/files/deps_p1__iconv_rebar.config.patch b/chat/ejabberd/files/deps_p1__iconv_rebar.config.patch new file mode 100644 index 00000000000..261000a30cf --- /dev/null +++ b/chat/ejabberd/files/deps_p1__iconv_rebar.config.patch @@ -0,0 +1,11 @@ +--- rebar.config.orig 2013-10-11 06:52:27.975407457 +0000 ++++ rebar.config 2013-10-11 06:59:26.293793956 +0000 +@@ -1,6 +1,7 @@ + {erl_opts, [debug_info]}. + +-{port_env, [{"CFLAGS", "-g -O2 -Wall"}]}. ++{port_env, [{"CFLAGS", "$CFLAGS -g -O2 -Wall"}, ++ {"LDFLAGS", "$LDFLAGS -liconv"}]}. + + {port_specs, [{"priv/lib/iconv.so", ["c_src/iconv.c"]}]}. + diff --git a/chat/ejabberd/files/ejabberd.sh b/chat/ejabberd/files/ejabberd.sh index 21b4d045aec..76f75d5f334 100644 --- a/chat/ejabberd/files/ejabberd.sh +++ b/chat/ejabberd/files/ejabberd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: ejabberd.sh,v 1.2 2011/10/07 22:37:03 shattered Exp $ +# $NetBSD: ejabberd.sh,v 1.3 2013/10/11 13:32:25 fhajny Exp $ # $FreeBSD: ejabberd.sh.in,v 1.1 2005/08/28 15:51:48 vsevolod Exp $ # # PROVIDE: ejabberd @@ -17,7 +17,7 @@ name="ejabberd" rcvar=${name} command=ejabberdctl -ejabberd_user="@JABBERD_USER@" +ejabberd_user="@EJABBERD_USER@" reload_cmd="ejabberd_reload" restart_cmd="ejabberd_reload" start_cmd="ejabberd_start" diff --git a/chat/ejabberd/patches/patch-aa b/chat/ejabberd/patches/patch-aa index e98c7cf9154..d059540cbdd 100644 --- a/chat/ejabberd/patches/patch-aa +++ b/chat/ejabberd/patches/patch-aa @@ -1,17 +1,9 @@ -$NetBSD: patch-aa,v 1.9 2011/06/06 13:45:38 fhajny Exp $ +$NetBSD: patch-aa,v 1.10 2013/10/11 13:32:25 fhajny Exp $ ---- src/Makefile.in.orig 2011-06-06 13:25:51.841507950 +0000 -+++ src/Makefile.in -@@ -71,7 +71,7 @@ endif - - INSTALL_EPAM= - ifeq (@pam@, pam) -- INSTALL_EPAM=install -m 750 $(O_USER) epam $(PBINDIR) -+ INSTALL_EPAM=$(BSD_INSTALL_DATA) -m 750 $(O_USER) epam $(PBINDIR) - endif - - prefix = @prefix@ -@@ -89,13 +89,13 @@ BEAMS = $(SOURCES:.erl=.beam) +Fix locations; don't mess with ownership. +--- Makefile.in.orig 2013-09-27 09:19:22.000000000 +0000 ++++ Makefile.in +@@ -9,13 +9,13 @@ exec_prefix = @exec_prefix@ DESTDIR = # /etc/ejabberd/ @@ -27,7 +19,7 @@ $NetBSD: patch-aa,v 1.9 2011/06/06 13:45:38 fhajny Exp $ # /share/doc/ejabberd PACKAGE_TARNAME = @PACKAGE_TARNAME@ -@@ -121,16 +121,16 @@ SODIR = $(PRIVDIR)/lib +@@ -41,16 +41,16 @@ SODIR = $(PRIVDIR)/lib MSGSDIR = $(PRIVDIR)/msgs # /var/lib/ejabberd/ @@ -43,135 +35,22 @@ $NetBSD: patch-aa,v 1.9 2011/06/06 13:45:38 fhajny Exp $ # /var/log/ejabberd/ -LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd -+LOGDIR = $(DESTDIR)@JABBERD_LOGDIR@ - - # Assume Linux-style dynamic library flags - DYNAMIC_LIB_CFLAGS = -fpic -shared -@@ -183,10 +183,10 @@ translations: - install: all - # - # Configuration files -- install -d -m 750 $(G_USER) $(ETCDIR) -+ $(BSD_INSTALL_DATA_DIR) -m 750 $(G_USER) $(ETCDIR) - [ -f $(ETCDIR)/ejabberd.cfg ] \ -- && install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \ -- || install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg -+ && $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \ -+ || $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg - sed -e "s*@rootdir@*@prefix@*" \ - -e "s*@installuser@*@INSTALLUSER@*" \ - -e "s*@LIBDIR@*@libdir@*" \ -@@ -196,13 +196,13 @@ install: all - -e "s*@erl@*@ERL@*" ejabberdctl.template \ - > ejabberdctl.example - [ -f $(ETCDIR)/ejabberdctl.cfg ] \ -- && install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \ -- || install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg -- install -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc -+ && $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \ -+ || $(BSD_INSTALL_DATA) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg -+ $(BSD_INSTALL_DATA) -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc - # - # Administration script -- [ -d $(SBINDIR) ] || install -d -m 755 $(SBINDIR) -- install -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl -+ [ -d $(SBINDIR) ] || $(BSD_INSTALL_DATA_DIR) -m 755 $(SBINDIR) -+ $(BSD_INSTALL_SCRIPT) -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl - # - # Init script - sed -e "s*@ctlscriptpath@*$(SBINDIR)*" \ -@@ -211,64 +211,58 @@ install: all - chmod 755 ejabberd.init - # - # Binary Erlang files -- install -d $(BEAMDIR) -- install -m 644 *.app $(BEAMDIR) -- install -m 644 *.beam $(BEAMDIR) -+ $(BSD_INSTALL_DATA_DIR) $(BEAMDIR) -+ $(BSD_INSTALL_DATA) -m 644 *.app $(BEAMDIR) -+ $(BSD_INSTALL_DATA) -m 644 *.beam $(BEAMDIR) - rm -f $(BEAMDIR)/configure.beam - # - # ejabberd header files -- install -d $(INCLUDEDIR) -- install -m 644 *.hrl $(INCLUDEDIR) -- install -d $(INCLUDEDIR)/eldap/ -- install -m 644 eldap/*.hrl $(INCLUDEDIR)/eldap/ -- install -d $(INCLUDEDIR)/mod_muc/ -- install -m 644 mod_muc/*.hrl $(INCLUDEDIR)/mod_muc/ -- install -d $(INCLUDEDIR)/mod_proxy65/ -- install -m 644 mod_proxy65/*.hrl $(INCLUDEDIR)/mod_proxy65/ -- install -d $(INCLUDEDIR)/mod_pubsub/ -- install -m 644 mod_pubsub/*.hrl $(INCLUDEDIR)/mod_pubsub/ -- install -d $(INCLUDEDIR)/web/ -- install -m 644 web/*.hrl $(INCLUDEDIR)/web/ -+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR) -+ $(BSD_INSTALL_DATA) -m 644 *.hrl $(INCLUDEDIR) -+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/eldap/ -+ $(BSD_INSTALL_DATA) -m 644 eldap/*.hrl $(INCLUDEDIR)/eldap/ -+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/mod_muc/ -+ $(BSD_INSTALL_DATA) -m 644 mod_muc/*.hrl $(INCLUDEDIR)/mod_muc/ -+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/mod_proxy65/ -+ $(BSD_INSTALL_DATA) -m 644 mod_proxy65/*.hrl $(INCLUDEDIR)/mod_proxy65/ -+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/mod_pubsub/ -+ $(BSD_INSTALL_DATA) -m 644 mod_pubsub/*.hrl $(INCLUDEDIR)/mod_pubsub/ -+ $(BSD_INSTALL_DATA_DIR) $(INCLUDEDIR)/web/ -+ $(BSD_INSTALL_DATA) -m 644 web/*.hrl $(INCLUDEDIR)/web/ - # - # Binary C programs -- install -d $(PBINDIR) -- install -m 750 $(O_USER) ../tools/captcha.sh $(PBINDIR) -+ $(BSD_INSTALL_SCRIPT_DIR) $(PBINDIR) -+ $(BSD_INSTALL_SCRIPT) -m 750 $(O_USER) ../tools/captcha.sh $(PBINDIR) - $(INSTALL_EPAM) - # - # Binary system libraries -- install -d $(SODIR) -- install -m 644 *.so $(SODIR) -+ $(BSD_INSTALL_LIB_DIR) $(SODIR) -+ $(BSD_INSTALL_LIB) -m 644 *.so $(SODIR) - # - # Translated strings -- install -d $(MSGSDIR) -- install -m 644 msgs/*.msg $(MSGSDIR) -- # -- # Spool directory -- install -d -m 750 $(O_USER) $(SPOOLDIR) -- $(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT) -- chmod -R 750 $(SPOOLDIR) -- [ ! -f $(COOKIEFILE) ] || { $(CHOWN_COMMAND) @INSTALLUSER@ $(COOKIEFILE) >$(CHOWN_OUTPUT) ; chmod 400 $(COOKIEFILE) ; } -+ $(BSD_INSTALL_DATA_DIR) $(MSGSDIR) -+ $(BSD_INSTALL_DATA) -m 644 msgs/*.msg $(MSGSDIR) - # - # ejabberdctl lock directory -- install -d -m 750 $(O_USER) $(CTLLOCKDIR) -+ $(BSD_INSTALL_DATA_DIR) -m 750 $(O_USER) $(CTLLOCKDIR) - $(CHOWN_COMMAND) -R @INSTALLUSER@ $(CTLLOCKDIR) >$(CHOWN_OUTPUT) - chmod -R 750 $(CTLLOCKDIR) - # - # Log directory -- install -d -m 750 $(O_USER) $(LOGDIR) -+ $(BSD_INSTALL_DATA_DIR) -m 750 $(O_USER) $(LOGDIR) - $(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT) - chmod -R 750 $(LOGDIR) - # - # Documentation -- install -d $(DOCDIR) -- install -m 644 ../doc/dev.html $(DOCDIR) -- install -m 644 ../doc/guide.html $(DOCDIR) -- install -m 644 ../doc/*.png $(DOCDIR) -- install -m 644 ../doc/*.txt $(DOCDIR) -+ $(BSD_INSTALL_DATA_DIR) $(DOCDIR) -+ $(BSD_INSTALL_DATA) -m 644 ../doc/dev.html $(DOCDIR) -+ $(BSD_INSTALL_DATA) -m 644 ../doc/guide.html $(DOCDIR) -+ $(BSD_INSTALL_DATA) -m 644 ../doc/*.png $(DOCDIR) -+ $(BSD_INSTALL_DATA) -m 644 ../doc/*.txt $(DOCDIR) - [ -f ../doc/guide.pdf ] \ -- && install -m 644 ../doc/guide.pdf $(DOCDIR) \ -+ && $(BSD_INSTALL_DATA) -m 644 ../doc/guide.pdf $(DOCDIR) \ - || echo "No ../doc/guide.pdf was built" -- install -m 644 ../COPYING $(DOCDIR) -+ $(BSD_INSTALL_DATA) -m 644 ../COPYING $(DOCDIR) - - uninstall: uninstall-binary ++LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@ + + INSTALLUSER=@INSTALLUSER@ + # if no user was enabled, don't set privileges or ownership +@@ -61,10 +61,10 @@ ifeq ($(INSTALLUSER),) + CHOWN_OUTPUT=/dev/null + INIT_USER=root + else +- O_USER=-o $(INSTALLUSER) +- G_USER=-g $(INSTALLUSER) +- CHOWN_COMMAND=chown +- CHOWN_OUTPUT=&1 ++ O_USER= ++ G_USER= ++ CHOWN_COMMAND=echo ++ CHOWN_OUTPUT=/dev/null + INIT_USER=$(INSTALLUSER) + endif diff --git a/chat/ejabberd/patches/patch-ad b/chat/ejabberd/patches/patch-ad index 7eda4c80c9b..b593796536a 100644 --- a/chat/ejabberd/patches/patch-ad +++ b/chat/ejabberd/patches/patch-ad @@ -1,53 +1,14 @@ -$NetBSD: patch-ad,v 1.6 2011/06/06 13:45:38 fhajny Exp $ +$NetBSD: patch-ad,v 1.7 2013/10/11 13:32:25 fhajny Exp $ ---- src/ejabberd.cfg.example.orig 2011-06-01 09:03:36.000000000 +0000 -+++ src/ejabberd.cfg.example -@@ -109,7 +109,6 @@ - [ +Proper path to captcha script. +--- ejabberd.yml.example.orig 2013-09-27 09:19:22.000000000 +0000 ++++ ejabberd.yml.example +@@ -490,7 +490,7 @@ language: "en" + ## + ## Full path to a script that generates the image. + ## +-## captcha_cmd: "/lib/ejabberd/priv/bin/captcha.sh" ++## captcha_cmd: "@PREFIX@/lib/erlang/lib/@DISTNAME@/priv/bin/captcha.sh" - {5222, ejabberd_c2s, [ -- - %% - %% If TLS is compiled in and you installed a SSL - %% certificate, specify the full path to the -@@ -125,12 +124,12 @@ - %% - %% To enable the old SSL connection method on port 5223: - %% -- %%{5223, ejabberd_c2s, [ -- %% {access, c2s}, -- %% {shaper, c2s_shaper}, -- %% {certfile, "/path/to/ssl.pem"}, tls, -- %% {max_stanza_size, 65536} -- %% ]}, -+ {5223, ejabberd_c2s, [ -+ {access, c2s}, -+ {shaper, c2s_shaper}, -+ {certfile, "/path/to/ssl.pem"}, tls, -+ {max_stanza_size, 65536} -+ ]}, - - {5269, ejabberd_s2s_in, [ - {shaper, s2s_shaper}, -@@ -140,10 +139,10 @@ - %% - %% ejabberd_service: Interact with external components (transports, ...) - %% -- %%{8888, ejabberd_service, [ -+ %%{{8888, "127.0.0.1"}, -+ %% ejabberd_service, [ - %% {access, all}, - %% {shaper_rule, fast}, -- %% {ip, {127, 0, 0, 1}}, - %% {hosts, ["icq.example.org", "sms.example.org"], - %% [{password, "secret"}] - %% } -@@ -472,7 +471,7 @@ - %% - %% Full path to a script that generates the image. - %% --%%{captcha_cmd, "/lib/ejabberd/priv/bin/captcha.sh"}. -+%%{captcha_cmd, "@PREFIX@/lib/erlang/lib/@DISTNAME@/priv/bin/captcha.sh"}. - - %% - %% Host for the URL and port where ejabberd listens for CAPTCHA requests. + ## + ## Host for the URL and port where ejabberd listens for CAPTCHA requests. diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae index cfa491edec1..25577eea7b7 100644 --- a/chat/ejabberd/patches/patch-ae +++ b/chat/ejabberd/patches/patch-ae @@ -1,35 +1,45 @@ -$NetBSD: patch-ae,v 1.6 2010/09/03 10:31:43 fhajny Exp $ +$NetBSD: patch-ae,v 1.7 2013/10/11 13:32:25 fhajny Exp $ ---- src/ejabberdctl.template.orig 2010-08-02 16:33:20.000000000 +0000 -+++ src/ejabberdctl.template -@@ -43,10 +43,10 @@ if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ; +Default locations. +--- ejabberdctl.template.orig 2013-09-27 09:19:22.000000000 +0000 ++++ ejabberdctl.template +@@ -23,7 +23,7 @@ if [ "$INSTALLUSER" != "" ] ; then + EXEC_CMD="false" + for GID in `id -G`; do + if [ $GID -eq 0 ] ; then +- EXEC_CMD="su $INSTALLUSER -p -c" ++ EXEC_CMD="su $INSTALLUSER -m -c" + fi + done + if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then +@@ -68,10 +68,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th + EJABBERD_CONFIG_PATH=$ETCDIR/ejabberd.yml fi - [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH" if [ "$LOGS_DIR" = "" ] ; then -- LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd +- LOGS_DIR={{localstatedir}}/log/ejabberd + LOGS_DIR=@EJABBERD_LOGDIR@ fi if [ "$SPOOLDIR" = "" ] ; then -- SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd +- SPOOLDIR={{localstatedir}}/lib/ejabberd + SPOOLDIR=@EJABBERD_DB@ fi if [ "$EJABBERD_DOC_PATH" = "" ] ; then - EJABBERD_DOC_PATH=@DOCDIR@ -@@ -86,7 +86,7 @@ ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_ - - # define additional environment variables - if [ "$EJABBERDDIR" = "" ]; then -- EJABBERDDIR=@LIBDIR@/ejabberd -+ EJABBERDDIR=@LIBDIR@/erlang/lib/@DISTNAME@ + EJABBERD_DOC_PATH={{docdir}} +@@ -82,7 +82,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then fi - if [ "$EJABBERD_EBIN_PATH" = "" ]; then - EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin -@@ -237,7 +237,7 @@ ctl () + if [ "{{release}}" != "true" ] ; then + if [ "$EJABBERDDIR" = "" ] ; then +- EJABBERDDIR={{libdir}}/ejabberd ++ EJABBERDDIR={{libdir}}/erlang/lib/@DISTNAME@ + fi + if [ "$EJABBERD_EBIN_PATH" = "" ] ; then + EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin +@@ -261,7 +261,7 @@ ctl() # using flock if available. Expects a linux-style # flock that can lock a file descriptor. MAXCONNID=100 -- CONNLOCKDIR=@LOCALSTATEDIR@/lock/ejabberdctl +- CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl + CONNLOCKDIR=@EJABBERD_PIDDIR@ FLOCK='/usr/bin/flock' if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then - JOT='/usr/bin/jot' + JOT='/usr/bin/jot' diff --git a/chat/ejabberd/patches/patch-configure b/chat/ejabberd/patches/patch-configure new file mode 100644 index 00000000000..872b5ec6c73 --- /dev/null +++ b/chat/ejabberd/patches/patch-configure @@ -0,0 +1,23 @@ +$NetBSD: patch-configure,v 1.1 2013/10/11 13:32:25 fhajny Exp $ + +Portability. +--- configure.orig 2013-10-10 10:59:33.747311941 +0000 ++++ configure +@@ -2548,7 +2548,7 @@ EOF + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 + $as_echo "failed" >&6; } + X="`cat conftest.out`" +- if test "" == "warn"; then ++ if test "" = "warn"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $X" >&5 + $as_echo "$as_me: WARNING: $X" >&2;} + else +@@ -2630,7 +2630,7 @@ EOF + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 + $as_echo "failed" >&6; } + X="`cat conftest.out`" +- if test "warn" == "warn"; then ++ if test "warn" = "warn"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $X" >&5 + $as_echo "$as_me: WARNING: $X" >&2;} + else |