From nobody@FreeBSD.org  Fri May  6 19:15:59 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B04941065675
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  6 May 2011 19:15:59 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FE728FC23
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  6 May 2011 19:15:59 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p46JFxaQ048950
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 6 May 2011 19:15:59 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p46JFxSa048949;
	Fri, 6 May 2011 19:15:59 GMT
	(envelope-from nobody)
Message-Id: <201105061915.p46JFxSa048949@red.freebsd.org>
Date: Fri, 6 May 2011 19:15:59 GMT
From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [UPDATE] net-im/ejabberd: update to 2.1.6
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         156850
>Category:       ports
>Synopsis:       [UPDATE] net-im/ejabberd: update to 2.1.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ashish
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 06 19:20:12 UTC 2011
>Closed-Date:    Tue May 10 16:47:18 UTC 2011
>Last-Modified:  Tue May 10 16:50:10 UTC 2011
>Originator:     Ruslan Mahmatkhanov
>Release:        9.0-CURRENT
>Organization:
>Environment:
9.0-CURRENT i386 with erlang-r14b02,1
>Description:
- update to 2.1.6
- switch to USERS/GROUPS knobs instead of manual creating of uids/gids
- cleanup unsupported FreeBSD versions
- some pkg-plist cleanup:
  - use ETCDIR instead of etc/PORTNAME
  - change 'ejabberd' with PORTNAME in all cases

changelog:
  http://www.ejabberd.im/ejabberd-2.1.6
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruNa ejabberd.orig/Makefile ejabberd/Makefile
--- ejabberd.orig/Makefile	2010-10-25 01:55:04.000000000 +0400
+++ ejabberd/Makefile	2011-05-06 22:33:00.000000000 +0400
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ejabberd
-PORTVERSION=	2.1.5
+PORTVERSION=	2.1.6
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/
 
@@ -17,6 +17,9 @@
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
+USERS=		ejabberd
+GROUPS=		${USERS}
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
@@ -31,7 +34,8 @@
 PKGINSTALL=	${WRKDIR}/pkg-install
 PLIST_SUB=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
 SUB_FILES=	pkg-message pkg-install
-SUB_LIST=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
+SUB_LIST=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \
+		USERS=${USERS} GROUPS=${GROUPS}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 LICENSE=	GPLv2
@@ -41,11 +45,6 @@
 
 USE_OPENSSL=	yes
 
-.if ${OSVERSION} < 700000
-BROKEN=		does not compile
-WITH_OPENSSL_PORT=      yes
-CONFIGURE_ARGS+=--with-openssl=${LOCALBASE}
-.endif
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 
 .if defined(WITH_ODBC)
diff -ruNa ejabberd.orig/distinfo ejabberd/distinfo
--- ejabberd.orig/distinfo	2011-03-20 15:53:23.000000000 +0300
+++ ejabberd/distinfo	2011-05-06 22:22:15.000000000 +0400
@@ -1,2 +1,2 @@
-SHA256 (ejabberd-2.1.5.tar.gz) = 31a46228c6933d7c24435753300a4d2ae2e84568a6097175dc5d4e553299dd9d
-SIZE (ejabberd-2.1.5.tar.gz) = 2278008
+SHA256 (ejabberd-2.1.6.tar.gz) = b54886b119a0ae9f19c8dd91a18e85e518fbd979d47812bee582e872cfbc3544
+SIZE (ejabberd-2.1.6.tar.gz) = 2874967
diff -ruNa ejabberd.orig/files/pkg-install.in ejabberd/files/pkg-install.in
--- ejabberd.orig/files/pkg-install.in	2009-03-16 11:38:32.000000000 +0300
+++ ejabberd/files/pkg-install.in	2011-05-06 22:29:42.000000000 +0400
@@ -4,35 +4,11 @@
     exit 0
 fi
 
-USER=ejabberd
-GROUP=${USER}
-UID=543
-GID=${UID}
 USERS_HOME="/var/spool/ejabberd"
 
