3 files changed, 395 insertions, 353 deletions

diff --git a/devel/poco-ssl/Makefile b/devel/poco-ssl/Makefile
index 4f926d266fe0..4d3e75a209dd 100644
--- a/devel/poco-ssl/Makefile
+++ b/devel/poco-ssl/Makefile
@@ -7,25 +7,66 @@
 #
 
 PORTNAME=	poco
-PORTVERSION=	1.4.1
-PORTREVISION=	2
+PORTVERSION=	1.4.3
 CATEGORIES=	devel net
 MASTER_SITES=	SF/${PORTNAME}/sources/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	-ssl
 DISTNAME=	poco-${PORTVERSION}p1-all
 
 MAINTAINER=	wes@FreeBSD.org
-COMMENT=	C++ Portable Components library with NetSSL library
-
-LIB_DEPENDS=	odbc:${PORTSDIR}/databases/unixODBC
+COMMENT=	C++ Portable Components library with NetSSL and Database libraries
 
 CONFLICTS=	poco-[0-9]*
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_LDCONFIG=	yes
+OPTIONS=	TESTS	"Build testsuites" off \
+		SAMPLES	"Build sample programs" off \
+		MYSQL	"Build MySQL driver" on \
+		UODBC	"Build with ODBC driver" off \
+		IODBC	"Build with iODBC driver" on \
+		SQLITE	"Build SQLite driver" on
+
+CONFIGURE_ARGS= --config=FreeBSD
 
+.if !defined(WITH_TESTS)
+CONFIGURE_ARGS+= --no-tests
+.endif
+
+.if !defined(WITH_SAMPLES)
+CONFIGURE_ARGS+= --no-samples
+.endif
+
+#
+# ODBC
+#
+.if defined(WITH_UODBC) && defined(WITH_IODBC)
+IGNORE=		please select either UODBC or IODBC, but not both
+.else
+CONFIGURE_ARGS+= --omit=Data/ODBC
+.endif
+
+.if defined(WITH_UODBC) && !defined(WITH_IODBC)
+LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
+.endif
+
+.if defined(WITH_IODBC) && !defined(WITH_UODBC)
+LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
+.endif
+
+.if defined(WITH_MYSQL)
 USE_MYSQL=	yes
+.else
+CONFIGURE_ARGS+= --omit=Data/MySQL
+.endif
+
+.if defined(WITH_SQLITE)
 USE_SQLITE=	yes
+.else
+CONFIGURE_ARGS+= --omit=Data/SQLite
+.endif
+
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_BZIP2=	yes
+USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/poco-ssl/distinfo b/devel/poco-ssl/distinfo
index 7527037f20df..8ea99057802d 100644
--- a/devel/poco-ssl/distinfo
+++ b/devel/poco-ssl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (poco-1.4.1p1-all.tar.gz) = 543fef4efa39b31dfeec50d67888ba2c2f4852f4e88cc538b4aa0e504a9461ef
-SIZE (poco-1.4.1p1-all.tar.gz) = 3903746
+SHA256 (poco-1.4.3p1-all.tar.bz2) = 8a3fd41234a8015e5c46470baa90140c7726cd7dc70d8300c655f08d71fdc35a
+SIZE (poco-1.4.3p1-all.tar.bz2) = 3005394
diff --git a/devel/poco-ssl/pkg-plist b/devel/poco-ssl/pkg-plist
index ac0b08dec309..200a5e2d98d9 100644
--- a/devel/poco-ssl/pkg-plist
+++ b/devel/poco-ssl/pkg-plist
@@ -1,10 +1,4 @@
-bin/cpspc
-bin/cpspcd
-bin/f2cpsp
-bin/f2cpspd
-include/Poco/Ascii.h
-include/Poco/ASCIIEncoding.h
-include/Poco/AbstractCache.h
+include/Poco/zlib.h
 include/Poco/AbstractDelegate.h
 include/Poco/AbstractEvent.h
 include/Poco/AbstractObserver.h
@@ -22,6 +16,8 @@ include/Poco/ActiveStarter.h
 include/Poco/Activity.h
 include/Poco/Any.h
 include/Poco/ArchiveStrategy.h
+include/Poco/Ascii.h
+include/Poco/ASCIIEncoding.h
 include/Poco/AsyncChannel.h
 include/Poco/AtomicCounter.h
 include/Poco/AutoPtr.h
@@ -41,27 +37,26 @@ include/Poco/Channel.h
 include/Poco/Checksum.h
 include/Poco/ClassLibrary.h
 include/Poco/ClassLoader.h
-include/Poco/CompareFunctions.h
 include/Poco/Condition.h
 include/Poco/Config.h
 include/Poco/Configurable.h
 include/Poco/ConsoleChannel.h
 include/Poco/CountingStream.h
-include/Poco/Crypto/Cipher.h
-include/Poco/Crypto/CipherFactory.h
-include/Poco/Crypto/CipherImpl.h
-include/Poco/Crypto/CipherKey.h
-include/Poco/Crypto/CipherKeyImpl.h
-include/Poco/Crypto/Crypto.h
-include/Poco/Crypto/CryptoStream.h
-include/Poco/Crypto/CryptoTransform.h
-include/Poco/Crypto/OpenSSLInitializer.h
-include/Poco/Crypto/RSACipherImpl.h
-include/Poco/Crypto/RSADigestEngine.h
-include/Poco/Crypto/RSAKey.h
-include/Poco/Crypto/RSAKeyImpl.h
-include/Poco/Crypto/X509Certificate.h
-include/Poco/DOM/AbstractContainerNode.h
+include/Poco/DateTime.h
+include/Poco/DateTimeFormat.h
+include/Poco/DateTimeFormatter.h
+include/Poco/DateTimeParser.h
+include/Poco/Debugger.h
+include/Poco/DefaultStrategy.h
+include/Poco/DeflatingStream.h
+include/Poco/Delegate.h
+include/Poco/DigestEngine.h
+include/Poco/DigestStream.h
+include/Poco/DirectoryIterator.h
+include/Poco/DirectoryIterator_UNIX.h
+include/Poco/DirectoryIterator_VMS.h
+include/Poco/DirectoryIterator_WIN32.h
+include/Poco/DOM/TreeWalker.h
 include/Poco/DOM/AbstractNode.h
 include/Poco/DOM/Attr.h
 include/Poco/DOM/AttrMap.h
