.
+
+The upstream archive was downloaded from
+
+Copyright:
+
+Copyright (c) 1997-2005, PostgreSQL Global Development Group
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+3. Neither the name of the PostgreSQL Global Development Group nor the names
+ of its contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
--- libpgjava-8.4-701.orig/org/postgresql/ds/PGSimpleDataSource.java
+++ libpgjava-8.4-701/org/postgresql/ds/PGSimpleDataSource.java
@@ -0,0 +1,26 @@
+/*-------------------------------------------------------------------------
+*
+* Copyright (c) 2004-2005, PostgreSQL Global Development Group
+*
+* IDENTIFICATION
+* $PostgreSQL: pgjdbc/org/postgresql/ds/PGSimpleDataSource.java.in,v 1.1 2006/11/29 04:00:16 jurka Exp $
+*
+*-------------------------------------------------------------------------
+*/
+package org.postgresql.ds;
+
+import javax.sql.DataSource;
+
+/**
+ * Simple DataSource which does not perform connection pooling. In order to use
+ * the DataSource, you must set the property databaseName. The settings for
+ * serverName, portNumber, user, and password are optional. Note: these properties
+ * are declared in the superclass.
+ *
+ * @author Aaron Mulder (ammulder@chariotsolutions.com)
+ */
+public class PGSimpleDataSource
+ extends org.postgresql.ds.jdbc23.AbstractJdbc23SimpleDataSource
+ implements DataSource
+{
+}
--- libpgjava-8.4-701.orig/org/postgresql/ds/PGPoolingDataSource.java
+++ libpgjava-8.4-701/org/postgresql/ds/PGPoolingDataSource.java
@@ -0,0 +1,52 @@
+/*-------------------------------------------------------------------------
+*
+* Copyright (c) 2004-2005, PostgreSQL Global Development Group
+*
+* IDENTIFICATION
+* $PostgreSQL: pgjdbc/org/postgresql/ds/PGPoolingDataSource.java.in,v 1.1 2006/11/29 04:00:16 jurka Exp $
+*
+*-------------------------------------------------------------------------
+*/
+package org.postgresql.ds;
+
+import javax.sql.DataSource;
+
+/**
+ * DataSource which uses connection pooling. Don't use this if
+ * your server/middleware vendor provides a connection pooling implementation
+ * which interfaces with the PostgreSQL ConnectionPoolDataSource implementation!
+ * This class is provided as a convenience, but the JDBC Driver is really not
+ * supposed to handle the connection pooling algorithm. Instead, the server or
+ * middleware product is supposed to handle the mechanics of connection pooling,
+ * and use the PostgreSQL implementation of ConnectionPoolDataSource to provide
+ * the connections to pool.
+ *
+ * If you're sure you want to use this, then you must set the properties
+ * dataSourceName, databaseName, user, and password (if required for the user).
+ * The settings for serverName, portNumber, initialConnections, and
+ * maxConnections are optional. Note that only connections
+ * for the default user will be pooled! Connections for other users will
+ * be normal non-pooled connections, and will not count against the maximum pool
+ * size limit.
+ *
+ * If you put this DataSource in JNDI, and access it from different JVMs (or
+ * otherwise load this class from different ClassLoaders), you'll end up with one
+ * pool per ClassLoader or VM. This is another area where a server-specific
+ * implementation may provide advanced features, such as using a single pool
+ * across all VMs in a cluster.
+ *
+ * This implementation supports JDK 1.3 and higher.
+ *
+ * @author Aaron Mulder (ammulder@chariotsolutions.com)
+ */
+public class PGPoolingDataSource
+ extends org.postgresql.ds.jdbc23.AbstractJdbc23PoolingDataSource
+ implements DataSource
+{
+
+ protected void addDataSource(String dataSourceName)
+ {
+ dataSources.put(dataSourceName, this);
+ }
+
+}
--- libpgjava-8.4-701.orig/org/postgresql/ds/PGPooledConnection.java
+++ libpgjava-8.4-701/org/postgresql/ds/PGPooledConnection.java
@@ -0,0 +1,46 @@
+/*-------------------------------------------------------------------------
+*
+* Copyright (c) 2004-2005, PostgreSQL Global Development Group
+*
+* IDENTIFICATION
+* $PostgreSQL: pgjdbc/org/postgresql/ds/PGPooledConnection.java.in,v 1.1 2006/11/29 04:00:15 jurka Exp $
+*
+*-------------------------------------------------------------------------
+*/
+package org.postgresql.ds;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import javax.sql.PooledConnection;
+import javax.sql.ConnectionEvent;
+
+/**
+ * PostgreSQL implementation of the PooledConnection interface. This shouldn't
+ * be used directly, as the pooling client should just interact with the
+ * ConnectionPool instead.
+ * @see org.postgresql.ds.PGConnectionPoolDataSource
+ *
+ * @author Aaron Mulder (ammulder@chariotsolutions.com)
+ * @author Csaba Nagy (ncsaba@yahoo.com)
+ */
+public class PGPooledConnection
+ extends org.postgresql.ds.jdbc23.AbstractJdbc23PooledConnection
+ implements PooledConnection
+{
+
+ public PGPooledConnection(Connection con, boolean autoCommit, boolean isXA)
+ {
+ super(con, autoCommit, isXA);
+ }
+
+ public PGPooledConnection(Connection con, boolean autoCommit)
+ {
+ this(con, autoCommit, false);
+ }
+
+ protected ConnectionEvent createConnectionEvent(SQLException sqle)
+ {
+ return new ConnectionEvent(this, sqle);
+ }
+
+}
--- libpgjava-8.4-701.orig/org/postgresql/gss/MakeGSS.java
+++ libpgjava-8.4-701/org/postgresql/gss/MakeGSS.java
@@ -18,7 +18,6 @@
import java.io.IOException;
import java.sql.SQLException;
-import com.sun.security.auth.callback.TextCallbackHandler;
import org.postgresql.core.PGStream;
import org.postgresql.core.Logger;
import org.postgresql.util.*;