Date: Sat, 19 Apr 2008 16:37:33 GMT From: Nikolay Pavlov <qpadla@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/122914: Update port: net-im/openfire update to new version - openfire 3.5.0_1 Message-ID: <200804191637.m3JGbXK2062260@www.freebsd.org> Resent-Message-ID: <200804191640.m3JGe1jd093314@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 122914 >Category: ports >Synopsis: Update port: net-im/openfire update to new version - openfire 3.5.0_1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Apr 19 16:40:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Nikolay Pavlov >Release: 6.1-RELEASE >Organization: Grimm Brothers >Environment: FreeBSD support 6.1-RELEASE FreeBSD 6.1-RELEASE #1: Thu Jun 29 06:43:43 EDT 2006 root@support:/usr/src/sys/i386/compile/SMP-STABLE6 i386 >Description: I have a report that on plain pkg installation there are some errors on user/group creation phase. This patch should fix this. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urd -u openfire/Makefile openfire.new/Makefile --- openfire/Makefile Sat Apr 19 12:25:49 2008 +++ openfire.new/Makefile Sat Apr 19 12:28:34 2008 @@ -7,6 +7,7 @@ PORTNAME= openfire PORTVERSION= 3.5.0 +PORTREVISION= 1 CATEGORIES= net-im java MASTER_SITES= http://www.igniterealtime.org/downloadServlet?filename=openfire/ DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g} diff -urd -u openfire/pkg-install openfire.new/pkg-install --- openfire/pkg-install Sat Apr 19 12:25:49 2008 +++ openfire.new/pkg-install Sat Apr 19 12:21:08 2008 @@ -7,9 +7,7 @@ PUID=342 PGID=${PUID} - if pw group show "${PGROUP}" >/dev/null; then - echo "You already have a group \"${PGROUP}\", so I will use it." - else + if ! pw group show "${PGROUP}" > /dev/null; then if pw groupadd ${PGROUP} -g ${PGID}; then echo "Added group \"${PGROUP}\"." else @@ -18,9 +16,7 @@ fi fi - if pw user show "${PUSER}" >/dev/null; then - echo "You already have a user \"${PUSER}\", so I will use it." - else + if ! pw user show "${PUSER}" > /dev/null; then if pw useradd ${PUSER} -u ${PUID} -g ${PGROUP} -h - \ -d /nonexistent -s /sbin/nologin -c "Openfire Daemon" then diff -urd -u openfire/pkg-plist openfire.new/pkg-plist --- openfire/pkg-plist Sat Apr 19 12:25:49 2008 +++ openfire.new/pkg-plist Sat Apr 19 12:21:08 2008 @@ -4,6 +4,8 @@ %%EXAMPLESDIR%%/openfire.xml %%EXAMPLESDIR%%/keystore %%EXAMPLESDIR%%/truststore +@exec if ! /usr/sbin/pw group show openfire > /dev/null; then /usr/sbin/pw groupadd openfire -g 342 && echo "Added group openfire."; fi +@exec if ! /usr/sbin/pw user show openfire > /dev/null; then /usr/sbin/pw useradd openfire -u 342 -g 342 -h - -d /nonexistent -s /sbin/nologin -c "Openfire Daemon" && echo "Added user openfire."; fi @exec [ -d /var/log/openfire ] || mkdir -p /var/log/openfire && chown openfire:openfire /var/log/openfire @exec [ -d /var/db/openfire ] || mkdir -p /var/db/openfire && chown openfire:openfire /var/db/openfire @exec [ -d %D/%%ETCDIR%% ] || mkdir -p %D/%%ETCDIR%% && chown openfire:openfire %D/%%ETCDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804191637.m3JGbXK2062260>