@@ -70,6 +65,10 @@ include/Poco/DOM/CDATASection.h
 include/Poco/DOM/CharacterData.h
 include/Poco/DOM/ChildNodesList.h
 include/Poco/DOM/Comment.h
+include/Poco/DOM/Document.h
+include/Poco/DOM/DocumentEvent.h
+include/Poco/DOM/DocumentFragment.h
+include/Poco/DOM/DocumentType.h
 include/Poco/DOM/DOMBuilder.h
 include/Poco/DOM/DOMException.h
 include/Poco/DOM/DOMImplementation.h
@@ -78,10 +77,6 @@ include/Poco/DOM/DOMParser.h
 include/Poco/DOM/DOMSerializer.h
 include/Poco/DOM/DOMWriter.h
 include/Poco/DOM/DTDMap.h
-include/Poco/DOM/Document.h
-include/Poco/DOM/DocumentEvent.h
-include/Poco/DOM/DocumentFragment.h
-include/Poco/DOM/DocumentType.h
 include/Poco/DOM/Element.h
 include/Poco/DOM/ElementsByTagNameList.h
 include/Poco/DOM/Entity.h
@@ -101,87 +96,7 @@ include/Poco/DOM/NodeList.h
 include/Poco/DOM/Notation.h
 include/Poco/DOM/ProcessingInstruction.h
 include/Poco/DOM/Text.h
-include/Poco/DOM/TreeWalker.h
-include/Poco/Data/AbstractBinder.h
-include/Poco/Data/AbstractBinding.h
-include/Poco/Data/AbstractExtraction.h
-include/Poco/Data/AbstractExtractor.h
-include/Poco/Data/AbstractPreparation.h
-include/Poco/Data/AbstractPrepare.h
-include/Poco/Data/AbstractSessionImpl.h
-include/Poco/Data/BLOB.h
-include/Poco/Data/BLOBStream.h
-include/Poco/Data/Binding.h
-include/Poco/Data/Column.h
-include/Poco/Data/Common.h
-include/Poco/Data/Connector.h
-include/Poco/Data/Data.h
-include/Poco/Data/DataException.h
-include/Poco/Data/Extraction.h
-include/Poco/Data/Limit.h
-include/Poco/Data/MetaColumn.h
-include/Poco/Data/MySQL/Binder.h
-include/Poco/Data/MySQL/Connector.h
-include/Poco/Data/MySQL/Extractor.h
-include/Poco/Data/MySQL/MySQL.h
-include/Poco/Data/MySQL/MySQLException.h
-include/Poco/Data/MySQL/MySQLStatementImpl.h
-include/Poco/Data/MySQL/ResultMetadata.h
-include/Poco/Data/MySQL/SessionHandle.h
-include/Poco/Data/MySQL/SessionImpl.h
-include/Poco/Data/MySQL/StatementExecutor.h
-include/Poco/Data/ODBC/Binder.h
-include/Poco/Data/ODBC/ConnectionHandle.h
-include/Poco/Data/ODBC/Connector.h
-include/Poco/Data/ODBC/DataTypes.h
-include/Poco/Data/ODBC/Diagnostics.h
-include/Poco/Data/ODBC/EnvironmentHandle.h
-include/Poco/Data/ODBC/Error.h
-include/Poco/Data/ODBC/Extractor.h
-include/Poco/Data/ODBC/Handle.h
-include/Poco/Data/ODBC/ODBC.h
-include/Poco/Data/ODBC/ODBCColumn.h
-include/Poco/Data/ODBC/ODBCException.h
-include/Poco/Data/ODBC/ODBCStatementImpl.h
-include/Poco/Data/ODBC/Parameter.h
-include/Poco/Data/ODBC/Preparation.h
-include/Poco/Data/ODBC/SessionImpl.h
-include/Poco/Data/ODBC/Utility.h
-include/Poco/Data/PooledSessionHolder.h
-include/Poco/Data/PooledSessionImpl.h
-include/Poco/Data/Prepare.h
-include/Poco/Data/Range.h
-include/Poco/Data/RecordSet.h
-include/Poco/Data/SQLite/Binder.h
-include/Poco/Data/SQLite/Connector.h
-include/Poco/Data/SQLite/Extractor.h
-include/Poco/Data/SQLite/SQLite.h
-include/Poco/Data/SQLite/SQLiteException.h
-include/Poco/Data/SQLite/SQLiteStatementImpl.h
-include/Poco/Data/SQLite/SessionImpl.h
-include/Poco/Data/SQLite/Utility.h
-include/Poco/Data/Session.h
-include/Poco/Data/SessionFactory.h
-include/Poco/Data/SessionImpl.h
-include/Poco/Data/SessionPool.h
-include/Poco/Data/Statement.h
-include/Poco/Data/StatementCreator.h
-include/Poco/Data/StatementImpl.h
-include/Poco/Data/TypeHandler.h
-include/Poco/DateTime.h
-include/Poco/DateTimeFormat.h
-include/Poco/DateTimeFormatter.h
-include/Poco/DateTimeParser.h
-include/Poco/Debugger.h
-include/Poco/DefaultStrategy.h
-include/Poco/DeflatingStream.h
-include/Poco/Delegate.h
-include/Poco/DigestEngine.h
-include/Poco/DigestStream.h
-include/Poco/DirectoryIterator.h
-include/Poco/DirectoryIterator_UNIX.h
-include/Poco/DirectoryIterator_VMS.h
-include/Poco/DirectoryIterator_WIN32.h
+include/Poco/DOM/AbstractContainerNode.h
 include/Poco/DirectoryIterator_WIN32U.h
 include/Poco/DynamicAny.h
 include/Poco/DynamicAnyHolder.h
@@ -195,44 +110,44 @@ include/Poco/Environment_WIN32U.h
 include/Poco/Environment_WINCE.h
 include/Poco/ErrorHandler.h
 include/Poco/Event.h
-include/Poco/EventArgs.h
-include/Poco/EventLogChannel.h
 include/Poco/Event_POSIX.h
+include/Poco/Event_VX.h
 include/Poco/Event_WIN32.h
+include/Poco/EventArgs.h
+include/Poco/EventLogChannel.h
 include/Poco/Exception.h
-include/Poco/ExpirationDecorator.h
 include/Poco/Expire.h
+include/Poco/ExpirationDecorator.h
 include/Poco/ExpireCache.h
 include/Poco/ExpireLRUCache.h
 include/Poco/ExpireStrategy.h
 include/Poco/FIFOEvent.h
 include/Poco/FIFOStrategy.h
-include/Poco/FPEnvironment.h
-include/Poco/FPEnvironment_C99.h
-include/Poco/FPEnvironment_DEC.h
-include/Poco/FPEnvironment_DUMMY.h
-include/Poco/FPEnvironment_SUN.h
-include/Poco/FPEnvironment_WIN32.h
 include/Poco/File.h
-include/Poco/FileChannel.h
-include/Poco/FileStream.h
-include/Poco/FileStreamFactory.h
-include/Poco/FileStream_POSIX.h
-include/Poco/FileStream_WIN32.h
 include/Poco/File_UNIX.h
 include/Poco/File_VMS.h
 include/Poco/File_VX.h
-include/Poco/File_WINCE.h
 include/Poco/File_WIN32.h
 include/Poco/File_WIN32U.h
+include/Poco/File_WINCE.h
+include/Poco/FileChannel.h
+include/Poco/FileStream.h
+include/Poco/FileStream_POSIX.h
+include/Poco/FileStream_WIN32.h
+include/Poco/FileStreamFactory.h
 include/Poco/Format.h
 include/Poco/Formatter.h
 include/Poco/FormattingChannel.h
 include/Poco/Foundation.h
+include/Poco/FPEnvironment.h
+include/Poco/FPEnvironment_C99.h
+include/Poco/FPEnvironment_DEC.h
+include/Poco/FPEnvironment_DUMMY.h
+include/Poco/FPEnvironment_SUN.h
+include/Poco/FPEnvironment_WIN32.h
 include/Poco/FunctionDelegate.h
 include/Poco/FunctionPriorityDelegate.h
 include/Poco/Glob.h
-include/Poco/HMACEngine.h
 include/Poco/Hash.h
 include/Poco/HashFunction.h
 include/Poco/HashMap.h
@@ -241,29 +156,29 @@ include/Poco/HashStatistic.h
 include/Poco/HashTable.h
 include/Poco/HexBinaryDecoder.h
 include/Poco/HexBinaryEncoder.h
+include/Poco/HMACEngine.h
 include/Poco/InflatingStream.h
 include/Poco/Instantiator.h
 include/Poco/KeyValueArgs.h
-include/Poco/LRUCache.h
-include/Poco/LRUStrategy.h
 include/Poco/Latin1Encoding.h
 include/Poco/Latin9Encoding.h
-include/Poco/LineEndingConverter.h
 include/Poco/LinearHashTable.h
+include/Poco/LineEndingConverter.h
 include/Poco/LocalDateTime.h
 include/Poco/LogFile.h
 include/Poco/LogFile_STD.h
 include/Poco/LogFile_VMS.h
 include/Poco/LogFile_WIN32.h
 include/Poco/LogFile_WIN32U.h
-include/Poco/LogStream.h
 include/Poco/Logger.h
 include/Poco/LoggingFactory.h
 include/Poco/LoggingRegistry.h
-include/Poco/MD2Engine.h
+include/Poco/LogStream.h
+include/Poco/LRUCache.h
+include/Poco/LRUStrategy.h
+include/Poco/Manifest.h
 include/Poco/MD4Engine.h
 include/Poco/MD5Engine.h
-include/Poco/Manifest.h
 include/Poco/MemoryPool.h
 include/Poco/MemoryStream.h
 include/Poco/Message.h
@@ -271,138 +186,24 @@ include/Poco/MetaObject.h
 include/Poco/MetaProgramming.h
 include/Poco/Mutex.h
 include/Poco/Mutex_POSIX.h
+include/Poco/Mutex_VX.h
 include/Poco/Mutex_WIN32.h
 include/Poco/Mutex_WINCE.h
-include/Poco/NObserver.h
 include/Poco/NamedEvent.h
+include/Poco/NamedEvent_Android.h
 include/Poco/NamedEvent_UNIX.h
 include/Poco/NamedEvent_VMS.h
 include/Poco/NamedEvent_WIN32.h
 include/Poco/NamedEvent_WIN32U.h
 include/Poco/NamedMutex.h
+include/Poco/NamedMutex_Android.h
 include/Poco/NamedMutex_UNIX.h
 include/Poco/NamedMutex_VMS.h
 include/Poco/NamedMutex_WIN32.h
 include/Poco/NamedMutex_WIN32U.h
 include/Poco/NamedTuple.h
 include/Poco/NestedDiagnosticContext.h
-include/Poco/Net/AbstractHTTPRequestHandler.h
-include/Poco/Net/AcceptCertificateHandler.h
-include/Poco/Net/CertificateHandlerFactory.h
-include/Poco/Net/CertificateHandlerFactoryMgr.h
-include/Poco/Net/ConsoleCertificateHandler.h
-include/Poco/Net/Context.h
-include/Poco/Net/DNS.h
-include/Poco/Net/DatagramSocket.h
-include/Poco/Net/DatagramSocketImpl.h
-include/Poco/Net/DialogSocket.h
-include/Poco/Net/FTPClientSession.h
-include/Poco/Net/FTPStreamFactory.h
-include/Poco/Net/FilePartSource.h
-include/Poco/Net/HTMLForm.h
-include/Poco/Net/HTTPBasicCredentials.h
-include/Poco/Net/HTTPBasicStreamBuf.h
-include/Poco/Net/HTTPBufferAllocator.h
-include/Poco/Net/HTTPChunkedStream.h
-include/Poco/Net/HTTPClientSession.h
-include/Poco/Net/HTTPCookie.h
-include/Poco/Net/HTTPFixedLengthStream.h
-include/Poco/Net/HTTPHeaderStream.h
-include/Poco/Net/HTTPIOStream.h
-include/Poco/Net/HTTPMessage.h
-include/Poco/Net/HTTPRequest.h
-include/Poco/Net/HTTPRequestHandler.h
-include/Poco/Net/HTTPRequestHandlerFactory.h
-include/Poco/Net/HTTPResponse.h
-include/Poco/Net/HTTPSClientSession.h
-include/Poco/Net/HTTPSSessionInstantiator.h
-include/Poco/Net/HTTPSStreamFactory.h
-include/Poco/Net/HTTPServer.h
-include/Poco/Net/HTTPServerConnection.h
-include/Poco/Net/HTTPServerConnectionFactory.h
-include/Poco/Net/HTTPServerParams.h
-include/Poco/Net/HTTPServerRequest.h
-include/Poco/Net/HTTPServerRequestImpl.h
-include/Poco/Net/HTTPServerResponse.h
-include/Poco/Net/HTTPServerResponseImpl.h
-include/Poco/Net/HTTPServerSession.h
-include/Poco/Net/HTTPSession.h
-include/Poco/Net/HTTPSessionFactory.h
-include/Poco/Net/HTTPSessionInstantiator.h
-include/Poco/Net/HTTPStream.h
-include/Poco/Net/HTTPStreamFactory.h
-include/Poco/Net/HostEntry.h
-include/Poco/Net/ICMPClient.h
-include/Poco/Net/ICMPEventArgs.h
-include/Poco/Net/ICMPPacket.h
-include/Poco/Net/ICMPPacketImpl.h
-include/Poco/Net/ICMPSocket.h
-include/Poco/Net/ICMPSocketImpl.h
-include/Poco/Net/ICMPv4PacketImpl.h
-include/Poco/Net/IPAddress.h
-include/Poco/Net/InvalidCertificateHandler.h
-include/Poco/Net/KeyConsoleHandler.h
-include/Poco/Net/KeyFileHandler.h
-include/Poco/Net/MailMessage.h
-include/Poco/Net/MailRecipient.h
-include/Poco/Net/MailStream.h
-include/Poco/Net/MediaType.h
-include/Poco/Net/MessageHeader.h
-include/Poco/Net/MulticastSocket.h
-include/Poco/Net/MultipartReader.h
-include/Poco/Net/MultipartWriter.h
-include/Poco/Net/NameValueCollection.h
-include/Poco/Net/Net.h
-include/Poco/Net/NetException.h
-include/Poco/Net/NetSSL.h
-include/Poco/Net/NetworkInterface.h
-include/Poco/Net/NullPartHandler.h
-include/Poco/Net/POP3ClientSession.h
-include/Poco/Net/PartHandler.h
-include/Poco/Net/PartSource.h
-include/Poco/Net/PrivateKeyFactory.h
-include/Poco/Net/PrivateKeyFactoryMgr.h
-include/Poco/Net/PrivateKeyPassphraseHandler.h
-include/Poco/Net/QuotedPrintableDecoder.h
-include/Poco/Net/QuotedPrintableEncoder.h
-include/Poco/Net/RawSocket.h
-include/Poco/Net/RawSocketImpl.h
-include/Poco/Net/RejectCertificateHandler.h
-include/Poco/Net/RemoteSyslogChannel.h
-include/Poco/Net/RemoteSyslogListener.h
-include/Poco/Net/Session.h
-include/Poco/Net/SecureSMTPClientSession.h
-include/Poco/Net/SMTPClientSession.h
-include/Poco/Net/SSLException.h
-include/Poco/Net/SSLManager.h
-include/Poco/Net/SecureServerSocket.h
-include/Poco/Net/SecureServerSocketImpl.h
-include/Poco/Net/SecureSocketImpl.h
-include/Poco/Net/SecureStreamSocket.h
-include/Poco/Net/SecureStreamSocketImpl.h
-include/Poco/Net/ServerSocket.h
-include/Poco/Net/ServerSocketImpl.h
-include/Poco/Net/Socket.h
-include/Poco/Net/SocketAcceptor.h
-include/Poco/Net/SocketAddress.h
-include/Poco/Net/SocketConnector.h
-include/Poco/Net/SocketDefs.h
-include/Poco/Net/SocketImpl.h
-include/Poco/Net/SocketNotification.h
-include/Poco/Net/SocketNotifier.h
-include/Poco/Net/SocketReactor.h
-include/Poco/Net/SocketStream.h
-include/Poco/Net/StreamSocket.h
-include/Poco/Net/StreamSocketImpl.h
-include/Poco/Net/StringPartSource.h
-include/Poco/Net/TCPServer.h
-include/Poco/Net/TCPServerConnection.h
-include/Poco/Net/TCPServerConnectionFactory.h
-include/Poco/Net/TCPServerDispatcher.h
-include/Poco/Net/TCPServerParams.h
-include/Poco/Net/Utility.h
-include/Poco/Net/VerificationErrorArgs.h
-include/Poco/Net/X509Certificate.h
+include/Poco/NObserver.h
 include/Poco/Notification.h
 include/Poco/NotificationCenter.h
 include/Poco/NotificationQueue.h
@@ -418,10 +219,10 @@ include/Poco/Path.h
 include/Poco/Path_UNIX.h
 include/Poco/Path_VMS.h
 include/Poco/Path_WIN32.h
+include/Poco/Pipe.h
 include/Poco/Path_WIN32U.h
 include/Poco/Path_WINCE.h
 include/Poco/PatternFormatter.h
