# HG changeset patch # User holger # Date 1300892102 -3600 # Node ID a5d43ca434f7809aff6392be6aa8d490a674dc51 # Parent 4053ff69911f83417e4a07ffb08078e1c2aa2b01 update to rabbitmq 2.4.0, fix init script :/ diff -r 4053ff69911f -r a5d43ca434f7 net-misc/rabbitmq-server/Manifest --- a/net-misc/rabbitmq-server/Manifest Fri Mar 04 12:17:45 2011 +0100 +++ b/net-misc/rabbitmq-server/Manifest Wed Mar 23 15:55:02 2011 +0100 @@ -1,5 +1,5 @@ AUX rabbitmq-script-wrapper 1844 RMD160 255586b0339a8200c63309eaefb952f67712eb0d SHA1 3b4f880d484541e749e3dd0d913adc6a21e4df23 SHA256 46783bc7466f48d8ddc785c5aac2b94d723c811106b6d8251adee170558f316e -AUX rabbitmq-server.init-r1 627 RMD160 bfcb3cdd1301bf497a80613ce18cac03186beb4e SHA1 de798f739de02f0013cca8e063f772cf75f739c9 SHA256 03f0f3c3495ff339d8768b303da302823c75bdd5d1bab1b48c5b69d614aafab9 -DIST rabbitmq-server-2.3.1.tar.gz 301044 RMD160 5e06fe0bae359d0d3d5ea4b2c23e6adbbd89cc19 SHA1 d38e7e12836b94e45402774d5790873413599ab4 SHA256 3bb6c4004031fc3e57c886452e03dd10e2c23cd64f1cca180f34aba5b30d9f24 -EBUILD rabbitmq-server-2.3.1.ebuild 2252 RMD160 459b31bd0d462e3aeea384196a2344ce71ab2b36 SHA1 954f4883d57e0d90ee0f2339e1858602edca9d8b SHA256 492e2b188664c606ebbcf8792e5c4b9351c21ae102e31cc2f4bc5ec39540a99b +AUX rabbitmq-server.init-r1 640 RMD160 74285fbafeeec24b3c9f5e83ec0f65bed9e23a06 SHA1 c68b9493920a25dbad9ad27e462defbff775c582 SHA256 5c4110c077679461105d77f1b1048bf014f6f4a817e402a1f6bc0d93feaa1ae4 +DIST rabbitmq-server-2.4.0.tar.gz 318182 RMD160 6362f4f2bf06f201410132be91edbd64a1577798 SHA1 9f39d830aa778cf8e71fd5eb47c8a42e26c3c42d SHA256 aadad1bb6ae8b7ecba73dbe1c74a2dfd3ac0559018ed0d433af1df9938f67e7f +EBUILD rabbitmq-server-2.4.0.ebuild 2237 RMD160 6afbe2bdea6a454580b6a13b55c73e0b7cea2296 SHA1 a490ffcacdfac87fdd1e50f9c83bf749bad29bc5 SHA256 5b9f6b8b7fe38e8a21578b72922c3d79de01d7d8270fab220ffc212d699a66dd MISC metadata.xml 256 RMD160 d9b3d76f0f3b12500bf0a1e012563f2f32f4992f SHA1 2520f467b4a64d131a92dd8101e03ad334d6d7a6 SHA256 74f2c9d6b7ef600697deed6d19bc64604a39ba7a2e8c24fae47ca2544def84c0 diff -r 4053ff69911f -r a5d43ca434f7 net-misc/rabbitmq-server/files/rabbitmq-server.init-r1 --- a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r1 Fri Mar 04 12:17:45 2011 +0100 +++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r1 Wed Mar 23 15:55:02 2011 +0100 @@ -11,12 +11,12 @@ start() { ebegin "Starting RabbitMQ..." - /usr/sbin/rabbitmq-multi start_all ${NODE_COUNT:-1} >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err + start-stop-daemon --start --background --exec /usr/sbin/rabbitmq-server >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err eend $? } stop() { ebegin "Stopping RabbitMQ..." - /usr/sbin/rabbitmq-multi stop_all >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err + /usr/sbin/rabbitmqctl stop >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err eend $? } diff -r 4053ff69911f -r a5d43ca434f7 net-misc/rabbitmq-server/rabbitmq-server-2.3.1.ebuild --- a/net-misc/rabbitmq-server/rabbitmq-server-2.3.1.ebuild Fri Mar 04 12:17:45 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,83 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.1.0.ebuild,v 1.1 2010/09/19 08:35:51 hollow Exp $ - -EAPI="2" - -inherit eutils - -DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang." -HOMEPAGE="http://www.rabbitmq.com/" -SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz" - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-lang/erlang" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - dev-libs/libxslt - dev-python/simplejson -" - -pkg_setup() { - enewgroup rabbitmq - enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq -} - -src_compile() { - emake all docs_all || die "emake all failed" - gunzip docs/*.gz -} - -src_install() { - # erlang module - local targetdir="/usr/$(get_libdir)/erlang/lib/${P}" - - einfo "Setting correct RABBITMQ_HOME in scripts" - sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ - -i scripts/rabbitmq-env - - einfo "Installing Erlang modules to ${targetdir}" - insinto "${targetdir}" - doins -r ebin include - - einfo "Installing server scripts to /usr/sbin" - for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-multi; do - exeinto /usr/libexec/rabbitmq - doexe scripts/${script} - newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script} - done - - # create the directory where our log file will go. - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/log/rabbitmq - - # create the mnesia directory - diropts -m 0770 -o rabbitmq -g rabbitmq - dodir /var/lib/rabbitmq{,/mnesia} - - # install the init script - newinitd "${FILESDIR}"/rabbitmq-server.init-r1 rabbitmq - - # install documentation - doman docs/*.[15] - dodoc README -} - -pkg_preinst() { - if has_version "<=net-misc/rabbitmq-server-1.8.0"; then - elog "IMPORTANT UPGRADE NOTICE:" - elog - elog "RabbitMQ is now running as an unprivileged user instead of root." - elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database." - elog "Please run the following commands as root:" - elog - elog " usermod -d /var/lib/rabbitmq rabbitmq" - elog " chown rabbitmq:rabbitmq -R /var/lib/rabbitmq" - elog - fi -} diff -r 4053ff69911f -r a5d43ca434f7 net-misc/rabbitmq-server/rabbitmq-server-2.4.0.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-misc/rabbitmq-server/rabbitmq-server-2.4.0.ebuild Wed Mar 23 15:55:02 2011 +0100 @@ -0,0 +1,83 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-2.1.0.ebuild,v 1.1 2010/09/19 08:35:51 hollow Exp $ + +EAPI="2" + +inherit eutils + +DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang." +HOMEPAGE="http://www.rabbitmq.com/" +SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz" + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-lang/erlang" +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.5 + app-text/xmlto + dev-libs/libxslt + dev-python/simplejson +" + +pkg_setup() { + enewgroup rabbitmq + enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq +} + +src_compile() { + emake all docs_all || die "emake all failed" + gunzip docs/*.gz +} + +src_install() { + # erlang module + local targetdir="/usr/$(get_libdir)/erlang/lib/${P}" + + einfo "Setting correct RABBITMQ_HOME in scripts" + sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ + -i scripts/rabbitmq-env + + einfo "Installing Erlang modules to ${targetdir}" + insinto "${targetdir}" + doins -r ebin include + + einfo "Installing server scripts to /usr/sbin" + for script in rabbitmq-env rabbitmq-server rabbitmqctl; do + exeinto /usr/libexec/rabbitmq + doexe scripts/${script} + newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script} + done + + # create the directory where our log file will go. + diropts -m 0770 -o rabbitmq -g rabbitmq + keepdir /var/log/rabbitmq + + # create the mnesia directory + diropts -m 0770 -o rabbitmq -g rabbitmq + dodir /var/lib/rabbitmq{,/mnesia} + + # install the init script + newinitd "${FILESDIR}"/rabbitmq-server.init-r1 rabbitmq + + # install documentation + doman docs/*.[15] + dodoc README +} + +pkg_preinst() { + if has_version "<=net-misc/rabbitmq-server-1.8.0"; then + elog "IMPORTANT UPGRADE NOTICE:" + elog + elog "RabbitMQ is now running as an unprivileged user instead of root." + elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database." + elog "Please run the following commands as root:" + elog + elog " usermod -d /var/lib/rabbitmq rabbitmq" + elog " chown rabbitmq:rabbitmq -R /var/lib/rabbitmq" + elog + fi +}