From d6f785280ae9f1298b7bfe6d21df32358aab4cb7 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 1 Jun 2014 20:09:54 +0000 Subject: fix logroate script wrt #505596 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020) --- net-im/jabberd2/ChangeLog | 8 +- net-im/jabberd2/files/jabberd2-2.3.2.init | 97 +++++++++++++++ net-im/jabberd2/files/jabberd2-2.3.2.logrotate | 7 ++ net-im/jabberd2/jabberd2-2.3.2-r1.ebuild | 157 +++++++++++++++++++++++++ 4 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 net-im/jabberd2/files/jabberd2-2.3.2.init create mode 100644 net-im/jabberd2/files/jabberd2-2.3.2.logrotate create mode 100644 net-im/jabberd2/jabberd2-2.3.2-r1.ebuild diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog index cf85b0b99c6d..9ada38967c6c 100644 --- a/net-im/jabberd2/ChangeLog +++ b/net-im/jabberd2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/jabberd2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.61 2014/03/08 23:58:05 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.62 2014/06/01 20:09:54 hasufell Exp $ + +*jabberd2-2.3.2-r1 (01 Jun 2014) + + 01 Jun 2014; Julian Ospald +jabberd2-2.3.2-r1.ebuild, + +files/jabberd2-2.3.2.init, +files/jabberd2-2.3.2.logrotate: + fix logroate script wrt #505596 08 Mar 2014; Julian Ospald jabberd2-2.3.2.ebuild, metadata.xml: diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.init b/net-im/jabberd2/files/jabberd2-2.3.2.init new file mode 100644 index 000000000000..87f0808f801d --- /dev/null +++ b/net-im/jabberd2/files/jabberd2-2.3.2.init @@ -0,0 +1,97 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.3.2.init,v 1.1 2014/06/01 20:09:54 hasufell Exp $ + +extra_commands="reload" + +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_pre() { + checkpath -d -o jabber /var/run/jabber +} + +start() { + + einfo "Starting Jabber Server ..." + local services executable cfgfile pidfile + 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})" + pidfile="$(grep -v ^# ${cfgfile} | grep '' | sed 's#<.\?pidfile>##g')" + start-stop-daemon \ + --background \ + --start \ + --user jabber:jabber \ + --exec /usr/bin/${service} \ + --pid ${pidfile} \ + -- -c ${cfgfile} + eend $? + + done + eoutdent + +} + +reload() { + eindent + for pidfile in /var/run/jabber/*.pid; do + if [ -f "${pidfile}" ]; then + service=$(basename ${pidfile} .pid) + ebegin "Reloading ${service}" + kill -HUP $(cat ${pidfile}) + eend $? + fi + done + eoutdent +} + +stop() { + + einfo "Stopping Jabber Server" + stopJabberServices + +} diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.logrotate b/net-im/jabberd2/files/jabberd2-2.3.2.logrotate new file mode 100644 index 000000000000..ba4628f3a0ad --- /dev/null +++ b/net-im/jabberd2/files/jabberd2-2.3.2.logrotate @@ -0,0 +1,7 @@ +/var/log/jabber/c2s.log /var/log/jabber/s2s.log /var/log/jabber/sm.log /var/log/jabber/router.log { + su jabber jabber + sharedscripts + postrotate + /etc/init.d/jabberd reload + endscript +} diff --git a/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild new file mode 100644 index 000000000000..760b35159b0e --- /dev/null +++ b/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild,v 1.1 2014/06/01 20:09:54 hasufell Exp $ + +EAPI=5 + +inherit db-use eutils flag-o-matic pam + +DESCRIPTION="Open Source Jabber Server" +HOMEPAGE="http://jabberd2.org" +SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" +IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test zlib" +REQUIRED_USE="memdebug? ( debug )" + +# broken +RESTRICT="test" + +DEPEND="dev-libs/expat + net-libs/udns + net-dns/libidn + virtual/gsasl + berkdb? ( >=sys-libs/db-4.1.25 ) + ldap? ( net-nds/openldap ) + mysql? ( virtual/mysql ) + pam? ( virtual/pam ) + postgres? ( dev-db/postgresql-base ) + ssl? ( >=dev-libs/openssl-1.0.1:0 ) + sqlite? ( dev-db/sqlite:3 ) + zlib? ( sys-libs/zlib )" +RDEPEND="${DEPEND} + >=net-im/jabber-base-0.01" +DEPEND="${DEPEND} + app-arch/xz-utils + virtual/pkgconfig + test? ( dev-libs/check )" + +DOCS=( AUTHORS README ) + +S=${WORKDIR}/jabberd-${PV} + +src_prepare() { + # Fix some default directory locations + sed -i \ + -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ + -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ + -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ + -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ + -e 's,@localstatedir@,/var/spool,g' \ + -e 's,@package@,jabber,g' \ + etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!" + + # If the package wasn't merged with sqlite then default to use berkdb + use sqlite || + sed -i \ + -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db,g' \ + etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!" + + # avoid file collision with x11-misc/screen-message wrt #453994 + sed -i \ + -e 's/@jabberd_router_bin@/jabberd2-router/' \ + -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \ + -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \ + -e 's/@jabberd_sm_bin@/jabberd2-sm/' \ + etc/jabberd*.in || die "fixing file collisions failed!" + + # rename pid files wrt #241472 + sed -i \ + -e '/pidfile/s/c2s\.pid/jabberd2-c2s\.pid/' \ + -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \ + -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \ + -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \ + etc/*.xml.dist.in || die "renaming pid files failed!" +} + +src_configure() { + # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3 + # https://github.com/jabberd2/jabberd2/issues/34 + replace-flags -O[3s] -O2 + + # --enable-pool-debug is currently broken + econf \ + --sysconfdir=/etc/jabber \ + $(usex debug "--enable-debug" "") \ + $(usex memdebug "--enable-nad-debug" "") \ + $(use_enable ssl) \ + $(use_enable mysql) \ + $(use_enable postgres pgsql) \ + $(use_enable sqlite) \ + $(use_enable berkdb db) \ + $(use_enable ldap) \ + $(use_enable pam) \ + --enable-pipe \ + --enable-anon \ + --enable-fs \ + $(use_enable experimental) \ + $(use_enable test tests) \ + $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \ + $(use_with zlib) +} + +src_install() { + local i + + default + prune_libtool_files --modules + + keepdir /var/spool/jabber/{fs,db} + fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ + /var/spool/jabber/{fs,db} + fperms 770 /var/spool/jabber/{fs,db} + fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} + + # avoid file collision with x11-misc/screen-message wrt #453994 + for i in router sm c2s s2s ; do + einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" + mv "${ED%/}"/usr/bin/${i} "${ED%/}"/usr/bin/jabberd2-${i} || die + done + + newinitd "${FILESDIR}/${PN}-2.3.2.init" jabberd + newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd + + docompress -x /usr/share/doc/${PF}/tools + docinto tools + dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \ + tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} + + # remove useless upstart files wrt #498900 + rm -rf "${ED%/}"/usr/etc +} + +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 + fi + + if use sqlite || use mysql || use postgres; then + echo + einfo "You will need to setup or update your database using the" + einfo "scripts in /usr/share/doc/${PF}/tools/" + echo + fi + + ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have' + ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because' + ewarn 'the binaries have been renamed to avoid file collisions!' +} -- cgit v1.2.3-65-gdbad