-include/Poco/Pipe.h
 include/Poco/PipeImpl.h
 include/Poco/PipeImpl_DUMMY.h
 include/Poco/PipeImpl_POSIX.h
@@ -437,18 +238,15 @@ include/Poco/PriorityDelegate.h
 include/Poco/PriorityEvent.h
 include/Poco/PriorityExpire.h
 include/Poco/PriorityNotificationQueue.h
+include/Poco/PriorityStrategy.h
 include/Poco/Process.h
 include/Poco/Process_UNIX.h
 include/Poco/Process_VMS.h
+include/Poco/Process_VX.h
 include/Poco/Process_WIN32.h
 include/Poco/Process_WIN32U.h
 include/Poco/Process_WINCE.h
 include/Poco/PurgeStrategy.h
-include/Poco/RWLock.h
-include/Poco/RWLock_POSIX.h
-include/Poco/RWLock_VX.h
-include/Poco/RWLock_WINCE.h
-include/Poco/RWLock_WIN32.h
 include/Poco/Random.h
 include/Poco/RandomStream.h
 include/Poco/RefCountedObject.h
@@ -456,32 +254,19 @@ include/Poco/RegularExpression.h
 include/Poco/RotateStrategy.h
 include/Poco/Runnable.h
 include/Poco/RunnableAdapter.h
-include/Poco/SAX/Attributes.h
-include/Poco/SAX/AttributesImpl.h
-include/Poco/SAX/ContentHandler.h
-include/Poco/SAX/DTDHandler.h
-include/Poco/SAX/DeclHandler.h
-include/Poco/SAX/DefaultHandler.h
-include/Poco/SAX/EntityResolver.h
-include/Poco/SAX/EntityResolverImpl.h
-include/Poco/SAX/ErrorHandler.h
-include/Poco/SAX/InputSource.h
-include/Poco/SAX/LexicalHandler.h
-include/Poco/SAX/Locator.h
-include/Poco/SAX/LocatorImpl.h
-include/Poco/SAX/NamespaceSupport.h
-include/Poco/SAX/SAXException.h
-include/Poco/SAX/SAXParser.h
-include/Poco/SAX/WhitespaceFilter.h
-include/Poco/SAX/XMLFilter.h
-include/Poco/SAX/XMLFilterImpl.h
-include/Poco/SAX/XMLReader.h
-include/Poco/SHA1Engine.h
+include/Poco/RWLock.h
+include/Poco/RWLock_Android.h
+include/Poco/RWLock_POSIX.h
+include/Poco/RWLock_VX.h
+include/Poco/RWLock_WIN32.h
+include/Poco/RWLock_WINCE.h
 include/Poco/ScopedLock.h
 include/Poco/ScopedUnlock.h
 include/Poco/Semaphore.h
 include/Poco/Semaphore_POSIX.h
+include/Poco/Semaphore_VX.h
 include/Poco/Semaphore_WIN32.h
+include/Poco/SHA1Engine.h
 include/Poco/SharedLibrary.h
 include/Poco/SharedLibrary_HPUX.h
 include/Poco/SharedLibrary_UNIX.h
@@ -494,6 +279,7 @@ include/Poco/SharedMemory_DUMMY.h
 include/Poco/SharedMemory_POSIX.h
 include/Poco/SharedMemory_WIN32.h
 include/Poco/SharedPtr.h
+include/Poco/Task.h
 include/Poco/SignalHandler.h
 include/Poco/SimpleFileChannel.h
 include/Poco/SimpleHashTable.h
@@ -510,22 +296,22 @@ include/Poco/String.h
 include/Poco/StringTokenizer.h
 include/Poco/SynchronizedObject.h
 include/Poco/SyslogChannel.h
-include/Poco/Task.h
 include/Poco/TaskManager.h
 include/Poco/TaskNotification.h
 include/Poco/TeeStream.h
+include/Poco/Thread.h
 include/Poco/TemporaryFile.h
 include/Poco/TextBufferIterator.h
 include/Poco/TextConverter.h
 include/Poco/TextEncoding.h
 include/Poco/TextIterator.h
-include/Poco/Thread.h
-include/Poco/ThreadLocal.h
-include/Poco/ThreadPool.h
-include/Poco/ThreadTarget.h
 include/Poco/Thread_POSIX.h
+include/Poco/Thread_VX.h
 include/Poco/Thread_WIN32.h
 include/Poco/Thread_WINCE.h
+include/Poco/ThreadLocal.h
+include/Poco/ThreadPool.h
+include/Poco/ThreadTarget.h
 include/Poco/TimedNotificationQueue.h
 include/Poco/Timer.h
 include/Poco/Timespan.h
@@ -535,15 +321,6 @@ include/Poco/Token.h
 include/Poco/Tuple.h
 include/Poco/TypeList.h
 include/Poco/Types.h
-include/Poco/URI.h
-include/Poco/URIStreamFactory.h
-include/Poco/URIStreamOpener.h
-include/Poco/UTF16Encoding.h
-include/Poco/UTF8Encoding.h
-include/Poco/UTF8String.h
-include/Poco/UUID.h
-include/Poco/UUIDGenerator.h
-include/Poco/UnWindows.h
 include/Poco/UnbufferedStreamBuf.h
 include/Poco/Unicode.h
 include/Poco/UnicodeConverter.h
@@ -553,7 +330,55 @@ include/Poco/UniqueAccessExpireStrategy.h
 include/Poco/UniqueExpireCache.h
 include/Poco/UniqueExpireLRUCache.h
 include/Poco/UniqueExpireStrategy.h
