head	1.10;
access;
symbols
	pkgsrc-2013Q2:1.10.0.8
	pkgsrc-2013Q2-base:1.10
	pkgsrc-2012Q4:1.10.0.6
	pkgsrc-2012Q4-base:1.10
	pkgsrc-2011Q4:1.10.0.4
	pkgsrc-2011Q4-base:1.10
	pkgsrc-2011Q2:1.10.0.2
	pkgsrc-2011Q2-base:1.10
	pkgsrc-2010Q4:1.9.0.6
	pkgsrc-2010Q4-base:1.9
	pkgsrc-2010Q3:1.9.0.4
	pkgsrc-2010Q3-base:1.9
	pkgsrc-2010Q2:1.9.0.2
	pkgsrc-2010Q2-base:1.9
	pkgsrc-2010Q1:1.8.0.6
	pkgsrc-2010Q1-base:1.8
	pkgsrc-2009Q4:1.8.0.4
	pkgsrc-2009Q4-base:1.8
	pkgsrc-2009Q3:1.8.0.2
	pkgsrc-2009Q3-base:1.8
	pkgsrc-2009Q2:1.7.0.16
	pkgsrc-2009Q2-base:1.7
	pkgsrc-2009Q1:1.7.0.14
	pkgsrc-2009Q1-base:1.7
	pkgsrc-2008Q4:1.7.0.12
	pkgsrc-2008Q4-base:1.7
	pkgsrc-2008Q3:1.7.0.10
	pkgsrc-2008Q3-base:1.7
	cube-native-xorg:1.7.0.8
	cube-native-xorg-base:1.7
	pkgsrc-2008Q2:1.7.0.6
	pkgsrc-2008Q2-base:1.7
	cwrapper:1.7.0.4
	pkgsrc-2008Q1:1.7.0.2
	pkgsrc-2008Q1-base:1.7
	pkgsrc-2007Q4:1.6.0.4
	pkgsrc-2007Q4-base:1.6
	pkgsrc-2007Q3:1.6.0.2
	pkgsrc-2007Q3-base:1.6
	pkgsrc-2007Q2:1.4.0.2
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.3.0.18
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.16
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.14
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.12
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.10
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.8
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.6
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.4
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.2
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.2.0.4
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.2
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.1.1.1.0.2
	pkgsrc-2004Q2-base:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.10
date	2011.01.28.13.35.51;	author adam;	state dead;
branches;
next	1.9;

1.9
date	2010.06.16.07.56.30;	author adam;	state Exp;
branches;
next	1.8;

1.8
date	2009.08.21.02.28.13;	author schnoebe;	state Exp;
branches;
next	1.7;

1.7
date	2008.02.20.14.33.04;	author xtraeme;	state Exp;
branches;
next	1.6;

1.6
date	2007.08.27.08.41.06;	author xtraeme;	state Exp;
branches;
next	1.5;

1.5
date	2007.08.26.09.10.54;	author xtraeme;	state Exp;
branches;
next	1.4;

1.4
date	2007.05.26.11.50.13;	author xtraeme;	state Exp;
branches;
next	1.3;

1.3
date	2005.01.20.15.08.54;	author xtraeme;	state Exp;
branches;
next	1.2;

1.2
date	2004.07.14.00.25.11;	author xtraeme;	state Exp;
branches;
next	1.1;

1.1
date	2004.03.28.19.44.12;	author xtraeme;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2004.03.28.19.44.12;	author xtraeme;	state Exp;
branches;
next	;


desc
@@


1.10
log
@* force linking against pthread, so some modules do not fail to dlopen()
* sed, rather than patch, config files to meet pkgsrc needs
@
text
@$NetBSD: patch-ag,v 1.9 2010/06/16 07:56:30 adam Exp $

--- etc/c2s.xml.in.orig	2010-06-11 11:44:58.000000000 +0000
+++ etc/c2s.xml.in
@@@@ -5,7 +5,7 @@@@
 
   <!-- The process ID file. Comment this out if you don't need to know
        the process ID from outside the process (eg for control scripts) -->
-  <pidfile>@@localstatedir@@/jabberd/pid/c2s.pid</pidfile>
+  <pidfile>@@PIDDIR@@/c2s.pid</pidfile>
 
   <!-- Router connection configuration -->
   <router>
@@@@ -27,7 +27,7 @@@@
          If this is commented out, or the file can't be read, no attempt
          will be made to establish an encrypted channel with the router. -->
     <!--
-    <pemfile>@@sysconfdir@@/server.pem</pemfile>
+    <pemfile>@@SSLCERTS@@/server.pem</pemfile>
     -->
 
     <!-- Router connection retry -->
@@@@ -60,7 +60,7 @@@@
 
     <!-- If logging to file, this is the filename of the logfile -->
     <!--
-    <file>@@localstatedir@@/jabberd/log/c2s.log</file>
+    <file>@@LOGDIR@@/c2s.log</file>
     -->
   </log>
 
@@@@ -136,7 +136,7 @@@@
     <id register-enable='true'>localhost.localdomain</id>
     <!-- or
     <id realm='company.int'
-        pemfile='@@sysconfdir@@/server.pem'
+        pemfile='@@SSLCERTS@@/server.pem'
         verify-mode='7'
         cachain='@@sysconfdir@@/client_ca_certs.pem'
         require-starttls='true'
@@@@ -176,7 +176,7 @@@@
          use STARTTLS over the standard XMPP port 5222 then you
          MUST specify the pemfile in the 'id' tag above. -->
     <!--
-    <pemfile>@@sysconfdir@@/server.pem</pemfile>
+    <pemfile>@@SSLCERTS@@/server.pem</pemfile>
     -->
 
     <!-- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter -->
@@@@ -329,7 +329,7 @@@@
   <stats>
     <!-- file containing count of packets that went through -->
     <!--
-    <packet>@@localstatedir@@/jabberd/stats/c2s.packets</packet>
+    <packet>@@LOGDIR@@/c2s.packets</packet>
     -->
   </stats>
 
@@@@ -399,7 +399,7 @@@@
     <!-- SQLite driver configuration -->
     <sqlite>
       <!-- Database name -->
-      <dbname>@@localstatedir@@/jabberd/db/sqlite.db</dbname>
+      <dbname>@@DBDIR@@/sqlite.db</dbname>
 
       <!-- Transacation support. If this is commented out, transactions
            will be disabled. This might make database accesses faster,
@@@@ -476,7 +476,7 @@@@
     <!-- Berkeley DB module configuration -->
     <db>
       <!-- Directory to store database files under -->
-      <path>@@localstatedir@@/jabberd/db</path>
+      <path>@@DBDIR@@</path>
 
       <!-- Synchronize the database to disk after each write. If you
            disable this, database accesses may be faster, but data may
@@@@ -604,7 +604,7 @@@@
     <!-- Pipe module configuration -->
     <pipe>
       <!-- Program to execute -->
-      <exec>@@bindir@@/pipe-auth.pl</exec>
+      <exec>@@BINDIR@@/pipe-auth.pl</exec>
     </pipe>
 
   </authreg>
@


1.9
log
@Changes 2.2.10:
* Special case to ignore the X509_V_ERR_UNABLE_TO_GET_CRL error
  when CRL is not present in chain. Merged patch by Michal Witkowski.
* storage_ldapvcard rebind like auth_ldap for successful connection
  to MS Active Directory as LDAP storage. Merged patch by x0r.
* Merged SASL External login for clients patch by Michal Witkowski.
* Merged router-filter redirect option by Ugnich Anton.
* Dropped support for PEP
* Fix for crash on empty pkt->to
@
text
@d1 1
a1 1
$NetBSD$
@


1.8
log
@

Welcome to jabberd2 2.2.8.
@
text
@d3 1
a3 1
--- etc/c2s.xml.in.orig	2009-07-05 16:54:18.000000000 -0500
d32 1
a32 1
@@@@ -125,7 +125,7 @@@@
d39 1
d41 1
a41 2
         register-enable='true'
@@@@ -164,7 +164,7 @@@@
d50 1
a50 1
@@@@ -312,7 +312,7 @@@@
d59 1
a59 1
@@@@ -382,7 +382,7 @@@@
d68 1
a68 1
@@@@ -459,7 +459,7 @@@@
d77 1
a77 1
@@@@ -587,7 +587,7 @@@@
@


