From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 6 19:20:14 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21DAE1065686 for ; Fri, 6 May 2011 19:20:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 83DCA8FC17 for ; Fri, 6 May 2011 19:20:12 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p46JKCEM005852 for ; Fri, 6 May 2011 19:20:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p46JKCvS005851; Fri, 6 May 2011 19:20:12 GMT (envelope-from gnats) Resent-Date: Fri, 6 May 2011 19:20:12 GMT Resent-Message-Id: <201105061920.p46JKCvS005851@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ruslan Mahmatkhanov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B04941065675 for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/156850: [UPDATE] net-im/ejabberd: update to 2.1.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 May 2011 19:20:14 -0000 >Number: 156850 >Category: ports >Synopsis: [UPDATE] net-im/ejabberd: update to 2.1.6 >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: Fri May 06 19:20:12 UTC 2011 >Closed-Date: >Last-Modified: >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 <Release-Note: >Audit-Trail: >Unformatted: