summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2014-05-01 08:08:40 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2014-05-01 08:08:40 +0000
commit0a7252635dea87edbf3bae3644b30744ff7b1817 (patch)
tree54aae306059782b2ebf8e6041477c0eb67fe3c16 /net-im/openfire
parentMove yaml patch to devspace, wrt bug #509106 (diff)
downloadgentoo-2-0a7252635dea87edbf3bae3644b30744ff7b1817.tar.gz
gentoo-2-0a7252635dea87edbf3bae3644b30744ff7b1817.tar.bz2
gentoo-2-0a7252635dea87edbf3bae3644b30744ff7b1817.zip
Add default 'security.xml' to make upgrade nicer.
(Portage version: 2.2.10_p15/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'net-im/openfire')
-rw-r--r--net-im/openfire/ChangeLog8
-rw-r--r--net-im/openfire/openfire-3.9.2-r1.ebuild (renamed from net-im/openfire/openfire-3.9.2.ebuild)26
2 files changed, 25 insertions, 9 deletions
diff --git a/net-im/openfire/ChangeLog b/net-im/openfire/ChangeLog
index 419d426bbaff..7a46986a0576 100644
--- a/net-im/openfire/ChangeLog
+++ b/net-im/openfire/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-im/openfire
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.57 2014/05/01 07:11:48 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/ChangeLog,v 1.58 2014/05/01 08:08:40 slyfox Exp $
+
+*openfire-3.9.2-r1 (01 May 2014)
+
+ 01 May 2014; Sergei Trofimovich <slyfox@gentoo.org> +openfire-3.9.2-r1.ebuild,
+ -openfire-3.9.2.ebuild:
+ Add default 'security.xml' to make upgrade nicer.
*openfire-3.9.2 (01 May 2014)
diff --git a/net-im/openfire/openfire-3.9.2.ebuild b/net-im/openfire/openfire-3.9.2-r1.ebuild
index 0d1cc0f351f0..bbfbe3f58b2d 100644
--- a/net-im/openfire/openfire-3.9.2.ebuild
+++ b/net-im/openfire/openfire-3.9.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.9.2.ebuild,v 1.1 2014/05/01 07:11:48 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openfire/openfire-3.9.2-r1.ebuild,v 1.1 2014/05/01 08:08:40 slyfox Exp $
inherit eutils java-pkg-2 java-ant-2 systemd
@@ -66,6 +66,7 @@ src_install() {
dodir /opt/openfire/conf
insinto /opt/openfire/conf
newins target/openfire/conf/openfire.xml openfire.xml.sample
+ newins target/openfire/conf/security.xml security.xml.sample
dodir /opt/openfire/logs
keepdir /opt/openfire/logs
@@ -93,11 +94,20 @@ src_install() {
}
pkg_postinst() {
- chown -R jabber:jabber /opt/openfire
-
- ewarn If this is a new install, please edit /opt/openfire/conf/openfire.xml.sample
- ewarn and save it as /opt/openfire/conf/openfire.xml
- ewarn
- ewarn The following must be be owned or writable by the jabber user.
- ewarn /opt/openfire/conf/openfire.xml
+ local src
+ local dst
+
+ # http://community.igniterealtime.org/thread/52289
+ for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
+ do
+ src="${dst}".sample
+ if [[ -f "${dst}" ]]; then
+ einfo "Leaving old '${dst}'"
+ else
+ einfo "Created default '${dst}'. Please edit."
+ cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
+ chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
+ fi
+ done
+ chown -R jabber:jabber "${ROOT}"/opt/openfire
}