-include/Poco/Util/AbstractConfiguration.h
+include/Poco/UnWindows.h
+include/Poco/URI.h
+include/Poco/URIStreamFactory.h
+include/Poco/URIStreamOpener.h
+include/Poco/UTF16Encoding.h
+include/Poco/UTF8Encoding.h
+include/Poco/UTF8String.h
+include/Poco/UUID.h
+include/Poco/UUIDGenerator.h
+include/Poco/ValidArgs.h
+include/Poco/._Version.h
+include/Poco/SAX/XMLReader.h
+include/Poco/SAX/AttributesImpl.h
+include/Poco/SAX/ContentHandler.h
+include/Poco/SAX/DeclHandler.h
+include/Poco/SAX/DefaultHandler.h
+include/Poco/SAX/DTDHandler.h
+include/Poco/SAX/EntityResolver.h
+include/Poco/SAX/EntityResolverImpl.h
+include/Poco/SAX/ErrorHandler.h
+include/Poco/SAX/InputSource.h
+include/Poco/SAX/LexicalHandler.h
+include/Poco/SAX/Locator.h
+include/Poco/SAX/LocatorImpl.h
+include/Poco/SAX/NamespaceSupport.h
+include/Poco/SAX/SAXException.h
+include/Poco/SAX/SAXParser.h
+include/Poco/SAX/WhitespaceFilter.h
+include/Poco/SAX/XMLFilter.h
+include/Poco/SAX/XMLFilterImpl.h
+include/Poco/SAX/Attributes.h
+include/Poco/Version.h
+include/Poco/Void.h
+include/Poco/Windows1252Encoding.h
+include/Poco/WindowsConsoleChannel.h
+include/Poco/zconf.h
+include/Poco/AbstractCache.h
+include/Poco/XML/XMLWriter.h
+include/Poco/XML/expat_external.h
+include/Poco/XML/Name.h
+include/Poco/XML/NamePool.h
+include/Poco/XML/NamespaceStrategy.h
+include/Poco/XML/ParserEngine.h
+include/Poco/XML/XML.h
+include/Poco/XML/XMLException.h
+include/Poco/XML/XMLStream.h
+include/Poco/XML/XMLString.h
+include/Poco/XML/expat.h
+include/Poco/Util/XMLConfiguration.h
 include/Poco/Util/Application.h
 include/Poco/Util/ConfigurationMapper.h
 include/Poco/Util/ConfigurationView.h
@@ -570,38 +395,224 @@ include/Poco/Util/OptionCallback.h
 include/Poco/Util/OptionException.h
 include/Poco/Util/OptionProcessor.h
 include/Poco/Util/OptionSet.h
+include/Poco/Util/Timer.h
 include/Poco/Util/PropertyFileConfiguration.h
 include/Poco/Util/RegExpValidator.h
 include/Poco/Util/ServerApplication.h
 include/Poco/Util/Subsystem.h
 include/Poco/Util/SystemConfiguration.h
-include/Poco/Util/Timer.h
 include/Poco/Util/TimerTask.h
 include/Poco/Util/TimerTaskAdapter.h
-include/Poco/Util/Util.h
 include/Poco/Util/Units.h
+include/Poco/Util/Util.h
 include/Poco/Util/Validator.h
-include/Poco/Version.h
 include/Poco/Util/WinRegistryConfiguration.h
 include/Poco/Util/WinRegistryKey.h
 include/Poco/Util/WinService.h
