Bump revision with a whole new ebuild, thanks to the folks in bug #207586

(Portage version: 2.1.4.4)

6 files changed, 169 insertions, 27 deletions

diff --git a/net-im/ejabberd/files/2.0.0-ejab-542-mod_proxy65.patch b/net-im/ejabberd/files/2.0.0-ejab-542-mod_proxy65.patch
new file mode 100644
index 000000000000..6cc3bc815a56
--- /dev/null
+++ b/net-im/ejabberd/files/2.0.0-ejab-542-mod_proxy65.patch
@@ -0,0 +1,12 @@
+--- ejabberd-2.0.0/src/mod_proxy65/mod_proxy65_service.erl.original	2008-04-11 00:10:26.000000000 +0100
++++ ejabberd-2.0.0/src/mod_proxy65/mod_proxy65_service.erl	2008-04-11 00:11:12.000000000 +0100
+@@ -201,7 +201,7 @@
+ 	         none -> get_proxy_or_domainip(ServerHost, MyHost);
+ 	         Addr -> Addr
+ 	     end,
+-    [_ | StrIP] = lists:append([[$. | integer_to_list(X)] || X <- inet:ip_to_bytes(IP)]),
++    StrIP = inet_parse:ntoa(IP),
+     StreamAddr = [{"jid", MyHost}, {"host", StrIP}, {"port", integer_to_list(Port)}],
+     {IP, #state{myhost      = MyHost,
+ 		serverhost  = ServerHost,
+
diff --git a/net-im/ejabberd/files/2.0.0-erlang12-s2s-in.patch b/net-im/ejabberd/files/2.0.0-erlang12-s2s-in.patch
new file mode 100644
index 000000000000..68cc69810056
--- /dev/null
+++ b/net-im/ejabberd/files/2.0.0-erlang12-s2s-in.patch
@@ -0,0 +1,35 @@
+--- ejabberd-2.0.0/src/ejabberd_s2s_in.erl.original	2008-02-21 10:02:12.000000000 +0000
++++ ejabberd-2.0.0/src/ejabberd_s2s_in.erl	2008-04-08 18:00:04.000000000 +0100
+@@ -50,9 +50,13 @@
+ -include("jlib.hrl").
+ -ifdef(SSL39).
+ -include_lib("ssl/include/ssl_pkix.hrl").
++-define(PKIXEXPLICIT, 'OTP-PKIX').
++-define(PKIXIMPLICIT, 'OTP-PKIX').
+ -else.
+ -include_lib("ssl/include/PKIX1Explicit88.hrl").
+ -include_lib("ssl/include/PKIX1Implicit88.hrl").
++-define(PKIXEXPLICIT, 'PKIX1Explicit88').
++-define(PKIXIMPLICIT, 'PKIX1Implicit88').
+ -endif.
+ -include("XmppAddr.hrl").
+ 
+@@ -603,7 +607,7 @@
+     lists:flatmap(
+       fun(#'AttributeTypeAndValue'{type = ?'id-at-commonName',
+ 				   value = Val}) ->
+-	      case 'PKIX1Explicit88':decode('X520CommonName', Val) of
++	      case ?PKIXEXPLICIT:decode('X520CommonName', Val) of
+ 		  {ok, {_, D1}} ->
+ 		      D = if
+ 			      is_list(D1) -> D1;
+@@ -637,7 +641,7 @@
+ 			     is_binary(Val) -> Val;
+ 			     true -> Val
+ 			 end,
+-		  case 'PKIX1Implicit88':decode('SubjectAltName', BVal) of
++		  case ?PKIXIMPLICIT:decode('SubjectAltName', BVal) of
+ 		      {ok, SANs} ->
+ 			  lists:flatmap(
+ 			    fun({otherName,
+
diff --git a/net-im/ejabberd/files/ejabberd-2.0.0.confd b/net-im/ejabberd/files/ejabberd-2.0.0.confd
new file mode 100644
index 000000000000..6399d27d2473
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-2.0.0.confd
@@ -0,0 +1,23 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.0.confd,v 1.1 2008/04/13 12:27:10 caleb Exp $
+
+# Name of your ejabberd node. Used by ejabberdctl to determine which
+# node to communicate with.
+EJABBERD_NODE="ejabberd@`hostname -s`"
+
+# Max number of open network connections. Default is 1024. Increasing
+# this will slightly increase memory usage.
+#ERL_MAX_PORTS=1024
+
+# Return memory to the system after using it, instead of keeping it
+# allocated for future use. Decreases the memory required by ejabberd,
+# but makes it run slower.  Default is unset, set to any value to
+# activate.
+#ERL_FULLSWEEP_AFTER=0
+
+# set to 1, "true" or "yes" if you have a symmetric-multi-processor
+# default is non smp
+#HAVE_SMP=0
+
+
diff --git a/net-im/ejabberd/files/ejabberd-2.0.0.initd b/net-im/ejabberd/files/ejabberd-2.0.0.initd
index c16b849602dd..1b351c464241 100644
--- a/net-im/ejabberd/files/ejabberd-2.0.0.initd
+++ b/net-im/ejabberd/files/ejabberd-2.0.0.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.0.initd,v 1.1 2008/02/05 13:27:45 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-2.0.0.initd,v 1.2 2008/04/13 12:27:10 caleb Exp $
 
 opts="${opts} reload"
 
@@ -13,7 +13,7 @@ depend() {
 
 checkconfig() {
 	if [ ! -e /etc/jabber/ejabberd.cfg ] ; then
-		eerror "You need an /etc/jabber/ejabberd.cfg file to run ejabberd"
+		eerror "You need a /etc/jabber/ejabberd.cfg file to run ejabberd"
 		return 1
 	fi
 }
@@ -21,8 +21,21 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting eJabberd"
+	# the process name of beam is different depending whether smp is used.
+	# set it explicitly so start-stop-daemon works
+	case "$HAVE_SMP" in
+		"1"|"true"|"yes")
+			BEAMNAME="beam.smp"
+			SMPOPT="enable"
+		;;
+		*)
+			BEAMNAME="beam"
+			SMPOPT="disable"
+		;;
+	esac
 	start-stop-daemon --start --quiet --chuid jabber:jabber \
-		--exec /usr/bin/env HOME=/var/run/jabber /usr/bin/ejabberd -- -noshell -detached
+		--name $BEAMNAME \
+		--exec /usr/sbin/ejabberd -- -detached -noinput -smp $SMPOPT
 	eend $?
 	# For bug #190266
 	chown jabber:jabber /var/run/jabber/.erlang.cookie
@@ -30,33 +43,13 @@ start() {
 
 stop() {
 	ebegin "Stopping eJabberd"
-	if [ -z "$EJABBERD_NODE" ];
-	then
-		EJABBERD_NODE="ejabberd@`hostname -s`"
-	fi
-	/usr/bin/ejabberdctl $EJABBERD_NODE stop
-	eend $?
-}
-
-# Work around a bug in /sbin/runscript.sh - it won't run our custom
-# restart() unless it finds these two strings in the file.
-# svc_start svc_stop
-restart() {
-	ebegin "Restarting eJabberd"
-	if [ -z "$EJABBERD_NODE" ];
-	then
-		EJABBERD_NODE="ejabberd@`hostname -s`"
-	fi
-	/usr/bin/ejabberdctl $EJABBERD_NODE restart
+	/usr/sbin/ejabberdctl stop
 	eend $?
 }
 
 reload() {
 	ebegin "Reloading eJabberd"
-	if [ -z "$EJABBERD_NODE" ];
-	then
-		EJABBERD_NODE="ejabberd@`hostname -s`"
-	fi
-	/usr/bin/ejabberdctl $EJABBERD_NODE reopen-log
+	/usr/sbin/ejabberdctl reopen-log
 	eend $?
 }
+
diff --git a/net-im/ejabberd/files/ejabberd-wrapper-2.0.0.template b/net-im/ejabberd/files/ejabberd-wrapper-2.0.0.template
new file mode 100644
index 000000000000..89f3ff4824e3
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-wrapper-2.0.0.template
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+[ -f /etc/conf.d/ejabberd ] && . /etc/conf.d/ejabberd
+
+# provide some default configuration
+ERL=/usr/bin/erl
+CONFIG=/etc/jabber/ejabberd.cfg
+INETRC=/etc/jabber/inetrc
+LOG_PATH=/var/log/jabber/ejabberd.log
+SASL_LOG=/var/log/jabber/sasl.log
+SPOOL=/var/spool/jabber
+
+ARGS=
+while [ $# -ne 0 ] ; do
+    PARAM=$1
+    shift
+    case $PARAM in
+	--) break ;;
+	--node) EJABBERD_NODE=$1; shift ;;
+	--config) CONFIG=$1 ; shift ;;
+	--log) LOG_PATH=$1 ; shift ;;
+	--sasl-log) SASL_LOG=$1 ; shift ;;
+	--spool) SPOOL=$1 ; shift ;;
+	*) ARGS="$ARGS $PARAM" ;;
+    esac
+done
+
+if [ "$EJABBERD_NODE" = "${EJABBERD_NODE%.*}" ] ; then
+    SNAME=-sname
+else
+    SNAME=-name
+fi
+
+# export ejabberd configuration environment variables
+export HOME=/var/run/jabber
+export EJABBERD_EBIN=/usr/@libdir@/erlang/lib/ejabberd-@version@/ebin
+export EJABBERD_MSGS_PATH=/usr/@libdir@/erlang/lib/ejabberd-@version@/priv/msgs
+export EJABBERD_SO_PATH=/usr/@libdir@/erlang/lib/ejabberd-@version@/priv/lib
+export EJABBERD_LOG_PATH=$LOG_PATH
+export EJABBERD_CONFIG_PATH=$CONFIG
+
+exec $ERL $SNAME $EJABBERD_NODE \
+    -s ejabberd \
+    -kernel inetrc \"$INETRC\" \
+    -sasl sasl_error_logger \{file,\"$SASL_LOG\"\} \
+    -mnesia dir \"$SPOOL\" \
+    $ERL_OPTIONS $ARGS "$@"
+
+
diff --git a/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.0.template b/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.0.template
new file mode 100644
index 000000000000..6443678cf9b2
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberdctl-wrapper-2.0.0.template
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+[ -f /etc/conf.d/ejabberd ] && . /etc/conf.d/ejabberd
+
+if [ -r /var/run/jabber/.erlang.cookie ] ; then
+    HOME=/var/run/jabber
+    export HOME
+fi
+
+ERL=/usr/bin/erl
+
+if [ $# -ne 0 ] ; then
+    case $1 in
+	--node) shift ; EJABBERD_NODE=$1 ; shift ;;
+    esac
+fi
+
+if [ "$EJABBERD_NODE" = "${EJABBERD_NODE%.*}" ] ; then
+    SNAME=-sname
+else
+    SNAME=-name
+fi
+
+exec $ERL $SNAME ejabberdctl \
+    -pa /usr/@libdir@/erlang/lib/ejabberd-@version@/ebin \
+    -s ejabberd_ctl \
+    -noinput \
+    -extra $EJABBERD_NODE "$@"
+
+