# ChangeLog for net-im/jabberd
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.93 2007/02/03 13:28:12 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.94 2007/02/03 13:49:10 nelchael Exp $
+
+ 03 Feb 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+ -files/multiple-xml-patch-00, -files/xml-stream-patch-00,
+ -files/multiple-xml-patch-01, -files/README.Gentoo,
+ -files/jabber.init.bundled, -files/jabber.init.gentoo,
+ -files/jabber.rc6-r5, -files/jabber.rc6-r6, -files/jabber.rc6-r7,
+ -files/jabber.rc6-r8, -files/jabber-conf.d, -files/multiple.xml,
+ -files/patch-c2s-buffers, -files/self-cert.jabberd-2.sh,
+ -files/self-cert.sh, -files/xdb-ldap.xml, -jabberd-1.4.3-r5.ebuild:
+ Remove old version, cleanup.
03 Feb 2007; Krzysiek Pawlik <nelchael@gentoo.org>
jabberd-1.4.3-r5.ebuild:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX README.Gentoo 984 RMD160 cbaac3ea99a614c2155baad18a0a364a33d01ca1 SHA1 9a8c71a0499ccf46aa80d4b54b3e16066dd74caa SHA256 cb495c86769e5de3d070b98ba379f3a1d83936c3c509263bca34f2fdd78f3726
-MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
-RMD160 cbaac3ea99a614c2155baad18a0a364a33d01ca1 files/README.Gentoo 984
-SHA256 cb495c86769e5de3d070b98ba379f3a1d83936c3c509263bca34f2fdd78f3726 files/README.Gentoo 984
-AUX jabber-conf.d 525 RMD160 0a1a0afdaf445d8202b86d009d02752ce07a8111 SHA1 85c3d9970bbd3594b436a751928633549b4e1568 SHA256 63d86ba061bee5bd8777b6b5f5c558dc70af03999b10ca45b583cbc69eb68a0a
-MD5 3a5219d7870e60f5b16d6aefb1c63a0e files/jabber-conf.d 525
-RMD160 0a1a0afdaf445d8202b86d009d02752ce07a8111 files/jabber-conf.d 525
-SHA256 63d86ba061bee5bd8777b6b5f5c558dc70af03999b10ca45b583cbc69eb68a0a files/jabber-conf.d 525
-AUX jabber.init.bundled 626 RMD160 fcb220de2879550fa91cb3cfce7b45e818e2972b SHA1 ff3003732af409e44b21f80defa3a2a939c8ad4d SHA256 55cbd339b6c4112aeade836b363d62abe1f5e99f70bfc2d8dbc9dcc944378d61
-MD5 3d8c2953acd251416c2fdb9a721b9e52 files/jabber.init.bundled 626
-RMD160 fcb220de2879550fa91cb3cfce7b45e818e2972b files/jabber.init.bundled 626
-SHA256 55cbd339b6c4112aeade836b363d62abe1f5e99f70bfc2d8dbc9dcc944378d61 files/jabber.init.bundled 626
-AUX jabber.init.gentoo 2118 RMD160 c363c6cccd9671d6fb8484aebb4659665e51f138 SHA1 2c63fd57aab7039da188052772d2eec4035a0980 SHA256 636e1432955b6a09f2f6ceba8cd4a223a8e1840b4082e3615424cfeca4c93e51
-MD5 1813a30dabb60fa0a15ee3ed3aaad28d files/jabber.init.gentoo 2118
-RMD160 c363c6cccd9671d6fb8484aebb4659665e51f138 files/jabber.init.gentoo 2118
-SHA256 636e1432955b6a09f2f6ceba8cd4a223a8e1840b4082e3615424cfeca4c93e51 files/jabber.init.gentoo 2118
-AUX jabber.rc6-r5 874 RMD160 a5cc38b73d707f4cc6a74f6658d93987471ce2e9 SHA1 7d77b306d6eed609bd78357a1687b32f8658477e SHA256 2a5b6f0e0045e1b0a179f45acf6dfdda3eafb07e9626c59ab9694091ad0059be
-MD5 8d4ca5fb6338d837674ab33c8f969273 files/jabber.rc6-r5 874
-RMD160 a5cc38b73d707f4cc6a74f6658d93987471ce2e9 files/jabber.rc6-r5 874
-SHA256 2a5b6f0e0045e1b0a179f45acf6dfdda3eafb07e9626c59ab9694091ad0059be files/jabber.rc6-r5 874
-AUX jabber.rc6-r6 953 RMD160 2165b3119893f51e777b27972bc755c6390ac58f SHA1 0a2f2867683b3b42e205b9dc8452888620000508 SHA256 03301c94ee862ffa7c31a9995ef9e3557f415fb299fad8a398f0d27588780712
-MD5 6912454f1d1d480cbb711f715292e3cc files/jabber.rc6-r6 953
-RMD160 2165b3119893f51e777b27972bc755c6390ac58f files/jabber.rc6-r6 953
-SHA256 03301c94ee862ffa7c31a9995ef9e3557f415fb299fad8a398f0d27588780712 files/jabber.rc6-r6 953
-AUX jabber.rc6-r7 1842 RMD160 115b8e998e8cbab50a35e6450cde9ffee2d84077 SHA1 130c989bb57c8c8f7d1531142ddd998e449440ad SHA256 d3fabcb90f65271a2fb5afc7384e6bbc45d55d17a0e208a011e682feeb00a624
-MD5 4ea516e4527dd2de19281709704238ee files/jabber.rc6-r7 1842
-RMD160 115b8e998e8cbab50a35e6450cde9ffee2d84077 files/jabber.rc6-r7 1842
-SHA256 d3fabcb90f65271a2fb5afc7384e6bbc45d55d17a0e208a011e682feeb00a624 files/jabber.rc6-r7 1842
-AUX jabber.rc6-r8 800 RMD160 99fe1b8af7a4293af04b08c4b32b77173a46c7f1 SHA1 fe427cf1df5cc93e7f7b7d5792b841d54fac2ec2 SHA256 1ee99a10af00a518cfd74fa0279fcb7937d00f4d24633b67ea6974a19e2a505a
-MD5 078528dc08a082b7a0534d4f6c5c5f5e files/jabber.rc6-r8 800
-RMD160 99fe1b8af7a4293af04b08c4b32b77173a46c7f1 files/jabber.rc6-r8 800
-SHA256 1ee99a10af00a518cfd74fa0279fcb7937d00f4d24633b67ea6974a19e2a505a files/jabber.rc6-r8 800
AUX jabberd-1.4.4-crypt.patch 605 RMD160 62763a71dfeb13763cd6e2cb47a2ec36a942fd42 SHA1 3befde7962b643050e61d04bd87483ed192483a1 SHA256 0a96fea2745058546bada3b234be4a803df836ba2b65052737b000867e932eca
MD5 3de1d023b07d0bf247a71329eb70355d files/jabberd-1.4.4-crypt.patch 605
RMD160 62763a71dfeb13763cd6e2cb47a2ec36a942fd42 files/jabberd-1.4.4-crypt.patch 605
MD5 15e304cfa6bdf41c2633da7fe6063ace files/jabberd-2.0.11.init 1701
RMD160 0637157c6c84aa9acc5e787ae347980506db3c02 files/jabberd-2.0.11.init 1701
SHA256 21ab8f057412d853318370b567c8f53c4d33dfc6ca2151e205f51c01b7dd5c0a files/jabberd-2.0.11.init 1701
-AUX multiple-xml-patch-00 5934 RMD160 89554e2f3f3354ecc248324bcb2a8b9151ebc67d SHA1 27f0aab6b2ec468dd9a1d3b7633555db83ade23f SHA256 43287b8265631498e0e82dfd0b362ec2513ffc4f3ea4daf112a52f3be49795c7
-MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
-RMD160 89554e2f3f3354ecc248324bcb2a8b9151ebc67d files/multiple-xml-patch-00 5934
-SHA256 43287b8265631498e0e82dfd0b362ec2513ffc4f3ea4daf112a52f3be49795c7 files/multiple-xml-patch-00 5934
-AUX multiple-xml-patch-01 303 RMD160 94a3d484e157f59f04ac2c7e5edf1d92eecd9edd SHA1 6db80faa5a9ea9dea767665866baa3c6d27b4b9d SHA256 9354ea516986fff0de1a1745a33323d5717753a1ef6a19a166da251faa2532a5
-MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303
-RMD160 94a3d484e157f59f04ac2c7e5edf1d92eecd9edd files/multiple-xml-patch-01 303
-SHA256 9354ea516986fff0de1a1745a33323d5717753a1ef6a19a166da251faa2532a5 files/multiple-xml-patch-01 303
-AUX multiple.xml 15387 RMD160 c2eb6c555adb1560426dc2f407b4044735a19ee8 SHA1 848fe2149daf363fd1c142fbde6fb7f625de9700 SHA256 4dc1cd47d7fd8157680cb67d5b0265f41dc225cf5717cd556d755d2ecab0ed9e
-MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387
-RMD160 c2eb6c555adb1560426dc2f407b4044735a19ee8 files/multiple.xml 15387
-SHA256 4dc1cd47d7fd8157680cb67d5b0265f41dc225cf5717cd556d755d2ecab0ed9e files/multiple.xml 15387
-AUX patch-c2s-buffers 12112 RMD160 53b67e0c890d4939e92ea929d2daa589d0af4985 SHA1 bc66b98f81d23d2314b5515cf2191be38985afaf SHA256 c9a2bfb0874aa335044ec79e5d1c1ae7ad929c6889e780976e114de223f2ecab
-MD5 40ed7d521eda61aa9f67390099e5b693 files/patch-c2s-buffers 12112
-RMD160 53b67e0c890d4939e92ea929d2daa589d0af4985 files/patch-c2s-buffers 12112
-SHA256 c9a2bfb0874aa335044ec79e5d1c1ae7ad929c6889e780976e114de223f2ecab files/patch-c2s-buffers 12112
-AUX self-cert.jabberd-2.sh 688 RMD160 bdf07df3eac44c121947a2b53797bf38002aac2c SHA1 00422b0720f09a42bc92fac18f9eb022c8e86e2d SHA256 2b7bd52854a4dabc0ff08ac0c72c3f0c0355bf84d751fe2a266d3e987890089d
-MD5 1d08c47f5fe30ced5227f28bac65f6fd files/self-cert.jabberd-2.sh 688
-RMD160 bdf07df3eac44c121947a2b53797bf38002aac2c files/self-cert.jabberd-2.sh 688
-SHA256 2b7bd52854a4dabc0ff08ac0c72c3f0c0355bf84d751fe2a266d3e987890089d files/self-cert.jabberd-2.sh 688
-AUX self-cert.sh 494 RMD160 f9af6ce9cf396b6ae2697f66120060433514051a SHA1 6fd88c8368291d293dd8fb901305ae8cfae7dde0 SHA256 060756f5e3660d9e5c37f4c34e895b88a371c76fc1095ab49853e151c190e9b4
-MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
-RMD160 f9af6ce9cf396b6ae2697f66120060433514051a files/self-cert.sh 494
-SHA256 060756f5e3660d9e5c37f4c34e895b88a371c76fc1095ab49853e151c190e9b4 files/self-cert.sh 494
-AUX xdb-ldap.xml 985 RMD160 1fef53144712c90a1a8331f2dd33dde67e96d4da SHA1 0da96bd4d285e225714470ba254be44025fdde5e SHA256 b120ded22102e2f21f557c6da7914ca4174272a51b9ae48e9fb950bb529c4e32
-MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
-RMD160 1fef53144712c90a1a8331f2dd33dde67e96d4da files/xdb-ldap.xml 985
-SHA256 b120ded22102e2f21f557c6da7914ca4174272a51b9ae48e9fb950bb529c4e32 files/xdb-ldap.xml 985
-AUX xml-stream-patch-00 726 RMD160 52bd65c728666be7f6ad48508748d1a4f0b47f3a SHA1 ec391341dd818bbdc9bc7f9c72e5d77934565b96 SHA256 c6b447658281c5136b63cc2bdcd1d38463dae57a0dc701b7d90fecacc409f0c4
-MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726
-RMD160 52bd65c728666be7f6ad48508748d1a4f0b47f3a files/xml-stream-patch-00 726
-SHA256 c6b447658281c5136b63cc2bdcd1d38463dae57a0dc701b7d90fecacc409f0c4 files/xml-stream-patch-00 726
-DIST jabberd-1.4.3-extexpat.diff 309514 RMD160 93000ff5aa882a48ac55d45dc51d01405d7cafdc SHA1 d06d53032634cc6a508e51e92a8943fab177e67c SHA256 436a1b7b11b157794027940fd9ae474474ebdf0d6ba16b799016a689682650b7
-DIST jabberd-1.4.3.tar.gz 258016 RMD160 a87bede7d76d6601d8b2986dca8d882401ba1a85 SHA1 cf968017c8a4f2d0dc3c139c712846a722d9bbed SHA256 aad60b39ebe9121a857e51ea226964ad5a21babff8ccb99cb25d6a45e96e1f57
DIST jabberd-1.4.4.tar.gz 613479 RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 SHA1 5fa5b561740720591997ed189609403af8c796c2 SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af
DIST jabberd-2.0s11.tar.gz 777466 RMD160 7e89790abb5ff4e84a0a38ac5afbc0c365d60b3d SHA1 c938d95fc17634b889ba9b1d7d27115593b13e3d SHA256 0ef0f668f5d86b8c22ce0ae2366bff0be9d4c961d6f48b7b849ebe749bdb213a
-DIST xdb_ldap-1.0.tar.gz 112204 RMD160 2b8722d8990944105dacd4a73bc45c24a72ccdfa SHA1 e2f8110b77031a2ce751ffa300768794c36d91fb SHA256 fdcdc9b65a40aff8ca38ad27fad701d7692f0976eb6344f5deae317d00d0c5bd
-EBUILD jabberd-1.4.3-r5.ebuild 5661 RMD160 c27231cd497591af1e049ebcf1b8978c142e672c SHA1 8cc6ebc856af29a9b012d7893418ef1c0c1502fd SHA256 f4152b691d6f8d1de56c28e9b958ab6713017940d92e3ed4a189a07a215da446
-MD5 00259642982abd48a5bc7e3c70e92f12 jabberd-1.4.3-r5.ebuild 5661
-RMD160 c27231cd497591af1e049ebcf1b8978c142e672c jabberd-1.4.3-r5.ebuild 5661
-SHA256 f4152b691d6f8d1de56c28e9b958ab6713017940d92e3ed4a189a07a215da446 jabberd-1.4.3-r5.ebuild 5661
EBUILD jabberd-1.4.4-r3.ebuild 3068 RMD160 e9714b597f27b62da756e7194d38e1d58dee0001 SHA1 8e3797c930d7b476346b736c4fe5ca7e1d97f8b6 SHA256 61e626753adbd61082e741460f149a77afc627ba3261356a92b2ff25ae98122b
MD5 b8f4e7afcb7f73251f3e50b67bd03c7a jabberd-1.4.4-r3.ebuild 3068
RMD160 e9714b597f27b62da756e7194d38e1d58dee0001 jabberd-1.4.4-r3.ebuild 3068
MD5 eb18455612bf9cb77ddf56c3957c2997 jabberd-2.0.11-r1.ebuild 2292
RMD160 b5ab536343692dbd873ff61c349af2b5d12ce3f1 jabberd-2.0.11-r1.ebuild 2292
SHA256 5c172be2b8d01508b7da14bec0b6709a66757d021f19a84779d3ae1c37fa8239 jabberd-2.0.11-r1.ebuild 2292
-MISC ChangeLog 14707 RMD160 3ab2b14c469bc3e8f9709867c2c8420373841c2f SHA1 4bbe8e07dfaca37e9016cf588ebead60faf7a3dc SHA256 f7df535ac2995b47de262df082dd96b2f0f8d3408bb1a570b80064ee75472de1
-MD5 8d1022bbc0d032ea205fda83854d5412 ChangeLog 14707
-RMD160 3ab2b14c469bc3e8f9709867c2c8420373841c2f ChangeLog 14707
-SHA256 f7df535ac2995b47de262df082dd96b2f0f8d3408bb1a570b80064ee75472de1 ChangeLog 14707
+MISC ChangeLog 15227 RMD160 102dc2fe891d15d1c64330640a0af84e1b6b0243 SHA1 806f1cb29be9cb7361914db98e6c7eb7b294a7df SHA256 a9f156e9c30cbe5db0c079415d7491cb06596645aff35379d64c3609a184ae78
+MD5 580e1d2426c9e979e5f46f02fc9ff4c9 ChangeLog 15227
+RMD160 102dc2fe891d15d1c64330640a0af84e1b6b0243 ChangeLog 15227
+SHA256 a9f156e9c30cbe5db0c079415d7491cb06596645aff35379d64c3609a184ae78 ChangeLog 15227
MISC metadata.xml 399 RMD160 e223c713f74619996bc47a70298aa535f6addf09 SHA1 dc9bc290a5ed00f7101aabd3a40b346112eb40eb SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377
MD5 be8887bde84aab1d4ff9d5a0f5d50141 metadata.xml 399
RMD160 e223c713f74619996bc47a70298aa535f6addf09 metadata.xml 399
SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377 metadata.xml 399
-MD5 9e3234e4f869fa8ac1e504bd23c4c9ce files/digest-jabberd-1.4.3-r5 741
-RMD160 faa064a50b8c611bb985a5211b4098c89aad67eb files/digest-jabberd-1.4.3-r5 741
-SHA256 4eb60913cb6143f37c2c3c2f7536e97876c8f786e48943a5cc6fb97fd2016198 files/digest-jabberd-1.4.3-r5 741
MD5 6608e1126e4f091819d2c41a1a8843a5 files/digest-jabberd-1.4.4-r3 241
RMD160 0c09cceb4332b70a38db717adb4bd1d244337b72 files/digest-jabberd-1.4.4-r3 241
SHA256 05c069ff9a60336785d0d1049dc28c727a5b4cc2f9a40c0f5304f98f2343cb9b files/digest-jabberd-1.4.4-r3 241
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.2 (GNU/Linux)
-iD8DBQFFxI5Zgo/w9rxVVVERAgiZAJ0V4ytO/U80NOqm+/DbDJ5QuQ8uyACfRLw+
-QD161VYIlgZG2s0LXoDJdkw=
-=Dn6y
+iD8DBQFFxJNDgo/w9rxVVVERAp03AJ43JFO5CnbRDnO3xwyLwGIexny1LwCfVI3Z
+fCsMD2KCdWt9drJ03m3wyic=
+=0UNq
-----END PGP SIGNATURE-----
+++ /dev/null
-This instructions are valid if you are using jabberd14 as the main server. If
-you are going to use jabberd2 you must edit /etc/confd/jabberd and change
-jabberd14 to jabberd2.
-
-This is a small help to get you started with Jabber in Gentoo.
-Edit /etc/jabber/multiple.xml . This is the main jabber server config file.
-There change all references to localhost with the FQDN (Fully Qualified Domain
-Name) for your server.
-If you are going to use SSL you must change the line:
- <ssl port="5223"/> <!-- 10.1.2.3</ssl> -->
-To:
-<ssl port="5223">10.1.2.3</ssl>
-Where 10.1.2.3 is your machines IP (not name, IP here).
-Also, edit:
-<ssl>
- <key ip="10.1.2.3">/etc/jabber/gentoo.pem</key>
-</ssl>
-
-at the end of the file to your IP.
-
-You can now test your setup with the command:
-jabberd -c /etc/jabber/multiple.xml -D
-
-And try to connect to your new server with a jabber client. If all goes well
-kill your jabber server (control-c) and if you have installed transports go
-configure them now.
+++ /dev/null
-MD5 293c77245963b21e73f17fbde4aec200 jabberd-1.4.3-extexpat.diff 309514
-RMD160 93000ff5aa882a48ac55d45dc51d01405d7cafdc jabberd-1.4.3-extexpat.diff 309514
-SHA256 436a1b7b11b157794027940fd9ae474474ebdf0d6ba16b799016a689682650b7 jabberd-1.4.3-extexpat.diff 309514
-MD5 a3e964d6fa07b5d850302ae0512f94c6 jabberd-1.4.3.tar.gz 258016
-RMD160 a87bede7d76d6601d8b2986dca8d882401ba1a85 jabberd-1.4.3.tar.gz 258016
-SHA256 aad60b39ebe9121a857e51ea226964ad5a21babff8ccb99cb25d6a45e96e1f57 jabberd-1.4.3.tar.gz 258016
-MD5 373f0f780c725cc06c824e322fc694ff xdb_ldap-1.0.tar.gz 112204
-RMD160 2b8722d8990944105dacd4a73bc45c24a72ccdfa xdb_ldap-1.0.tar.gz 112204
-SHA256 fdcdc9b65a40aff8ca38ad27fad701d7692f0976eb6344f5deae317d00d0c5bd xdb_ldap-1.0.tar.gz 112204
+++ /dev/null
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber-conf.d,v 1.4 2004/07/14 23:45:05 agriffis Exp $
-
-# Configure which is the default jabberd server. Any value that is not
-# jabberd14 and jabberd2 will be started
-
-JABBERD="jabberd14"
-
-#Right now this is only used by the init script, but i would like to find a way
-#for jabberd to include this in the conf
-JPIDFILE="/var/log/jabber/jabberd14.pid"
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.init.bundled,v 1.1 2005/01/31 23:05:41 humpback Exp $
-
-depend() {
- need net
- use mysql postgresql slapd
- provide jabber-server
-}
-
-start() {
- ebegin "Starting Jabber Server"
- start-stop-daemon --start -c jabber:jabber \
- -b --make-pidfile --pidfile /var/jabberd/pid/jabberd.pid \
- -q -x /usr/bin/jabberd
- eend $?
-}
-
-stop() {
- ebegin "Stopping Jabber Server"
- start-stop-daemon --stop -q --pidfile /var/jabberd/pid/jabberd.pid
- eend $?
-}
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.init.gentoo,v 1.1 2005/01/31 23:05:41 humpback Exp $
-
-depend() {
- need net
- use mysql postgresql slapd
- provide jabber-server
-}
-
-components="router resolver sm c2s s2s"
-
-my_start() {
- ebegin "-> Starting ${i}"
- component=${i}
-# pidfile=/var/jabberd/pid/${component}.pid
-# ## remove components pidfile
-# rm -f "${pidfile}" >/dev/null 2>&1
- ## start component
- start-stop-daemon --start -c jabber:jabber -b \
- -q -x /usr/bin/${component} >/dev/null 2>&1
-# ## check if pidfile exists
-# if [ ! -f "${pidfile}" ]; then
-# false
-# ## check if pidfile contains the pid of a running process
-# elif ! ps -p "$(< ${pidfile})" -o pid= >/dev/null 2>&1; then
-# false
-# fi
- eend $?
-}
-
-my_stop() {
- ebegin "-> Stopping ${i}"
- component=${i}
- pidfile=/var/jabberd/pid/${component}.pid
- start-stop-daemon --stop -q --pidfile ${pidfile} >/dev/null 2>&1
-# if [ -f "${pidfile}" ] && ps -p "$(< ${pidfile})" -o pid= >/dev/null 2>&1; then
-# false
-# fi
-# ## remove components pidfile
-# rm -f "${pidfile}" >/dev/null 2>&1
- eend $?
-}
-
-start() {
- ebegin "Starting Jabber Server"
- local started=''
- local failed=''
- for i in ${components}; do
- if ! my_start ${i}; then
- failed="${failed:+${failed} }${i}"
- else
- started="${started:+${started} }${i}"
- fi
- done
- if [ -n "${failed}" ]; then
- eerror
- eerror "The following components failed to start:"
- eerror "-> ${failed}"
- eerror
- eerror "Trying to stop started components"
- for i in ${started}; do
- my_stop ${i}
- done
- false
- fi
- eend $?
-}
-
-stop() {
- ebegin "Stopping Jabber Server"
- local failed=''
- for i in ${components}; do
- if ! my_stop ${i}; then
- failed="${failed:+${failed} }${i}"
- fi
- done
- if [ -n "${failed}" ]; then
- eerror
- eerror "The following components failed to stop:"
- eerror "-> ${failed}"
- eerror
- eerror "Please kill the processes manually and reset"
- eerror "this service to a stopped state using"
- eerror "-> ${0} zap"
- eerror
- false
- fi
- eend $?
-}
+++ /dev/null
-#!/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/jabberd/files/jabber.rc6-r5,v 1.4 2004/07/14 23:45:05 agriffis Exp $
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting Jabber Server"
-
- jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1
- for addon in /etc/jabber/*.xml; do
- if [ "$addon" == "/etc/jabber/jit.xml" ]; then
- jit-wpjabber -d -c $addon >/dev/null 2>&1
- else
- if [ "$addon" != "/etc/jabber/multiple.xml" ]; then
- jabberd -B -c $addon >/dev/null 2>&1
- fi
- fi
- done
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping Jabber Server"
- killall jabberd
- if [ "$addon" == "/etc/jabber/jit.xml" ]; then
- killall jit-wpjabber
- fi
- sleep 2
- killall -9 jabberd
- if [ "$addon" == "/etc/jabber/jit.xml" ]; then
- killall -9 jit-wpjabber
- fi
- eend $?
-}
+++ /dev/null
-#!/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/jabberd/files/jabber.rc6-r6,v 1.3 2004/07/14 23:45:05 agriffis Exp $
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting Jabber Server"
-
- jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1
- for addon in /etc/jabber/*.xml; do
- if [ "$addon" == "/etc/jabber/jit.xml" ]; then
- jit-wpjabber -d -c $addon >/dev/null 2>&1
- else
- if [ "$addon" != "/etc/jabber/multiple.xml" ]; then
- jabberd -B -c $addon >/dev/null 2>&1
- fi
- fi
- done
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping Jabber Server"
-
- killall jabberd
- sleep 2
- if (( `ps -e | grep jabberd | wc -l`>0 )); then
- killall -9 jabberd
- fi
-
- if [ -e /etc/jabber/jit.xml ]; then
- killall jit-wpjabber
- sleep 2
- if (( `ps -e | grep jit-wpjabber | wc -l`>0 )); then
- killall -9 jit-wpjabber
- fi
- fi
-
- eend $?
-}
+++ /dev/null
-#!/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/jabberd/files/jabber.rc6-r7,v 1.7 2004/07/14 23:45:05 agriffis Exp $
-
-depend() {
- need net
- provide jabber-server
-}
-
-start() {
- ebegin "Starting main Jabber Component"
- if [ "${JABBERD}" = "jabberd14" ]
- then
- if [ -f ${JPIDFILE} ]; then
- if [ -z $(ps ax | grep `cat ${JPIDFILE}` | grep -v grep ) ]
- then
- rm -f ${JPIDFILE}
- fi
- fi
- jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1
- else
- ebegin " Router"
- start-stop-daemon --start -b -q -x /usr/bin/router
- eend $?
- ebegin " Resolver"
- start-stop-daemon --start -b -q -x /usr/bin/resolver
- eend $?
- ebegin " Session Manager"
- start-stop-daemon --start -b -q -x /usr/bin/sm
- eend $?
- ebegin " Client to Server Component"
- start-stop-daemon --start -b -q -x /usr/bin/c2s
- eend $?
- ebegin " Server to Server Component"
- start-stop-daemon --start -b -q -x /usr/bin/s2s
- eend $?
- fi
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping main Jabber Component"
- if [ "${JABBERD}" = "jabberd14" ]
- then
- kill `cat ${JPIDFILE}`
- sleep 2
- if [ -f ${JPIDFILE} ]; then
- kill -9 `cat ${JPIDFILE}`
- rm -f ${JPIDFILE}
- fi
- else
- ebegin " Router"
- start-stop-daemon --stop -q --pidfile /var/jabberd/pid/router.pid
- eend $?
- ebegin " Resolver"
- start-stop-daemon --stop -q --pidfile /var/jabberd/pid/resolver.pid
- eend $?
- ebegin " Session Manager"
- start-stop-daemon --stop -q --pidfile /var/jabberd/pid/sm.pid
- eend $?
- ebegin " Client to Server Component"
- start-stop-daemon --stop -q --pidfile /var/jabberd/pid/c2s.pid
- eend $?
- ebegin " Server to Server Component"
- start-stop-daemon --stop -q --pidfile /var/jabberd/pid/s2s.pid
- eend $?
- fi
- eend $?
-}
+++ /dev/null
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r8,v 1.1 2005/05/21 18:35:51 humpback Exp $
-
-depend() {
- need net
- provide jabber-server
-}
-
-start() {
- ebegin "Starting Jabber Server"
- if [ -f ${JPIDFILE} ]; then
- if [ -z $(ps ax | grep `cat ${JPIDFILE}` | grep -v grep ) ]
- then
- rm -f ${JPIDFILE}
- fi
- fi
- start-stop-daemon --start -c jabber:jabber \
- -x /usr/sbin/jabberd -- -B -c /etc/jabber/multiple.xml
- eend $?
-}
-
-stop() {
- ebegin "Stopping Jabber Server"
- start-stop-daemon --stop -x /usr/sbin/jabberd
- kill `cat ${JPIDFILE}`
- sleep 2
- if [ -f ${JPIDFILE} ]; then
- kill -9 `cat ${JPIDFILE}`
- rm -f ${JPIDFILE}
- fi
- eend $?
-}
+++ /dev/null
---- jabber.xml 2004-02-13 01:57:46.144389448 +0000
-+++ jabber.xml2 2004-02-13 01:57:01.725142200 +0000
-@@ -133,13 +133,13 @@
- a message after each valid registration if the notify
- attribute is present.
- -->
--
-+ <!-- commented out so no one can register!!!
- <register notify="yes">
- <instructions>Choose a username and password to register with this server.</instructions>
- <name/>
- <email/>
- </register>
--
-+ -->
- <!--
- A welcome note that is sent to every new user who registers
- with your server. Comment it out to disable this function.
-@@ -178,7 +178,7 @@
- sent in response to any admin messages.
- -->
-
-- <!--
-+
- <admin>
- <read>support@localhost</read>
- <write>admin@localhost</write>
-@@ -187,7 +187,7 @@
- <body>This is a special administrative address. Your message was received and forwarded to server administrators.</body>
- </reply>
- </admin>
-- -->
-+
-
- <!--
- This enables the server to automatically update the
-@@ -295,21 +295,21 @@
- -->
-
- <load main="jsm">
-- <jsm>./jsm/jsm.so</jsm>
-- <mod_echo>./jsm/jsm.so</mod_echo>
-- <mod_roster>./jsm/jsm.so</mod_roster>
-- <mod_time>./jsm/jsm.so</mod_time>
-- <mod_vcard>./jsm/jsm.so</mod_vcard>
-- <mod_last>./jsm/jsm.so</mod_last>
-- <mod_version>./jsm/jsm.so</mod_version>
-- <mod_announce>./jsm/jsm.so</mod_announce>
-- <mod_agents>./jsm/jsm.so</mod_agents>
-- <mod_browse>./jsm/jsm.so</mod_browse>
-- <mod_disco>./jsm/jsm.so</mod_disco>
-- <mod_admin>./jsm/jsm.so</mod_admin>
-- <mod_filter>./jsm/jsm.so</mod_filter>
-- <mod_offline>./jsm/jsm.so</mod_offline>
-- <mod_presence>./jsm/jsm.so</mod_presence>
-+ <jsm>/usr/lib/jabberd/jsm.so</jsm>
-+ <mod_echo>/usr/lib/jabberd/jsm.so</mod_echo>
-+ <mod_roster>/usr/lib/jabberd/jsm.so</mod_roster>
-+ <mod_time>/usr/lib/jabberd/jsm.so</mod_time>
-+ <mod_vcard>/usr/lib/jabberd/jsm.so</mod_vcard>
-+ <mod_last>/usr/lib/jabberd/jsm.so</mod_last>
-+ <mod_version>/usr/lib/jabberd/jsm.so</mod_version>
-+ <mod_announce>/usr/lib/jabberd/jsm.so</mod_announce>
-+ <mod_agents>/usr/lib/jabberd/jsm.so</mod_agents>
-+ <mod_browse>/usr/lib/jabberd/jsm.so</mod_browse>
-+ <mod_disco>/usr/lib/jabberd/jsm.so</mod_disco>
-+ <mod_admin>/usr/lib/jabberd/jsm.so</mod_admin>
-+ <mod_filter>/usr/lib/jabberd/jsm.so</mod_filter>
-+ <mod_offline>/usr/lib/jabberd/jsm.so</mod_offline>
-+ <mod_presence>/usr/lib/jabberd/jsm.so</mod_presence>
-
- <!--
- Authentication
-@@ -325,19 +325,21 @@
- -->
- <!-- mod_auth_digest: Password in clear text in storage,
- encrypted/hashed on the wire -->
-- <mod_auth_digest>./jsm/jsm.so</mod_auth_digest>
-+ <mod_auth_digest>/usr/lib/jabberd/jsm.so</mod_auth_digest>
- <!-- mod_auth_plain: Password in clear text in storage
- and on the wire. Disable this if you do not use clients
- that need plaintext auth -->
-- <mod_auth_plain>./jsm/jsm.so</mod_auth_plain>
-+ <mod_auth_plain>/usr/lib/jabberd/jsm.so</mod_auth_plain>
- <!-- mod_auth_crypt: Password encrypted/hashed in storage,
- clear text on the wire. Disabled as this only makes
- sense when used exclusively and with SSL mandatory
-- <mod_auth_crypt>./jsm/jsm.so</mod_auth_crypt> -->
-+ <mod_auth_crypt>/usr/lib/jabberd/jsm.so</mod_auth_crypt> -->
-
-- <mod_log>./jsm/jsm.so</mod_log>
-- <mod_register>./jsm/jsm.so</mod_register>
-- <mod_xml>./jsm/jsm.so</mod_xml>
-+ <mod_log>/usr/lib/jabberd/jsm.so</mod_log>
-+ <!-- commented out so no one can register!!!
-+ <mod_register>/usr/lib/jabberd/jsm.so</mod_register>
-+ -->
-+ <mod_xml>/usr/lib/jabberd/jsm.so</mod_xml>
- </load>
-
- </service>
-@@ -353,10 +355,10 @@
- <xdb id="xdb">
- <host/>
- <load>
-- <xdb_file>./xdb_file/xdb_file.so</xdb_file>
-+ <xdb_file>/usr/lib/jabberd/xdb_file.so</xdb_file>
- </load>
- <xdb_file xmlns="jabber:config:xdb_file">
-- <spool><jabberd:cmdline flag='s'>./spool</jabberd:cmdline></spool>
-+ <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>
- </xdb_file>
- </xdb>
-
-@@ -387,7 +389,7 @@
-
- <service id="c2s">
- <load>
-- <pthsock_client>./pthsock/pthsock_client.so</pthsock_client>
-+ <pthsock_client>/usr/lib/jabberd/pthsock_client.so</pthsock_client>
- </load>
- <pthcsock xmlns='jabber:config:pth-csock'>
- <authtime/>
-@@ -430,7 +432,7 @@
- <host/>
- <logtype/>
- <format>%d: [%t] (%h): %s</format>
-- <file>error.log</file>
-+ <file>/var/log/jabber/error.log</file>
- <stderr/>
- </log>
-
-@@ -443,7 +445,7 @@
- <host/>
- <logtype>record</logtype>
- <format>%d %h %s</format>
-- <file>record.log</file>
-+ <file>/var/log/jabber/record.log</file>
- </log>
-
- <!-- The following two services are for handling server-to-server traffic. -->
-@@ -453,7 +455,7 @@
- <service id="dnsrv">
- <host/>
- <load>
-- <dnsrv>./dnsrv/dnsrv.so</dnsrv>
-+ <dnsrv>/usr/lib/jabberd/dnsrv.so</dnsrv>
- </load>
- <dnsrv xmlns="jabber:config:dnsrv">
- <resend service="_xmpp-server._tcp">s2s</resend> <!-- for supporting XMPP compliant SRV records -->
-@@ -473,7 +475,7 @@
-
- <service id="s2s">
- <load>
-- <dialback>./dialback/dialback.so</dialback>
-+ <dialback>/usr/lib/jabberd/dialback.so</dialback>
- </load>
- <dialback xmlns='jabber:config:dialback'>
- <legacy/>
-@@ -641,8 +643,8 @@
- -->
- <!--
- <ssl>
-- <key ip='192.168.1.1'>/path/to/cert_and_key.pem</key>
-- <key ip='192.168.1.100'>/path/to/other/cert_and_key.pem</key>
-+ <key ip='192.168.1.1'>/etc/jabber/gentoo.pem</key>
-+ <key ip='192.168.1.100'>/etc/jabber/gentoo.pem</key>
- </ssl>
- -->
-
+++ /dev/null
---- jabber.xml 2004-03-28 17:41:06.867787280 +0100
-+++ jabber2.xml 2004-03-28 17:40:49.470432080 +0100
-@@ -670,7 +670,7 @@
- <!--
- This specifies the file to store the pid of the process in.
- -->
-- <pidfile>./jabber.pid</pidfile>
-+ <pidfile>/var/log/jabber/jabberd14.pid</pidfile>
-
-
- </jabber>
+++ /dev/null
-<jabber>
- <!--
- This is the Jabber server configuration file. The file is
- broken into different sections based on the services being
- managed by jabberd, the server daemon. Most of the important
- sections have comments and are easy to modify.
-
- At http://jabberd.jabberstudio.org/1.4/ you find further
- instructions including an annotated version of this con-
- figuration file and an installation guide.
-
- Note that when you see a tag like "jabberd:cmdline", it's
- automatically replaced on startup with the command line flag
- passed in to jabberd. This enables you to override para-
- meters set in this configuration file if necessary or de-
- sired. Also note as you comment things in and out that
- jabberd does not like comments within comments, so be care-
- ful with your XML. :)
- -->
-
-
- <!--
- The following <service/> section is for the session manager,
- the most important component within the server. This section
- contains the following types of information:
-
- * the server's hostname
- * other basic server information
- * the location of the session log file
- * email addresses for server administrators
- * registration instructions for new users
- * a welcome message for new users
- * a list of agents with which users can register
- * load rules for the modules within the session manager
-
- -->
-
- <service id="sessions">
- <!--
- Replace all occurrences of "localhost" in this file by
- the hostname of your Jabber server. Be aware changing
- the server's name is all but impossible once users start
- to use the server. So choose a name that is permanent
- (especially no Intranet hostnames or IP addresses).
-
- Multiple <host/> entries are allowed - each one is for a
- separate virtual server. Note that each host entry must
- be on one line, the server doesn't like it otherwise! :)
- Use lowercase for the hostname.
- -->
-
- <host><jabberd:cmdline flag="h">localhost</jabberd:cmdline></host>
-
- <!--
- This is the custom configuration section for the
- Jabber session manager, a.k.a. "JSM".
- -->
-
- <jsm xmlns="jabber:config:jsm">
-
- <filter>
- <default/>
- <max_size>100</max_size>
- <allow>
- <conditions>
- <ns/>
- <unavailable/>
- <from/>
- <resource/>
- <subject/>
- <body/>
- <show/>
- <type/>
- <roster/>
- <group/>
- </conditions>
- <actions>
- <error/>
- <offline/>
- <forward/>
- <reply/>
- <continue/>
- <settype/>
- </actions>
- </allow>
- </filter>
- <!-- The server vCard -->
- <vCard>
- <FN>localhost</FN>
- <DESC>localhost</DESC>
- <URL>http://localhost/</URL>
- </vCard>
-
- <!-- commented out so no one can register!!!
- <register notify="yes">
- <instructions>Choose a username and password to register with this server.</instructions>
- <name/>
- <email/>
- </register>
- -->
-
- <!--
- A welcome note that is sent to every new user who registers
- with your server. Comment it out to disable this function.
- -->
-
- <welcome>
- <subject>Welcome!</subject>
- <body>Welcome to the Private Jabber server at localhost -- we hope you enjoy this service! For Questions and Remarks, please contact Foo Bar [ foobar@localhost ]. </body>
- </welcome>
-
- <!--
- IDs with admin access - these people will receive admin
- messages (any message to="yourhostname" is an admin
- message). These addresses must be local ids, they cannot
- be remote addresses.
-
- Note that they can also send announcements to all
- users of the server, or to all online users. To use
- the announcement feature, you need to send raw xml and be
- logged in as one of the admin users. Here is the syntax
- for sending an announcement to online users:
-
- <message to="yourhostname/announce/online">
- <body>announcement here</body>
- </message>
-
- <message to="yourhostname/announce/motd">
- <body>message (of the day) that is sent only once to all users that are logged in and additionally to new ones as they log in</body>
- </message>
-
- Sending to /announce/motd/delete will remove any existing
- motd, and to /announce/motd/update will only update the motd
- without re-announcing to all logged in users.
-
- The <reply> will be the message that is automatically
- sent in response to any admin messages.
- -->
-
- <admin>
- <read>foobar@localhost</read>
- <write>foobar@localhost</write>
- <reply>
- <subject>Auto Reply</subject>
- <body>This is a special administrative address. Your message was received and forwarded to server administrators.</body>
- </reply>
- </admin>
-
-
- <vcard2jud/>
- <browse>
-
-<!-- Place to "advertise" your transports -->
-<!--
- The <browse/> section identifies the transports and other
- services that are available from this server. Note that each
- entity identified here must exist elsewhere or be further
- defined in its own <service/> section below. These services
- will appear in the user interface of Jabber clients that
- connect to your server.
- The <browse/> section is also used by mod_disco (see below)
- for building the disco#items reply.
- -->
-<!-- An example that would setup a Jabber User Directory could be:
-
-<service type="jud" jid="jud.localhost" name="Jabber User Directory">
- <ns>jabber:iq:search</ns>
- <ns>jabber:iq:register</ns>
-</service>
-
--->
- </browse>
- </jsm>
-
- <load main="jsm">
- <jsm>/usr/lib/jabberd/jsm.so</jsm>
- <mod_echo>/usr/lib/jabberd/jsm.so</mod_echo>
- <mod_roster>/usr/lib/jabberd/jsm.so</mod_roster>
- <mod_time>/usr/lib/jabberd/jsm.so</mod_time>
- <mod_vcard>/usr/lib/jabberd/jsm.so</mod_vcard>
- <mod_last>/usr/lib/jabberd/jsm.so</mod_last>
- <mod_version>/usr/lib/jabberd/jsm.so</mod_version>
- <mod_announce>/usr/lib/jabberd/jsm.so</mod_announce>
- <mod_agents>/usr/lib/jabberd/jsm.so</mod_agents>
- <mod_browse>/usr/lib/jabberd/jsm.so</mod_browse>
- <mod_admin>/usr/lib/jabberd/jsm.so</mod_admin>
- <mod_filter>/usr/lib/jabberd/jsm.so</mod_filter>
- <mod_offline>/usr/lib/jabberd/jsm.so</mod_offline>
- <mod_presence>/usr/lib/jabberd/jsm.so</mod_presence>
- <mod_auth_plain>/usr/lib/jabberd/jsm.so</mod_auth_plain>
- <mod_auth_digest>/usr/lib/jabberd/jsm.so</mod_auth_digest>
- <mod_log>/usr/lib/jabberd/jsm.so</mod_log>
-<!-- commented out so no one can register!!!
- <mod_register>/usr/lib/jabberd/jsm.so</mod_register>
--->
- <mod_xml>/usr/lib/jabberd/jsm.so</mod_xml>
- </load>
-
- </service>
- <!--
- The <xdb/> component handles all data storage, using the filesystem.
- Make sure the spool directory defined here exists and has proper
- permissions.
- -->
-
- <xdb id="xdb">
- <host/>
- <load>
- <xdb_file>/usr/lib/jabberd/xdb_file.so</xdb_file>
- </load>
- <xdb_file xmlns="jabber:config:xdb_file">
- <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>
- </xdb_file>
- </xdb>
-
- <!--
- The following service manages incoming client socket connections.
- There are several items you can set here to optimize performance:
-
- * authtime - default is unlimited, but you can set this to
- limit the amount of time allowed for authentication to be
- completed, e.g., <authtime>10</authtime> for 10 seconds
-
- * heartbeat - default is to not send out heartbeat packets
- to the clients. This option allows you to specify that
- you want heartbeats to happen every x seconds. This is
- useful if you have a lot of dial-up or laptop users who
- may drop their connection without logging off of jabber.
- Otherwise the server won't notice that they are offline until
- someone tries to send a packet to them (and the message is
- lost). Example: <heartbeat>60</heartbeat>
-
- * karma - this is an input/output rate limiting system that
- the Jabber team came up with to prevent bandwidth hogging.
- For details about karma, read the io section at the bottom.
- These are the low settings and apply per connection/socket
- and can be changed as desired.
- To disable rate limiting just delete the <karma/> section.
- -->
-
-
- <service id="c2s">
- <load>
- <pthsock_client>/usr/lib/jabberd/pthsock_client.so</pthsock_client>
- </load>
- <pthcsock xmlns='jabber:config:pth-csock'>
- <authtime/>
- <karma>
- <init>10</init>
- <max>10</max>
- <inc>1</inc>
- <dec>1</dec>
- <heartbeat>60</heartbeat>
- <penalty>-6</penalty>
- <restore>10</restore>
- </karma>
-
- <!--
- Use these to listen on particular addresses and/or ports.
- Example: <ip port="5222">127.0.0.1</ip>
- Default is to listen on port 5222 on every interface.
- Remove the <ip/> section to disable non-ssl client connections.
- -->
- <ip port="5222"/>
-
- <!--
- The <ssl/> tag acts pretty much like the <ip/> tag,
- except it defines that SSL is to be used on the
- ports and IP addresses specified. You must specify
- an IP address here, or the connections will fail.
- <ssl port='5223'>127.0.0.1</ssl>
- <ssl port='5224'>192.168.1.100</ssl>
- -->
-
-
- </pthcsock>
- </service>
-
- <!--
- This is the default server error logging component,
- which copies to a file and to STDERR.
- -->
-
- <log id='elogger'>
- <host/>
- <logtype/>
- <format>%d: [%t] (%h): %s</format>
- <file>/var/log/jabber/error.log</file>
- <stderr/>
- </log>
-
- <log id='rlogger'>
- <host/>
- <logtype>record</logtype>
- <format>%d %h %s</format>
- <file>/var/log/jabber/record.log</file>
- </log>
-
- <service id="dnsrv">
- <host/>
- <load>
- <dnsrv>/usr/lib/jabberd/dnsrv.so</dnsrv>
- </load>
- <dnsrv xmlns="jabber:config:dnsrv">
- <resend service="_jabber._tcp">s2s</resend> <!-- for supporting SRV records -->
- <resend>s2s</resend>
- </dnsrv>
- </service>
-
- <!--
- The following 's2s' config handles server connections and
- dialback hostname verification. The <legacy/> element is
- here to enable communication with old 1.0 servers. The
- karma settings are a little higher here to handle the
- higher traffic of server-to-server connections (read
- the io section below for more details, medium settings).
- -->
- <service id="s2s">
- <load>
- <dialback>/usr/lib/jabberd/dialback.so</dialback>
- </load>
- <dialback xmlns='jabber:config:dialback'>
- <legacy/>
- <ip port="5269"/>
- <karma>
- <init>50</init>
- <max>50</max>
- <inc>4</inc>
- <dec>1</dec>
- <penalty>-5</penalty>
- <restore>50</restore>
- </karma>
- </dialback>
- </service>
-
- <!--
- update.jabber.org is long dead but some clients still
- request update information. In order to avoid errors
- in the logs, just drop packages for update.jabber.org.
- -->
- <service id="update.jabber.org">
- <host>update.jabber.org</host>
- <null/>
- </service>
-
- <!--
- If you identified additional agents in the main <service/>
- section (see examples above), you'll need to define each
- of them here using a separate <service/> section for each
- <agent/> you identified. Note that the <agent/> sections
- determine what gets shown to clients that connect to your
- server, whereas the following <service/> sections define
- these services within the server itself. The following are
- examples only, you will need to create/modify them to get
- them working on your Jabber server. See the README files
- for each agent and/or the server howto for further
- information/instructions.
- -->
-
- <!-- we're commenting these out, of course :)
-<service id="jud">
- <host>jud.localhost</host>
- <load><jud>/usr/lib/jabberd/jud.so</jud></load>
- <jud xmlns="jabber:config:jud">
- <vCard>
- <FN>Local User Directory</FN>
- <DESC>This service provides a simple user directory service.</DESC>
- <URL>http://jud.jabberstudio.org/</URL>
- </vCard>
- </jud>
-</service>
- -->
-
- <io>
- <!-- Set the default karma for *all* sockets -->
- <!-- definition of terms:
-
- * Avg. Throughput - The number of bytes you can
- send every second without incuring any penalty.
-
- * Burst Allowed - The maximum number of bytes you
- can send in 2 seconds without incurring any penalty.
-
- * Max Sustained Rate - If you send data as fast as
- you can, you will hit penalty, and will not be
- able to send for 10 seconds; the max sustained
- rate is the average rate you can dump data when
- you are dumping as much data as you can, as fast
- as you can.
-
- * Seconds to Recover from Burst - The amount of time
- it will take to reach Avg. Throughput capability
- after sending a max burst of data.
-
- * Penalty Length - The length of your penalty is
- determined according to this formula:
- abs(penalty) * Heartbeat seconds
- E.g., a penalty of -5 and heartbeat of 2 will
- cause your penalty length to be 10 seconds.
- Note that a penalty CANNOT be less than -100,
- otherwise strange things might happen.
-
- -->
- <!-- Example of Low Karma Limits
- Avg. Throughput: 1k-2k/s
- Burst Allowed To: 5.5k/s
- Max Sustained Rate: 485b/s
- Seconds to Recover from Burst: 20
- Penalty Length: 12 seconds
- <karma>
- <heartbeat>2</heartbeat>
- <init>10</init>
- <max>10</max>
- <inc>1</inc>
- <dec>1</dec>
- <penalty>-6</penalty>
- <restore>10</restore>
- </karma>
- -->
-
- <!--
- Set rate limits to monitor the number of connection
- attempts from a single IP, any more than [points]
- within [time] will engage the limit. This setting
- applies to all incoming connections to any service,
- unless otherwise overridden by that service.
- -->
-
- <rate points="5" time="25"/>
-
- <!--
- The following section initializes SSL for top-level I/O.
- This works only when the server is compiled with openssl!
- Use IPs here or connections will fail.
- -->
-
- <ssl>
- <key ip="64.57.168.155">/etc/jabber/gentoo.pem</key>
- </ssl>
- <!--
- The following section is used to allow or deny
- communications from specified IP networks or
- addressses. If there is no <allow/> section,
- then *all* IPs will be allowed to connect. If
- you allow one block, then only that block may
- connect. Note that <allow/> is checked before
- <deny/>, so if a specific address is allowed
- but the network for that address is denied,
- then that address will still be denied.
- -->
- <!--
- <allow><ip>127.0.0.0</ip><mask>255.255.255.0</mask></allow>
- <allow><ip>12.34.56.78</ip></allow>
- <deny><ip>22.11.44.0</ip><mask>255.255.255.0</mask></deny>
- -->
-
- </io>
-
- <!--
- This specifies the file to store the pid of the process in.
- -->
-
- <pidfile>/var/run/jabber.pid</pidfile>
-
-</jabber>
+++ /dev/null
-diff -ru c2sorig/authreg.c c2s/authreg.c
---- c2sorig/authreg.c Mon Nov 22 15:53:34 2004
-+++ c2s/authreg.c Mon Nov 22 20:06:25 2004
-@@ -623,7 +623,7 @@
- log_write(c2s->log, LOG_NOTICE, "[%d] created user: user=%s; realm=%s", sess->s->tag, username, sess->realm);
-
- /* extract the password */
-- snprintf(password, 1024, "%.*s", NAD_CDATA_L(nad, elem), NAD_CDATA(nad, elem));
-+ snprintf(password, 257, "%.*s", NAD_CDATA_L(nad, elem), NAD_CDATA(nad, elem));
-
- /* change it */
- if((c2s->ar->set_password)(c2s->ar, username, sess->realm, password) != 0)
-diff -ru c2sorig/authreg_mysql.c c2s/authreg_mysql.c
---- c2sorig/authreg_mysql.c Mon Nov 22 15:53:34 2004
-+++ c2s/authreg_mysql.c Mon Nov 22 16:55:37 2004
-@@ -24,6 +24,10 @@
-
- #ifdef STORAGE_MYSQL
-
-+#define MYSQL_LU 1024 /* maximum length of username - should correspond to field length */
-+#define MYSQL_LR 256 /* maximum length of realm - should correspond to field length */
-+#define MYSQL_LP 256 /* maximum length of password - should correspond to field length */
-+
- #include <mysql.h>
-
- typedef struct mysqlcontext_st {
-@@ -42,7 +46,8 @@
- static MYSQL_RES *_ar_mysql_get_user_tuple(authreg_t ar, char *username, char *realm) {
- mysqlcontext_t ctx = (mysqlcontext_t) ar->private;
- MYSQL *conn = ctx->conn;
-- char euser[2049], erealm[2049], sql[5121]; /* query(1024) + euser(2048) + erealm(2048) + \0(1) */
-+ char iuser[MYSQL_LU+1], irealm[MYSQL_LR+1];
-+ char euser[MYSQL_LU*2+1], erealm[MYSQL_LR*2+1], sql[1024 + MYSQL_LU*2 + MYSQL_LR*2 + 1]; /* query(1024) + euser + erealm + \0(1) */
- MYSQL_RES *res;
-
- if(mysql_ping(conn) != 0) {
-@@ -50,8 +55,11 @@
- return NULL;
- }
-
-- mysql_real_escape_string(conn, euser, username, strlen(username));
-- mysql_real_escape_string(conn, erealm, realm, strlen(realm));
-+ snprintf(iuser, MYSQL_LU+1, "%s", username);
-+ snprintf(irealm, MYSQL_LR+1, "%s", realm);
-+
-+ mysql_real_escape_string(conn, euser, iuser, strlen(iuser));
-+ mysql_real_escape_string(conn, erealm, irealm, strlen(irealm));
-
- sprintf(sql, ctx->sql_select, euser, erealm);
-
-@@ -127,15 +135,21 @@
- static int _ar_mysql_set_password(authreg_t ar, char *username, char *realm, char password[257]) {
- mysqlcontext_t ctx = (mysqlcontext_t) ar->private;
- MYSQL *conn = ctx->conn;
-- char euser[2049], erealm[2049], epass[513], sql[5633]; /* query(1024) + euser(2048) + erealm(2048) + epass(512) + \0(1) */
-+ char iuser[MYSQL_LU+1], irealm[MYSQL_LR+1];
-+ char euser[MYSQL_LU*2+1], erealm[MYSQL_LR*2+1], epass[513], sql[1024+MYSQL_LU*2+MYSQL_LR*2+512+1]; /* query(1024) + euser + erealm + epass(512) + \0(1) */
-
- if(mysql_ping(conn) != 0) {
- log_write(ar->c2s->log, LOG_ERR, "mysql: connection to database lost");
- return 1;
- }
-
-- mysql_real_escape_string(conn, euser, username, strlen(username));
-- mysql_real_escape_string(conn, erealm, realm, strlen(realm));
-+ snprintf(iuser, MYSQL_LU+1, "%s", username);
-+ snprintf(irealm, MYSQL_LR+1, "%s", realm);
-+
-+ password[256]= '\0';
-+
-+ mysql_real_escape_string(conn, euser, iuser, strlen(iuser));
-+ mysql_real_escape_string(conn, erealm, irealm, strlen(irealm));
- mysql_real_escape_string(conn, epass, password, strlen(password));
-
- sprintf(sql, ctx->sql_setpassword, epass, euser, erealm);
-@@ -195,15 +209,19 @@
- static int _ar_mysql_set_zerok(authreg_t ar, char *username, char *realm, char hash[41], char token[11], int sequence) {
- mysqlcontext_t ctx = (mysqlcontext_t) ar->private;
- MYSQL *conn = ctx->conn;
-- char euser[2049], erealm[2049], ehash[81], etoken[21], sql[5233]; /* query(1024) + euser(2048) + erealm(2048) + ehash(80) + etoken(20) + sequence(12) + \0(1) */
-+ char iuser[MYSQL_LU+1], irealm[MYSQL_LR+1];
-+ char euser[MYSQL_LU*2+1], erealm[MYSQL_LR*2+1], ehash[81], etoken[21], sql[1024+MYSQL_LU*2+MYSQL_LR*2+80+20+12+1]; /* query(1024) + euser + erealm + ehash(80) + etoken(20) + sequence(12) + \0(1) */
-
- if(mysql_ping(conn) != 0) {
- log_write(ar->c2s->log, LOG_ERR, "mysql: connection to database lost");
- return 1;
- }
-
-- mysql_real_escape_string(conn, euser, username, strlen(username));
-- mysql_real_escape_string(conn, erealm, realm, strlen(realm));
-+ snprintf(iuser, MYSQL_LU+1, "%s", username);
-+ snprintf(irealm, MYSQL_LR+1, "%s", realm);
-+
-+ mysql_real_escape_string(conn, euser, iuser, strlen(iuser));
-+ mysql_real_escape_string(conn, erealm, irealm, strlen(irealm));
- mysql_real_escape_string(conn, ehash, hash, strlen(hash));
- mysql_real_escape_string(conn, etoken, token, strlen(token));
-
-@@ -222,7 +240,8 @@
- static int _ar_mysql_create_user(authreg_t ar, char *username, char *realm) {
- mysqlcontext_t ctx = (mysqlcontext_t) ar->private;
- MYSQL *conn = ctx->conn;
-- char euser[2049], erealm[2049], sql[5121]; /* query(1024) + euser(2048) + erealm(2048) + \0(1) */
-+ char iuser[MYSQL_LU+1], irealm[MYSQL_LR+1];
-+ char euser[MYSQL_LU*2+1], erealm[MYSQL_LR*2+1], sql[1024+MYSQL_LU*2+MYSQL_LR*2+1]; /* query(1024) + euser + erealm + \0(1) */
- MYSQL_RES *res = _ar_mysql_get_user_tuple(ar, username, realm);
-
- if(res != NULL) {
-@@ -237,8 +256,11 @@
- return 1;
- }
-
-- mysql_real_escape_string(conn, euser, username, strlen(username));
-- mysql_real_escape_string(conn, erealm, realm, strlen(realm));
-+ snprintf(iuser, MYSQL_LU+1, "%s", username);
-+ snprintf(irealm, MYSQL_LR+1, "%s", realm);
-+
-+ mysql_real_escape_string(conn, euser, iuser, strlen(iuser));
-+ mysql_real_escape_string(conn, erealm, irealm, strlen(irealm));
-
- sprintf(sql, ctx->sql_create, euser, erealm);
-
-@@ -255,15 +277,19 @@
- static int _ar_mysql_delete_user(authreg_t ar, char *username, char *realm) {
- mysqlcontext_t ctx = (mysqlcontext_t) ar->private;
- MYSQL *conn = ctx->conn;
-- char euser[2049], erealm[2049], sql[5121]; /* query(1024) + euser(2048) + erealm(2048) + \0(1) */
-+ char iuser[MYSQL_LU+1], irealm[MYSQL_LR+1];
-+ char euser[MYSQL_LU*2+1], erealm[MYSQL_LR*2+1], sql[1024+MYSQL_LU*2+MYSQL_LR*2+1]; /* query(1024) + euser + erealm + \0(1) */
-
- if(mysql_ping(conn) != 0) {
- log_write(ar->c2s->log, LOG_ERR, "mysql: connection to database lost");
- return 1;
- }
-
-- mysql_real_escape_string(conn, euser, username, strlen(username));
-- mysql_real_escape_string(conn, erealm, realm, strlen(realm));
-+ snprintf(iuser, MYSQL_LU+1, "%s", username);
-+ snprintf(irealm, MYSQL_LR+1, "%s", realm);
-+
-+ mysql_real_escape_string(conn, euser, iuser, strlen(iuser));
-+ mysql_real_escape_string(conn, erealm, irealm, strlen(irealm));
-
- sprintf(sql, ctx->sql_delete, euser, erealm);
-
-diff -ru c2sorig/authreg_pgsql.c c2s/authreg_pgsql.c
---- c2sorig/authreg_pgsql.c Mon Nov 22 15:53:34 2004
-+++ c2s/authreg_pgsql.c Mon Nov 22 16:52:20 2004
-@@ -26,6 +26,10 @@
-
- #include <libpq-fe.h>
-
-+#define PGSQL_LU 1024 /* maximum length of username - should correspond to field length */
-+#define PGSQL_LR 256 /* maximum length of realm - should correspond to field length */
-+#define PGSQL_LP 256 /* maximum length of password - should correspond to field length */
-+
- typedef struct pgsqlcontext_st {
- PGconn * conn;
- char * sql_create;
-@@ -42,11 +46,16 @@
- static PGresult *_ar_pgsql_get_user_tuple(authreg_t ar, char *username, char *realm) {
- pgsqlcontext_t ctx = (pgsqlcontext_t) ar->private;
- PGconn *conn = ctx->conn;
-- char euser[2049], erealm[2049], sql[5121]; /* query(1024) + euser(2048) + erealm(2048) + \0(1) */
-+
-+ char iuser[PGSQL_LU+1], irealm[PGSQL_LR+1];
-+ char euser[PGSQL_LU*2+1], erealm[PGSQL_LR*2+1], sql[1024+PGSQL_LU*2+PGSQL_LR*2+1]; /* query(1024) + euser + erealm + \0(1) */
- PGresult *res;
-
-- PQescapeString(euser, username, strlen(username));
-- PQescapeString(erealm, realm, strlen(realm));
-+ snprintf(iuser, PGSQL_LU+1, "%s", username);
-+ snprintf(irealm, PGSQL_LR+1, "%s", realm);
-+
-+ PQescapeString(euser, iuser, strlen(iuser));
-+ PQescapeString(erealm, irealm, strlen(irealm));
-
- sprintf(sql, ctx->sql_select, euser, erealm);
-
-@@ -114,11 +123,15 @@
- static int _ar_pgsql_set_password(authreg_t ar, char *username, char *realm, char password[257]) {
- pgsqlcontext_t ctx = (pgsqlcontext_t) ar->private;
- PGconn *conn = ctx->conn;
-- char euser[2049], erealm[2049], epass[513], sql[5633]; /* query(1024) + euser(2048) + erealm(2048) + epass(512) + \0(1) */
-+ char iuser[PGSQL_LU+1], irealm[PGSQL_LR+1];
-+ char euser[PGSQL_LU*2+1], erealm[PGSQL_LR*2+1], epass[513], sql[1024+PGSQL_LU*2+PGSQL_LR*2+512+1]; /* query(1024) + euser + erealm + epass(512) + \0(1) */
- PGresult *res;
-
-- PQescapeString(euser, username, strlen(username));
-- PQescapeString(erealm, realm, strlen(realm));
-+ snprintf(iuser, PGSQL_LU+1, "%s", username);
-+ snprintf(irealm, PGSQL_LR+1, "%s", realm);
-+
-+ PQescapeString(euser, iuser, strlen(iuser));
-+ PQescapeString(erealm, irealm, strlen(irealm));
- PQescapeString(epass, password, strlen(password));
-
- sprintf(sql, ctx->sql_setpassword, epass, euser, erealm);
-@@ -177,11 +190,15 @@
- static int _ar_pgsql_set_zerok(authreg_t ar, char *username, char *realm, char hash[41], char token[11], int sequence) {
- pgsqlcontext_t ctx = (pgsqlcontext_t) ar->private;
- PGconn *conn = ctx->conn;
-- char euser[2049], erealm[2049], ehash[81], etoken[21], sql[5233]; /* query(1024) + euser(2048) + erealm(2048) + ehash(80) + etoken(20) + sequence(12) + \0(1) */
-+ char iuser[PGSQL_LU+1], irealm[PGSQL_LR+1];
-+ char euser[PGSQL_LU*2+1], erealm[PGSQL_LR*2+1], ehash[81], etoken[21], sql[1024 + PGSQL_LU*2 + PGSQL_LR*2 + 80 + 20 + 12 + 1]; /* query(1024) + euser + erealm + ehash(80) + etoken(20) + sequence(12) + \0(1) */
- PGresult *res;
-
-- PQescapeString(euser, username, strlen(username));
-- PQescapeString(erealm, realm, strlen(realm));
-+ snprintf(iuser, PGSQL_LU+1, "%s", username);
-+ snprintf(irealm, PGSQL_LR+1, "%s", realm);
-+
-+ PQescapeString(euser, iuser, strlen(iuser));
-+ PQescapeString(erealm, irealm, strlen(irealm));
- PQescapeString(ehash, hash, strlen(hash));
- PQescapeString(etoken, token, strlen(token));
-
-@@ -210,7 +227,8 @@
- static int _ar_pgsql_create_user(authreg_t ar, char *username, char *realm) {
- pgsqlcontext_t ctx = (pgsqlcontext_t) ar->private;
- PGconn *conn = ctx->conn;
-- char euser[2049], erealm[2049], sql[5121]; /* query(1024) + euser(2048) + erealm(2048) + \0(1) */
-+ char iuser[PGSQL_LU+1], irealm[PGSQL_LR+1];
-+ char euser[PGSQL_LU*2+1], erealm[PGSQL_LR*2+1], sql[1024+PGSQL_LU*2+PGSQL_LR*2+1]; /* query(1024) + euser + erealm + \0(1) */
- PGresult *res;
-
- res = _ar_pgsql_get_user_tuple(ar, username, realm);
-@@ -221,8 +239,11 @@
-
- PQclear(res);
-
-- PQescapeString(euser, username, strlen(username));
-- PQescapeString(erealm, realm, strlen(realm));
-+ snprintf(iuser, PGSQL_LU+1, "%s", username);
-+ snprintf(irealm, PGSQL_LR+1, "%s", realm);
-+
-+ PQescapeString(euser, iuser, strlen(iuser));
-+ PQescapeString(erealm, irealm, strlen(irealm));
-
- sprintf(sql, ctx->sql_create, euser, erealm);
-
-@@ -249,11 +270,15 @@
- static int _ar_pgsql_delete_user(authreg_t ar, char *username, char *realm) {
- pgsqlcontext_t ctx = (pgsqlcontext_t) ar->private;
- PGconn *conn = ctx->conn;
-- char euser[2049], erealm[2049], sql[5121]; /* query(1024) + euser(2048) + erealm(2048) + \0(1) */
-+ char iuser[PGSQL_LU+1], irealm[PGSQL_LR+1];
-+ char euser[PGSQL_LU*2+1], erealm[PGSQL_LR*2+1], sql[1024+PGSQL_LU*2+PGSQL_LR*2+1]; /* query(1024) + euser + erealm + \0(1) */
- PGresult *res;
-
-- PQescapeString(euser, username, strlen(username));
-- PQescapeString(erealm, realm, strlen(realm));
-+ snprintf(iuser, PGSQL_LU+1, "%s", username);
-+ snprintf(irealm, PGSQL_LR+1, "%s", realm);
-+
-+ PQescapeString(euser, iuser, strlen(iuser));
-+ PQescapeString(erealm, irealm, strlen(irealm));
-
- sprintf(sql, ctx->sql_delete, euser, erealm);
-
+++ /dev/null
-#!/bin/bash
-
-######
-#
-# Generate a certificate and key with no passphrase.
-#
-######
-
-OPENSSL=/usr/bin/openssl
-
-## Remove existing temporary private key
-test -f /tmp/privkey.pem && rm -f /tmp/privkey.pem
-## Remove existing private key
-test -f /etc/jabberd/gentoo.pem && rm -f /etc/jabberd/gentoo.pem
-## This generates the cert and key
-$OPENSSL req -new -x509 -newkey rsa:2048 -keyout /tmp/privkey.pem -out /etc/jabberd/gentoo.pem
-## This will remove the passphrase
-$OPENSSL rsa -in /tmp/privkey.pem -out /tmp/privkey.pem
-## Put it all together
-cat /tmp/privkey.pem >> /etc/jabberd/gentoo.pem
-## Cleanup
-rm -f /tmp/privkey.pem
-echo ""
-echo "Your new key is /etc/jabberd/gentoo.pem"
-echo ""
+++ /dev/null
-#!/bin/bash
-
-######
-#
-# Generate a certificate and key with no passphrase.
-#
-######
-
-OPENSSL=/usr/bin/openssl
-
-## This generates the cert and key
-$OPENSSL req -new -x509 -newkey rsa:1024 -keyout /tmp/privkey.pem -out /etc/jabber/gentoo.pem
-## This will remove the passphrase
-$OPENSSL rsa -in /tmp/privkey.pem -out /tmp/privkey.pem
-## Put it all together
-cat /tmp/privkey.pem >> /etc/jabber/gentoo.pem
-## Cleanup
-rm /tmp/privkey.pem
-echo ""
-echo "Your new key is /etc/jabber/gentoo.pem"
-echo ""
+++ /dev/null
-<xdb id="xdb_ldap">
- <ns>jabber:iq:auth:0k</ns>
- <ns>jabber:iq:auth</ns>
- <ns>vcard-temp</ns>
- <ns>jabber:jud:users</ns>
- <host/>
- <load>
- <xdb_ldap>/usr/lib/jabberd/xdb_ldap.so</xdb_ldap>
- </load>
- <xdb_ldap xmlns="jabberd:xdb_ldap:config">
- <connection>
- <host>localhost</host>
- <port></port>
- <rootdn>o=idx-jabber,c=fr</rootdn>
- <uniqattr>cn</uniqattr>
- <binddn>cn=jabberadmin, o=idx-jabber, c=fr</binddn>
- <bindpw>secret</bindpw>
- </connection>
- <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>
- </xdb_ldap>
-</xdb>
-<xdb id="xdb_other">
- <ns>jabber:iq:roster</ns>
- <ns>jabber:iq:private</ns>
- <ns>jabber:iq:register</ns>
- <ns>jabber:iq:filter</ns>
- <ns>jabber:x:offline</ns>
- <host/>
- <load>
- <xdb_file>./xdb_file/xdb_file.so</xdb_file>
- </load>
- <xdb_file xmlns="jabber:config:xdb_file">
- <spool><jabberd:cmdline flag='s'>/var/spool/jabber</jabberd:cmdline></spool>
- </xdb_file>
-</xdb>
+++ /dev/null
---- error.c.old 2004-03-20 14:39:57.985636816 +0100
-+++ error.c 2004-03-20 14:40:42.025941672 +0100
-@@ -71,7 +71,13 @@
- len += sprintf(&(buf->data[len]), "<stream:error xmlns:stream='" uri_STREAMS "'><%s xmlns='" uri_STREAM_ERR "'/><text xmlns='" uri_STREAM_ERR "'>%s</text></stream:error>", _stream_errors[err], text);
-
- if(s->state < state_STREAM)
-- len += sprintf(&(buf->data[len]), "</stream:stream>");
-+ {
-+ char *streamend= "</stream:stream>";
-+ printf ("About to write %d bytes\n", strlen (streamend));
-+ // len += sprintf(&(buf->data[len]), "</stream:stream>");
-+ memcpy (&(buf->data[len]), streamend, strlen (streamend));
-+ len += strlen (streamend);
-+ }
-
- assert(len == buf->len);
-
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r5.ebuild,v 1.7 2007/02/03 13:28:12 nelchael Exp $
-
-inherit eutils multilib
-
-S="${WORKDIR}/jabberd-${PV}"
-DESCRIPTION="Open Source Jabber Server"
-HOMEPAGE="http://www.jabber.org"
-SRC_URI="http://jabberd.jabberstudio.org/1.4/dist/jabberd-${PV}.tar.gz
- http://www.gentoo-pt.org/~humpback/jabberd-1.4.3-extexpat.diff
- ldap? ( http://www.jabberstudio.org/files/xdb_ldap/xdb_ldap-1.0.tar.gz )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc sparc x86"
-IUSE="ssl ldap ipv6 msn oscar yahoo icq"
-
-DEPEND="!net-im/jabber-server
- >=dev-libs/pth-1.4.0
- dev-libs/expat
- ssl? ( >=dev-libs/openssl-0.9.6i )
- ldap? ( =net-nds/openldap-2* )"
-
-PDEPEND="msn? ( net-im/msn-transport )
- oscar? ( net-im/aim-transport )
- yahoo? ( net-im/yahoo-transport )
- icq? ( net-im/jit )"
-
-pkg_setup() {
- enewgroup jabber
- enewuser jabber -1 -1 /var/spool/jabber jabber
-
- if use ipv6 ; then
- ewarn "You are about to build with ipv6 support, if your system is not using ipv6"
- ewarn "do control-c now and emerge with \"USE=-ipv6\" "
- epause 5
- fi
-}
-
-src_unpack() {
- unpack jabberd-${PV}.tar.gz
- cd ${S}
- use ldap && unpack xdb_ldap-1.0.tar.gz
- epatch ${FILESDIR}/multiple-xml-patch-00
- epatch ${FILESDIR}/multiple-xml-patch-01
- #Patch for extexpat DoS http://www.jabber.org/pipermail/jadmin/2004-September/018046.html
- epatch ${DISTDIR}/jabberd-1.4.3-extexpat.diff
- mv jabber.xml multiple.xml
-}
-
-src_compile() {
- # These can cause problems with certain configure scripts used...
- unset LC_ALL LC_CTYPE
-
-
- local myconf
- cd ${S}
- use ssl && myconf="--enable-ssl"
- use ipv6 && myconf="${myconf} --enable-ipv6"
-
- mv jabberd/jabberd.c jabberd/jabberd.c.orig
- sed 's:pstrdup(jabberd__runtime,HOME):"/var/spool/jabber":' jabberd/jabberd.c.orig > jabberd/jabberd.c
- rm -f jabberd/jabberd.c.orig
- ./configure ${myconf} || die
- make || die
-
- if use ldap; then
- cd ${S}/xdb_ldap/src
- make all || die
- fi
-}
-
-src_install() {
- insinto /etc/conf.d ; newins ${FILESDIR}/jabber-conf.d jabber
- exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r8 jabber
- dodir /usr/sbin /etc/jabber /usr/$(get_libdir)/jabberd /var/log/jabber /usr/include/jabberd
- touch ${D}/var/log/jabber/error.log
- touch ${D}/var/log/jabber/record.log
- dodir /var/spool/jabber
- keepdir /var/spool/jabber/
- keepdir /var/log/jabber/
- dodir /var/run
-
- exeinto /usr/sbin
- doexe jabberd/jabberd
- insinto /usr/$(get_libdir)/jabberd
- doins platform-settings
- doins jsm/jsm.so
- doins xdb_file/xdb_file.so
- doins pthsock/pthsock_client.so
- doins dnsrv/dnsrv.so
- doins dialback/dialback.so
- if use ldap; then
- insinto /etc/jabber
- doins xdb_ldap/jabber.schema
- doins xdb_ldap/slapd.conf
- doins config/xdb-ldap.xml
- insinto /usr/$(get_libdir)/jabberd
- doins xdb_ldap/src/xdb_ldap.so
- fi
- insinto /etc/jabber
- doins multiple.xml
- exeinto /etc/jabber
- doexe ${FILESDIR}/self-cert.sh
-
- dodoc README UPGRADE ${FILESDIR}/README.Gentoo
-
- fowners jabber:jabber /etc/jabber
- fowners jabber:jabber /usr/sbin/jabberd
- fowners jabber:jabber /var/log/jabber
- fowners jabber:jabber /var/log/jabber/error.log
- fowners jabber:jabber /var/log/jabber/record.log
- fowners jabber:jabber /var/spool/jabber
-
- fperms o-rwx /etc/jabber
- fperms o-rwx /usr/sbin/jabberd
- fperms o-rwx /var/log/jabber
- fperms o-rwx /var/log/jabber/error.log
- fperms o-rwx /var/log/jabber/record.log
- fperms o-rwx /var/spool/jabber
- fperms u+rwx /usr/sbin/jabberd
-
- fperms g-x /etc/jabber
- fperms g-x /usr/sbin/jabberd
- fperms g-x /var/log/jabber
- fperms g-x /var/log/jabber/error.log
- fperms g-x /var/log/jabber/record.log
- fperms g-x /var/spool/jabber
-
- fperms g+rw /etc/jabber
- fperms g+rw /usr/sbin/jabberd
- fperms g+rw /var/log/jabber
- fperms g+rw /var/log/jabber/error.log
- fperms g+rw /var/log/jabber/record.log
- fperms g+rw /var/spool/jabber
- fperms u+xs /usr/sbin/jabberd
-
- #Install header files for transports to use
- cd ${S}/jabberd
- tar cf - `find . -name \*.h` | (cd ${D}/usr/include/jabberd ; tar xvf -)
- assert "Failed to install header files to /usr/include/jabberd"
-}
-
-pkg_postinst() {
-
- einfo
- einfo "Change 'localhost' to your server's domainname in the"
- einfo "/etc/jabber/*.xml configs first"
- einfo "Server admins should be added to the "jabber" group"
- if use ssl; then
- einfo
- einfo "To enable SSL connections, execute /etc/jabber/self-cert.sh"
- fi
- if use ldap; then
- einfo
- einfo "In order to use the ldap backend, you need to copy"
- einfo "the file /etc/jabber/jabber.schema into the /etc/openldap/schemas"
- einfo "directory on your ldap server. You will also need to"
- einfo "include the schema in your slapd.conf file and retsart openldap."
- einfo "An example slapd.conf file is included in /etc/jabber."
- einfo "The xdb_ldap backend expects your ldap server to handle"
- einfo "StartTLS or run in ldaps mode."
- fi
- einfo
- einfo "The various IM transports for jabber are now separate packages,"
- einfo "which you will need to install separately if you want them:"
- einfo "net-im/jit - ICQ transport (You can use aim-transport for icq but JIT is better)"
- einfo "net-im/msn-transport - MSN transport (USE=msn)"
- einfo "net-im/jud - Jabber User Directory"
- einfo "net-im/yahoo-transport - Yahoo IM system (USE=yahoo)"
- einfo "net-im/aim-transport - AOL transport (USE=oscar)"
- einfo "net-im/mu-conference - Jabber multi user conference"
- einfo
- einfo "Please read /usr/share/doc/${PF}/README.Gentoo.gz"
- einfo
- ewarn "If upgrading from older version please stop jabberd BEFORE updating the init.d"
- ewarn "script, or you will end with a \"dead\" server."
-}
projects / gentoo.git / commitdiff