From 336ce78c6c6e0ee9a1a3d27ab27ca53c69ca526a Mon Sep 17 00:00:00 2001 From: Thomas Anderson Date: Sat, 28 Jun 2008 11:24:36 +0000 Subject: Revision bump, fixes bug #229313. Thanks to Thomas Arnett for reporting with a patch and some ebuild enhancements. Adds more USE flags for optional dependencies Package-Manager: portage-2.1.4.4 --- net-im/jabberd2/ChangeLog | 11 +- net-im/jabberd2/Manifest | 11 +- .../jabberd2/files/jabberd2-2.2.0-apr_base64.patch | 28 +++++ net-im/jabberd2/jabberd2-2.2.0-r1.ebuild | 140 +++++++++++++++++++++ net-im/jabberd2/jabberd2-2.2.0.ebuild | 109 ---------------- 5 files changed, 184 insertions(+), 115 deletions(-) create mode 100644 net-im/jabberd2/files/jabberd2-2.2.0-apr_base64.patch create mode 100644 net-im/jabberd2/jabberd2-2.2.0-r1.ebuild delete mode 100644 net-im/jabberd2/jabberd2-2.2.0.ebuild (limited to 'net-im/jabberd2') diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog index 9c4ba6d23b33..74e6fb65ae51 100644 --- a/net-im/jabberd2/ChangeLog +++ b/net-im/jabberd2/ChangeLog @@ -1,6 +1,15 @@ # 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.14 2008/06/23 13:15:40 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.15 2008/06/28 11:24:35 gentoofan23 Exp $ + +*jabberd2-2.2.0-r1 (28 Jun 2008) + + 28 Jun 2008; Thomas Anderson + +files/jabberd2-2.2.0-apr_base64.patch, -jabberd2-2.2.0.ebuild, + +jabberd2-2.2.0-r1.ebuild: + Revision bump, fixes bug #229313. Thanks to Thomas Arnett for reporting with + a patch and some ebuild enhancements. Adds more USE flags for optional + dependencies *jabberd2-2.2.0 (23 Jun 2008) diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest index b567911736e3..82e74f6112b4 100644 --- a/net-im/jabberd2/Manifest +++ b/net-im/jabberd2/Manifest @@ -1,16 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX jabberd2-2.2.0-apr_base64.patch 627 RMD160 4d6d94ffe80e4f891943723d15f7074a99393384 SHA1 986b994ec2871288fa21570487a53f3b9d0d9f31 SHA256 e8b1b12c717a1cd82132e4c1f912fc550edbee078f02f4fd47ac06f1cfad5816 AUX jabberd2-2.2.0.init 1625 RMD160 7e0d90a32df91da1e2e00df20aa25df081e34eb8 SHA1 07d90136a1c4fad30384a76a6366d2ae36310271 SHA256 a2d48c850063019e1763d62061b1c0ab3af0a1f32356f4caf5b27a7aa19062c5 AUX jabberd2-2.2.0.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b DIST jabberd-2.2.0.tar.bz2 648710 RMD160 4cf76bd8306d8255517d19da4b99d8bc654f4977 SHA1 a3774e165dffc098e9f815ddabc6fad5073d775d SHA256 6b0bf3b56c70ce17dcefd176c83bee3c175d97dd4038ef95931fde05e6de9895 -EBUILD jabberd2-2.2.0.ebuild 2864 RMD160 32849aaceb630a3195846acb339170b6409f43d6 SHA1 9bae8fd227f892ff44bc1c04972351e817e90233 SHA256 7fba8d6c7f0769df7d7749c720f8aac9d7acebe4aae70eb60b1eae732825970c -MISC ChangeLog 2666 RMD160 39d5c6f7cc28ded289a37d7528602c8a7b6ad1f5 SHA1 e1aa6f27e88dcdbf9a625c2eda951be29a49d45b SHA256 8f9a925e5de76a9df4fa576a6acdbeaf9658b97f80c1f7b5ef247f159f8df25e +EBUILD jabberd2-2.2.0-r1.ebuild 3780 RMD160 6a1c09eee528551c55486d62fe403da0afa1883c SHA1 6fee1a86cdda4bae649a2a067944f885f027a260 SHA256 77f2ef9722bd38fe22c9f256c88d56dc93cc33812dd3ae3b1283d7138a19fd14 +MISC ChangeLog 3019 RMD160 5344ad1b263527b53c93f70deddbf8fc5abe4ec9 SHA1 d8144824a7ba4a34a53c5c740cd39535a0fafca1 SHA256 01ea400b40b7145525e01a4dd3d3d71c10ff7ad6d289425c1444bbc1c61385ea MISC metadata.xml 533 RMD160 e5c0fd1596a3959e5c30ed3e721b2b4754aaa50e SHA1 09a5de789c18f50ba3e3f18183712131d0d7c4ee SHA256 b3efa5e5aa69ae20f1c154b175fa5a83e71d78155dcd1e549821494dbf6a8f09 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkhfpWsACgkQF6yMcaBxwHnhugCePdr3HZH9eY/+NxEppqB83obY -fxYAoJE4mgB5ZSvpaZhAar4iBF6sQ8Eo -=S3WE +iEYEARECAAYFAkhmIuoACgkQF6yMcaBxwHkR3gCfV6nEf7+4axg8tdJF1BcnTvsh +8mUAn2b7CRb5r+FjSHyJ58CjEbXTllPW +=p8bY -----END PGP SIGNATURE----- diff --git a/net-im/jabberd2/files/jabberd2-2.2.0-apr_base64.patch b/net-im/jabberd2/files/jabberd2-2.2.0-apr_base64.patch new file mode 100644 index 000000000000..95582713d689 --- /dev/null +++ b/net-im/jabberd2/files/jabberd2-2.2.0-apr_base64.patch @@ -0,0 +1,28 @@ +--- util/base64.c ++++ util/base64.c +@@ -167,10 +167,10 @@ + if(len == 0) + len = strlen(buf); + +- elen = ap_base64encode_len(len); ++ elen = apr_base64_encode_len(len); + out = (char *) malloc(sizeof(char) * (elen + 1)); + +- ap_base64encode(out, buf, len); ++ apr_base64_encode(out, buf, len); + + return out; + } +@@ -179,10 +179,10 @@ + int elen; + char *out; + +- elen = ap_base64decode_len(buf, -1); ++ elen = apr_base64_decode_len(buf, -1); + out = (char *) malloc(sizeof(char) * (elen + 1)); + +- ap_base64decode(out, buf, -1); ++ apr_base64_decode(out, buf, -1); + + return out; + } diff --git a/net-im/jabberd2/jabberd2-2.2.0-r1.ebuild b/net-im/jabberd2/jabberd2-2.2.0-r1.ebuild new file mode 100644 index 000000000000..c4116d208a75 --- /dev/null +++ b/net-im/jabberd2/jabberd2-2.2.0-r1.ebuild @@ -0,0 +1,140 @@ +# 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.0-r1.ebuild,v 1.1 2008/06/28 11:24:35 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 pipe postgres sqlite ssl zlib" + +DEPEND="dev-libs/expat + zlib? ( sys-libs/zlib ) + ssl? ( >=dev-libs/openssl-0.9.6b ) + net-libs/udns + >=net-dns/libidn-0.3 + ldap? ( net-nds/openldap ) + berkdb? ( >=sys-libs/db-4.1.24 ) + pam? ( virtual/pam ) + mysql? ( virtual/mysql ) + postgres? ( virtual/postgresql-server ) + sqlite? ( >=dev-db/sqlite-3 ) + >=virtual/gsasl-0.2.26" +RDEPEND="${DEPEND} + >=net-im/jabber-base-0.01 + !net-im/jabberd" + +S="${WORKDIR}/jabberd-${PV}" + +pkg_setup() { + if ! use berkdb && ! use postgres && ! use mysql && ! use sqlite; then + eerror 'You have no storage backend selected.' + eerror 'Please set one of the following USE flags:' + eerror ' berkdb' + eerror ' postgres' + eerror ' mysql' + eerror ' sqlite' + die 'Please enable one of the storage backends mentioned.' + fi + + if ! use berkdb && ! use mysql && ! use postgres \ + && ! use pam && ! use ldap; then + eerror 'You have no Authentication mechanism selected.' + eerror 'Please set one of the following USE flags for authentication:' + eerror ' berkdb' + eerror ' mysql' + eerror ' postgres' + eerror ' pam' + eerror ' ldap' + die 'Please enable one of the authentication mechanisms mentioned.' + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-apr_base64.patch +} + +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 \ + ${myconf} \ + $(use_enable berkdb db) + $(use_enable ldap) \ + $(use_enable mysql) \ + $(use_enable pam) \ + $(use_enable pipe) \ + $(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,resolver,sm,c2s,s2s} + fperms 750 /usr/bin/{jabberd,router,resolver,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 + +} diff --git a/net-im/jabberd2/jabberd2-2.2.0.ebuild b/net-im/jabberd2/jabberd2-2.2.0.ebuild deleted file mode 100644 index e57ed3ddd944..000000000000 --- a/net-im/jabberd2/jabberd2-2.2.0.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# 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.0.ebuild,v 1.1 2008/06/23 13:15:40 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="debug memdebug ipv6 ldap mysql pam pipe postgres sqlite" - -DEPEND="dev-libs/expat - >=dev-libs/openssl-0.9.6b - net-libs/udns - >=net-dns/libidn-0.3 - ldap? ( net-nds/openldap ) - >=sys-libs/db-4.1.24 - pam? ( virtual/pam ) - mysql? ( virtual/mysql ) - postgres? ( virtual/postgresql-server ) - sqlite? ( >=dev-db/sqlite-3 ) - >=virtual/gsasl-0.2.26" -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 - - local myconf="--with-sasl=gsasl" - - 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-db \ - --with-extra-include-path=$(db_includedir) \ - ${myconf} \ - $(use_enable ipv6) \ - $(use_enable ldap) \ - $(use_enable mysql) \ - $(use_enable pam) \ - $(use_enable pipe) \ - $(use_enable postgres pgsql) \ - $(use_enable sqlite) - emake || die "make failed" - -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - fowners jabber:jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s} - fperms 750 /usr/bin/{jabberd,router,resolver,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