added latest version of jabberd2

This commit is contained in:
Manuel Friedli 2012-12-25 13:33:45 +00:00
parent 5043efefe1
commit 25a3ba4a97
5 changed files with 269 additions and 13 deletions

View file

@ -1,13 +1,18 @@
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
AUX jabberd2-2.2.16-no_debug.patch 1597 RMD160 bcd1b4de0efe21ffcd5d86bc26972f5576aa4f23 SHA1 56d46f737d55ee9ca26f86f18303260114f2fcff SHA256 705e041cd90a25c33628cc398c6c62ada46142d70c21315f5fb0d52d5ea02bc0
AUX jabberd2-2.2.16.init 1625 RMD160 81a06dc64c47202e9091d1e76ac3497e49aca63f SHA1 89854854914ec01e248cc902e86d0c283d6154d9 SHA256 648f0e659175a060f852df502316db8221f622ad27b9085c8770aca20db151d9
AUX jabberd2-2.2.16.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
AUX jabberd2-2.2.4.init 1625 RMD160 ef5c466dd5976cfa7aac5abb797b103befc52e60 SHA1 5a66d45559bae3d946e92ff517e7a3c0eabb9f11 SHA256 f01a66b3303f1ac366492e913a82952996b75619335ae210357e43e4fbed37a7
AUX jabberd2-2.2.4.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
AUX jabberd2-2.2.5.init 1622 RMD160 e9caa803b5e4c69e84d3257591c12ab95c0917bd SHA1 05cd2427166a84948bce1a841c2f632b5c4b9bd4 SHA256 0f89246b7240f7f4ce528734a054d32bb63c7195c4a278362265ed818d6049e3
AUX jabberd2-2.2.5.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
AUX jabberd2-2.2.8.init 1625 RMD160 6c0f847a6b220f379244e2d47b1c0ae59615803c SHA1 fc1cf432b2a12ef924eb4707d9804c3e1d58d0e7 SHA256 38e08cc155b9a7f7781a3255f7a1bbb885fed9eb22d72a37349b5f7790cf1689
AUX jabberd2-2.2.8.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b
DIST jabberd-2.2.16.tar.gz 2818476 RMD160 c778babd0a883506f874dff56f879f800533e73c SHA1 d39f7475ec676a127e948f2c5f73d7605ec5a7f9 SHA256 112844e0319dc31faf9225930fe10f811b9faefe2e4e30b73d8e3ab965a7d4bf
EBUILD jabberd2-2.2.16.ebuild 3056 RMD160 a68c7d58c0f780527163331fc6069773d80b69d9 SHA1 b5864fac3ff92fdb41ea9518f29756eb72788e9f SHA256 eca1e557d33d53f5b1b324dc44ec6ba803da3557565a3d06b82f11d7600cf517
AUX jabberd2-2.2.1.init 1625 SHA256 23c37f789d84575824a3cd8d009c88e7035ca1222cdb24e0c8437e1a6e55bec1 SHA512 a910b391be0deb85319563e07d74d0442c3accc1ec24b5ee9235d869b759576e0cae9c947b948d0a4735703177eb4baa5eb23d86f29c5134ef491e12a51c9505 WHIRLPOOL 48cd1a62ee3e123495429809c7ab7ee62c48ab4b2edab1c9523684371a9f5ebd8261b8a93136b3aa9d126cb3773d0d85acb1fc5113f9e88cdeb82f9c02ab06bf
AUX jabberd2-2.2.1.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
AUX jabberd2-2.2.16-no_debug.patch 1597 SHA256 705e041cd90a25c33628cc398c6c62ada46142d70c21315f5fb0d52d5ea02bc0 SHA512 306ca11839756b2289c5deaee8c55148546f9301a3c3a8343eb652cdc90f337c1d2d3e555ab348b19b41f17f781c4d5b0f532502e87ce6d7981b043e0dd42713 WHIRLPOOL 476151b962a2deb6ababdcddbcd558d4363656f5219e719a6e6ce156295b405a31d33059a8689293041122f14076694da7fe68b32d30469ea4c6b63ca446ddd4
AUX jabberd2-2.2.16.init 1625 SHA256 648f0e659175a060f852df502316db8221f622ad27b9085c8770aca20db151d9 SHA512 526f5a6e07c745532af019ced5ec2aa936c42c23f68720c16d5b8c45f779bf80afa9d7ab268888c56414f9c6d1393900f4bde68bc75ec4e8ac65d0cf33116c94 WHIRLPOOL a45d9b47ef3f9619bb120acd9658c1b15e1b16a0da1e644a12a52363a999131443cd7ca334b71fbc83427e0c75205b95e3aa312ff7fc66f266bc5198da89c699
AUX jabberd2-2.2.16.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
AUX jabberd2-2.2.17-no_debug.patch 1597 SHA256 705e041cd90a25c33628cc398c6c62ada46142d70c21315f5fb0d52d5ea02bc0 SHA512 306ca11839756b2289c5deaee8c55148546f9301a3c3a8343eb652cdc90f337c1d2d3e555ab348b19b41f17f781c4d5b0f532502e87ce6d7981b043e0dd42713 WHIRLPOOL 476151b962a2deb6ababdcddbcd558d4363656f5219e719a6e6ce156295b405a31d33059a8689293041122f14076694da7fe68b32d30469ea4c6b63ca446ddd4
AUX jabberd2-2.2.17.init 1625 SHA256 648f0e659175a060f852df502316db8221f622ad27b9085c8770aca20db151d9 SHA512 526f5a6e07c745532af019ced5ec2aa936c42c23f68720c16d5b8c45f779bf80afa9d7ab268888c56414f9c6d1393900f4bde68bc75ec4e8ac65d0cf33116c94 WHIRLPOOL a45d9b47ef3f9619bb120acd9658c1b15e1b16a0da1e644a12a52363a999131443cd7ca334b71fbc83427e0c75205b95e3aa312ff7fc66f266bc5198da89c699
AUX jabberd2-2.2.17.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
AUX jabberd2-2.2.4.init 1625 SHA256 f01a66b3303f1ac366492e913a82952996b75619335ae210357e43e4fbed37a7 SHA512 df57e053ca7e4a8af841d659295ea4a5d747b21b6ae49f238a66cb7583e6cee6e50b5ad2781c42bda142a16e6bc9bce1aecfb12bec4b1974b652639f1e164ee8 WHIRLPOOL 3c56c3f588048db901dcf20554387e303df0876d9a6962406568e4a061854930f8b1b539d8b1a35ba1a175c2f4ba39929709ab009a8a529bc161a6bd19adad5d
AUX jabberd2-2.2.4.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
AUX jabberd2-2.2.5.init 1622 SHA256 0f89246b7240f7f4ce528734a054d32bb63c7195c4a278362265ed818d6049e3 SHA512 e207bc463ae5248ad35197fced982be62ca860fc079a778c0c20ac4e51b4f825820ecb0d69a0a33013d02d30cfcea8f2fa265a4a54a1af565182087fe6cc6327 WHIRLPOOL 7ee7f65ab2d409333b1d96911ef49ff6e5019e4bfa1b6d69e86cf18eec07f072099055edf9a53656978f5ca597e13f30eb50162025cab60bb41e8fe95e831934
AUX jabberd2-2.2.5.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
AUX jabberd2-2.2.8.init 1625 SHA256 38e08cc155b9a7f7781a3255f7a1bbb885fed9eb22d72a37349b5f7790cf1689 SHA512 02ef6d0c67291a9d7f7fc313c3e075fbca9d8bf7d74a63fb8326d112f90657e39828eb47220eaceecc58e56452bbbf3303f00e26c0a8e03473b8f47664687129 WHIRLPOOL 0ef41ded73116611910d5156c43d68abae44898d4c3b87198adc1e94fe3a4ce51a77850fabf4d662d1beaefd6757095d6753a3cc4a7f5d5698922bd463f6a383
AUX jabberd2-2.2.8.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
DIST jabberd-2.2.16.tar.gz 2818476 SHA256 112844e0319dc31faf9225930fe10f811b9faefe2e4e30b73d8e3ab965a7d4bf SHA512 dfa4f6ea5f01ea3c689d42bd51aab909b447d93ad5ecbd8ba6d1c93901cf22f0c99c7d1cf59cb841b7802e5baabf83535d7458aa8a6a50a263f818185fb85457 WHIRLPOOL 2104490084e2b72a5d3411c661590b9dd7b33015ba07625f8e2bb86739d50c927248daf603e2c3108c21bf7a4995bf9dfef99ff44f8cac90065c85877f4f988b
DIST jabberd-2.2.17.tar.xz 1382124 SHA256 0be815dfa1e450cd7416a9a2046c6f9ad547b11b562b6d0bf33520594e03b647 SHA512 9d003c98b5dd4ae00541194a890c68a31b41c665ba7932c542a4d7d70b4d1b4e8e93b66ec868119cb928755c24611113c89e504b6f8392baee5336cff9f475c8 WHIRLPOOL ef34de29b89346d48959abd0130c019318c440a1e999cba12b7dd31d6722fa3419677f9e14e344db712dfca5bb7e952425782cfd70f757981854a45c4cfed9a1
EBUILD jabberd2-2.2.16.ebuild 3056 SHA256 eca1e557d33d53f5b1b324dc44ec6ba803da3557565a3d06b82f11d7600cf517 SHA512 1c85da4ff9fe40d9e005006fc77acaff498f6e36f0955267791d3c4ef368d750f5e332b0c0cc076e6b6670dcc4b02130d1169c3345a4dde7a81162becdbbaa56 WHIRLPOOL 65ea9c775a73e01d637a07ac815826085b7490c4aca8cae029326aa8d46cde8a32dd71b729b670ecbca9583c15d9e0045ae2fad44ca1928683dfafde4956f3a4
EBUILD jabberd2-2.2.17.ebuild 3058 SHA256 4722a30125dbe669924b10d10b62158fa04d7600d77daa699c59c7ce1a48fbde SHA512 f4325c999d596e5d78580d860a71b19e4f1118d885ce872dc460a6c7695bcd24a540836fafa7520629ee2bcfda441bc6a57f9324c85fcc38e95006f8d6cd21e9 WHIRLPOOL 874e96a0d6410a76e1dca5c915b770084ca6b32e2df9e7e511960e71d215ad2eaf157ddf17da21128669175a606ebfce672052c841753b660d6d0f64316b6366

