18414441 Upgrade ejabberd to 2.13
authorNorm Jacobs <Norm.Jacobs@Sun.COM>
Mon, 17 Mar 2014 16:47:35 -0500
changeset 1761 430c843da2e3
parent 1760 353323c7bdc1
child 1762 318f8ff09ac3
18414441 Upgrade ejabberd to 2.13 18126825 problem in SERVICE/EJABBERD 18414374 problem in SERVICE/EJABBERD
components/ejabberd/Makefile
components/ejabberd/ejabberd.p5m
components/ejabberd/patches/ejabberd-install.patch
--- a/components/ejabberd/Makefile	Mon Mar 17 09:51:44 2014 -0600
+++ b/components/ejabberd/Makefile	Mon Mar 17 16:47:35 2014 -0500
@@ -20,51 +20,50 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
-PATH=/usr/xpg4/bin:/usr/bin
+# for ginstall and tail -n
+PATH=/usr/gnu/bin:/usr/bin
 
 COMPONENT_NAME=		ejabberd
-COMPONENT_VERSION=	2.1.8
+COMPONENT_VERSION=	2.1.13
 COMPONENT_PROJECT_URL=	http://www.ejabberd.im/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:dedf7684f9e96efbbc12f08f175096ef50b3f75b284bd27d172eaf75cecded7f
+    sha256:a80d1c72e435da31758261cb0c04fe750ac71fc3e33a3b606123efd3b3abc86d
 COMPONENT_ARCHIVE_URL=	http://www.process-one.net/downloads/ejabberd/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	service/ejabberd
 
 include ../../make-rules/prep.mk
 
-SRC_OFFSET =	src
-# Now we override paths to .built
-BUILD_DIR_32 = $(BUILD_DIR)/$(MACH32)/$(SRC_OFFSET)
 
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-# tail with -n is needed
-CONFIGURE_ENV += "PATH=/usr/xpg4/bin:/usr/bin"
+CONFIGURE_SCRIPT = $(SOURCE_DIR)/src/configure
+BUILD_DIR_64 =	$(BUILD_DIR)/$(MACH64)/src
+COMPONENT_PRE_CONFIGURE_ACTION = \
+	($(CLONEY) $(SOURCE_DIR) $(BUILD_DIR)/$(MACH64))
 
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS +=	LDFLAGS="$(LDFLAGS)"
 CONFIGURE_OPTIONS +=	--sysconfdir=$(ETCDIR)
 CONFIGURE_OPTIONS +=	--with-erlang=$(USRBINDIR)
 CONFIGURE_OPTIONS +=	--localstatedir=/var
+CONFIGURE_OPTIONS +=	--enable-odbc
 
-COMPONENT_PRE_CONFIGURE_ACTION = \
-	($(CLONEY) $(SOURCE_DIR) $(BUILD_DIR)/$(MACH32))
+COMPONENT_BUILD_TARGETS = all
 
-CONFIGURE_SCRIPT = ./configure
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-build:	$(BUILD_32)
+build:	$(BUILD_64)
 
-install:	$(INSTALL_32)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 
--- a/components/ejabberd/ejabberd.p5m	Mon Mar 17 09:51:44 2014 -0600
+++ b/components/ejabberd/ejabberd.p5m	Mon Mar 17 16:47:35 2014 -0500
@@ -18,100 +18,102 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+<transform file path=usr/lib/ejabberd/.*/.* -> default mode 0444>
+
 set name=pkg.fmri \
     value=pkg:/web/server/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="ejabberd - Jabber/XMPP instant messaging server"
-set name=com.oracle.info.description value="the ejabberd Jabber/XMPP instant messaging server"
+set name=com.oracle.info.description \
+    value="the ejabberd Jabber/XMPP instant messaging server"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Communications"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/340
+set name=org.opensolaris.arc-caseid value=PSARC/2008/340
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-depend fmri=runtime/[email protected] type=require
-
-<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-
-<transform file path=usr/lib/ejabberd/.*/.* -> default mode 0444>
-
-dir path=var/lib/ejabberd owner=daemon group=daemon
-dir path=var/log/ejabberd owner=daemon group=daemon
-
+file path=etc/ejabberd/ejabberd.cfg mode=0644 \
+    original_name=SUNWejabberd:etc/ejabberd/ejabberd.cfg preserve=true
+file path=etc/ejabberd/ejabberdctl.cfg mode=0644 \
+    original_name=SUNWejabberd:etc/ejabberd/ejabberdctl.cfg preserve=true
+file path=etc/ejabberd/inetrc mode=0644 \
+    original_name=SUNWejabberd:etc/ejabberd/inetrc preserve=true
 file auth_attr path=etc/security/auth_attr.d/ejabberd
 file exec_attr path=etc/security/exec_attr.d/ejabberd
 file prof_attr path=etc/security/prof_attr.d/ejabberd
+file xmpp-ejabberd.xml path=lib/svc/manifest/network/xmpp-ejabberd.xml
 file xmpp-ejabberd path=lib/svc/method/xmpp-ejabberd
-file xmpp-ejabberd.xml path=lib/svc/manifest/network/xmpp-ejabberd.xml
-file path=etc/ejabberd/ejabberd.cfg mode=0644 preserve=true original_name=SUNWejabberd:etc/ejabberd/ejabberd.cfg
-file path=etc/ejabberd/ejabberdctl.cfg mode=0644 preserve=true original_name=SUNWejabberd:etc/ejabberd/ejabberdctl.cfg
-file path=etc/ejabberd/inetrc mode=0644 preserve=true original_name=SUNWejabberd:etc/ejabberd/inetrc
+file path=usr/lib/ejabberd/ebin/ELDAPv3.beam
+file path=usr/lib/ejabberd/ebin/XmppAddr.beam
 file path=usr/lib/ejabberd/ebin/acl.beam
 file path=usr/lib/ejabberd/ebin/adhoc.beam
+file path=usr/lib/ejabberd/ebin/cache_tab.beam
 file path=usr/lib/ejabberd/ebin/cache_tab_sup.beam
-file path=usr/lib/ejabberd/ebin/cache_tab.beam
+file path=usr/lib/ejabberd/ebin/cyrsasl.beam
 file path=usr/lib/ejabberd/ebin/cyrsasl_anonymous.beam
 file path=usr/lib/ejabberd/ebin/cyrsasl_digest.beam
 file path=usr/lib/ejabberd/ebin/cyrsasl_plain.beam
-file path=usr/lib/ejabberd/ebin/cyrsasl.beam
+file path=usr/lib/ejabberd/ebin/cyrsasl_scram.beam
 file path=usr/lib/ejabberd/ebin/dynamic_compile.beam
+file path=usr/lib/ejabberd/ebin/ejabberd.app
+file path=usr/lib/ejabberd/ebin/ejabberd.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_admin.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_app.beam
+file path=usr/lib/ejabberd/ebin/ejabberd_auth.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_auth_anonymous.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_auth_external.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_auth_internal.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_auth_ldap.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_auth_odbc.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_auth_pam.beam
-file path=usr/lib/ejabberd/ebin/ejabberd_auth.beam
+file path=usr/lib/ejabberd/ebin/ejabberd_c2s.beam
+file path=usr/lib/ejabberd/ebin/ejabberd_c2s_config.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_captcha.beam
+file path=usr/lib/ejabberd/ebin/ejabberd_check.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_commands.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_config.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_ctl.beam
-file path=usr/lib/ejabberd/ebin/ejabberd_c2s_config.beam
-file path=usr/lib/ejabberd/ebin/ejabberd_c2s.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_frontend_socket.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_hooks.beam
+file path=usr/lib/ejabberd/ebin/ejabberd_http.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_http_bind.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_http_poll.beam
-file path=usr/lib/ejabberd/ebin/ejabberd_http.beam
-file path=usr/lib/ejabberd/ebin/ejabberd_check.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_listener.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_local.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_logger_h.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_loglevel.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_node_groups.beam
+file path=usr/lib/ejabberd/ebin/ejabberd_odbc.beam
+file path=usr/lib/ejabberd/ebin/ejabberd_odbc_sup.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_piefxis.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_rdbms.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_receiver.beam
+file path=usr/lib/ejabberd/ebin/ejabberd_regexp.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_router.beam
+file path=usr/lib/ejabberd/ebin/ejabberd_s2s.beam
+file path=usr/lib/ejabberd/ebin/ejabberd_s2s_in.beam
+file path=usr/lib/ejabberd/ebin/ejabberd_s2s_out.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_service.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_sm.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_socket.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_stun.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_sup.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_system_monitor.beam
-file path=usr/lib/ejabberd/ebin/ejabberd_s2s_in.beam
-file path=usr/lib/ejabberd/ebin/ejabberd_s2s_out.beam
-file path=usr/lib/ejabberd/ebin/ejabberd_s2s.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_tmp_sup.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_update.beam
+file path=usr/lib/ejabberd/ebin/ejabberd_web.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_web_admin.beam
-file path=usr/lib/ejabberd/ebin/ejabberd_web.beam
 file path=usr/lib/ejabberd/ebin/ejabberd_zlib.beam
-file path=usr/lib/ejabberd/ebin/ejabberd.app
-file path=usr/lib/ejabberd/ebin/ejabberd.beam
 file path=usr/lib/ejabberd/ebin/ejd2odbc.beam
+file path=usr/lib/ejabberd/ebin/eldap.beam
+file path=usr/lib/ejabberd/ebin/eldap_filter.beam
 file path=usr/lib/ejabberd/ebin/eldap_filter_yecc.beam
-file path=usr/lib/ejabberd/ebin/eldap_filter.beam
 file path=usr/lib/ejabberd/ebin/eldap_pool.beam
 file path=usr/lib/ejabberd/ebin/eldap_utils.beam
-file path=usr/lib/ejabberd/ebin/eldap.beam
-file path=usr/lib/ejabberd/ebin/ELDAPv3.beam
 file path=usr/lib/ejabberd/ebin/extauth.beam
 file path=usr/lib/ejabberd/ebin/gen_iq_handler.beam
 file path=usr/lib/ejabberd/ebin/gen_mod.beam
@@ -132,87 +134,83 @@
 file path=usr/lib/ejabberd/ebin/mod_http_bind.beam
 file path=usr/lib/ejabberd/ebin/mod_http_fileserver.beam
 file path=usr/lib/ejabberd/ebin/mod_ip_blacklist.beam
+file path=usr/lib/ejabberd/ebin/mod_irc.beam
 file path=usr/lib/ejabberd/ebin/mod_irc_connection.beam
-file path=usr/lib/ejabberd/ebin/mod_irc.beam
-file path=usr/lib/ejabberd/ebin/mod_last_odbc.beam
 file path=usr/lib/ejabberd/ebin/mod_last.beam
+file path=usr/lib/ejabberd/ebin/mod_muc.beam
 file path=usr/lib/ejabberd/ebin/mod_muc_log.beam
 file path=usr/lib/ejabberd/ebin/mod_muc_room.beam
-file path=usr/lib/ejabberd/ebin/mod_muc.beam
-file path=usr/lib/ejabberd/ebin/mod_offline_odbc.beam
 file path=usr/lib/ejabberd/ebin/mod_offline.beam
 file path=usr/lib/ejabberd/ebin/mod_ping.beam
 file path=usr/lib/ejabberd/ebin/mod_pres_counter.beam
-file path=usr/lib/ejabberd/ebin/mod_privacy_odbc.beam
 file path=usr/lib/ejabberd/ebin/mod_privacy.beam
-file path=usr/lib/ejabberd/ebin/mod_private_odbc.beam
 file path=usr/lib/ejabberd/ebin/mod_private.beam
+file path=usr/lib/ejabberd/ebin/mod_proxy65.beam
 file path=usr/lib/ejabberd/ebin/mod_proxy65_lib.beam
 file path=usr/lib/ejabberd/ebin/mod_proxy65_service.beam
 file path=usr/lib/ejabberd/ebin/mod_proxy65_sm.beam
 file path=usr/lib/ejabberd/ebin/mod_proxy65_stream.beam
-file path=usr/lib/ejabberd/ebin/mod_proxy65.beam
+file path=usr/lib/ejabberd/ebin/mod_pubsub.beam
 file path=usr/lib/ejabberd/ebin/mod_pubsub_odbc.beam
-file path=usr/lib/ejabberd/ebin/mod_pubsub.beam
+file path=usr/lib/ejabberd/ebin/mod_register.beam
 file path=usr/lib/ejabberd/ebin/mod_register_web.beam
-file path=usr/lib/ejabberd/ebin/mod_register.beam
-file path=usr/lib/ejabberd/ebin/mod_roster_odbc.beam
 file path=usr/lib/ejabberd/ebin/mod_roster.beam
 file path=usr/lib/ejabberd/ebin/mod_service_log.beam
+file path=usr/lib/ejabberd/ebin/mod_shared_roster.beam
 file path=usr/lib/ejabberd/ebin/mod_shared_roster_ldap.beam
-file path=usr/lib/ejabberd/ebin/mod_shared_roster.beam
 file path=usr/lib/ejabberd/ebin/mod_sic.beam
 file path=usr/lib/ejabberd/ebin/mod_stats.beam
 file path=usr/lib/ejabberd/ebin/mod_time.beam
+file path=usr/lib/ejabberd/ebin/mod_vcard.beam
 file path=usr/lib/ejabberd/ebin/mod_vcard_ldap.beam
-file path=usr/lib/ejabberd/ebin/mod_vcard_odbc.beam
 file path=usr/lib/ejabberd/ebin/mod_vcard_xupdate.beam
-file path=usr/lib/ejabberd/ebin/mod_vcard.beam
 file path=usr/lib/ejabberd/ebin/mod_version.beam
 file path=usr/lib/ejabberd/ebin/node_buddy.beam
 file path=usr/lib/ejabberd/ebin/node_club.beam
 file path=usr/lib/ejabberd/ebin/node_dag.beam
 file path=usr/lib/ejabberd/ebin/node_dispatch.beam
+file path=usr/lib/ejabberd/ebin/node_flat.beam
 file path=usr/lib/ejabberd/ebin/node_flat_odbc.beam
-file path=usr/lib/ejabberd/ebin/node_flat.beam
-file path=usr/lib/ejabberd/ebin/node_hometree_odbc.beam
 file path=usr/lib/ejabberd/ebin/node_hometree.beam
+file path=usr/lib/ejabberd/ebin/node_hometree_odbc.beam
 file path=usr/lib/ejabberd/ebin/node_mb.beam
+file path=usr/lib/ejabberd/ebin/node_pep.beam
 file path=usr/lib/ejabberd/ebin/node_pep_odbc.beam
-file path=usr/lib/ejabberd/ebin/node_pep.beam
 file path=usr/lib/ejabberd/ebin/node_private.beam
 file path=usr/lib/ejabberd/ebin/node_public.beam
 file path=usr/lib/ejabberd/ebin/nodetree_dag.beam
+file path=usr/lib/ejabberd/ebin/nodetree_tree.beam
 file path=usr/lib/ejabberd/ebin/nodetree_tree_odbc.beam
-file path=usr/lib/ejabberd/ebin/nodetree_tree.beam
 file path=usr/lib/ejabberd/ebin/nodetree_virtual.beam
+file path=usr/lib/ejabberd/ebin/odbc_queries.beam
+file path=usr/lib/ejabberd/ebin/p1_fsm.beam
+file path=usr/lib/ejabberd/ebin/p1_mnesia.beam
 file path=usr/lib/ejabberd/ebin/pg2_backport.beam
 file path=usr/lib/ejabberd/ebin/pubsub_db_odbc.beam
 file path=usr/lib/ejabberd/ebin/pubsub_index.beam
+file path=usr/lib/ejabberd/ebin/pubsub_subscription.beam
 file path=usr/lib/ejabberd/ebin/pubsub_subscription_odbc.beam
-file path=usr/lib/ejabberd/ebin/pubsub_subscription.beam
-file path=usr/lib/ejabberd/ebin/p1_fsm.beam
-file path=usr/lib/ejabberd/ebin/p1_mnesia.beam
 file path=usr/lib/ejabberd/ebin/randoms.beam
+file path=usr/lib/ejabberd/ebin/scram.beam
 file path=usr/lib/ejabberd/ebin/sha.beam
 file path=usr/lib/ejabberd/ebin/shaper.beam
+file path=usr/lib/ejabberd/ebin/stringprep.beam
 file path=usr/lib/ejabberd/ebin/stringprep_sup.beam
-file path=usr/lib/ejabberd/ebin/stringprep.beam
 file path=usr/lib/ejabberd/ebin/stun_codec.beam
 file path=usr/lib/ejabberd/ebin/tls.beam
 file path=usr/lib/ejabberd/ebin/translate.beam
 file path=usr/lib/ejabberd/ebin/treap.beam
 file path=usr/lib/ejabberd/ebin/win32_dns.beam
+file path=usr/lib/ejabberd/ebin/xml.beam
 file path=usr/lib/ejabberd/ebin/xml_stream.beam
-file path=usr/lib/ejabberd/ebin/xml.beam
-file path=usr/lib/ejabberd/ebin/XmppAddr.beam
+file path=usr/lib/ejabberd/include/XmppAddr.hrl
 file path=usr/lib/ejabberd/include/adhoc.hrl
+file path=usr/lib/ejabberd/include/ejabberd.hrl
 file path=usr/lib/ejabberd/include/ejabberd_commands.hrl
 file path=usr/lib/ejabberd/include/ejabberd_config.hrl
 file path=usr/lib/ejabberd/include/ejabberd_ctl.hrl
-file path=usr/lib/ejabberd/include/ejabberd.hrl
+file path=usr/lib/ejabberd/include/eldap/ELDAPv3.hrl
 file path=usr/lib/ejabberd/include/eldap/eldap.hrl
-file path=usr/lib/ejabberd/include/eldap/ELDAPv3.hrl
 file path=usr/lib/ejabberd/include/jlib.hrl
 file path=usr/lib/ejabberd/include/mod_muc/mod_muc_room.hrl
 file path=usr/lib/ejabberd/include/mod_privacy.hrl
@@ -222,8 +220,7 @@
 file path=usr/lib/ejabberd/include/web/ejabberd_http.hrl
 file path=usr/lib/ejabberd/include/web/ejabberd_web_admin.hrl
 file path=usr/lib/ejabberd/include/web/http_bind.hrl
-file path=usr/lib/ejabberd/include/XmppAddr.hrl
-file path=usr/lib/ejabberd/priv/bin/captcha.sh
+file path=usr/lib/ejabberd/priv/bin/captcha.sh mode=0555
 file path=usr/lib/ejabberd/priv/lib/ejabberd_zlib_drv.so
 file path=usr/lib/ejabberd/priv/lib/expat_erl.so
 file path=usr/lib/ejabberd/priv/lib/iconv_erl.so
@@ -238,6 +235,7 @@
 file path=usr/lib/ejabberd/priv/msgs/es.msg
 file path=usr/lib/ejabberd/priv/msgs/fr.msg
 file path=usr/lib/ejabberd/priv/msgs/gl.msg
+file path=usr/lib/ejabberd/priv/msgs/he.msg
 file path=usr/lib/ejabberd/priv/msgs/id.msg
 file path=usr/lib/ejabberd/priv/msgs/it.msg
 file path=usr/lib/ejabberd/priv/msgs/ja.msg
@@ -260,15 +258,14 @@
 file path=usr/share/doc/ejabberd/dev.html
 file path=usr/share/doc/ejabberd/discorus.png
 file path=usr/share/doc/ejabberd/guide.html
-file path=usr/share/doc/ejabberd/guide.pdf
 file path=usr/share/doc/ejabberd/logo.png
 file path=usr/share/doc/ejabberd/msrl-dit-deep.png
 file path=usr/share/doc/ejabberd/msrl-dit-flat.png
 file path=usr/share/doc/ejabberd/msrl-roster-deep.png
 file path=usr/share/doc/ejabberd/msrl-roster-flat.png
-file path=usr/share/doc/ejabberd/release_notes_0.9.txt
 file path=usr/share/doc/ejabberd/release_notes_0.9.1.txt
 file path=usr/share/doc/ejabberd/release_notes_0.9.8.txt
+file path=usr/share/doc/ejabberd/release_notes_0.9.txt
 file path=usr/share/doc/ejabberd/release_notes_1.0.0.txt
 file path=usr/share/doc/ejabberd/release_notes_1.1.0.txt
 file path=usr/share/doc/ejabberd/release_notes_1.1.1.txt
@@ -283,6 +280,10 @@
 file path=usr/share/doc/ejabberd/release_notes_2.0.5.txt
 file path=usr/share/doc/ejabberd/release_notes_2.1.0.txt
 file path=usr/share/doc/ejabberd/release_notes_2.1.1.txt
+file path=usr/share/doc/ejabberd/release_notes_2.1.10.txt
+file path=usr/share/doc/ejabberd/release_notes_2.1.11.txt
+file path=usr/share/doc/ejabberd/release_notes_2.1.12.txt
+file path=usr/share/doc/ejabberd/release_notes_2.1.13.txt
 file path=usr/share/doc/ejabberd/release_notes_2.1.2.txt
 file path=usr/share/doc/ejabberd/release_notes_2.1.3.txt
 file path=usr/share/doc/ejabberd/release_notes_2.1.4.txt
@@ -290,8 +291,11 @@
 file path=usr/share/doc/ejabberd/release_notes_2.1.6.txt
 file path=usr/share/doc/ejabberd/release_notes_2.1.7.txt
 file path=usr/share/doc/ejabberd/release_notes_2.1.8.txt
+file path=usr/share/doc/ejabberd/release_notes_2.1.9.txt
 file path=usr/share/doc/ejabberd/webadmmain.png
 file path=usr/share/doc/ejabberd/webadmmainru.png
 file path=usr/share/doc/ejabberd/yozhikheader.png
-
-license COPYING license="GPLv2"
+dir  path=var/lib/ejabberd owner=daemon group=daemon
+dir  path=var/log/ejabberd owner=daemon group=daemon
+license COPYING license=GPLv2
+depend type=require fmri=runtime/[email protected]
--- a/components/ejabberd/patches/ejabberd-install.patch	Mon Mar 17 09:51:44 2014 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
---- ejabberd-2.1.8/src/Makefile.in	Mon Jun  6 12:24:32 2011
-+++ ejabberd-2.1.8-patch/src/Makefile.in	Thu Jun 16 14:54:13 2011
[email protected]@ -74,1 +74,1 @@
--  INSTALL_EPAM=install -m 750 $(O_USER) epam $(PBINDIR)
-+  INSTALL_EPAM=ginstall -m 750 $(O_USER) epam $(PBINDIR)
[email protected]@ -186,1 +186,1 @@
--	install -d -m 750 $(G_USER) $(ETCDIR)
-+	ginstall -d -m 750 $(G_USER) $(ETCDIR)
[email protected]@ -188,2 +188,2 @@
--		&& 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
-+		&& ginstall -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \
-+		|| ginstall -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
[email protected]@ -198,4 +198,4 @@
--	[ -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
-+	[ -f $(ETCDIR)/ejabberd/ejabberdctl.cfg ] \
-+		&& ginstall -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
-+		|| ginstall -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
-+	ginstall -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
[email protected]@ -204,2 +204,2 @@
--	[ -d $(SBINDIR) ] || install -d -m 755 $(SBINDIR)
--	install -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
-+	[ -d $(SBINDIR) ] || ginstall -d -m 755 $(SBINDIR)
-+	ginstall -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
[email protected]@ -214,3 +214,3 @@
--	install -d $(BEAMDIR)
--	install -m 644 *.app $(BEAMDIR)
--	install -m 644 *.beam $(BEAMDIR)
-+	ginstall -d $(BEAMDIR)
-+	ginstall -m 644 *.app $(BEAMDIR)
-+	ginstall -m 644 *.beam $(BEAMDIR)
[email protected]@ -220,12 +220,12 @@
--	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/
-+	ginstall -d $(INCLUDEDIR)
-+	ginstall -m 644 *.hrl $(INCLUDEDIR)
-+	ginstall -d $(INCLUDEDIR)/eldap/
-+	ginstall -m 644 eldap/*.hrl $(INCLUDEDIR)/eldap/
-+	ginstall -d $(INCLUDEDIR)/mod_muc/
-+	ginstall -m 644 mod_muc/*.hrl $(INCLUDEDIR)/mod_muc/
-+	ginstall -d $(INCLUDEDIR)/mod_proxy65/
-+	ginstall -m 644 mod_proxy65/*.hrl $(INCLUDEDIR)/mod_proxy65/
-+	ginstall -d $(INCLUDEDIR)/mod_pubsub/
-+	ginstall -m 644 mod_pubsub/*.hrl $(INCLUDEDIR)/mod_pubsub/
-+	ginstall -d $(INCLUDEDIR)/web/
-+	ginstall -m 644 web/*.hrl $(INCLUDEDIR)/web/
[email protected]@ -234,2 +234,2 @@
--	install -d $(PBINDIR)
--	install -m 750 $(O_USER) ../tools/captcha.sh $(PBINDIR)
-+	ginstall -d $(PBINDIR)
-+	ginstall -m 750 $(O_USER) ../tools/captcha.sh $(PBINDIR)
[email protected]@ -239,2 +239,2 @@
--	install -d $(SODIR)
--	install -m 644 *.so $(SODIR)
-+	ginstall -d $(SODIR)
-+	ginstall -m 644 *.so $(SODIR)
[email protected]@ -243,2 +243,2 @@
--	install -d $(MSGSDIR)
--	install -m 644 msgs/*.msg $(MSGSDIR)
-+	ginstall -d $(MSGSDIR)
-+	ginstall -m 644 msgs/*.msg $(MSGSDIR)
[email protected]@ -247,1 +247,1 @@
--	install -d -m 750 $(O_USER) $(SPOOLDIR)
-+	ginstall -d -m 750 $(O_USER) $(SPOOLDIR)
[email protected]@ -253,1 +253,1 @@
--	install -d -m 750 $(O_USER) $(CTLLOCKDIR)
-+	ginstall -d -m 750 $(O_USER) $(CTLLOCKDIR)
[email protected]@ -258,1 +258,1 @@
--	install -d -m 750 $(O_USER) $(LOGDIR)
-+	ginstall -d -m 750 $(O_USER) $(LOGDIR)
[email protected]@ -263,5 +263,5 @@
--	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)
-+	ginstall -d $(DOCDIR)
-+	ginstall -m 644 ../doc/dev.html $(DOCDIR)
-+	ginstall -m 644 ../doc/guide.html $(DOCDIR)
-+	ginstall -m 644 ../doc/*.png $(DOCDIR)
-+	ginstall -m 644 ../doc/*.txt $(DOCDIR)
[email protected]@ -269,1 +269,1 @@
--		&& install -m 644 ../doc/guide.pdf $(DOCDIR) \
-+		&& ginstall -m 644 ../doc/guide.pdf $(DOCDIR) \
[email protected]@ -271,1 +271,1 @@
--	install -m 644 ../COPYING $(DOCDIR)
-+	ginstall -m 644 ../COPYING $(DOCDIR)