From 0ce2c20e43290ea6f2345f9b5869dcd8620f50a2 Mon Sep 17 00:00:00 2001 From: Thomas Anderson Date: Mon, 15 Sep 2008 01:33:55 +0000 Subject: Version bump, bug #236710 (Portage version: 2.1.4.4) --- net-im/jabberd2/ChangeLog | 9 ++- net-im/jabberd2/files/jabberd2-2.2.4.init | 77 +++++++++++++++++++++ net-im/jabberd2/files/jabberd2-2.2.4.pamd | 6 ++ net-im/jabberd2/jabberd2-2.2.4.ebuild | 110 ++++++++++++++++++++++++++++++ 4 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 net-im/jabberd2/files/jabberd2-2.2.4.init create mode 100644 net-im/jabberd2/files/jabberd2-2.2.4.pamd create mode 100644 net-im/jabberd2/jabberd2-2.2.4.ebuild (limited to 'net-im') diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog index 8a47202572e9..2589466f8847 100644 --- a/net-im/jabberd2/ChangeLog +++ b/net-im/jabberd2/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-im/jabberd2 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.22 2008/08/05 17:11:24 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.23 2008/09/15 01:33:54 gentoofan23 Exp $ + +*jabberd2-2.2.4 (14 Sep 2008) + + 14 Sep 2008; Thomas Anderson + +files/jabberd2-2.2.4.init, +files/jabberd2-2.2.4.pamd, + +jabberd2-2.2.4.ebuild: + Version bump, bug #236710 05 Aug 2008; Thomas Anderson metadata.xml: Add USE flag description to metadata as per GLEP 56. diff --git a/net-im/jabberd2/files/jabberd2-2.2.4.init b/net-im/jabberd2/files/jabberd2-2.2.4.init new file mode 100644 index 000000000000..8d40b606428b --- /dev/null +++ b/net-im/jabberd2/files/jabberd2-2.2.4.init @@ -0,0 +1,77 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.4.init,v 1.1 2008/09/15 01:33:55 gentoofan23 Exp $ + +depend() { + need net + use mysql postgresql slapd + provide jabber-server +} + +stopJabberServices() { + + eindent + for pidfile in /var/run/jabber/*.pid; do + if [ -f "${pidfile}" ]; then + service=$(basename ${pidfile} .pid) + ebegin "Stopping ${service}" + start-stop-daemon \ + --stop \ + --pidfile ${pidfile} + eend $? + fi + done + eoutdent + +} + +start() { + + einfo "Starting Jabber Server ..." + local services + services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}') + eindent + for service in ${services}; do + + cfgfile=$(echo ${service} | cut -d ':' -f 2) + service=$(echo ${service} | cut -d ':' -f 1) + if [ ! -f "${cfgfile}" ]; then + if [ -f "/etc/jabber/${service}.xml" ]; then + cfgfile="/etc/jabber/${service}.xml" + else + eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml" + stopJabberServices + return 1 + fi + fi + + executable=/usr/bin/${service} + + if [ ! -f "${executable}" ]; then + eerror "Can't find executable: ${executable}" + stopJabberServices + return 1 + fi + + ebegin "Starting ${service} (${cfgfile})" + start-stop-daemon \ + --background \ + --start \ + --chuid jabber:jabber \ + --exec /usr/bin/${service} \ + --pid /var/run/jabber/$(basename ${cfgfile%.xml}).pid \ + -- -c ${cfgfile} + eend $? + + done + eoutdent + +} + +stop() { + + einfo "Stopping Jabber Server" + stopJabberServices + +} diff --git a/net-im/jabberd2/files/jabberd2-2.2.4.pamd b/net-im/jabberd2/files/jabberd2-2.2.4.pamd new file mode 100644 index 000000000000..2c5a5347ad6a --- /dev/null +++ b/net-im/jabberd2/files/jabberd2-2.2.4.pamd @@ -0,0 +1,6 @@ +#%PAM-1.0 + +auth required pam_nologin.so +auth include system-auth +account include system-auth +session include system-auth diff --git a/net-im/jabberd2/jabberd2-2.2.4.ebuild b/net-im/jabberd2/jabberd2-2.2.4.ebuild new file mode 100644 index 000000000000..c41e6e34f405 --- /dev/null +++ b/net-im/jabberd2/jabberd2-2.2.4.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.4.ebuild,v 1.1 2008/09/15 01:33:54 gentoofan23 Exp $ + +inherit db-use eutils flag-o-matic pam + +DESCRIPTION="Open Source Jabber Server" +HOMEPAGE="http://jabberd2.xiaoka.com/" +SRC_URI="http://ftp.xiaoka.com/${PN}/releases/jabberd-${PV}.tar.bz2" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="berkdb debug memdebug mysql ldap pam postgres sqlite ssl zlib" + +DEPEND="dev-libs/expat + net-libs/udns + >=net-dns/libidn-0.3 + >=virtual/gsasl-0.2.27 + berkdb? ( >=sys-libs/db-4.1.25 ) + mysql? ( virtual/mysql ) + ldap? ( >=net-nds/openldap-2.1.0 ) + pam? ( virtual/pam ) + postgres? ( virtual/postgresql-base ) + ssl? ( >=dev-libs/openssl-0.9.6b ) + sqlite? ( >=dev-db/sqlite-3 ) + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND} + >=net-im/jabber-base-0.01 + !net-im/jabberd" + +S="${WORKDIR}/jabberd-${PV}" + +src_compile() { + + # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3 + replace-flags -O[3s] -O2 + + use berkdb && myconf="${myconf} --with-extra-include-path=$(db_includedir)" + + if use debug; then + myconf="${myconf} --enable-debug" + # --enable-pool-debug is currently broken + use memdebug && myconf="${myconf} --enable-nad-debug" + else + if use memdebug; then + ewarn + ewarn '"memdebug" requires "debug" enabled.' + ewarn + fi + fi + + econf \ + --sysconfdir=/etc/jabber \ + --enable-fs --enable-pipe --enable-anon \ + ${myconf} \ + $(use_enable berkdb db) \ + $(use_enable ldap) \ + $(use_enable mysql) \ + $(use_enable pam) \ + $(use_enable postgres pgsql) \ + $(use_enable sqlite) \ + $(use_enable ssl) \ + $(use_with zlib) + emake || die "make failed" + +} + +src_install() { + emake DESTDIR="${D}" install || die "make install failed" + + fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} + fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} + + newinitd "${FILESDIR}/${P}.init" jabberd || die "newinitd failed" + newpamd "${FILESDIR}/${P}.pamd" jabberd || die "newpamd failed" + + dodoc AUTHORS README UPGRADE + docinto tools + dodoc tools/db-setup{.mysql,.pgsql,.sqlite} + dodoc tools/{migrate.pl,pipe-auth.pl} + + cd "${D}/etc/jabber/" + sed -i \ + -e 's,/var/lib/jabberd/pid/,/var/run/jabber/,g' \ + -e 's,/var/lib/jabberd/log/,/var/log/jabber/,g' \ + -e 's,/var/lib/jabberd/db,/var/spool/jabber/,g' \ + *.xml *.xml.dist || die "sed failed" + sed -i \ + -e 's,mysql,db,' \ + c2s.xml* || die "sed failed" + sed -i \ + -e 's,mysql,db,' \ + sm.xml* || die "sed failed" + +} + +pkg_postinst() { + + if use pam; then + echo + ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' + ewarn 'be in the form of "contactname@jabberdomain". This behavior' + ewarn 'is likely to change in future versions of jabberd-2. It may' + ewarn 'be advisable to avoid PAM authentication for the time being.' + echo + ebeep + fi + +} -- cgit v1.2.3-65-gdbad