View file

@ -0,0 +1,51 @@
diff -ur jabberd-2.2.16/util/log.c jabberd-2.2.16_patched/util/log.c
--- jabberd-2.2.16/util/log.c 2012-05-04 14:51:08.000000000 +0000
+++ jabberd-2.2.16_patched/util/log.c 2012-07-25 08:10:49.004560934 +0000
@@ -223,12 +223,12 @@
debug_flag = v;
}
-int set_debug_log_from_config(config_t c)
+void set_debug_log_from_config(config_t c)
{
return set_debug_file(config_get_one(c, "log.debug", 0));
-};
+}
-JABBERD2_API int set_debug_file(const char *filename)
+JABBERD2_API void set_debug_file(const char *filename)
{
// Close debug output file but not stderr
if (debug_log_target != 0 &&
@@ -255,7 +255,7 @@
// set stderr
debug_log_target = stderr;
}
-};
+}
#else /* DEBUG */
void debug_log(const char *file, int line, const char *msgfmt, ...)
@@ -263,4 +263,7 @@
void set_debug_flag(int v)
{ }
+
+void set_debug_log_from_config(config_t c)
+{ }
#endif
diff -ur jabberd-2.2.16/util/util.h jabberd-2.2.16_patched/util/util.h
--- jabberd-2.2.16/util/util.h 2012-05-04 14:51:08.000000000 +0000
+++ jabberd-2.2.16_patched/util/util.h 2012-07-25 08:11:19.612564607 +0000
@@ -414,9 +414,9 @@
JABBERD2_API int get_debug_flag(void);
JABBERD2_API void set_debug_flag(int v);
JABBERD2_API void debug_log(const char *file, int line, const char *msgfmt, ...);
-JABBERD2_API int set_debug_file(const char *filename);
+JABBERD2_API void set_debug_file(const char *filename);
-JABBERD2_API int set_debug_log_from_config(config_t c);
+JABBERD2_API void set_debug_log_from_config(config_t c);
#define ZONE __FILE__,__LINE__
#define MAX_DEBUG 8192

