From fa43f526594d4fb3bca033c437ecd76251ce368f Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Thu, 7 Apr 2011 17:09:59 +0200 Subject: Prosody 0.8.0 --- net-im/prosody/Manifest | 7 +-- net-im/prosody/files/prosody-0.8.0.cfg.lua.patch | 26 ++++++++++ net-im/prosody/files/prosody.initd | 4 +- net-im/prosody/prosody-0.8.0.ebuild | 66 ++++++++++++++++++++++++ net-im/prosody/prosody-0.8.0_rc2.ebuild | 64 ----------------------- 5 files changed, 98 insertions(+), 69 deletions(-) create mode 100644 net-im/prosody/files/prosody-0.8.0.cfg.lua.patch create mode 100644 net-im/prosody/prosody-0.8.0.ebuild delete mode 100644 net-im/prosody/prosody-0.8.0_rc2.ebuild (limited to 'net-im') diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest index 23fe6f3..987e8c4 100644 --- a/net-im/prosody/Manifest +++ b/net-im/prosody/Manifest @@ -1,7 +1,8 @@ AUX prosody-0.6.2-cfg.lua.patch 637 RMD160 b3bdeaffbb8318debd9e99d006451ae9fb3cb514 SHA1 355faa0dfee2616c4a30a2393f5879c70666d572 SHA256 06057f56a0858b2d4596de874b8ea3465a984fe3dbebab0d58a10359c74dd94d AUX prosody-0.7.0-cfg.lua.patch 1517 RMD160 ea1e8459c61d93e1b196177a42f089e153c79f8e SHA1 635bdc90428249d5846eabaf7cb8bac975dee3c5 SHA256 5bc54faaf365be5a3568f201fa53f0ff094bb51bb4d8300cdca60ec8aaffb4e8 -AUX prosody.initd 1148 RMD160 54de6d4b97600024cfd8624fa10240a1e0a430e8 SHA1 c75e361c36e27adc880517d02a0e3089f200fd97 SHA256 e520a55d4a10fc7fce24ce7b57e722846d2814e6726407acba606af519de19e8 +AUX prosody-0.8.0.cfg.lua.patch 1097 RMD160 eba74dba5b9dca69f3a211d722a81ad20ecc9399 SHA1 f0a00f9f895909e4f17ce13cee64a6b5f2676c7c SHA256 944b31092a49b7d386aeedffd8b7398c9f927439e06cb2ffd8cf67fb2b914808 +AUX prosody.initd 1062 RMD160 2e9ba3ba0e759355ec07fc16782f17b74074c6d5 SHA1 a62d975b12e0bd485c80ccfcca8d6a6e6c09fc8d SHA256 6b88ffcf2fd7a38030480073b19f99e8dc078e6008e8adf8f9e00827a37b7981 DIST prosody-0.7.0.tar.gz 177412 RMD160 2e40b4f807b6120971c611f52d4df3264a82cbb9 SHA1 3f3a6c4f262a062a9c027cc843cd6827104fb8ba SHA256 a8b826805dd55282706c5683c2028899b3721eb0f84d3e35c0509a6c1bc32390 -DIST prosody-0.8.0rc2.tar.gz 210391 RMD160 93e3925c575cabbd399b5b0460c141dd03513c45 SHA1 5442e8bb8de95c55c24324d5c57d04d51c6b14a7 SHA256 75c0124044aebfb0a5567fe7d106288f25070796b0f81c256d076db7c3a4f6d8 +DIST prosody-0.8.0.tar.gz 210945 RMD160 98817b1f40c6fd9ab402b70f73dae308e5990cdc SHA1 f20baab36bd2570825a24f49e0643cb9c2a65541 SHA256 0b9e39a6b555b4c848af288f27107e99b1480d9733556a2c9b3a9f249eba602d EBUILD prosody-0.7.0.ebuild 2082 RMD160 c143b7de9495f3bb068bc89e98aea552fa669846 SHA1 2f0de036674b644e6386923f679f690d9b831a99 SHA256 5d4efc6be5fda92dd4ead4d13a8ca801be47a7335d522114e589813a586e4bf2 -EBUILD prosody-0.8.0_rc2.ebuild 1949 RMD160 8ba5b685668420af29dda22949ae8b447152b6b2 SHA1 8ea50d5e055bca1f431b70c0d9254c5cb5602551 SHA256 85ad54ca9c4b9d94ed8220f7995e45c05be92384d5fae166367bcb9b6dc593ea +EBUILD prosody-0.8.0.ebuild 2036 RMD160 64fece90eb5d15dd5a1622a248b91e2376093923 SHA1 869720f93cfa6a95490963ddeea35591e65ccf61 SHA256 005bf1e6d4e34b432eb15dd194166554e0b967ff571bceb8d2bb6dfd41af8915 diff --git a/net-im/prosody/files/prosody-0.8.0.cfg.lua.patch b/net-im/prosody/files/prosody-0.8.0.cfg.lua.patch new file mode 100644 index 0000000..a5cbab2 --- /dev/null +++ b/net-im/prosody/files/prosody-0.8.0.cfg.lua.patch @@ -0,0 +1,26 @@ +--- prosody.cfg.lua.dist.old 2011-01-13 02:29:32.000000000 +0100 ++++ prosody.cfg.lua.dist 2011-01-14 17:17:28.000000000 +0100 +@@ -114,15 +114,20 @@ + -- to update the logrotate config at /etc/logrotate.d/prosody + log = { + -- Log all error messages to prosody.err +- error = "/var/log/prosody/prosody.err"; ++ error = "/var/log/jabber/prosody.err"; + -- Log everything of level "info" and higher (that is, all except "debug" messages) + -- to prosody.log +- info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for more verbose logging ++ info = "/var/log/jabber/prosody.log"; -- Change 'info' to 'debug' for more verbose logging + --"*syslog"; -- Uncomment this for logging to syslog + } + + -- Pidfile, used by prosodyctl and the init.d script +-pidfile = "/var/run/prosody/prosody.pid"; ++pidfile = "/var/run/jabber/prosody.pid"; ++ ++-- User and group, used for daemon ++prosody_user = "jabber"; ++prosody_group = "jabber"; ++ + + ----------- Virtual hosts ----------- + -- You need to add a VirtualHost entry for each domain you wish Prosody to serve. diff --git a/net-im/prosody/files/prosody.initd b/net-im/prosody/files/prosody.initd index 02a1fdc..9cb1340 100644 --- a/net-im/prosody/files/prosody.initd +++ b/net-im/prosody/files/prosody.initd @@ -1,14 +1,14 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/files/prosody.initd,v 1.1 2010/05/27 11:47:12 djc Exp $ +# $Header: $ description="Prosody is a server for Jabber/XMPP written in Lua." description_reload="Reload configuration and reopen log files." extra_started_commands="reload" PIDFILE="/var/run/jabber/prosody.pid" -USER="jabber" +USER="jabber:jabber" COMMAND="/usr/bin/prosody" depend() { diff --git a/net-im/prosody/prosody-0.8.0.ebuild b/net-im/prosody/prosody-0.8.0.ebuild new file mode 100644 index 0000000..75bf13b --- /dev/null +++ b/net-im/prosody/prosody-0.8.0.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.7.0.ebuild,v 1.2 2011/03/22 20:59:44 ulm Exp $ + +EAPI="2" + +inherit eutils multilib toolchain-funcs versionator + +MY_PV=$(replace_version_separator 3 '') +DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua." +HOMEPAGE="http://prosody.im/" +SRC_URI="http://prosody.im/downloads/source/${PN}-${MY_PV}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libevent ssl sql +zlib" + +DEPEND="net-im/jabber-base + >=dev-lang/lua-5.1 + >=net-dns/libidn-1.1 + >=dev-libs/openssl-0.9.8" +RDEPEND="${DEPEND} + dev-lua/luasocket + ssl? ( dev-lua/luasec ) + dev-lua/luaexpat + dev-lua/luafilesystem + sql? ( >=dev-lua/luadbi-0.5 ) + libevent? ( dev-lua/luaevent ) + zlib? ( dev-lua/lua-zlib )" + +S="${WORKDIR}/${PN}-${MY_PV}" + +JABBER_ETC="/etc/jabber" +JABBER_SPOOL="/var/spool/jabber" + +src_prepare() { + epatch "${FILESDIR}/${PN}-${PV}.cfg.lua.patch" + sed -i "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile + sed -i "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile + sed -i "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!" Makefile + sed -i "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!" Makefile +} + +src_configure() { + # the configure script is handcrafted (and yells at unknown options) + # hence do not use 'econf' + ./configure --prefix="/usr" \ + --sysconfdir="${JABBER_ETC}" \ + --datadir="${JABBER_SPOOL}" \ + --with-lua-lib=/usr/$(get_libdir)/lua \ + --c-compiler="$(tc-getCC)" --linker="$(tc-getCC)" \ + --cflags="${CFLAGS} -Wall -fPIC" \ + --ldflags="${LDFLAGS} -shared" \ + --require-config || die "configure failed" +} + +src_install() { + DESTDIR="${D}" emake install || die "make failed" + newinitd "${FILESDIR}/${PN}".initd ${PN} +} + +src_test() { + cd tests + ./run_tests.sh +} diff --git a/net-im/prosody/prosody-0.8.0_rc2.ebuild b/net-im/prosody/prosody-0.8.0_rc2.ebuild deleted file mode 100644 index 170dff1..0000000 --- a/net-im/prosody/prosody-0.8.0_rc2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.7.0.ebuild,v 1.2 2011/03/22 20:59:44 ulm Exp $ - -EAPI="2" - -inherit eutils multilib toolchain-funcs versionator - -MY_PV=$(replace_version_separator 3 '') -DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua." -HOMEPAGE="http://prosody.im/" -SRC_URI="http://prosody.im/tmp/${MY_PV}/${PN}-${MY_PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libevent ssl +zlib" - -DEPEND="net-im/jabber-base - >=dev-lang/lua-5.1 - dev-lua/luasocket - ssl? ( dev-lua/luasec ) - dev-lua/luaexpat - dev-lua/luafilesystem - libevent? ( dev-lua/luaevent ) - >=net-dns/libidn-1.1 - >=dev-libs/openssl-0.9.8" -RDEPEND="${DEPEND} - zlib? ( dev-lua/lua-zlib )" - -S="${WORKDIR}/${PN}-${MY_PV}" - -JABBER_ETC="/etc/jabber" -JABBER_SPOOL="/var/spool/jabber" - -src_prepare() { - sed -i "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile - sed -i "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile - sed -i "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!" Makefile - sed -i "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!" Makefile -} - -src_configure() { - # the configure script is handcrafted (and yells at unknown options) - # hence do not use 'econf' - ./configure --prefix="/usr" \ - --sysconfdir="${JABBER_ETC}" \ - --datadir="${JABBER_SPOOL}" \ - --with-lua-lib=/usr/$(get_libdir)/lua \ - --c-compiler="$(tc-getCC)" --linker="$(tc-getCC)" \ - --cflags="${CFLAGS} -Wall -fPIC" \ - --ldflags="${LDFLAGS} -shared" \ - --require-config || die "configure failed" -} - -src_install() { - DESTDIR="${D}" emake install || die "make failed" - newinitd "${FILESDIR}/${PN}".initd ${PN} -} - -src_test() { - cd tests - ./run_tests.sh -} -- cgit v1.2.3-70-g09d2