ports/156850: [UPDATE] net-im/ejabberd: update to 2.1.6
Ruslan Mahmatkhanov
cvs-src at yandex.ru
Fri May 6 19:20:14 UTC 2011
>Number: 156850
>Category: ports
>Synopsis: [UPDATE] net-im/ejabberd: update to 2.1.6
>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: Fri May 06 19:20:12 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Ruslan Mahmatkhanov
>Release: 9.0-CURRENT
>Organization:
>Environment:
9.0-CURRENT i386 with erlang-r14b02,1
>Description:
- update to 2.1.6
- switch to USERS/GROUPS knobs instead of manual creating of uids/gids
- cleanup unsupported FreeBSD versions
- some pkg-plist cleanup:
- use ETCDIR instead of etc/PORTNAME
- change 'ejabberd' with PORTNAME in all cases
changelog:
http://www.ejabberd.im/ejabberd-2.1.6
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruNa ejabberd.orig/Makefile ejabberd/Makefile
--- ejabberd.orig/Makefile 2010-10-25 01:55:04.000000000 +0400
+++ ejabberd/Makefile 2011-05-06 22:33:00.000000000 +0400
@@ -6,7 +6,7 @@
#
PORTNAME= ejabberd
-PORTVERSION= 2.1.5
+PORTVERSION= 2.1.6
CATEGORIES= net-im
MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/
@@ -17,6 +17,9 @@
RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
+USERS= ejabberd
+GROUPS= ${USERS}
+
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_ICONV= yes
@@ -31,7 +34,8 @@
PKGINSTALL= ${WRKDIR}/pkg-install
PLIST_SUB= PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
SUB_FILES= pkg-message pkg-install
-SUB_LIST= PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
+SUB_LIST= PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \
+ USERS=${USERS} GROUPS=${GROUPS}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
LICENSE= GPLv2
@@ -41,11 +45,6 @@
USE_OPENSSL= yes
-.if ${OSVERSION} < 700000
-BROKEN= does not compile
-WITH_OPENSSL_PORT= yes
-CONFIGURE_ARGS+=--with-openssl=${LOCALBASE}
-.endif
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
.if defined(WITH_ODBC)
diff -ruNa ejabberd.orig/distinfo ejabberd/distinfo
--- ejabberd.orig/distinfo 2011-03-20 15:53:23.000000000 +0300
+++ ejabberd/distinfo 2011-05-06 22:22:15.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (ejabberd-2.1.5.tar.gz) = 31a46228c6933d7c24435753300a4d2ae2e84568a6097175dc5d4e553299dd9d
-SIZE (ejabberd-2.1.5.tar.gz) = 2278008
+SHA256 (ejabberd-2.1.6.tar.gz) = b54886b119a0ae9f19c8dd91a18e85e518fbd979d47812bee582e872cfbc3544
+SIZE (ejabberd-2.1.6.tar.gz) = 2874967
diff -ruNa ejabberd.orig/files/pkg-install.in ejabberd/files/pkg-install.in
--- ejabberd.orig/files/pkg-install.in 2009-03-16 11:38:32.000000000 +0300
+++ ejabberd/files/pkg-install.in 2011-05-06 22:29:42.000000000 +0400
@@ -4,35 +4,11 @@
exit 0
fi
-USER=ejabberd
-GROUP=${USER}
-UID=543
-GID=${UID}
USERS_HOME="/var/spool/ejabberd"
-if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
- if pw groupadd ${GROUP} -g ${GID}; then
- echo "Added group \"${GROUP}\"."
- else
- echo "Adding group \"${GROUP}\" failed..."
- exit 1
- fi
-fi
-
-if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
- if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
- -s "/bin/sh" -d ${USERS_HOME} -c "ejabberd pseudo user"; \
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- exit 1
- fi
-fi
-
-install -d -m 750 -o ${USER} -g ${GROUP} ${USERS_HOME} /var/log/ejabberd
+install -d -m 750 -o %%USERS%% -g %%GROUPS%% ${USERS_HOME} /var/log/ejabberd
-chown -R ${USER}:${GROUP} %%PREFIX%%/etc/%%PORTNAME%%
-chown -R ${USER}:${GROUP} %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%
+chown -R %%USERS%%:%%GROUPS%% %%PREFIX%%/etc/%%PORTNAME%%
+chown -R %%USERS%%:%%GROUPS%% %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%
exit 0
diff -ruNa ejabberd.orig/pkg-deinstall ejabberd/pkg-deinstall
--- ejabberd.orig/pkg-deinstall 2005-08-28 19:51:47.000000000 +0400
+++ ejabberd/pkg-deinstall 2011-05-06 22:34:59.000000000 +0400
@@ -4,18 +4,6 @@
exit 0
fi
-USER=ejabberd
-
-echo ""
-
-if pw usershow "${USER}" 2>/dev/null 1>&2; then
- echo "To delete ejabberd user permanently, use 'pw userdel ${USER}'."
-fi
-
-if pw groupshow "${USER}" 2>/dev/null 1>&2; then
- echo "To delete ejabberd group permanently, use 'pw groupdel ${USER}'."
-fi
-
rm -Rf /var/run/ejabberd
cat <<EOF
diff -ruNa ejabberd.orig/pkg-plist ejabberd/pkg-plist
--- ejabberd.orig/pkg-plist 2010-09-30 20:22:15.000000000 +0400
+++ ejabberd/pkg-plist 2011-05-06 22:58:52.000000000 +0400
@@ -1,6 +1,6 @@
-etc/%%PORTNAME%%/%%PORTNAME%%.cfg.example
-etc/%%PORTNAME%%/%%PORTNAME%%ctl.cfg.example
-etc/%%PORTNAME%%/inetrc.example
+%%ETCDIR%%/%%PORTNAME%%.cfg.example
+%%ETCDIR%%/%%PORTNAME%%ctl.cfg.example
+%%ETCDIR%%/inetrc.example
@unexec if cmp -s %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg; then rm -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg; fi
@unexec if cmp -s %D/etc/%%PORTNAME%%/%%PORTNAME%%.defaults.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.defaults; then rm -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.defaults; fi
@unexec if cmp -s %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc; then rm -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc; fi
@@ -9,10 +9,13 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/adhoc.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cache_tab.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cache_tab_sup.beam
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/dynamic_compile.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.app
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_admin.beam
@@ -26,7 +29,9 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_pam.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_c2s.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_c2s_config.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_captcha.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_check.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_commands.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_config.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_ctl.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_frontend_socket.beam
@@ -39,6 +44,7 @@
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
+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
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_router.beam
@@ -48,6 +54,7 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_service.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_socket.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_stun.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sup.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_system_monitor.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_tmp_sup.beam
@@ -58,11 +65,6 @@
%%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
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/dynamic_compile.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejabberd_captcha.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejabberd_commands.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejabberd_piefxis.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejabberd_stun.beam
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
@@ -110,10 +112,12 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pubsub.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pubsub_odbc.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_register.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_register_web.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster_odbc.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_service_log.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster_ldap.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_sic.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_stats.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_time.beam
@@ -141,6 +145,7 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_virtual.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
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_db_odbc.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_index.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_subscription.beam
@@ -159,10 +164,10 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml_stream.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/XmppAddr.hrl
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/adhoc.hrl
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/ejabberd.hrl
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/ejabberd_commands.hrl
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/ejabberd_config.hrl
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/ejabberd_ctl.hrl
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%.hrl
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_commands.hrl
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_config.hrl
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_ctl.hrl
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/eldap/ELDAPv3.hrl
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/eldap/eldap.hrl
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/jlib.hrl
@@ -171,8 +176,8 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/mod_proxy65/mod_proxy65.hrl
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/mod_pubsub/pubsub.hrl
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/mod_roster.hrl
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/ejabberd_http.hrl
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/ejabberd_web_admin.hrl
+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
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/%%PORTNAME%%_zlib_drv.so
@@ -212,6 +217,10 @@
%%PORTDOCS%%%%DOCSDIR%%/guide.html
%%PORTDOCS%%%%DOCSDIR%%/guide.pdf
%%PORTDOCS%%%%DOCSDIR%%/logo.png
+%%PORTDOCS%%%%DOCSDIR%%/msrl-dit-deep.png
+%%PORTDOCS%%%%DOCSDIR%%/msrl-dit-flat.png
+%%PORTDOCS%%%%DOCSDIR%%/msrl-roster-deep.png
+%%PORTDOCS%%%%DOCSDIR%%/msrl-roster-flat.png
%%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.1.txt
%%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.8.txt
%%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.txt
@@ -233,11 +242,11 @@
%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.3.txt
%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.4.txt
%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.5.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.6.txt
%%PORTDOCS%%%%DOCSDIR%%/webadmmain.png
%%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png
%%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png
%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrmtry etc/%%PORTNAME%%
@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs
@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib
@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin
@@ -250,3 +259,4 @@
@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include
@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin
@dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%
+ at dirrmtry %%ETCDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list