diff options
author | demon <demon@FreeBSD.org> | 2004-10-25 15:25:02 +0800 |
---|---|---|
committer | demon <demon@FreeBSD.org> | 2004-10-25 15:25:02 +0800 |
commit | c65be20e7d2b0c3cbdd4a359b0a9f0b2dab8a1fb (patch) | |
tree | 30dfe8b35f463c7afc5258280fb66fb98c4766e9 /net/ejabberd | |
parent | c2b09da6394ca2619772640bc62813cd28531dd4 (diff) | |
download | freebsd-ports-gnome-c65be20e7d2b0c3cbdd4a359b0a9f0b2dab8a1fb.tar.gz freebsd-ports-gnome-c65be20e7d2b0c3cbdd4a359b0a9f0b2dab8a1fb.tar.zst freebsd-ports-gnome-c65be20e7d2b0c3cbdd4a359b0a9f0b2dab8a1fb.zip |
Update to version 0.7.5.
PR: 72981
Submitted by: maintainer
Diffstat (limited to 'net/ejabberd')
-rw-r--r-- | net/ejabberd/Makefile | 3 | ||||
-rw-r--r-- | net/ejabberd/distinfo | 4 | ||||
-rw-r--r-- | net/ejabberd/files/ejabberd.cfg.sample | 16 | ||||
-rw-r--r-- | net/ejabberd/files/patch-src::ejabberd | 16 | ||||
-rw-r--r-- | net/ejabberd/files/patch-src::ejabberd.sh | 78 | ||||
-rw-r--r-- | net/ejabberd/files/patch-src::ejabberdctl | 17 | ||||
-rw-r--r-- | net/ejabberd/pkg-install | 5 | ||||
-rw-r--r-- | net/ejabberd/pkg-plist | 9 |
8 files changed, 113 insertions, 35 deletions
diff --git a/net/ejabberd/Makefile b/net/ejabberd/Makefile index f702b9389dee..4ca5ca87b549 100644 --- a/net/ejabberd/Makefile +++ b/net/ejabberd/Makefile @@ -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 @@ do-install: @${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 --git a/net/ejabberd/distinfo b/net/ejabberd/distinfo index b91752cc78ca..2be0c358b89d 100644 --- a/net/ejabberd/distinfo +++ b/net/ejabberd/distinfo @@ -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 --git a/net/ejabberd/files/ejabberd.cfg.sample b/net/ejabberd/files/ejabberd.cfg.sample index f0f43f0f5bac..64ba14368af1 100644 --- a/net/ejabberd/files/ejabberd.cfg.sample +++ b/net/ejabberd/files/ejabberd.cfg.sample @@ -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 --git a/net/ejabberd/files/patch-src::ejabberd b/net/ejabberd/files/patch-src::ejabberd index c10fa05691ab..a500e66dd17f 100644 --- a/net/ejabberd/files/patch-src::ejabberd +++ b/net/ejabberd/files/patch-src::ejabberd @@ -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 --git a/net/ejabberd/files/patch-src::ejabberd.sh b/net/ejabberd/files/patch-src::ejabberd.sh index 294917dbfb26..1a2da91f2894 100644 --- a/net/ejabberd/files/patch-src::ejabberd.sh +++ b/net/ejabberd/files/patch-src::ejabberd.sh @@ -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 --git a/net/ejabberd/files/patch-src::ejabberdctl b/net/ejabberd/files/patch-src::ejabberdctl index 23bca0660790..3eb278a29162 100644 --- a/net/ejabberd/files/patch-src::ejabberdctl +++ b/net/ejabberd/files/patch-src::ejabberdctl @@ -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 --git a/net/ejabberd/pkg-install b/net/ejabberd/pkg-install index 0ea8071c47a5..784fcb8ff7fd 100644 --- a/net/ejabberd/pkg-install +++ b/net/ejabberd/pkg-install @@ -31,10 +31,13 @@ if ! pw usershow "${USER}" 2>/dev/null 1>&2; then 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 --git a/net/ejabberd/pkg-plist b/net/ejabberd/pkg-plist index f5e204b9ed3f..e1c98b0339ee 100644 --- a/net/ejabberd/pkg-plist +++ b/net/ejabberd/pkg-plist @@ -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_auth.beam 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_sup.beam 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_private.beam 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%%/ebin/ejabberd.app 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 |