ports/158137: [UPDATE] net-im/ejabberd: update to 2.1.8
Ruslan Mahmatkhanov
cvs-src at yandex.ru
Tue Jun 21 20:20:18 UTC 2011
>Number: 158137
>Category: ports
>Synopsis: [UPDATE] net-im/ejabberd: update to 2.1.8
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 21 20:20:14 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Ruslan Mahmatkhanov
>Release: 9.0-CURRENT
>Organization:
>Environment:
9.0-CURRENT i386
>Description:
- update to 2.1.8
- silence ${FIND} output
- rename patch-src::ejabberdctl.template to patch-src_ejabberdctl.template (portlint warning)
changelogs:
- http://www.process-one.net/en/ejabberd/release_notes/release_note_ejabberd_2.1.7
2.1.7 also fixes CVE-2011-1753 (DoS attack)
- http://www.process-one.net/en/ejabberd/release_notes/release_note_ejabberd_2.1.8
2.1.8 fixes issue, introduced in 2.1.7
tinderbuild log (8.2-RELEASE):
http://happy-nation.by.ru/ports/tb/ejabberd-2.1.8.log
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruNa ejabberd.orig/Makefile ejabberd/Makefile
--- ejabberd.orig/Makefile 2011-05-10 20:44:25.000000000 +0400
+++ ejabberd/Makefile 2011-06-18 23:25:15.000000000 +0400
@@ -6,7 +6,7 @@
#
PORTNAME= ejabberd
-PORTVERSION= 2.1.6
+PORTVERSION= 2.1.8
CATEGORIES= net-im
MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/
@@ -71,8 +71,8 @@
post-install:
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- ${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
- ${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHOWN} ${SHAREOWN}:${SHAREGRP}
+ @${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
+ @${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHOWN} ${SHAREOWN}:${SHAREGRP}
.if defined(WITH_PAM)
${CHMOD} 4750 ${PREFIX}/lib/erlang/lib/${DISTNAME}/priv/bin/epam
diff -ruNa ejabberd.orig/distinfo ejabberd/distinfo
--- ejabberd.orig/distinfo 2011-05-10 20:44:25.000000000 +0400
+++ ejabberd/distinfo 2011-06-18 09:34:51.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (ejabberd-2.1.6.tar.gz) = b54886b119a0ae9f19c8dd91a18e85e518fbd979d47812bee582e872cfbc3544
-SIZE (ejabberd-2.1.6.tar.gz) = 2874967
+SHA256 (ejabberd-2.1.8.tar.gz) = dedf7684f9e96efbbc12f08f175096ef50b3f75b284bd27d172eaf75cecded7f
+SIZE (ejabberd-2.1.8.tar.gz) = 3382833
diff -ruNa ejabberd.orig/files/patch-src::ejabberdctl.template ejabberd/files/patch-src::ejabberdctl.template
--- ejabberd.orig/files/patch-src::ejabberdctl.template 2010-02-05 21:48:47.000000000 +0300
+++ ejabberd/files/patch-src::ejabberdctl.template 1970-01-01 03:00:00.000000000 +0300
@@ -1,28 +0,0 @@
---- ejabberdctl.template.orig 2009-12-12 21:23:49.192455441 +0000
-+++ ejabberdctl.template 2009-12-12 21:35:11.121377666 +0000
-@@ -43,10 +43,10 @@
- fi
- [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
- if [ "$LOGS_DIR" = "" ] ; then
-- LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd
-+ LOGS_DIR=/var/log/ejabberd
- fi
- if [ "$SPOOLDIR" = "" ] ; then
-- SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd
-+ SPOOLDIR=/var/spool/ejabberd
- fi
- if [ "$EJABBERD_DOC_PATH" = "" ] ; then
- EJABBERD_DOC_PATH=@DOCDIR@
-@@ -86,10 +86,10 @@
- EJABBERDDIR=@LIBDIR@/ejabberd
- fi
- if [ "$EJABBERD_EBIN_PATH" = "" ]; then
-- EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
-+ EJABBERD_EBIN_PATH=@rootdir@/lib/erlang/lib/ejabberd/ebin
- fi
- if [ "$EJABBERD_PRIV_PATH" = "" ]; then
-- EJABBERD_PRIV_PATH=$EJABBERDDIR/priv
-+ EJABBERD_PRIV_PATH=@rootdir@/lib/erlang/lib/ejabberd/priv
- fi
- if [ "$EJABBRD_BIN_PATH" = "" ]; then
- EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin
diff -ruNa ejabberd.orig/files/patch-src_ejabberdctl.template ejabberd/files/patch-src_ejabberdctl.template
--- ejabberd.orig/files/patch-src_ejabberdctl.template 1970-01-01 03:00:00.000000000 +0300
+++ ejabberd/files/patch-src_ejabberdctl.template 2010-02-05 21:48:47.000000000 +0300
@@ -0,0 +1,28 @@
+--- ejabberdctl.template.orig 2009-12-12 21:23:49.192455441 +0000
++++ ejabberdctl.template 2009-12-12 21:35:11.121377666 +0000
+@@ -43,10 +43,10 @@
+ fi
+ [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
+ if [ "$LOGS_DIR" = "" ] ; then
+- LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd
++ LOGS_DIR=/var/log/ejabberd
+ fi
+ if [ "$SPOOLDIR" = "" ] ; then
+- SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd
++ SPOOLDIR=/var/spool/ejabberd
+ fi
+ if [ "$EJABBERD_DOC_PATH" = "" ] ; then
+ EJABBERD_DOC_PATH=@DOCDIR@
+@@ -86,10 +86,10 @@
+ EJABBERDDIR=@LIBDIR@/ejabberd
+ fi
+ if [ "$EJABBERD_EBIN_PATH" = "" ]; then
+- EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
++ EJABBERD_EBIN_PATH=@rootdir@/lib/erlang/lib/ejabberd/ebin
+ fi
+ if [ "$EJABBERD_PRIV_PATH" = "" ]; then
+- EJABBERD_PRIV_PATH=$EJABBERDDIR/priv
++ EJABBERD_PRIV_PATH=@rootdir@/lib/erlang/lib/ejabberd/priv
+ fi
+ if [ "$EJABBRD_BIN_PATH" = "" ]; then
+ EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin
diff -ruNa ejabberd.orig/pkg-plist ejabberd/pkg-plist
--- ejabberd.orig/pkg-plist 2011-05-10 20:44:25.000000000 +0400
+++ ejabberd/pkg-plist 2011-06-18 22:17:43.000000000 +0400
@@ -8,10 +8,13 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/XmppAddr.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/acl.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/adhoc.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cache_tab.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cache_tab_sup.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_anonymous.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_digest.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cyrsasl_plain.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/dynamic_compile.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.app
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_admin.beam
@@ -25,7 +28,9 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_auth_pam.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_c2s.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_c2s_config.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_captcha.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_check.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_commands.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_config.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_ctl.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_frontend_socket.beam
@@ -38,6 +43,7 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_logger_h.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_loglevel.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_node_groups.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_piefxis.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_rdbms.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_receiver.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_router.beam
@@ -47,6 +53,7 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_service.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sm.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_socket.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_stun.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_sup.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_system_monitor.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_tmp_sup.beam
@@ -60,13 +67,6 @@
%%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/epam.beam
%%PAM%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/epam
%%PAM%%etc/pam.d/%%PORTNAME%%
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cache_tab.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/cache_tab_sup.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/dynamic_compile.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_captcha.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_commands.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_piefxis.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_stun.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejd2odbc.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/eldap_filter.beam
@@ -84,6 +84,7 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/jlib.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_adhoc.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_announce.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_blocking.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_caps.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_configure.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_configure2.beam
@@ -102,6 +103,7 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_offline.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_offline_odbc.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_ping.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pres_counter.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_privacy.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_privacy_odbc.beam
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_private.beam
@@ -196,6 +198,7 @@
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/es.msg
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/fr.msg
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/gl.msg
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/id.msg
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/it.msg
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/ja.msg
lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs/nl.msg
@@ -244,7 +247,9 @@
%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.3.txt
%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.4.txt
%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.5.txt
-%%PORTDOCS%%%%DOCSDIR%%/release_notes_%%PORTVERSION%%.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.6.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.7.txt
+%%PORTDOCS%%%%DOCSDIR%%/release_notes_2.1.8.txt
%%PORTDOCS%%%%DOCSDIR%%/webadmmain.png
%%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png
%%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list