ports/72981: [maintainer update] update to 0.7.5
Alexander Timoshenko
gonzo at univ.kiev.ua
Thu Oct 21 22:40:27 UTC 2004
>Number: 72981
>Category: ports
>Synopsis: [maintainer update] update to 0.7.5
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 21 22:40:25 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Alexander Timoshenko
>Release: FreeBSD 5.2.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD expo.ukrweb.net 5.2.1-RELEASE-p10 FreeBSD 5.2.1-RELEASE-p10 #0: Tue Sep 21 13:10:22 EEST 2004 anri at expo.ukrweb.net:/usr/obj/usr/src/sys/EXPO i386
>Description:
* new upstream release (highlights: new tls module, starttls,
improvements in admin web interface, bugfixes)
>How-To-Repeat:
>Fix:
diff -ruN ejabberd.orig/Makefile ejabberd/Makefile
--- ejabberd.orig/Makefile Thu Aug 19 13:15:58 2004
+++ ejabberd/Makefile Fri Oct 22 01:06:45 2004
@@ -6,7 +6,7 @@
#
PORTNAME= ejabberd
-PORTVERSION= 0.7
+PORTVERSION= 0.7.5
CATEGORIES= net
MASTER_SITES= http://www.jabber.ru/files/ejabberd/
@@ -48,6 +48,7 @@
@${INSTALL_SCRIPT} ${WRKSRC}/ejabberdctl ${PREFIX}/bin
@${INSTALL_SCRIPT} ${WRKSRC}/ejabberd.sh ${PREFIX}/etc/rc.d
@${INSTALL_DATA} ${FILESDIR}/ejabberd.cfg.sample ${PREFIX}/etc/
+ @${INSTALL_DATA} ${FILESDIR}/ejabberd.defaults ${PREFIX}/etc/
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/../doc/* ${DOCSDIR}
diff -ruN ejabberd.orig/distinfo ejabberd/distinfo
--- ejabberd.orig/distinfo Mon Jul 19 15:51:15 2004
+++ ejabberd/distinfo Thu Oct 14 19:30:04 2004
@@ -1,2 +1,2 @@
-MD5 (ejabberd-0.7.tar.gz) = dfec9573263de8729213993f015cfac9
-SIZE (ejabberd-0.7.tar.gz) = 378466
+MD5 (ejabberd-0.7.5.tar.gz) = c9f900ed535cb446e8b567048514c705
+SIZE (ejabberd-0.7.5.tar.gz) = 410451
diff -ruN ejabberd.orig/files/ejabberd.cfg.sample ejabberd/files/ejabberd.cfg.sample
--- ejabberd.orig/files/ejabberd.cfg.sample Tue Jul 20 20:12:20 2004
+++ ejabberd/files/ejabberd.cfg.sample Wed Oct 20 21:41:38 2004
@@ -84,10 +84,15 @@
%{ldap_uidattr, "uid"}. % LDAP attribute that holds user ID
%{ldap_base, "dc=example,dc=com"}. % Base of LDAP directory
+% For authentification via external script use the following:
+%{auth_method, external}.
+%{extauth_program, "/path/to/authentification/script"}.
+
% Host name: (replace for your hostname)
{host, "localhost"}.
+
% Default language for server messages
{language, "en"}.
@@ -95,13 +100,13 @@
{listen,
% Ordinary client-2-server service
[{5222, ejabberd_c2s, [{access, c2s},
+ starttls, {certfile, "/etc/ssl/certs/ejabberd.pem"},
{shaper, c2s_shaper}]},
-% SSL-enabled client-2-server service, uncomment these lines to
-% enable ssl
-% {5223, ejabberd_c2s, [{access, c2s},
-% ssl,
-% {certfile, "/etc/ssl/certs/ejabberd.pem"}]},
+% SSL-enabled client-2-server service
+ {5223, ejabberd_c2s, [{access, c2s},
+ tls, {certfile, "/etc/ssl/certs/ejabberd.pem"},
+ {shaper, c2s_shaper}]},
% Server-2-server service
{5269, ejabberd_s2s_in, [{shaper, s2s_shaper}]},
@@ -148,6 +153,7 @@
% Used modules:
{modules,
[
+ {mod_announce, [{access, announce}]},
{mod_register, [{access, register}]},
{mod_roster, []},
{mod_privacy, []},
diff -ruN ejabberd.orig/files/ejabberd.defaults ejabberd/files/ejabberd.defaults
--- ejabberd.orig/files/ejabberd.defaults Thu Jan 1 03:00:00 1970
+++ ejabberd/files/ejabberd.defaults Fri Oct 22 01:23:27 2004
@@ -0,0 +1,13 @@
+# Additionnal options passed to erlang while starting ejabberd.
+# See erl(3) for more info
+# default options already passed are:
+# -noshell -detached
+#export ERL_OPTIONS="-heart"
+
+# To use more than 1024 connections, you will need to set environment variable ERL_MAX_PORTS:
+#export ERL_MAX_PORTS=1024
+
+# To reduce memory usage, you can set environment variable ERL_FULLSWEEP_AFTER:
+# But in this case ejabberd may work slower.
+#export ERL_FULLSWEEP_AFTER=0
+
diff -ruN ejabberd.orig/files/patch-src::ejabberd ejabberd/files/patch-src::ejabberd
--- ejabberd.orig/files/patch-src::ejabberd Mon Jul 19 15:46:40 2004
+++ ejabberd/files/patch-src::ejabberd Fri Oct 22 01:13:01 2004
@@ -1,9 +1,10 @@
---- ejabberd.orig Thu Jan 1 03:00:00 1970
-+++ ejabberd Sat Jul 3 15:52:35 2004
-@@ -0,0 +1,31 @@
+--- ejabberd.orig Wed Oct 20 21:59:31 2004
++++ ejabberd Wed Oct 20 21:59:15 2004
+@@ -0,0 +1,33 @@
+#!/bin/sh
+
+[ -r /var/run/ejabberd/.erlang.cookie ] && HOME=/var/run/ejabberd
++[ -f %%PREFIX%%/etc/ejabberd.defaults ] && . %%PREFIX%%/etc/ejabberd.defaults
+
+CONFIG=%%PREFIX%%/etc/ejabberd.cfg
+LOG=/var/log/ejabberd/ejabberd.log
@@ -11,7 +12,8 @@
+SPOOL=/var/spool/ejabberd
+
+ARGS=
-+while [ $# -ne 0 ];
++
++while [ $# -ne 0 ]
+do
+ PARAM=$1
+ shift
@@ -21,14 +23,14 @@
+ --log) LOG=$1 ; shift ;;
+ --sasl-log) SASL_LOG=$1 ; shift ;;
+ --spool) SPOOL=$1 ; shift ;;
-+ *) ARGS="$ARGS $PARAM"
++ *) ARGS="$ARGS $PARAM" ;;
+ esac
+done
+
+exec erl -sname ejabberd \
-+ -s ejabberd -detached \
++ -s ejabberd \
+ -ejabberd config \"$CONFIG\" log_path \"$LOG\" \
+ -sasl sasl_error_logger \{file,\"$SASL_LOG\"\} \
+ -mnesia dir \"$SPOOL\" \
-+ $ARGS "$@"
++ $ERL_OPTIONS $ARGS "$@"
+
diff -ruN ejabberd.orig/files/patch-src::ejabberd.sh ejabberd/files/patch-src::ejabberd.sh
--- ejabberd.orig/files/patch-src::ejabberd.sh Mon Jul 19 15:46:40 2004
+++ ejabberd/files/patch-src::ejabberd.sh Fri Oct 22 01:12:42 2004
@@ -1,6 +1,6 @@
---- ejabberd.sh Thu Jan 1 03:00:00 1970
-+++ ejabberd.sh Sat Jul 3 16:49:51 2004
-@@ -0,0 +1,42 @@
+--- ejabberd.sh.orig Wed Oct 20 22:16:07 2004
++++ ejabberd.sh Wed Oct 20 22:14:04 2004
+@@ -0,0 +1,90 @@
+#! /bin/sh
+#
+# ejabberd Start/stop ejabberd server
@@ -8,8 +8,8 @@
+#
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
-+EJABBERD=%%PREFIX%%/bin/ejabberd
-+EJABBERDCTL=%%PREFIX%%/bin/ejabberdctl
++EJABBERD=/usr/local/bin/ejabberd
++EJABBERDCTL=/usr/local/bin/ejabberdctl
+EJABBERDUSER=ejabberd
+NAME=ejabberd
+DESC=ejabberd
@@ -17,27 +17,75 @@
+test -f $EJABBERD || exit 0
+test -f $EJABBERDCTL || exit 0
+
++# Include ejabberd defaults if available
++if [ -f %%PREFIX%%/etc/ejabberd.defaults ] ; then
++ . %%PREFIX%%/etc/ejabberd.defaults
++fi
++
++
+set -e
+
++status()
++{
++ $EJABBERDCTL status >/dev/null
++}
++
++start()
++{
++ su $EJABBERDUSER -c "$EJABBERD -noshell -detached"
++}
++
++
+case "$1" in
+ start)
-+ echo -n "Starting $DESC: "
-+ su ejabberd -c "$EJABBERD -heart -noshell -detached"
-+ echo "$NAME."
++ echo -n "Starting $DESC: "
++
++ if status
++ then
++ echo " already running."
++ false
++ else
++ start
++ fi
++
++ echo "$NAME."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: "
-+ su ejabberd -c "$EJABBERDCTL stop"
-+ echo "$NAME."
++
++ if $EJABBERDCTL stop
++ then
++ cnt=0
++ while status
++ do
++ cnt=`expr $cnt + 1`
++ if [ $cnt -gt 60 ]
++ then
++ echo -n " failed "
++ break
++ fi
++ sleep 1
++ echo -n .
++ done
++ else
++ echo -n " failed "
++ fi
++
++ echo "$NAME."
+ ;;
+ restart|force-reload)
-+ echo -n "Restarting $DESC: "
-+ su ejabberd -c "$EJABBERDCTL restart"
-+ echo "$NAME."
++ echo -n "Restarting $DESC: "
++ if status
++ then
++ $EJABBERDCTL restart
++ else
++ start
++ fi
++
++ echo "$NAME."
+ ;;
+ *)
-+ N=/etc/init.d/$NAME
-+ echo "Usage: $N {start|stop|restart|force-reload}" >&2
++ echo "Usage: ejabberd.sh {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
diff -ruN ejabberd.orig/files/patch-src::ejabberdctl ejabberd/files/patch-src::ejabberdctl
--- ejabberd.orig/files/patch-src::ejabberdctl Mon Jul 19 15:46:40 2004
+++ ejabberd/files/patch-src::ejabberdctl Wed Oct 20 22:11:17 2004
@@ -1,9 +1,18 @@
---- ejabberdctl.orig Thu Jan 1 03:00:00 1970
-+++ ejabberdctl Sat Jul 3 15:53:38 2004
-@@ -0,0 +1,6 @@
+--- ejabberdctl.orig Wed Oct 20 22:10:55 2004
++++ ejabberdctl Wed Oct 20 22:10:49 2004
+@@ -0,0 +1,15 @@
+#!/bin/sh
+
+[ -r /var/run/ejabberd/.erlang.cookie ] && HOME=/var/run/ejabberd
+
-+exec erl -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` "$@"
++NODE=ejabberd@`hostname -s`
++
++if [ $# -ne 0 ]
++then
++ case $1 in
++ --node) shift ; NODE=$1 ; shift ;;
++ esac
++fi
++
++exec erl -noinput -sname ejabberdctl -s ejabberd_ctl -extra $NODE "$@"
+
diff -ruN ejabberd.orig/pkg-install ejabberd/pkg-install
--- ejabberd.orig/pkg-install Tue Jul 20 14:38:45 2004
+++ ejabberd/pkg-install Fri Oct 22 01:05:02 2004
@@ -31,10 +31,13 @@
fi
mkdir -m 750 /var/log/ejabberd /var/spool/ejabberd /var/run/ejabberd 2>/dev/null
+
cat > /var/run/ejabberd/.inetrc << __EOF__
{lookup,["file","native"]}.
{host,{127,0,0,1}, ["localhost","hostalias"]}.
__EOF__
-chown -R ejabberd:ejabberd /var/log/ejabberd /var/spool/ejabberd /var/run/ejabberd
+
+chown -R ejabberd:ejabberd /var/log/ejabberd /var/spool/ejabberd \
+ /var/run/ejabberd
exit 0
diff -ruN ejabberd.orig/pkg-plist ejabberd/pkg-plist
--- ejabberd.orig/pkg-plist Tue Jul 20 23:14:20 2004
+++ ejabberd/pkg-plist Fri Oct 22 01:16:10 2004
@@ -1,5 +1,6 @@
bin/ejabberd
bin/ejabberdctl
+etc/ejabberd.defaults
etc/ejabberd.cfg.sample
etc/rc.d/ejabberd.sh
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/ELDAPv3.beam
@@ -14,6 +15,7 @@
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/ejabberd_c2s.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/ejabberd_config.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/ejabberd_ctl.beam
+lib/erlang/lib/ejabberd-%%VERSION%%/ebin/ejabberd_hooks.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/ejabberd_http.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/ejabberd_http_poll.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/ejabberd_listener.beam
@@ -31,12 +33,14 @@
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/ejabberd_tmp_sup.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/ejabberd_web.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/ejabberd_web_admin.beam
+lib/erlang/lib/ejabberd-%%VERSION%%/ebin/extauth.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/gen_iq_handler.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/gen_mod.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/iconv.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/idna.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/jd2ejd.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/jlib.beam
+lib/erlang/lib/ejabberd-%%VERSION%%/ebin/mod_announce.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/mod_configure.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/mod_configure2.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/mod_disco.beam
@@ -52,14 +56,17 @@
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/mod_pubsub.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/mod_register.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/mod_roster.beam
+lib/erlang/lib/ejabberd-%%VERSION%%/ebin/mod_service_log.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/mod_stats.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/mod_time.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/mod_vcard.beam
+lib/erlang/lib/ejabberd-%%VERSION%%/ebin/mod_vcard_ldap.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/mod_version.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/randoms.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/sha.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/shaper.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/stringprep.beam
+lib/erlang/lib/ejabberd-%%VERSION%%/ebin/tls.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/translate.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/xml.beam
lib/erlang/lib/ejabberd-%%VERSION%%/ebin/xml_stream.beam
@@ -67,10 +74,12 @@
lib/erlang/lib/ejabberd-%%VERSION%%/priv/lib/expat_erl.so
lib/erlang/lib/ejabberd-%%VERSION%%/priv/lib/iconv_erl.so
lib/erlang/lib/ejabberd-%%VERSION%%/priv/lib/stringprep_drv.so
+lib/erlang/lib/ejabberd-%%VERSION%%/priv/lib/tls_drv.so
lib/erlang/lib/ejabberd-%%VERSION%%/priv/msgs/es.msg
lib/erlang/lib/ejabberd-%%VERSION%%/priv/msgs/fr.msg
lib/erlang/lib/ejabberd-%%VERSION%%/priv/msgs/nl.msg
lib/erlang/lib/ejabberd-%%VERSION%%/priv/msgs/ru.msg
+lib/erlang/lib/ejabberd-%%VERSION%%/priv/msgs/uk.msg
%%PORTDOCS%%%%DOCSDIR%%/confacls.png
%%PORTDOCS%%%%DOCSDIR%%/confhostname.png
%%PORTDOCS%%%%DOCSDIR%%/dev.html
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list