From 60d386edc90af095f9e63c73542a6104dee92ddc Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Wed, 17 Jan 2007 10:34:30 +0000 Subject: [PATCH] BSD license change --- Foundation/include/Poco/Random.h | 8 +-- Foundation/src/Random.cpp | 15 ++-- MANIFEST | 116 ------------------------------- Makefile | 23 ++---- VERSION | 2 +- build_vs71.cmd | 10 --- build_vs80.cmd | 10 --- components | 1 - doc/Acknowledgements.html | 4 -- 9 files changed, 16 insertions(+), 173 deletions(-) diff --git a/Foundation/include/Poco/Random.h b/Foundation/include/Poco/Random.h index 140973a07..afb910df9 100644 --- a/Foundation/include/Poco/Random.h +++ b/Foundation/include/Poco/Random.h @@ -1,7 +1,7 @@ // // Random.h // -// $Id: //poco/1.3/Foundation/include/Poco/Random.h#1 $ +// $Id: //poco/1.3/Foundation/include/Poco/Random.h#2 $ // // Library: Foundation // Package: Crypt @@ -36,7 +36,7 @@ // // // Based on the FreeBSD random number generator. -// src/lib/libc/stdlib/random.c,v 1.13 2000/01/27 23:06:49 jasone Exp +// src/lib/libc/stdlib/random.c,v 1.25 // // Copyright (c) 1983, 1993 // The Regents of the University of California. All rights reserved. @@ -48,10 +48,6 @@ // 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. All advertising materials mentioning features or use of this software -// must display the following acknowledgement: -// This product includes software developed by the University of -// California, Berkeley and its contributors. // 4. Neither the name of the University nor the names of its contributors // may be used to endorse or promote products derived from this software // without specific prior written permission. diff --git a/Foundation/src/Random.cpp b/Foundation/src/Random.cpp index 401964cd4..4c2106fc9 100644 --- a/Foundation/src/Random.cpp +++ b/Foundation/src/Random.cpp @@ -1,7 +1,7 @@ // // Random.cpp // -// $Id: //poco/1.3/Foundation/src/Random.cpp#1 $ +// $Id: //poco/1.3/Foundation/src/Random.cpp#2 $ // // Library: Foundation // Package: Crypt @@ -36,7 +36,7 @@ // // // Based on the FreeBSD random number generator. -// src/lib/libc/stdlib/random.c,v 1.13 2000/01/27 23:06:49 jasone Exp +// src/lib/libc/stdlib/random.c,v 1.25 // // Copyright (c) 1983, 1993 // The Regents of the University of California. All rights reserved. @@ -48,10 +48,6 @@ // 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. All advertising materials mentioning features or use of this software -// must display the following acknowledgement: -// This product includes software developed by the University of -// California, Berkeley and its contributors. // 4. Neither the name of the University nor the names of its contributors // may be used to endorse or promote products derived from this software // without specific prior written permission. @@ -91,10 +87,10 @@ * congruential generator. If the amount of state information is less than * 32 bytes, a simple linear congruential R.N.G. is used. * - * Internally, the state information is treated as an array of longs; the + * Internally, the state information is treated as an array of uint32_t's; the * zeroeth element of the array is the type of R.N.G. being used (small * integer); the remainder of the array is the state information for the - * R.N.G. Thus, 32 bytes of state information will give 7 longs worth of + * R.N.G. Thus, 32 bytes of state information will give 7 ints worth of * state information, which will allow a degree seven polynomial. (Note: * the zeroeth word of state information also has some other information * stored in it -- see setstate() for details). @@ -110,7 +106,7 @@ * period of the generator is approximately deg*(2**deg - 1); thus doubling * the amount of state information has a vast influence on the period of the * generator. Note: the deg*(2**deg - 1) is an approximation only good for - * large deg, when the period of the shift register is the dominant factor. + * large deg, when the period of the shift is the dominant factor. * With deg equal to seven, the period is actually much longer than the * 7*(2**7 - 1) predicted by this formula. * @@ -278,6 +274,7 @@ void Random::seed() * * Returns a pointer to the old state. * + * Note: The Sparc platform requires that arg_state begin on an int * word boundary; otherwise a bus error will occur. Even so, lint will * complain about mis-alignment, but you should disregard these messages. */ diff --git a/MANIFEST b/MANIFEST index e49aa6a85..d29e0adde 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1340,122 +1340,6 @@ Net/testsuite/src/WinDriver.cpp Net/testsuite/TestSuite.vmsbuild Net/testsuite/TestSuite_vs71.vcproj Net/testsuite/TestSuite_vs80.vcproj -NetSSL_OpenSSL -NetSSL_OpenSSL/doc -NetSSL_OpenSSL/doc/howtobuild.txt -NetSSL_OpenSSL/include -NetSSL_OpenSSL/include/Poco -NetSSL_OpenSSL/include/Poco/Net -NetSSL_OpenSSL/include/Poco/Net/AcceptCertificateHandler.h -NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h -NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactoryMgr.h -NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h -NetSSL_OpenSSL/include/Poco/Net/Context.h -NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h -NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h -NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h -NetSSL_OpenSSL/include/Poco/Net/InvalidCertificateHandler.h -NetSSL_OpenSSL/include/Poco/Net/KeyConsoleHandler.h -NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h -NetSSL_OpenSSL/include/Poco/Net/NetSSL.h -NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h -NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactoryMgr.h -NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h -NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h -NetSSL_OpenSSL/include/Poco/Net/SecureServerSocketImpl.h -NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h -NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h -NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h -NetSSL_OpenSSL/include/Poco/Net/SSLException.h -NetSSL_OpenSSL/include/Poco/Net/SSLInitializer.h -NetSSL_OpenSSL/include/Poco/Net/SSLManager.h -NetSSL_OpenSSL/include/Poco/Net/Utility.h -NetSSL_OpenSSL/include/Poco/Net/VerificationErrorArgs.h -NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h -NetSSL_OpenSSL/Makefile -NetSSL_OpenSSL/NetSSL_OpenSSL_vs71.sln -NetSSL_OpenSSL/NetSSL_OpenSSL_vs71.vcproj -NetSSL_OpenSSL/NetSSL_OpenSSL_vs80.sln -NetSSL_OpenSSL/NetSSL_OpenSSL_vs80.vcproj -NetSSL_OpenSSL/samples -NetSSL_OpenSSL/samples/download -NetSSL_OpenSSL/samples/download/any.pem -NetSSL_OpenSSL/samples/download/download.vmsbuild -NetSSL_OpenSSL/samples/download/download_vs71.vcproj -NetSSL_OpenSSL/samples/download/download_vs80.vcproj -NetSSL_OpenSSL/samples/download/Makefile -NetSSL_OpenSSL/samples/download/rootcert.pem -NetSSL_OpenSSL/samples/download/src -NetSSL_OpenSSL/samples/download/src/download.cpp -NetSSL_OpenSSL/samples/HTTPSTimeServer -NetSSL_OpenSSL/samples/HTTPSTimeServer/any.pem -NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.properties -NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.vmsbuild -NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs71.vcproj -NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs80.vcproj -NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile -NetSSL_OpenSSL/samples/HTTPSTimeServer/rootcert.pem -NetSSL_OpenSSL/samples/HTTPSTimeServer/src -NetSSL_OpenSSL/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp -NetSSL_OpenSSL/samples/Makefile -NetSSL_OpenSSL/samples/samples_vs71.sln -NetSSL_OpenSSL/samples/samples_vs80.sln -NetSSL_OpenSSL/src -NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp -NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp -NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp -NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp -NetSSL_OpenSSL/src/Context.cpp -NetSSL_OpenSSL/src/HTTPSClientSession.cpp -NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp -NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp -NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp -NetSSL_OpenSSL/src/KeyConsoleHandler.cpp -NetSSL_OpenSSL/src/KeyFileHandler.cpp -NetSSL_OpenSSL/src/PrivateKeyFactory.cpp -NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp -NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp -NetSSL_OpenSSL/src/SecureServerSocket.cpp -NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp -NetSSL_OpenSSL/src/SecureSocketImpl.cpp -NetSSL_OpenSSL/src/SecureStreamSocket.cpp -NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp -NetSSL_OpenSSL/src/SSLException.cpp -NetSSL_OpenSSL/src/SSLInitializer.cpp -NetSSL_OpenSSL/src/SSLManager.cpp -NetSSL_OpenSSL/src/Utility.cpp -NetSSL_OpenSSL/src/VerificationErrorArgs.cpp -NetSSL_OpenSSL/src/X509Certificate.cpp -NetSSL_OpenSSL/testsuite -NetSSL_OpenSSL/testsuite/any.pem -NetSSL_OpenSSL/testsuite/Makefile -NetSSL_OpenSSL/testsuite/rootcert.pem -NetSSL_OpenSSL/testsuite/src -NetSSL_OpenSSL/testsuite/src/Driver.cpp -NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp -NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h -NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.cpp -NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h -NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp -NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h -NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.cpp -NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h -NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp -NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h -NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp -NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.h -NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.cpp -NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h -NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp -NetSSL_OpenSSL/testsuite/src/TCPServerTest.h -NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.cpp -NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h -NetSSL_OpenSSL/testsuite/src/WinDriver.cpp -NetSSL_OpenSSL/testsuite/testrunner.xml -NetSSL_OpenSSL/testsuite/TestSuite.vmsbuild -NetSSL_OpenSSL/testsuite/TestSuite.xml -NetSSL_OpenSSL/testsuite/TestSuite_vs71.vcproj -NetSSL_OpenSSL/testsuite/TestSuite_vs80.vcproj NEWS README Util diff --git a/Makefile b/Makefile index a0625d991..6cfa210f3 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ endif all: libexecs tests samples INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) -COMPONENTS = Foundation XML Util Net NetSSL_OpenSSL +COMPONENTS = Foundation XML Util Net cppunit: $(MAKE) -C $(POCO_BASE)/CppUnit @@ -39,13 +39,13 @@ install: libexecs done find $(POCO_BUILD)/lib -name "libPoco*" -exec cp -Rf {} $(INSTALLDIR)/lib \; -.PHONY: Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec -.PHONY: Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests -.PHONY: Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples +.PHONY: Foundation-libexec XML-libexec Util-libexec Net-libexec +.PHONY: Foundation-tests XML-tests Util-tests Net-tests +.PHONY: Foundation-samples XML-samples Util-samples Net-samples -libexecs: Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec -tests: Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests -samples: Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples +libexecs: Foundation-libexec XML-libexec Util-libexec Net-libexec +tests: Foundation-tests XML-tests Util-tests Net-tests +samples: Foundation-samples XML-samples Util-samples Net-samples Foundation-libexec: $(MAKE) -C $(POCO_BASE)/Foundation @@ -82,12 +82,3 @@ Net-tests: Net-libexec cppunit Net-samples: Net-libexec Foundation-libexec XML-libexec Util-libexec $(MAKE) -C $(POCO_BASE)/Net/samples - -NetSSL_OpenSSL-libexec: Foundation-libexec Net-libexec Util-libexec - $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL - -NetSSL_OpenSSL-tests: NetSSL_OpenSSL-libexec cppunit - $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/testsuite - -NetSSL_OpenSSL-samples: NetSSL_OpenSSL-libexec - $(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/samples diff --git a/VERSION b/VERSION index a24bad199..923f8e436 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3-20070111 (2007-01-11) +1.3-20070117 (2007-01-17) diff --git a/build_vs71.cmd b/build_vs71.cmd index f00141985..ca66e88ab 100644 --- a/build_vs71.cmd +++ b/build_vs71.cmd @@ -39,11 +39,6 @@ cd Net devenv /useenv /rebuild debug_shared Net_vs71.sln devenv /useenv /rebuild release_shared Net_vs71.sln cd %POCOBASE% - -cd NetSSL_OpenSSL -devenv /useenv /rebuild debug_shared NetSSL_OpenSSL_vs71.sln -devenv /useenv /rebuild release_shared NetSSL_OpenSSL_vs71.sln -cd %POCOBASE% cd Foundation/samples devenv /useenv /rebuild debug_shared samples_vs71.sln @@ -64,8 +59,3 @@ cd Net/samples devenv /useenv /rebuild debug_shared samples_vs71.sln devenv /useenv /rebuild release_shared samples_vs71.sln cd %POCOBASE% - -cd NetSSL_OpenSSL/samples -devenv /useenv /rebuild debug_shared samples_vs71.sln -devenv /useenv /rebuild release_shared samples_vs71.sln -cd %POCOBASE% diff --git a/build_vs80.cmd b/build_vs80.cmd index b1ef27342..4e785d469 100644 --- a/build_vs80.cmd +++ b/build_vs80.cmd @@ -39,11 +39,6 @@ cd Net devenv /useenv /rebuild debug_shared Net_vs80.sln devenv /useenv /rebuild release_shared Net_vs80.sln cd %POCOBASE% - -cd NetSSL_OpenSSL -devenv /useenv /rebuild debug_shared NetSSL_OpenSSL_vs80.sln -devenv /useenv /rebuild release_shared NetSSL_OpenSSL_vs80.sln -cd %POCOBASE% cd Foundation/samples devenv /useenv /rebuild debug_shared samples_vs80.sln @@ -64,8 +59,3 @@ cd Net/samples devenv /useenv /rebuild debug_shared samples_vs80.sln devenv /useenv /rebuild release_shared samples_vs80.sln cd %POCOBASE% - -cd NetSSL_OpenSSL/samples -devenv /useenv /rebuild debug_shared samples_vs80.sln -devenv /useenv /rebuild release_shared samples_vs80.sln -cd %POCOBASE% diff --git a/components b/components index 9695fba7c..55e6831dc 100644 --- a/components +++ b/components @@ -2,5 +2,4 @@ Foundation XML Util Net -NetSSL_OpenSSL CppUnit diff --git a/doc/Acknowledgements.html b/doc/Acknowledgements.html index b74cc0bfb..b0a505423 100644 --- a/doc/Acknowledgements.html +++ b/doc/Acknowledgements.html @@ -59,10 +59,6 @@ are met: 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. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the University of - California, Berkeley and its contributors. 4. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.