-include/Poco/Util/XMLConfiguration.h
-include/Poco/ValidArgs.h
-include/Poco/Void.h
-include/Poco/Windows1252Encoding.h
-include/Poco/WindowsConsoleChannel.h
-include/Poco/XML/Name.h
-include/Poco/XML/NamePool.h
-include/Poco/XML/NamespaceStrategy.h
-include/Poco/XML/ParserEngine.h
-include/Poco/XML/XML.h
-include/Poco/XML/XMLException.h
-include/Poco/XML/XMLStream.h
-include/Poco/XML/XMLString.h
-include/Poco/XML/XMLWriter.h
-include/Poco/XML/expat.h
-include/Poco/XML/expat_external.h
-include/Poco/Zip/Add.h
+include/Poco/Util/AbstractConfiguration.h
+include/Poco/Net/WebSocketImpl.h
+include/Poco/Net/DatagramSocket.h
+include/Poco/Net/DatagramSocketImpl.h
+include/Poco/Net/DialogSocket.h
+include/Poco/Net/DNS.h
+include/Poco/Net/FilePartSource.h
+include/Poco/Net/FTPClientSession.h
+include/Poco/Net/FTPStreamFactory.h
+include/Poco/Net/HostEntry.h
+include/Poco/Net/HTMLForm.h
+include/Poco/Net/HTTPAuthenticationParams.h
+include/Poco/Net/HTTPBasicCredentials.h
+include/Poco/Net/HTTPBasicStreamBuf.h
+include/Poco/Net/HTTPBufferAllocator.h
+include/Poco/Net/HTTPChunkedStream.h
+include/Poco/Net/HTTPClientSession.h
+include/Poco/Net/HTTPCookie.h
+include/Poco/Net/HTTPCredentials.h
+include/Poco/Net/HTTPDigestCredentials.h
+include/Poco/Net/HTTPFixedLengthStream.h
+include/Poco/Net/HTTPHeaderStream.h
+include/Poco/Net/HTTPIOStream.h
+include/Poco/Net/HTTPMessage.h
+include/Poco/Net/HTTPRequest.h
+include/Poco/Net/HTTPRequestHandler.h
+include/Poco/Net/HTTPRequestHandlerFactory.h
+include/Poco/Net/HTTPResponse.h
+include/Poco/Net/HTTPServer.h
+include/Poco/Net/HTTPServerConnection.h
+include/Poco/Net/HTTPServerConnectionFactory.h
+include/Poco/Net/HTTPServerParams.h
+include/Poco/Net/HTTPServerRequest.h
+include/Poco/Net/HTTPServerRequestImpl.h
+include/Poco/Net/HTTPServerResponse.h
+include/Poco/Net/HTTPServerResponseImpl.h
+include/Poco/Net/HTTPServerSession.h
+include/Poco/Net/HTTPSession.h
+include/Poco/Net/HTTPSessionFactory.h
+include/Poco/Net/HTTPSessionInstantiator.h
+include/Poco/Net/HTTPStream.h
+include/Poco/Net/HTTPStreamFactory.h
+include/Poco/Net/ICMPClient.h
+include/Poco/Net/ICMPEventArgs.h
+include/Poco/Net/ICMPPacket.h
+include/Poco/Net/ICMPPacketImpl.h
+include/Poco/Net/ICMPSocket.h
+include/Poco/Net/ICMPSocketImpl.h
+include/Poco/Net/ICMPv4PacketImpl.h
+include/Poco/Net/IPAddress.h
+include/Poco/Net/MailMessage.h
+include/Poco/Net/MailRecipient.h
+include/Poco/Net/MailStream.h
+include/Poco/Net/MediaType.h
+include/Poco/Net/MessageHeader.h
+include/Poco/Net/Net.h
+include/Poco/Net/MulticastSocket.h
+include/Poco/Net/MultipartReader.h
+include/Poco/Net/MultipartWriter.h
+include/Poco/Net/NameValueCollection.h
+include/Poco/Net/NetException.h
+include/Poco/Net/NetworkInterface.h
+include/Poco/Net/NullPartHandler.h
+include/Poco/Net/PartHandler.h
+include/Poco/Net/PartSource.h
+include/Poco/Net/POP3ClientSession.h
+include/Poco/Net/QuotedPrintableDecoder.h
+include/Poco/Net/QuotedPrintableEncoder.h
+include/Poco/Net/RawSocket.h
+include/Poco/Net/RawSocketImpl.h
+include/Poco/Net/RemoteSyslogChannel.h
+include/Poco/Net/RemoteSyslogListener.h
+include/Poco/Net/Socket.h
+include/Poco/Net/ServerSocket.h
+include/Poco/Net/ServerSocketImpl.h
+include/Poco/Net/SMTPClientSession.h
+include/Poco/Net/SocketAcceptor.h
+include/Poco/Net/SocketAddress.h
+include/Poco/Net/SocketConnector.h
+include/Poco/Net/SocketDefs.h
+include/Poco/Net/SocketImpl.h
+include/Poco/Net/SocketNotification.h
+include/Poco/Net/SocketNotifier.h
+include/Poco/Net/SocketReactor.h
+include/Poco/Net/SocketStream.h
+include/Poco/Net/StreamSocket.h
+include/Poco/Net/StreamSocketImpl.h
+include/Poco/Net/StringPartSource.h
+include/Poco/Net/TCPServer.h
+include/Poco/Net/TCPServerConnection.h
+include/Poco/Net/TCPServerConnectionFactory.h
+include/Poco/Net/WebSocket.h
+include/Poco/Net/TCPServerParams.h
+include/Poco/Net/TCPServerDispatcher.h
+include/Poco/Net/AbstractHTTPRequestHandler.h
+include/Poco/Net/X509Certificate.h
+include/Poco/Net/CertificateHandlerFactory.h
+include/Poco/Net/CertificateHandlerFactoryMgr.h
+include/Poco/Net/ConsoleCertificateHandler.h
+include/Poco/Net/Context.h
+include/Poco/Net/HTTPSClientSession.h
+include/Poco/Net/HTTPSSessionInstantiator.h
+include/Poco/Net/HTTPSStreamFactory.h
+include/Poco/Net/InvalidCertificateHandler.h
+include/Poco/Net/KeyConsoleHandler.h
+include/Poco/Net/KeyFileHandler.h
+include/Poco/Net/NetSSL.h
+include/Poco/Net/PrivateKeyFactory.h
+include/Poco/Net/PrivateKeyFactoryMgr.h
+include/Poco/Net/PrivateKeyPassphraseHandler.h
+include/Poco/Net/RejectCertificateHandler.h
+include/Poco/Net/SecureServerSocket.h
+include/Poco/Net/SecureServerSocketImpl.h
+include/Poco/Net/SecureSMTPClientSession.h
+include/Poco/Net/SecureSocketImpl.h
+include/Poco/Net/SecureStreamSocket.h
+include/Poco/Net/SecureStreamSocketImpl.h
+include/Poco/Net/Session.h
+include/Poco/Net/SSLException.h
+include/Poco/Net/SSLManager.h
+include/Poco/Net/Utility.h
+include/Poco/Net/VerificationErrorArgs.h
+include/Poco/Net/AcceptCertificateHandler.h
+include/Poco/Crypto/X509Certificate.h
+include/Poco/Crypto/CipherFactory.h
+include/Poco/Crypto/CipherImpl.h
+include/Poco/Crypto/CipherKey.h
+include/Poco/Crypto/CipherKeyImpl.h
+include/Poco/Crypto/Crypto.h
+include/Poco/Crypto/CryptoStream.h
+include/Poco/Crypto/CryptoTransform.h
+include/Poco/Crypto/OpenSSLInitializer.h
+include/Poco/Crypto/RSACipherImpl.h
+include/Poco/Crypto/RSADigestEngine.h
+include/Poco/Crypto/RSAKey.h
+include/Poco/Crypto/RSAKeyImpl.h
+include/Poco/Crypto/Cipher.h
+include/Poco/Data/TypeHandler.h
+include/Poco/Data/AbstractBinding.h
+include/Poco/Data/AbstractExtraction.h
+include/Poco/Data/AbstractExtractor.h
+include/Poco/Data/AbstractPreparation.h
+include/Poco/Data/AbstractPrepare.h
+include/Poco/Data/AbstractSessionImpl.h
+include/Poco/Data/Binding.h
+include/Poco/Data/BLOB.h
+include/Poco/Data/BLOBStream.h
+include/Poco/Data/Column.h
+include/Poco/Data/Common.h
+include/Poco/Data/Connector.h
+include/Poco/Data/Data.h
+include/Poco/Data/DataException.h
+include/Poco/Data/Extraction.h
+include/Poco/Data/Limit.h
+include/Poco/Data/MetaColumn.h
+include/Poco/Data/PooledSessionHolder.h
+include/Poco/Data/Prepare.h
+include/Poco/Data/PooledSessionImpl.h
+include/Poco/Data/Range.h
+include/Poco/Data/RecordSet.h
+include/Poco/Data/Session.h
+include/Poco/Data/SessionFactory.h
+include/Poco/Data/SessionImpl.h
+include/Poco/Data/SessionPool.h
+include/Poco/Data/Statement.h
+include/Poco/Data/StatementCreator.h
+include/Poco/Data/StatementImpl.h
+include/Poco/Data/AbstractBinder.h
+include/Poco/Data/SQLite/Utility.h
+include/Poco/Data/SQLite/Connector.h
+include/Poco/Data/SQLite/Extractor.h
+include/Poco/Data/SQLite/SessionImpl.h
+include/Poco/Data/SQLite/SQLite.h
+include/Poco/Data/SQLite/SQLiteException.h
+include/Poco/Data/SQLite/SQLiteStatementImpl.h
+include/Poco/Data/SQLite/Binder.h
+include/Poco/Data/ODBC/Utility.h
+include/Poco/Data/ODBC/ConnectionHandle.h
+include/Poco/Data/ODBC/Connector.h
+include/Poco/Data/ODBC/DataTypes.h
+include/Poco/Data/ODBC/Diagnostics.h
+include/Poco/Data/ODBC/EnvironmentHandle.h
+include/Poco/Data/ODBC/Error.h
+include/Poco/Data/ODBC/Extractor.h
+include/Poco/Data/ODBC/Handle.h
+include/Poco/Data/ODBC/ODBC.h
+include/Poco/Data/ODBC/ODBCColumn.h
+include/Poco/Data/ODBC/ODBCException.h
+include/Poco/Data/ODBC/ODBCStatementImpl.h
+include/Poco/Data/ODBC/Parameter.h
+include/Poco/Data/ODBC/Preparation.h
+include/Poco/Data/ODBC/SessionImpl.h
+include/Poco/Data/ODBC/Binder.h
+include/Poco/Data/MySQL/StatementExecutor.h
+include/Poco/Data/MySQL/Connector.h
+include/Poco/Data/MySQL/Extractor.h
+include/Poco/Data/MySQL/MySQL.h
+include/Poco/Data/MySQL/MySQLException.h
+include/Poco/Data/MySQL/MySQLStatementImpl.h
+include/Poco/Data/MySQL/ResultMetadata.h
+include/Poco/Data/MySQL/SessionHandle.h
+include/Poco/Data/MySQL/SessionImpl.h
+include/Poco/Data/MySQL/Binder.h
+include/Poco/Zip/ZipUtil.h
 include/Poco/Zip/AutoDetectStream.h
 include/Poco/Zip/Compress.h
 include/Poco/Zip/Decompress.h