-if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
-	if pw groupadd ${GROUP} -g ${GID}; then
-		echo "Added group \"${GROUP}\"."
-	else
-		echo "Adding group \"${GROUP}\" failed..."
-		exit 1
-	fi
-fi
-
-if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
-	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-		-s "/bin/sh" -d ${USERS_HOME} -c "ejabberd pseudo user"; \
-	then
-		echo "Added user \"${USER}\"."
-	else
-		echo "Adding user \"${USER}\" failed..."
-		exit 1
-	fi
-fi
-
-install -d -m 750 -o ${USER} -g ${GROUP} ${USERS_HOME} /var/log/ejabberd
+install -d -m 750 -o %%USERS%% -g %%GROUPS%% ${USERS_HOME} /var/log/ejabberd
 
-chown -R ${USER}:${GROUP}  %%PREFIX%%/etc/%%PORTNAME%%
-chown -R ${USER}:${GROUP}  %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%
+chown -R %%USERS%%:%%GROUPS%%  %%PREFIX%%/etc/%%PORTNAME%%
+chown -R %%USERS%%:%%GROUPS%%  %%PREFIX%%/lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%
 
 exit 0
diff -ruNa ejabberd.orig/pkg-deinstall ejabberd/pkg-deinstall
--- ejabberd.orig/pkg-deinstall	2005-08-28 19:51:47.000000000 +0400
+++ ejabberd/pkg-deinstall	2011-05-06 22:34:59.000000000 +0400
@@ -4,18 +4,6 @@
     exit 0
 fi
 
-USER=ejabberd
-
-echo ""
-
-if pw usershow "${USER}" 2>/dev/null 1>&2; then
-	echo "To delete ejabberd user permanently, use 'pw userdel ${USER}'."
-fi
-
-if pw groupshow "${USER}" 2>/dev/null 1>&2; then
-	echo "To delete ejabberd group permanently, use 'pw groupdel ${USER}'."
-fi
-
 rm -Rf /var/run/ejabberd
 
 cat <<EOF
diff -ruNa ejabberd.orig/pkg-plist ejabberd/pkg-plist
--- ejabberd.orig/pkg-plist	2010-09-30 20:22:15.000000000 +0400
+++ ejabberd/pkg-plist	2011-05-06 22:58:52.000000000 +0400
@@ -1,6 +1,6 @@
-etc/%%PORTNAME%%/%%PORTNAME%%.cfg.example
-etc/%%PORTNAME%%/%%PORTNAME%%ctl.cfg.example
-etc/%%PORTNAME%%/inetrc.example
+%%ETCDIR%%/%%PORTNAME%%.cfg.example
+%%ETCDIR%%/%%PORTNAME%%ctl.cfg.example
+%%ETCDIR%%/inetrc.example
 @unexec if cmp -s %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg; then rm -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.cfg; fi
 @unexec if cmp -s %D/etc/%%PORTNAME%%/%%PORTNAME%%.defaults.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.defaults; then rm -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.defaults; fi
 @unexec if cmp -s %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc.example %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc; then rm -f %D/etc/%%PORTNAME%%/%%PORTNAME%%.inetrc; fi