1.7
log
@Update to 2.1.23. Lots of changes and bugfixes since previous version,
see http://jabberd2.xiaoka.com/wiki/Releases for a detailed description.
@
text
@d3 1
a3 1
--- etc/c2s.xml.in.orig	2008-02-03 08:23:09.000000000 -0600
d32 1
a32 1
@@@@ -118,7 +118,7 @@@@
d41 1
a41 1
@@@@ -157,7 +157,7 @@@@
d50 1
a50 1
@@@@ -284,7 +284,7 @@@@
d59 1
a59 1
@@@@ -393,7 +393,7 @@@@
d68 1
a68 1
@@@@ -407,7 +407,7 @@@@
d77 1
a77 1
@@@@ -535,7 +535,7 @@@@
@


1.6
log
@Replace more paths in two configuration files, reported by Mr. Martti
Kuparinen.
@
text
@d3 6
a8 6
--- etc/c2s.xml.in.orig	2007-08-14 00:29:45.000000000 +0200
+++ etc/c2s.xml.in	2007-08-27 10:31:18.000000000 +0200
@@@@ -6,7 +6,7 @@@@
   <!-- The process ID file. comment this out if you don't need to know
        to know the process ID from outside the process (eg for control
        scripts) -->
d10 1
a10 1
+       <pidfile>@@PIDDIR@@/c2s.pid</pidfile>
d14 1
a14 1
@@@@ -28,7 +28,7 @@@@
d23 2
a24 2
@@@@ -61,7 +61,7 @@@@
     
d32 2
a33 2
@@@@ -113,7 +113,7 @@@@
     <id register-enable='true'>localhost</id>
d35 1
a35 1
     <id realm='company'
d41 3
a43 3
@@@@ -147,7 +147,7 @@@@
          If this is commented out, clients will not be offered
          the STARTTLS stream extension -->
d50 10
a59 1
@@@@ -362,7 +362,7 @@@@
d68 1
a68 1
@@@@ -376,7 +376,7 @@@@
d74 1
a74 1
       
d77 1
a77 1
@@@@ -440,7 +440,7 @@@@
@


1.5
log
@Update to 2.1.14:

2.1.14

2007-08-14

* Integrated authreg_oracle by fundy.
* Operands incompatibility fix for Sun compiler.
* contrib/cyrus-sasl-digest-md5-fix added
* Applied MIO memleak fix related to time_checks by Christof Meerwald.

2.1.13

2007-08-08

* Reverted broken [311] and [313] changes to source:trunk/mio/mio_impl.h
* compilation fix
* Fix configuration XML files domain update
* Don't allow reinstalling on newer version
* Fixed off-by-one error in base64
* Force uninstall previous version on upgrade.

2.1.12

2007-07-30

* Fixed many memleaks
* Check if OpenSSL is already initialized in PostgreSQL backend.
* Implemented PQconnectdb PostgreSQL connection method.
* Applied pg_config using by configure patch by Michael Krelin.
* Implemented auth/reg stream features advertisement.
* Removed useless while/alloc loops
* WiX notes for Windows README
* WiX new "JabberWelcomeDlg?"
* WiX fixed cases of reinstall & upgrade
* nad_cache_new & nad_cache_free exported as JABBERD2_API functions.
* Changed allocator BLOCKSIZE to 128 bytes

2.1.11

2007-07-27

* Changed SASL level error reporting to malformed-request error according
  to rfc3920bis.
* Fixed ./configure tests reliability.
* Changed DOS line endings to UNIX line endings.
* Fixed XML predefined entities quoting in serialized XML.

2.1.10

2007-07-20

* Removed SASL backend fallbacks
* Added roster items limit option. Closes #89
* Added count support in SQLite3 backend

2.1.9

2007-07-19

* Added jabber:x:oob redirection support during in-band registration
* Logging JID on disconnection
* Added counting packets on c2s and s2s connections
* Added TLS indicator for c2s and s2s logs.
* Added type='log' to ComponentProtocol <route/> wrapper for logged packets.
@
text
@d3 2
a4 2
--- etc/c2s.xml.in.orig	2007-08-26 10:52:06.000000000 +0200
+++ etc/c2s.xml.in	2007-08-26 10:53:53.000000000 +0200
d32 9
@


1.4
log
@Update to 2.1.6 (last stable version).

A lot of changes were made since previous update, like SASL support,
SQLite support, etc. Please see the following URL for a full list
of changes:

