diff options
51 files changed, 1302 insertions, 3407 deletions
diff --git a/afms/makefile.mk b/afms/makefile.mk index 2d61ed2dfa12..b1d2eafe7555 100644 --- a/afms/makefile.mk +++ b/afms/makefile.mk @@ -37,9 +37,8 @@ TARGET=afms # --- Files -------------------------------------------------------- TARFILE_NAME=Adobe-Core35_AFMs-314 +TARFILE_MD5=1756c4fa6c616ae15973c104cd8cb256 TARFILE_ROOTDIR=Adobe-Core35_AFMs-314 -# TAR_EXCLUDES broken for solaris tar - #i77247# -# TAR_EXCLUDES=*/*Helvetica-Narrow* # --- Targets ------------------------------------------------------ diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk index 6b2d09b00355..6e89a0034e97 100644 --- a/beanshell/makefile.mk +++ b/beanshell/makefile.mk @@ -38,6 +38,7 @@ TARGET=ooo_beanshell # --- Files -------------------------------------------------------- TARFILE_NAME=bsh-2.0b1-src +TARFILE_MD5=ea570af93c284aa9e5621cd563f54f4d TARFILE_ROOTDIR=BeanShell PATCH_FILES=bsh-2.0b1-src.patch diff --git a/cppunit/cppunit-1.8.0-r1.patch b/cppunit/cppunit-1.8.0-r1.patch deleted file mode 100644 index 9785fee093a6..000000000000 --- a/cppunit/cppunit-1.8.0-r1.patch +++ /dev/null @@ -1,2415 +0,0 @@ ---- misc/cppunit-1.8.0/AUTHORS 2002-03-26 09:29:58.000000000 +0100 -+++ misc/build/cppunit-1.8.0/AUTHORS 2009-09-12 14:15:35.015625000 +0200 -@@ -5,3 +5,4 @@ - Baptiste Lepilleur <gaiacrtn@free.fr> <blep@sourceforge.net> - Bastiaan Bakker <bastiaan.bakker@lifeline.nl> - Steve Robbins <smr99@sourceforge.net> -+Lars Langhans <lla@openoffice.org> ---- misc/cppunit-1.8.0/ChangeLog 2002-04-11 11:53:02.000000000 +0200 -+++ misc/build/cppunit-1.8.0/ChangeLog 2009-09-12 14:15:35.031250000 +0200 -@@ -1,3 +1,9 @@ -+2008-12-09 Lars Langhans <lla@openoffice.org> -+ * create with some source files a new library -+ * lot of source changes to build it within OOo environment. -+ * lot of additional code to build within OOo environment. -+ * Configure is no longer supported. -+ - 2002-04-11 Baptiste Lepilleur <gaiacrtn@free.fr> - - * doc/FAQ: removed question about the Exception::operator =() problem. ---- misc/cppunit-1.8.0/INSTALL 2001-07-06 19:48:28.000000000 +0200 -+++ misc/build/cppunit-1.8.0/INSTALL 2009-09-12 14:15:35.062500000 +0200 -@@ -1,6 +1,12 @@ - Basic Installation - ================== - -+<IMPORTANT> -+This is a patched Version of CppUnit and works only in a OpenOffice.org -+environment. -+All other information here are expired. -+</IMPORTANT> -+ - These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for ---- misc/cppunit-1.8.0/include/cppunit/Asserter.h 2002-03-28 16:47:07.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/Asserter.h 2009-09-12 14:15:35.078125000 +0200 -@@ -5,6 +5,7 @@ - #include <cppunit/SourceLine.h> - #include <string> - -+ - namespace CppUnit - { - -@@ -44,8 +45,8 @@ - - /*! Throws a Exception with the specified message and location. - */ -- void CPPUNIT_API fail( std::string message, -- SourceLine sourceLine = SourceLine() ); -+ void CPPUNIT_API fail( std::string const& message, -+ SourceLine const& sourceLine = SourceLine() ); - - /*! Throws a Exception with the specified message and location. - * \param shouldFail if \c true then the exception is thrown. Otherwise -@@ -54,8 +55,14 @@ - * \param sourceLine Location of the assertion. - */ - void CPPUNIT_API failIf( bool shouldFail, -- std::string message, -- SourceLine sourceLine = SourceLine() ); -+ std::string const& message, -+ SourceLine const& sourceLine = SourceLine() ); -+ -+ -+ // LLA: test, if it's possible to use a DEFINE twice ;-) -+ void CPPUNIT_API failIf( bool shouldFail, -+ const char* message, -+ SourceLine const& sourceLine = SourceLine() ); - - /*! Throws a NotEqualException with the specified message and location. - * \param expected Text describing the expected value. -@@ -64,10 +71,10 @@ - * where the "difference" is located. - * \param sourceLine Location of the assertion. - */ -- void CPPUNIT_API failNotEqual( std::string expected, -- std::string actual, -- SourceLine sourceLine = SourceLine(), -- std::string additionalMessage ="" ); -+ void CPPUNIT_API failNotEqual( std::string const& expected, -+ std::string const& actual, -+ SourceLine const& sourceLine = SourceLine(), -+ std::string const& additionalMessage ="" ); - - /*! Throws a NotEqualException with the specified message and location. - * \param shouldFail if \c true then the exception is thrown. Otherwise -@@ -79,10 +86,18 @@ - * \param sourceLine Location of the assertion. - */ - void CPPUNIT_API failNotEqualIf( bool shouldFail, -- std::string expected, -- std::string actual, -- SourceLine sourceLine = SourceLine(), -- std::string additionalMessage ="" ); -+ std::string const& expected, -+ std::string const& actual, -+ SourceLine const& sourceLine = SourceLine(), -+ std::string const& additionalMessage ="" ); -+ -+ -+ /*! Throws an Exception with the specified message and location. -+ * \param message Message explaining the assertion failure. -+ * \param sourceLine Location of the assertion. -+ */ -+ void CPPUNIT_API failStub( std::string const& message, -+ SourceLine const& sourceLine = SourceLine() ); - - } // namespace Asserter - } // namespace CppUnit ---- misc/cppunit-1.8.0/include/cppunit/Exception.h 2002-03-28 16:47:07.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/Exception.h 2009-09-12 14:15:35.093750000 +0200 -@@ -21,7 +21,7 @@ - class Type - { - public: -- Type( std::string type ) : m_type ( type ) {} -+ Type( std::string const& _type ) : m_type ( _type ) {} - - bool operator ==( const Type &other ) const - { -@@ -32,13 +32,13 @@ - }; - - -- Exception( std::string message = "", -- SourceLine sourceLine = SourceLine() ); -+ Exception( std::string const& message = "", -+ SourceLine const& sourceLine = SourceLine() ); - - #ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED -- Exception( std::string message, -+ Exception( std::string const& message, - long lineNumber, -- std::string fileName ); -+ std::string const& fileName ); - #endif - - Exception (const Exception& other); -@@ -74,6 +74,41 @@ - SourceLine m_sourceLine; - }; - -+// ----------------------------------------------------------------------------- -+ -+class StubException : public Exception -+{ -+public: -+ StubException( std::string const& _message = "", -+ SourceLine const& _sourceLine = SourceLine() ) -+ :Exception(_message, _sourceLine) {} -+ -+ -+#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED -+ StubException( std::string const& message, -+ long lineNumber, -+ std::string const& fileName ) -+ :Exception(message, lineNumber, fileName) {} -+#endif -+}; -+ -+// ----------------------------------------------------------------------------- -+ -+class SignalException : public Exception -+{ -+public: -+ SignalException( std::string const& _message = "", -+ SourceLine const& _sourceLine = SourceLine() ) -+ :Exception(_message, _sourceLine) {} -+ -+ -+#ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED -+ SignalException( std::string const& message, -+ long lineNumber, -+ std::string const& fileName ) -+ :Exception(message, lineNumber, fileName) {} -+#endif -+}; - - } // namespace CppUnit - ---- misc/cppunit-1.8.0/include/cppunit/NotEqualException.h 2002-03-28 16:47:07.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/NotEqualException.h 2009-09-12 14:15:35.093750000 +0200 -@@ -19,16 +19,16 @@ - * \param additionalMessage Additionnal information provided to further qualify - * the inequality. - */ -- NotEqualException( std::string expected, -- std::string actual, -- SourceLine sourceLine = SourceLine(), -- std::string additionalMessage = "" ); -+ NotEqualException( std::string const& expected, -+ std::string const& actual, -+ SourceLine const& sourceLine = SourceLine(), -+ std::string const& additionalMessage = "" ); - - #ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED -- NotEqualException( std::string expected, -- std::string actual, -+ NotEqualException( std::string const& expected, -+ std::string const& actual, - long lineNumber, -- std::string fileName ); -+ std::string const& fileName ); - #endif - - NotEqualException( const NotEqualException &other ); ---- misc/cppunit-1.8.0/include/cppunit/Portability.h 2002-03-25 19:41:39.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/Portability.h 2009-09-12 14:15:35.109375000 +0200 -@@ -28,7 +28,7 @@ - #define CPPUNIT_ENABLE_CU_TEST_MACROS 0 - #endif - --/* Define to 1 if the preprocessor expands (#foo) to "foo" (quotes incl.) -+/* Define to 1 if the preprocessor expands (#foo) to "foo" (quotes incl.) - I don't think there is any C preprocess that does NOT support this! */ - #ifndef CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION - #define CPPUNIT_HAVE_CPP_SOURCE_ANNOTATION 1 -@@ -51,11 +51,11 @@ - #if CPPUNIT_HAVE_SSTREAM - # include <sstream> - namespace CppUnit { -- class OStringStream : public std::ostringstream -+ class OStringStream : public std::ostringstream - { - }; - } --#else -+#else - #if CPPUNIT_HAVE_CLASS_STRSTREAM - # include <string> - # if CPPUNIT_HAVE_STRSTREAM -@@ -65,7 +65,7 @@ - # endif - - namespace CppUnit { -- class OStringStream : public std::ostrstream -+ class OStringStream : public std::ostrstream - { - public: - std::string str() ---- misc/cppunit-1.8.0/include/cppunit/Test.h 2002-03-28 16:47:07.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/Test.h 2009-09-12 14:15:35.125000000 +0200 -@@ -4,13 +4,15 @@ - #include <cppunit/Portability.h> - #include <string> - -+typedef void* hTestResult; -+ - namespace CppUnit { - --class TestResult; -+//# class TestResult; - - /*! \brief Base class for all test objects. - * \ingroup BrowsingCollectedTestResult -- * -+ *l- - * All test objects should be a subclass of Test. Some test objects, - * TestCase for example, represent one individual test. Other test - * objects, such as TestSuite, are comprised of several tests. -@@ -27,7 +29,7 @@ - - /*! \brief Run the test, collecting results. - */ -- virtual void run (TestResult *result) = 0; -+ virtual void run (hTestResult pResult) = 0; - - /*! \brief Return the number of test cases invoked by run(). - * ---- misc/cppunit-1.8.0/include/cppunit/TestAssert.h 2002-04-04 17:39:37.000000000 +0200 -+++ misc/build/cppunit-1.8.0/include/cppunit/TestAssert.h 2009-09-12 14:15:35.156250000 +0200 -@@ -5,9 +5,10 @@ - #include <cppunit/Exception.h> - #include <cppunit/Asserter.h> - -- - namespace CppUnit { - -+ -+ - /*! \brief Traits used by CPPUNIT_ASSERT_EQUAL(). - * - * Here is an example of specialization of that traits: -@@ -31,83 +32,83 @@ - * }; - * \endcode - */ -- template <class T> -- struct assertion_traits -- { -- static bool equal( const T& x, const T& y ) -- { -- return x == y; -- } -- -- static std::string toString( const T& x ) -- { -- OStringStream ost; -- ost << x; -- return ost.str(); -- } -- }; - - -- namespace TestAssert -- { -+template <class T> -+struct assertion_traits -+{ -+ static bool equal( const T& x, const T& y ) -+ { -+ return x == y; -+ } -+ -+ static std::string toString( const T& x ) -+ { -+ OStringStream ost; -+ ost << x; -+ return ost.str(); -+ } -+}; -+ -+namespace TestAssert -+{ - #ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED -- void CPPUNIT_API assertImplementation( bool condition, -- std::string conditionExpression = "", -- long lineNumber, -- std::string fileName ); -- -- void CPPUNIT_API assertNotEqualImplementation( std::string expected, -- std::string actual, -- long lineNumber, -- std::string fileName ); -- -- -- template <class T> -- void assertEquals( const T& expected, -- const T& actual, -- long lineNumber, -- std::string fileName ) -- { -- if ( !assertion_traits<T>::equal(expected,actual) ) // lazy toString conversion... -- { -- assertNotEqualImplementation( assertion_traits<T>::toString(expected), -- assertion_traits<T>::toString(actual), -- lineNumber, -- fileName ); -- } -- } -- -- void CPPUNIT_API assertEquals( double expected, -- double actual, -- double delta, -- long lineNumber, -- std::string fileName ); -+ void CPPUNIT_API assertImplementation( bool condition, -+ std::string conditionExpression = "", -+ long lineNumber, -+ std::string fileName ); -+ -+ void CPPUNIT_API assertNotEqualImplementation( std::string expected, -+ std::string actual, -+ long lineNumber, -+ std::string fileName ); -+ -+ -+ template <class T> -+ void assertEquals( const T& expected, -+ const T& actual, -+ long lineNumber, -+ std::string fileName ) -+ { -+ if ( !assertion_traits<T>::equal(expected,actual) ) // lazy toString conversion... -+ { -+ assertNotEqualImplementation( assertion_traits<T>::toString(expected), -+ assertion_traits<T>::toString(actual), -+ lineNumber, -+ fileName ); -+ } -+ } -+ -+ void CPPUNIT_API assertEquals( double expected, -+ double actual, -+ double delta, -+ long lineNumber, -+ std::string fileName ); - - #else // using SourceLine - -- template <class T> -- void assertEquals( const T& expected, -- const T& actual, -- SourceLine sourceLine, -- const std::string &message ="" ) -- { -- if ( !assertion_traits<T>::equal(expected,actual) ) // lazy toString conversion... -- { -- Asserter::failNotEqual( assertion_traits<T>::toString(expected), -- assertion_traits<T>::toString(actual), -- sourceLine, -- message ); -- } -- } -- -- void CPPUNIT_API assertDoubleEquals( double expected, -- double actual, -- double delta, -- SourceLine sourceLine ); -+ template <class T> -+ void assertEquals( const T& expected, -+ const T& actual, -+ SourceLine sourceLine, -+ const std::string &message ="" ) -+ { -+ if ( !assertion_traits<T>::equal(expected,actual) ) // lazy toString conversion... -+ { -+ Asserter::failNotEqual( assertion_traits<T>::toString(expected), -+ assertion_traits<T>::toString(actual), -+ sourceLine, -+ message ); -+ } -+ } -+ -+ void CPPUNIT_API assertDoubleEquals( double expected, -+ double actual, -+ double delta, -+ SourceLine sourceLine ); - - #endif -- } -- -+} - - /* A set of macros which allow us to get the line number - * and file name at the point of an error. -@@ -118,15 +119,22 @@ - /** Assertions that a condition is \c true. - * \ingroup Assertions - */ --#define CPPUNIT_ASSERT(condition) \ -- ( ::CppUnit::Asserter::failIf( !(condition), \ -- (#condition), \ -- CPPUNIT_SOURCELINE() ) ) -+ // LLA: due to the fact, that side effects are not wished, we create a local scope, -+ // assign the condition to a local variable and check this variable again and again. -+ -+#define CPPUNIT_ASSERT(condition) \ -+ { bool __bLocalCondition = condition; \ -+ CheckBoom((__bLocalCondition), (#condition)); \ -+ (::CppUnit::Asserter::failIf( !(__bLocalCondition), \ -+ (#condition), \ -+ CPPUNIT_SOURCELINE() ) ); } - #else --#define CPPUNIT_ASSERT(condition) \ -- ( ::CppUnit::Asserter::failIf( !(condition), \ -- "", \ -- CPPUNIT_SOURCELINE() ) ) -+#define CPPUNIT_ASSERT(condition) \ -+ { bool __bLocalCondition = condition; \ -+ CheckBoom((__bLocalCondition), ""); \ -+ (::CppUnit::Asserter::failIf( !(__bLocalCondition), \ -+ "", \ -+ CPPUNIT_SOURCELINE() ) ); } - #endif - - /** Assertion with a user specified message. -@@ -136,25 +144,33 @@ - * \param condition If this condition evaluates to \c false then the - * test failed. - */ --#define CPPUNIT_ASSERT_MESSAGE(message,condition) \ -- ( ::CppUnit::Asserter::failIf( !(condition), \ -- (message), \ -- CPPUNIT_SOURCELINE() ) ) -+#define CPPUNIT_ASSERT_MESSAGE(message,condition) \ -+ { bool __bLocalCondition = (condition); \ -+ CheckBoom((__bLocalCondition), (message)); \ -+ (::CppUnit::Asserter::failIf( !(__bLocalCondition), \ -+ (message), \ -+ CPPUNIT_SOURCELINE() ) ); } -+ -+#define CPPUNIT_ASSERT_STUB() \ -+ CheckBoom((1 == 0), ("This is only a stub.")); \ -+ (::CppUnit::Asserter::failStub("This is only a stub.", \ -+ CPPUNIT_SOURCELINE() ) ) -+ - - /** Fails with the specified message. - * \ingroup Assertions - * \param message Message reported in diagnostic. - */ - #define CPPUNIT_FAIL( message ) \ -- ( ::CppUnit::Asserter::fail( message, \ -- CPPUNIT_SOURCELINE() ) ) -+ ( ::CppUnit::Asserter::fail( message, \ -+ CPPUNIT_SOURCELINE() ) ) - - #ifdef CPPUNIT_ENABLE_SOURCELINE_DEPRECATED - /// Generalized macro for primitive value comparisons - #define CPPUNIT_ASSERT_EQUAL(expected,actual) \ -- ( ::CppUnit::TestAssert::assertEquals( (expected), \ -- (actual), \ -- __LINE__, __FILE__ ) ) -+ ( ::CppUnit::TestAssert::assertEquals( (expected), \ -+ (actual), \ -+ __LINE__, __FILE__ ) ) - #else - /** Asserts that two values are equals. - * \ingroup Assertions -@@ -173,9 +189,9 @@ - * removed by specializing the CppUnit::assertion_traits. - */ - #define CPPUNIT_ASSERT_EQUAL(expected,actual) \ -- ( ::CppUnit::TestAssert::assertEquals( (expected), \ -- (actual), \ -- CPPUNIT_SOURCELINE() ) ) -+ ( ::CppUnit::TestAssert::assertEquals( (expected), \ -+ (actual), \ -+ CPPUNIT_SOURCELINE() ) ) - - /** Asserts that two values are equals, provides additional messafe on failure. - * \ingroup Assertions -@@ -196,20 +212,20 @@ - * removed by specializing the CppUnit::assertion_traits. - */ - #define CPPUNIT_ASSERT_EQUAL_MESSAGE(message,expected,actual) \ -- ( ::CppUnit::TestAssert::assertEquals( (expected), \ -- (actual), \ -- CPPUNIT_SOURCELINE(), \ -- (message) ) ) -+ ( ::CppUnit::TestAssert::assertEquals( (expected), \ -+ (actual), \ -+ CPPUNIT_SOURCELINE(), \ -+ (message) ) ) - #endif - - /*! \brief Macro for primitive value comparisons - * \ingroup Assertions - */ - #define CPPUNIT_ASSERT_DOUBLES_EQUAL(expected,actual,delta) \ -- ( ::CppUnit::TestAssert::assertDoubleEquals( (expected), \ -- (actual), \ -- (delta), \ -- CPPUNIT_SOURCELINE() ) ) -+ ( ::CppUnit::TestAssert::assertDoubleEquals( (expected), \ -+ (actual), \ -+ (delta), \ -+ CPPUNIT_SOURCELINE() ) ) - - // Backwards compatibility - -@@ -223,7 +239,6 @@ - - #endif - -- - } // namespace CppUnit - - #endif // CPPUNIT_TESTASSERT_H ---- misc/cppunit-1.8.0/include/cppunit/TestCaller.h 2002-03-28 16:47:07.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/TestCaller.h 2009-09-12 14:15:35.171875000 +0200 -@@ -111,7 +111,7 @@ - * \param name name of this TestCaller - * \param test the method this TestCaller calls in runTest() - */ -- TestCaller( std::string name, TestMethod test ) : -+ TestCaller( std::string const& name, TestMethod test ) : - TestCase( name ), - m_ownFixture( true ), - m_fixture( new Fixture() ), -@@ -128,7 +128,7 @@ - * \param test the method this TestCaller calls in runTest() - * \param fixture the Fixture to invoke the test method on. - */ -- TestCaller(std::string name, TestMethod test, Fixture& fixture) : -+ TestCaller(std::string const& name, TestMethod test, Fixture& fixture) : - TestCase( name ), - m_ownFixture( false ), - m_fixture( &fixture ), -@@ -145,7 +145,7 @@ - * \param test the method this TestCaller calls in runTest() - * \param fixture the Fixture to invoke the test method on. - */ -- TestCaller(std::string name, TestMethod test, Fixture* fixture) : -+ TestCaller(std::string const& name, TestMethod test, Fixture* fixture) : - TestCase( name ), - m_ownFixture( true ), - m_fixture( fixture ), ---- misc/cppunit-1.8.0/include/cppunit/TestCase.h 2002-03-27 18:56:45.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/TestCase.h 2009-09-12 14:15:35.187500000 +0200 -@@ -3,15 +3,12 @@ - - #include <cppunit/Portability.h> - #include <cppunit/Test.h> --#include <cppunit/TestAssert.h> - #include <cppunit/TestFixture.h> - #include <string> - -- - namespace CppUnit { - --class TestResult; -- -+//# class TestResult; - - /*! \brief A single test object. - * -@@ -28,25 +25,25 @@ - { - public: - -- TestCase( std::string Name ); -+ TestCase( std::string const& Name ); - //! \internal - TestCase(); - ~TestCase(); - -- virtual void run(TestResult *result); -+ virtual void run(hTestResult pResult); - virtual int countTestCases() const; - std::string getName() const; - std::string toString() const; - - //! FIXME: what is this for? -- virtual TestResult *run(); -+ //# virtual TestResult *run(); - - protected: - //! FIXME: this should probably be pure virtual. - virtual void runTest(); - - //! Create TestResult for the run(void) method. -- TestResult *defaultResult(); -+ //# TestResult *defaultResult(); - - private: - TestCase( const TestCase &other ); ---- misc/cppunit-1.8.0/include/cppunit/TestFailure.h 2002-03-28 16:47:07.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/TestFailure.h 2009-09-12 14:15:35.187500000 +0200 -@@ -4,6 +4,16 @@ - #include <cppunit/Portability.h> - #include <string> - -+namespace ErrorType -+{ -+ enum num -+ { -+ ET_FAILURE = 1, -+ ET_ERROR = 2, -+ ET_SIGNAL = 4 -+ }; -+} -+ - namespace CppUnit { - - class Exception; -@@ -20,12 +30,13 @@ - * TestFailure assumes lifetime control for any exception - * passed to it. - */ -+ - class CPPUNIT_API TestFailure - { - public: - TestFailure( Test *failedTest, - Exception *thrownException, -- bool isError ); -+ ErrorType::num eError ); - - virtual ~TestFailure (); - -@@ -36,6 +47,7 @@ - virtual SourceLine sourceLine() const; - - virtual bool isError() const; -+ virtual ErrorType::num getErrorType() const; - - virtual std::string failedTestName() const; - -@@ -46,7 +58,7 @@ - protected: - Test *m_failedTest; - Exception *m_thrownException; -- bool m_isError; -+ ErrorType::num m_eError; - - private: - TestFailure( const TestFailure &other ); ---- misc/cppunit-1.8.0/include/cppunit/TestFixture.h 2002-03-28 16:47:07.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/TestFixture.h 2009-09-12 14:15:35.203125000 +0200 -@@ -74,11 +74,6 @@ - * } - * \endcode - * -- * A set of macros have been created for convenience. They are located in HelperMacros.h. -- * -- * \see TestResult, TestSuite, TestCaller, -- * \see CPPUNIT_TEST_SUB_SUITE, CPPUNIT_TEST, CPPUNIT_TEST_SUITE_END, -- * \see CPPUNIT_TEST_SUITE_REGISTRATION, CPPUNIT_TEST_EXCEPTION, CPPUNIT_TEST_FAIL. - */ - class CPPUNIT_API TestFixture - { ---- misc/cppunit-1.8.0/include/cppunit/TestSuite.h 2002-03-28 16:47:07.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/TestSuite.h 2009-09-12 14:15:35.218750000 +0200 -@@ -4,9 +4,11 @@ - #include <cppunit/Portability.h> - - #if CPPUNIT_NEED_DLL_DECL -+#ifdef _MSC_VER - #pragma warning( push ) - #pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z - #endif -+#endif - - #include <cppunit/Test.h> - #include <vector> -@@ -14,7 +16,7 @@ - - namespace CppUnit { - --class TestResult; -+//# class TestResult; - - #if CPPUNIT_NEED_DLL_DECL - template class CPPUNIT_API std::vector<Test *>; -@@ -35,7 +37,6 @@ - * Note that TestSuites assume lifetime - * control for any tests added to them. - * -- * TestSuites do not register themselves in the TestRegistry. - * \see Test - * \see TestCaller - */ -@@ -44,10 +45,10 @@ - class CPPUNIT_API TestSuite : public Test - { - public: -- TestSuite( std::string name = "" ); -+ TestSuite( std::string const& name = "" ); - ~TestSuite(); - -- void run( TestResult *result ); -+ void run( hTestResult pResult ); - int countTestCases() const; - std::string getName() const; - std::string toString() const; -@@ -71,7 +72,9 @@ - - - #if CPPUNIT_NEED_DLL_DECL -+#ifdef _MSC_VER - #pragma warning( pop ) - #endif -+#endif - - #endif // CPPUNIT_TESTSUITE_H ---- misc/cppunit-1.8.0/include/cppunit/callbackfunc_fktptr.h 2009-09-14 08:43:30.656250000 +0200 -+++ misc/build/cppunit-1.8.0/include/cppunit/callbackfunc_fktptr.h 2009-09-12 15:11:06.859375000 +0200 -@@ -1 +1,47 @@ --dummy -+/************************************************************************* -+ * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * Copyright 2000, 2010 Oracle and/or its affiliates -+ * -+ * OpenOffice.org - a multi-platform office productivity suite -+ * -+ * This file is part of OpenOffice.org. -+ * -+ * OpenOffice.org is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU Lesser General Public License version 3 -+ * only, as published by the Free Software Foundation. -+ * -+ * OpenOffice.org is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU Lesser General Public License version 3 for more details -+ * (a copy is included in the LICENSE file that accompanied this code). -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * version 3 along with OpenOffice.org. If not, see -+ * <http://www.openoffice.org/license.html> -+ * for a copy of the LGPLv3 License. -+ * -+ ************************************************************************/ -+ -+#ifndef _callbackfunc_fktptr_h -+#define _callbackfunc_fktptr_h -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+// these typedefs are used for the TestCase, to call the TestResult functions. -+// The TestResult is only in the testshl tool, not in the test libraries. -+ -+typedef void* hTest; -+typedef void* hException; -+ -+typedef long (* FktPtr_CallbackDispatch)(int x, ...); -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif ---- misc/cppunit-1.8.0/include/cppunit/config-auto.h 2009-09-12 15:20:48.250000000 +0200 -+++ misc/build/cppunit-1.8.0/include/cppunit/config-auto.h 2009-09-12 14:15:35.234375000 +0200 -@@ -1 +1,64 @@ --dummy -+#ifndef _INCLUDE_CPPUNIT_CONFIG_AUTO_H -+#define _INCLUDE_CPPUNIT_CONFIG_AUTO_H 1 -+ -+/* include/cppunit/config-auto.h. Generated automatically at end of configure. */ -+/* config/config.h. Generated automatically by configure. */ -+/* config/config.h.in. Generated automatically from configure.in by autoheader. */ -+ -+/* define if library uses std::string::compare(string,pos,n) */ -+#ifndef CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST -+#define CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST 1 -+#endif -+ -+/* define if the library defines sstream */ -+#ifndef CPPUNIT_HAVE_SSTREAM -+#define CPPUNIT_HAVE_SSTREAM 1 -+#endif -+ -+/* Define if you have the <cmath> header file. */ -+#ifndef CPPUNIT_HAVE_CMATH -+#define CPPUNIT_HAVE_CMATH 1 -+#endif -+ -+/* Define if you have the <dlfcn.h> header file. */ -+#ifndef CPPUNIT_HAVE_DLFCN_H -+#define CPPUNIT_HAVE_DLFCN_H 1 -+#endif -+ -+/* define to 1 if the compiler implements namespaces */ -+#ifndef CPPUNIT_HAVE_NAMESPACES -+#define CPPUNIT_HAVE_NAMESPACES 1 -+#endif -+ -+/* define if the compiler supports Run-Time Type Identification */ -+#ifndef CPPUNIT_HAVE_RTTI -+#define CPPUNIT_HAVE_RTTI 0 -+#endif -+ -+/* define if the compiler has stringstream */ -+#ifndef CPPUNIT_HAVE_SSTREAM -+#define CPPUNIT_HAVE_SSTREAM 1 -+#endif -+ -+/* Define if you have the <strstream> header file. */ -+#ifndef CPPUNIT_HAVE_STRSTREAM -+#define CPPUNIT_HAVE_STRSTREAM 1 -+#endif -+ -+/* Name of package */ -+#ifndef CPPUNIT_PACKAGE -+#define CPPUNIT_PACKAGE "cppunit" -+#endif -+ -+/* Define to 1 to use type_info::name() for class names */ -+#ifndef CPPUNIT_USE_TYPEINFO_NAME -+#define CPPUNIT_USE_TYPEINFO_NAME CPPUNIT_HAVE_RTTI -+#endif -+ -+/* Version number of package */ -+#ifndef CPPUNIT_VERSION -+#define CPPUNIT_VERSION "1.8.0" -+#endif -+ -+/* _INCLUDE_CPPUNIT_CONFIG_AUTO_H */ -+#endif ---- misc/cppunit-1.8.0/include/cppunit/config-msvc6.h 2002-03-25 19:41:39.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/config-msvc6.h 2009-09-12 14:15:35.250000000 +0200 -@@ -21,12 +21,10 @@ - #define CPPUNIT_HAVE_NAMESPACES 1 - #endif - --/* define if the compiler supports Run-Time Type Identification */ - #ifndef CPPUNIT_HAVE_RTTI --#define CPPUNIT_HAVE_RTTI 1 -+#define CPPUNIT_HAVE_RTTI 0 - #endif - --/* Define to 1 to use type_info::name() for class names */ - #ifndef CPPUNIT_USE_TYPEINFO_NAME - #define CPPUNIT_USE_TYPEINFO_NAME CPPUNIT_HAVE_RTTI - #endif ---- misc/cppunit-1.8.0/include/cppunit/extensions/AutoRegisterSuite.h 2002-03-28 16:47:07.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/extensions/AutoRegisterSuite.h 2009-09-12 14:15:35.265625000 +0200 -@@ -1,6 +1,7 @@ - #ifndef CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H - #define CPPUNIT_EXTENSIONS_AUTOREGISTERSUITE_H - -+#include <stdio.h> - #include <string> - #include <cppunit/extensions/TestSuiteFactory.h> - #include <cppunit/extensions/TestFactoryRegistry.h> -@@ -30,19 +31,20 @@ - /** Auto-register the suite factory in the global registry. - */ - AutoRegisterSuite() -- { -- TestFactory *factory = new TestSuiteFactory<TestCaseType>(); -- TestFactoryRegistry::getRegistry().registerFactory( factory ); -- } -- -+ { -+ TestFactory *factory = new TestSuiteFactory<TestCaseType>(); -+ TestFactoryRegistry::getRegistry().registerFactory( factory ); -+ } -+ - /** Auto-register the suite factory in the specified registry. - * \param name Name of the registry. - */ - AutoRegisterSuite( const std::string &name ) -- { -- TestFactory *factory = new TestSuiteFactory<TestCaseType>(); -- TestFactoryRegistry::getRegistry( name ).registerFactory( factory ); -- } -+ { -+ // printf("AutoRegisterSuite %s\n", name.c_str()); -+ TestFactory *factory = new TestSuiteFactory<TestCaseType>(); -+ TestFactoryRegistry::getRegistry( name ).registerFactory( factory ); -+ } - }; - - } // namespace CppUnit ---- misc/cppunit-1.8.0/include/cppunit/extensions/HelperMacros.h 2002-03-28 16:47:07.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/extensions/HelperMacros.h 2009-09-12 14:15:35.281250000 +0200 -@@ -132,6 +132,14 @@ - } \ - }; \ - public: \ -+ static CppUnit::TestSuite *suite() \ -+ { \ -+ CppUnit::TestSuiteBuilder<__ThisTestFixtureType> \ -+ builder __CPPUNIT_SUITE_CTOR_ARGS( ATestFixtureType ); \ -+ ThisTestFixtureFactory factory; \ -+ __ThisTestFixtureType::registerTests( builder.suite(), &factory ); \ -+ return builder.takeSuite(); \ -+ } \ - static void \ - registerTests( CppUnit::TestSuite *suite, \ - CppUnit::TestFixtureFactory *factory ) \ -@@ -245,14 +253,6 @@ - #define CPPUNIT_TEST_SUITE_END() \ - builder.takeSuite(); \ - } \ -- static CppUnit::TestSuite *suite() \ -- { \ -- CppUnit::TestSuiteBuilder<__ThisTestFixtureType> \ -- builder __CPPUNIT_SUITE_CTOR_ARGS( ATestFixtureType ); \ -- ThisTestFixtureFactory factory; \ -- __ThisTestFixtureType::registerTests( builder.suite(), &factory ); \ -- return builder.takeSuite(); \ -- } \ - private: /* dummy typedef so that the macro can still end with ';'*/ \ - typedef ThisTestFixtureFactory __ThisTestFixtureFactory - -@@ -283,10 +283,12 @@ - * \see CPPUNIT_TEST_SUITE, CppUnit::AutoRegisterSuite, - * CppUnit::TestFactoryRegistry. - */ --#define CPPUNIT_TEST_SUITE_REGISTRATION( ATestFixtureType ) \ -- static CppUnit::AutoRegisterSuite< ATestFixtureType > \ -- __CPPUNIT_MAKE_UNIQUE_NAME(__autoRegisterSuite ) - -+/* LLA: -+ #define CPPUNIT_TEST_SUITE_REGISTRATION( ATestFixtureType ) \ -+ static CppUnit::AutoRegisterSuite< ATestFixtureType > \ -+ __CPPUNIT_MAKE_UNIQUE_NAME(__autoRegisterSuite ) -+*/ - - /** Adds the specified fixture suite to the specified registry suite. - * \ingroup CreatingTestSuite -@@ -325,21 +327,7 @@ - */ - #define CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ATestFixtureType, suiteName ) \ - static CppUnit::AutoRegisterSuite< ATestFixtureType > \ -- __CPPUNIT_MAKE_UNIQUE_NAME(__autoRegisterSuite )(suiteName) -- -- --// Backwards compatibility --// (Not tested!) -- --#if CPPUNIT_ENABLE_CU_TEST_MACROS -- --#define CU_TEST_SUITE(tc) CPPUNIT_TEST_SUITE(tc) --#define CU_TEST_SUB_SUITE(tc,sc) CPPUNIT_TEST_SUB_SUITE(tc,sc) --#define CU_TEST(tm) CPPUNIT_TEST(tm) --#define CU_TEST_SUITE_END() CPPUNIT_TEST_SUITE_END() --#define CU_TEST_SUITE_REGISTRATION(tc) CPPUNIT_TEST_SUITE_REGISTRATION(tc) -- --#endif -+ __CPPUNIT_MAKE_UNIQUE_NAME(__autoRegisterSuite )( suiteName ) - - - #endif // CPPUNIT_EXTENSIONS_HELPERMACROS_H ---- misc/cppunit-1.8.0/include/cppunit/extensions/TestFactoryRegistry.h 2002-03-28 16:47:07.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/extensions/TestFactoryRegistry.h 2009-09-12 14:15:35.296875000 +0200 -@@ -4,13 +4,16 @@ - #include <cppunit/Portability.h> - - #if CPPUNIT_NEED_DLL_DECL -+#ifdef _MSC_VER - #pragma warning( push ) - #pragma warning( disable: 4251 ) // X needs to have dll-interface to be used by clients of class Z - #endif -+#endif - - #include <cppunit/extensions/TestFactory.h> - #include <map> - #include <string> -+#include <cppunit/Test.h> - - namespace CppUnit { - -@@ -79,7 +82,7 @@ - * \param name Name of the registry. It is the name of TestSuite returned by - * makeTest(). - */ -- TestFactoryRegistry( std::string name = "All Tests" ); -+ TestFactoryRegistry( std::string const& name = "All Tests" ); - - /// Destructor. - virtual ~TestFactoryRegistry(); -@@ -105,6 +108,7 @@ - * specified name. - */ - static TestFactoryRegistry &getRegistry( const std::string &name ); -+ static void testRegistries(hTestResult _pResult); - - /** Adds the registered tests to the specified suite. - * \param suite Suite the tests are added to. -@@ -116,9 +120,12 @@ - * \param factory Factory to register. - * \deprecated Use registerFactory( TestFactory *) instead. - */ -+protected: -+ - void registerFactory( const std::string &name, - TestFactory *factory ); -- -+public: -+ - /** Adds the specified TestFactory to the registry. - * - * \param factory Factory to register. -@@ -141,8 +148,10 @@ - - - #if CPPUNIT_NEED_DLL_DECL -+#ifdef _MSC_VER - #pragma warning( pop ) - #endif -+#endif - - - #endif // CPPUNIT_EXTENSIONS_TESTFACTORYREGISTRY_H ---- misc/cppunit-1.8.0/include/cppunit/extensions/TestSuiteBuilder.h 2002-03-28 16:47:07.000000000 +0100 -+++ misc/build/cppunit-1.8.0/include/cppunit/extensions/TestSuiteBuilder.h 2009-09-12 14:15:35.312500000 +0200 -@@ -34,11 +34,11 @@ - } - #endif - -- TestSuiteBuilder( TestSuite *suite ) : m_suite( suite ) -+ TestSuiteBuilder( TestSuite *_suite ) : m_suite( _suite ) - { - } - -- TestSuiteBuilder(std::string name) : m_suite( new TestSuite(name) ) -+ TestSuiteBuilder(std::string const& name) : m_suite( new TestSuite(name) ) - { - } - -@@ -57,7 +57,7 @@ - m_suite->addTest( test ); - } - -- void addTestCaller( std::string methodName, -+ void addTestCaller( std::string const& methodName, - TestMethod testMethod ) - { - Test *test = -@@ -66,7 +66,7 @@ - addTest( test ); - } - -- void addTestCaller( std::string methodName, -+ void addTestCaller( std::string const& methodName, - TestMethod testMethod, - Fixture *fixture ) - { -@@ -78,7 +78,7 @@ - } - - template<typename ExceptionType> -- void addTestCallerForException( std::string methodName, -+ void addTestCallerForException( std::string const& methodName, - TestMethod testMethod, - Fixture *fixture, - ExceptionType *dummyPointer ) -@@ -93,7 +93,8 @@ - - std::string makeTestName( const std::string &methodName ) - { -- return m_suite->getName() + "." + methodName; -+ // return m_suite->getName() + "." + methodName; -+ return methodName; - } - - private: ---- misc/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx 2009-09-14 08:43:30.703125000 +0200 -+++ misc/build/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx 2009-09-12 15:12:02.703125000 +0200 -@@ -1 +1,36 @@ --dummy -+/************************************************************************* -+ * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * Copyright 2000, 2010 Oracle and/or its affiliates. -+ * -+ * OpenOffice.org - a multi-platform office productivity suite -+ * -+ * This file is part of OpenOffice.org. -+ * -+ * OpenOffice.org is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU Lesser General Public License version 3 -+ * only, as published by the Free Software Foundation. -+ * -+ * OpenOffice.org is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU Lesser General Public License version 3 for more details -+ * (a copy is included in the LICENSE file that accompanied this code). -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * version 3 along with OpenOffice.org. If not, see -+ * <http://www.openoffice.org/license.html> -+ * for a copy of the LGPLv3 License. -+ * -+ ************************************************************************/ -+ -+#ifndef _externcallbackfunc_hxx -+#define _externcallbackfunc_hxx -+ -+#include <cppunit/callbackfunc_fktptr.h> -+ -+// these pointers have they origin in 'tresregister.cxx' -+extern FktPtr_CallbackDispatch pCallbackFunc; -+ -+#endif ---- misc/cppunit-1.8.0/include/cppunit/tagvalues.hxx 2009-09-14 08:43:30.609375000 +0200 -+++ misc/build/cppunit-1.8.0/include/cppunit/tagvalues.hxx 2009-09-12 15:14:27.812500000 +0200 -@@ -1 +1,91 @@ --dummy -+/************************************************************************* -+ * -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * Copyright 2000, 2010 Oracle and/or its affiliates. -+ * -+ * OpenOffice.org - a multi-platform office productivity suite -+ * -+ * This file is part of OpenOffice.org. -+ * -+ * OpenOffice.org is free software: you can redistribute it and/or modify -+ * it under the terms of the GNU Lesser General Public License version 3 -+ * only, as published by the Free Software Foundation. -+ * -+ * OpenOffice.org is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU Lesser General Public License version 3 for more details -+ * (a copy is included in the LICENSE file that accompanied this code). -+ * -+ * You should have received a copy of the GNU Lesser General Public License -+ * version 3 along with OpenOffice.org. If not, see -+ * <http://www.openoffice.org/license.html> -+ * for a copy of the LGPLv3 License. -+ * -+ ************************************************************************/ -+ -+#ifndef TAGVALUES_H -+#define TAGVALUES_H -+ -+typedef unsigned long Tag; -+ -+/* constants for Tag.ti_Tag, control tag values */ -+#define TAG_DONE (Tag(0L)) /* terminates array of TagItems. ti_Data unused */ -+#define TAG_END (Tag(0L)) /* synonym for TAG_DONE */ -+#define TAG_IGNORE (Tag(1L)) /* ignore this item, not end of array */ -+#define TAG_MORE (Tag(2L)) /* ti_Data is pointer to another array of TagItems -+ * note that this tag terminates the current array -+ */ -+#define TAG_SKIP (Tag(3L)) /* skip this and the next ti_Data items */ -+ -+/* differentiates user tags from control tags */ -+#define TAG_USER (Tag(1L<<31)) -+ -+ -+#define TAG_TYPE (Tag(TAG_USER | (0x01L))) -+ -+#define TAG_RESULT (TAG_USER | 0x100) -+ -+#define RESULT_START (Tag(TAG_RESULT | (0x02L))) -+#define TAG_RESULT_PTR (Tag(TAG_RESULT | (0x03L))) -+#define TAG_TEST_PTR (Tag(TAG_RESULT | (0x04L))) -+ -+#define RESULT_END (Tag(TAG_RESULT | (0x05L))) -+ -+#define RESULT_ADD_FAILURE (Tag(TAG_RESULT | (0x06L))) -+#define RESULT_ADD_ERROR (Tag(TAG_RESULT | (0x07L))) -+ -+#define TAG_EXCEPTION (Tag(TAG_RESULT | (0x08L))) -+ -+#define RESULT_ADD_INFO (Tag(TAG_RESULT | (0x09L))) -+#define TAG_INFO (Tag(TAG_RESULT | (0x0aL))) -+ -+#define RESULT_ENTER_NODE (Tag(TAG_RESULT | (0x0bL))) -+#define RESULT_LEAVE_NODE (Tag(TAG_RESULT | (0x0cL))) -+#define TAG_NODENAME (Tag(TAG_RESULT | (0x0dL))) -+ -+#define RESULT_SHOULD_STOP (Tag(TAG_RESULT | (0x0eL))) -+ -+ -+#define TAG_SIGNAL (TAG_USER | 0x200) -+// #define SIGNAL_CHECK (Tag(TAG_SIGNAL | (0x01L))) -+// #define INIT_SIGNAL_HANDLING (Tag(TAG_SIGNAL | (0x04L))) -+// #define RELEASE_SIGNAL_HANDLING (Tag(TAG_SIGNAL | (0x05L))) -+ -+#define SIGNAL_START_TEST (Tag(TAG_SIGNAL | (0x06L))) -+#define SIGNAL_END_TEST (Tag(TAG_SIGNAL | (0x07L))) -+ -+#define TAG_EXECUTION (TAG_USER | 0x400) -+#define EXECUTION_CHECK (Tag(TAG_EXECUTION | (0x01))) -+#define INIT_TEST (Tag(TAG_EXECUTION | (0x02))) -+#define RELEASE_TEST (Tag(TAG_EXECUTION | (0x03))) -+// #define EXECUTION_PUSH_NAME (Tag(TAG_EXECUTION | (0x04))) -+// #define EXECUTION_POP_NAME (Tag(TAG_EXECUTION | (0x05))) -+ -+#define DO_NOT_EXECUTE 666 -+#define GO_EXECUTE 1 -+ -+typedef long ReturnValue; -+ -+#endif ---- misc/cppunit-1.8.0/makefile.mk 2009-09-12 15:20:48.343750000 +0200 -+++ misc/build/cppunit-1.8.0/makefile.mk 2009-09-12 14:15:35.328125000 +0200 -@@ -1 +1,29 @@ --dummy -+#************************************************************************* -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# Copyright 2000, 2010 Oracle and/or its affiliates. -+# -+# OpenOffice.org - a multi-platform office productivity suite -+# -+# This file is part of OpenOffice.org. -+# -+# OpenOffice.org is free software: you can redistribute it and/or modify -+# it under the terms of the GNU Lesser General Public License version 3 -+# only, as published by the Free Software Foundation. -+# -+# OpenOffice.org is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU Lesser General Public License version 3 for more details -+# (a copy is included in the LICENSE file that accompanied this code). -+# -+# You should have received a copy of the GNU Lesser General Public License -+# version 3 along with OpenOffice.org. If not, see -+# <http://www.openoffice.org/license.html> -+# for a copy of the LGPLv3 License. -+# -+#************************************************************************* -+ -+target: -+ cd src && $(MAKE) $(MFLAGS) $(CALLMACROS) ---- misc/cppunit-1.8.0/src/cppunit/Asserter.cpp 2002-03-27 20:04:02.000000000 +0100 -+++ misc/build/cppunit-1.8.0/src/cppunit/Asserter.cpp 2009-09-12 14:15:35.343750000 +0200 -@@ -1,52 +1,72 @@ - #include <cppunit/Asserter.h> - #include <cppunit/NotEqualException.h> - -- - namespace CppUnit - { -- -+ - - namespace Asserter - { - -+void -+fail( std::string const& message, -+ SourceLine const& sourceLine ) -+{ -+ throw Exception( message, sourceLine ); -+} - - void --fail( std::string message, -- SourceLine sourceLine ) -+failStub( std::string const& message, -+ SourceLine const& sourceLine ) - { -- throw Exception( message, sourceLine ); -+ throw StubException( message, sourceLine ); - } - - - void - failIf( bool shouldFail, -- std::string message, -- SourceLine location ) -+ std::string const& message, -+ SourceLine const& location ) - { - if ( shouldFail ) -- fail( message, location ); -+ { -+ fail( message, location ); -+ } - } - -- -+// ----------------------------------------------------------------------------- - void --failNotEqual( std::string expected, -- std::string actual, -- SourceLine sourceLine, -- std::string additionalMessage ) -+failIf( bool shouldFail, -+ const char* _suMessage, -+ SourceLine const& location ) - { -- throw NotEqualException( expected, -- actual, -- sourceLine, -- additionalMessage ); -+ if ( shouldFail ) -+ { -+ std::string message( _suMessage ); -+ fail( message, location ); -+ } -+} -+// ----------------------------------------------------------------------------- -+ -+void -+failNotEqual( std::string const& expected, -+ std::string const& actual, -+ SourceLine const& sourceLine, -+ std::string const& additionalMessage ) -+{ -+ throw NotEqualException( expected, -+ actual, -+ sourceLine, -+ additionalMessage ); - } - - - void - failNotEqualIf( bool shouldFail, -- std::string expected, -- std::string actual, -- SourceLine sourceLine, -- std::string additionalMessage ) -+ std::string const& expected, -+ std::string const& actual, -+ SourceLine const& sourceLine, -+ std::string const& additionalMessage ) - { - if ( shouldFail ) - failNotEqual( expected, actual, sourceLine, additionalMessage ); ---- misc/cppunit-1.8.0/src/cppunit/Exception.cpp 2001-10-19 20:37:24.000000000 +0200 -+++ misc/build/cppunit-1.8.0/src/cppunit/Exception.cpp 2009-09-12 14:15:35.359375000 +0200 -@@ -19,20 +19,19 @@ - - /// Construct the exception - Exception::Exception( const Exception &other ) : -- std::exception( other ) --{ -- m_message = other.m_message; -- m_sourceLine = other.m_sourceLine; --} -+ std::exception( other ), -+ m_message( other.m_message), -+ m_sourceLine(other.m_sourceLine) -+{} - - - /*! - * \deprecated Use other constructor instead. - */ --Exception::Exception( std::string message, -- SourceLine sourceLine ) : -- m_message( message ), -- m_sourceLine( sourceLine ) -+Exception::Exception( std::string const& _message, -+ SourceLine const& _sourceLine ) : -+ m_message( _message ), -+ m_sourceLine( _sourceLine ) - { - } - -@@ -41,9 +40,9 @@ - /*! - * \deprecated Use other constructor instead. - */ --Exception::Exception( std::string message, -+Exception::Exception( std::string const& message, - long lineNumber, -- std::string fileName ) : -+ std::string const& fileName ) : - m_message( message ), - m_sourceLine( fileName, lineNumber ) - { ---- misc/cppunit-1.8.0/src/cppunit/NotEqualException.cpp 2001-10-06 00:27:14.000000000 +0200 -+++ misc/build/cppunit-1.8.0/src/cppunit/NotEqualException.cpp 2009-09-12 14:15:35.359375000 +0200 -@@ -3,17 +3,17 @@ - namespace CppUnit { - - --NotEqualException::NotEqualException( std::string expected, -- std::string actual, -- SourceLine sourceLine , -- std::string additionalMessage ) : -- Exception( "Expected: " + expected + -- ", but was: " + actual + -- "." + additionalMessage , -- sourceLine), -- m_expected( expected ), -- m_actual( actual ), -- m_additionalMessage( additionalMessage ) -+NotEqualException::NotEqualException( std::string const& _expected, -+ std::string const& _actual, -+ SourceLine const& _sourceLine , -+ std::string const& _additionalMessage ) : -+ Exception( "Expected: " + _expected + -+ ", but was: " + _actual + -+ "." + _additionalMessage , -+ _sourceLine), -+ m_expected( _expected ), -+ m_actual( _actual ), -+ m_additionalMessage( _additionalMessage ) - { - } - -@@ -22,10 +22,10 @@ - /*! - * \deprecated Use other constructor instead. - */ --NotEqualException::NotEqualException( std::string expected, -- std::string actual, -+NotEqualException::NotEqualException( std::string const& expected, -+ std::string const& actual, - long lineNumber, -- std::string fileName ) : -+ std::string const& fileName ) : - Exception( "Expected: " + expected + ", but was: " + actual, - lineNumber, - fileName ), ---- misc/cppunit-1.8.0/src/cppunit/SourceLine.cpp 2001-10-06 00:27:14.000000000 +0200 -+++ misc/build/cppunit-1.8.0/src/cppunit/SourceLine.cpp 2009-09-12 14:15:35.375000000 +0200 -@@ -10,10 +10,10 @@ - } - - --SourceLine::SourceLine( const std::string &fileName, -- int lineNumber ) : -- m_fileName( fileName ), -- m_lineNumber( lineNumber ) -+SourceLine::SourceLine( const std::string &file, -+ int line ) : -+ m_fileName( file ), -+ m_lineNumber( line ) - { - } - ---- misc/cppunit-1.8.0/src/cppunit/TestAssert.cpp 2001-10-07 21:36:47.000000000 +0200 -+++ misc/build/cppunit-1.8.0/src/cppunit/TestAssert.cpp 2009-09-12 14:15:35.390625000 +0200 -@@ -1,4 +1,4 @@ --#if HAVE_CMATH -+#ifdef HAVE_CMATH - # include <cmath> - #else - # include <math.h> -@@ -15,56 +15,56 @@ - /// Check for a failed general assertion - void - TestAssert::assertImplementation( bool condition, -- std::string conditionExpression, -- long lineNumber, -- std::string fileName ) -+ std::string conditionExpression, -+ long lineNumber, -+ std::string fileName ) - { - Asserter::failIf( condition, -- conditionExpression, -- SourceLine( fileName, lineNumber ) ); -+ conditionExpression, -+ SourceLine( fileName, lineNumber ) ); - } - - - /// Reports failed equality - void - TestAssert::assertNotEqualImplementation( std::string expected, -- std::string actual, -- long lineNumber, -- std::string fileName ) -+ std::string actual, -+ long lineNumber, -+ std::string fileName ) - { - Asserter::failNotEqual( expected, -- actual, -- SouceLine( fileName, lineNumber ), "" ); -+ actual, -+ SouceLine( fileName, lineNumber ), "" ); - } - - - /// Check for a failed equality assertion - void - TestAssert::assertEquals( double expected, -- double actual, -- double delta, -- long lineNumber, -- std::string fileName ) -+ double actual, -+ double delta, -+ long lineNumber, -+ std::string fileName ) - { - if (fabs (expected - actual) > delta) -- assertNotEqualImplementation( assertion_traits<double>::toString(expected), -- assertion_traits<double>::toString(actual), -- lineNumber, -- fileName ); -+ assertNotEqualImplementation( assertion_traits<double>::toString(expected), -+ assertion_traits<double>::toString(actual), -+ lineNumber, -+ fileName ); - } - - #else // CPPUNIT_ENABLE_SOURCELINE_DEPRECATED - - void - TestAssert::assertDoubleEquals( double expected, -- double actual, -- double delta, -- SourceLine sourceLine ) -+ double actual, -+ double delta, -+ SourceLine sourceLine ) - { - Asserter::failNotEqualIf( fabs( expected - actual ) > delta, -- assertion_traits<double>::toString(expected), -- assertion_traits<double>::toString(actual), -- sourceLine ); -+ assertion_traits<double>::toString(expected), -+ assertion_traits<double>::toString(actual), -+ sourceLine ); - } - - ---- misc/cppunit-1.8.0/src/cppunit/TestCase.cpp 2002-03-25 23:35:34.000000000 +0100 -+++ misc/build/cppunit-1.8.0/src/cppunit/TestCase.cpp 2009-09-12 15:14:46.515625000 +0200 -@@ -1,74 +1,142 @@ -+#include <stdlib.h> - #include <cppunit/Portability.h> - #include <typeinfo> - #include <stdexcept> - - #include "cppunit/TestCase.h" - #include "cppunit/Exception.h" --#include "cppunit/TestResult.h" -- -+#include "cppunit/tagvalues.hxx" -+#include "cppunit/externcallbackfunc.hxx" - - namespace CppUnit { - - /// Create a default TestResult --CppUnit::TestResult* --TestCase::defaultResult() --{ -- return new TestResult; --} -- -- --/// Run the test and catch any exceptions that are triggered by it --void --TestCase::run( TestResult *result ) --{ -- result->startTest(this); -- -- try { -- setUp(); -- -- try { -- runTest(); -- } -- catch ( Exception &e ) { -- Exception *copy = e.clone(); -- result->addFailure( this, copy ); -- } -- catch ( std::exception &e ) { -- result->addError( this, new Exception( e.what() ) ); -- } -- catch (...) { -- Exception *e = new Exception( "caught unknown exception" ); -- result->addError( this, e ); -- } -- -- try { -- tearDown(); -- } -- catch (...) { -- result->addError( this, new Exception( "tearDown() failed" ) ); -- } -- } -- catch (...) { -- result->addError( this, new Exception( "setUp() failed" ) ); -- } -- -- result->endTest( this ); --} -- -- --/// A default run method --TestResult * --TestCase::run() --{ -- TestResult *result = defaultResult(); -- -- run (result); -- return result; --} -+//# CppUnit::TestResult* -+//# TestCase::defaultResult() -+//# { -+//# return new TestResult; -+//# } -+ -+ -+/// Run the test and catch any exceptions that are triggered by it -+//# void -+//# TestCase::run( TestResult *result ) -+//# { -+//# result->startTest(this); -+//# -+//# try { -+//# setUp(); -+//# -+//# try { -+//# runTest(); -+//# } -+//# catch ( Exception &e ) { -+//# Exception *copy = e.clone(); -+//# result->addFailure( this, copy ); -+//# } -+//# catch ( std::exception &e ) { -+//# result->addError( this, new Exception( e.what() ) ); -+//# } -+//# catch (...) { -+//# Exception *e = new Exception( "caught unknown exception" ); -+//# result->addError( this, e ); -+//# } -+//# -+//# try { -+//# tearDown(); -+//# } -+//# catch (...) { -+//# result->addError( this, new Exception( "tearDown() failed" ) ); -+//# } -+//# } -+//# catch (...) { -+//# result->addError( this, new Exception( "setUp() failed" ) ); -+//# } -+//# -+//# result->endTest( this ); -+//# } -+//# -+ -+void -+TestCase::run( hTestResult result ) -+{ -+ CppUnit::Test* pTest = this; -+ -+ // if (signalCheck(pTest->getName()) == HAS_SIGNAL) -+ long nValue = (pCallbackFunc)(0 /* NULL */, TAG_TYPE, EXECUTION_CHECK, TAG_RESULT_PTR, result, TAG_NODENAME, pTest->getName().c_str(), TAG_DONE); -+ if (nValue == DO_NOT_EXECUTE) -+ { -+ return; -+ } -+ -+ // (pTestResult_StartTest)(result, pTest); -+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_START, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_DONE); -+ -+ try -+ { -+ setUp(); -+ -+ try -+ { -+ runTest(); -+ // (pTestResult_AddInfo)(result, pTest, "PASSED"); -+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_INFO, "PASSED", TAG_DONE); -+ } -+ catch ( CppUnit::StubException &) -+ { -+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ADD_INFO, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_INFO, "STUB", TAG_DONE ); -+ } -+ catch ( CppUnit::Exception &e ) -+ { -+ CppUnit::Exception *copy = e.clone(); -+ // (pTestResult_AddFailure)( result, pTest, copy ); -+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ADD_FAILURE, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, copy, TAG_DONE ); -+ } -+ catch ( std::exception &e ) -+ { -+ // (pTestResult_AddError)( result, pTest, new Exception( e.what() ) ); -+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( e.what() ), TAG_DONE ); -+ } -+ catch (...) -+ { -+ CppUnit::Exception *e = new CppUnit::Exception( "caught unknown exception" ); -+ // (pTestResult_AddError)( result, pTest, e ); -+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, e, TAG_DONE ); -+ } -+ -+ try -+ { -+ tearDown(); -+ } -+ catch (...) -+ { -+ // (pTestResult_AddError)( result, pTest, new Exception( "tearDown() failed" ) ); -+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( "tearDown() failed" ), TAG_DONE ); -+ } -+ } -+ catch (...) -+ { -+ // (pTestResult_AddError)( result, pTest, new Exception( "setUp() failed" ) ); -+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_ADD_ERROR, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_EXCEPTION, new CppUnit::Exception( "setUp() failed" ), TAG_DONE ); -+ } -+ -+ // (pTestResult_EndTest)( result, pTest ); -+ (pCallbackFunc)( 0 /* NULL */, TAG_TYPE, RESULT_END, TAG_RESULT_PTR, result, TAG_TEST_PTR, pTest, TAG_DONE ); -+} -+ -+/// A default run method -+//# TestResult * -+//# TestCase::run() -+//# { -+//# TestResult *result = defaultResult(); -+//# -+//# run (result); -+//# return result; -+//# } - - --/// All the work for runTest is deferred to subclasses --void -+/// All the work for runTest is deferred to subclasses -+void - TestCase::runTest() - { - } -@@ -77,7 +145,7 @@ - /** Constructs a test case. - * \param name the name of the TestCase. - **/ --TestCase::TestCase( std::string name ) -+TestCase::TestCase( std::string const& name ) - : m_name(name) - { - } -@@ -100,25 +168,25 @@ - - - /// Returns a count of all the tests executed --int -+int - TestCase::countTestCases() const --{ -- return 1; -+{ -+ return 1; - } - - - /// Returns the name of the test case --std::string -+std::string - TestCase::getName() const --{ -- return m_name; -+{ -+ return m_name; - } - - - /// Returns the name of the test case instance --std::string -+std::string - TestCase::toString() const --{ -+{ - std::string className; - - #if CPPUNIT_USE_TYPEINFO_NAME -@@ -128,8 +196,13 @@ - className = "TestCase"; - #endif - -- return className + "." + getName(); -+ return className + "." + getName(); - } -- -+ - - } // namespace CppUnit -+ -+// The following sets variables for GNU EMACS -+// Local Variables: -+// tab-width:4 -+// End: ---- misc/cppunit-1.8.0/src/cppunit/TestFactoryRegistry.cpp 2002-03-28 16:47:08.000000000 +0100 -+++ misc/build/cppunit-1.8.0/src/cppunit/TestFactoryRegistry.cpp 2009-09-12 15:17:54.093750000 +0200 -@@ -1,12 +1,19 @@ -+#include <stdio.h> -+#include <stdlib.h> - #include <cppunit/extensions/TestFactoryRegistry.h> - #include <cppunit/TestSuite.h> --#include <set> - -+#include <set> -+#include <sstream> - - #if CPPUNIT_USE_TYPEINFO_NAME - # include "cppunit/extensions/TypeInfoHelper.h" - #endif - -+#include <cppunit/externcallbackfunc.hxx> -+#include <cppunit/tagvalues.hxx> -+ -+#undef HELLOWORLD_DEBUGGER - - namespace CppUnit { - -@@ -26,15 +33,18 @@ - - static NamedRegistries &getInstance(); - -- TestFactoryRegistry &getRegistry( std::string name ); -+ TestFactoryRegistry &getRegistry( std::string const& name ); - - void wasDestroyed( TestFactory *factory ); - - bool needDestroy( TestFactory *factory ); - -+ void testRegistries( hTestResult ); - private: -- typedef std::map<std::string, TestFactoryRegistry *> Registries; -- Registries m_registries; -+ typedef std::map<std::string, TestFactoryRegistry *> MapRegistries; -+ // typedef std::pair<std::string, TestFactoryRegistry *> StringTestFactoryRegistry; -+ // typedef std::vector< StringTestFactoryRegistry > MapRegistries; -+ MapRegistries m_registries; - - typedef std::set<TestFactory *> Factories; - Factories m_factoriesToDestroy; -@@ -44,13 +54,27 @@ - - NamedRegistries::~NamedRegistries() - { -- Registries::iterator it = m_registries.begin(); -- while ( it != m_registries.end() ) -- { -- TestFactoryRegistry *registry = (it++)->second; -- if ( needDestroy( registry ) ) -- delete registry; -- } -+#ifdef HELLOWORLD_DEBUGGER -+ printf("~NamedRegistries.\n"); -+#endif -+ MapRegistries::iterator it = m_registries.begin(); -+ while ( it != m_registries.end() ) -+ { -+ TestFactoryRegistry *registry = (it++)->second; -+ if ( needDestroy( registry ) ) -+ delete registry; -+ } -+/* -+ for (MapRegistries::iterator it = m_registries.begin(); -+ it != m_registries.end(); -+ ++it) -+ { -+ StringTestFactoryRegistry stfr = *it; -+ TestFactoryRegistry *registry = stfr.second; -+ if ( needDestroy( registry ) ) -+ delete registry; -+ } -+*/ - } - - -@@ -63,17 +87,55 @@ - - - TestFactoryRegistry & --NamedRegistries::getRegistry( std::string name ) -+NamedRegistries::getRegistry( std::string const& name ) - { -- Registries::const_iterator foundIt = m_registries.find( name ); -- if ( foundIt == m_registries.end() ) -+#ifdef HELLOWORLD_DEBUGGER -+ printf("getRegistry '%s', ", name.c_str()); -+#endif -+ MapRegistries::const_iterator foundIt = m_registries.find( name ); -+ if ( foundIt == m_registries.end() ) -+ { -+ TestFactoryRegistry *factory = new TestFactoryRegistry( name ); -+ // m_registries.insert( std::make_pair( name, factory ) ); -+ m_registries[name] = factory; -+ m_factoriesToDestroy.insert( factory ); -+ -+#ifdef HELLOWORLD_DEBUGGER -+ printf("factory not found, create.\n"); -+#endif -+ return *factory; -+ } -+#ifdef HELLOWORLD_DEBUGGER -+ printf("factory found.\n"); -+#endif -+ return *foundIt->second; -+/* -+ // MapRegistries::const_iterator foundIt; -+ TestFactoryRegistry *pFound = NULL; -+ for (MapRegistries::const_iterator it = m_registries.begin(); -+ it != m_registries.end(); -+ ++it) -+ { -+ StringTestFactoryRegistry stfr = *it; -+ if (name == stfr.first) -+ { -+ pFound = stfr.second; -+ break; -+ } -+ } -+ -+ // MapRegistries::const_iterator foundIt = m_registries.find( name ); -+ if ( pFound != NULL ) - { - TestFactoryRegistry *factory = new TestFactoryRegistry( name ); -- m_registries.insert( std::make_pair( name, factory ) ); -+ // m_registries.insert( std::make_pair( name, factory ) ); -+ StringTestFactoryRegistry stfr = std::make_pair(name, factory); -+ m_registries.push_back(stfr); - m_factoriesToDestroy.insert( factory ); - return *factory; - } -- return *foundIt->second; -+ return *pFound; -+*/ - } - - -@@ -91,9 +153,32 @@ - return m_destroyedFactories.count( factory ) == 0; - } - -+void NamedRegistries::testRegistries( hTestResult _pResult) -+{ -+ // initialise the test handling -+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, INIT_TEST, TAG_RESULT_PTR, _pResult, TAG_DONE); -+ -+ // Start signal based Check -+ for (MapRegistries::const_iterator it = m_registries.begin(); -+ it != m_registries.end(); -+ ++it) -+ { -+ std::string sName = (*it).first; -+ -+ CppUnit::Test* tp = CppUnit::TestFactoryRegistry::getRegistry(sName).makeTest(); -+ tp->run(_pResult); -+ } - -+ // release test handling -+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RELEASE_TEST, TAG_RESULT_PTR, _pResult, TAG_DONE); -+ // start normal based tests, leave signal signed tests out. - --TestFactoryRegistry::TestFactoryRegistry( std::string name ) : -+ //! Allfunction in the inclusion list which has a flag, not found, has to call here. -+} -+ -+// ----------------------------------------------------------------------------- -+ -+TestFactoryRegistry::TestFactoryRegistry( std::string const& name ) : - m_name( name ) - { - } -@@ -116,26 +201,38 @@ - } - } - -- -+// static - TestFactoryRegistry & - TestFactoryRegistry::getRegistry() - { - return getRegistry( "All Tests" ); - } - -- -+// static - TestFactoryRegistry & - TestFactoryRegistry::getRegistry( const std::string &name ) - { - return NamedRegistries::getInstance().getRegistry( name ); - } - -+// static -+void TestFactoryRegistry::testRegistries( hTestResult _pResult ) -+{ -+ NamedRegistries::getInstance().testRegistries( _pResult ); -+} -+ - - void - TestFactoryRegistry::registerFactory( const std::string &name, - TestFactory *factory ) - { -- m_factories[name] = factory; -+#ifdef HELLOWORLD_DEBUGGER -+ printf("registerFactory %s\n", name.c_str()); -+#endif -+ m_factories[name] = factory; -+#ifdef HELLOWORLD_DEBUGGER -+ printf("FactorySize: %d\n ", m_factories.size()); -+#endif - } - - -@@ -144,10 +241,23 @@ - { - static int serialNumber = 1; - -- OStringStream ost; -- ost << "@Dummy@" << serialNumber++; -- -- registerFactory( ost.str(), factory ); -+ std::string aStr("@Dummy@_"); -+ -+ char cBuf[20]; -+ char *pBuf = cBuf; -+ sprintf(pBuf, "%d", serialNumber++ ); -+ -+ aStr += std::string(pBuf); -+ -+ // LLA: this does not work within Solaris, could be a problem of the osl::Module::load? -+ // std::ostringstream ost; -+ // ost << "@Dummy@" << nValue; -+ // registerFactory( ost.str(), factory ); -+ -+#ifdef HELLOWORLD_DEBUGGER -+ printf("aStr: %s\n", aStr.c_str()); -+#endif -+ registerFactory( aStr, factory ); - } - - -@@ -163,6 +273,9 @@ - void - TestFactoryRegistry::addTestToSuite( TestSuite *suite ) - { -+#ifdef HELLOWORLD_DEBUGGER -+ printf("addTestToSuite %s\n", suite->getName().c_str()); -+#endif - for ( Factories::iterator it = m_factories.begin(); - it != m_factories.end(); - ++it ) ---- misc/cppunit-1.8.0/src/cppunit/TestFailure.cpp 2002-02-28 11:57:20.000000000 +0100 -+++ misc/build/cppunit-1.8.0/src/cppunit/TestFailure.cpp 2009-09-12 14:15:35.437500000 +0200 -@@ -5,12 +5,12 @@ - namespace CppUnit { - - /// Constructs a TestFailure with the given test and exception. --TestFailure::TestFailure( Test *failedTest, -- Exception *thrownException, -- bool isError ) : -- m_failedTest( failedTest ), -- m_thrownException( thrownException ), -- m_isError( isError ) -+TestFailure::TestFailure( Test *failed, -+ Exception *_thrownException, -+ ErrorType::num eError ) : -+ m_failedTest( failed ), -+ m_thrownException( _thrownException ), -+ m_eError( eError ) - { - } - -@@ -45,10 +45,19 @@ - - - /// Indicates if the failure is a failed assertion or an error. --bool -+bool - TestFailure::isError() const - { -- return m_isError; -+ if (m_eError == ErrorType::ET_ERROR || -+ m_eError == ErrorType::ET_SIGNAL) -+ return true; -+ return false; -+} -+ -+ErrorType::num -+TestFailure::getErrorType() const -+{ -+ return m_eError; - } - - -@@ -71,7 +80,7 @@ - TestFailure * - TestFailure::clone() const - { -- return new TestFailure( m_failedTest, m_thrownException->clone(), m_isError ); -+ return new TestFailure( m_failedTest, m_thrownException->clone(), m_eError ); - } - - } // namespace CppUnit ---- misc/cppunit-1.8.0/src/cppunit/TestSuite.cpp 2002-03-24 20:39:55.000000000 +0100 -+++ misc/build/cppunit-1.8.0/src/cppunit/TestSuite.cpp 2009-09-12 15:16:07.265625000 +0200 -@@ -1,11 +1,13 @@ -+#include <stdlib.h> - #include "cppunit/TestSuite.h" --#include "cppunit/TestResult.h" -+#include "cppunit/tagvalues.hxx" -+#include "cppunit/externcallbackfunc.hxx" - - namespace CppUnit { - - /// Default constructor --TestSuite::TestSuite( std::string name ) -- : m_name( name ) -+TestSuite::TestSuite( std::string const& name ) -+ : m_name( name ) - { - } - -@@ -13,7 +15,7 @@ - /// Destructor - TestSuite::~TestSuite() - { -- deleteContents(); -+ deleteContents(); - } - - -@@ -21,28 +23,37 @@ - void - TestSuite::deleteContents() - { -- for ( std::vector<Test *>::iterator it = m_tests.begin(); -- it != m_tests.end(); -- ++it) -- delete *it; -- m_tests.clear(); -+ for ( std::vector<Test *>::iterator it = m_tests.begin(); -+ it != m_tests.end(); -+ ++it) -+ delete *it; -+ m_tests.clear(); - } - - - /// Runs the tests and collects their result in a TestResult. -+ - void --TestSuite::run( TestResult *result ) -+TestSuite::run( hTestResult result ) - { -- for ( std::vector<Test *>::iterator it = m_tests.begin(); -- it != m_tests.end(); -- ++it ) -- { -- if ( result->shouldStop() ) -- break; -- -- Test *test = *it; -- test->run( result ); -- } -+ // (pTestResult_EnterNode)(result, getName().c_str()); -+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_ENTER_NODE, TAG_RESULT_PTR, result, TAG_NODENAME, getName().c_str(), TAG_DONE); -+ for ( std::vector<Test *>::const_iterator it = getTests().begin(); -+ it != getTests().end(); -+ ++it ) -+ { -+ //# if ( result->shouldStop() ) -+ //# break; -+ // if ( pTestResult_ShouldStop(result) ) -+ if ( (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_SHOULD_STOP, TAG_RESULT_PTR, result, TAG_DONE) ) -+ { -+ break; -+ } -+ Test *test = *it; -+ test->run( result ); -+ } -+ // (pTestResult_LeaveNode)(result, getName().c_str()); -+ (pCallbackFunc)(0 /* NULL */, TAG_TYPE, RESULT_LEAVE_NODE, TAG_RESULT_PTR, result, TAG_NODENAME, getName().c_str(), TAG_DONE); - } - - -@@ -50,14 +61,14 @@ - int - TestSuite::countTestCases() const - { -- int count = 0; -- -- for ( std::vector<Test *>::const_iterator it = m_tests.begin(); -- it != m_tests.end(); -- ++it ) -- count += (*it)->countTestCases(); -- -- return count; -+ int count = 0; -+ -+ for ( std::vector<Test *>::const_iterator it = m_tests.begin(); -+ it != m_tests.end(); -+ ++it ) -+ count += (*it)->countTestCases(); -+ -+ return count; - } - - -@@ -65,7 +76,7 @@ - void - TestSuite::addTest( Test *test ) - { -- m_tests.push_back( test ); -+ m_tests.push_back( test ); - } - - -@@ -73,7 +84,7 @@ - std::string - TestSuite::toString() const - { -- return "suite " + getName(); -+ return "suite " + getName(); - } - - -@@ -81,16 +92,20 @@ - std::string - TestSuite::getName() const - { -- return m_name; -+ return m_name; - } - - - const std::vector<Test *> & - TestSuite::getTests() const - { -- return m_tests; -+ return m_tests; - } - - - } // namespace CppUnit - -+// The following sets variables for GNU EMACS -+// Local Variables: -+// tab-width:4 -+// End: ---- misc/cppunit-1.8.0/src/cppunit/makefile.mk 2009-09-12 15:20:48.515625000 +0200 -+++ misc/build/cppunit-1.8.0/src/cppunit/makefile.mk 2009-09-12 14:15:35.468750000 +0200 -@@ -1 +1,86 @@ --dummy -+#************************************************************************* -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# Copyright 2000, 2010 Oracle and/or its affiliates. -+# -+# OpenOffice.org - a multi-platform office productivity suite -+# -+# This file is part of OpenOffice.org. -+# -+# OpenOffice.org is free software: you can redistribute it and/or modify -+# it under the terms of the GNU Lesser General Public License version 3 -+# only, as published by the Free Software Foundation. -+# -+# OpenOffice.org is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU Lesser General Public License version 3 for more details -+# (a copy is included in the LICENSE file that accompanied this code). -+# -+# You should have received a copy of the GNU Lesser General Public License -+# version 3 along with OpenOffice.org. If not, see -+# <http://www.openoffice.org/license.html> -+# for a copy of the LGPLv3 License. -+# -+#************************************************************************* -+ -+PRJ=..$/..$/..$/..$/..$/.. -+INCEXT=..$/..$/include -+ -+PRJNAME=cppunit -+TARGET=cppunit -+LIBTARGET=NO -+ENABLE_EXCEPTIONS=TRUE -+# ENABLE_RTTI=TRUE -+ -+# --- Settings ----------------------------------------------------- -+ -+.INCLUDE : settings.mk -+ -+# --- Files -------------------------------------------------------- -+ -+# CXXFILES = \ -+# querytemplate.cxx \ -+# stringhelper.cxx -+ -+# ENVCFLAGSCXX+=-DCPPUNIT_BUILD_DLL -+ -+CPPUNIT_TESTSHL_SLOFILES = \ -+ $(SLO)$/SourceLine.obj \ -+ $(SLO)$/Exception.obj \ -+ $(SLO)$/NotEqualException.obj \ -+ $(SLO)$/TestFailure.obj -+ -+CPPUNIT_STATIC_SOLFILES = \ -+ $(SLO)$/Asserter.obj \ -+ $(SLO)$/TestCase.obj \ -+ $(SLO)$/TestSuite.obj \ -+ $(SLO)$/TestAssert.obj \ -+ $(SLO)$/TestFactoryRegistry.obj -+ -+ -+SLOFILES = \ -+ $(CPPUNIT_TESTSHL_SLOFILES) \ -+ $(CPPUNIT_STATIC_SOLFILES) -+#------------------------------------------------------------------------------- -+# This is statically cppunit library -+LIB1TARGET= $(LB)$/$(TARGET).lib -+LIB1OBJFILES= \ -+ $(SLOFILES) -+ -+.IF "$(GUI)"=="WNT" -+.IF "$(COM)"=="GCC" -+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a -+.ENDIF -+#LIB1FILES=$(LB)$/c5t_winstuff.lib -+.ENDIF -+ -+.IF "$(GUI)" == "UNX" -+LIB1ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a -+.ENDIF -+ -+# --- Targets ------------------------------------------------------ -+ -+.INCLUDE : target.mk -+ ---- misc/cppunit-1.8.0/src/makefile.mk 2009-09-12 15:20:48.421875000 +0200 -+++ misc/build/cppunit-1.8.0/src/makefile.mk 2009-09-12 14:15:35.484375000 +0200 -@@ -1 +1,29 @@ --dummy -+#************************************************************************* -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# Copyright 2000, 2010 Oracle and/or its affiliates. -+# -+# OpenOffice.org - a multi-platform office productivity suite -+# -+# This file is part of OpenOffice.org. -+# -+# OpenOffice.org is free software: you can redistribute it and/or modify -+# it under the terms of the GNU Lesser General Public License version 3 -+# only, as published by the Free Software Foundation. -+# -+# OpenOffice.org is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU Lesser General Public License version 3 for more details -+# (a copy is included in the LICENSE file that accompanied this code). -+# -+# You should have received a copy of the GNU Lesser General Public License -+# version 3 along with OpenOffice.org. If not, see -+# <http://www.openoffice.org/license.html> -+# for a copy of the LGPLv3 License. -+# -+#************************************************************************* -+ -+target: -+ cd cppunit && $(MAKE) $(MFLAGS) $(CALLMACROS) diff --git a/cppunit/ldflags.patch b/cppunit/ldflags.patch new file mode 100644 index 000000000000..cecd69a4b5ee --- /dev/null +++ b/cppunit/ldflags.patch @@ -0,0 +1,10 @@ +--- misc/cppunit-1.12.1/src/cppunit/Makefile.am Wed Feb 20 06:36:38 2008 ++++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.am Mon May 3 17:00:41 2010 +@@ -63,5 +63,6 @@ + + libcppunit_la_LDFLAGS= \ + -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +- -release $(LT_RELEASE) ++ -release $(LT_RELEASE) \ ++ @LIBADD_DL@ + diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 7fb183f1ebc2..5ef6499726e5 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -1,7 +1,6 @@ #************************************************************************* -# # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -22,42 +21,134 @@ # version 3 along with OpenOffice.org. If not, see # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. -# -#************************************************************************* +#***********************************************************************/ -PRJ=. +PRJ = . +PRJNAME = cppunit +TARGET = cppunit -PRJNAME=so_cppunit -TARGET=so_cppunit +.INCLUDE: settings.mk -# --- Settings ----------------------------------------------------- +TARFILE_NAME = cppunit-1.12.1 +TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19 + # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/ + # cppunit-1.12.1.tar.gz/download> -.INCLUDE : settings.mk +PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch + # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail& + # aid=2912590&group_id=11795&atid=311795> + # warnings.patch: see <https://sourceforge.net/tracker/?func=detail& + # aid=2912630&group_id=11795&atid=311795> -# --- Files -------------------------------------------------------- +.IF "$(OS)" == "WNT" && "$(COM)" == "MSC" -TARFILE_NAME=cppunit-1.8.0 +# On Windows, CppUnit appears to support either the Unix-style configure/make +# approach with cygwin and gcc (and libtool fails miserably if gcc is replaced +# by MSVC cl), or a Visual Studio project (CppUnitLibraries.dsw). However, the +# latter is too old to work with vcbuild from a wntmsci12 tool chain. So, the +# easiest way appears to inject hand-crafted dmake makefiles to build the +# relevant parts. (Another approach would be to manually use the Visual Studio +# IDE to convert CppUnitLibraries.dsw to modern format, inject the resulting +# cppunit_dll.vcproj and DllPlugInTester.vcproj and build those with vcbuild.) -ADDITIONAL_FILES=\ - include$/cppunit$/config-auto.h \ - include$/cppunit$/tagvalues.hxx \ - include$/cppunit$/callbackfunc_fktptr.h \ - include$/cppunit$/externcallbackfunc.hxx \ - makefile.mk \ - src$/makefile.mk \ - src$/cppunit$/makefile.mk +CONFIGURE_ACTION = $(SED) -e s:@BACKPATH@:../$(BACK_PATH): \ + < ../$(BACK_PATH)$(PATH_IN_MODULE)/ooo-cppunit_dll.mk \ + > src/cppunit/ooo-cppunit_dll.mk && \ + $(SED) -e s:@BACKPATH@:../$(BACK_PATH): \ + < ../$(BACK_PATH)$(PATH_IN_MODULE)/ooo-DllPlugInTester.mk \ + > src/DllPlugInTester/ooo-DllPlugInTester.mk -PATCH_FILES=cppunit-1.8.0-r1.patch +BUILD_ACTION = cd src/cppunit && dmake -f ooo-cppunit_dll.mk && \ + cd ../DllPlugInTester && dmake -f ooo-DllPlugInTester.mk -# CONFIGURE_DIR= -# CONFIGURE_ACTION= -# -# BUILD_DIR= -BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) +OUTDIR2INC = include/cppunit + +.INCLUDE: set_ext.mk +.INCLUDE: target.mk +.INCLUDE: tg_ext.mk + +$(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk + +.ELSE + +.IF "$(USE_SYSTEM_STL)" != "YES" + +OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl +.IF "$(USE_STLP_DEBUG)" == "TRUE" +OOO_STLPORT_CXXFLAGS += -D_STLP_DEBUG +.END +.IF "$(COM)" == "GCC" +OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) +.END + +OOO_STLPORT_LDFLAGS = -L$(SOLARLIBDIR) +OOO_STLPORT_LIBS = $(LIBSTLPORT) + +# When "checking for C compiler default output file name" configure +# unfortunately uses "$CC $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS" to build +# a C program that links against $(LIBSTLPORT); at least on one unxlngi6 +# machine, this has been observed to fail with "/lib/libm.so.6: undefined +# reference to `_rtld_global_ro@GLIBC_PRIVATE'" unless -lm is also specified: +.IF "$(OS)" == "LINUX" && "$(COM)" == "GCC" && "$(CPU)" == "I" +OOO_STLPORT_LIBS += -lm +# #i112124# furthermore, STLPort seems to require libstdc++ +OOO_STLPORT_LIBS += -lstdc++ +.END + +# And later, when "checking whether the C compiler works" configure tries to +# execute that program; however, the program would fail to locate the STLport +# library (another work-around might be to add something like --as-needed around +# $(LIBSTLPORT)): +.IF "$(OS)" == "FREEBSD" || "$(OS)" == "LINUX" || "$(OS)" == "SOLARIS" +.IF "$(LD_LIBRARY_PATH)" == "" +LD_LIBRARY_PATH := $(SOLARLIBDIR) + # strictly speaking, this is incorrect if the LD_LIBRARY_PATH environment + # variable is set to the empty string +.ELSE +LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(SOLARLIBDIR) +.END +.EXPORT: LD_LIBRARY_PATH +.END + +.END + +# At least on Solaris with Sun CC, linking the cppunit dynamic library fails as +# TestAssert.o uses fabs but -lm is missing from the command line (cppunit's +# aclocal.m4 contains an unused AC_CHECK_LIBM, maybe using that would be a +# better fix): +.IF "$(OS)" == "SOLARIS" && "$(COM)" == "C52" +MY_LIBS = -lm +.END + +CONFIGURE_ACTION = ./configure +CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ + pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \ + --disable-dependency-tracking --disable-static --disable-doxygen \ + --disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \ + CXXFLAGS='$(EXTRA_CFLAGS) $(OOO_STLPORT_CXXFLAGS)' \ + LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \ + LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)' + +BUILD_ACTION = $(GNUMAKE) +BUILD_FLAGS = install + +OUTDIR2INC = ooo-install/include/cppunit -# --- Targets ------------------------------------------------------ +.IF "$(OS)" == "WNT" +OUT2BIN = ooo-install/bin/DllPlugInTester.exe \ + ooo-install/bin/cygcppunit-1-12-1.dll +.ELSE +OUT2BIN = ooo-install/bin/DllPlugInTester +.IF "$(OS)" == "MACOSX" +OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib +EXTRPATH = NONE +.ELSE +OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1 +.END +.END -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk +.INCLUDE: set_ext.mk +.INCLUDE: target.mk +.INCLUDE: tg_ext.mk +.END diff --git a/fondu/makefile.mk b/cppunit/ooo-DllPlugInTester.mk index b684461e0e34..1c8c8a0a167b 100644 --- a/fondu/makefile.mk +++ b/cppunit/ooo-DllPlugInTester.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -23,47 +23,28 @@ # <http://www.openoffice.org/license.html> # for a copy of the LGPLv3 License. # -#************************************************************************* - -PRJ=. - -PRJNAME=fondu -TARGET=fondu - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -TARFILE_NAME=fondu_src-051010 - -.IF "$(OS)"!="MACOSX" || "$(GUIBASE)"=="aqua" -dummy: - @echo "Nothing to build for OS $(OS)" -.ENDIF # "$(OS)"!="MACOSX" || "$(GUIBASE)"=="aqua" - -CONFIGURE_DIR=. - -#relative to CONFIGURE_DIR -CONFIGURE_ACTION=configure - -CONFIGURE_FLAGS= - -BUILD_DIR=$(CONFIGURE_DIR) - -BUILD_ACTION=$(GNUMAKE) fondu +#***********************************************************************/ -OUT2BIN=$(BUILD_DIR)$/fondu +PRJ = @BACKPATH@../.. +PRJNAME = cppunit +TARGET = DllPlugInTester -# --- Targets ------------------------------------------------------ +ENABLE_EXCEPTIONS = TRUE +nodep = TRUE -# contains some necessary variables. +.INCLUDE: settings.mk -.INCLUDE : set_ext.mk +CDEFS += -DCPPUNIT_DLL +CFLAGSCXX += -I../../include +UWINAPILIB = -.INCLUDE : target.mk +OBJFILES = $(APP1OBJS) -# contains the "magic" to create targets out of the set variables. +APP1OBJS = \ + $(OBJ)/CommandLineParser.obj \ + $(OBJ)/DllPlugInTester.obj +APP1RPATH = NONE +APP1STDLIBS = icppunit_dll.lib +APP1TARGET = DllPlugInTester_dll -.INCLUDE : tg_ext.mk +.INCLUDE: target.mk diff --git a/cppunit/ooo-cppunit_dll.mk b/cppunit/ooo-cppunit_dll.mk new file mode 100644 index 000000000000..048a51e90926 --- /dev/null +++ b/cppunit/ooo-cppunit_dll.mk @@ -0,0 +1,100 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#***********************************************************************/ + +PRJ = @BACKPATH@../.. +PRJNAME = cppunit +TARGET = cppunit_dll + +ENABLE_EXCEPTIONS = TRUE +EXTERNAL_WARNINGS_NOT_ERRORS = TRUE +nodep = TRUE + +.INCLUDE: settings.mk + +CDEFS += -DCPPUNIT_BUILD_DLL +CFLAGSCXX += -I../../include +UWINAPILIB = + +SLOFILES = $(SHL1OBJS) + +SHL1IMPLIB = i$(SHL1TARGET) +SHL1OBJS = \ + $(SLO)/AdditionalMessage.obj \ + $(SLO)/Asserter.obj \ + $(SLO)/BeosDynamicLibraryManager.obj \ + $(SLO)/BriefTestProgressListener.obj \ + $(SLO)/CompilerOutputter.obj \ + $(SLO)/DefaultProtector.obj \ + $(SLO)/DllMain.obj \ + $(SLO)/DynamicLibraryManager.obj \ + $(SLO)/DynamicLibraryManagerException.obj \ + $(SLO)/Exception.obj \ + $(SLO)/Message.obj \ + $(SLO)/PlugInManager.obj \ + $(SLO)/PlugInParameters.obj \ + $(SLO)/Protector.obj \ + $(SLO)/ProtectorChain.obj \ + $(SLO)/RepeatedTest.obj \ + $(SLO)/SourceLine.obj \ + $(SLO)/StringTools.obj \ + $(SLO)/SynchronizedObject.obj \ + $(SLO)/Test.obj \ + $(SLO)/TestAssert.obj \ + $(SLO)/TestCase.obj \ + $(SLO)/TestCaseDecorator.obj \ + $(SLO)/TestComposite.obj \ + $(SLO)/TestDecorator.obj \ + $(SLO)/TestFactoryRegistry.obj \ + $(SLO)/TestFailure.obj \ + $(SLO)/TestLeaf.obj \ + $(SLO)/TestNamer.obj \ + $(SLO)/TestPath.obj \ + $(SLO)/TestPlugInDefaultImpl.obj \ + $(SLO)/TestResult.obj \ + $(SLO)/TestResultCollector.obj \ + $(SLO)/TestRunner.obj \ + $(SLO)/TestSetUp.obj \ + $(SLO)/TestSuccessListener.obj \ + $(SLO)/TestSuite.obj \ + $(SLO)/TestSuiteBuilderContext.obj \ + $(SLO)/TextOutputter.obj \ + $(SLO)/TextTestProgressListener.obj \ + $(SLO)/TextTestResult.obj \ + $(SLO)/TextTestRunner.obj \ + $(SLO)/TypeInfoHelper.obj \ + $(SLO)/UnixDynamicLibraryManager.obj \ + $(SLO)/Win32DynamicLibraryManager.obj \ + $(SLO)/XmlDocument.obj \ + $(SLO)/XmlElement.obj \ + $(SLO)/XmlOutputter.obj \ + $(SLO)/XmlOutputterHook.obj +SHL1RPATH = NONE +SHL1TARGET = cppunit_dll +SHL1USE_EXPORTS = name +DEF1NAME = $(SHL1TARGET) + +.INCLUDE: target.mk diff --git a/cppunit/prj/build.lst b/cppunit/prj/build.lst index f2587dd4c624..9bfcb57f9e89 100644 --- a/cppunit/prj/build.lst +++ b/cppunit/prj/build.lst @@ -1,3 +1,2 @@ -c5t cppunit : soltools stlport NULL -c5t cppunit usr1 - all c5t_mkout NULL -c5t cppunit nmake - all c5t_make NULL +c5t cppunit : stlport NULL +c5t cppunit nmake - all cppunit NULL diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst index ff580704f9a4..6ecac46bfb90 100644 --- a/cppunit/prj/d.lst +++ b/cppunit/prj/d.lst @@ -1,10 +1,29 @@ -mkdir: %_DEST%/inc%_EXT%/cppunit -mkdir: %_DEST%/inc%_EXT%/cppunit/extensions +mkdir: %_DEST%\inc%_EXT%\cppunit +..\%__SRC%\inc\cppunit\*.h %_DEST%\inc%_EXT%\cppunit\*.h +mkdir: %_DEST%\inc%_EXT%\cppunit\config +..\%__SRC%\inc\cppunit\config\*.h %_DEST%\inc%_EXT%\cppunit\config\*.h +mkdir: %_DEST%\inc%_EXT%\cppunit\extensions +..\%__SRC%\inc\cppunit\extensions\*.h %_DEST%\inc%_EXT%\cppunit\extensions\*.h +mkdir: %_DEST%\inc%_EXT%\cppunit\plugin +..\%__SRC%\inc\cppunit\plugin\*.h %_DEST%\inc%_EXT%\cppunit\plugin\*.h +mkdir: %_DEST%\inc%_EXT%\cppunit\portability +..\%__SRC%\inc\cppunit\portability\*.h %_DEST%\inc%_EXT%\cppunit\portability\*.h +mkdir: %_DEST%\inc%_EXT%\cppunit\tools +..\%__SRC%\inc\cppunit\tools\*.h %_DEST%\inc%_EXT%\cppunit\tools\*.h +mkdir: %_DEST%\inc%_EXT%\cppunit\ui\text +..\%__SRC%\inc\cppunit\ui\text\*.h %_DEST%\inc%_EXT%\cppunit\ui\text\*.h -../%__SRC%/misc/build/cppunit-1.8.0/include/cppunit/*.h %_DEST%/inc%_EXT%/cppunit/*.h -../%__SRC%/misc/build/cppunit-1.8.0/include/cppunit/*.hxx %_DEST%/inc%_EXT%/cppunit/*.hxx -../%__SRC%/misc/build/cppunit-1.8.0/include/cppunit/extensions/*.h %_DEST%/inc%_EXT%/cppunit/extensions/*.h +..\%__SRC%\bin\cppunit_dll.dll %_DEST%\bin%_EXT%\cppunit_dll.dll +..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib%_EXT%\icppunit_dll.lib -../%__SRC%/lib/cppunit.lib %_DEST%/lib%_EXT%/cppunit.lib -../%__SRC%/lib/*.a %_DEST%/lib%_EXT%/*.a +..\%__SRC%\bin\cygcppunit-1-12-1.dll %_DEST%\bin%_EXT%\cygcppunit-1-12-1.dll +..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib +symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit.dylib + +..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 +symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit.so + +..\%__SRC%\bin\DllPlugInTester %_DEST%\bin%_EXT%\DllPlugInTester +..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin%_EXT%\DllPlugInTester.exe +..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin%_EXT%\DllPlugInTester_dll.exe diff --git a/cppunit/solarisfinite.patch b/cppunit/solarisfinite.patch new file mode 100644 index 000000000000..0c15cdcb77a7 --- /dev/null +++ b/cppunit/solarisfinite.patch @@ -0,0 +1,14 @@ +--- misc/cppunit-1.12.1/include/cppunit/portability/FloatingPoint.h Mon Mar 5 04:16:42 2007 ++++ misc/build/cppunit-1.12.1/include/cppunit/portability/FloatingPoint.h Thu Dec 3 16:34:23 2009 +@@ -3,6 +3,11 @@ + + #include <cppunit/Portability.h> + #include <math.h> ++ ++#if defined(__sun) && !defined(CPPUNIT_HAVE_ISFINITE) && defined(CPPUNIT_HAVE_FINITE) ++#include <ieeefp.h> ++ // <math.h> is still needed for usage of fabs in TestAssert.cpp ++#endif + + CPPUNIT_NS_BEGIN + diff --git a/cppunit/warnings.patch b/cppunit/warnings.patch new file mode 100644 index 000000000000..39e804aff7f0 --- /dev/null +++ b/cppunit/warnings.patch @@ -0,0 +1,22 @@ +--- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2007-01-12 05:54:34.000000000 +0100 ++++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2009-12-02 15:33:29.639857272 +0100 +@@ -151,9 +151,7 @@ + #include <windows.h> + #endif + #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ +- BOOL APIENTRY DllMain( HANDLE hModule, \ +- DWORD ul_reason_for_call, \ +- LPVOID lpReserved ) \ ++ BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID ) \ + { \ + return TRUE; \ + } \ +@@ -162,7 +160,7 @@ + // Unix + #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER) + #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ +- int main( int argc, char *argv[] ) \ ++ int main( int, char *[] ) \ + { \ + return 0; \ + } \ diff --git a/cppunit/windows.patch b/cppunit/windows.patch new file mode 100644 index 000000000000..da346924ea44 --- /dev/null +++ b/cppunit/windows.patch @@ -0,0 +1,12 @@ +--- misc/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:25.084658287 +0100 ++++ misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2010-01-11 14:42:18.660706180 +0100 +@@ -149,6 +149,9 @@ + #define NOMINMAX + #define BLENDFUNCTION void // for mingw & gcc + #include <windows.h> ++#if defined(OPTIONAL) // set within windows.h ++#undef OPTIONAL ++#endif + #endif + #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \ + BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID ) \ diff --git a/epm/makefile.mk b/epm/makefile.mk index 9cf767911ab5..a33f6077b925 100644 --- a/epm/makefile.mk +++ b/epm/makefile.mk @@ -37,6 +37,7 @@ TARGET=epm # --- Files -------------------------------------------------------- TARFILE_NAME=epm-3.7 +TARFILE_MD5=3ade8cfe7e59ca8e65052644fed9fca4 PATCH_FILES=epm-3.7.patch .IF "$(GUI)"=="UNX" && "$(BUILD_EPM)" != "NO" diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk index 067a4844df90..cf4516515a67 100644 --- a/external/glibc/makefile.mk +++ b/external/glibc/makefile.mk @@ -37,6 +37,7 @@ TARGET=getopt # --- Files -------------------------------------------------------- TARFILE_NAME=glibc-2.1.3-stub +TARFILE_MD5=4a660ce8466c9df01f19036435425c3a TARFILE_ROOTDIR=glibc-2.1.3 ADDITIONAL_FILES=posix$/makefile.mk posix$/config.h posix$/readdir_r.c diff --git a/fondu/prj/build.lst b/fondu/prj/build.lst deleted file mode 100644 index d99a2c230c02..000000000000 --- a/fondu/prj/build.lst +++ /dev/null @@ -1,2 +0,0 @@ -fd fondu : solenv NULL -fd fondu nmake - u fd_fondu NULL diff --git a/fondu/prj/d.lst b/fondu/prj/d.lst deleted file mode 100644 index d68d83e80b74..000000000000 --- a/fondu/prj/d.lst +++ /dev/null @@ -1,2 +0,0 @@ -mkdir: %_DEST%\inc%_EXT%\fondu -..\%__SRC%\bin\fondu %_DEST%\bin%_EXT%\fondu diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index 0aea6c3e2b79..6b3166aad4c5 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -45,6 +45,7 @@ ANT_BUILDFILE=build$/build.xml # --- Files -------------------------------------------------------- TARFILE_NAME=hsqldb_$(HSQLDB_VERSION) +TARFILE_MD5=17410483b5b5f267aa18b7e00b65e6e0 TARFILE_ROOTDIR=hsqldb diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk index dea814e50447..f1aa3806a17c 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -37,6 +37,7 @@ TARGET=hyphen # --- Files -------------------------------------------------------- TARFILE_NAME=hyphen-2.4 +TARFILE_MD5=d0b5af6e408b8d2958f3d83b5244f5e8 ADDITIONAL_FILES += makefile.mk @@ -73,7 +74,7 @@ BUILD_ACTION=make hyph_en_US.dic @all: echo "Nothing to do here." .ELSE -BUILD_ACTION=make +BUILD_ACTION=make && make check OUT2INC += hyphen.h .ENDIF diff --git a/icc/makefile.mk b/icc/makefile.mk index bdf9f1326085..87ebf3aeb577 100644 --- a/icc/makefile.mk +++ b/icc/makefile.mk @@ -37,6 +37,7 @@ TARGET=icc # --- Files -------------------------------------------------------- TARFILE_NAME=SampleICC-1.3.2 +TARFILE_MD5=fdb27bfe2dbe2e7b57ae194d9bf36bab PATCH_FILES=$(TARFILE_NAME).patch CONVERTFILES= \ diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk index 5ac18a9402c2..01a2a6eadc36 100644 --- a/libtextcat/makefile.mk +++ b/libtextcat/makefile.mk @@ -37,6 +37,7 @@ TARGET=libtextcat # --- Files -------------------------------------------------------- TARFILE_NAME=libtextcat-2.2 +TARFILE_MD5=128cfc86ed5953e57fe0f5ae98b62c2e TARFILE_ROOTDIR=libtextcat-2.2 PATCH_FILES=libtextcat-2.2.patch diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk index a4f6b689e450..abca6ff60019 100644 --- a/libwpd/makefile.mk +++ b/libwpd/makefile.mk @@ -42,6 +42,7 @@ TARGET=wpd .ENDIF TARFILE_NAME=libwpd-0.8.8 +TARFILE_MD5=cd5997284f4ba1e8dde5d1e5869fc342 PATCH_FILES=$(TARFILE_NAME).diff BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 98cc871ec15d..211a5376a688 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -42,23 +42,25 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE # --- Files -------------------------------------------------------- -XMLSEC1VERSION=1.2.12 +XMLSEC1VERSION=1.2.14 TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION) +TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f -#xmlsec1-configure.patch: Set up the build. Straightforward -#configuration +#xmlsec1-configure.patch: Set up the build. Straightforward configuration +#xmlsec1-olderlibxml2.patch: Allow build against older libxml2, for macosx +#xmlsec1-nssdisablecallbacks.patch: Disable use of smime3 so don't need to package it #xmlsec1-customkeymanage.patch: Could we do this alternatively outside xmlsec #xmlsec1-nssmangleciphers.patch: Dubious, do we still need this ? -#xmlsec1-nssdisablecallbacks.patch: Dubious, do we still need this ? #xmlsec1-noverify.patch: As per readme.txt. #xmlsec1-mingw32.patch: Mingw32 support. #xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw PATCH_FILES=\ xmlsec1-configure.patch \ + xmlsec1-olderlibxml2.patch \ + xmlsec1-nssdisablecallbacks.patch \ xmlsec1-customkeymanage.patch \ xmlsec1-nssmangleciphers.patch \ - xmlsec1-nssdisablecallbacks.patch \ xmlsec1-noverify.patch \ xmlsec1-mingw32.patch \ xmlsec1-mingw-keymgr-mscrypto.patch \ @@ -96,7 +98,7 @@ xmlsec_LIBS+=-lstdc++_s .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump" +CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozilla_ver=1.7.5 --enable-mscrypto --disable-crypto-dl --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xmlsec_CC)" CFLAGS="-D_MT" LDFLAGS="-no-undefined -L$(ILIB:s/;/ -L/)" LIBS="$(xmlsec_LIBS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB) OBJDUMP="$(WRAPCMD) objdump" .IF "$(SYSTEM_MOZILLA)" != "YES" CONFIGURE_FLAGS+=--enable-pkgconfig=no @@ -152,7 +154,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS) .ENDIF CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)" -CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" +CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)" # system-mozilla needs pkgconfig to get the information about nss # FIXME: This also will enable pkg-config usage for libxml2. It *seems* # that the internal headers still are used when they are there but.... diff --git a/libxmlsec/readme.txt b/libxmlsec/readme.txt index b518c6222687..55c6976f51f3 100644 --- a/libxmlsec/readme.txt +++ b/libxmlsec/readme.txt @@ -22,7 +22,7 @@ for details. There is a flag XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS that can be set in a xmlSecKeyInfoCtx (see function xmlSecNssKeyDataX509XmlRead, in file -src/nss/x509.c), which indicates that one can turn of the validation. However, +src/nss/x509.c), which indicates that one can turn off the validation. However, setting it will cause that the validation key is not found. If the flag is set, then the key is not extracted from the certificate store which contains all the certificates of the X509Data elements. In other words, the certificates which diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch index d804c2729076..943ac98bf687 100644 --- a/libxmlsec/xmlsec1-configure.patch +++ b/libxmlsec/xmlsec1-configure.patch @@ -1,24 +1,449 @@ ---- misc/xmlsec1-1.2.12/Makefile.in 2009-06-25 22:53:34.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/Makefile.in 2009-10-01 10:32:48.708515261 +0200 -@@ -340,8 +340,9 @@ - target_alias = @target_alias@ +--- misc/xmlsec1-1.2.14/Makefile.in 2009-06-25 22:53:34.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/Makefile.in 2009-10-01 10:32:48.708515261 +0200 +@@ -341,8 +341,9 @@ + top_srcdir = @top_srcdir@ NULL = SAFE_VERSION = @XMLSEC_VERSION_SAFE@ -SUBDIRS = include src apps man docs --TEST_APP = apps/xmlsec1 +-TEST_APP = apps/xmlsec1$(EXEEXT) +#Do not build xmlsec1 app. It is not needed. Also the libtool includes +#a -L/path_to_lib_dir which may contain an incompatible lixbml2. +SUBDIRS = include src man docs DEFAULT_CRYPTO = @XMLSEC_CRYPTO@ bin_SCRIPTS = xmlsec1-config pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@ ---- misc/xmlsec1-1.2.12/configure 2009-06-25 22:53:35.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/configure 2009-10-01 10:28:50.980389049 +0200 -@@ -24769,7 +24769,11 @@ +--- misc/xmlsec1-1.2.14/configure 2009-06-25 22:53:35.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/configure 2009-10-01 10:28:50.980389049 +0200 +@@ -1,12 +1,14 @@ + #! /bin/sh + # Guess values for system-dependent variables and create Makefiles. +-# Generated by GNU Autoconf 2.64 for xmlsec1 1.2.14. ++# Generated by GNU Autoconf 2.65 for xmlsec1 1.2.14. + # + # Report bugs to <http://www.aleksey.com/xmlsec>. + # ++# + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software +-# Foundation, Inc. ++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, ++# Inc. ++# + # + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. +@@ -676,7 +678,8 @@ + + + +-exec 7<&0 </dev/null 6>&1 ++test -n "$DJDIR" || exec 7<&0 </dev/null ++exec 6>&1 + + # Name of the host. + # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +@@ -1749,7 +1752,7 @@ + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a + nonstandard directory <lib dir> + LIBS libraries to pass to the linker, e.g. -l<library> +- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if ++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if + you have headers in a nonstandard directory <include dir> + CPP C preprocessor + PKG_CONFIG path to pkg-config utility +@@ -1837,7 +1840,7 @@ + if $ac_init_version; then + cat <<\_ACEOF + xmlsec1 configure 1.2.14 +-generated by GNU Autoconf 2.64 ++generated by GNU Autoconf 2.65 + + Copyright (C) 2009 Free Software Foundation, Inc. + This configure script is free software; the Free Software Foundation +@@ -1884,7 +1887,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_compile + +@@ -1921,7 +1924,7 @@ + ac_retval=1 + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_cpp + +@@ -1963,7 +1966,7 @@ + fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_run + +@@ -2009,7 +2012,7 @@ + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_try_link + +@@ -2378,7 +2381,7 @@ + + fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} +- return $ac_retval ++ as_fn_set_status $ac_retval + + } # ac_fn_c_compute_int + cat >config.log <<_ACEOF +@@ -2386,7 +2389,7 @@ + running configure, to aid debugging if configure makes a mistake. + + It was created by xmlsec1 $as_me 1.2.14, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + $ $0 $@ + +@@ -2639,7 +2642,7 @@ + for ac_site_file in "$ac_site_file1" "$ac_site_file2" + do + test "x$ac_site_file" = xNONE && continue +- if test -r "$ac_site_file"; then ++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 + $as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 +@@ -2648,9 +2651,9 @@ + done + + if test -r "$cache_file"; then +- # Some versions of bash will fail to source /dev/null (special +- # files actually), so we avoid doing that. +- if test -f "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special files ++ # actually), so we avoid doing that. DJGPP emulates it as a regular file. ++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 + $as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in +@@ -3160,6 +3163,7 @@ + + fi + ++ test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else +@@ -3167,7 +3171,6 @@ + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. +- test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi + fi +@@ -3753,32 +3756,30 @@ + ... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 +- rm -f conftest.er1 conftest.err + fi ++ rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + done + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <stdio.h> ++ + int + main () + { +-FILE *f = fopen ("conftest.out", "w"); +- return ferror (f) || fclose (f) != 0; + + ; + return 0; + } + _ACEOF + ac_clean_files_save=$ac_clean_files +-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" ++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" + # Try to create an executable without -o first, disregard a.out. + # It will help us diagnose broken compilers, and finding out an intuition + # of exeext. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +-$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 ++$as_echo_n "checking whether the C compiler works... " >&6; } + ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + + # The possible output files: +@@ -3840,10 +3841,10 @@ + else + ac_file='' + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +-$as_echo "$ac_file" >&6; } + if test -z "$ac_file"; then : +- $as_echo "$as_me: failed program was:" >&5 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++$as_echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +@@ -3851,51 +3852,18 @@ + { as_fn_set_status 77 + as_fn_error "C compiler cannot create executables + See \`config.log' for more details." "$LINENO" 5; }; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 ++$as_echo_n "checking for C compiler default output file name... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 ++$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext + +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +-$as_echo_n "checking whether the C compiler works... " >&6; } +-# If not cross compiling, check that we can run a simple program. +-if test "$cross_compiling" != yes; then +- if { ac_try='./$ac_file' +- { { case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +-$as_echo "$ac_try_echo"; } >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then +- cross_compiling=no +- else +- if test "$cross_compiling" = maybe; then +- cross_compiling=yes +- else +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "cannot run C compiled programs. +-If you meant to cross compile, use \`--host'. +-See \`config.log' for more details." "$LINENO" 5; } +- fi +- fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out ++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out + ac_clean_files=$ac_clean_files_save +-# Check that the compiler produces executables we can run. If not, either +-# the compiler is broken, or we cross compile. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +-$as_echo_n "checking whether we are cross compiling... " >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +-$as_echo "$cross_compiling" >&6; } +- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 + $as_echo_n "checking for suffix of executables... " >&6; } + if { { ac_try="$ac_link" +@@ -3928,13 +3896,72 @@ + as_fn_error "cannot compute suffix of executables: cannot compile and link + See \`config.log' for more details." "$LINENO" 5; } + fi +-rm -f conftest$ac_cv_exeext ++rm -f conftest conftest$ac_cv_exeext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 + $as_echo "$ac_cv_exeext" >&6; } + + rm -f conftest.$ac_ext + EXEEXT=$ac_cv_exeext + ac_exeext=$EXEEXT ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <stdio.h> ++int ++main () ++{ ++FILE *f = fopen ("conftest.out", "w"); ++ return ferror (f) || fclose (f) != 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files="$ac_clean_files conftest.out" ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 ++$as_echo_n "checking whether we are cross compiling... " >&6; } ++if test "$cross_compiling" != yes; then ++ { { ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; } ++ if { ac_try='./conftest$ac_cv_exeext' ++ { { case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" ++$as_echo "$ac_try_echo"; } >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." "$LINENO" 5; } ++ fi ++ fi ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 ++$as_echo "$cross_compiling" >&6; } ++ ++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ++ac_clean_files=$ac_clean_files_save + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 + $as_echo_n "checking for suffix of object files... " >&6; } + if test "${ac_cv_objext+set}" = set; then : +@@ -5249,13 +5276,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:5252: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:5279: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:5255: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:5282: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:5258: output\"" >&5) ++ (eval echo "\"\$as_me:5285: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -6460,7 +6487,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 6463 "configure"' > conftest.$ac_ext ++ echo '#line 6490 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -7736,11 +7763,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7739: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7766: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7743: \$? = $ac_status" >&5 ++ echo "$as_me:7770: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8075,11 +8102,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8078: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8105: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8082: \$? = $ac_status" >&5 ++ echo "$as_me:8109: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8180,11 +8207,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8183: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8210: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8187: \$? = $ac_status" >&5 ++ echo "$as_me:8214: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -8235,11 +8262,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8238: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8265: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8242: \$? = $ac_status" >&5 ++ echo "$as_me:8269: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -10618,7 +10645,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10621 "configure" ++#line 10648 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -10714,7 +10741,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 10717 "configure" ++#line 10744 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11804,8 +11831,12 @@ + fi fi - LIBXML_MIN_VERSION="2.6.12" --LIBXML_CONFIG="xml2-config" +-LIBXML_MIN_VERSION="2.7.4" + LIBXML_CONFIG="xml2-config" +if test -f "$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" ; then + LIBXML_CONFIG="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" +else @@ -27,7 +452,7 @@ LIBXML_CFLAGS="" LIBXML_LIBS="" LIBXML_FOUND="no" -@@ -25678,12 +25682,26 @@ +@@ -12757,12 +12788,26 @@ XMLSEC_NO_NSS="1" MOZILLA_MIN_VERSION="1.4" @@ -56,112 +481,87 @@ NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" NSS_FOUND="no" NSPR_PACKAGE=mozilla-nspr -@@ -25776,6 +25794,104 @@ - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then -+ echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION" >&5 -+echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6 -+ -+ if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION" ; then -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+ succeeded=yes -+ -+ echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5 -+echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6 -+ NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"` -+ echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5 -+echo "${ECHO_T}$NSS_CFLAGS" >&6 -+ -+ echo "$as_me:$LINENO: checking NSS_LIBS" >&5 -+echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6 -+ NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"` -+ echo "$as_me:$LINENO: result: $NSS_LIBS" >&5 -+echo "${ECHO_T}$NSS_LIBS" >&6 -+ else -+ NSS_CFLAGS="" -+ NSS_LIBS="" -+ ## If we have a custom action on failure, don't print errors, but -+ ## do set a variable so people can do so. -+ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"` -+ -+ fi -+ +@@ -12811,6 +12856,79 @@ + pkg_cv_NSS_CFLAGS="$NSS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MOZ_FLAVOUR-nspr >= \$MOZILLA_MIN_VERSION \$MOZ_FLAVOUR >= \$MOZILLA_MIN_VERSION\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NSS_LIBS"; then ++ pkg_cv_NSS_LIBS="$NSS_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MOZ_FLAVOUR-nspr >= \$MOZILLA_MIN_VERSION \$MOZ_FLAVOUR >= \$MOZILLA_MIN_VERSION\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi + + -+ else -+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." -+ echo "*** See http://www.freedesktop.org/software/pkgconfig" -+ fi -+ fi + -+ if test $succeeded = yes; then -+ NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss -+ else -+ NSS_FOUND=no -+ fi ++if test $pkg_failed = yes; then + -+ fi -+ if test "z$NSS_FOUND" = "zno" ; then -+ -+ succeeded=no -+ -+ if test -z "$PKG_CONFIG"; then -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes +else -+ case $PKG_CONFIG in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -+ ;; -+esac ++ _pkg_short_errors_supported=no +fi -+PKG_CONFIG=$ac_cv_path_PKG_CONFIG ++ if test $_pkg_short_errors_supported = yes; then ++ NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"` ++ else ++ NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$NSS_PKG_ERRORS" >&5 + -+if test -n "$PKG_CONFIG"; then -+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -+echo "${ECHO_T}$PKG_CONFIG" >&6 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ NSS_FOUND=no ++elif test $pkg_failed = untried; then ++ NSS_FOUND=no +else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 ++ NSS_CFLAGS=$pkg_cv_NSS_CFLAGS ++ NSS_LIBS=$pkg_cv_NSS_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss +fi ++ fi ++ if test "z$NSS_FOUND" = "zno" ; then + -+ fi ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5 ++$as_echo_n "checking for NSS... " >&6; } + -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script could not be found. Make sure it is" -+ echo "*** in your path, or set the PKG_CONFIG environment variable" -+ echo "*** to the full path to pkg-config." -+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." -+ else -+ PKG_CONFIG_MIN_VERSION=0.9.0 -+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION" >&5 - echo $ECHO_N "checking for mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6 - -@@ -26026,8 +26142,8 @@ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$NSS_CFLAGS"; then ++ pkg_cv_NSS_CFLAGS="$NSS_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-nspr >= \$MOZILLA_MIN_VERSION mozilla-nss >= \$MOZILLA_MIN_VERSION\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION") 2>&5 + ac_status=$? +@@ -13030,8 +13148,8 @@ ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION fi @@ -170,9 +570,9 @@ + ac_nss_lib_dir="${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}" + ac_nss_inc_dir="${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/mozilla" - echo "$as_me:$LINENO: checking for nspr libraries >= $NSPR_MIN_VERSION" >&5 - echo $ECHO_N "checking for nspr libraries >= $NSPR_MIN_VERSION... $ECHO_C" >&6 -@@ -26062,7 +26178,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr libraries >= $NSPR_MIN_VERSION" >&5 + $as_echo_n "checking for nspr libraries >= $NSPR_MIN_VERSION... " >&6; } +@@ -13066,7 +13184,7 @@ done for dir in $ac_nss_lib_dir ; do @@ -181,7 +581,7 @@ if test "z$dir" = "z/usr/lib" ; then NSPR_LIBS="$NSPR_LIBS_LIST" else -@@ -26148,7 +26264,7 @@ +@@ -13148,7 +13266,7 @@ done for dir in $ac_nss_lib_dir ; do @@ -190,13 +590,72 @@ if test "z$dir" = "z/usr/lib" ; then NSS_LIBS="$NSS_LIBS_LIST" else ---- misc/xmlsec1-1.2.12/configure.in 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/configure.in 2009-10-01 10:28:50.990755126 +0200 -@@ -183,7 +183,11 @@ +@@ -15036,7 +15154,7 @@ + # values after options handling. + ac_log=" + This file was extended by xmlsec1 $as_me 1.2.14, which was +-generated by GNU Autoconf 2.64. Invocation command line was ++generated by GNU Autoconf 2.65. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS +@@ -15076,6 +15194,7 @@ + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit ++ --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files +@@ -15098,10 +15217,11 @@ + + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + ac_cs_version="\\ + xmlsec1 config.status 1.2.14 +-configured by $0, generated by GNU Autoconf 2.64, +- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++configured by $0, generated by GNU Autoconf 2.65, ++ with options \\"\$ac_cs_config\\" + + Copyright (C) 2009 Free Software Foundation, Inc. + This config.status script is free software; the Free Software Foundation +@@ -15139,6 +15259,8 @@ + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; ++ --config | --confi | --conf | --con | --co | --c ) ++ $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) +@@ -15606,7 +15728,7 @@ + t delim + :nl + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more1 + s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ + p +@@ -15620,7 +15742,7 @@ + t nl + :delim + h +-s/\(.\{148\}\).*/\1/ ++s/\(.\{148\}\)..*/\1/ + t more2 + s/["\\]/\\&/g; s/^/"/; s/$/"/ + p +--- misc/xmlsec1-1.2.14/configure.in 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/configure.in 2009-10-01 10:28:50.990755126 +0200 +@@ -190,8 +190,12 @@ + dnl ========================================================================== dnl find libxml dnl ========================================================================== - LIBXML_MIN_VERSION="2.6.12" --LIBXML_CONFIG="xml2-config" +-LIBXML_MIN_VERSION="2.7.4" + LIBXML_CONFIG="xml2-config" +if test -f "$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" ; then + LIBXML_CONFIG="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/xml2-config" +else @@ -205,7 +664,7 @@ LIBXML_CFLAGS="" LIBXML_LIBS="" LIBXML_FOUND="no" -@@ -490,12 +494,26 @@ +@@ -555,12 +559,26 @@ XMLSEC_NO_NSS="1" MOZILLA_MIN_VERSION="1.4" @@ -234,7 +693,7 @@ NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" NSS_FOUND="no" NSPR_PACKAGE=mozilla-nspr -@@ -521,6 +539,11 @@ +@@ -586,6 +604,11 @@ dnl We are going to try all options dnl if test "z$NSS_FOUND" = "zno" ; then @@ -246,7 +705,7 @@ PKG_CHECK_MODULES(NSS, mozilla-nspr >= $MOZILLA_MIN_VERSION mozilla-nss >= $MOZILLA_MIN_VERSION, [NSS_FOUND=yes NSPR_PACKAGE=mozilla-nspr NSS_PACKAGE=mozilla-nss], [NSS_FOUND=no]) -@@ -547,8 +570,8 @@ +@@ -612,8 +635,8 @@ ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION fi @@ -257,7 +716,7 @@ AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION) NSPR_INCLUDES_FOUND="no" -@@ -583,7 +606,7 @@ +@@ -648,7 +671,7 @@ done for dir in $ac_nss_lib_dir ; do @@ -266,7 +725,7 @@ dnl do not add -L/usr/lib because compiler does it anyway if test "z$dir" = "z/usr/lib" ; then NSPR_LIBS="$NSPR_LIBS_LIST" -@@ -654,7 +677,7 @@ +@@ -719,7 +742,7 @@ done for dir in $ac_nss_lib_dir ; do @@ -275,9 +734,9 @@ dnl do not add -L/usr/lib because compiler does it anyway if test "z$dir" = "z/usr/lib" ; then NSS_LIBS="$NSS_LIBS_LIST" ---- misc/xmlsec1-1.2.12/win32/Makefile.msvc 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/win32/Makefile.msvc 2009-10-01 10:28:50.997747312 +0200 -@@ -381,7 +381,7 @@ +--- misc/xmlsec1-1.2.14/win32/Makefile.msvc 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc 2009-10-01 10:28:50.997747312 +0200 +@@ -376,7 +376,7 @@ XMLSEC_OPENSSL_SOLIBS = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib XMLSEC_OPENSSL_ALIBS = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib diff --git a/libxmlsec/xmlsec1-customkeymanage.patch b/libxmlsec/xmlsec1-customkeymanage.patch index 80cb7de93a70..d5c771a67ab8 100644 --- a/libxmlsec/xmlsec1-customkeymanage.patch +++ b/libxmlsec/xmlsec1-customkeymanage.patch @@ -1,5 +1,5 @@ ---- misc/xmlsec1-1.2.12/include/xmlsec/mscrypto/Makefile.am 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/include/xmlsec/mscrypto/Makefile.am 2009-09-21 14:02:48.563253008 +0200 +--- misc/xmlsec1-1.2.14/include/xmlsec/mscrypto/Makefile.am 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/include/xmlsec/mscrypto/Makefile.am 2009-09-21 14:02:48.563253008 +0200 @@ -3,6 +3,7 @@ xmlsecmscryptoincdir = $(includedir)/xmlsec1/xmlsec/mscrypto @@ -8,9 +8,9 @@ app.h \ certkeys.h \ crypto.h \ ---- misc/xmlsec1-1.2.12/include/xmlsec/mscrypto/Makefile.in 2009-06-25 22:53:30.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/include/xmlsec/mscrypto/Makefile.in 2009-09-21 14:02:48.571021349 +0200 -@@ -308,6 +308,7 @@ +--- misc/xmlsec1-1.2.14/include/xmlsec/mscrypto/Makefile.in 2009-06-25 22:53:30.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/include/xmlsec/mscrypto/Makefile.in 2009-09-21 14:02:48.571021349 +0200 +@@ -281,6 +281,7 @@ NULL = xmlsecmscryptoincdir = $(includedir)/xmlsec1/xmlsec/mscrypto xmlsecmscryptoinc_HEADERS = \ @@ -18,8 +18,8 @@ app.h \ certkeys.h \ crypto.h \ ---- misc/xmlsec1-1.2.12/include/xmlsec/mscrypto/akmngr.h 2009-09-21 14:07:19.052318336 +0200 -+++ misc/build/xmlsec1-1.2.12/include/xmlsec/mscrypto/akmngr.h 2009-09-21 14:02:48.504966762 +0200 +--- misc/xmlsec1-1.2.14/include/xmlsec/mscrypto/akmngr.h 2009-09-21 14:07:19.052318336 +0200 ++++ misc/build/xmlsec1-1.2.14/include/xmlsec/mscrypto/akmngr.h 2009-09-21 14:02:48.504966762 +0200 @@ -1 +1,71 @@ -dummy +/** @@ -93,8 +93,8 @@ +#endif /* __XMLSEC_MSCRYPTO_AKMNGR_H__ */ + + ---- misc/xmlsec1-1.2.12/include/xmlsec/nss/Makefile.am 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/Makefile.am 2009-09-21 14:02:48.577933031 +0200 +--- misc/xmlsec1-1.2.14/include/xmlsec/nss/Makefile.am 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/Makefile.am 2009-09-21 14:02:48.577933031 +0200 @@ -10,6 +10,9 @@ keysstore.h \ pkikeys.h \ @@ -105,9 +105,9 @@ $(NULL) install-exec-hook: ---- misc/xmlsec1-1.2.12/include/xmlsec/nss/Makefile.in 2009-06-25 22:53:31.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/Makefile.in 2009-09-21 14:02:48.585376325 +0200 -@@ -315,6 +315,9 @@ +--- misc/xmlsec1-1.2.14/include/xmlsec/nss/Makefile.in 2009-06-25 22:53:31.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/Makefile.in 2009-09-21 14:02:48.585376325 +0200 +@@ -288,6 +288,9 @@ keysstore.h \ pkikeys.h \ x509.h \ @@ -117,8 +117,8 @@ $(NULL) all: all-am ---- misc/xmlsec1-1.2.12/include/xmlsec/nss/akmngr.h 2009-09-21 14:07:19.105517659 +0200 -+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/akmngr.h 2009-09-21 14:02:48.510978278 +0200 +--- misc/xmlsec1-1.2.14/include/xmlsec/nss/akmngr.h 2009-09-21 14:07:19.105517659 +0200 ++++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/akmngr.h 2009-09-21 14:02:48.510978278 +0200 @@ -1 +1,56 @@ -dummy +/** @@ -177,8 +177,8 @@ +#endif /* __XMLSEC_NSS_AKMNGR_H__ */ + + ---- misc/xmlsec1-1.2.12/include/xmlsec/nss/app.h 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/app.h 2009-09-21 14:02:48.612847068 +0200 +--- misc/xmlsec1-1.2.14/include/xmlsec/nss/app.h 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/app.h 2009-09-21 14:02:48.612847068 +0200 @@ -22,6 +22,9 @@ #include <xmlsec/keysmngr.h> #include <xmlsec/transforms.h> @@ -198,8 +198,8 @@ XMLSEC_CRYPTO_EXPORT int xmlSecNssAppDefaultKeysMngrSave (xmlSecKeysMngrPtr mngr, const char* filename, xmlSecKeyDataType type); ---- misc/xmlsec1-1.2.12/include/xmlsec/nss/ciphers.h 2009-09-21 14:07:19.146496548 +0200 -+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/ciphers.h 2009-09-21 14:02:48.516689712 +0200 +--- misc/xmlsec1-1.2.14/include/xmlsec/nss/ciphers.h 2009-09-21 14:07:19.146496548 +0200 ++++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/ciphers.h 2009-09-21 14:02:48.516689712 +0200 @@ -1 +1,35 @@ -dummy +/** @@ -237,8 +237,8 @@ +#endif /* __XMLSEC_NSS_CIPHERS_H__ */ + + ---- misc/xmlsec1-1.2.12/include/xmlsec/nss/keysstore.h 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/keysstore.h 2009-09-21 14:02:48.626261748 +0200 +--- misc/xmlsec1-1.2.14/include/xmlsec/nss/keysstore.h 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/keysstore.h 2009-09-21 14:02:48.626261748 +0200 @@ -16,6 +16,8 @@ #endif /* __cplusplus */ @@ -257,8 +257,8 @@ XMLSEC_CRYPTO_EXPORT int xmlSecNssKeysStoreLoad (xmlSecKeyStorePtr store, const char *uri, xmlSecKeysMngrPtr keysMngr); ---- misc/xmlsec1-1.2.12/include/xmlsec/nss/tokens.h 2009-09-21 14:07:19.172421448 +0200 -+++ misc/build/xmlsec1-1.2.12/include/xmlsec/nss/tokens.h 2009-09-21 14:02:48.522913605 +0200 +--- misc/xmlsec1-1.2.14/include/xmlsec/nss/tokens.h 2009-09-21 14:07:19.172421448 +0200 ++++ misc/build/xmlsec1-1.2.14/include/xmlsec/nss/tokens.h 2009-09-21 14:02:48.522913605 +0200 @@ -1 +1,182 @@ -dummy +/** @@ -443,8 +443,8 @@ + +#endif /* __XMLSEC_NSS_TOKENS_H__ */ + ---- misc/xmlsec1-1.2.12/src/mscrypto/akmngr.c 2009-09-21 14:07:19.078910929 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/akmngr.c 2009-09-21 14:02:48.531281225 +0200 +--- misc/xmlsec1-1.2.14/src/mscrypto/akmngr.c 2009-09-21 14:07:19.078910929 +0200 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/akmngr.c 2009-09-21 14:02:48.531281225 +0200 @@ -1 +1,235 @@ -dummy +/** @@ -682,8 +682,8 @@ + return( 0 ) ; +} + ---- misc/xmlsec1-1.2.12/src/nss/Makefile.am 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/Makefile.am 2009-09-21 14:02:48.591560472 +0200 +--- misc/xmlsec1-1.2.14/src/nss/Makefile.am 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/Makefile.am 2009-09-21 14:02:48.591560472 +0200 @@ -35,6 +35,9 @@ kw_des.c \ kw_aes.c \ @@ -694,9 +694,9 @@ $(NULL) if SHAREDLIB_HACK ---- misc/xmlsec1-1.2.12/src/nss/Makefile.in 2009-06-25 22:53:33.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/Makefile.in 2009-09-21 14:02:48.599339718 +0200 -@@ -61,7 +61,8 @@ +--- misc/xmlsec1-1.2.14/src/nss/Makefile.in 2009-06-25 22:53:33.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/Makefile.in 2009-09-21 14:02:48.599339718 +0200 +@@ -72,7 +72,8 @@ am__libxmlsec1_nss_la_SOURCES_DIST = app.c bignum.c ciphers.c crypto.c \ digests.c hmac.c pkikeys.c signatures.c symkeys.c x509.c \ x509vfy.c keysstore.c keytrans.c kw_des.c kw_aes.c globals.h \ @@ -706,7 +706,7 @@ am__objects_1 = @SHAREDLIB_HACK_TRUE@am__objects_2 = libxmlsec1_nss_la-strings.lo am_libxmlsec1_nss_la_OBJECTS = libxmlsec1_nss_la-app.lo \ -@@ -72,6 +73,8 @@ +@@ -83,6 +84,8 @@ libxmlsec1_nss_la-x509.lo libxmlsec1_nss_la-x509vfy.lo \ libxmlsec1_nss_la-keysstore.lo libxmlsec1_nss_la-keytrans.lo \ libxmlsec1_nss_la-kw_des.lo libxmlsec1_nss_la-kw_aes.lo \ @@ -714,8 +714,8 @@ + libxmlsec1_nss_la-tokens.lo \ $(am__objects_1) $(am__objects_2) libxmlsec1_nss_la_OBJECTS = $(am_libxmlsec1_nss_la_OBJECTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -357,6 +360,7 @@ + libxmlsec1_nss_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -333,6 +336,7 @@ libxmlsec1_nss_la_SOURCES = app.c bignum.c ciphers.c crypto.c \ digests.c hmac.c pkikeys.c signatures.c symkeys.c x509.c \ x509vfy.c keysstore.c keytrans.c kw_des.c kw_aes.c globals.h \ @@ -723,7 +723,7 @@ $(NULL) $(am__append_1) libxmlsec1_nss_la_LIBADD = \ ../libxmlsec1.la \ -@@ -458,6 +462,9 @@ +@@ -439,6 +443,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-symkeys.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-x509.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-x509vfy.Plo@am__quote@ @@ -732,10 +732,10 @@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_nss_la-tokens.Plo@am__quote@ .c.o: - @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@@ -487,6 +494,27 @@ + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@@ -468,6 +475,27 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c + @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c +libxmlsec1_nss_la-akmngr.lo: akmngr.c +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-akmngr.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-akmngr.Tpo" -c -o libxmlsec1_nss_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c; \ @@ -759,10 +759,10 @@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_nss_la-tokens.lo `test -f 'tokens.c' || echo '$(srcdir)/'`tokens.c + libxmlsec1_nss_la-bignum.lo: bignum.c - @am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-bignum.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_nss_la-bignum.Tpo" -c -o libxmlsec1_nss_la-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxmlsec1_nss_la-bignum.Tpo" "$(DEPDIR)/libxmlsec1_nss_la-bignum.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_nss_la-bignum.Tpo"; exit 1; fi ---- misc/xmlsec1-1.2.12/src/nss/akmngr.c 2009-09-21 14:07:19.197249962 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/akmngr.c 2009-09-21 14:02:48.539616129 +0200 + @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_nss_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_nss_la-bignum.lo -MD -MP -MF $(DEPDIR)/libxmlsec1_nss_la-bignum.Tpo -c -o libxmlsec1_nss_la-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c + @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxmlsec1_nss_la-bignum.Tpo $(DEPDIR)/libxmlsec1_nss_la-bignum.Plo +--- misc/xmlsec1-1.2.14/src/nss/akmngr.c 2009-09-21 14:07:19.197249962 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/akmngr.c 2009-09-21 14:02:48.539616129 +0200 @@ -1 +1,384 @@ -dummy +/** @@ -1149,8 +1149,8 @@ + return(0) ; +} + ---- misc/xmlsec1-1.2.12/src/nss/hmac.c 2009-06-26 06:18:13.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/hmac.c 2009-09-21 14:02:48.649065288 +0200 +--- misc/xmlsec1-1.2.14/src/nss/hmac.c 2009-06-26 06:18:13.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/hmac.c 2009-09-21 14:02:48.649065288 +0200 @@ -23,8 +23,8 @@ #include <xmlsec/transforms.h> #include <xmlsec/errors.h> @@ -1159,9 +1159,9 @@ #include <xmlsec/nss/crypto.h> +#include <xmlsec/nss/tokens.h> - #define XMLSEC_NSS_MIN_HMAC_SIZE 40 - #define XMLSEC_NSS_MAX_HMAC_SIZE 128 -@@ -284,13 +284,13 @@ + /* sizes in bits */ + #define XMLSEC_NSS_MIN_HMAC_SIZE 80 +@@ -286,13 +286,13 @@ keyItem.data = xmlSecBufferGetData(buffer); keyItem.len = xmlSecBufferGetSize(buffer); @@ -1178,8 +1178,8 @@ return(-1); } ---- misc/xmlsec1-1.2.12/src/nss/keysstore.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/keysstore.c 2009-09-21 14:02:48.633533885 +0200 +--- misc/xmlsec1-1.2.14/src/nss/keysstore.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/keysstore.c 2009-09-21 14:02:48.633533885 +0200 @@ -1,36 +1,56 @@ /** * XMLSec library @@ -1252,7 +1252,7 @@ #include <xmlsec/errors.h> #include <xmlsec/xmltree.h> -@@ -38,82 +58,464 @@ +@@ -38,82 +58,461 @@ #include <xmlsec/nss/crypto.h> #include <xmlsec/nss/keysstore.h> @@ -1344,6 +1344,8 @@ + XMLSEC_ERRORS_NO_MESSAGE ) ; + return -1 ; + } ++ return 0 ; ++} - /* data */ - BAD_CAST "NSS-keys-store", /* const xmlChar* name; */ @@ -1357,13 +1359,6 @@ - NULL, /* void* reserved0; */ - NULL, /* void* reserved1; */ -}; -+ return 0 ; -+} - --/** -- * xmlSecNssKeysStoreGetKlass: -- * -- * The Nss list based keys store klass. +int xmlSecNssKeysStoreAdoptKey( + xmlSecKeyStorePtr store , + xmlSecKeyPtr key @@ -1411,7 +1406,11 @@ + XMLSEC_ERRORS_NO_MESSAGE ) ; + return -1 ; + } -+ + +-/** +- * xmlSecNssKeysStoreGetKlass: +- * +- * The Nss list based keys store klass. + return 0 ; +} + @@ -1421,7 +1420,7 @@ + * + * Keys store specific initialization method. * -- * Returns Nss list based keys store klass. +- * Returns: Nss list based keys store klass. + * Returns 0 on success or a negative value if an error occurs. */ -xmlSecKeyStoreId @@ -1459,7 +1458,7 @@ - * - * Adds @key to the @store. * -- * Returns 0 on success or a negative value if an error occurs. +- * Returns: 0 on success or a negative value if an error occurs. + * xmlSecKeyStoreFinalizeMethod: + * @store: the store. + * @@ -1500,10 +1499,7 @@ + context->slotList = NULL ; + } +} - -- ss = xmlSecNssKeysStoreGetSS(store); -- xmlSecAssert2(((ss != NULL) && (*ss != NULL) && -- (xmlSecKeyStoreCheckId(*ss, xmlSecSimpleKeysStoreId))), -1); ++ +xmlSecKeyPtr +xmlSecNssKeysStoreFindKeyFromSlot( + PK11SlotInfo* slot, @@ -1639,10 +1635,11 @@ + } + } -- return (xmlSecSimpleKeysStoreAdoptKey(*ss, key)); -+ return(key); - } - +- ss = xmlSecNssKeysStoreGetSS(store); +- xmlSecAssert2(((ss != NULL) && (*ss != NULL) && +- (xmlSecKeyStoreCheckId(*ss, xmlSecSimpleKeysStoreId))), -1); ++ return(key); ++} + +/** + * xmlSecKeyStoreFindKeyMethod: @@ -1750,19 +1747,19 @@ + NULL , + NULL +} ; -+ + +- return (xmlSecSimpleKeysStoreAdoptKey(*ss, key)); +/** + * xmlSecNssKeysStoreGetKlass: + * + * The simple list based keys store klass. + * -+ * Returns simple list based keys store klass. + */ +xmlSecKeyStoreId +xmlSecNssKeysStoreGetKlass( void ) { + return &xmlSecNssKeysStoreKlass ; -+} -+ + } + +/************************** + * Application routines + */ @@ -1770,7 +1767,7 @@ /** * xmlSecNssKeysStoreLoad: * @store: the pointer to Nss keys store. -@@ -252,234 +654,147 @@ +@@ -252,234 +651,147 @@ */ int xmlSecNssKeysStoreSave(xmlSecKeyStorePtr store, const char *filename, xmlSecKeyDataType type) { @@ -1794,26 +1791,26 @@ - ss = xmlSecNssKeysStoreGetSS(store); - xmlSecAssert2(((ss != NULL) && (*ss != NULL) && - (xmlSecKeyStoreCheckId(*ss, xmlSecSimpleKeysStoreId))), -1); +- +- return (xmlSecSimpleKeysStoreSave(*ss, filename, type)); +-} +- +-static int +-xmlSecNssKeysStoreInitialize(xmlSecKeyStorePtr store) { +- xmlSecKeyStorePtr *ss; + xmlSecAssert2( xmlSecKeyStoreCheckSize( store , xmlSecNssKeysStoreSize ), -1 ) ; + xmlSecAssert2(filename != NULL, -1); -- return (xmlSecSimpleKeysStoreSave(*ss, filename, type)); --} +- xmlSecAssert2(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId), -1); + context = xmlSecNssKeysStoreGetCtx( store ) ; + xmlSecAssert2( context != NULL, -1 ); --static int --xmlSecNssKeysStoreInitialize(xmlSecKeyStorePtr store) { -- xmlSecKeyStorePtr *ss; +- ss = xmlSecNssKeysStoreGetSS(store); +- xmlSecAssert2((*ss == NULL), -1); + list = context->keyList ; + xmlSecAssert2( list != NULL, -1 ); + xmlSecAssert2(xmlSecPtrListCheckId(list, xmlSecKeyPtrListId), -1); -- xmlSecAssert2(xmlSecKeyStoreCheckId(store, xmlSecNssKeysStoreId), -1); -- -- ss = xmlSecNssKeysStoreGetSS(store); -- xmlSecAssert2((*ss == NULL), -1); -- - *ss = xmlSecKeyStoreCreate(xmlSecSimpleKeysStoreId); - if(*ss == NULL) { - xmlSecError(XMLSEC_ERRORS_HERE, @@ -1832,9 +1829,7 @@ - return(0); -} -+ idsList = xmlSecKeyDataIdsGet(); -+ xmlSecAssert2(idsList != NULL, -1); - +- -static void -xmlSecNssKeysStoreFinalize(xmlSecKeyStorePtr store) { - xmlSecKeyStorePtr *ss; @@ -1846,12 +1841,7 @@ - - xmlSecKeyStoreDestroy(*ss); -} -+ keysSize = xmlSecPtrListGetSize(list); -+ idsSize = xmlSecPtrListGetSize(idsList); -+ for(i = 0; i < keysSize; ++i) { -+ key = (xmlSecKeyPtr)xmlSecPtrListGetItem(list, i); -+ xmlSecAssert2(key != NULL, -1); - +- -static xmlSecKeyPtr -xmlSecNssKeysStoreFindKey(xmlSecKeyStorePtr store, const xmlChar* name, - xmlSecKeyInfoCtxPtr keyInfoCtx) { @@ -1883,7 +1873,9 @@ - if (name == NULL) { - goto done; - } -- ++ idsList = xmlSecKeyDataIdsGet(); ++ xmlSecAssert2(idsList != NULL, -1); + - /* what type of key are we looking for? - * TBD: For now, we'll look only for public/private keys using the - * name as a cert nickname. Later on, we can attempt to find @@ -1896,7 +1888,12 @@ - if (cert == NULL) { - goto done; - } -- ++ keysSize = xmlSecPtrListGetSize(list); ++ idsSize = xmlSecPtrListGetSize(idsList); ++ for(i = 0; i < keysSize; ++i) { ++ key = (xmlSecKeyPtr)xmlSecPtrListGetItem(list, i); ++ xmlSecAssert2(key != NULL, -1); + - if (keyReq->keyType & xmlSecKeyDataTypePublic) { - pubkey = CERT_ExtractPublicKey(cert); - if (pubkey == NULL) { @@ -2112,8 +2109,8 @@ + xmlFreeDoc(doc); + return(0); } ---- misc/xmlsec1-1.2.12/src/nss/keywrapers.c 2009-09-21 14:07:19.223802688 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/keywrapers.c 2009-09-21 14:02:48.548869372 +0200 +--- misc/xmlsec1-1.2.14/src/nss/keywrapers.c 2009-09-21 14:07:19.223802688 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/keywrapers.c 2009-09-21 14:02:48.548869372 +0200 @@ -1 +1,1213 @@ -dummy +/** @@ -3329,8 +3326,8 @@ + +#endif /* XMLSEC_NO_DES */ + ---- misc/xmlsec1-1.2.12/src/nss/pkikeys.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/pkikeys.c 2009-09-21 14:02:48.657352624 +0200 +--- misc/xmlsec1-1.2.14/src/nss/pkikeys.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/pkikeys.c 2009-09-21 14:02:48.657352624 +0200 @@ -24,6 +24,7 @@ #include <xmlsec/nss/crypto.h> #include <xmlsec/nss/bignum.h> @@ -3520,8 +3517,8 @@ return(8 * SECKEY_PublicKeyStrength(ctx->pubkey)); } ---- misc/xmlsec1-1.2.12/src/nss/symkeys.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/symkeys.c 2009-09-21 14:02:48.620574832 +0200 +--- misc/xmlsec1-1.2.14/src/nss/symkeys.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/symkeys.c 2009-09-21 14:02:48.620574832 +0200 @@ -15,20 +15,41 @@ #include <stdio.h> #include <string.h> @@ -4362,8 +4359,8 @@ /* data */ xmlSecNameHMACKeyValue, ---- misc/xmlsec1-1.2.12/src/nss/tokens.c 2009-09-21 14:07:19.249145861 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/tokens.c 2009-09-21 14:02:48.556772442 +0200 +--- misc/xmlsec1-1.2.14/src/nss/tokens.c 2009-09-21 14:07:19.249145861 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/tokens.c 2009-09-21 14:02:48.556772442 +0200 @@ -1 +1,548 @@ -dummy +/** @@ -4914,8 +4911,8 @@ + return(0); +} + ---- misc/xmlsec1-1.2.12/src/nss/x509.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/x509.c 2009-09-21 14:02:48.642312431 +0200 +--- misc/xmlsec1-1.2.14/src/nss/x509.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/x509.c 2009-09-21 14:02:48.642312431 +0200 @@ -34,7 +34,6 @@ #include <xmlsec/keys.h> #include <xmlsec/keyinfo.h> @@ -5651,8 +5648,8 @@ static void xmlSecNssX509CertDebugDump(CERTCertificate* cert, FILE* output) { SECItem *sn; ---- misc/xmlsec1-1.2.12/src/nss/x509vfy.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/x509vfy.c 2009-09-21 14:02:48.669245207 +0200 +--- misc/xmlsec1-1.2.14/src/nss/x509vfy.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/x509vfy.c 2009-09-21 14:02:48.669245207 +0200 @@ -30,6 +30,7 @@ #include <xmlsec/keyinfo.h> #include <xmlsec/keysmngr.h> @@ -5680,7 +5677,7 @@ static xmlSecKeyDataStoreKlass xmlSecNssX509StoreKlass = { sizeof(xmlSecKeyDataStoreKlass), -@@ -343,40 +334,28 @@ +@@ -339,40 +330,28 @@ xmlSecNssX509FindCert(xmlChar *subjectName, xmlChar *issuerName, xmlChar *issuerSerial, xmlChar *ski) { CERTCertificate *cert = NULL; @@ -5724,7 +5721,7 @@ goto done; } -@@ -398,34 +377,23 @@ +@@ -394,34 +373,23 @@ if((issuerName != NULL) && (issuerSerial != NULL)) { CERTIssuerAndSN issuerAndSN; @@ -5762,7 +5759,7 @@ goto done; } -@@ -445,8 +413,15 @@ +@@ -441,8 +409,15 @@ issuerAndSN.derIssuer.data = nameitem->data; issuerAndSN.derIssuer.len = nameitem->len; @@ -5780,7 +5777,7 @@ cert = CERT_FindCertByIssuerAndSN(CERT_GetDefaultCertDB(), &issuerAndSN); -@@ -477,9 +452,6 @@ +@@ -473,9 +448,6 @@ } done: @@ -5790,13 +5787,10 @@ if (arena != NULL) { PORT_FreeArena(arena, PR_FALSE); } -@@ -490,226 +462,76 @@ +@@ -486,176 +458,6 @@ return(cert); } --/** -- * xmlSecNssX509NameRead: -- */ -static xmlSecByte * -xmlSecNssX509NameRead(xmlSecByte *str, int len) { - xmlSecByte name[256]; @@ -5804,15 +5798,7 @@ - xmlSecByte *retval = NULL; - xmlSecByte *p = NULL; - int nameLen, valueLen; -+static int -+xmlSecNssIntegerToItem( -+ const xmlChar* integer , -+ SECItem *item -+) { -+ xmlSecBn bn ; -+ xmlSecSize i, length ; -+ const xmlSecByte* bnInteger ; - +- - xmlSecAssert2(str != NULL, NULL); - - /* return string should be no longer than input string */ @@ -5832,20 +5818,14 @@ - while((len > 0) && isspace(*str)) { - ++str; --len; - } -+ xmlSecAssert2( integer != NULL, -1 ) ; -+ xmlSecAssert2( item != NULL, -1 ) ; - +- - nameLen = xmlSecNssX509NameStringRead(&str, &len, name, sizeof(name), '=', 0); - if(nameLen < 0) { - xmlSecError(XMLSEC_ERRORS_HERE, -+ if( xmlSecBnInitialize( &bn, 0 ) < 0 ) { -+ xmlSecError(XMLSEC_ERRORS_HERE, - NULL, +- NULL, - "xmlSecNssX509NameStringRead", - XMLSEC_ERRORS_R_XMLSEC_FAILED, -+ "xmlSecBnInitialize", -+ XMLSEC_ERRORS_R_INVALID_DATA, - XMLSEC_ERRORS_NO_MESSAGE); +- XMLSEC_ERRORS_NO_MESSAGE); - goto done; - } - memcpy(p, name, nameLen); @@ -5857,17 +5837,11 @@ - valueLen = xmlSecNssX509NameStringRead(&str, &len, - value, sizeof(value), '"', 1); - if(valueLen < 0) { -+ return -1 ; -+ } -+ -+ if( xmlSecBnFromDecString( &bn, integer ) < 0 ) { - xmlSecError(XMLSEC_ERRORS_HERE, - NULL, +- xmlSecError(XMLSEC_ERRORS_HERE, +- NULL, - "xmlSecNssX509NameStringRead", - XMLSEC_ERRORS_R_XMLSEC_FAILED, -+ "xmlSecBnFromDecString", -+ XMLSEC_ERRORS_R_INVALID_DATA, - XMLSEC_ERRORS_NO_MESSAGE); +- XMLSEC_ERRORS_NO_MESSAGE); - goto done; - } - /* skip spaces before comma or semicolon */ @@ -5875,17 +5849,10 @@ - ++str; --len; - } - if((len > 0) && ((*str) != ',')) { -+ xmlSecBnFinalize( &bn ) ; -+ return -1 ; -+ } -+ -+ length = xmlSecBnGetSize( &bn ) ; -+ if( length <= 0 ) { - xmlSecError(XMLSEC_ERRORS_HERE, - NULL, +- xmlSecError(XMLSEC_ERRORS_HERE, +- NULL, - NULL, -+ "xmlSecBnGetSize", - XMLSEC_ERRORS_R_INVALID_DATA, +- XMLSEC_ERRORS_R_INVALID_DATA, - "comma is expected"); - goto done; - } @@ -5912,7 +5879,7 @@ - NULL, - "xmlSecNssX509NameStringRead", - XMLSEC_ERRORS_R_XMLSEC_FAILED, - XMLSEC_ERRORS_NO_MESSAGE); +- XMLSEC_ERRORS_NO_MESSAGE); - goto done; - } - memcpy(p, value, valueLen); @@ -5926,8 +5893,8 @@ - if(len > 0) { - ++str; --len; - } - } - +- } +- - *p = 0; - return(retval); - @@ -5936,11 +5903,6 @@ - return (NULL); -} - -- -- --/** -- * xmlSecNssX509NameStringRead: -- */ -static int -xmlSecNssX509NameStringRead(xmlSecByte **str, int *strLen, - xmlSecByte *res, int resLen, @@ -5964,13 +5926,10 @@ - nonSpace = q; - if(xmlSecIsHex((*p))) { - if((p - (*str) + 1) >= (*strLen)) { -+ bnInteger = xmlSecBnGetData( &bn ) ; -+ if( bnInteger == NULL ) { - xmlSecError(XMLSEC_ERRORS_HERE, - NULL, +- xmlSecError(XMLSEC_ERRORS_HERE, - NULL, -+ "xmlSecBnGetData", - XMLSEC_ERRORS_R_INVALID_DATA, +- NULL, +- XMLSEC_ERRORS_R_INVALID_DATA, - "two hex digits expected"); - return(-1); - } @@ -5978,28 +5937,17 @@ - p += 2; - } else { - if(((++p) - (*str)) >= (*strLen)) { -+ XMLSEC_ERRORS_NO_MESSAGE ) ; -+ xmlSecBnFinalize( &bn ) ; -+ return -1 ; -+ } -+ -+ item->data = ( unsigned char * )PORT_Alloc( length ); -+ if( item->data == NULL ) { - xmlSecError(XMLSEC_ERRORS_HERE, - NULL, +- xmlSecError(XMLSEC_ERRORS_HERE, - NULL, -+ "PORT_Alloc", - XMLSEC_ERRORS_R_INVALID_DATA, +- NULL, +- XMLSEC_ERRORS_R_INVALID_DATA, - "escaped symbol missed"); - return(-1); - } - *(q++) = *(p++); - } - } -+ XMLSEC_ERRORS_NO_MESSAGE ) ; -+ xmlSecBnFinalize( &bn ) ; -+ return -1 ; - } +- } - if(((p - (*str)) < (*strLen)) && ((*p) != delim)) { - xmlSecError(XMLSEC_ERRORS_HERE, - NULL, @@ -6012,61 +5960,91 @@ - (*str) = p; - return((ingoreTrailingSpaces) ? nonSpace - res + 1 : q - res); -} - --/* code lifted from NSS */ --static void --xmlSecNssNumToItem(SECItem *it, unsigned long ui) --{ -- unsigned char bb[5]; -- int len; -- -- bb[0] = 0; -- bb[1] = (unsigned char) (ui >> 24); -- bb[2] = (unsigned char) (ui >> 16); -- bb[3] = (unsigned char) (ui >> 8); -- bb[4] = (unsigned char) (ui); - -- /* -- ** Small integers are encoded in a single byte. Larger integers -- ** require progressively more space. -- */ -- if (ui > 0x7f) { -- if (ui > 0x7fff) { -- if (ui > 0x7fffffL) { -- if (ui >= 0x80000000L) { -- len = 5; -- } else { -- len = 4; -- } -- } else { -- len = 3; -- } -- } else { -- len = 2; -- } -- } else { -- len = 1; -- } + /* code lifted from NSS */ + static void + xmlSecNssNumToItem(SECItem *it, unsigned long ui) +@@ -699,6 +501,77 @@ + it->len = len; + PORT_Memcpy(it->data, bb + (sizeof(bb) - len), len); + } ++ ++static int ++xmlSecNssIntegerToItem( ++ const xmlChar* integer , ++ SECItem *item ++) { ++ xmlSecBn bn ; ++ xmlSecSize i, length ; ++ const xmlSecByte* bnInteger ; ++ ++ xmlSecAssert2( integer != NULL, -1 ) ; ++ xmlSecAssert2( item != NULL, -1 ) ; ++ ++ if( xmlSecBnInitialize( &bn, 0 ) < 0 ) { ++ xmlSecError(XMLSEC_ERRORS_HERE, ++ NULL, ++ "xmlSecBnInitialize", ++ XMLSEC_ERRORS_R_INVALID_DATA, ++ XMLSEC_ERRORS_NO_MESSAGE); ++ return -1 ; ++ } ++ ++ if( xmlSecBnFromDecString( &bn, integer ) < 0 ) { ++ xmlSecError(XMLSEC_ERRORS_HERE, ++ NULL, ++ "xmlSecBnFromDecString", ++ XMLSEC_ERRORS_R_INVALID_DATA, ++ XMLSEC_ERRORS_NO_MESSAGE); ++ xmlSecBnFinalize( &bn ) ; ++ return -1 ; ++ } ++ ++ length = xmlSecBnGetSize( &bn ) ; ++ if( length <= 0 ) { ++ xmlSecError(XMLSEC_ERRORS_HERE, ++ NULL, ++ "xmlSecBnGetSize", ++ XMLSEC_ERRORS_R_INVALID_DATA, ++ XMLSEC_ERRORS_NO_MESSAGE); ++ } ++ ++ bnInteger = xmlSecBnGetData( &bn ) ; ++ if( bnInteger == NULL ) { ++ xmlSecError(XMLSEC_ERRORS_HERE, ++ NULL, ++ "xmlSecBnGetData", ++ XMLSEC_ERRORS_R_INVALID_DATA, ++ XMLSEC_ERRORS_NO_MESSAGE ) ; ++ xmlSecBnFinalize( &bn ) ; ++ return -1 ; ++ } ++ ++ item->data = ( unsigned char * )PORT_Alloc( length ); ++ if( item->data == NULL ) { ++ xmlSecError(XMLSEC_ERRORS_HERE, ++ NULL, ++ "PORT_Alloc", ++ XMLSEC_ERRORS_R_INVALID_DATA, ++ XMLSEC_ERRORS_NO_MESSAGE ) ; ++ xmlSecBnFinalize( &bn ) ; ++ return -1 ; ++ } ++ + item->len = length; - -- it->data = (unsigned char *)PORT_Alloc(len); -- if (it->data == NULL) { -- return; -- } + for( i = 0 ; i < length ; i ++ ) + item->data[i] = *( bnInteger + i ) ; + + xmlSecBnFinalize( &bn ) ; - -- it->len = len; -- PORT_Memcpy(it->data, bb + (sizeof(bb) - len), len); ++ + return 0 ; - } ++} #endif /* XMLSEC_NO_X509 */ ---- misc/xmlsec1-1.2.12/win32/Makefile.msvc 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/win32/Makefile.msvc 2009-09-21 14:02:48.607277908 +0200 -@@ -223,6 +223,9 @@ + +--- misc/xmlsec1-1.2.14/win32/Makefile.msvc 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc 2009-09-21 14:02:48.607277908 +0200 +@@ -218,6 +218,9 @@ $(XMLSEC_OPENSSL_INTDIR_A)\x509vfy.obj XMLSEC_NSS_OBJS = \ @@ -6076,7 +6054,7 @@ $(XMLSEC_NSS_INTDIR)\app.obj\ $(XMLSEC_NSS_INTDIR)\bignum.obj\ $(XMLSEC_NSS_INTDIR)\ciphers.obj \ -@@ -258,6 +261,7 @@ +@@ -253,6 +256,7 @@ $(XMLSEC_NSS_INTDIR_A)\strings.obj XMLSEC_MSCRYPTO_OBJS = \ diff --git a/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch b/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch index 87a4bb55d1a2..8c6349a63c5f 100644 --- a/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch +++ b/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch @@ -1,5 +1,5 @@ ---- misc/xmlsec1-1.2.12/src/mscrypto/Makefile.am 2009-06-26 05:53:18.000000000 +0900 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/Makefile.am 2009-09-30 18:53:05.373000000 +0900 +--- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.am 2009-06-26 05:53:18.000000000 +0900 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.am 2009-09-30 18:53:05.373000000 +0900 @@ -35,6 +35,7 @@ csp_oid.h \ globals.h \ @@ -8,9 +8,9 @@ $(NULL) if SHAREDLIB_HACK ---- misc/xmlsec1-1.2.12/src/mscrypto/Makefile.in 2009-06-26 05:53:32.000000000 +0900 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/Makefile.in 2009-09-30 19:00:50.107375000 +0900 -@@ -61,7 +61,8 @@ +--- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.in 2009-06-26 05:53:32.000000000 +0900 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.in 2009-09-30 19:00:50.107375000 +0900 +@@ -72,7 +72,8 @@ am__libxmlsec1_mscrypto_la_SOURCES_DIST = app.c certkeys.c ciphers.c \ crypto.c digests.c keysstore.c kt_rsa.c signatures.c symkeys.c \ x509.c x509vfy.c csp_calg.h csp_oid.h globals.h xmlsec-mingw.h \ @@ -20,7 +20,7 @@ am__objects_1 = @SHAREDLIB_HACK_TRUE@am__objects_2 = \ @SHAREDLIB_HACK_TRUE@ libxmlsec1_mscrypto_la-strings.lo -@@ -75,7 +76,8 @@ +@@ -86,7 +87,8 @@ libxmlsec1_mscrypto_la-signatures.lo \ libxmlsec1_mscrypto_la-symkeys.lo \ libxmlsec1_mscrypto_la-x509.lo \ @@ -29,8 +29,8 @@ + libxmlsec1_mscrypto_la-akmngr.lo $(am__objects_1) \ $(am__objects_2) libxmlsec1_mscrypto_la_OBJECTS = $(am_libxmlsec1_mscrypto_la_OBJECTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -362,6 +364,7 @@ + libxmlsec1_mscrypto_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +@@ -338,6 +340,7 @@ libxmlsec1_mscrypto_la_SOURCES = app.c certkeys.c ciphers.c crypto.c \ digests.c keysstore.c kt_rsa.c signatures.c symkeys.c x509.c \ x509vfy.c csp_calg.h csp_oid.h globals.h xmlsec-mingw.h \ @@ -38,17 +38,17 @@ $(NULL) $(am__append_1) libxmlsec1_mscrypto_la_LIBADD = \ ../libxmlsec1.la \ -@@ -460,6 +463,7 @@ +@@ -441,6 +444,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-symkeys.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-x509.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-x509vfy.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Plo@am__quote@ .c.o: - @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@@ -489,6 +493,13 @@ + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@@ -470,6 +474,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c + @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-app.lo `test -f 'app.c' || echo '$(srcdir)/'`app.c +libxmlsec1_mscrypto_la-akmngr.lo: akmngr.c +@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-akmngr.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-akmngr.Tpo" -c -o libxmlsec1_mscrypto_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c; \ @@ -58,5 +58,5 @@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libxmlsec1_mscrypto_la-akmngr.lo `test -f 'akmngr.c' || echo '$(srcdir)/'`akmngr.c + libxmlsec1_mscrypto_la-certkeys.lo: certkeys.c - @am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-certkeys.lo -MD -MP -MF "$(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo" -c -o libxmlsec1_mscrypto_la-certkeys.lo `test -f 'certkeys.c' || echo '$(srcdir)/'`certkeys.c; \ - @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo" "$(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Plo"; else rm -f "$(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo"; exit 1; fi + @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxmlsec1_mscrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libxmlsec1_mscrypto_la-certkeys.lo -MD -MP -MF $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo -c -o libxmlsec1_mscrypto_la-certkeys.lo `test -f 'certkeys.c' || echo '$(srcdir)/'`certkeys.c + @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Tpo $(DEPDIR)/libxmlsec1_mscrypto_la-certkeys.Plo diff --git a/libxmlsec/xmlsec1-mingw32.patch b/libxmlsec/xmlsec1-mingw32.patch index d2ff676facb1..3aaf19fe5a5c 100644 --- a/libxmlsec/xmlsec1-mingw32.patch +++ b/libxmlsec/xmlsec1-mingw32.patch @@ -1,57 +1,6 @@ ---- misc/xmlsec1-1.2.12/aclocal.m4 2009-06-25 22:53:24.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/aclocal.m4 2009-09-29 15:49:39.550158665 +0200 -@@ -6219,6 +6219,10 @@ - AC_SUBST(LIBADD_DL) - AC_LANG_PUSH([C]) - -+case $host_os in -+mingw*) -+;; -+*) - AC_CHECK_FUNC([shl_load], - [AC_DEFINE([HAVE_SHL_LOAD], [1], - [Define if you have the shl_load function.])], -@@ -6254,6 +6258,8 @@ - ]) - ]) - ]) -+;; -+esac - - if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes - then ---- misc/xmlsec1-1.2.12/configure 2009-09-29 15:55:33.269924586 +0200 -+++ misc/build/xmlsec1-1.2.12/configure 2009-09-29 15:55:08.838176411 +0200 -@@ -21883,6 +21883,10 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -+case $host_os in -+mingw*) -+;; -+*) - echo "$as_me:$LINENO: checking for shl_load" >&5 - echo $ECHO_N "checking for shl_load... $ECHO_C" >&6 - if test "${ac_cv_func_shl_load+set}" = set; then -@@ -22434,6 +22438,8 @@ - - fi - -+;; -+esac - - if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes - then -@@ -22614,7 +22620,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<EOF --#line 22617 "configure" -+#line 22623 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -26178,7 +26184,9 @@ +--- misc/xmlsec1-1.2.14/configure 2009-09-29 15:55:33.269924586 +0200 ++++ misc/build/xmlsec1-1.2.14/configure 2009-09-29 15:55:08.838176411 +0200 +@@ -13184,7 +13184,9 @@ done for dir in $ac_nss_lib_dir ; do @@ -62,7 +11,7 @@ if test "z$dir" = "z/usr/lib" ; then NSPR_LIBS="$NSPR_LIBS_LIST" else -@@ -26191,6 +26199,25 @@ +@@ -13197,6 +13199,25 @@ NSPR_LIBS_FOUND="yes" break fi @@ -88,7 +37,7 @@ done fi -@@ -26264,6 +26291,24 @@ +@@ -13266,6 +13287,24 @@ done for dir in $ac_nss_lib_dir ; do @@ -113,7 +62,7 @@ if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then if test "z$dir" = "z/usr/lib" ; then NSS_LIBS="$NSS_LIBS_LIST" -@@ -26277,6 +26322,8 @@ +@@ -13279,6 +13318,8 @@ NSS_LIBS_FOUND="yes" break fi @@ -122,16 +71,16 @@ done fi -@@ -26769,7 +26816,7 @@ - echo "${ECHO_T}$MSCRYPTO_ENABLE" >&6 +@@ -13684,7 +13725,7 @@ + $as_echo "$MSCRYPTO_ENABLE" >&6; } else LIBS_SAVE="$LIBS" - LIBS="$LIBS -lcrypt32" + LIBS="$LIBS ${PSDK_HOME}/lib/crypt32.lib" - echo "$as_me:$LINENO: checking for mscrypto libraries" >&5 - echo $ECHO_N "checking for mscrypto libraries... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -@@ -26819,13 +26866,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mscrypto libraries" >&5 + $as_echo_n "checking for mscrypto libraries... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +@@ -13711,13 +13752,7 @@ XMLSEC_NO_MSCRYPTO="0" MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1" @@ -146,9 +95,9 @@ if test "z$XMLSEC_CRYPTO" = "z" ; then XMLSEC_CRYPTO="mscrypto" XMLSEC_CRYPTO_LIB="$MSCRYPTO_CRYPTO_LIB" ---- misc/xmlsec1-1.2.12/configure.in 2009-09-29 15:55:33.282288142 +0200 -+++ misc/build/xmlsec1-1.2.12/configure.in 2009-09-29 15:49:39.614223428 +0200 -@@ -606,7 +606,9 @@ +--- misc/xmlsec1-1.2.14/configure.in 2009-09-29 15:55:33.282288142 +0200 ++++ misc/build/xmlsec1-1.2.14/configure.in 2009-09-29 15:49:39.614223428 +0200 +@@ -671,7 +671,9 @@ done for dir in $ac_nss_lib_dir ; do @@ -159,7 +108,7 @@ dnl do not add -L/usr/lib because compiler does it anyway if test "z$dir" = "z/usr/lib" ; then NSPR_LIBS="$NSPR_LIBS_LIST" -@@ -620,6 +622,26 @@ +@@ -685,6 +687,26 @@ NSPR_LIBS_FOUND="yes" break fi @@ -186,7 +135,7 @@ done fi -@@ -677,6 +699,25 @@ +@@ -742,6 +764,25 @@ done for dir in $ac_nss_lib_dir ; do @@ -212,7 +161,7 @@ if test -f $dir/libnss3.so -o -f $dir/libnss3.dylib ; then dnl do not add -L/usr/lib because compiler does it anyway if test "z$dir" = "z/usr/lib" ; then -@@ -691,6 +732,8 @@ +@@ -756,6 +797,8 @@ NSS_LIBS_FOUND="yes" break fi @@ -221,7 +170,7 @@ done fi -@@ -861,7 +904,7 @@ +@@ -926,7 +969,7 @@ dnl cannot detect __stdcall functions dnl AC_CHECK_LIB(crypt32, CertOpenStore, .... LIBS_SAVE="$LIBS" @@ -230,7 +179,7 @@ AC_MSG_CHECKING(for mscrypto libraries) AC_LINK_IFELSE([ #include <windows.h> -@@ -878,15 +921,7 @@ +@@ -943,15 +986,7 @@ XMLSEC_NO_MSCRYPTO="0" MSCRYPTO_CFLAGS="$MSCRYPTO_CFLAGS -DXMLSEC_CRYPTO_MSCRYPTO=1" @@ -247,9 +196,9 @@ dnl first crypto library is default one if test "z$XMLSEC_CRYPTO" = "z" ; then XMLSEC_CRYPTO="mscrypto" ---- misc/xmlsec1-1.2.12/ltmain.sh 2009-06-25 22:53:19.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/ltmain.sh 2009-09-29 15:49:39.628349554 +0200 -@@ -1661,6 +1661,11 @@ +--- misc/xmlsec1-1.2.14/ltmain.sh 2009-06-25 22:53:19.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/ltmain.sh 2009-09-29 15:49:39.628349554 +0200 +@@ -4868,6 +4868,11 @@ fi ;; @@ -261,7 +210,7 @@ *.$libext) # An archive. deplibs="$deplibs $arg" -@@ -1974,6 +1979,10 @@ +@@ -5213,6 +5218,10 @@ continue ;; *.la) lib="$deplib" ;; @@ -272,9 +221,9 @@ *.$libext) if test "$pass" = conv; then deplibs="$deplib $deplibs" ---- misc/xmlsec1-1.2.12/src/mscrypto/certkeys.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/certkeys.c 2009-09-29 15:49:39.643186151 +0200 -@@ -938,7 +938,11 @@ +--- misc/xmlsec1-1.2.14/src/mscrypto/certkeys.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/certkeys.c 2009-09-29 15:49:39.643186151 +0200 +@@ -947,7 +947,11 @@ static void xmlSecMSCryptoKeyDataRsaDebugDump(xmlSecKeyDataPtr data, FILE* output); static void xmlSecMSCryptoKeyDataRsaDebugXmlDump(xmlSecKeyDataPtr data, FILE* output); @@ -286,7 +235,7 @@ sizeof(xmlSecKeyDataKlass), xmlSecMSCryptoKeyDataSize, -@@ -1649,7 +1653,11 @@ +@@ -1658,7 +1662,11 @@ static void xmlSecMSCryptoKeyDataDsaDebugXmlDump(xmlSecKeyDataPtr data, FILE* output); @@ -298,8 +247,8 @@ sizeof(xmlSecKeyDataKlass), xmlSecMSCryptoKeyDataSize, ---- misc/xmlsec1-1.2.12/src/mscrypto/ciphers.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/ciphers.c 2009-09-29 15:49:39.652528324 +0200 +--- misc/xmlsec1-1.2.14/src/mscrypto/ciphers.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/ciphers.c 2009-09-29 15:49:39.652528324 +0200 @@ -802,7 +802,11 @@ * AES CBC cipher transforms * @@ -348,8 +297,8 @@ /* klass/object sizes */ sizeof(xmlSecTransformKlass), /* size_t klassSize */ xmlSecMSCryptoBlockCipherSize, /* size_t objSize */ ---- misc/xmlsec1-1.2.12/src/mscrypto/digests.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/digests.c 2009-09-29 15:49:39.660554904 +0200 +--- misc/xmlsec1-1.2.14/src/mscrypto/digests.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/digests.c 2009-09-29 15:49:39.660554904 +0200 @@ -329,7 +329,11 @@ * SHA1 * @@ -362,8 +311,8 @@ /* klass/object sizes */ sizeof(xmlSecTransformKlass), /* size_t klassSize */ xmlSecMSCryptoDigestSize, /* size_t objSize */ ---- misc/xmlsec1-1.2.12/src/mscrypto/keysstore.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/keysstore.c 2009-09-29 15:49:39.667289994 +0200 +--- misc/xmlsec1-1.2.14/src/mscrypto/keysstore.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/keysstore.c 2009-09-29 15:49:39.667289994 +0200 @@ -66,7 +66,11 @@ const xmlChar* name, xmlSecKeyInfoCtxPtr keyInfoCtx); @@ -376,8 +325,8 @@ sizeof(xmlSecKeyStoreKlass), xmlSecMSCryptoKeysStoreSize, ---- misc/xmlsec1-1.2.12/src/mscrypto/kt_rsa.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/kt_rsa.c 2009-09-29 15:49:39.674284044 +0200 +--- misc/xmlsec1-1.2.14/src/mscrypto/kt_rsa.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/kt_rsa.c 2009-09-29 15:49:39.674284044 +0200 @@ -66,7 +66,11 @@ static int xmlSecMSCryptoRsaPkcs1Process (xmlSecTransformPtr transform, xmlSecTransformCtxPtr transformCtx); @@ -390,8 +339,8 @@ /* klass/object sizes */ sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ xmlSecMSCryptoRsaPkcs1Size, /* xmlSecSize objSize */ ---- misc/xmlsec1-1.2.12/src/mscrypto/signatures.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/signatures.c 2009-09-29 15:49:39.682580497 +0200 +--- misc/xmlsec1-1.2.14/src/mscrypto/signatures.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/signatures.c 2009-09-29 15:49:39.682580497 +0200 @@ -524,7 +524,11 @@ * RSA-SHA1 signature transform * @@ -416,8 +365,8 @@ /* klass/object sizes */ sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ xmlSecMSCryptoSignatureSize, /* xmlSecSize objSize */ ---- misc/xmlsec1-1.2.12/src/mscrypto/symkeys.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/symkeys.c 2009-09-29 15:49:39.691081347 +0200 +--- misc/xmlsec1-1.2.14/src/mscrypto/symkeys.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/symkeys.c 2009-09-29 15:49:39.691081347 +0200 @@ -72,7 +72,11 @@ * <xmlsec:AESKeyValue> processing * @@ -442,8 +391,8 @@ sizeof(xmlSecKeyDataKlass), xmlSecKeyDataBinarySize, ---- misc/xmlsec1-1.2.12/src/mscrypto/x509.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/x509.c 2009-09-29 15:49:39.699931741 +0200 +--- misc/xmlsec1-1.2.14/src/mscrypto/x509.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/x509.c 2009-09-29 15:49:39.699931741 +0200 @@ -243,7 +243,11 @@ @@ -456,7 +405,7 @@ sizeof(xmlSecKeyDataKlass), xmlSecMSCryptoX509DataSize, -@@ -2148,7 +2152,11 @@ +@@ -2159,7 +2163,11 @@ xmlSecSize bufSize, xmlSecKeyInfoCtxPtr keyInfoCtx); @@ -468,8 +417,8 @@ sizeof(xmlSecKeyDataKlass), sizeof(xmlSecKeyData), ---- misc/xmlsec1-1.2.12/src/mscrypto/x509vfy.c 2009-09-29 15:55:33.502779834 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/x509vfy.c 2009-09-29 15:49:39.708831697 +0200 +--- misc/xmlsec1-1.2.14/src/mscrypto/x509vfy.c 2009-09-29 15:55:33.502779834 +0200 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/x509vfy.c 2009-09-29 15:49:39.708831697 +0200 @@ -67,7 +67,11 @@ static int xmlSecMSCryptoX509StoreInitialize (xmlSecKeyDataStorePtr store); static void xmlSecMSCryptoX509StoreFinalize (xmlSecKeyDataStorePtr store); @@ -482,8 +431,8 @@ sizeof(xmlSecKeyDataStoreKlass), xmlSecMSCryptoX509StoreSize, ---- misc/xmlsec1-1.2.12/src/nss/ciphers.c 2009-09-29 15:55:33.488430535 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/ciphers.c 2009-09-29 15:49:39.717511164 +0200 +--- misc/xmlsec1-1.2.14/src/nss/ciphers.c 2009-09-29 15:55:33.488430535 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/ciphers.c 2009-09-29 15:49:39.717511164 +0200 @@ -777,7 +777,11 @@ * AES CBC cipher transforms * @@ -532,8 +481,8 @@ /* klass/object sizes */ sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ xmlSecNssBlockCipherSize, /* xmlSecSize objSize */ ---- misc/xmlsec1-1.2.12/src/nss/digests.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/digests.c 2009-09-29 15:49:39.725650968 +0200 +--- misc/xmlsec1-1.2.14/src/nss/digests.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/digests.c 2009-09-29 15:49:39.725650968 +0200 @@ -285,7 +285,11 @@ * SHA1 Digest transforms * @@ -546,9 +495,9 @@ /* klass/object sizes */ sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ xmlSecNssDigestSize, /* xmlSecSize objSize */ ---- misc/xmlsec1-1.2.12/src/nss/hmac.c 2009-09-29 15:55:33.409285968 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/hmac.c 2009-09-29 15:49:39.733673690 +0200 -@@ -502,7 +502,11 @@ +--- misc/xmlsec1-1.2.14/src/nss/hmac.c 2009-09-29 15:55:33.409285968 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/hmac.c 2009-09-29 15:49:39.733673690 +0200 +@@ -504,7 +504,11 @@ /** * HMAC SHA1 */ @@ -560,7 +509,7 @@ /* klass/object sizes */ sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ xmlSecNssHmacSize, /* xmlSecSize objSize */ -@@ -544,7 +548,11 @@ +@@ -546,7 +550,11 @@ /** * HMAC Ripemd160 */ @@ -572,7 +521,7 @@ /* klass/object sizes */ sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ xmlSecNssHmacSize, /* xmlSecSize objSize */ -@@ -586,7 +594,11 @@ +@@ -588,7 +596,11 @@ /** * HMAC Md5 */ @@ -584,9 +533,9 @@ /* klass/object sizes */ sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ xmlSecNssHmacSize, /* xmlSecSize objSize */ ---- misc/xmlsec1-1.2.12/src/nss/keysstore.c 2009-09-29 15:55:33.422265895 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/keysstore.c 2009-09-29 15:49:39.741628057 +0200 -@@ -489,7 +489,11 @@ +--- misc/xmlsec1-1.2.14/src/nss/keysstore.c 2009-09-29 15:55:33.422265895 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/keysstore.c 2009-09-29 15:49:39.741628057 +0200 +@@ -487,7 +487,11 @@ return NULL ; } @@ -598,8 +547,8 @@ sizeof( xmlSecKeyStoreKlass ) , xmlSecNssKeysStoreSize , BAD_CAST "implicit_nss_keys_store" , ---- misc/xmlsec1-1.2.12/src/nss/keywrapers.c 2009-09-29 15:55:33.430875248 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/keywrapers.c 2009-09-29 15:49:39.749963247 +0200 +--- misc/xmlsec1-1.2.14/src/nss/keywrapers.c 2009-09-29 15:55:33.430875248 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/keywrapers.c 2009-09-29 15:49:39.749963247 +0200 @@ -1126,6 +1126,7 @@ NULL, /* void* reserved1; */ }; @@ -632,8 +581,8 @@ #endif /* XMLSEC_NO_DES */ ---- misc/xmlsec1-1.2.12/src/nss/pkikeys.c 2009-09-29 15:55:33.440002568 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/pkikeys.c 2009-09-29 15:49:39.757984523 +0200 +--- misc/xmlsec1-1.2.14/src/nss/pkikeys.c 2009-09-29 15:55:33.440002568 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/pkikeys.c 2009-09-29 15:49:39.757984523 +0200 @@ -491,7 +491,11 @@ static void xmlSecNssKeyDataDsaDebugXmlDump (xmlSecKeyDataPtr data, FILE* output); @@ -658,8 +607,8 @@ sizeof(xmlSecKeyDataKlass), xmlSecNssPKIKeyDataSize, ---- misc/xmlsec1-1.2.12/src/nss/signatures.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/signatures.c 2009-09-29 15:49:39.765851110 +0200 +--- misc/xmlsec1-1.2.14/src/nss/signatures.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/signatures.c 2009-09-29 15:49:39.765851110 +0200 @@ -459,7 +459,11 @@ * ***************************************************************************/ @@ -684,8 +633,8 @@ /* klass/object sizes */ sizeof(xmlSecTransformKlass), /* xmlSecSize klassSize */ xmlSecNssSignatureSize, /* xmlSecSize objSize */ ---- misc/xmlsec1-1.2.12/src/nss/symkeys.c 2009-09-29 15:55:33.448817761 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/symkeys.c 2009-09-29 15:49:39.773211741 +0200 +--- misc/xmlsec1-1.2.14/src/nss/symkeys.c 2009-09-29 15:55:33.448817761 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/symkeys.c 2009-09-29 15:49:39.773211741 +0200 @@ -856,7 +856,11 @@ * <xmlsec:AESKeyValue> processing * @@ -722,8 +671,8 @@ sizeof(xmlSecKeyDataKlass), xmlSecNssSymKeyDataSize, ---- misc/xmlsec1-1.2.12/src/nss/x509.c 2009-09-29 15:55:33.465839785 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/x509.c 2009-09-29 15:49:39.784408301 +0200 +--- misc/xmlsec1-1.2.14/src/nss/x509.c 2009-09-29 15:55:33.465839785 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/x509.c 2009-09-29 15:49:39.784408301 +0200 @@ -235,7 +235,11 @@ @@ -736,7 +685,7 @@ sizeof(xmlSecKeyDataKlass), xmlSecNssX509DataSize, -@@ -1779,7 +1783,11 @@ +@@ -1785,7 +1789,11 @@ xmlSecSize bufSize, xmlSecKeyInfoCtxPtr keyInfoCtx); @@ -748,8 +697,8 @@ sizeof(xmlSecKeyDataKlass), sizeof(xmlSecKeyData), ---- misc/xmlsec1-1.2.12/src/nss/x509vfy.c 2009-09-29 15:55:33.510337681 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/x509vfy.c 2009-09-29 15:49:39.791239957 +0200 +--- misc/xmlsec1-1.2.14/src/nss/x509vfy.c 2009-09-29 15:55:33.510337681 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/x509vfy.c 2009-09-29 15:49:39.791239957 +0200 @@ -64,7 +64,11 @@ static void xmlSecNssX509StoreFinalize (xmlSecKeyDataStorePtr store); static int xmlSecNssIntegerToItem( const xmlChar* integer , SECItem *it ) ; diff --git a/libxmlsec/xmlsec1-noverify.patch b/libxmlsec/xmlsec1-noverify.patch index 0015c8e62e7a..c51540caa2aa 100644 --- a/libxmlsec/xmlsec1-noverify.patch +++ b/libxmlsec/xmlsec1-noverify.patch @@ -1,6 +1,6 @@ ---- misc/xmlsec1-1.2.12/src/mscrypto/x509vfy.c 2009-06-25 22:53:18.000000000 +0200 -+++ misc/build/xmlsec1-1.2.12/src/mscrypto/x509vfy.c 2009-09-23 10:01:07.237316078 +0200 -@@ -559,9 +559,16 @@ +--- misc/xmlsec1-1.2.14/src/mscrypto/x509vfy.c 2009-06-25 22:53:18.000000000 +0200 ++++ misc/build/xmlsec1-1.2.14/src/mscrypto/x509vfy.c 2009-09-23 10:01:07.237316078 +0200 +@@ -567,9 +567,16 @@ CertFreeCertificateContext(nextCert); } @@ -20,8 +20,8 @@ } return (NULL); ---- misc/xmlsec1-1.2.12/src/nss/x509vfy.c 2009-09-23 10:06:52.989793254 +0200 -+++ misc/build/xmlsec1-1.2.12/src/nss/x509vfy.c 2009-09-23 10:05:03.183042205 +0200 +--- misc/xmlsec1-1.2.14/src/nss/x509vfy.c 2009-09-23 10:06:52.989793254 +0200 ++++ misc/build/xmlsec1-1.2.14/src/nss/x509vfy.c 2009-09-23 10:05:03.183042205 +0200 @@ -191,13 +191,27 @@ continue; } diff --git a/libxmlsec/xmlsec1-nssdisablecallbacks.patch b/libxmlsec/xmlsec1-nssdisablecallbacks.patch index 48b0b552441b..c6ed83a2c54d 100644 --- a/libxmlsec/xmlsec1-nssdisablecallbacks.patch +++ b/libxmlsec/xmlsec1-nssdisablecallbacks.patch @@ -1,5 +1,5 @@ ---- misc/xmlsec1-1.2.12.orig/src/nss/crypto.c 2009-09-10 07:06:17.000000000 -0400 -+++ misc/build/xmlsec1-1.2.12/src/nss/crypto.c 2009-09-10 07:08:24.000000000 -0400 +--- misc/xmlsec1-1.2.14.orig/src/nss/crypto.c 2009-09-10 07:06:17.000000000 -0400 ++++ misc/build/xmlsec1-1.2.14/src/nss/crypto.c 2009-09-10 07:08:24.000000000 -0400 @@ -136,6 +136,7 @@ /** * High level routines form xmlsec command line utility diff --git a/libxmlsec/xmlsec1-nssmangleciphers.patch b/libxmlsec/xmlsec1-nssmangleciphers.patch index 6d64914859a7..96f5049f68ae 100644 --- a/libxmlsec/xmlsec1-nssmangleciphers.patch +++ b/libxmlsec/xmlsec1-nssmangleciphers.patch @@ -1,5 +1,5 @@ ---- misc/xmlsec1-1.2.12/src/nss/ciphers.c 2009-09-10 05:16:27.000000000 -0400 -+++ misc/build/xmlsec1-1.2.12/src/nss/ciphers.c 2009-09-10 06:59:39.000000000 -0400 +--- misc/xmlsec1-1.2.14/src/nss/ciphers.c 2009-09-10 05:16:27.000000000 -0400 ++++ misc/build/xmlsec1-1.2.14/src/nss/ciphers.c 2009-09-10 06:59:39.000000000 -0400 @@ -11,180 +11,421 @@ #include <string.h> diff --git a/libxmlsec/xmlsec1-olderlibxml2.patch b/libxmlsec/xmlsec1-olderlibxml2.patch new file mode 100644 index 000000000000..b5f3d5747586 --- /dev/null +++ b/libxmlsec/xmlsec1-olderlibxml2.patch @@ -0,0 +1,23 @@ +--- misc/xmlsec1-1.2.14/src/c14n.c 2010-03-02 15:46:05.000000000 +0000 ++++ misc/build/xmlsec1-1.2.14/src/c14n.c 2010-03-02 15:50:35.000000000 +0000 +@@ -406,6 +406,20 @@ + return(0); + } + ++#if !defined(LIBXML_VERSION) || LIBXML_VERSION < 20706 ++/* ++ * xmlC14NMode: ++ * ++ * Predefined values for C14N modes ++ * ++ */ ++typedef enum { ++ XML_C14N_1_0 = 0, /* Origianal C14N 1.0 spec */ ++ XML_C14N_EXCLUSIVE_1_0 = 1, /* Exclusive C14N 1.0 spec */ ++ XML_C14N_1_1 = 2 /* C14N 1.1 spec */ ++} xmlC14NMode; ++#endif ++ + static int + xmlSecTransformC14NExecute(xmlSecTransformId id, xmlSecNodeSetPtr nodes, xmlChar** nsList, + xmlOutputBufferPtr buf) { diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch index fc446a4e5727..c6c780668554 100644 --- a/lpsolve/lp_solve_5.5.patch +++ b/lpsolve/lp_solve_5.5.patch @@ -26,7 +26,10 @@ +rm *.o 2>/dev/null --- misc/lp_solve_5.5/lpsolve55/ccc.osx Thu Jun 23 22:53:08 2005 +++ misc/build/lp_solve_5.5/lpsolve55/ccc.osx Wed May 21 17:19:56 2008 -@@ -3,6 +3,10 @@ +@@ -1,8 +1,12 @@ + src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' +-c=cc ++c=$CC def= so= diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk index 63738c127e79..3e66303b038a 100644 --- a/lpsolve/makefile.mk +++ b/lpsolve/makefile.mk @@ -37,6 +37,7 @@ TARGET=lpsolve # --- Files -------------------------------------------------------- TARFILE_NAME=lp_solve_5.5 +TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8 .IF "$(GUI)"=="WNT" PATCH_FILES=lp_solve_5.5-windows.patch diff --git a/lucene/makefile.mk b/lucene/makefile.mk index 23111eaee861..3ce8f058c942 100644 --- a/lucene/makefile.mk +++ b/lucene/makefile.mk @@ -49,6 +49,7 @@ LUCENE_CORE_JAR=lucene-core-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar LUCENE_ANALYZERS_JAR=lucene-analyzers-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar TARFILE_NAME=$(LUCENE_NAME) +TARFILE_MD5=48d8169acc35f97e05d8dcdfd45be7f2 PATCH_FILES=lucene.patch BUILD_DIR=. diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk index b8ae91492e2e..9fe9c646ab7a 100644 --- a/mysqlcppconn/makefile.mk +++ b/mysqlcppconn/makefile.mk @@ -43,6 +43,7 @@ EXT_PROJECT_NAME=mysql-connector-cpp # --- Files -------------------------------------------------------- TARFILE_NAME=$(EXT_PROJECT_NAME) +TARFILE_MD5=831126a1ee5af269923cfab6050769fe ADDITIONAL_FILES=\ driver$/makefile.mk \ driver$/nativeapi$/makefile.mk \ diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/mozsrc/npunix.c index bac0a38f10d4..55d0fa5316d2 100644 --- a/np_sdk/mozsrc/npunix.c +++ b/np_sdk/mozsrc/npunix.c @@ -1,25 +1,41 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ + * ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Stephen Mak <smak@sun.com> - */ + * Stephen Mak <smak@sun.com> + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ /* * npunix.c @@ -223,8 +239,6 @@ NPN_ForceRedraw(NPP instance) CallNPN_ForceRedrawProc(gNetscapeFuncs.forceredraw, instance); } - - /*********************************************************************** * * Wrapper functions : Netscape Navigator -> plugin @@ -364,7 +378,7 @@ NP_GetMIMEDescription(void) * that the navigator needs. */ NPError -NP_GetValue(NPP future, NPPVariable variable, void *value) +NP_GetValue(void* future, NPPVariable variable, void *value) { return NPP_GetValue(future, variable, value); } diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 42d770c95d3f..081680781a2c 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -49,6 +49,7 @@ TARGET=openssl OPENSSL_NAME=openssl-0.9.8l TARFILE_NAME=$(OPENSSL_NAME) +TARFILE_MD5=05a0ece1372392a2cf310ebb96333025 CONFIGURE_DIR=. CONFIGURE_ACTION=config diff --git a/redland/README b/redland/README index d01ae085cc66..87299ebf1fd4 100644 --- a/redland/README +++ b/redland/README @@ -22,7 +22,8 @@ Libraries: libraptor, librasqal, librdf Patches: There are several patches, most of which contain only hacks to get it to build with OOo build system. -There are also 3 patches that fix bugs in redland and are of general interest: +There used to be also 3 patches here that fix bugs in redland and ought to be +of general interest: - redland-1.0.8.patch.free_null: redland destructor functions don't check if argument is NULL - redland-1.0.8.patch.storage_hashes_context_serialize_get_statement: @@ -31,4 +32,7 @@ There are also 3 patches that fix bugs in redland and are of general interest: - redland-1.0.8.patch.storage_hashes_list_duplicates: hashes, list storage: if contexts are enabled, then it is possible to add duplicate statements +Attempts to upstream these patches failed for reasons upstream kept to +themselves. Now these patches are replaced with workarounds in unoxml. +Note to future maintainers: work around redland bugs in client code. diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 4980063203ad..1375ae878497 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -47,6 +47,7 @@ all: RAPTORVERSION=$(RAPTOR_MAJOR).4.18 TARFILE_NAME=raptor-$(RAPTORVERSION) +TARFILE_MD5=284e768eeda0e2898b0d5bf7e26a016e ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h diff --git a/redland/raptor/raptor2.map b/redland/raptor/raptor2.map index 8c0cb819f9ff..109a74b632bb 100644 --- a/redland/raptor/raptor2.map +++ b/redland/raptor/raptor2.map @@ -1,4 +1,4 @@ -RAPTOR2 { +UDK_3_0_0 { global: GetVersionInfo; raptor_ntriples_string_as_utf8_string; diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index fc9e93baaa6d..d48b7af39cb4 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -47,6 +47,7 @@ all: RASQALVERSION=0.9.16 TARFILE_NAME=rasqal-$(RASQALVERSION) +TARFILE_MD5=fca8706f2c4619e2fa3f8f42f8fc1e9d ADDITIONAL_FILES=src/makefile.mk src/rasqal_config.h diff --git a/redland/rasqal/rasqal2.map b/redland/rasqal/rasqal2.map index b36d25c9664b..622043ac984c 100644 --- a/redland/rasqal/rasqal2.map +++ b/redland/rasqal/rasqal2.map @@ -1,4 +1,4 @@ -RASQAL2 { +UDK_3_0_0 { global: GetVersionInfo; rasqal_xsd_decimal_set_string; diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index c89724087dc9..d6acd4d8ea4d 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -47,6 +47,7 @@ all: REDLANDVERSION=1.0.8 TARFILE_NAME=redland-$(REDLANDVERSION) +TARFILE_MD5=ca66e26082cab8bb817185a116db809b ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h @@ -58,9 +59,7 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.win32 PATCH_FILES=$(OOO_PATCH_FILES) \ - $(TARFILE_NAME).patch.free_null \ - $(TARFILE_NAME).patch.storage_hashes_context_serialize_get_statement \ - $(TARFILE_NAME).patch.storage_hashes_list_duplicates + .IF "$(OS)"=="OS2" BUILD_ACTION=dmake diff --git a/redland/redland/redland-1.0.8.patch.free_null b/redland/redland/redland-1.0.8.patch.free_null deleted file mode 100644 index 0524bb636b5e..000000000000 --- a/redland/redland/redland-1.0.8.patch.free_null +++ /dev/null @@ -1,174 +0,0 @@ ---- misc/redland-1.0.8/librdf/rdf_digest.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_digest.c Thu Nov 6 12:44:39 2008 -@@ -248,6 +248,8 @@ - void - librdf_free_digest(librdf_digest *digest) - { -+ if(!digest) -+ return; - if(digest->context) - LIBRDF_FREE(digest_context, digest->context); - if(digest->digest) ---- misc/redland-1.0.8/librdf/rdf_hash.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_hash.c Thu Nov 6 12:44:39 2008 -@@ -488,6 +488,8 @@ - void - librdf_free_hash(librdf_hash* hash) - { -+ if(!hash) -+ return; - if(hash->context) { - if(hash->is_open) - librdf_hash_close(hash); ---- misc/redland-1.0.8/librdf/rdf_init.c Tue Nov 6 16:26:18 2007 -+++ misc/build/redland-1.0.8/librdf/rdf_init.c Mon Jun 16 15:55:51 2008 -@@ -178,6 +178,9 @@ - void - librdf_free_world(librdf_world *world) - { -+ if(!world) -+ return; -+ - /* NOTE: raptor is always initialised as a parser and may - * be also used as a serializer, but it is NOT finished - * in the serializer_raptor registration. Therefore, always ---- misc/redland-1.0.8/librdf/rdf_list.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_list.c Thu Nov 6 12:44:39 2008 -@@ -106,6 +106,8 @@ - void - librdf_free_list(librdf_list* list) - { -+ if(!list) -+ return; - LIBRDF_ASSERT_RETURN(list->iterator_count, - "Iterators were active on freeing list", ); - ---- misc/redland-1.0.8/librdf/rdf_model.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_model.c Thu Nov 6 12:44:39 2008 -@@ -391,7 +391,8 @@ - librdf_iterator* iterator; - librdf_model* m; - -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(model, librdf_model); -+ if(!model) -+ return; - - if(--model->usage) - return; ---- misc/redland-1.0.8/librdf/rdf_node.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_node.c Thu Nov 6 12:44:39 2008 -@@ -724,7 +724,8 @@ - librdf_world *world; - #endif - -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(node, librdf_node); -+ if(!node) -+ return; - - #ifdef WITH_THREADS - world = node->world; ---- misc/redland-1.0.8/librdf/rdf_parser.c Tue Jul 1 08:09:58 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_parser.c Thu Nov 6 12:44:39 2008 -@@ -369,7 +369,8 @@ - void - librdf_free_parser(librdf_parser *parser) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(parser, librdf_parser); -+ if(!parser) -+ return; - - if(parser->context) { - if(parser->factory->terminate) ---- misc/redland-1.0.8/librdf/rdf_query.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_query.c Thu Nov 6 12:44:39 2008 -@@ -386,7 +386,8 @@ - void - librdf_free_query(librdf_query* query) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query, librdf_query); -+ if(!query) -+ return; - - if(--query->usage) - return; ---- misc/redland-1.0.8/librdf/rdf_query_results.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_query_results.c Thu Nov 6 12:44:39 2008 -@@ -242,7 +242,8 @@ - void - librdf_free_query_results(librdf_query_results* query_results) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(query_results, librdf_query_results); -+ if(!query_results) -+ return; - - if(query_results->query->factory->free_results) - query_results->query->factory->free_results(query_results); -@@ -634,6 +635,8 @@ - void - librdf_free_query_results_formatter(librdf_query_results_formatter* formatter) - { -+ if(!formatter) -+ return; - if(formatter->query_results->query->factory->free_results_formatter) - formatter->query_results->query->factory->free_results_formatter(formatter); - } ---- misc/redland-1.0.8/librdf/rdf_serializer.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_serializer.c Thu Nov 6 12:44:39 2008 -@@ -371,7 +371,8 @@ - void - librdf_free_serializer(librdf_serializer *serializer) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(serializer, librdf_serializer); -+ if(!serializer) -+ return; - - if(serializer->context) { - if(serializer->factory->terminate) ---- misc/redland-1.0.8/librdf/rdf_statement.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_statement.c Thu Nov 6 12:44:39 2008 -@@ -253,7 +253,8 @@ - librdf_world *world; - #endif - -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(statement, librdf_statement); -+ if(!statement) -+ return; - - #ifdef WITH_THREADS - world = statement->world; ---- misc/redland-1.0.8/librdf/rdf_storage.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_storage.c Thu Nov 6 12:44:39 2008 -@@ -610,7 +610,8 @@ - void - librdf_free_storage(librdf_storage* storage) - { -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(storage, librdf_storage); -+ if(!storage) -+ return; - - if(--storage->usage) - return; ---- misc/redland-1.0.8/librdf/rdf_stream.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_stream.c Thu Nov 6 12:44:39 2008 -@@ -124,6 +124,9 @@ - void - librdf_free_stream(librdf_stream* stream) - { -+ if(!stream) -+ return; -+ - if(stream->finished_method) - stream->finished_method(stream->context); - ---- misc/redland-1.0.8/librdf/rdf_uri.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_uri.c Thu Nov 6 12:44:39 2008 -@@ -407,7 +407,8 @@ - librdf_world *world; - #endif - -- LIBRDF_ASSERT_OBJECT_POINTER_RETURN(uri, librdf_uri); -+ if(!uri) -+ return; - - #ifdef WITH_THREADS - world = uri->world; diff --git a/redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement b/redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement deleted file mode 100644 index 8c72946d199f..000000000000 --- a/redland/redland/redland-1.0.8.patch.storage_hashes_context_serialize_get_statement +++ /dev/null @@ -1,35 +0,0 @@ ---- misc/redland-1.0.8/librdf/rdf_storage_hashes.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_storage_hashes.c Thu Nov 6 12:44:39 2008 -@@ -1593,7 +1661,6 @@ - { - librdf_storage_hashes_context_serialise_stream_context* scontext=(librdf_storage_hashes_context_serialise_stream_context*)context; - librdf_hash_datum* v; -- librdf_node** cnp=NULL; - - switch(flags) { - case LIBRDF_ITERATOR_GET_METHOD_GET_OBJECT: -@@ -1606,20 +1673,14 @@ - return scontext->context_node; - } - -- /* current stuff is out of date - get new cached answers */ -- if(scontext->index_contexts) { -- if(scontext->context_node) -- librdf_free_node(scontext->context_node); -- scontext->context_node=NULL; -- cnp=&scontext->context_node; -- } -- -+ /* note: scontext->context_node is still valid */ -+ - librdf_statement_clear(&scontext->current); - - v=(librdf_hash_datum*)librdf_iterator_get_value(scontext->iterator); -- -+ - /* decode value content and optional context */ -- if(!librdf_statement_decode_parts(&scontext->current, cnp, -+ if(!librdf_statement_decode_parts(&scontext->current, NULL, - (unsigned char*)v->data, v->size)) { - return NULL; - } diff --git a/redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates b/redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates deleted file mode 100644 index d2ef7e772230..000000000000 --- a/redland/redland/redland-1.0.8.patch.storage_hashes_list_duplicates +++ /dev/null @@ -1,170 +0,0 @@ ---- misc/redland-1.0.8/librdf/rdf_storage_hashes.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_storage_hashes.c Thu Nov 6 12:44:39 2008 -@@ -1387,6 +1387,66 @@ - LIBRDF_STATEMENT_OBJECT); - } - -+ -+/* return -1 on failure, 1 if context contains stmt, 0 if not */ -+static int -+librdf_storage_hashes_context_contains_statement(librdf_storage* storage, -+ librdf_node* context_node, -+ librdf_statement* statement) -+{ -+ librdf_storage_hashes_context* context=(librdf_storage_hashes_context*)storage->context; -+ librdf_hash_datum key, value; /* on stack - not allocated */ -+ size_t size; -+ int status; -+ -+ if(context->contexts_index < 0) { -+ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, -+ "Storage was created without context support"); -+ return -1; -+ } -+ -+ /* ENCODE KEY */ -+ size=librdf_node_encode(context_node, NULL, 0); -+ if (!size) -+ return -1; -+ key.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!key.data) -+ return -1; -+ key.size=librdf_node_encode(context_node, -+ (unsigned char*)key.data, size); -+ if (!key.size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ /* ENCODE VALUE */ -+ size=librdf_statement_encode(statement, NULL, 0); -+ if (!size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!value.data) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); -+ if (!value.size) { -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ status=librdf_hash_exists(context->hashes[context->contexts_index], &key, &value); -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ -+ /* DO NOT free statement, ownership was not passed in */ -+ return status; -+} -+ -+ -+ - /** - * librdf_storage_hashes_context_add_statement: - * @storage: #librdf_storage object -@@ -1412,7 +1472,15 @@ - "Storage was created without context support"); - return 1; - } -- -+ -+ /* Do not add duplicate statements */ -+ status=librdf_storage_hashes_context_contains_statement(storage, context_node, statement); -+ if(status) -+ if(status < 0) -+ return 1; -+ else -+ return 0; -+ - if(librdf_storage_hashes_add_remove_statement(storage, - statement, context_node, 1)) - return 1; ---- misc/redland-1.0.8/librdf/rdf_storage_list.c Tue Jul 1 05:10:26 2008 -+++ misc/build/redland-1.0.8/librdf/rdf_storage_list.c Thu Nov 6 12:44:39 2008 -@@ -457,6 +457,64 @@ - } - - -+/* return -1 on failure, 1 if context contains stmt, 0 if not */ -+static int -+librdf_storage_list_context_contains_statement(librdf_storage* storage, -+ librdf_node* context_node, -+ librdf_statement* statement) -+{ -+ librdf_storage_list_context* context=(librdf_storage_list_context*)storage->context; -+ librdf_hash_datum key, value; /* on stack - not allocated */ -+ size_t size; -+ int status; -+ -+ if(!context->index_contexts) { -+ librdf_log(storage->world, 0, LIBRDF_LOG_WARN, LIBRDF_FROM_STORAGE, NULL, -+ "Storage was created without context support"); -+ return -1; -+ } -+ -+ /* ENCODE KEY */ -+ size=librdf_node_encode(context_node, NULL, 0); -+ if (!size) -+ return -1; -+ key.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!key.data) -+ return -1; -+ key.size=librdf_node_encode(context_node, -+ (unsigned char*)key.data, size); -+ if (!key.size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ /* ENCODE VALUE */ -+ size=librdf_statement_encode(statement, NULL, 0); -+ if (!size) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.data=(char*)LIBRDF_MALLOC(cstring, size); -+ if (!value.data) { -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ value.size=librdf_statement_encode(statement, (unsigned char*)value.data, size); -+ if (!value.size) { -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ return -1; -+ } -+ -+ status=librdf_hash_exists(context->contexts, &key, &value); -+ LIBRDF_FREE(data, value.data); -+ LIBRDF_FREE(data, key.data); -+ -+ /* DO NOT free statement, ownership was not passed in */ -+ return status; -+} -+ -+ - /** - * librdf_storage_list_context_add_statement: - * @storage: #librdf_storage object -@@ -483,7 +541,15 @@ - "Storage was created without context support"); - return 1; - } -- -+ -+ /* Do not add duplicate statements */ -+ status=librdf_storage_list_context_contains_statement(storage, context_node, statement); -+ if(status) -+ if(status < 0) -+ return 1; -+ else -+ return 0; -+ - /* Store statement + node in the storage_list */ - sln=(librdf_storage_list_node*)LIBRDF_MALLOC(librdf_storage_list_node, sizeof(librdf_storage_list_node)); - if(!sln) diff --git a/redland/redland/redland2.map b/redland/redland/redland2.map index 660f80a0b8a4..5798f461684b 100644 --- a/redland/redland/redland2.map +++ b/redland/redland/redland2.map @@ -1,4 +1,4 @@ -REDLAND2 { +UDK_3_0_0 { global: GetVersionInfo; librdf_get_concept_resource_by_index; diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 2facbe2dea00..008fb0caef2d 100755 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -39,6 +39,7 @@ TARGET=ooo_rhino # --- Files -------------------------------------------------------- TARFILE_NAME=rhino1_5R5 +TARFILE_MD5=798b2ffdc8bcfe7bca2cf92b62caf685 TARFILE_ROOTDIR=rhino1_5R5 ADDITIONAL_FILES= \ diff --git a/rhino/rhino1_5R5-find_swing.patch b/rhino/rhino1_5R5-find_swing.patch index e94974a41574..220c4f4e668a 100644 --- a/rhino/rhino1_5R5-find_swing.patch +++ b/rhino/rhino1_5R5-find_swing.patch @@ -1,13 +1,11 @@ --- misc/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:46.605524507 +0100 +++ misc/build/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:26.536908810 +0100 -@@ -12,6 +12,10 @@ +@@ -12,6 +12,8 @@ <os family="unix"/> </and> </condition> + <property environment="solenv"/> -+ <condition property="swing_zip" value="${solenv.TARFILE_LOCATION}/swingExSrc.zip" else="../../../../../download/swingExSrc.zip"> -+ <isset property="solenv.TARFILE_LOCATION" /> -+ </condition> ++ <property name="swing_zip" value="${solenv.TARFILE_LOCATION}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"/> <path id="macPath" location="${java.home}/../Classes/classes.jar"/> <!-- rhino.jar from OpenJDK breaks build --> <path id="nonMacPath"> diff --git a/vigra/makefile.mk b/vigra/makefile.mk index b598de27152a..db08373faf52 100644 --- a/vigra/makefile.mk +++ b/vigra/makefile.mk @@ -47,6 +47,7 @@ all: # --- Files -------------------------------------------------------- TARFILE_NAME=vigra1.4.0 +TARFILE_MD5=ea91f2fb4212a21d708aced277e6e85a PATCH_FILES=$(TARFILE_NAME).patch CONFIGURE_DIR= diff --git a/xsltml/makefile.mk b/xsltml/makefile.mk index 7d86ca9da92f..7c1a37c75580 100755 --- a/xsltml/makefile.mk +++ b/xsltml/makefile.mk @@ -39,6 +39,7 @@ TARGET=xsltml # --- Files -------------------------------------------------------- TARFILE_NAME=xsltml_2.1.2 +TARFILE_MD5=a7983f859eafb2677d7ff386a023bc40 PATCH_FILES=$(TARFILE_NAME).patch TARFILE_IS_FLAT:=TRUE |