Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 485404 - net-im/prosody - add optional support for dev-libs/cyrus-sasl
Summary: net-im/prosody - add optional support for dev-libs/cyrus-sasl
Status: UNCONFIRMED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Rafael Martins
URL: http://prosody.im/doc/cyrus_sasl
Whiteboard:
Keywords: EBUILD, PATCH
Depends on:
Blocks:
 
Reported: 2013-09-19 12:03 UTC by bsod
Modified: 2013-09-19 16:19 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
the changed prosody ebuild (prosody-0.9.1-r1.ebuild,2.40 KB, text/plain)
2013-09-19 12:05 UTC, bsod
Details
The lua-cyrussasl dependency (lua-cyrussasl-1.0.0.ebuild,1.33 KB, text/plain)
2013-09-19 12:06 UTC, bsod
Details
Makefile Patch required by the lua-cyrussasl ebuild. (lua-cyrussasl-update_makefile.patch,1.02 KB, patch)
2013-09-19 12:07 UTC, bsod
Details | Diff
changed 0.9.1-r1 ebuild (prosody-0.9.1-r1.ebuild,2.33 KB, text/plain)
2013-09-19 16:19 UTC, bsod
Details

Note You need to log in before you can comment on or make changes to this bug.
Description bsod 2013-09-19 12:03:56 UTC
prosody allows us to use cyrus-sasl as authentication provider. But the dependencies are not in the portage tree.

Reproducible: Always




I have added the required dependency and the changed ebuild to my private overlay:
https://github.com/matthid/gentoo-overlay/tree/master/dev-lua/lua-cyrussasl and https://github.com/matthid/gentoo-overlay/tree/master/net-im/prosody.
But I will add them as attachments also.
Comment 1 bsod 2013-09-19 12:05:50 UTC
Created attachment 359002 [details]
the changed prosody ebuild
Comment 2 bsod 2013-09-19 12:06:57 UTC
Created attachment 359004 [details]
The lua-cyrussasl dependency

This is the dependency I was refering to
Comment 3 bsod 2013-09-19 12:07:50 UTC
Created attachment 359006 [details, diff]
Makefile Patch required by the lua-cyrussasl ebuild.
Comment 4 bsod 2013-09-19 12:08:49 UTC
Comment on attachment 359002 [details]
the changed prosody ebuild

Basically The only thing changed is the "sasl? ( dev-lua/lua-cyrussasl )" dependency
Comment 5 Jeroen Roovers gentoo-dev 2013-09-19 14:48:07 UTC
Comment on attachment 359002 [details]
the changed prosody ebuild

Hm, CRLF?

wget -q https://bugs.gentoo.org/attachment.cgi?id=359002 -O - | dos2unix | diff -u prosody-0.8.2-r1.ebuild  -
--- prosody-0.8.2-r1.ebuild     2013-08-14 16:56:49.655439737 +0200
+++ -   2013-09-19 16:47:42.893630392 +0200
@@ -1,12 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.2-r1.ebuild,v 1.2 2013/08/08 19:27:35 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.8.2.ebuild,v 1.4 2012/10/21 09:10:40 maekke Exp $
 
-EAPI="5"
+EAPI=5
 
-inherit eutils multilib systemd toolchain-funcs versionator
+inherit eutils multilib systemd toolchain-funcs flag-o-matic multilib versionator
 
 MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
 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"
@@ -14,65 +15,63 @@
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="libevent mysql postgres sqlite ssl zlib"
+IUSE="ipv6 libevent mysql postgres sqlite ssl zlib sasl"
 
 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 )
+               sasl? ( dev-lua/lua-cyrussasl )         
                dev-lua/luaexpat
                dev-lua/luafilesystem
-               mysql? ( >=dev-lua/luadbi-0.5[mysql] )
-               postgres? ( >=dev-lua/luadbi-0.5[postgres] )
-               sqlite? ( >=dev-lua/luadbi-0.5[sqlite] )
-               libevent? ( dev-lua/luaevent )
+               ipv6? ( >=dev-lua/luasocket-3 )
+               !ipv6? ( dev-lua/luasocket )            
+               libevent? ( dev-lua/luaevent )          
+               mysql? ( dev-lua/luadbi[mysql] )
+               postgres? ( dev-lua/luadbi[postgres] )
+               sqlite? ( dev-lua/luadbi[sqlite] )
+               ssl? ( dev-lua/luasec )
                zlib? ( dev-lua/lua-zlib )"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+S=${WORKDIR}/${MY_P}
 
 JABBER_ETC="/etc/jabber"
 JABBER_SPOOL="/var/spool/jabber"
 
 src_prepare() {
-       epatch "${FILESDIR}/${PN}-0.8.0-cfg.lua.patch"
-
-       # Modify config to let prosodyctl work by default
-       sed -i -e 's/--"posix"/"posix"/' prosody.cfg.lua.dist || die
+       sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+               -e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
+               -e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
+               -e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
+                Makefile || die
 
-       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" \
+    append-cflags -D_GNU_SOURCE
+    ./configure \
+        --ostype=linux \
+        --prefix="/usr" \
                --sysconfdir="${JABBER_ETC}" \
                --datadir="${JABBER_SPOOL}" \
+               --with-lua-include=/usr/include \
                --with-lua-lib=/usr/$(get_libdir)/lua \
-               --c-compiler="$(tc-getCC)" --linker="$(tc-getCC)" \
                --cflags="${CFLAGS} -Wall -fPIC" \
                --ldflags="${LDFLAGS} -shared" \
+        --c-compiler="$(tc-getCC)" \
+        --linker="$(tc-getCC)" \
                --require-config || die "configure failed"
 }
 
 src_install() {
-       DESTDIR="${D}" emake install
+       emake DESTDIR="${D}" install
        newinitd "${FILESDIR}/${PN}".initd ${PN}
-       systemd_dounit "${FILESDIR}/${PN}".service
-       systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
 }
 
 src_test() {
-       cd tests
-       ./run_tests.sh
-}
-
-pkg_postinst() {
-       elog "Please note that the module 'console' has been renamed to 'admin_telnet'."
+       cd tests || die
+       ./run_tests.sh || die
 }
Comment 6 bsod 2013-09-19 16:19:30 UTC
Created attachment 359030 [details]
changed 0.9.1-r1 ebuild

Hope this one is better. However this ebuild is not really important as the changes should work on all prosody ebuilds (adding 
"		sasl? ( dev-lua/lua-cyrussasl )	"
dependency + sasl use flag)

I uploaded the files using a windows machine, downloading them from github should give you the correct line endings though.