From 59fdee13d9320445d06f564d7630fdb6fd69e0ee Mon Sep 17 00:00:00 2001 From: Thomas Anderson Date: Wed, 30 Jul 2008 11:34:36 +0000 Subject: Version bump, bug #232919 Package-Manager: portage-2.1.4.4 --- net-im/jabberd2/ChangeLog | 11 +- net-im/jabberd2/Manifest | 17 ++- .../jabberd2/files/jabberd2-2.2.0-apr_base64.patch | 28 ----- net-im/jabberd2/files/jabberd2-2.2.0.init | 77 -------------- net-im/jabberd2/files/jabberd2-2.2.0.pamd | 6 -- net-im/jabberd2/files/jabberd2-2.2.1.init | 77 ++++++++++++++ net-im/jabberd2/files/jabberd2-2.2.1.pamd | 6 ++ net-im/jabberd2/jabberd2-2.2.0-r2.ebuild | 116 --------------------- net-im/jabberd2/jabberd2-2.2.1.ebuild | 110 +++++++++++++++++++ 9 files changed, 211 insertions(+), 237 deletions(-) delete mode 100644 net-im/jabberd2/files/jabberd2-2.2.0-apr_base64.patch delete mode 100644 net-im/jabberd2/files/jabberd2-2.2.0.init delete mode 100644 net-im/jabberd2/files/jabberd2-2.2.0.pamd create mode 100644 net-im/jabberd2/files/jabberd2-2.2.1.init create mode 100644 net-im/jabberd2/files/jabberd2-2.2.1.pamd delete mode 100644 net-im/jabberd2/jabberd2-2.2.0-r2.ebuild create mode 100644 net-im/jabberd2/jabberd2-2.2.1.ebuild (limited to 'net-im/jabberd2') diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog index 7e66d222a6e1..e72001462898 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.20 2008/07/28 14:55:31 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.21 2008/07/30 11:34:36 gentoofan23 Exp $ + +*jabberd2-2.2.1 (30 Jul 2008) + + 30 Jul 2008; Thomas Anderson + -files/jabberd2-2.2.0-apr_base64.patch, -files/jabberd2-2.2.0.init, + -files/jabberd2-2.2.0.pamd, +files/jabberd2-2.2.1.init, + +files/jabberd2-2.2.1.pamd, -jabberd2-2.2.0-r2.ebuild, + +jabberd2-2.2.1.ebuild: + Version bump, bug #232919 28 Jul 2008; Thomas Anderson jabberd2-2.2.0-r2.ebuild: diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest index ff8e95f890e1..18325e21bed3 100644 --- a/net-im/jabberd2/Manifest +++ b/net-im/jabberd2/Manifest @@ -1,17 +1,16 @@ -----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-r2.ebuild 3034 RMD160 1b7cd1ffefda67f33b6044f3e37ed9bce08c63aa SHA1 35b688be64904418b5e72555c6ec4b15570e6c70 SHA256 0522cbcee1f450ac43d0c1e218a03faa4d4421264a4d46a61beb0ea6a33d82b1 -MISC ChangeLog 4145 RMD160 c0999eea3f5941502ad0f54184bd56d8f51765cf SHA1 455a788eec933f06c244436ca8b362eca0482947 SHA256 9be4e8917d48986cf6db8f0c1b01f0499f8701bfe3b8fd8ac68861c77f011bde +AUX jabberd2-2.2.1.init 1625 RMD160 eb56ebb821ca11bdd09ddf07ba0899f75273e022 SHA1 d7116a599165535d8adf64da89e31f5342309291 SHA256 23c37f789d84575824a3cd8d009c88e7035ca1222cdb24e0c8437e1a6e55bec1 +AUX jabberd2-2.2.1.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b +DIST jabberd-2.2.1.tar.bz2 645496 RMD160 572cd477797e6a75a7e2c6e43e66f280c8fe98d4 SHA1 4316662fb321690584ead8b0a5fbde8c6e177895 SHA256 6790e4f76febc2889bbe463c85879a4cccc9e6d72f98c9d0bb2a6fe0fa848aa6 +EBUILD jabberd2-2.2.1.ebuild 2945 RMD160 bade915a4533fcf738f15960e60a96be90db660e SHA1 ff994b285068dbb3a40ed897842be4e2e8db52fd SHA256 2d1c5f778b2c448ea695bf10f819421b39fe3531de71c91c26b4ecd1d9958894 +MISC ChangeLog 4472 RMD160 a57f4c5bf0f361678c0718b6d3ea5b83db7cd6dd SHA1 ea54cb7692543e9c87466c11b831aa3620392fed SHA256 f13dbdcc550725690cf0ba3d98bcda3f5409dd130aa01b392c562e0e5fc12e94 MISC metadata.xml 436 RMD160 91ffd82a7986ad956a2f9a1a9af4b5105f5e80ea SHA1 c4d45874b2d31a54154e59bd2f7a425728c7afe8 SHA256 29e7a55e7ca18f68628c8596b22ce2766e70247a7b586da4e4fc68efb1e08238 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkiN4XoACgkQF6yMcaBxwHmbqwCeMFGdPVGUhXIYoWs1Oavpe/0W -5TYAoLKLQG3ZLXacdkyCY72cry81VrCI -=UiHM +iEYEARECAAYFAkiQVXYACgkQF6yMcaBxwHn0zgCbB8qLZvqYFMhtOGXnvtFnbpVc +HS4AoLVVo9oEHQp8jsUU0EfYM83sBAdA +=AAz0 -----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 deleted file mode 100644 index 95582713d689..000000000000 --- a/net-im/jabberd2/files/jabberd2-2.2.0-apr_base64.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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/files/jabberd2-2.2.0.init b/net-im/jabberd2/files/jabberd2-2.2.0.init deleted file mode 100644 index 9169e3c7aa24..000000000000 --- a/net-im/jabberd2/files/jabberd2-2.2.0.init +++ /dev/null @@ -1,77 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.0.init,v 1.1 2008/06/23 13:15:41 gentoofan23 Exp $ - -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() { - - einfo "Starting Jabber Server ..." - local services - 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})" - start-stop-daemon \ - --background \ - --start \ - --chuid jabber:jabber \ - --exec /usr/bin/${service} \ - --pid /var/run/jabber/$(basename ${cfgfile%.xml}).pid \ - -- -c ${cfgfile} - eend $? - - done - eoutdent - -} - -stop() { - - einfo "Stopping Jabber Server" - stopJabberServices - -} diff --git a/net-im/jabberd2/files/jabberd2-2.2.0.pamd b/net-im/jabberd2/files/jabberd2-2.2.0.pamd deleted file mode 100644 index 2c5a5347ad6a..000000000000 --- a/net-im/jabberd2/files/jabberd2-2.2.0.pamd +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 - -auth required pam_nologin.so -auth include system-auth -account include system-auth -session include system-auth diff --git a/net-im/jabberd2/files/jabberd2-2.2.1.init b/net-im/jabberd2/files/jabberd2-2.2.1.init new file mode 100644 index 000000000000..085e6d0853e2 --- /dev/null +++ b/net-im/jabberd2/files/jabberd2-2.2.1.init @@ -0,0 +1,77 @@ +#!/sbin/runscript +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.1.init,v 1.1 2008/07/30 11:34:36 gentoofan23 Exp $ + +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() { + + einfo "Starting Jabber Server ..." + local services + 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})" + start-stop-daemon \ + --background \ + --start \ + --chuid jabber:jabber \ + --exec /usr/bin/${service} \ + --pid /var/run/jabber/$(basename ${cfgfile%.xml}).pid \ + -- -c ${cfgfile} + eend $? + + done + eoutdent + +} + +stop() { + + einfo "Stopping Jabber Server" + stopJabberServices + +} diff --git a/net-im/jabberd2/files/jabberd2-2.2.1.pamd b/net-im/jabberd2/files/jabberd2-2.2.1.pamd new file mode 100644 index 000000000000..2c5a5347ad6a --- /dev/null +++ b/net-im/jabberd2/files/jabberd2-2.2.1.pamd @@ -0,0 +1,6 @@ +#%PAM-1.0 + +auth required pam_nologin.so +auth include system-auth +account include system-auth +session include system-auth diff --git a/net-im/jabberd2/jabberd2-2.2.0-r2.ebuild b/net-im/jabberd2/jabberd2-2.2.0-r2.ebuild deleted file mode 100644 index 658fe5c55488..000000000000 --- a/net-im/jabberd2/jabberd2-2.2.0-r2.ebuild +++ /dev/null @@ -1,116 +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-r2.ebuild,v 1.3 2008/07/28 14:55:31 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 postgres sqlite ssl zlib" - -DEPEND="dev-libs/expat - net-libs/udns - >=net-dns/libidn-0.3 - >=virtual/gsasl-0.2.26 - berkdb? ( >=sys-libs/db-4.1.24 ) - mysql? ( virtual/mysql ) - ldap? ( net-nds/openldap ) - pam? ( virtual/pam ) - postgres? ( virtual/postgresql-base ) - ssl? ( >=dev-libs/openssl-0.9.6b ) - sqlite? ( >=dev-db/sqlite-3 ) - zlib? ( sys-libs/zlib )" -RDEPEND="${DEPEND} - >=net-im/jabber-base-0.01 - !net-im/jabberd" - -S="${WORKDIR}/jabberd-${PV}" - -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 \ - --enable-fs --enable-pipe --enable-anon \ - ${myconf} \ - $(use_enable berkdb db) \ - $(use_enable ldap) \ - $(use_enable mysql) \ - $(use_enable pam) \ - $(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,sm,c2s,s2s} - fperms 750 /usr/bin/{jabberd,router,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.1.ebuild b/net-im/jabberd2/jabberd2-2.2.1.ebuild new file mode 100644 index 000000000000..2ea32d2ab57f --- /dev/null +++ b/net-im/jabberd2/jabberd2-2.2.1.ebuild @@ -0,0 +1,110 @@ +# 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.1.ebuild,v 1.1 2008/07/30 11:34:36 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 postgres sqlite ssl zlib" + +DEPEND="dev-libs/expat + net-libs/udns + >=net-dns/libidn-0.3 + >=virtual/gsasl-0.2.26 + berkdb? ( >=sys-libs/db-4.1.24 ) + mysql? ( virtual/mysql ) + ldap? ( net-nds/openldap ) + pam? ( virtual/pam ) + postgres? ( virtual/postgresql-base ) + ssl? ( >=dev-libs/openssl-0.9.6b ) + sqlite? ( >=dev-db/sqlite-3 ) + zlib? ( sys-libs/zlib )" +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 + + 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 \ + --enable-fs --enable-pipe --enable-anon \ + ${myconf} \ + $(use_enable berkdb db) \ + $(use_enable ldap) \ + $(use_enable mysql) \ + $(use_enable pam) \ + $(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,sm,c2s,s2s} + fperms 750 /usr/bin/{jabberd,router,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