aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2008-04-29 21:01:21 +0800
committermiwi <miwi@FreeBSD.org>2008-04-29 21:01:21 +0800
commit114226fa9a71ea09a37f74c13a15cf4a5cdcba71 (patch)
treecc459844bf77d554dad63c5fe0c42510fa27728e
parent9cc57c422e9fe4e88a25e2564158b8e1fadbcd47 (diff)
downloadfreebsd-ports-gnome-114226fa9a71ea09a37f74c13a15cf4a5cdcba71.tar.gz
freebsd-ports-gnome-114226fa9a71ea09a37f74c13a15cf4a5cdcba71.tar.zst
freebsd-ports-gnome-114226fa9a71ea09a37f74c13a15cf4a5cdcba71.zip
- Update to 3.5.1 [1]
- Fix some errors on user/group creation phase [2] PR: 123124 [1] 122914 [2] Submitted by: Linh Pham <question+fbsdports@closedsrc.org> [1] Nikolay Pavlov <qpadla@gmail.com> [2] (maintainer) Approved by: maintainer
-rw-r--r--net-im/openfire/Makefile2
-rw-r--r--net-im/openfire/distinfo6
-rw-r--r--net-im/openfire/pkg-install8
-rw-r--r--net-im/openfire/pkg-plist2
4 files changed, 8 insertions, 10 deletions
diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index 28345901ef2c..658d18e182e6 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= openfire
-PORTVERSION= 3.5.0
+PORTVERSION= 3.5.1
CATEGORIES= net-im java
MASTER_SITES= http://www.igniterealtime.org/downloadServlet?filename=openfire/
DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g}
diff --git a/net-im/openfire/distinfo b/net-im/openfire/distinfo
index c984c03856c6..e5f7da0233c5 100644
--- a/net-im/openfire/distinfo
+++ b/net-im/openfire/distinfo
@@ -1,3 +1,3 @@
-MD5 (openfire_src_3_5_0.tar.gz) = 048d2d7fc409366ba7c94a42788b04b9
-SHA256 (openfire_src_3_5_0.tar.gz) = a288f45aeb3006104e3cba69b73da5fb7e1c353f1551d94f97b9d82928d40746
-SIZE (openfire_src_3_5_0.tar.gz) = 45664553
+MD5 (openfire_src_3_5_1.tar.gz) = baccfceb6230e283f9b09ff3a02db5a1
+SHA256 (openfire_src_3_5_1.tar.gz) = 77a17fff6c8b926b6a1e12ac5866bbc8e6deae3e78e8cb47252bbbd0588b7f1e
+SIZE (openfire_src_3_5_1.tar.gz) = 50631057
diff --git a/net-im/openfire/pkg-install b/net-im/openfire/pkg-install
index a18c3156e2bb..b3f53f44b88f 100644
--- a/net-im/openfire/pkg-install
+++ b/net-im/openfire/pkg-install
@@ -7,9 +7,7 @@ POST-INSTALL)
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 @@ POST-INSTALL)
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 --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index a9d0c57df10e..1e87e29798bc 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -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%%