@@ -9,10 +9,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
@@ -26,7 +29,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
@@ -39,6 +44,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
@@ -48,6 +54,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
@@ -58,11 +65,6 @@
 %%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc.beam
 %%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/%%PORTNAME%%_odbc_sup.beam
 %%ODBC%%lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/odbc_queries.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/dynamic_compile.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejabberd_captcha.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejabberd_commands.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejabberd_piefxis.beam
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/ejabberd_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
@@ -110,10 +112,12 @@
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pubsub.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_pubsub_odbc.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_register.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_register_web.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_roster_odbc.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_service_log.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_shared_roster_ldap.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_sic.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_stats.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/mod_time.beam
@@ -141,6 +145,7 @@
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/nodetree_virtual.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_fsm.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/p1_mnesia.beam
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pg2_backport.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_db_odbc.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_index.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/pubsub_subscription.beam
@@ -159,10 +164,10 @@
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin/xml_stream.beam
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/XmppAddr.hrl
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/adhoc.hrl
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/ejabberd.hrl
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/ejabberd_commands.hrl
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/ejabberd_config.hrl
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/ejabberd_ctl.hrl
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%.hrl
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_commands.hrl
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_config.hrl
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/%%PORTNAME%%_ctl.hrl
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/eldap/ELDAPv3.hrl
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/eldap/eldap.hrl
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/jlib.hrl
@@ -171,8 +176,8 @@
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/mod_proxy65/mod_proxy65.hrl
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/mod_pubsub/pubsub.hrl
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/mod_roster.hrl
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/ejabberd_http.hrl
-lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/ejabberd_web_admin.hrl
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/%%PORTNAME%%_http.hrl
+lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/%%PORTNAME%%_web_admin.hrl
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include/web/http_bind.hrl
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin/captcha.sh
 lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib/%%PORTNAME%%_zlib_drv.so
@@ -212,6 +217,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/guide.html
 %%PORTDOCS%%%%DOCSDIR%%/guide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/logo.png
+%%PORTDOCS%%%%DOCSDIR%%/msrl-dit-deep.png
+%%PORTDOCS%%%%DOCSDIR%%/msrl-dit-flat.png
+%%PORTDOCS%%%%DOCSDIR%%/msrl-roster-deep.png
+%%PORTDOCS%%%%DOCSDIR%%/msrl-roster-flat.png
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.1.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.8.txt
 %%PORTDOCS%%%%DOCSDIR%%/release_notes_0.9.txt
@@ -233,11 +242,11 @@
 %%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_2.1.6.txt
 %%PORTDOCS%%%%DOCSDIR%%/webadmmain.png
 %%PORTDOCS%%%%DOCSDIR%%/webadmmainru.png
 %%PORTDOCS%%%%DOCSDIR%%/yozhikheader.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry etc/%%PORTNAME%%
 @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/msgs
 @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/lib
 @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/priv/bin
@@ -250,3 +259,4 @@
 @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/include
 @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%/ebin
 @dirrm lib/erlang/lib/%%PORTNAME%%-%%PORTVERSION%%
+@dirrmtry %%ETCDIR%%


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ashish 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri May 6 19:20:25 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156850 

