From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 24 12:40:01 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A3E8106567B for ; Mon, 24 Oct 2011 12:40:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2FF428FC15 for ; Mon, 24 Oct 2011 12:40:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p9OCe1T8017798 for ; Mon, 24 Oct 2011 12:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p9OCe11Z017797; Mon, 24 Oct 2011 12:40:01 GMT (envelope-from gnats) Resent-Date: Mon, 24 Oct 2011 12:40:01 GMT Resent-Message-Id: <201110241240.p9OCe11Z017797@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ruslan Mahmatkhanov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F3DE1065674 for ; Mon, 24 Oct 2011 12:35:31 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 1DE6E8FC0A for ; Mon, 24 Oct 2011 12:35:31 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p9OCZUCg021238 for ; Mon, 24 Oct 2011 12:35:30 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p9OCZUCg021237; Mon, 24 Oct 2011 12:35:30 GMT (envelope-from nobody) Message-Id: <201110241235.p9OCZUCg021237@red.freebsd.org> Date: Mon, 24 Oct 2011 12:35:30 GMT From: Ruslan Mahmatkhanov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/161962: [UPDATE] net-im/ejabberd: update to 2.1.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2011 12:40:01 -0000 >Number: 161962 >Category: ports >Synopsis: [UPDATE] net-im/ejabberd: update to 2.1.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Oct 24 12:40:00 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Ruslan Mahmatkhanov >Release: 10.0-CURRENT >Organization: >Environment: 10.0-CURRENT i386 >Description: - update to 2.1.9 - remove irrelevant patches: deleted: files/patch-.._ebin_ejabberd.app deleted: files/patch-ejabberd.app - fix portlint warning (move LICENSE into it's own place) - whitespace fix in pkg-descr Works fine here on FreeBSD 10.0-CURRENT i386 with erlang-r14b04_1,1. Hope this patch will find it's way to 9.0R DVD :) Please also note that 2.1.9 distfile is half less than 2.1.8 distfile - it's because of guide.pdf removal. changelog (notable many LDAP improvements): http://www.ejabberd.im/ejabberd-2.1.9 tinderbuild logs: 7.4: http://happy-nation.by.ru/ports/tb/7.4/ejabberd-2.1.9.log 8.2: http://happy-nation.by.ru/ports/tb/8.2/ejabberd-2.1.9.log >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/Makefile b/Makefile index 3345efd..338d0c9 100644 --- a/Makefile +++ b/Makefile @@ -6,14 +6,16 @@ # PORTNAME= ejabberd -PORTVERSION= 2.1.8 -PORTREVISION= 2 +PORTVERSION= 2.1.9 CATEGORIES= net-im MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/ MAINTAINER= ashish@FreeBSD.org COMMENT= Free and Open Source distributed fault-tolerant Jabber server +LICENSE= GPLv2 +LICENSE_FILE= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/COPYING + BUILD_DEPENDS= erlc:${PORTSDIR}/lang/erlang RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 @@ -40,9 +42,6 @@ SUB_LIST= PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \ USERS=${USERS} GROUPS=${GROUPS} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -LICENSE= GPLv2 -LICENSE_FILE= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/COPYING - .include USE_OPENSSL= yes diff --git a/distinfo b/distinfo index 700c776..3f0b39c 100644 --- a/distinfo +++ b/distinfo @@ -1,2 +1,2 @@ -SHA256 (ejabberd-2.1.8.tar.gz) = dedf7684f9e96efbbc12f08f175096ef50b3f75b284bd27d172eaf75cecded7f -SIZE (ejabberd-2.1.8.tar.gz) = 3382833 +SHA256 (ejabberd-2.1.9.tar.gz) = f97f2daad497d9d9979455b67ce31e2ddbd3a3cd638a97b2e1d76a6ac8758781 +SIZE (ejabberd-2.1.9.tar.gz) = 1872544 diff --git a/files/patch-.._ebin_ejabberd.app b/files/patch-.._ebin_ejabberd.app deleted file mode 100644 index 4b146ce..0000000 --- a/files/patch-.._ebin_ejabberd.app +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD: ports/net-im/ejabberd/files/patch-.._ebin_ejabberd.app,v 1.1 2011/06/24 13:49:46 ashish Exp $ - ---- ../ebin/ejabberd.app.orig -+++ ../ebin/ejabberd.app -@@ -2,7 +2,7 @@ - - {application, ejabberd, - [{description, "ejabberd"}, -- {vsn, "2.1.7"}, -+ {vsn, "2.1.8"}, - {modules, [acl, - adhoc, - configure, diff --git a/files/patch-ejabberd.app b/files/patch-ejabberd.app deleted file mode 100644 index 82b3297..0000000 --- a/files/patch-ejabberd.app +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD: ports/net-im/ejabberd/files/patch-ejabberd.app,v 1.1 2011/06/24 13:49:46 ashish Exp $ - ---- ejabberd.app.orig -+++ ejabberd.app -@@ -2,7 +2,7 @@ - - {application, ejabberd, - [{description, "ejabberd"}, -- {vsn, "2.1.7"}, -+ {vsn, "2.1.8"}, - {modules, [acl, - adhoc, - configure, diff --git a/pkg-descr b/pkg-descr index c6555ea..5f2b3b5 100644 --- a/pkg-descr +++ b/pkg-descr @@ -1,4 +1,4 @@ -ejabberd is a high performance Free and Open Source distributed +ejabberd is a high performance Free and Open Source distributed fault-tolerant instant messaging Jabber server. Key features include: diff --git a/pkg-plist b/pkg-plist index 7538abf..f831866 100644 --- a/pkg-plist +++ b/pkg-plist @@ -4,6 +4,7 @@ @unexec if cmp -s %D/%%ETCDIR%%/%%PORTNAME%%.defaults.example %D/%%ETCDIR%%/%%PORTNAME%%.defaults; then rm -f %D/%%ETCDIR%%/%%PORTNAME%%.defaults; fi @unexec if cmp -s %D/%%ETCDIR%%/%%PORTNAME%%.inetrc.example %D/%%ETCDIR%%/%%PORTNAME%%.inetrc; then rm -f %D/%%ETCDIR%%/%%PORTNAME%%.inetrc; fi @exec [ ! -f %D/%%ETCDIR%%/%%PORTNAME%%.inetrc ] && cp %D/%%ETCDIR%%/%%PORTNAME%%.inetrc.example %D/%%ETCDIR%%/%%PORTNAME%%.inetrc +%%PAM%%etc/pam.d/%%PORTNAME%% lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ELDAPv3.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam @@ -14,6 +15,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_anonymous.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_digest.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_plain.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_scram.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/dynamic_compile.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.app lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.beam @@ -43,6 +45,8 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_local.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_logger_h.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_loglevel.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_node_groups.beam +%%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc.beam +%%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc_sup.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_piefxis.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_rdbms.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_receiver.beam @@ -61,18 +65,13 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_update.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_web.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_web_admin.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_zlib.beam -%%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc.beam -%%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc_sup.beam -%%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/odbc_queries.beam -%%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/epam.beam -%%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam -%%PAM%%etc/pam.d/%%PORTNAME%% lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejd2odbc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_filter.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_filter_yecc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_pool.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_utils.beam +%%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/epam.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/extauth.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/gen_iq_handler.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/gen_mod.beam @@ -147,6 +146,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_dag.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_tree.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_tree_odbc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_virtual.beam +%%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/odbc_queries.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_fsm.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_mnesia.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pg2_backport.beam @@ -155,6 +155,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_index.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_subscription.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_subscription_odbc.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/randoms.beam +lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/scram.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/sha.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/shaper.beam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/stringprep.beam @@ -184,6 +185,7 @@ lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/%%PORTNAME%%_http.hrl lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/%%PORTNAME%%_web_admin.hrl lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/http_bind.hrl lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/captcha.sh +%%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/%%PORTNAME%%_zlib_drv.so lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/expat_erl.so lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/iconv_erl.so @@ -220,7 +222,6 @@ sbin/%%PORTNAME%%ctl %%PORTDOCS%%%%DOCSDIR%%/dev.html %%PORTDOCS%%%%DOCSDIR%%/discorus.png %%PORTDOCS%%%%DOCSDIR%%/guide.html -%%PORTDOCS%%%%DOCSDIR%%/guide.pdf %%PORTDOCS%%%%DOCSDIR%%/logo.png %%PORTDOCS%%%%DOCSDIR%%/msrl-dit-deep.png %%PORTDOCS%%%%DOCSDIR%%/msrl-dit-flat.png @@ -250,6 +251,7 @@ sbin/%%PORTNAME%%ctl %%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.6.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.7.txt %%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.8.txt +%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.9.txt %%PORTDOCS%%%%DOCSDIR%%/webadmmain.png %%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png %%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png >Release-Note: >Audit-Trail: >Unformatted: