# HG changeset patch # User Milan Jurik # Date 1309386817 25200 # Node ID d9644516b4a8948fb1092baa5d0e4b78ff472d42 # Parent 1c4e9d92420b4acbc2d94bba0827a988a8440fd8 7056173 move ejabberd to userland 6999165 Update ejabberd to ejabberd 2.1.8 6944459 Problem with utility/ejabberd diff -r 1c4e9d92420b -r d9644516b4a8 components/ejabberd/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ejabberd/Makefile Wed Jun 29 15:33:37 2011 -0700 @@ -0,0 +1,68 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# + +include ../../make-rules/shared-macros.mk + +PATH=/usr/xpg4/bin:/usr/bin + +COMPONENT_NAME= ejabberd +COMPONENT_VERSION= 2.1.8 +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= sha1:3f8ecc944e0719577bfc45a68e974b1945ffa296 +COMPONENT_ARCHIVE_URL= http://www.process-one.net/downloads/ejabberd/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) + +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_OPTIONS += CFLAGS="$(CFLAGS)" +CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)" +CONFIGURE_OPTIONS += --sysconfdir=$(ETCDIR) +CONFIGURE_OPTIONS += --with-erlang=$(USRBINDIR) +CONFIGURE_OPTIONS += --localstatedir=/var + +COMPONENT_PRE_CONFIGURE_ACTION = \ + ($(CLONEY) $(SOURCE_DIR) $(BUILD_DIR)/$(MACH32)) + +CONFIGURE_SCRIPT = ./configure + +build: $(BUILD_32) + +install: $(INSTALL_32) + +test: $(NO_TESTS) + +BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) + +include ../../make-rules/depend.mk diff -r 1c4e9d92420b -r d9644516b4a8 components/ejabberd/auth_attr --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ejabberd/auth_attr Wed Jun 29 15:33:37 2011 -0700 @@ -0,0 +1,2 @@ +solaris.smf.value.ejabberd:::Change ejabberd value properties:: +solaris.smf.manage.ejabberd:::Manage ejabberd service states:: diff -r 1c4e9d92420b -r d9644516b4a8 components/ejabberd/ejabberd.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ejabberd/ejabberd.p5m Wed Jun 29 15:33:37 2011 -0700 @@ -0,0 +1,337 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# + +set name=pkg.fmri \ + value=pkg:/web/server/ejabberd@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary value="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=http://www.ejabberd.im/ +set name=opensolaris.arc_url \ + value=http://arc.opensolaris.org/caselog/PSARC/2008/340 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) + +depend fmri=runtime/erlang@12.1.1-0.151.0.1 type=require + + default mangler.man.stability uncommitted> + + default mode 0444> + +dir path=etc +dir path=etc/ejabberd +dir path=etc/security +dir path=etc/security/auth_attr.d +dir path=etc/security/exec_attr.d +dir path=etc/security/prof_attr.d +dir path=lib +dir path=lib/svc +dir path=lib/svc/manifest +dir path=lib/svc/manifest/network +dir path=lib/svc/method +dir path=usr +dir path=usr/lib +dir path=usr/lib/ejabberd +dir path=usr/lib/ejabberd/ebin +dir path=usr/lib/ejabberd/include +dir path=usr/lib/ejabberd/include/eldap +dir path=usr/lib/ejabberd/include/mod_muc +dir path=usr/lib/ejabberd/include/mod_proxy65 +dir path=usr/lib/ejabberd/include/mod_pubsub +dir path=usr/lib/ejabberd/include/web +dir path=usr/lib/ejabberd/priv +dir path=usr/lib/ejabberd/priv/bin +dir path=usr/lib/ejabberd/priv/lib +dir path=usr/lib/ejabberd/priv/msgs +dir path=usr/sbin +dir path=usr/share +dir path=usr/share/doc +dir path=usr/share/doc/ejabberd +dir path=usr/share/man +dir path=usr/share/man/man1m +dir path=var +dir path=var/lib +dir path=var/lib/ejabberd owner=daemon group=daemon +dir path=var/log +dir path=var/log/ejabberd owner=daemon group=daemon + +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 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/acl.beam +file path=usr/lib/ejabberd/ebin/adhoc.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_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/dynamic_compile.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_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_captcha.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_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_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_router.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_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_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 +file path=usr/lib/ejabberd/ebin/gen_pubsub_node.beam +file path=usr/lib/ejabberd/ebin/gen_pubsub_nodetree.beam +file path=usr/lib/ejabberd/ebin/iconv.beam +file path=usr/lib/ejabberd/ebin/idna.beam +file path=usr/lib/ejabberd/ebin/jd2ejd.beam +file path=usr/lib/ejabberd/ebin/jlib.beam +file path=usr/lib/ejabberd/ebin/mod_adhoc.beam +file path=usr/lib/ejabberd/ebin/mod_announce.beam +file path=usr/lib/ejabberd/ebin/mod_blocking.beam +file path=usr/lib/ejabberd/ebin/mod_caps.beam +file path=usr/lib/ejabberd/ebin/mod_configure.beam +file path=usr/lib/ejabberd/ebin/mod_configure2.beam +file path=usr/lib/ejabberd/ebin/mod_disco.beam +file path=usr/lib/ejabberd/ebin/mod_echo.beam +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_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_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_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_odbc.beam +file path=usr/lib/ejabberd/ebin/mod_pubsub.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_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_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_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_mb.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_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/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_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/sha.beam +file path=usr/lib/ejabberd/ebin/shaper.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_stream.beam +file path=usr/lib/ejabberd/ebin/xml.beam +file path=usr/lib/ejabberd/ebin/XmppAddr.beam +file path=usr/lib/ejabberd/include/adhoc.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/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 +file path=usr/lib/ejabberd/include/mod_proxy65/mod_proxy65.hrl +file path=usr/lib/ejabberd/include/mod_pubsub/pubsub.hrl +file path=usr/lib/ejabberd/include/mod_roster.hrl +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/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 +file path=usr/lib/ejabberd/priv/lib/sha_drv.so +file path=usr/lib/ejabberd/priv/lib/stringprep_drv.so +file path=usr/lib/ejabberd/priv/lib/tls_drv.so +file path=usr/lib/ejabberd/priv/msgs/ca.msg +file path=usr/lib/ejabberd/priv/msgs/cs.msg +file path=usr/lib/ejabberd/priv/msgs/de.msg +file path=usr/lib/ejabberd/priv/msgs/el.msg +file path=usr/lib/ejabberd/priv/msgs/eo.msg +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/id.msg +file path=usr/lib/ejabberd/priv/msgs/it.msg +file path=usr/lib/ejabberd/priv/msgs/ja.msg +file path=usr/lib/ejabberd/priv/msgs/nl.msg +file path=usr/lib/ejabberd/priv/msgs/no.msg +file path=usr/lib/ejabberd/priv/msgs/pl.msg +file path=usr/lib/ejabberd/priv/msgs/pt-br.msg +file path=usr/lib/ejabberd/priv/msgs/pt.msg +file path=usr/lib/ejabberd/priv/msgs/ru.msg +file path=usr/lib/ejabberd/priv/msgs/sk.msg +file path=usr/lib/ejabberd/priv/msgs/sv.msg +file path=usr/lib/ejabberd/priv/msgs/th.msg +file path=usr/lib/ejabberd/priv/msgs/tr.msg +file path=usr/lib/ejabberd/priv/msgs/uk.msg +file path=usr/lib/ejabberd/priv/msgs/vi.msg +file path=usr/lib/ejabberd/priv/msgs/wa.msg +file path=usr/lib/ejabberd/priv/msgs/zh.msg +file path=usr/sbin/ejabberdctl +file path=usr/share/doc/ejabberd/COPYING +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_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 +file path=usr/share/doc/ejabberd/release_notes_1.1.2.txt +file path=usr/share/doc/ejabberd/release_notes_1.1.3.txt +file path=usr/share/doc/ejabberd/release_notes_1.1.4.txt +file path=usr/share/doc/ejabberd/release_notes_2.0.0.txt +file path=usr/share/doc/ejabberd/release_notes_2.0.1.txt +file path=usr/share/doc/ejabberd/release_notes_2.0.2.txt +file path=usr/share/doc/ejabberd/release_notes_2.0.3.txt +file path=usr/share/doc/ejabberd/release_notes_2.0.4.txt +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.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 +file path=usr/share/doc/ejabberd/release_notes_2.1.5.txt +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/webadmmain.png +file path=usr/share/doc/ejabberd/webadmmainru.png +file path=usr/share/doc/ejabberd/yozhikheader.png + +legacy pkg=SUNWejabberdr \ + name="ejabberd - Jabber/XMPP instant messaging server (Root)" \ + desc="ejabberd Jabber/XMPP instant messaging server" +legacy pkg=SUNWejabberdu \ + name="ejabberd - Jabber/XMPP instant messaging server (Usr)" \ + desc="ejabberd Jabber/XMPP instant messaging server" + +license COPYING license="GPLv2" diff -r 1c4e9d92420b -r d9644516b4a8 components/ejabberd/ejabberdctl.1m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ejabberd/ejabberdctl.1m Wed Jun 29 15:33:37 2011 -0700 @@ -0,0 +1,198 @@ +.TH ejabberdctl 1M "18 March 2008" "Version 2.0.5" "ejabberdctl" + +.SH NAME +ejabberdctl \(em ejabberd Jabber/XMPP server control interface + +.SH SYNOPSIS +.PP +\fBejabberdctl\fR \fI[--node node] [vhost server] command [options]\fP + +.SH DESCRIPTION +.PP +\fBejabberd\fR is packaged as a SMF service on OpenSolaris, and should +be started and stopped using SMF. Its service name is: + + svc:/network/xmpp:ejabberd + +\fBejabberdctl\fR can be used to debug \fBejabberd\fR server, and +perform many other administrative tasks. + +User should have Ejabberd Management profile to manage \fBejabberd\fR +service and to run \fBejabberdctl\fR command, otherwise there would be +cookie file access permission issue. + +.SH OPTIONS +.TP +.BI \-\-node " node" +Specifies the erlang node on which command will be performed. Default +value is ejabberd@localhost. Node name has the following syntax: + + name\fI@\fPhost + +host can either be a short hostname (usually it coincides with +\fI\(gahostname\(ga\fP) or a FQDN (see \fBerl\fR(1) manual page +and look for options \fI-name\fP and \fI-sname\fP for details). + +If the node name does not contain symbol \fI@\fP, then a short hostname +(that is, \fI\(gahostname\(ga\fP) is appended by \fBerlang\fR +runtime system automatically. + +.TP +.BI vhost " server" +Specifies the virtual host \fIserver\fP for which command will be +executed. There are only few commands that needs \fIvhost\fP argument. + +.SH COMMANDS +.TP +.BI start +Start an ejabberd node in background mode. This is the default method. + +.TP +.BI live +Start an ejabberd node in live(interactive) mode. An erlang shell is +attached to the started server, showing log messages and allowing to +execute interactive commands. + +.TP +.BI debug +Attach an interactive Erlang shell to a running ejabberd node. This allows +to execute commands interactively on a running ejabberd server. To detach +it, press Ctrl+G, q, . + +.TP +.BI stop +Stop ejabberd server and shut down the node. + +.TP +.BI restart +Restart ejabberd server. + +.TP +.BI status +Get ejabberd server status. + +.TP +.BI reopen-log +Request ejabberd server to reopen its log file. + +.TP +.BI register " user server password" +Register a \fIuser\fP with \fIpassword\fP for a virtual \fIserver\fP. + +.TP +.BI unregister " user server" +Unregister \fIuser\fP from virtual \fIserver\fP. + +.TP +.BI backup " file" +Backup ejabberd user database to a \fIfile\fP. + +.TP +.BI restore " file" +Restore ejabberd user database from backup \fIfile\fP. + +.TP +.BI install-fallback " file" +Install a database fallback from \fIfile\fP. + +.TP +.BI dump " file" +Dump ejabberd user database to a text \fIfile\fP. + +.TP +.BI load " file" +Restore ejabberd user database from a text \fIfile\fP. + +.TP +.BI import-file " file" +Import user data from jabberd 1.4 spool \fIfile\fP. For example, if +\fIfile\fP is \fI.../example.org/user.xml\fP then imported username +will be \fIuser\fP and it will be imported to virtual server +\fIexample.org\fP. + +.TP +.BI import-dir " dir" +Import user data from jabberd 1.4 spool \fIdir\fP. Directory +name should be the name of virtual server to import users. + +.TP +.BI delete-expired-messages +Delete expired offline messages from database. + +.TP +.BI delete-old-messages n +Delete offline messages older than \fIn\fP days from database. + +.TP +.BI mnesia [info] +Show informatoin of Mnesia system. + +.TP +.BI incoming-s2s-number +Print number of incoming s2s connections on the node + +.TP +.BI outgoing-s2s-number +Print number of outgoing s2s connections on the node + +.TP +.BI user-resources " user server" +List all connected resources of user \fIuser@server\fP. + +.TP +.BI connected-users-number +Report number of established users' sessions. + +.TP +.BI connected-users +List all established users' sessions. + +.PP +The following commands are vhost specific: + +.TP +.BI registered-users +List all registered users for specified virtual \fIserver\fP. + +.SH OPTION FILES +.PP + +.TP +.BI --config file +Config file for ejabberd. Default is /etc/ejabberd/ejabberd.cfg. + +.TP +.BI --ctl-config file +Config file for ejabberdctl. Default is /etc/ejabberd/ejabberdctl.cfg. + +.TP +.BI --logs dir +Directory for log files. Default is /var/ejabberd/log. + +.TP +.BI --spool dir +Database spool dir. Default is /var/ejabberd/db/ejabberd. + +.SH SEE ALSO +.PP +\fBerl\fR(1), \fBmnesia\fR(3). + +.PP +Ejabberd documentation is available at +\fIhttp://www.process-one.net/en/projects/ejabberd/\fP. + +.SH AUTHORS +.PP +This manual page was adapted by Sergei Golovan for +the \fBDebian\fP system (but may be used by others) from the +\fBejabberd\fP documentation written by Alexey Shchepin . + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU General Public License, Version 2 any +later version published by the Free Software Foundation. + +The complete text of the GNU General Public License can be found +at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. + +The manual page was modified for ejabberd-2.0.5 on OpenSolaris. + diff -r 1c4e9d92420b -r d9644516b4a8 components/ejabberd/exec_attr --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ejabberd/exec_attr Wed Jun 29 15:33:37 2011 -0700 @@ -0,0 +1,1 @@ +Ejabberd Administration:solaris:cmd:RO::/usr/sbin/ejabberdctl:uid=daemon;gid=daemon diff -r 1c4e9d92420b -r d9644516b4a8 components/ejabberd/patches/ejabberd-install.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ejabberd/patches/ejabberd-install.patch Wed Jun 29 15:33:37 2011 -0700 @@ -0,0 +1,100 @@ +--- 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 +@@ -74,1 +74,1 @@ +- INSTALL_EPAM=install -m 750 $(O_USER) epam $(PBINDIR) ++ INSTALL_EPAM=ginstall -m 750 $(O_USER) epam $(PBINDIR) +@@ -186,1 +186,1 @@ +- install -d -m 750 $(G_USER) $(ETCDIR) ++ ginstall -d -m 750 $(G_USER) $(ETCDIR) +@@ -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 +@@ -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 +@@ -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 +@@ -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) +@@ -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/ +@@ -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) +@@ -239,2 +239,2 @@ +- install -d $(SODIR) +- install -m 644 *.so $(SODIR) ++ ginstall -d $(SODIR) ++ ginstall -m 644 *.so $(SODIR) +@@ -243,2 +243,2 @@ +- install -d $(MSGSDIR) +- install -m 644 msgs/*.msg $(MSGSDIR) ++ ginstall -d $(MSGSDIR) ++ ginstall -m 644 msgs/*.msg $(MSGSDIR) +@@ -247,1 +247,1 @@ +- install -d -m 750 $(O_USER) $(SPOOLDIR) ++ ginstall -d -m 750 $(O_USER) $(SPOOLDIR) +@@ -253,1 +253,1 @@ +- install -d -m 750 $(O_USER) $(CTLLOCKDIR) ++ ginstall -d -m 750 $(O_USER) $(CTLLOCKDIR) +@@ -258,1 +258,1 @@ +- install -d -m 750 $(O_USER) $(LOGDIR) ++ ginstall -d -m 750 $(O_USER) $(LOGDIR) +@@ -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) +@@ -269,1 +269,1 @@ +- && install -m 644 ../doc/guide.pdf $(DOCDIR) \ ++ && ginstall -m 644 ../doc/guide.pdf $(DOCDIR) \ +@@ -271,1 +271,1 @@ +- install -m 644 ../COPYING $(DOCDIR) ++ ginstall -m 644 ../COPYING $(DOCDIR) diff -r 1c4e9d92420b -r d9644516b4a8 components/ejabberd/prof_attr --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ejabberd/prof_attr Wed Jun 29 15:33:37 2011 -0700 @@ -0,0 +1,1 @@ +Ejabberd Administration:RO::Ejabberd Service Administration:auths=solaris.smf.manage.ejabberd,solaris.smf.value.ejabberd diff -r 1c4e9d92420b -r d9644516b4a8 components/ejabberd/xmpp-ejabberd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/ejabberd/xmpp-ejabberd Wed Jun 29 15:33:37 2011 -0700 @@ -0,0 +1,66 @@ +#! /usr/bin/ksh93 +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +# + +# wait_until