@@ -623,58 +634,48 @@ include/Poco/Zip/ZipLocalFileHeader.h
 include/Poco/Zip/ZipManipulator.h
 include/Poco/Zip/ZipOperation.h
 include/Poco/Zip/ZipStream.h
-include/Poco/Zip/ZipUtil.h
-include/Poco/zconf.h
-include/Poco/zlib.h
+include/Poco/Zip/Add.h
 lib/libPocoCrypto.so
-lib/libPocoCrypto.so.11
+lib/libPocoCrypto.so.12
 lib/libPocoCryptod.so
-lib/libPocoCryptod.so.11
+lib/libPocoCryptod.so.12
 lib/libPocoData.so
-lib/libPocoData.so.11
+lib/libPocoData.so.12
+lib/libPocoDataSQLite.so
+lib/libPocoDataSQLite.so.12
+lib/libPocoDataSQLited.so
+lib/libPocoDataSQLited.so.12
 lib/libPocoDatad.so
-lib/libPocoDatad.so.11
+lib/libPocoDatad.so.12
 lib/libPocoFoundation.so
-lib/libPocoFoundation.so.11
+lib/libPocoFoundation.so.12
 lib/libPocoFoundationd.so
-lib/libPocoFoundationd.so.11
-lib/libPocoDataMySQL.so
-lib/libPocoDataMySQL.so.11
-lib/libPocoDataMySQLd.so
-lib/libPocoDataMySQLd.so.11
+lib/libPocoFoundationd.so.12
 lib/libPocoNet.so
-lib/libPocoNet.so.11
+lib/libPocoNet.so.12
 lib/libPocoNetSSL.so
-lib/libPocoNetSSL.so.11
+lib/libPocoNetSSL.so.12
 lib/libPocoNetSSLd.so
-lib/libPocoNetSSLd.so.11
+lib/libPocoNetSSLd.so.12
 lib/libPocoNetd.so
-lib/libPocoNetd.so.11
-lib/libPocoDataODBC.so
-lib/libPocoDataODBC.so.11
-lib/libPocoDataODBCd.so
-lib/libPocoDataODBCd.so.11
-lib/libPocoDataSQLite.so
-lib/libPocoDataSQLite.so.11
-lib/libPocoDataSQLited.so
-lib/libPocoDataSQLited.so.11
+lib/libPocoNetd.so.12
 lib/libPocoUtil.so
-lib/libPocoUtil.so.11
+lib/libPocoUtil.so.12
 lib/libPocoUtild.so
-lib/libPocoUtild.so.11
+lib/libPocoUtild.so.12
 lib/libPocoXML.so
-lib/libPocoXML.so.11
+lib/libPocoXML.so.12
 lib/libPocoXMLd.so
-lib/libPocoXMLd.so.11
+lib/libPocoXMLd.so.12
 lib/libPocoZip.so
-lib/libPocoZip.so.11
+lib/libPocoZip.so.12
 lib/libPocoZipd.so
-lib/libPocoZipd.so.11
+lib/libPocoZipd.so.12
 @dirrmtry include/Poco/DOM
-@dirrmtry include/Poco/Net
 @dirrmtry include/Poco/SAX
-@dirrmtry include/Poco/Util
 @dirrmtry include/Poco/XML
+@dirrmtry include/Poco/Util
+@dirrmtry include/Poco/Net
 @dirrmtry include/Poco/Crypto
 @dirrmtry include/Poco/Data/SQLite
 @dirrmtry include/Poco/Data/ODBC