ooo-build r12013 - in trunk: . distro-configs patches patches/src680 patches/src680-only

[pmladek svn gnome org]

Author: pmladek
Date: Wed Mar 26 18:00:29 2008
New Revision: 12013
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12013&view=rev

Log:
2008-03-26  Petr Mladek  <pmladek suse cz>

	* distro-configs/CommonLinux.conf.in: add --with-system-openssl

	* patches/src680/default-openssl-no-idea-alg.diff:
	* patches/src680/apply: disable the IDEA algorithm in the internal
	  openssl; It is pattented. There is no license fee only for
	  non-commercial use. This change actually affects only the Windows
	  builds because the others should use --with-system-openssl



Added:
   trunk/patches/src680-only/Makefile.am
   trunk/patches/src680/default-openssl-no-idea-alg.diff
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/distro-configs/CommonLinux.conf.in
   trunk/patches/Makefile.am
   trunk/patches/src680-only/   (props changed)
   trunk/patches/src680/apply

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Mar 26 18:00:29 2008
@@ -1187,6 +1187,7 @@
 patches/postgresql/Makefile
 patches/scsolver/Makefile
 patches/src680/Makefile
+patches/src680-only/Makefile
 patches/64bit/Makefile
 po/Makefile
 doc/Makefile

Modified: trunk/distro-configs/CommonLinux.conf.in
==============================================================================
--- trunk/distro-configs/CommonLinux.conf.in	(original)
+++ trunk/distro-configs/CommonLinux.conf.in	Wed Mar 26 18:00:29 2008
@@ -7,6 +7,7 @@
 --with-system-jpeg
 --with-system-libxml
 --with-system-mozilla
+--with-system-openssl
 --with-system-python
 --with-system-stdlibs
 --with-system-zlib

Modified: trunk/patches/Makefile.am
==============================================================================
--- trunk/patches/Makefile.am	(original)
+++ trunk/patches/Makefile.am	Wed Mar 26 18:00:29 2008
@@ -1,3 +1,3 @@
-SUBDIRS=64bit cairo emf+ evo2 gstreamer hotfixes mono ooxml scsolver src680 vba postgresql
+SUBDIRS=64bit cairo emf+ evo2 gstreamer hotfixes mono ooxml scsolver src680 src680-only vba postgresql
 
 EXTRA_DIST=README apply.pl.in $(wildcard *.diff)

Added: trunk/patches/src680-only/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/patches/src680-only/Makefile.am	Wed Mar 26 18:00:29 2008
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.diff)

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Mar 26 18:00:29 2008
@@ -978,6 +978,12 @@
 # Pack new JAVA Runtime
 javaversion.diff
 
+# disable the IDEA algorithm in the internal openssl; It is pattented.
+# There is no license fee only for non-commercial use.
+# This change actually affects only the Windows builds because the others
+# should use --with-system-openssl
+default-openssl-no-idea-alg.diff, pmladek
+
 [ Features ]
 # load and save also odf documents in flat xml format as opposed to the
 # compressed ones (conforming to the odf specifications)

Added: trunk/patches/src680/default-openssl-no-idea-alg.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/default-openssl-no-idea-alg.diff	Wed Mar 26 18:00:29 2008
@@ -0,0 +1,20 @@
+--- openssl/makefile.mk.old	2008-01-18 14:02:56.000000000 +0100
++++ openssl/makefile.mk	2008-03-26 18:16:35.000000000 +0100
+@@ -60,7 +60,7 @@ TARFILE_NAME=$(OPENSSL_NAME)
+ 
+ CONFIGURE_DIR=.
+ CONFIGURE_ACTION=config
+-CONFIGURE_FLAGS=-I$(SYSBASE)$/usr$/include -L$(SYSBASE)$/usr$/lib shared 
++CONFIGURE_FLAGS=-I$(SYSBASE)$/usr$/include -L$(SYSBASE)$/usr$/lib shared no-idea
+ 
+ BUILD_DIR=.
+ BUILD_ACTION=make CC='$(CC)'
+@@ -123,7 +123,7 @@ OUT2INC += include/openssl/*
+ 
+ 		#CONFIGURE_ACTION=cmd /c $(PERL:s!\!/!) configure
+ 		CONFIGURE_ACTION=$(PERL) configure
+-		CONFIGURE_FLAGS=VC-WIN32
++		CONFIGURE_FLAGS=VC-WIN32 no-idea
+ 		BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\ $(normpath,1 $(PERL)))" && nmake -f ms/ntdll.mak
+ 
+ 		OUT2LIB = out32dll$/ssleay32.lib