r1662 - in trunk

stsp at user.in-berlin.de stsp at user.in-berlin.de
Fri Dec 22 16:57:26 CET 2006 

Author: stsp
Date: 2006-12-22 16:57:21 +0100 (Fri, 22 Dec 2006)
New Revision: 1662

Log:
New port of OpenSSL-0.9.8b. This time, put all source code
into a subdirectory, and have lib/libssl/Makefile
run the configure script, instead of using pre-generated
configuration files hacked to work with DSLinux.

I only had to apply a very small diff to src/Configure to
make this work. So this way our diff against upsteam is
much smaller than it used to be.


Added:
   trunk/lib/libssl/Makefile
   trunk/lib/libssl/src/

Removed:
   trunk/lib/libssl/CHANGES
   trunk/lib/libssl/CHANGES.SSLeay
   trunk/lib/libssl/ChangeLog.0_9_7-stable_not-in-head
   trunk/lib/libssl/ChangeLog.0_9_7-stable_not-in-head_FIPS
   trunk/lib/libssl/Configure
   trunk/lib/libssl/FAQ
   trunk/lib/libssl/INSTALL
   trunk/lib/libssl/INSTALL.DJGPP
   trunk/lib/libssl/INSTALL.MacOS
   trunk/lib/libssl/INSTALL.NW
   trunk/lib/libssl/INSTALL.OS2
   trunk/lib/libssl/INSTALL.VMS
   trunk/lib/libssl/INSTALL.W32
   trunk/lib/libssl/INSTALL.W64
   trunk/lib/libssl/INSTALL.WCE
   trunk/lib/libssl/LICENSE
   trunk/lib/libssl/MacOS/
   trunk/lib/libssl/Makefile
   trunk/lib/libssl/Makefile.org
   trunk/lib/libssl/Makefile.shared
   trunk/lib/libssl/NEWS
   trunk/lib/libssl/Netware/
   trunk/lib/libssl/PROBLEMS
   trunk/lib/libssl/README
   trunk/lib/libssl/README.ASN1
   trunk/lib/libssl/README.ENGINE
   trunk/lib/libssl/VMS/
   trunk/lib/libssl/apps/
   trunk/lib/libssl/bugs/
   trunk/lib/libssl/certs/
   trunk/lib/libssl/config
   trunk/lib/libssl/crypto/
   trunk/lib/libssl/demos/
   trunk/lib/libssl/doc/
   trunk/lib/libssl/e_os.h
   trunk/lib/libssl/e_os2.h
   trunk/lib/libssl/engines/
   trunk/lib/libssl/include/
   trunk/lib/libssl/install.com
   trunk/lib/libssl/makevms.com
   trunk/lib/libssl/ms/
   trunk/lib/libssl/openssl.doxy
   trunk/lib/libssl/openssl.spec
   trunk/lib/libssl/os2/
   trunk/lib/libssl/shlib/
   trunk/lib/libssl/ssl/
   trunk/lib/libssl/test/
   trunk/lib/libssl/times/
   trunk/lib/libssl/tools/
   trunk/lib/libssl/util/

Modified:
   trunk/include/Makefile
   trunk/lib/Makefile
   trunk/lib/libssl/src/Configure
   trunk/lib/libssl/src/Makefile
   trunk/lib/libssl/src/crypto/opensslconf.h
   trunk/lib/libssl/src/tools/c_rehash

