From 441d811d4d759a2f22a0a9f0581aa9f03293ff3a Mon Sep 17 00:00:00 2001 From: xtraeme Date: Thu, 20 Jan 2005 15:08:54 +0000 Subject: Update to 2.0s6. Changes: * Fix base64 encoding length in authreg_pipe.c Stephen Marquard, Diagnosed by Jerome Vandenabeele * Fixes segfault on s2s startup on some platforms when ssl is enabled (local pemfile defined in s2s.xml), Stephen Marquard * mod_offline handling of jabber:x:event client requests (JEP-0022) can lead to a loop repeatedly adding duplicates to the offline queue under certain race conditions. Correctly detect jabber:x:event notifications and do not respond to them as requests, Stephen Marquard * Check for invalid jids in directed presence packets, Stephen Marquard, Based on bug report by Christopher Zorn * Fixes minor memory leaks in authreg_ldap, Ilja Booij * Fixes error in storage filter code using bdb storage causing sm crash, Stephen Marquard * Changes incorrectly indexed primary keys to non-unique indexes, adds other indexes for efficiency, and changes type of xml field to increase max allowed length, Stephen Marquard * Include sys/types.h if available in util.h inter alia for FreeeBSD, Stephen Marquard * Minor code cleanups for compilation on HP-UX, Christof Meerwald * Fix configure.in for correct handling of resolv.h, Magnus Henoch * Include resquery checks from MAIN cvs branch in 2.0, Christof Meerwald * Allows jabberd to start new components and place itself in the background, Richard Bullington-McGuire (original ver), Additional components defined in jabberd.cfg get started as long as they are in the same directory as the jabberd script (useful for mu-conference installed through jcr) The script can daemonize itself with the "-b" switch after starting the various programs it watches over, unless the debug option is set. * Paranoia, ensure than srv->name is nul terminated., Jedi/Sector One And more, please see the Changelog file. --- chat/jabberd2/Makefile | 15 ++++----------- chat/jabberd2/distinfo | 34 +++++----------------------------- chat/jabberd2/options.mk | 4 ++-- chat/jabberd2/patches/patch-ag | 19 +++++++++++++------ chat/jabberd2/patches/patch-ah | 15 --------------- chat/jabberd2/patches/patch-ai | 20 ++++++++++++++++++++ 6 files changed, 44 insertions(+), 63 deletions(-) delete mode 100644 chat/jabberd2/patches/patch-ah create mode 100644 chat/jabberd2/patches/patch-ai (limited to 'chat') diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile index 0dc06422a84..189b0b0dd06 100644 --- a/chat/jabberd2/Makefile +++ b/chat/jabberd2/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2004/12/28 02:47:41 reed Exp $ +# $NetBSD: Makefile,v 1.18 2005/01/20 15:08:54 xtraeme Exp $ # -DISTNAME= jabberd-2.0s4 -PKGREVISION= 2 +DISTNAME= jabberd-2.0s6 CATEGORIES= chat MASTER_SITES= http://www.jabberstudio.org/files/jabberd2/ @@ -10,14 +9,6 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://jabberd.jabberstudio.org/2/ COMMENT= Instant messaging server (version 2) -PATCH_SITES= http://www.marquard.net/jabber/patches/ -PATCHFILES= patch-jedi8-sm-object_c patch-jedi-mysql-storage patch-base64 \ - patch-sm-storage_db patch-nad-escape patch-jedi-pgsql-storage \ - patch-memleaks patch-ns-fix patch-sm-nad-triplet \ - patch-mod_disco_publish patch-sm-filter patch-c2s-buffers -DIST_SUBDIR= ${PKGNAME_NOREV} - - CONFLICTS= jabberd-[0-9]*:../../chat/jabberd USE_BUILDLINK3= yes @@ -39,6 +30,8 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --disable-mysql CONFIGURE_ARGS+= --enable-pipe CONFIGURE_ARGS+= --enable-anon +CONFIGURE_ARGS+= --enable-ssl +CONFIGURE_ARGS+= --enable-fs REPLACE_PERL= tools/*.pl diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo index 65df6ece4d8..d1840b4d38f 100644 --- a/chat/jabberd2/distinfo +++ b/chat/jabberd2/distinfo @@ -1,36 +1,12 @@ -$NetBSD: distinfo,v 1.4 2004/11/29 17:54:03 abs Exp $ +$NetBSD: distinfo,v 1.5 2005/01/20 15:08:54 xtraeme Exp $ -SHA1 (jabberd-2.0s4/jabberd-2.0s4.tar.gz) = cb429db090982118f2b448499635ff14b91718b8 -Size (jabberd-2.0s4/jabberd-2.0s4.tar.gz) = 716819 bytes -SHA1 (jabberd-2.0s4/patch-jedi8-sm-object_c) = 06d0737e93c3eee677c20fd2914b4dc70286acf6 -Size (jabberd-2.0s4/patch-jedi8-sm-object_c) = 341 bytes -SHA1 (jabberd-2.0s4/patch-jedi-mysql-storage) = 4684a8f89f8f79b31d2fcd9c39929404d840e3ef -Size (jabberd-2.0s4/patch-jedi-mysql-storage) = 1563 bytes -SHA1 (jabberd-2.0s4/patch-base64) = 1fb446754e86fb5a4361f8be81063d77d1d06a9f -Size (jabberd-2.0s4/patch-base64) = 4252 bytes -SHA1 (jabberd-2.0s4/patch-sm-storage_db) = a42c3b75c719bf36148b4a03e05c10d23d8da30a -Size (jabberd-2.0s4/patch-sm-storage_db) = 1264 bytes -SHA1 (jabberd-2.0s4/patch-nad-escape) = 3e32fc737958afc2d5faa0134407d12b5cf841c9 -Size (jabberd-2.0s4/patch-nad-escape) = 1052 bytes -SHA1 (jabberd-2.0s4/patch-jedi-pgsql-storage) = fb3226177bfafeced72a8c74c1594c4ed851d32c -Size (jabberd-2.0s4/patch-jedi-pgsql-storage) = 2648 bytes -SHA1 (jabberd-2.0s4/patch-memleaks) = 5d57fc737667ed39185dccc29d9174ae4ece85db -Size (jabberd-2.0s4/patch-memleaks) = 969 bytes -SHA1 (jabberd-2.0s4/patch-ns-fix) = 4b3b53cd54c7d93fd4f57a30bcf888fc96a6bf41 -Size (jabberd-2.0s4/patch-ns-fix) = 1193 bytes -SHA1 (jabberd-2.0s4/patch-sm-nad-triplet) = feedb1b21dc526cf0e1b643c57663c0c7b75a66c -Size (jabberd-2.0s4/patch-sm-nad-triplet) = 238 bytes -SHA1 (jabberd-2.0s4/patch-mod_disco_publish) = ff87c23b48ed1a68f77f6757249ac173c1ab2039 -Size (jabberd-2.0s4/patch-mod_disco_publish) = 509 bytes -SHA1 (jabberd-2.0s4/patch-sm-filter) = 4efd5fb4b5eca2b09eb475bd1be8d25ed6f72a47 -Size (jabberd-2.0s4/patch-sm-filter) = 12616 bytes -SHA1 (jabberd-2.0s4/patch-c2s-buffers) = bc66b98f81d23d2314b5515cf2191be38985afaf -Size (jabberd-2.0s4/patch-c2s-buffers) = 12112 bytes +SHA1 (jabberd-2.0s6.tar.gz) = 10a160e804e3ace8f7f39174db6bfaabe50211f0 +Size (jabberd-2.0s6.tar.gz) = 724448 bytes SHA1 (patch-aa) = ff9a1aa6c39b7e96870d4f884de09be8307ac169 SHA1 (patch-ab) = de1c8ec12b55117223bcca2071499c42ab145a34 SHA1 (patch-ac) = 312a07fa6772956297789e15025e0ca0fad9ebb7 SHA1 (patch-ad) = b7776cbd6553f3b3b2f9b20250b1368f196cb85d SHA1 (patch-ae) = a5edb31af022b682c96ceacee615999f6439662e SHA1 (patch-af) = aad84cbfba7c0519e32df1ed6f31fa8383d73393 -SHA1 (patch-ag) = 2b60461b16a419c69855478f282fa123c00fd54c -SHA1 (patch-ah) = 332711288dc07c952726357d6d1d804216e5eb56 +SHA1 (patch-ag) = fda728bc2682c76376b68863797fcb085739a047 +SHA1 (patch-ai) = 207ea23701784272b8481a7f9b1cfee0c1887268 diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk index 703f7631d31..79ec4f96e8a 100644 --- a/chat/jabberd2/options.mk +++ b/chat/jabberd2/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.5 2005/01/14 05:15:39 jlam Exp $ +# $NetBSD: options.mk,v 1.6 2005/01/20 15:08:54 xtraeme Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2 PKG_SUPPORTED_OPTIONS= db mysql pgsql ldap PAM -PKG_DEFAULT_OPTIONS+= mysql +PKG_DEFAULT_OPTIONS= mysql .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mdb) diff --git a/chat/jabberd2/patches/patch-ag b/chat/jabberd2/patches/patch-ag index 9adff9f7202..9ded7708323 100644 --- a/chat/jabberd2/patches/patch-ag +++ b/chat/jabberd2/patches/patch-ag @@ -1,7 +1,7 @@ -$NetBSD: patch-ag,v 1.2 2004/07/14 00:25:11 xtraeme Exp $ +$NetBSD: patch-ag,v 1.3 2005/01/20 15:08:54 xtraeme Exp $ ---- etc/c2s.xml.in.orig 2004-07-13 18:56:31.000000000 +0200 -+++ etc/c2s.xml.in 2004-07-13 18:58:39.000000000 +0200 +--- etc/c2s.xml.in.orig 2005-01-20 15:39:58.000000000 +0100 ++++ etc/c2s.xml.in 2005-01-20 15:41:39.000000000 +0100 @@ -6,7 +6,7 @@ -@@ -88,7 +88,7 @@ +@@ -88,13 +88,13 @@ connections. If this is commented out, clients will not be offered the STARTTLS stream extension --> + + + @@ -47,7 +54,7 @@ $NetBSD: patch-ag,v 1.2 2004/07/14 00:25:11 xtraeme Exp $ diff --git a/chat/jabberd2/patches/patch-ah b/chat/jabberd2/patches/patch-ah deleted file mode 100644 index e5cc6285b96..00000000000 --- a/chat/jabberd2/patches/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2004/07/14 00:25:11 xtraeme Exp $ - ---- util/util.h.orig 2004-07-14 01:59:37.000000000 +0200 -+++ util/util.h 2004-07-14 02:00:14.000000000 +0200 -@@ -31,6 +31,10 @@ - #include - #include - -+#ifdef HAVE_SYS_SOCKET_H -+# include -+#endif -+ - #ifdef HAVE_NETINET_IN_H - # include - #endif diff --git a/chat/jabberd2/patches/patch-ai b/chat/jabberd2/patches/patch-ai new file mode 100644 index 00000000000..683f21d577d --- /dev/null +++ b/chat/jabberd2/patches/patch-ai @@ -0,0 +1,20 @@ +$NetBSD: patch-ai,v 1.1 2005/01/20 15:08:54 xtraeme Exp $ + +--- ltmain.sh.orig Tue Nov 30 15:55:46 2004 ++++ ltmain.sh Tue Nov 30 15:55:59 2004 +@@ -561,7 +561,6 @@ + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" + # user sometimes does CC=-gcc so we need to match that to 'gcc' +- trimedcc="${CC/${host}-}" + case "$base_compile " in + "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) + tagname=CC +@@ -954,7 +953,6 @@ + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" + # user sometimes does CC=-gcc so we need to match that to 'gcc' +- trimedcc="${CC/${host}-}" + case $base_compile in + "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*) + tagname=CC -- cgit v1.2.3