summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-05-19 14:50:11 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-05-19 14:50:11 +0000
commit1576ad892e07fe0df2a9fd970df098e7465adfdf (patch)
tree18fdafd23e8dbd56d7524cd1fd16583577991014 /net-im/jabberd
parentStable for amd64, wrt bug #400005 (diff)
downloadgentoo-2-1576ad892e07fe0df2a9fd970df098e7465adfdf.tar.gz
gentoo-2-1576ad892e07fe0df2a9fd970df098e7465adfdf.tar.bz2
gentoo-2-1576ad892e07fe0df2a9fd970df098e7465adfdf.zip
Update HOMEPAGE and change -c argument to --user in init script wrt #389619 by "thican"
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'net-im/jabberd')
-rw-r--r--net-im/jabberd/ChangeLog7
-rw-r--r--net-im/jabberd/files/jabberd-1.6.1.1.init6
-rw-r--r--net-im/jabberd/jabberd-1.6.1.1-r1.ebuild4
3 files changed, 11 insertions, 6 deletions
diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index f8b6036bbf2f..a16772386a1a 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-im/jabberd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.129 2012/05/19 14:43:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.130 2012/05/19 14:50:10 ssuominen Exp $
+
+ 19 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+ jabberd-1.6.1.1-r1.ebuild, files/jabberd-1.6.1.1.init:
+ Update HOMEPAGE and change -c argument to --user in init script wrt #389619
+ by "thican"
19 May 2012; Samuli Suominen <ssuominen@gentoo.org>
jabberd-1.6.1.1-r1.ebuild, +files/jabberd-1.6.1.1-underlinking.patch:
diff --git a/net-im/jabberd/files/jabberd-1.6.1.1.init b/net-im/jabberd/files/jabberd-1.6.1.1.init
index 0b2dd6bb08b3..237c1cf3b960 100644
--- a/net-im/jabberd/files/jabberd-1.6.1.1.init
+++ b/net-im/jabberd/files/jabberd-1.6.1.1.init
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabberd-1.6.1.1.init,v 1.1 2008/06/18 12:24:56 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabberd-1.6.1.1.init,v 1.2 2012/05/19 14:50:10 ssuominen Exp $
depend() {
@@ -14,7 +14,7 @@ start() {
ebegin "Starting Jabber Server"
start-stop-daemon --start \
- -c jabber:jabber \
+ --user jabber:jabber \
-x /usr/bin/jabberd -- -B -c /etc/jabber/jabberd.xml
eend $?
diff --git a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
index 91c4e6f35f88..3c90d71a3e81 100644
--- a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
+++ b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.21 2012/05/19 14:43:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.22 2012/05/19 14:50:11 ssuominen Exp $
EAPI=4
WANT_AUTOMAKE=1.9
inherit autotools eutils
DESCRIPTION="Open-source Jabber server"
-HOMEPAGE="http://www.jabber.org"
+HOMEPAGE="http://www.jabber.org/ http://jabberd.org/"
SRC_URI="http://download.jabberd.org/jabberd14/jabberd14-${PV}.tar.gz"
LICENSE="GPL-2"