Modified: trunk/include/Makefile
===================================================================
--- trunk/include/Makefile	2006-12-22 15:32:10 UTC (rev 1661)
+++ trunk/include/Makefile	2006-12-22 15:57:21 UTC (rev 1662)
@@ -28,7 +28,7 @@
 	$(ROOTDIR)/lib/libidn/lib/*.h,. \
 	$(ROOTDIR)/lib/libcurl/include/curl/*.h,curl \
 	$(ROOTDIR)/lib/libpcap/net/bpf.h,net \
-	$(ROOTDIR)/lib/libssl/include/*,. \
+	$(ROOTDIR)/lib/libssl/src/include/*,. \
 	$(ROOTDIR)/lib/zlib/*.h,. \
 	$(ROOTDIR)/lib/libbzip2/bzlib.h,. \
 	$(ROOTDIR)/prop/libsnapgear/include/*.h,. \

Modified: trunk/lib/Makefile
===================================================================
--- trunk/lib/Makefile	2006-12-22 15:32:10 UTC (rev 1661)
+++ trunk/lib/Makefile	2006-12-22 15:57:21 UTC (rev 1662)
@@ -154,7 +154,7 @@
 	$(ROOTDIR)/lib/libidn/build/lib/.libs/libidn.a \
 	$(ROOTDIR)/lib/libcurl/build/lib/.libs/libcurl.a \
 	$(ROOTDIR)/lib/libcurl/build/lib/.libs/libcurl.so \
-	$(ROOTDIR)/lib/libssl/*.so* $(ROOTDIR)/lib/libssl/*.a \
+	$(ROOTDIR)/lib/libssl/src/*.so* $(ROOTDIR)/lib/libssl/src/*.a \
 	$(ROOTDIR)/lib/zlib/libz.a \
 	$(ROOTDIR)/lib/libbzip2/libbz2.so* \
 	$(ROOTDIR)/lib/libatm/src/lib/*.so* $(ROOTDIR)/lib/libatm/src/lib/*.a \

Deleted: trunk/lib/libssl/CHANGES

Deleted: trunk/lib/libssl/CHANGES.SSLeay

Deleted: trunk/lib/libssl/ChangeLog.0_9_7-stable_not-in-head

Deleted: trunk/lib/libssl/ChangeLog.0_9_7-stable_not-in-head_FIPS

Deleted: trunk/lib/libssl/Configure

Deleted: trunk/lib/libssl/FAQ

Deleted: trunk/lib/libssl/INSTALL

Deleted: trunk/lib/libssl/INSTALL.DJGPP

Deleted: trunk/lib/libssl/INSTALL.MacOS

Deleted: trunk/lib/libssl/INSTALL.NW

Deleted: trunk/lib/libssl/INSTALL.OS2

Deleted: trunk/lib/libssl/INSTALL.VMS

Deleted: trunk/lib/libssl/INSTALL.W32

Deleted: trunk/lib/libssl/INSTALL.W64

Deleted: trunk/lib/libssl/INSTALL.WCE

Deleted: trunk/lib/libssl/LICENSE

Deleted: trunk/lib/libssl/Makefile

Added: trunk/lib/libssl/Makefile

Deleted: trunk/lib/libssl/Makefile.org

Deleted: trunk/lib/libssl/Makefile.shared

Deleted: trunk/lib/libssl/NEWS

Deleted: trunk/lib/libssl/PROBLEMS

Deleted: trunk/lib/libssl/README

Deleted: trunk/lib/libssl/README.ASN1

Deleted: trunk/lib/libssl/README.ENGINE

Deleted: trunk/lib/libssl/config

Deleted: trunk/lib/libssl/e_os.h

Deleted: trunk/lib/libssl/e_os2.h

Deleted: trunk/lib/libssl/install.com

Deleted: trunk/lib/libssl/makevms.com

Deleted: trunk/lib/libssl/openssl.doxy

Deleted: trunk/lib/libssl/openssl.spec

Copied: trunk/lib/libssl/src (from rev 1659, tags/openssl/openssl_0_9_8b/lib/libssl)

Modified: trunk/lib/libssl/src/Configure
===================================================================
--- tags/openssl/openssl_0_9_8b/lib/libssl/Configure	2006-12-22 13:40:53 UTC (rev 1659)
+++ trunk/lib/libssl/src/Configure	2006-12-22 15:57:21 UTC (rev 1662)
@@ -354,6 +354,9 @@
 "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
 
+# DSLinux
+"dslinux","$ENV{'CC'}:$ENV{'CFLAGS'} -DL_ENDIAN -DTERMIO -Wall:::::::::-fPIC::",
+
 #### *BSD [do see comment about ${BSDthreads} above!]
 "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "BSD-x86",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -1289,7 +1292,7 @@
 	s/^CONFIGURE_ARGS=.*$/CONFIGURE_ARGS=$argvstring/;
 	s/^CC=.*$/CC= $cc/;
 	s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
-	s/^CFLAG=.*$/CFLAG= $cflags/;
+	s/^CFLAGS=.*$/CFLAGS= $cflags/;
 	s/^DEPFLAG=.*$/DEPFLAG= $depflags/;
 	s/^EX_LIBS=.*$/EX_LIBS= $lflags/;
 	s/^EXE_EXT=.*$/EXE_EXT= $exe_ext/;
@@ -1342,7 +1345,7 @@
 rename("$Makefile.new",$Makefile) || die "unable to rename $Makefile.new\n";
 
 print "CC            =$cc\n";
-print "CFLAG         =$cflags\n";
+print "CFLAGS        =$cflags\n";
 print "EX_LIBS       =$lflags\n";
 print "CPUID_OBJ     =$cpuid_obj\n";
 print "BN_ASM        =$bn_obj\n";

Modified: trunk/lib/libssl/src/Makefile
===================================================================
--- tags/openssl/openssl_0_9_8b/lib/libssl/Makefile	2006-12-22 13:40:53 UTC (rev 1659)
+++ trunk/lib/libssl/src/Makefile	2006-12-22 15:57:21 UTC (rev 1662)
@@ -12,9 +12,9 @@
 SHLIB_MAJOR=0
 SHLIB_MINOR=9.8
 SHLIB_EXT=
-PLATFORM=dist
-OPTIONS= no-gmp no-krb5 no-mdc2 no-rc5 no-shared no-zlib no-zlib-dynamic
-CONFIGURE_ARGS=dist
+PLATFORM=dslinux
+OPTIONS=--prefix=/nonexistent no-asm no-gmp no-hw no-krb5 no-mdc2 no-rc5 no-shared no-threads no-zlib no-zlib-dynamic
+CONFIGURE_ARGS=no-shared no-threads no-asm no-krb5 no-hw --prefix=/nonexistent dslinux
 SHLIB_TARGET=
 
 # HERE indicates where this Makefile lives.  This can be used to indicate
@@ -26,10 +26,10 @@
 # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
 # Normally it is left empty.
 INSTALL_PREFIX=
-INSTALLTOP=/usr/local/ssl
+INSTALLTOP=/nonexistent
 
 # Do not edit this manually. Use Configure --openssldir=DIR do change this!
-OPENSSLDIR=/usr/local/ssl
+OPENSSLDIR=/nonexistent/ssl
 
 # NO_IDEA - Define to build without the IDEA algorithm
 # NO_RC4  - Define to build without the RC4 algorithm
@@ -59,7 +59,7 @@
 # equal 4.
 # PKCS1_CHECK - pkcs1 tests.
 
-CC= cc
+CC= ucfront-gcc arm-linux-elf-gcc
 CFLAG= -O
 DEPFLAG= -DOPENSSL_NO_GMP -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 
 PEX_LIBS= 

Modified: trunk/lib/libssl/src/crypto/opensslconf.h
===================================================================
--- tags/openssl/openssl_0_9_8b/lib/libssl/crypto/opensslconf.h	2006-12-22 13:40:53 UTC (rev 1659)
+++ trunk/lib/libssl/src/crypto/opensslconf.h	2006-12-22 15:57:21 UTC (rev 1662)
@@ -18,6 +18,12 @@
 #endif
 
 #endif /* OPENSSL_DOING_MAKEDEPEND */
+#ifndef OPENSSL_NO_ASM
+# define OPENSSL_NO_ASM
+#endif
+#ifndef OPENSSL_NO_HW
+# define OPENSSL_NO_HW
+#endif
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
@@ -48,8 +54,8 @@
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/local/ssl/lib/engines"
-#define OPENSSLDIR "/usr/local/ssl"
+#define ENGINESDIR "/nonexistent/lib/engines"
+#define OPENSSLDIR "/nonexistent/ssl"
 #endif
 #endif
 

Modified: trunk/lib/libssl/src/tools/c_rehash
===================================================================
--- tags/openssl/openssl_0_9_8b/lib/libssl/tools/c_rehash	2006-12-22 13:40:53 UTC (rev 1659)
+++ trunk/lib/libssl/src/tools/c_rehash	2006-12-22 15:57:21 UTC (rev 1662)
@@ -6,7 +6,7 @@
 
 my $openssl;
 
-my $dir = "/usr/local/ssl";
+my $dir = "/nonexistent/ssl";
 
 if(defined $ENV{OPENSSL}) {
 	$openssl = $ENV{OPENSSL};

More information about the dslinux-commit mailing list