From: ashish@FreeBSD.org (Ashish SHUKLA)
To: bug-followup@FreeBSD.org,cvs-src@yandex.ru
Cc:  
Subject: Re: ports/156850: [UPDATE] net-im/ejabberd: update to 2.1.6
Date: Sat, 07 May 2011 02:09:34 +0530

 --=-=-=
 Content-Type: text/plain
 Content-Transfer-Encoding: quoted-printable
 
 Hi Ruslan,
 
 I've prepared a diff[1] myself for 2.1.6 (which also includes PAM support
 contributed by lstewart@ ), but have problems building it (and lang/erlang)=
  on
 9.x jail (running on 8.x kernel).
 
 I see you prepared it on a 9.x host, do you mind testing a merged diff (your
 changes and mine) on 9.x host.=20
 
 I'll do the merge and upload it later today.
 
 References:
 [1]  http://people.freebsd.org/~ashish/diffs/ejabberd-2.1.6.diff
 
 Thanks
 =2D-=20
 Ashish SHUKLA      | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
 freebsd.org!ashish | http://people.freebsd.org/~ashish/
 
 Avoid Success At All Costs !!
 
 --=-=-=
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (FreeBSD)
 
 iQIcBAEBCgAGBQJNxFyGAAoJEMdGz6nnT6Sw0MkQAJVDriMoqxQIdI9g5vE8EMeM
 fgorVctpBiOXnIMA6PkM2txRYaIKXILSGT30/Gxfl5fUklb7bd57tkD7kzQEWHNy
 zeQvfKeSDpSGnzE/Lqmh+OnzKTRiKyO4hD7VKyN+OSEfbcCK7TRZCEXaP8Fc9tq5
 hsEzszoTomeQMqLk4KR93LPqznHlMNfidH5+m0QDEKTo8NyK16egBqG0LfJADRz/
 A3Z+7X2hzEE/zotV4tHmsN2JDcMRBLaRka2GcI4UBn84xY6mHg/FoBbSVMMOnJ3S
 Mn9JSNeJP5CanRNAtXQk6QhInrHCa4CKTjbSm29KnxzZ0jgRQkCwf6xm5F3icS2x
 UK4mpuDkaCv2Jm6ACKcHys2maKOqSCB8G6qKDiWdI3HLvA4PeygNZyIjG/aodSKP
 6u9oYOK3KbTp0oqzSUOF1KNp+z9OWk5jBGG+QPZFEpJJ0mfFYiLoTHRIyBQ2AA+Z
 On+2WxttaNJanwFAeWr8slsuqxIa+cf6CDSl0SW0L69oGnRCAMDbLpBUjVct6mfK
 WifevL8aafBHjYOX/UcrWGPrYkJvuD1Q1ZEAmCye3Ii96vmvV73IDngSePh1s+Ah
 uCGyPgqpKVvBP/5s3lUNS2+9dcHx8jC9JUYjw552owcNr7WHffp+Dc3T3x0ZAwhP
 VcbrqH9ceaPRUZrS9e6p
 =t5t2
 -----END PGP SIGNATURE-----
 --=-=-=--

From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: Ashish SHUKLA <ashish@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/156850: [UPDATE] net-im/ejabberd: update to 2.1.6
Date: Sat, 07 May 2011 00:56:33 +0400

 Hi Ashish,
 
 07.05.2011 00:39, Ashish SHUKLA пишет:
 > Hi Ruslan,
 >
 > I've prepared a diff[1] myself for 2.1.6 (which also includes PAM support
 > contributed by lstewart@ ), but have problems building it (and lang/erlang) on
 > 9.x jail (running on 8.x kernel).
 >
 > I see you prepared it on a 9.x host, do you mind testing a merged diff (your
 > changes and mine) on 9.x host.
 
 It builds and runs fine for me (i had tried it both
 with ODBC and PAM options). Buildlog is here:
 http://pastebin.com/UP0VGurY
 It seems like some tinderbox trouble. I saw build failure
 on portsmon for net/erlyvideo on -current also, but can't
 reproduce it on a real system.
 
 >
 > I'll do the merge and upload it later today.
 >
 > References:
 > [1]  http://people.freebsd.org/~ashish/diffs/ejabberd-2.1.6.diff
 >
 > Thanks
 
 -- 
 Regards,
 Ruslan

From: ashish@freebsd.org (Ashish SHUKLA)
To: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
Cc: Ashish SHUKLA <ashish@freebsd.org>,  bug-followup@FreeBSD.org
Subject: Re: ports/156850: [UPDATE] net-im/ejabberd: update to 2.1.6
Date: Sat, 07 May 2011 03:12:00 +0530

 --=-=-=
 Content-Type: text/plain; charset=utf-8
 Content-Transfer-Encoding: quoted-printable
 
 Ruslan Mahmatkhanov writes:
 > Hi Ashish,
 
 > 07.05.2011 00:39, Ashish SHUKLA =D0=BF=D0=B8=D1=88=D0=B5=D1=82:
 >> Hi Ruslan,
 >>=20
 >> I've prepared a diff[1] myself for 2.1.6 (which also includes PAM support
 >> contributed by lstewart@ ), but have problems building it (and lang/erla=
 ng) on
 >> 9.x jail (running on 8.x kernel).
 >>=20
 >> I see you prepared it on a 9.x host, do you mind testing a merged diff (=
 your
 >> changes and mine) on 9.x host.
 
 > It builds and runs fine for me (i had tried it both
 > with ODBC and PAM options). Buildlog is here:
 > http://pastebin.com/UP0VGurY
 > It seems like some tinderbox trouble. I saw build failure
 > on portsmon for net/erlyvideo on -current also, but can't
 > reproduce it on a real system.
 
 Thank you very much for confirming.
 
 =2D-=20
 Ashish SHUKLA      | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0
 freebsd.org!ashish | http://people.freebsd.org/~ashish/
 
 Avoid Success At All Costs !!
 
 --=-=-=
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (FreeBSD)
 
 iQIcBAEBCgAGBQJNxGssAAoJEMdGz6nnT6SwYOAQAIq1MN7WjJkStgG5WYcyMzeN
 l5lJfwF5jmrDBrE6E+pXFyFKdYsPlaUst/egc/FXfi/4MkxUyr2zV5/sQemr8lzq
 AvF0n9VnT7GWVVv1Z2Kg6YSCgWlxadKTGKzZn5XAEGGDDIZGr3OVuWzRPfXqe+1h
 MZ/rH67QAHf/Ct1b+G2eU2q1Gb5PqFKbWlazg8AlTglsJornf5baYhQDp/kwOnE5
 Y826o3tqx1CP0LUdFqvMi+4HbX0UcT9jAije7xmYOd+AbMNkEvhQD1nFuNoMihNi
 NbJbqftM8YpE45rn+OQB26K+FDnmhDQqvhlhmlXx1DWv/YU4f2GrsCxW2/mscshU
 oZujqhxp/gzslkAXD9Ou6soMj3GdMpcHMsm2ye/l5SovV34r/Mxsurl431IyEIWz
 aNaXCuZIePNcz4dJY3xUB7mOXI185ByoagAHBiXTh+WxyjuGb01t7/m7Ypb4Agr5
 L95cJsSH4adnoGXJq64kRopSxRKAZswwlF4vJ74aVv7ymx/zVUAwinJ2abvwet7e
 NnA887IQbMQ7up2dwBwdeHxkt9g5IxHe6UrYqunIOg83IUVVbtFw3pVc0HXuozoy
 Rp67YZdQS6M3zqP1BYMEVer90OW8vxQQVSqjP1jYN5x8y16wFF8n9D2Y7YirVpy7
 2H/PUK/G6KLoOLv98x1s
 =EJ+M
 -----END PGP SIGNATURE-----
 --=-=-=--
State-Changed-From-To: open->closed 
State-Changed-By: ashish 
State-Changed-When: Tue May 10 16:47:16 UTC 2011 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=156850 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/156850: commit references a PR
Date: Tue, 10 May 2011 16:44:41 +0000 (UTC)

 ashish      2011-05-10 16:44:25 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-im/ejabberd      Makefile distinfo pkg-deinstall pkg-plist 
     net-im/ejabberd/files pkg-install.in 
   Added files:
     net-im/ejabberd/files pam_ejabberd 
   Log:
   - Update to 2.1.6
   - Cleanup pkg-plist
   - Switch to USERS/GROUPS knobs instead of manual creating
   - Remove support for unsupported FreeBSD versions
   - Add PAM support[1]
   
   PR:             ports/156850
   Submitted by:   Ruslan Mahmatkhanov <cvs-src@yandex.ru>, lstewart[1] (via private email)
   
   Revision  Changes    Path
   1.43      +22 -9     ports/net-im/ejabberd/Makefile
   1.19      +2 -2      ports/net-im/ejabberd/distinfo
   1.1       +6 -0      ports/net-im/ejabberd/files/pam_ejabberd (new)
   1.2       +3 -27     ports/net-im/ejabberd/files/pkg-install.in
   1.3       +0 -14     ports/net-im/ejabberd/pkg-deinstall
   1.19      +30 -18    ports/net-im/ejabberd/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