View file

@ -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.16.init,v 1.1 2009/05/08 15:24:09 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 \
--user 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
}

View file

@ -0,0 +1,6 @@
#%PAM-1.0
auth required pam_nologin.so
auth include system-auth
account include system-auth
session include system-auth

View file

@ -0,0 +1,117 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.16.ebuild,v 1.4 2012/02/20 12:16:52 naota Exp $
EAPI="2"
inherit db-use eutils flag-o-matic pam
DESCRIPTION="Open Source Jabber Server"
HOMEPAGE="http://jabberd2.xiaoka.com/"
SRC_URI="http://cloud.github.com/downloads/${PN}/${PN}/jabberd-${PV}.tar.xz"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE="berkdb debug memdebug mysql ldap pam postgres sqlite ssl zlib"
DEPEND="dev-libs/expat
dev-util/cppunit
net-libs/udns
>=net-dns/libidn-0.3
virtual/gsasl
berkdb? ( >=sys-libs/db-4.1.25 )
mysql? ( virtual/mysql )
ldap? ( >=net-nds/openldap-2.1.0 )
pam? ( virtual/pam )
postgres? ( dev-db/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_prepare() {
use debug || epatch "${FILESDIR}/${P}-no_debug.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,<module>mysql</module>,<module>db</module>,' \
c2s.xml* || die "sed failed"
sed -i \
-e 's,<driver>mysql</driver>,<driver>db</driver>,' \
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
}