http://jabberd2.xiaoka.com/wiki/Releases
@
text
@d3 2
a4 2
--- etc/c2s.xml.in.orig	2007-05-26 12:07:39.000000000 +0200
+++ etc/c2s.xml.in	2007-05-26 12:09:13.000000000 +0200
d10 1
a10 1
+  <pidfile>@@PIDDIR@@/c2s.pid</pidfile>
d32 1
a32 10
@@@@ -109,7 +109,7 @@@@
     <id register-enable='true'>localhost</id>
     <!-- or
     <id realm='company'
-        pemfile='/usr/local/etc/jabberd/server.pem'
+	pemfile='@@SSLCERTS@@/server.pem'
         verify-mode='7'
         require-starttls='true'
         register-enable='true'
@@@@ -142,7 +142,7 @@@@
d41 10
a50 1
@@@@ -339,7 +339,7 @@@@
d59 1
a59 1
@@@@ -403,13 +403,13 @@@@
d67 1
a67 8
     <!-- SQLite driver configuration -->
     <sqlite>
       <!-- Database name -->
-      <dbname>@@localstatedir@@/jabberd/db/sqlite.db</dbname>
+      <dbname>@@DBDIR@@/sqlite.db</dbname>
 
       <!-- Transacation support. If this is commented out, transactions
            will be disabled. This might make database accesses faster,
@


1.3
log
@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.
@
text
@d3 2
a4 2
--- 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
d14 3
a16 3
@@@@ -23,7 +23,7 @@@@
          commented out, or the file can't be read, no attempt will be
          made to establish an encrypted channel with the router. -->
d23 1
a23 1
@@@@ -56,7 +56,7 @@@@
d32 12
a43 3
@@@@ -88,13 +88,13 @@@@
          connections. If this is commented out, clients will not be
          offered the STARTTLS stream extension -->
d49 2
a50 9
     <!-- File containing an optional SSL certificate chain file for client
          SSL connections. -->
     <!--
-    <cachain>@@sysconfdir@@/cachain.pem</cachain>
+    <cachain>@@SSLCERTS@@/cachain.pem</cachain>
     -->
 
     <!-- Require STARTTLS. If this is enabled, clients must do STARTTLS
@@@@ -295,7 +295,7 @@@@
d59 1
a59 1
@@@@ -348,7 +348,7 @@@@
d67 8
a74 1
   </authreg>
@


1.2
log
@Update chat/jabberd2 to 2.0s3.

Changes:

2004-06-25  jabberd 2.0s3

    * Fixed several memory leaks and overruns <karsten.petersen@@hrz.tu-chemnitz.de>
    * Fixed XMPP session replacement [rob]
    * Added support for Win32 platforms <peter@@cerebus.co.za> [rob]
    * Added support for requiring SSL/TLS before auth <deryni@@eden.rutgers.edu>
    * Added support for LDAPv3 (including channel encryption) [rob]
    * Added workaround to make large presence broadcasts more efficient [rob]
    * Generate random dialback key if none provided [rob]
    * Rewrote configure script (+ many code tweaks to support this) [rob]
    * Remove build requirement for Libidn and OpenSSL [rob]
    * Removed bundled Libidn due to licensing issues [rob]
    * Bugfixes: 3059, 3174, 3343, 3368, 3480, 3481, 3594
@
text
@d3 2
a4 2
--- 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
d32 1
a32 1
@@@@ -88,7 +88,7 @@@@
d40 7
d48 1
a48 1
@@@@ -289,7 +289,7 @@@@
d57 1
a57 1
@@@@ -342,7 +342,7 @@@@
@


1.1
log
@Initial revision
@
text
@d3 2
a4 2
--- etc/c2s.xml.in.orig	2003-11-05 01:21:31.000000000 +0100
+++ etc/c2s.xml.in	2003-11-05 01:23:03.000000000 +0100
d40 2
a41 2
     <!-- Older versions of jabberd support encrypted client connections
@@@@ -282,7 +282,7 @@@@
d50 1
a50 1
@@@@ -316,7 +316,7 @@@@
@


1.1.1.1
log
@Initial import of jabberd2 (2.0s2) from pkgsrc-wip.

Jabber is an open XML protocol for real-time exchange of messages and
presence notification between any two points on the Internet.  The first
application of Jabber technology is an asynchronous, extensible instant
messaging platform, and an IM network that offers functionality similar
to legacy IM systems such as AIM, ICQ, MSN, and Yahoo.

This is a complete rewrite of the original jabberd.
@
text
@@