* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2007-04-06 15:01 aldot at uclibc.org
0 siblings, 0 replies; 38+ messages in thread
From: aldot at uclibc.org @ 2007-04-06 15:01 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-04-06 08:01:32 -0700 (Fri, 06 Apr 2007)
New Revision: 18350
Log:
- hit awk on steroids with a clue bait
Modified:
trunk/buildroot/package/openssl/openssl.mk
Changeset:
Modified: trunk/buildroot/package/openssl/openssl.mk
===================================================================
--- trunk/buildroot/package/openssl/openssl.mk 2007-04-06 14:21:00 UTC (rev 18349)
+++ trunk/buildroot/package/openssl/openssl.mk 2007-04-06 15:01:32 UTC (rev 18350)
@@ -32,9 +32,10 @@
$(OPENSSL_CAT) $(DL_DIR)/$(OPENSSL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(OPENSSL_DIR) package/openssl/ openssl\*.patch
# sigh... we have to resort to this just to set a gcc flag.
+ # grumble.. and of course make sure to escape any '/' in CFLAGS
$(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' \
$(OPENSSL_DIR)/Configure
- $(SED) '/CFLAG=/s,/;, $(TARGET_CFLAGS)/;,' \
+ $(SED) '/CFLAG=/s,/;, $(shell echo '$(TARGET_CFLAGS)' | sed -e 's/\//\\\\\//g')/;,' \
$(OPENSSL_DIR)/Configure
touch $(OPENSSL_DIR)/.unpacked
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2007-08-11 16:55 ulf at uclibc.org
0 siblings, 0 replies; 38+ messages in thread
From: ulf at uclibc.org @ 2007-08-11 16:55 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-11 09:55:52 -0700 (Sat, 11 Aug 2007)
New Revision: 19430
Log:
Bump version of openssl, add threads
Removed:
trunk/buildroot/package/openssl/openssl-0.9.7e-no-fips.patch
Modified:
trunk/buildroot/package/openssl/openssl.mk
trunk/buildroot/package/openssl/openssl.patch
Changeset:
Deleted: trunk/buildroot/package/openssl/openssl-0.9.7e-no-fips.patch
===================================================================
--- trunk/buildroot/package/openssl/openssl-0.9.7e-no-fips.patch 2007-08-11 16:52:57 UTC (rev 19429)
+++ trunk/buildroot/package/openssl/openssl-0.9.7e-no-fips.patch 2007-08-11 16:55:52 UTC (rev 19430)
@@ -1,43 +0,0 @@
-Ripped from fedora
-
---- openssl-0.9.7e/Configure
-+++ openssl-0.9.7e/Configure
-@@ -1161,15 +1161,21 @@
-
- $bn_obj = $bn_asm unless $bn_obj ne "";
-
-+my $fips_des_obj;
-+my $fips_sha1_obj;
- if ($fips)
- {
-+ if ($des_obj =~ /\-elf\.o$/ && $no_shared) # FIPS DES module is not PIC
-+ {
-+ $fips_des_obj='asm/fips-dx86-elf.o';
-+ $openssl_other_defines.="#define OPENSSL_FIPS_DES_ASM\n";
-+ }
-+ else { $fips_des_obj=$fips_des_enc; }
-+ $fips_sha1_obj='asm/sx86-elf.o' if ($sha1_obj =~ /\-elf\.o$/);
- $des_obj=$sha1_obj="";
- $openssl_other_defines.="#define OPENSSL_FIPS\n";
- }
--$des_obj=$des_enc unless (!$fips && $des_obj =~ /\.o$/);
--my $fips_des_obj='asm/fips-dx86-elf.o';
--$fips_des_obj=$fips_des_enc unless $processor eq '386';
--my $fips_sha1_obj='asm/sx86-elf.o' if $processor eq '386';
-+$des_obj=$des_enc unless ($des_obj =~ /\.o$/);
- $bf_obj=$bf_enc unless ($bf_obj =~ /\.o$/);
- $cast_obj=$cast_enc unless ($cast_obj =~ /\.o$/);
- $rc4_obj=$rc4_enc unless ($rc4_obj =~ /\.o$/);
---- openssl-0.9.7e/Makefile.org
-+++ openssl-0.9.7e/Makefile.org
-@@ -176,8 +176,8 @@
- # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
- SHLIB_MARK=
-
--DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps test tools
--SHLIBDIRS= fips crypto ssl
-+DIRS= crypto ssl $(SHLIB_MARK) sigs apps test tools
-+SHLIBDIRS= crypto ssl
-
- # dirs in crypto to build
- SDIRS= objects \
Modified: trunk/buildroot/package/openssl/openssl.mk
===================================================================
--- trunk/buildroot/package/openssl/openssl.mk 2007-08-11 16:52:57 UTC (rev 19429)
+++ trunk/buildroot/package/openssl/openssl.mk 2007-08-11 16:55:52 UTC (rev 19430)
@@ -5,7 +5,7 @@
#############################################################
# TARGETS
-OPENSSL_VERSION:=0.9.7e
+OPENSSL_VERSION:=0.9.7m
OPENSSL_SITE:=http://www.openssl.org/source
OPENSSL_SOURCE:=openssl-$(OPENSSL_VERSION).tar.gz
OPENSSL_CAT:=$(ZCAT)
@@ -45,7 +45,7 @@
PATH=$(TARGET_PATH) \
./Configure linux-$(OPENSSL_TARGET_ARCH) --prefix=/ \
--openssldir=/usr/lib/ssl -L$(STAGING_DIR)/lib -ldl \
- -I$(STAGING_DIR)/usr/include $(OPENSSL_OPTS) no-threads \
+ -I$(STAGING_DIR)/usr/include $(OPENSSL_OPTS) threads \
shared no-idea no-mdc2 no-rc5)
$(OPENSSL_DIR)/apps/openssl: $(OPENSSL_DIR)/Makefile
Modified: trunk/buildroot/package/openssl/openssl.patch
===================================================================
--- trunk/buildroot/package/openssl/openssl.patch 2007-08-11 16:52:57 UTC (rev 19429)
+++ trunk/buildroot/package/openssl/openssl.patch 2007-08-11 16:55:52 UTC (rev 19430)
@@ -1,12 +1,13 @@
---- openssl-0.9.7.orig/Configure
-+++ openssl-0.9.7/Configure
+diff -ruN openssl-0.9.7m.orig/Configure openssl-0.9.7m/Configure
+--- openssl-0.9.7m.orig/Configure 2007-02-22 17:30:49.000000000 -0500
++++ openssl-0.9.7m/Configure 2007-07-23 21:10:15.000000000 -0400
@@ -1,4 +1,4 @@
-:
+#!/usr/bin/perl
eval 'exec perl -S $0 ${1+"$@"}'
if $running_under_some_shell;
##
-@@ -373,6 +373,41 @@
+@@ -390,6 +390,41 @@
# assembler versions -- currently defunct:
##"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer:::(unknown):SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${alpha_asm}",
@@ -48,17 +49,18 @@
# The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
# bn86-elf.o file file since it is hand tweaked assembler.
"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-@@ -416,6 +451,7 @@
-
- # Linux on ARM
- "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -437,6 +472,7 @@
+ # ARM comes in both little- and big-endian flavors. The following line is
+ # endian neutral, but ./config is free to throw in -D[BL]_ENDIAN...
+ "linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# SCO/Caldera targets.
#
---- openssl-0.9.7.orig/crypto/md5/asm/md5-sparcv9.S
-+++ openssl-0.9.7/crypto/md5/asm/md5-sparcv9.S
-@@ -72,14 +72,14 @@
+diff -ruN openssl-0.9.7m.orig/crypto/md5/asm/md5-sparcv9.S openssl-0.9.7m/crypto/md5/asm/md5-sparcv9.S
+--- openssl-0.9.7m.orig/crypto/md5/asm/md5-sparcv9.S 2003-05-29 18:22:34.000000000 -0400
++++ openssl-0.9.7m/crypto/md5/asm/md5-sparcv9.S 2007-07-23 21:09:34.000000000 -0400
+@@ -74,14 +74,14 @@
#define Dval R8
#if defined(MD5_BLOCK_DATA_ORDER)
@@ -76,8 +78,9 @@
#else
# define LOAD ld
# define X(i) [%i1+i*4]
---- openssl-0.9.7.orig/crypto/opensslconf.h
-+++ openssl-0.9.7/crypto/opensslconf.h
+diff -ruN openssl-0.9.7m.orig/include/openssl/opensslconf.h openssl-0.9.7m/include/openssl/opensslconf.h
+--- openssl-0.9.7m.orig/include/openssl/opensslconf.h 2007-02-23 07:52:32.000000000 -0500
++++ openssl-0.9.7m/include/openssl/opensslconf.h 2007-07-23 21:09:34.000000000 -0400
@@ -4,17 +4,38 @@
/* OpenSSL was configured with the following options: */
#ifndef OPENSSL_DOING_MAKEDEPEND
@@ -170,8 +173,9 @@
#endif
/* These default values were supplied by
---- openssl-0.9.7.orig/ssl/ssl_algs.c
-+++ openssl-0.9.7/ssl/ssl_algs.c
+diff -ruN openssl-0.9.7m.orig/ssl/ssl_algs.c openssl-0.9.7m/ssl/ssl_algs.c
+--- openssl-0.9.7m.orig/ssl/ssl_algs.c 2001-02-20 03:11:58.000000000 -0500
++++ openssl-0.9.7m/ssl/ssl_algs.c 2007-07-23 21:09:34.000000000 -0400
@@ -109,3 +109,8 @@
return(1);
}
@@ -181,64 +185,63 @@
+ {
+ return SSL_library_init();
+ }
---- openssl-0.9.7.orig/tools/c_rehash.in
-+++ openssl-0.9.7/tools/c_rehash.in
+diff -ruN openssl-0.9.7m.orig/tools/c_rehash.in openssl-0.9.7m/tools/c_rehash.in
+--- openssl-0.9.7m.orig/tools/c_rehash.in 2002-10-11 16:35:45.000000000 -0400
++++ openssl-0.9.7m/tools/c_rehash.in 2007-07-23 21:09:34.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
# Perl c_rehash script, scan all files in a directory
---- openssl-0.9.7.orig/util/clean-depend.pl
-+++ openssl-0.9.7/util/clean-depend.pl
+diff -ruN openssl-0.9.7m.orig/util/clean-depend.pl openssl-0.9.7m/util/clean-depend.pl
+--- openssl-0.9.7m.orig/util/clean-depend.pl 2001-10-10 04:27:28.000000000 -0400
++++ openssl-0.9.7m/util/clean-depend.pl 2007-07-23 21:09:34.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl
# Clean the dependency list in a makefile of standard includes...
# Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
---- openssl-0.9.7.orig/util/extract-names.pl
-+++ openssl-0.9.7/util/extract-names.pl
+diff -ruN openssl-0.9.7m.orig/util/mkdef.pl openssl-0.9.7m/util/mkdef.pl
+--- openssl-0.9.7m.orig/util/mkdef.pl 2006-02-04 18:05:40.000000000 -0500
++++ openssl-0.9.7m/util/mkdef.pl 2007-07-23 21:09:34.000000000 -0400
@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/perl
-
- $/ = ""; # Eat a paragraph at once.
- while(<STDIN>) {
---- openssl-0.9.7.orig/util/mkdef.pl
-+++ openssl-0.9.7/util/mkdef.pl
-@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl
#
# generate a .def file
#
---- openssl-0.9.7.orig/util/mkerr.pl
-+++ openssl-0.9.7/util/mkerr.pl
+diff -ruN openssl-0.9.7m.orig/util/mkerr.pl openssl-0.9.7m/util/mkerr.pl
+--- openssl-0.9.7m.orig/util/mkerr.pl 2006-11-21 14:19:09.000000000 -0500
++++ openssl-0.9.7m/util/mkerr.pl 2007-07-23 21:09:34.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl
my $config = "crypto/err/openssl.ec";
my $debug = 0;
---- openssl-0.9.7.orig/util/mkstack.pl
-+++ openssl-0.9.7/util/mkstack.pl
+diff -ruN openssl-0.9.7m.orig/util/mkstack.pl openssl-0.9.7m/util/mkstack.pl
+--- openssl-0.9.7m.orig/util/mkstack.pl 2004-10-04 12:27:36.000000000 -0400
++++ openssl-0.9.7m/util/mkstack.pl 2007-07-23 21:09:34.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl
# This is a utility that searches out "DECLARE_STACK_OF()"
# declarations in .h and .c files, and updates/creates/replaces
---- openssl-0.9.7.orig/util/pod2man.pl
-+++ openssl-0.9.7/util/pod2man.pl
+diff -ruN openssl-0.9.7m.orig/util/pod2man.pl openssl-0.9.7m/util/pod2man.pl
+--- openssl-0.9.7m.orig/util/pod2man.pl 2005-06-18 00:27:11.000000000 -0400
++++ openssl-0.9.7m/util/pod2man.pl 2007-07-23 21:09:34.000000000 -0400
@@ -1,4 +1,4 @@
-: #!/usr/bin/perl-5.005
+#!/usr/bin/perl
eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
if $running_under_some_shell;
---- openssl-0.9.7.orig/util/selftest.pl
-+++ openssl-0.9.7/util/selftest.pl
+diff -ruN openssl-0.9.7m.orig/util/selftest.pl openssl-0.9.7m/util/selftest.pl
+--- openssl-0.9.7m.orig/util/selftest.pl 2005-06-20 16:45:44.000000000 -0400
++++ openssl-0.9.7m/util/selftest.pl 2007-07-23 21:09:34.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2007-08-13 19:35 ulf at uclibc.org
0 siblings, 0 replies; 38+ messages in thread
From: ulf at uclibc.org @ 2007-08-13 19:35 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-13 12:35:08 -0700 (Mon, 13 Aug 2007)
New Revision: 19490
Log:
Store openssl files in /usr/lib/ssl
Modified:
trunk/buildroot/package/openssl/openssl.mk
Changeset:
Modified: trunk/buildroot/package/openssl/openssl.mk
===================================================================
--- trunk/buildroot/package/openssl/openssl.mk 2007-08-13 19:33:36 UTC (rev 19489)
+++ trunk/buildroot/package/openssl/openssl.mk 2007-08-13 19:35:08 UTC (rev 19490)
@@ -44,10 +44,12 @@
CFLAGS="-DOPENSSL_NO_KRB5 -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 $(TARGET_CFLAGS)" \
PATH=$(TARGET_PATH) \
./Configure linux-$(OPENSSL_TARGET_ARCH) --prefix=/ \
- --openssldir=/usr/lib/ssl -L$(STAGING_DIR)/lib -ldl \
+ --openssldir=/lib/ssl -L$(STAGING_DIR)/lib -ldl \
-I$(STAGING_DIR)/usr/include $(OPENSSL_OPTS) threads \
shared no-idea no-mdc2 no-rc5)
+# --openssldir=/usr/lib/ssl results in files in /usr/usr/lib...
+
$(OPENSSL_DIR)/apps/openssl: $(OPENSSL_DIR)/Makefile
$(MAKE1) CC=$(TARGET_CC) -C $(OPENSSL_DIR) all build-shared
# Work around openssl build bug to link libssl.so with libcrypto.so.
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2008-07-05 6:54 ulf at uclibc.org
0 siblings, 0 replies; 38+ messages in thread
From: ulf at uclibc.org @ 2008-07-05 6:54 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-07-04 23:54:35 -0700 (Fri, 04 Jul 2008)
New Revision: 22644
Log:
Update config.* of openssl
Modified:
trunk/buildroot/package/openssl/openssl.mk
Changeset:
Modified: trunk/buildroot/package/openssl/openssl.mk
===================================================================
--- trunk/buildroot/package/openssl/openssl.mk 2008-07-05 06:46:43 UTC (rev 22643)
+++ trunk/buildroot/package/openssl/openssl.mk 2008-07-05 06:54:35 UTC (rev 22644)
@@ -37,6 +37,7 @@
$(OPENSSL_DIR)/Configure
$(SED) '/CFLAG=/s,/;, $(shell echo '$(TARGET_CFLAGS)' | sed -e 's/\//\\\\\//g')/;,' \
$(OPENSSL_DIR)/Configure
+ $(CONFIG_UPDATE) $(OPENSSL_DIR)
touch $@
$(OPENSSL_DIR)/Makefile: $(OPENSSL_DIR)/.unpacked
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2008-07-05 7:25 ulf at uclibc.org
2008-07-05 15:55 ` Thiago A. Corrêa
0 siblings, 1 reply; 38+ messages in thread
From: ulf at uclibc.org @ 2008-07-05 7:25 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-07-05 00:25:06 -0700 (Sat, 05 Jul 2008)
New Revision: 22646
Log:
Fix bug [1899] Add table entry to allow openssl to build for AVR32, disabled softfloat
Added:
trunk/buildroot/package/openssl/openssl-0.9.7m.patch.avr32
Modified:
trunk/buildroot/package/openssl/openssl.mk
Changeset:
Added: trunk/buildroot/package/openssl/openssl-0.9.7m.patch.avr32
===================================================================
--- trunk/buildroot/package/openssl/openssl-0.9.7m.patch.avr32 (rev 0)
+++ trunk/buildroot/package/openssl/openssl-0.9.7m.patch.avr32 2008-07-05 07:25:06 UTC (rev 22646)
@@ -0,0 +1,11 @@
+diff -urN openssl-0.9.7m-0rig/Configure openssl-0.9.7m/Configure
+--- openssl-0.9.7m-0rig/Configure 2008-07-05 08:59:46.000000000 +0200
++++ openssl-0.9.7m/Configure 2008-07-05 09:05:10.000000000 +0200
+@@ -396,6 +396,7 @@
+ "linux-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-avr32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-freebsd-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-freebsd-i386", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
Modified: trunk/buildroot/package/openssl/openssl.mk
===================================================================
--- trunk/buildroot/package/openssl/openssl.mk 2008-07-05 06:58:53 UTC (rev 22645)
+++ trunk/buildroot/package/openssl/openssl.mk 2008-07-05 07:25:06 UTC (rev 22646)
@@ -31,10 +31,13 @@
$(OPENSSL_DIR)/.unpacked: $(DL_DIR)/$(OPENSSL_SOURCE)
$(OPENSSL_CAT) $(DL_DIR)/$(OPENSSL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(OPENSSL_DIR) package/openssl/ openssl\*.patch
+ toolchain/patch-kernel.sh $(OPENSSL_DIR) package/openssl/ openssl\*.patch.$(ARCH)
# sigh... we have to resort to this just to set a gcc flag.
# grumble.. and of course make sure to escape any '/' in CFLAGS
+ifeq ($(BR2_avr32),)
$(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' \
$(OPENSSL_DIR)/Configure
+endif
$(SED) '/CFLAG=/s,/;, $(shell echo '$(TARGET_CFLAGS)' | sed -e 's/\//\\\\\//g')/;,' \
$(OPENSSL_DIR)/Configure
$(CONFIG_UPDATE) $(OPENSSL_DIR)
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-05 7:25 ulf at uclibc.org
@ 2008-07-05 15:55 ` Thiago A. Corrêa
2008-07-05 21:59 ` Ulf Samuelsson
0 siblings, 1 reply; 38+ messages in thread
From: Thiago A. Corrêa @ 2008-07-05 15:55 UTC (permalink / raw)
To: buildroot
On Sat, Jul 5, 2008 at 4:25 AM, <ulf@uclibc.org> wrote:
> Author: ulf
> Date: 2008-07-05 00:25:06 -0700 (Sat, 05 Jul 2008)
> New Revision: 22646
>
> Log:
> Fix bug [1899] Add table entry to allow openssl to build for AVR32, disabled softfloat
>
> Added:
> trunk/buildroot/package/openssl/openssl-0.9.7m.patch.avr32
>
> Modified:
> trunk/buildroot/package/openssl/openssl.mk
>
(cut)
> Modified: trunk/buildroot/package/openssl/openssl.mk
> ===================================================================
> --- trunk/buildroot/package/openssl/openssl.mk 2008-07-05 06:58:53 UTC (rev 22645)
> +++ trunk/buildroot/package/openssl/openssl.mk 2008-07-05 07:25:06 UTC (rev 22646)
(cut)
> +ifeq ($(BR2_avr32),)
> $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' \
> $(OPENSSL_DIR)/Configure
> +endif
Shouldn't this be usefull to all platforms and not just avr32?
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-05 15:55 ` Thiago A. Corrêa
@ 2008-07-05 21:59 ` Ulf Samuelsson
0 siblings, 0 replies; 38+ messages in thread
From: Ulf Samuelsson @ 2008-07-05 21:59 UTC (permalink / raw)
To: buildroot
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Thiago A. Corr?a skrev:
> On Sat, Jul 5, 2008 at 4:25 AM, <ulf@uclibc.org> wrote:
>> Author: ulf
>> Date: 2008-07-05 00:25:06 -0700 (Sat, 05 Jul 2008)
>> New Revision: 22646
>>
>> Log:
>> Fix bug [1899] Add table entry to allow openssl to build for AVR32, disabled softfloat
>>
>> Added:
>> trunk/buildroot/package/openssl/openssl-0.9.7m.patch.avr32
>>
>> Modified:
>> trunk/buildroot/package/openssl/openssl.mk
>>
> (cut)
>> Modified: trunk/buildroot/package/openssl/openssl.mk
>> ===================================================================
>> --- trunk/buildroot/package/openssl/openssl.mk 2008-07-05 06:58:53 UTC (rev 22645)
>> +++ trunk/buildroot/package/openssl/openssl.mk 2008-07-05 07:25:06 UTC (rev 22646)
> (cut)
>> +ifeq ($(BR2_avr32),)
>> $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' \
>> $(OPENSSL_DIR)/Configure
>> +endif
>
> Shouldn't this be usefull to all platforms and not just avr32?
Don't think so, but I am not 100% sure.
This patch will *remove* the TARGET_SOFT_FLOAT switch from openssl
CFLAGS if compiled for the AVR32,
because the AVR32 gcc does not support the
"--with-abi=soft" which gets included as a switch if this is set.
If another architecture is found which does not like the soft-float
then I guess it is easy to take that into account.
BR
Ulf
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org
iD8DBQFIb+7RAyRRH5cXxqwRAms6AJ0TCzu7R0BRMaXsfG2sZg3S+SEgBQCdHZZZ
GC4ODwDt9x6KO/AIMQ8vKtA=
=rFgy
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2008-07-08 6:40 hamish at uclibc.org
2008-07-08 9:36 ` Ulf Samuelsson
0 siblings, 1 reply; 38+ messages in thread
From: hamish at uclibc.org @ 2008-07-08 6:40 UTC (permalink / raw)
To: buildroot
Author: hamish
Date: 2008-07-07 23:40:05 -0700 (Mon, 07 Jul 2008)
New Revision: 22683
Log:
Don't $(CONFIG_UPDATE) openssl as it doesn't use autotools anyway
Modified:
trunk/buildroot/package/openssl/openssl.mk
Changeset:
Modified: trunk/buildroot/package/openssl/openssl.mk
===================================================================
--- trunk/buildroot/package/openssl/openssl.mk 2008-07-08 05:41:44 UTC (rev 22682)
+++ trunk/buildroot/package/openssl/openssl.mk 2008-07-08 06:40:05 UTC (rev 22683)
@@ -40,7 +40,6 @@
endif
$(SED) '/CFLAG=/s,/;, $(shell echo '$(TARGET_CFLAGS)' | sed -e 's/\//\\\\\//g')/;,' \
$(OPENSSL_DIR)/Configure
- $(CONFIG_UPDATE) $(OPENSSL_DIR)
touch $@
$(OPENSSL_DIR)/Makefile: $(OPENSSL_DIR)/.unpacked
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 6:40 [Buildroot] svn commit: trunk/buildroot/package/openssl hamish at uclibc.org
@ 2008-07-08 9:36 ` Ulf Samuelsson
2008-07-08 12:03 ` Hamish Moffatt
0 siblings, 1 reply; 38+ messages in thread
From: Ulf Samuelsson @ 2008-07-08 9:36 UTC (permalink / raw)
To: buildroot
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hamish at uclibc.org skrev:
> Author: hamish
> Date: 2008-07-07 23:40:05 -0700 (Mon, 07 Jul 2008)
> New Revision: 22683
>
> Log:
> Don't $(CONFIG_UPDATE) openssl as it doesn't use autotools anyway
>
Have you built an AVR32 rootfs without this?
I think you just broke openssl for the AVR32 architecture
Please revert, if you have not successfully tested on the AVR32.
BR
Ulf Samuelsson
>
> Modified:
> trunk/buildroot/package/openssl/openssl.mk
>
>
> Changeset:
> Modified: trunk/buildroot/package/openssl/openssl.mk
> ===================================================================
> --- trunk/buildroot/package/openssl/openssl.mk 2008-07-08 05:41:44 UTC (rev 22682)
> +++ trunk/buildroot/package/openssl/openssl.mk 2008-07-08 06:40:05 UTC (rev 22683)
> @@ -40,7 +40,6 @@
> endif
> $(SED) '/CFLAG=/s,/;, $(shell echo '$(TARGET_CFLAGS)' | sed -e 's/\//\\\\\//g')/;,' \
> $(OPENSSL_DIR)/Configure
> - $(CONFIG_UPDATE) $(OPENSSL_DIR)
> touch $@
>
> $(OPENSSL_DIR)/Makefile: $(OPENSSL_DIR)/.unpacked
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org
iD8DBQFIczUeAyRRH5cXxqwRAkz1AKCRvMplkADs2PXkgqgOh0erHEQqqACePvEx
TlwO1/7RVqApO7tRx/g/xJc=
=RCvf
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2008-07-08 10:13 ulf at uclibc.org
2008-07-08 10:31 ` Peter Korsgaard
2008-07-08 12:04 ` Hamish Moffatt
0 siblings, 2 replies; 38+ messages in thread
From: ulf at uclibc.org @ 2008-07-08 10:13 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-07-08 03:13:04 -0700 (Tue, 08 Jul 2008)
New Revision: 22687
Log:
Revert patch which breaks AVR32 build
Modified:
trunk/buildroot/package/openssl/openssl.mk
Changeset:
Modified: trunk/buildroot/package/openssl/openssl.mk
===================================================================
--- trunk/buildroot/package/openssl/openssl.mk 2008-07-08 10:09:28 UTC (rev 22686)
+++ trunk/buildroot/package/openssl/openssl.mk 2008-07-08 10:13:04 UTC (rev 22687)
@@ -40,6 +40,7 @@
endif
$(SED) '/CFLAG=/s,/;, $(shell echo '$(TARGET_CFLAGS)' | sed -e 's/\//\\\\\//g')/;,' \
$(OPENSSL_DIR)/Configure
+ $(CONFIG_UPDATE) $(OPENSSL_DIR)
touch $@
$(OPENSSL_DIR)/Makefile: $(OPENSSL_DIR)/.unpacked
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 10:13 ulf at uclibc.org
@ 2008-07-08 10:31 ` Peter Korsgaard
2008-07-08 12:04 ` Hamish Moffatt
1 sibling, 0 replies; 38+ messages in thread
From: Peter Korsgaard @ 2008-07-08 10:31 UTC (permalink / raw)
To: buildroot
>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
ulf> Author: ulf
ulf> Date: 2008-07-08 03:13:04 -0700 (Tue, 08 Jul 2008)
ulf> New Revision: 22687
ulf> Log:
ulf> Revert patch which breaks AVR32 build
But I don't get it. From a quick grep of openssl-0.9.7m, I don't see
anything using config.sub / config.guess?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 9:36 ` Ulf Samuelsson
@ 2008-07-08 12:03 ` Hamish Moffatt
0 siblings, 0 replies; 38+ messages in thread
From: Hamish Moffatt @ 2008-07-08 12:03 UTC (permalink / raw)
To: buildroot
On Tue, Jul 08, 2008 at 11:36:30AM +0200, Ulf Samuelsson wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> hamish at uclibc.org skrev:
> > Author: hamish
> > Date: 2008-07-07 23:40:05 -0700 (Mon, 07 Jul 2008)
> > New Revision: 22683
> >
> > Log:
> > Don't $(CONFIG_UPDATE) openssl as it doesn't use autotools anyway
> >
>
> Have you built an AVR32 rootfs without this?
>
> I think you just broke openssl for the AVR32 architecture
>
> Please revert, if you have not successfully tested on the AVR32.
I built it for armeb ok (non-avr32).
There are no config.guess and config.sub in the package when it is
unpacked. Copying them over, which $(CONFIG_UPDATE) does, will not help
- the package just doesn't use autoconf!!
cheers
Hamish
--
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 10:13 ulf at uclibc.org
2008-07-08 10:31 ` Peter Korsgaard
@ 2008-07-08 12:04 ` Hamish Moffatt
2008-07-08 12:25 ` Thiago A. Corrêa
1 sibling, 1 reply; 38+ messages in thread
From: Hamish Moffatt @ 2008-07-08 12:04 UTC (permalink / raw)
To: buildroot
On Tue, Jul 08, 2008 at 03:13:05AM -0700, ulf at uclibc.org wrote:
> Author: ulf
> Date: 2008-07-08 03:13:04 -0700 (Tue, 08 Jul 2008)
> New Revision: 22687
>
> Log:
> Revert patch which breaks AVR32 build
>
> Modified:
> trunk/buildroot/package/openssl/openssl.mk
>
>
> Changeset:
> Modified: trunk/buildroot/package/openssl/openssl.mk
> ===================================================================
> --- trunk/buildroot/package/openssl/openssl.mk 2008-07-08 10:09:28 UTC (rev 22686)
> +++ trunk/buildroot/package/openssl/openssl.mk 2008-07-08 10:13:04 UTC (rev 22687)
> @@ -40,6 +40,7 @@
> endif
> $(SED) '/CFLAG=/s,/;, $(shell echo '$(TARGET_CFLAGS)' | sed -e 's/\//\\\\\//g')/;,' \
> $(OPENSSL_DIR)/Configure
> + $(CONFIG_UPDATE) $(OPENSSL_DIR)
> touch $@
>
> $(OPENSSL_DIR)/Makefile: $(OPENSSL_DIR)/.unpacked
Please, did you test before reverting this?
Hamish
--
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 12:04 ` Hamish Moffatt
@ 2008-07-08 12:25 ` Thiago A. Corrêa
2008-07-08 12:39 ` Peter Korsgaard
0 siblings, 1 reply; 38+ messages in thread
From: Thiago A. Corrêa @ 2008-07-08 12:25 UTC (permalink / raw)
To: buildroot
On Tue, Jul 8, 2008 at 9:04 AM, Hamish Moffatt <hamish@cloud.net.au> wrote:
> On Tue, Jul 08, 2008 at 03:13:05AM -0700, ulf at uclibc.org wrote:
>
> Please, did you test before reverting this?
>
Hamish, Peter,
Ulf is right. You can try building for avr32 and you will see that
configure fails with unknown platform/compiler without this. I tried
it more or less at the same time as Ulf commited, while I was porting
back some google code improvements. If Ulf hadn't committed before me,
I would have.
Kind Regards,
Thiago A. Correa
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 12:25 ` Thiago A. Corrêa
@ 2008-07-08 12:39 ` Peter Korsgaard
2008-07-08 13:16 ` Thiago A. Corrêa
0 siblings, 1 reply; 38+ messages in thread
From: Peter Korsgaard @ 2008-07-08 12:39 UTC (permalink / raw)
To: buildroot
>>>>> "Thiago" == Thiago A Corr?a <thiago.correa@gmail.com> writes:
Hi,
Thiago> Ulf is right. You can try building for avr32 and you will
Thiago> see that configure fails with unknown platform/compiler
Thiago> without this. I tried it more or less at the same time as Ulf
Thiago> commited, while I was porting back some google code
Thiago> improvements. If Ulf hadn't committed before me, I would
Thiago> have.
Strange, what error does it give exactly? I really don't see any
reference to config.sub / config.guess in the openssl package /
tarball.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 12:39 ` Peter Korsgaard
@ 2008-07-08 13:16 ` Thiago A. Corrêa
2008-07-08 13:29 ` Peter Korsgaard
2008-07-08 16:48 ` Ulf Samuelsson
0 siblings, 2 replies; 38+ messages in thread
From: Thiago A. Corrêa @ 2008-07-08 13:16 UTC (permalink / raw)
To: buildroot
On Tue, Jul 8, 2008 at 9:39 AM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "Thiago" == Thiago A Corr?a <thiago.correa@gmail.com> writes:
> Thiago> Ulf is right. You can try building for avr32 and you will
> Thiago> see that configure fails with unknown platform/compiler
> Thiago> without this. I tried it more or less at the same time as Ulf
> Thiago> commited, while I was porting back some google code
> Thiago> improvements. If Ulf hadn't committed before me, I would
> Thiago> have.
>
> Strange, what error does it give exactly? I really don't see any
> reference to config.sub / config.guess in the openssl package /
> tarball.
Hmmm after attempting to build without the CONFIG_UPDATE again, it
seams that it's really not necessary. I guess I might have confused
with another package.
It built to avr32 without it, but I also have some clean up changes
laying here, so I will commit both if it's ok.
Basically, this:
http://code.google.com/p/buildroot/source/diff?r=638&format=side&path=/trunk/package/openssl/openssl.mk
Regards,
Thiago A. Correa
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 13:16 ` Thiago A. Corrêa
@ 2008-07-08 13:29 ` Peter Korsgaard
2008-07-08 13:35 ` Thiago A. Corrêa
2008-07-08 16:48 ` Ulf Samuelsson
1 sibling, 1 reply; 38+ messages in thread
From: Peter Korsgaard @ 2008-07-08 13:29 UTC (permalink / raw)
To: buildroot
>>>>> "Thiago" == Thiago A Corr?a <thiago.correa@gmail.com> writes:
Hi,
>> Strange, what error does it give exactly? I really don't see any
>> reference to config.sub / config.guess in the openssl package /
>> tarball.
Thiago> Hmmm after attempting to build without the CONFIG_UPDATE again, it
Thiago> seams that it's really not necessary. I guess I might have confused
Thiago> with another package.
Ahh ok.
Thiago> It built to avr32 without it, but I also have some clean up changes
Thiago> laying here, so I will commit both if it's ok.
Thiago> Basically, this:
Thiago> http://code.google.com/p/buildroot/source/diff?r=638&format=side&path=/trunk/package/openssl/openssl.mk
I don't get it, how do the files get installed into TARGET_DIR?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 13:29 ` Peter Korsgaard
@ 2008-07-08 13:35 ` Thiago A. Corrêa
2008-07-08 13:45 ` Peter Korsgaard
2008-07-08 16:30 ` Ulf Samuelsson
0 siblings, 2 replies; 38+ messages in thread
From: Thiago A. Corrêa @ 2008-07-08 13:35 UTC (permalink / raw)
To: buildroot
On Tue, Jul 8, 2008 at 10:29 AM, Peter Korsgaard <jacmet@uclibc.org> wrote:
> Thiago> It built to avr32 without it, but I also have some clean up changes
> Thiago> laying here, so I will commit both if it's ok.
> Thiago> Basically, this:
> Thiago> http://code.google.com/p/buildroot/source/diff?r=638&format=side&path=/trunk/package/openssl/openssl.mk
>
> I don't get it, how do the files get installed into TARGET_DIR?
>
Oh, that's because in the google repository it was made in different
commits, but there John changed it to use make install instead. He was
looking into the issue of having Midori and other packages connect to
https servers. To fix that, besides having a proper openssl install,
one needs to install the CA certificates. But none the less make
install is better than copying individual files.
$(STAGING_DIR)/usr/lib/libcrypto.a: $(OPENSSL_DIR)/apps/openssl
$(MAKE) CC=$(TARGET_CC) INSTALL_PREFIX=$(STAGING_DIR)/usr -C
$(OPENSSL_DIR) install
$(MAKE) CC=$(TARGET_CC) INSTALL_PREFIX=$(TARGET_DIR) -C
$(OPENSSL_DIR) install
touch -c $@
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 13:35 ` Thiago A. Corrêa
@ 2008-07-08 13:45 ` Peter Korsgaard
2008-07-08 14:56 ` Thiago A. Corrêa
2008-07-08 16:30 ` Ulf Samuelsson
1 sibling, 1 reply; 38+ messages in thread
From: Peter Korsgaard @ 2008-07-08 13:45 UTC (permalink / raw)
To: buildroot
>>>>> "Thiago" == Thiago A Corr?a <thiago.correa@gmail.com> writes:
Hi,
>> I don't get it, how do the files get installed into TARGET_DIR?
>>
Thiago> Oh, that's because in the google repository it was made in different
Thiago> commits, but there John changed it to use make install instead. He was
Thiago> looking into the issue of having Midori and other packages connect to
Thiago> https servers. To fix that, besides having a proper openssl install,
Thiago> one needs to install the CA certificates. But none the less make
Thiago> install is better than copying individual files.
Yes, if it doesn't install a bunch of unneeded stuff.
Thiago> $(STAGING_DIR)/usr/lib/libcrypto.a: $(OPENSSL_DIR)/apps/openssl
Thiago> $(MAKE) CC=$(TARGET_CC) INSTALL_PREFIX=$(STAGING_DIR)/usr -C
Thiago> $(OPENSSL_DIR) install
Thiago> $(MAKE) CC=$(TARGET_CC) INSTALL_PREFIX=$(TARGET_DIR) -C
Thiago> $(OPENSSL_DIR) install
Ahh, we normally put those in seperate targets
($TARGET_DIR)/usr/lib/libcrypto... )
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2008-07-08 13:49 jacmet at uclibc.org
0 siblings, 0 replies; 38+ messages in thread
From: jacmet at uclibc.org @ 2008-07-08 13:49 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-07-08 06:49:23 -0700 (Tue, 08 Jul 2008)
New Revision: 22690
Log:
openssl: re-revert r22644
The build without CONFIG_UPDATE has now been verified on arm/armeb/avr32,
so lets revert this for good.
Modified:
trunk/buildroot/package/openssl/openssl.mk
Changeset:
Modified: trunk/buildroot/package/openssl/openssl.mk
===================================================================
--- trunk/buildroot/package/openssl/openssl.mk 2008-07-08 10:53:17 UTC (rev 22689)
+++ trunk/buildroot/package/openssl/openssl.mk 2008-07-08 13:49:23 UTC (rev 22690)
@@ -40,7 +40,6 @@
endif
$(SED) '/CFLAG=/s,/;, $(shell echo '$(TARGET_CFLAGS)' | sed -e 's/\//\\\\\//g')/;,' \
$(OPENSSL_DIR)/Configure
- $(CONFIG_UPDATE) $(OPENSSL_DIR)
touch $@
$(OPENSSL_DIR)/Makefile: $(OPENSSL_DIR)/.unpacked
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 13:45 ` Peter Korsgaard
@ 2008-07-08 14:56 ` Thiago A. Corrêa
2008-07-08 15:02 ` Peter Korsgaard
0 siblings, 1 reply; 38+ messages in thread
From: Thiago A. Corrêa @ 2008-07-08 14:56 UTC (permalink / raw)
To: buildroot
On Tue, Jul 8, 2008 at 10:45 AM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "Thiago" == Thiago A Corr?a <thiago.correa@gmail.com> writes:
>
> Hi,
>
> >> I don't get it, how do the files get installed into TARGET_DIR?
> >>
> Thiago> Oh, that's because in the google repository it was made in different
> Thiago> commits, but there John changed it to use make install instead. He was
> Thiago> looking into the issue of having Midori and other packages connect to
> Thiago> https servers. To fix that, besides having a proper openssl install,
> Thiago> one needs to install the CA certificates. But none the less make
> Thiago> install is better than copying individual files.
>
> Yes, if it doesn't install a bunch of unneeded stuff.
>
It will install to /usr/bin c_rehash fipsld openssl and
headers/libs, which the current make file does in:
$(TARGET_DIR)/usr/lib/libssl.a: $(STAGING_DIR)/usr/lib/libcrypto.a
mkdir -p $(TARGET_DIR)/usr/include
cp -a $(STAGING_DIR)/usr/include/openssl $(TARGET_DIR)/usr/include/
cp -dpf $(STAGING_DIR)/usr/lib/libssl.a $(TARGET_DIR)/usr/lib/
cp -dpf $(STAGING_DIR)/usr/lib/libcrypto.a $(TARGET_DIR)/usr/lib/
touch -c $@
But it also creates /lib/ssl/certs folder (empty) and
/lib/ssl/openssl.cnf which should be important to programs that verify
the peer identity, such as browsers like midori.
If I'm not mistaken, the headers and static libs are usually removed
later on when packing the final image, right?
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 14:56 ` Thiago A. Corrêa
@ 2008-07-08 15:02 ` Peter Korsgaard
2008-07-08 15:34 ` John Voltz
0 siblings, 1 reply; 38+ messages in thread
From: Peter Korsgaard @ 2008-07-08 15:02 UTC (permalink / raw)
To: buildroot
>>>>> "Thiago" == Thiago A Corr?a <thiago.correa@gmail.com> writes:
Hi,
Thiago> It will install to /usr/bin c_rehash fipsld openssl and
Thiago> headers/libs, which the current make file does in:
Ok, does it also strip them?
Thiago> If I'm not mistaken, the headers and static libs are usually
Thiago> removed later on when packing the final image, right?
Yes, unless the HAVE_DEVFILES stuff is enabled.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 15:02 ` Peter Korsgaard
@ 2008-07-08 15:34 ` John Voltz
2008-07-08 15:42 ` John Voltz
0 siblings, 1 reply; 38+ messages in thread
From: John Voltz @ 2008-07-08 15:34 UTC (permalink / raw)
To: buildroot
Here's a patch to add SSL certificates to buildroot. It builds them from
mozilla's svn, so the certs are not likely to have been tampered with. It's
really pretty slick.
diff -Nwrup -x .svn buildroot-orig/package/ca-certificates/
ca-certificates.mk buildroot/package/ca-certificates/ca-certificates.mk
--- buildroot-orig/package/ca-certificates/ca-certificates.mk 1969-12-31
19:00:00.000000000 -0500
+++ buildroot/package/ca-certificates/ca-certificates.mk 2008-07-03
07:33:36.000000000 -0400
@@ -0,0 +1,25 @@
+#############################################################
+#
+# ca-certificates
+#
+#############################################################
+
+package/ca-certificates/ca-bundle.crt:
+ package/ca-certificates/mkcabundle.pl > $@
+
+$(TARGET_DIR)/usr/lib/ssl/cert.pem: package/ca-certificates/ca-bundle.crt
+ mkdir -p $(TARGET_DIR)/usr/lib/ssl/certs/
+ mkdir -p $(TARGET_DIR)/usr/lib/ssl/CA/private
+ cp package/ca-certificates/ca-bundle.crt
$(TARGET_DIR)/usr/lib/ssl/certs
+ ln -s certs/ca-bundle.crt $(TARGET_DIR)/usr/lib/ssl/cert.pem
+
+ca-certificates: $(TARGET_DIR)/usr/lib/ssl/cert.pem
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_CA_CERTIFICATES)),y)
+TARGETS+=ca-certificates
+endif
\ No newline at end of file
diff -Nwrup -x .svn buildroot-orig/package/ca-certificates/Config.in
buildroot/package/ca-certificates/Config.in
--- buildroot-orig/package/ca-certificates/Config.in 1969-12-31
19:00:00.000000000 -0500
+++ buildroot/package/ca-certificates/Config.in 2008-07-03
07:33:36.000000000 -0400
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_CA_CERTIFICATES
+ bool "ssl certificates"
+ default n
+ help
+ SSL certificates for OpenSSL
diff -Nwrup -x .svn buildroot-orig/package/ca-certificates/mkcabundle.pl
buildroot/package/ca-certificates/mkcabundle.pl
--- buildroot-orig/package/ca-certificates/mkcabundle.pl 1969-12-31
19:00:00.000000000 -0500
+++ buildroot/package/ca-certificates/mkcabundle.pl 2008-07-03
07:33:36.000000000 -0400
@@ -0,0 +1,41 @@
+#!/usr/bin/perl -w
+#
+# Used to regenerate ca-bundle.crt from the Mozilla certdata.txt.
+# Run as ./mkcabundle.pl > ca-bundle.crt
+#
+
+my $cvsroot = ':pserver:anonymous at cvs-mirror.mozilla.org:/cvsroot';
+my $certdata = 'mozilla/security/nss/lib/ckfw/builtins/certdata.txt';
+
+open(IN, "cvs -d $cvsroot co -p $certdata|")
+ || die "could not check out certdata.txt";
+
+my $incert = 0;
+
+print<<EOH;
+# This is a bundle of X.509 certificates of public Certificate
+# Authorities. It was generated from the Mozilla root CA list.
+#
+# Source: $certdata
+#
+EOH
+
+while (<IN>) {
+ if (/^CKA_VALUE MULTILINE_OCTAL/) {
+ $incert = 1;
+ open(OUT, "|openssl x509 -text -inform DER -fingerprint")
+ || die "could not pipe to openssl x509";
+ } elsif (/^END/ && $incert) {
+ close(OUT);
+ $incert = 0;
+ print "\n\n";
+ } elsif ($incert) {
+ my @bs = split(/\\/);
+ foreach my $b (@bs) {
+ chomp $b;
+ printf(OUT "%c", oct($b)) unless $b eq '';
+ }
+ } elsif (/^CVS_ID.*Revision: ([^ ]*).*/) {
+ print "# Generated from certdata.txt RCS revision $1\n#\n";
+ }
+}
\ No newline at end of file
diff -Nwrup -x .svn buildroot-orig/package/Config.in
buildroot/package/Config.in
--- buildroot-orig/package/Config.in 2008-07-08 11:19:53.000000000 -0400
+++ buildroot/package/Config.in 2008-07-08 11:26:07.000000000 -0400
@@ -150,6 +150,7 @@ source "package/axel/Config.in"
source "package/boa/Config.in"
source "package/bind/Config.in"
source "package/bridge-utils/Config.in"
+source "package/ca-certificates/Config.in"
source "package/curl/Config.in"
if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
source "package/dhcp/Config.in"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://busybox.net/lists/buildroot/attachments/20080708/e821259b/attachment.htm
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 15:34 ` John Voltz
@ 2008-07-08 15:42 ` John Voltz
0 siblings, 0 replies; 38+ messages in thread
From: John Voltz @ 2008-07-08 15:42 UTC (permalink / raw)
To: buildroot
I've been able to verify that the openssl/libcurl subsystem works with lynx.
I haven't been able to get it to work with Midori/WebKit. I'm not even sure
that WebKit fully supports SSL through libcurl yet. If you export
WEBKIT_IGNORE_SSL_ERRORS=true before you start Midori, secure sites will
load, but it is obviously not necessarily truly a secure connection.
John
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://busybox.net/lists/buildroot/attachments/20080708/e71d8178/attachment.htm
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 13:35 ` Thiago A. Corrêa
2008-07-08 13:45 ` Peter Korsgaard
@ 2008-07-08 16:30 ` Ulf Samuelsson
1 sibling, 0 replies; 38+ messages in thread
From: Ulf Samuelsson @ 2008-07-08 16:30 UTC (permalink / raw)
To: buildroot
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Thiago A. Corr?a skrev:
> On Tue, Jul 8, 2008 at 10:29 AM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>> Thiago> It built to avr32 without it, but I also have some clean up changes
>> Thiago> laying here, so I will commit both if it's ok.
>> Thiago> Basically, this:
>> Thiago> http://code.google.com/p/buildroot/source/diff?r=638&format=side&path=/trunk/package/openssl/openssl.mk
>>
>> I don't get it, how do the files get installed into TARGET_DIR?
>>
> Oh, that's because in the google repository it was made in different
> commits, but there John changed it to use make install instead. He was
> looking into the issue of having Midori and other packages connect to
> https servers. To fix that, besides having a proper openssl install,
> one needs to install the CA certificates. But none the less make
> install is better than copying individual files.
I think this is slightly flawed.
If the make is aborted for some reason after the make install
and before the stuff is stripped, then the strip wont happen.
Not a big problem, but should be easy to fix.
I think you want the install into the target like this:
$(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7: \
$(STAGING_DIR)/usr/lib/libcrypto.a
$(MAKE) CC=$(TARGET_CC) INSTALL_PREFIX=$(TARGET_DIR) \
-C $(OPENSSL_DIR) install
<strip's>
BR
Ulf Samuelsson
>
> $(STAGING_DIR)/usr/lib/libcrypto.a: $(OPENSSL_DIR)/apps/openssl
> $(MAKE) CC=$(TARGET_CC) INSTALL_PREFIX=$(STAGING_DIR)/usr -C
> $(OPENSSL_DIR) install
> $(MAKE) CC=$(TARGET_CC) INSTALL_PREFIX=$(TARGET_DIR) -C
> $(OPENSSL_DIR) install
> touch -c $@
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org
iD8DBQFIc5Y9AyRRH5cXxqwRAhG9AJ47A3UnuCsJW6A27+1zK887sCeZRgCeJ1E2
xSSoWvQTNX9t42W4neOI5v0=
=r2Em
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-07-08 13:16 ` Thiago A. Corrêa
2008-07-08 13:29 ` Peter Korsgaard
@ 2008-07-08 16:48 ` Ulf Samuelsson
1 sibling, 0 replies; 38+ messages in thread
From: Ulf Samuelsson @ 2008-07-08 16:48 UTC (permalink / raw)
To: buildroot
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Thiago A. Corr?a skrev:
> On Tue, Jul 8, 2008 at 9:39 AM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>>> "Thiago" == Thiago A Corr?a <thiago.correa@gmail.com> writes:
>> Thiago> Ulf is right. You can try building for avr32 and you will
>> Thiago> see that configure fails with unknown platform/compiler
>> Thiago> without this. I tried it more or less at the same time as Ulf
>> Thiago> commited, while I was porting back some google code
>> Thiago> improvements. If Ulf hadn't committed before me, I would
>> Thiago> have.
>>
>> Strange, what error does it give exactly? I really don't see any
>> reference to config.sub / config.guess in the openssl package /
>> tarball.
>
> Hmmm after attempting to build without the CONFIG_UPDATE again, it
> seams that it's really not necessary. I guess I might have confused
> with another package.
It was broken for the AVR32 before I started modifying the stuff.
openssl-0.9.7m.patch.avr32 is needed.
Not sure about the exact sequence of changes
since it was a few days ago, but now when I had
time to run a check I can also confirm that CONFIG_UPDATE is not needed.
BR
Ulf Samuelsson
> It built to avr32 without it, but I also have some clean up changes
> laying here, so I will commit both if it's ok.
> Basically, this:
> http://code.google.com/p/buildroot/source/diff?r=638&format=side&path=/trunk/package/openssl/openssl.mk
>
> Regards,
> Thiago A. Correa
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org
iD8DBQFIc5pWAyRRH5cXxqwRAgzUAJ0b93y/QHy0l8XpVFbDzZvPccl8CgCgvnOb
j+oxhg4STB61FvA7AIGpeZE=
=jB76
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2008-09-24 9:10 egtvedt at uclibc.org
0 siblings, 0 replies; 38+ messages in thread
From: egtvedt at uclibc.org @ 2008-09-24 9:10 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-09-24 02:10:06 -0700 (Wed, 24 Sep 2008)
New Revision: 23458
Log:
openssl: convert to Makefile.autotools.in and bump version to 0.9.8g
This patch converts building of OpenSSL to use Makefile.autotools.in and bumps
the version to 0.9.8g. The patches are updated to reflect this version upgrade.
A kconfig option for adding the OpenSSL engines is also added.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Added:
trunk/buildroot/package/openssl/openssl-0.9.8g-do-not-build-docs.patch
Removed:
trunk/buildroot/package/openssl/openssl-0.9.7m.patch.avr32
trunk/buildroot/package/openssl/openssl-nodocs.patch
trunk/buildroot/package/openssl/openssl.patch
Modified:
trunk/buildroot/package/openssl/Config.in
trunk/buildroot/package/openssl/openssl.mk
Changeset:
Modified: trunk/buildroot/package/openssl/Config.in
===================================================================
--- trunk/buildroot/package/openssl/Config.in 2008-09-23 15:07:43 UTC (rev 23457)
+++ trunk/buildroot/package/openssl/Config.in 2008-09-24 09:10:06 UTC (rev 23458)
@@ -1,5 +1,6 @@
config BR2_PACKAGE_OPENSSL
bool "openssl"
+ select BR2_PACKAGE_ZLIB
help
A collaborative effort to develop a robust, commercial-grade, fully
featured, and Open Source toolkit implementing the Secure Sockets
@@ -8,8 +9,17 @@
http://www.openssl.org/
-config BR2_PACKAGE_OPENSSL_TARGET_HEADERS
- bool "openssl headers in target"
+config BR2_PACKAGE_OPENSSL_BIN
+ bool "openssl binary"
depends on BR2_PACKAGE_OPENSSL
+ default no
help
- Put openssl headers in the target.
+ Install the openssl binary to the target file system. This is a
+ command line tool for doing various crypthographic stuff.
+
+config BR2_PACKAGE_OPENSSL_ENGINES
+ bool "openssl additional engines"
+ depends on BR2_PACKAGE_OPENSSL
+ default no
+ help
+ Install additional encryption engine libraries.
Deleted: trunk/buildroot/package/openssl/openssl-0.9.7m.patch.avr32
===================================================================
--- trunk/buildroot/package/openssl/openssl-0.9.7m.patch.avr32 2008-09-23 15:07:43 UTC (rev 23457)
+++ trunk/buildroot/package/openssl/openssl-0.9.7m.patch.avr32 2008-09-24 09:10:06 UTC (rev 23458)
@@ -1,11 +0,0 @@
-diff -urN openssl-0.9.7m-0rig/Configure openssl-0.9.7m/Configure
---- openssl-0.9.7m-0rig/Configure 2008-07-05 08:59:46.000000000 +0200
-+++ openssl-0.9.7m/Configure 2008-07-05 09:05:10.000000000 +0200
-@@ -396,6 +396,7 @@
- "linux-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-avr32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-freebsd-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-freebsd-i386", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "linux-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
Added: trunk/buildroot/package/openssl/openssl-0.9.8g-do-not-build-docs.patch
===================================================================
--- trunk/buildroot/package/openssl/openssl-0.9.8g-do-not-build-docs.patch (rev 0)
+++ trunk/buildroot/package/openssl/openssl-0.9.8g-do-not-build-docs.patch 2008-09-24 09:10:06 UTC (rev 23458)
@@ -0,0 +1,13 @@
+Dont waste time building manpages if we're not going to use em.
+
+--- openssl/Makefile.org
++++ openssl/Makefile.org
+@@ -792,7 +792,7 @@
+ dist_pem_h:
+ (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
+
+-install: all install_docs install_sw
++install: all install_sw
+
+ install_sw:
+ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
Deleted: trunk/buildroot/package/openssl/openssl-nodocs.patch
===================================================================
--- trunk/buildroot/package/openssl/openssl-nodocs.patch 2008-09-23 15:07:43 UTC (rev 23457)
+++ trunk/buildroot/package/openssl/openssl-nodocs.patch 2008-09-24 09:10:06 UTC (rev 23458)
@@ -1,13 +0,0 @@
-Dont waste time building manpages if we're not going to use em.
-
---- openssl/Makefile.org
-+++ openssl/Makefile.org
-@@ -792,7 +792,7 @@
- dist_pem_h:
- (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
-
--install: all install_docs install_sw
-+install: all install_sw
-
- install_sw:
- @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
Modified: trunk/buildroot/package/openssl/openssl.mk
===================================================================
--- trunk/buildroot/package/openssl/openssl.mk 2008-09-23 15:07:43 UTC (rev 23457)
+++ trunk/buildroot/package/openssl/openssl.mk 2008-09-24 09:10:06 UTC (rev 23458)
@@ -3,13 +3,8 @@
# openssl
#
#############################################################
-
-# TARGETS
-OPENSSL_VERSION:=0.9.7m
+OPENSSL_VERSION:=0.9.8g
OPENSSL_SITE:=http://www.openssl.org/source
-OPENSSL_SOURCE:=openssl-$(OPENSSL_VERSION).tar.gz
-OPENSSL_CAT:=$(ZCAT)
-OPENSSL_DIR:=$(BUILD_DIR)/openssl-$(OPENSSL_VERSION)
OPENSSL_TARGET_ARCH:=
ifeq ($(BR2_i386),y)
@@ -24,95 +19,46 @@
OPENSSL_TARGET_ARCH:=$(ARCH)
endif
-$(DL_DIR)/$(OPENSSL_SOURCE):
- $(WGET) -P $(DL_DIR) $(OPENSSL_SITE)/$(OPENSSL_SOURCE)
+OPENSSL_INSTALL_STAGING = YES
+OPENSSL_INSTALL_STAGING_OPT = INSTALL_PREFIX=$(STAGING_DIR) install
-openssl-unpack: $(OPENSSL_DIR)/.unpacked
-$(OPENSSL_DIR)/.unpacked: $(DL_DIR)/$(OPENSSL_SOURCE)
- $(OPENSSL_CAT) $(DL_DIR)/$(OPENSSL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(OPENSSL_DIR) package/openssl/ openssl\*.patch
- toolchain/patch-kernel.sh $(OPENSSL_DIR) package/openssl/ openssl\*.patch.$(ARCH)
- # sigh... we have to resort to this just to set a gcc flag.
- # grumble.. and of course make sure to escape any '/' in CFLAGS
-ifeq ($(BR2_avr32),)
- $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' \
- $(OPENSSL_DIR)/Configure
-endif
- $(SED) '/CFLAG=/s,/;, $(shell echo '$(TARGET_CFLAGS)' | sed -e 's/\//\\\\\//g')/;,' \
- $(OPENSSL_DIR)/Configure
- touch $@
+OPENSSL_INSTALL_TARGET_OPT = INSTALL_PREFIX=$(TARGET_DIR) install
-$(OPENSSL_DIR)/Makefile: $(OPENSSL_DIR)/.unpacked
- (cd $(OPENSSL_DIR); \
- CFLAGS="-DOPENSSL_NO_KRB5 -DOPENSSL_NO_IDEA -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 $(TARGET_CFLAGS)" \
- PATH=$(TARGET_PATH) \
- ./Configure linux-$(OPENSSL_TARGET_ARCH) --prefix=/ \
- --openssldir=/lib/ssl -L$(STAGING_DIR)/lib -ldl \
- -I$(STAGING_DIR)/usr/include $(OPENSSL_OPTS) threads \
- shared no-idea no-mdc2 no-rc5)
+OPENSSL_DEPENDENCIES = zlib
-# --openssldir=/usr/lib/ssl results in files in /usr/usr/lib...
+$(eval $(call AUTOTARGETS,package,openssl))
-$(OPENSSL_DIR)/apps/openssl: $(OPENSSL_DIR)/Makefile
+$(OPENSSL_TARGET_CONFIGURE):
+ (cd $(OPENSSL_DIR); \
+ $(TARGET_CONFIGURE_ARGS) \
+ $(TARGET_CONFIGURE_OPTS) \
+ ./Configure \
+ linux-$(OPENSSL_TARGET_ARCH) \
+ --prefix=/usr \
+ --openssldir=/usr/lib/ssl \
+ threads \
+ shared \
+ no-idea \
+ no-mdc2 \
+ no-rc5 \
+ zlib-dynamic \
+ )
+ touch $@
+
+$(OPENSSL_TARGET_BUILD):
$(MAKE1) CC=$(TARGET_CC) -C $(OPENSSL_DIR) all build-shared
- # Work around openssl build bug to link libssl.so with libcrypto.so.
- -rm $(OPENSSL_DIR)/libssl.so.*.*.*
$(MAKE1) CC=$(TARGET_CC) -C $(OPENSSL_DIR) do_linux-shared
+ touch $@
-$(STAGING_DIR)/usr/lib/libcrypto.a: $(OPENSSL_DIR)/apps/openssl
- $(MAKE) CC=$(TARGET_CC) INSTALL_PREFIX=$(STAGING_DIR)/usr -C $(OPENSSL_DIR) install
- cp -fa $(OPENSSL_DIR)/libcrypto.so* $(STAGING_DIR)/usr/lib/
- chmod a-x $(STAGING_DIR)/usr/lib/libcrypto.so.0.9.7
- (cd $(STAGING_DIR)/usr/lib; \
- ln -fs libcrypto.so.0.9.7 libcrypto.so; \
- ln -fs libcrypto.so.0.9.7 libcrypto.so.0; \
- )
- cp -fa $(OPENSSL_DIR)/libssl.so* $(STAGING_DIR)/usr/lib/
- chmod a-x $(STAGING_DIR)/usr/lib/libssl.so.0.9.7
- (cd $(STAGING_DIR)/usr/lib; \
- ln -fs libssl.so.0.9.7 libssl.so; \
- ln -fs libssl.so.0.9.7 libssl.so.0; \
- )
- touch -c $@
-
-$(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7: $(STAGING_DIR)/usr/lib/libcrypto.a
- mkdir -p $(TARGET_DIR)/usr/lib
- cp -fa $(STAGING_DIR)/usr/lib/libcrypto.so* $(TARGET_DIR)/usr/lib/
- cp -fa $(STAGING_DIR)/usr/lib/libssl.so* $(TARGET_DIR)/usr/lib/
- #cp -fa $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libssl.so.0.9.7
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7
-
-$(TARGET_DIR)/usr/lib/libssl.a: $(STAGING_DIR)/usr/lib/libcrypto.a
- mkdir -p $(TARGET_DIR)/usr/include
- cp -a $(STAGING_DIR)/usr/include/openssl $(TARGET_DIR)/usr/include/
- cp -dpf $(STAGING_DIR)/usr/lib/libssl.a $(TARGET_DIR)/usr/lib/
- cp -dpf $(STAGING_DIR)/usr/lib/libcrypto.a $(TARGET_DIR)/usr/lib/
- touch -c $@
-
-openssl-headers: $(TARGET_DIR)/usr/lib/libssl.a
-
-openssl: uclibc $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7
-
-openssl-source: $(DL_DIR)/$(OPENSSL_SOURCE)
-
-openssl-clean:
- -$(MAKE) -C $(OPENSSL_DIR) clean
- rm -f $(STAGING_DIR)/usr/bin/openssl $(TARGET_DIR)/usr/bin/openssl
- -rm -f $(STAGING_DIR)/usr/lib/libcrypto.so* $(TARGET_DIR)/usr/lib/libcrypto.so*
- -rm -f $(STAGING_DIR)/usr/lib/libssl.so* $(TARGET_DIR)/usr/lib/libssl.so*
- rm -rf $(STAGING_DIR)/usr/include/openssl $(TARGET_DIR)/usr/include/openssl
-
-openssl-dirclean:
- rm -rf $(OPENSSL_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_OPENSSL)),y)
-TARGETS+=openssl
+$(OPENSSL_HOOK_POST_INSTALL):
+ $(if $(BR2_HAVE_DEVFILES),,rm -rf $(TARGET_DIR)/usr/lib/ssl)
+ifeq ($(BR2_PACKAGE_OPENSSL_BIN),y)
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/openssl
+else
+ rm -f $(TARGET_DIR)/usr/bin/c_rehash
+ rm -f $(TARGET_DIR)/usr/bin/openssl
endif
-ifeq ($(strip $(BR2_PACKAGE_OPENSSL_TARGET_HEADERS)),y)
-TARGETS+=openssl-headers
+ifneq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
+ rm -rf $(TARGET_DIR)/usr/lib/engines
endif
+ touch $@
Deleted: trunk/buildroot/package/openssl/openssl.patch
===================================================================
--- trunk/buildroot/package/openssl/openssl.patch 2008-09-23 15:07:43 UTC (rev 23457)
+++ trunk/buildroot/package/openssl/openssl.patch 2008-09-24 09:10:06 UTC (rev 23458)
@@ -1,250 +0,0 @@
-diff -ruN openssl-0.9.7m.orig/Configure openssl-0.9.7m/Configure
---- openssl-0.9.7m.orig/Configure 2007-02-22 17:30:49.000000000 -0500
-+++ openssl-0.9.7m/Configure 2007-07-23 21:10:15.000000000 -0400
-@@ -1,4 +1,4 @@
--:
-+#!/usr/bin/perl
- eval 'exec perl -S $0 ${1+"$@"}'
- if $running_under_some_shell;
- ##
-@@ -390,6 +390,41 @@
- # assembler versions -- currently defunct:
- ##"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer:::(unknown):SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${alpha_asm}",
-
-+# Sane Linux configuration values, stolen from the Debian package....
-+"linux-alpha","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-alpha-ev4","gcc:-DTERMIO -O3 -mcpu=ev4 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-freebsd-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-freebsd-i386", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-ia64","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+#"linux-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC",
-+"linux-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -mcpu=i486 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -mcpu=i586 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -mcpu=i686 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-openbsd-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-openbsd-mips","gcc:-O2 -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-sh3", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-sh4", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-sh3eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-sh4eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v8 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,-Av8plus -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-cris", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the
- # bn86-elf.o file file since it is hand tweaked assembler.
- "linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-@@ -437,6 +472,7 @@
- # ARM comes in both little- and big-endian flavors. The following line is
- # endian neutral, but ./config is free to throw in -D[BL]_ENDIAN...
- "linux-elf-arm","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-elf-armeb","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
- # SCO/Caldera targets.
- #
-diff -ruN openssl-0.9.7m.orig/crypto/md5/asm/md5-sparcv9.S openssl-0.9.7m/crypto/md5/asm/md5-sparcv9.S
---- openssl-0.9.7m.orig/crypto/md5/asm/md5-sparcv9.S 2003-05-29 18:22:34.000000000 -0400
-+++ openssl-0.9.7m/crypto/md5/asm/md5-sparcv9.S 2007-07-23 21:09:34.000000000 -0400
-@@ -74,14 +74,14 @@
- #define Dval R8
-
- #if defined(MD5_BLOCK_DATA_ORDER)
--# if defined(OPENSSL_SYSNAME_ULTRASPARC)
-+/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/
- # define LOAD lda
- # define X(i) [%i1+i*4]%asi
- # define md5_block md5_block_asm_data_order_aligned
- # define ASI_PRIMARY_LITTLE 0x88
--# else
-+/*# else
- # error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!"
--# endif
-+# endif*/
- #else
- # define LOAD ld
- # define X(i) [%i1+i*4]
-diff -ruN openssl-0.9.7m.orig/include/openssl/opensslconf.h openssl-0.9.7m/include/openssl/opensslconf.h
---- openssl-0.9.7m.orig/include/openssl/opensslconf.h 2007-02-23 07:52:32.000000000 -0500
-+++ openssl-0.9.7m/include/openssl/opensslconf.h 2007-07-23 21:09:34.000000000 -0400
-@@ -4,17 +4,38 @@
- /* OpenSSL was configured with the following options: */
- #ifndef OPENSSL_DOING_MAKEDEPEND
-
-+#ifndef OPENSSL_NO_IDEA
-+# define OPENSSL_NO_IDEA
-+#endif
-+#ifndef OPENSSL_NO_MDC2
-+# define OPENSSL_NO_MDC2
-+#endif
-+#ifndef OPENSSL_NO_RC5
-+# define OPENSSL_NO_RC5
-+#endif
- #ifndef OPENSSL_NO_KRB5
- # define OPENSSL_NO_KRB5
- #endif
-
- #endif /* OPENSSL_DOING_MAKEDEPEND */
-+#ifndef OPENSSL_THREADS
-+# define OPENSSL_THREADS
-+#endif
-
- /* The OPENSSL_NO_* macros are also defined as NO_* if the application
- asks for it. This is a transient feature that is provided for those
- who haven't had the time to do the appropriate changes in their
- applications. */
- #ifdef OPENSSL_ALGORITHM_DEFINES
-+# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
-+# define NO_IDEA
-+# endif
-+# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
-+# define NO_MDC2
-+# endif
-+# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
-+# define NO_RC5
-+# endif
- # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
- # define NO_KRB5
- # endif
-@@ -27,7 +48,7 @@
-
- #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
- #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
--#define OPENSSLDIR "/usr/local/ssl"
-+#define OPENSSLDIR "/usr/lib/ssl"
- #endif
- #endif
-
-@@ -79,7 +100,7 @@
-
- #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
- #define CONFIG_HEADER_BN_H
--#undef BN_LLONG
-+#define BN_LLONG
-
- /* Should we define BN_DIV2W here? */
-
-@@ -98,7 +119,7 @@
- #define CONFIG_HEADER_RC4_LOCL_H
- /* if this is defined data[i] is used instead of *data, this is a %20
- * speedup on x86 */
--#undef RC4_INDEX
-+#define RC4_INDEX
- #endif
-
- #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
-@@ -112,14 +133,14 @@
- /* the following is tweaked from a config script, that is why it is a
- * protected undef/define */
- #ifndef DES_PTR
--#undef DES_PTR
-+#define DES_PTR
- #endif
-
- /* This helps C compiler generate the correct code for multiple functional
- * units. It reduces register dependancies at the expense of 2 more
- * registers */
- #ifndef DES_RISC1
--#undef DES_RISC1
-+#define DES_RISC1
- #endif
-
- #ifndef DES_RISC2
-@@ -133,7 +154,7 @@
- /* Unroll the inner loop, this sometimes helps, sometimes hinders.
- * Very mucy CPU dependant */
- #ifndef DES_UNROLL
--#undef DES_UNROLL
-+#define DES_UNROLL
- #endif
-
- /* These default values were supplied by
-diff -ruN openssl-0.9.7m.orig/ssl/ssl_algs.c openssl-0.9.7m/ssl/ssl_algs.c
---- openssl-0.9.7m.orig/ssl/ssl_algs.c 2001-02-20 03:11:58.000000000 -0500
-+++ openssl-0.9.7m/ssl/ssl_algs.c 2007-07-23 21:09:34.000000000 -0400
-@@ -109,3 +109,8 @@
- return(1);
- }
-
-+#undef SSLeay_add_ssl_algorithms
-+int SSLeay_add_ssl_algorithms(void)
-+ {
-+ return SSL_library_init();
-+ }
-diff -ruN openssl-0.9.7m.orig/tools/c_rehash.in openssl-0.9.7m/tools/c_rehash.in
---- openssl-0.9.7m.orig/tools/c_rehash.in 2002-10-11 16:35:45.000000000 -0400
-+++ openssl-0.9.7m/tools/c_rehash.in 2007-07-23 21:09:34.000000000 -0400
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
-
- # Perl c_rehash script, scan all files in a directory
-diff -ruN openssl-0.9.7m.orig/util/clean-depend.pl openssl-0.9.7m/util/clean-depend.pl
---- openssl-0.9.7m.orig/util/clean-depend.pl 2001-10-10 04:27:28.000000000 -0400
-+++ openssl-0.9.7m/util/clean-depend.pl 2007-07-23 21:09:34.000000000 -0400
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- # Clean the dependency list in a makefile of standard includes...
- # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
-
-diff -ruN openssl-0.9.7m.orig/util/mkdef.pl openssl-0.9.7m/util/mkdef.pl
---- openssl-0.9.7m.orig/util/mkdef.pl 2006-02-04 18:05:40.000000000 -0500
-+++ openssl-0.9.7m/util/mkdef.pl 2007-07-23 21:09:34.000000000 -0400
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- #
- # generate a .def file
- #
-diff -ruN openssl-0.9.7m.orig/util/mkerr.pl openssl-0.9.7m/util/mkerr.pl
---- openssl-0.9.7m.orig/util/mkerr.pl 2006-11-21 14:19:09.000000000 -0500
-+++ openssl-0.9.7m/util/mkerr.pl 2007-07-23 21:09:34.000000000 -0400
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
-
- my $config = "crypto/err/openssl.ec";
- my $debug = 0;
-diff -ruN openssl-0.9.7m.orig/util/mkstack.pl openssl-0.9.7m/util/mkstack.pl
---- openssl-0.9.7m.orig/util/mkstack.pl 2004-10-04 12:27:36.000000000 -0400
-+++ openssl-0.9.7m/util/mkstack.pl 2007-07-23 21:09:34.000000000 -0400
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
-
- # This is a utility that searches out "DECLARE_STACK_OF()"
- # declarations in .h and .c files, and updates/creates/replaces
-diff -ruN openssl-0.9.7m.orig/util/pod2man.pl openssl-0.9.7m/util/pod2man.pl
---- openssl-0.9.7m.orig/util/pod2man.pl 2005-06-18 00:27:11.000000000 -0400
-+++ openssl-0.9.7m/util/pod2man.pl 2007-07-23 21:09:34.000000000 -0400
-@@ -1,4 +1,4 @@
--: #!/usr/bin/perl-5.005
-+#!/usr/bin/perl
- eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
- if $running_under_some_shell;
-
-diff -ruN openssl-0.9.7m.orig/util/selftest.pl openssl-0.9.7m/util/selftest.pl
---- openssl-0.9.7m.orig/util/selftest.pl 2005-06-20 16:45:44.000000000 -0400
-+++ openssl-0.9.7m/util/selftest.pl 2007-07-23 21:09:34.000000000 -0400
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- #
- # Run the test suite and generate a report
- #
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2008-09-24 9:12 egtvedt at uclibc.org
0 siblings, 0 replies; 38+ messages in thread
From: egtvedt at uclibc.org @ 2008-09-24 9:12 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-09-24 02:12:06 -0700 (Wed, 24 Sep 2008)
New Revision: 23459
Log:
openssl: add patch for AVR32 support and optimization
This patch adds support for AVR32 architecture and adds an optimized DES and
AES algorithm for this architecture.
Added:
trunk/buildroot/package/openssl/openssl-0.9.8g-avr32-asm-optimizations.patch.avr32
Changeset:
Sorry, the patch is too large to include (6369 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=23459
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2008-10-07 7:11 egtvedt at uclibc.org
0 siblings, 0 replies; 38+ messages in thread
From: egtvedt at uclibc.org @ 2008-10-07 7:11 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-10-07 00:11:15 -0700 (Tue, 07 Oct 2008)
New Revision: 23612
Log:
openssl: fix compiling OpenSSL for i386 architecture
This patch will use linux-generic32 for all i386 target architectures, which
fixes bug #5274.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Modified:
trunk/buildroot/package/openssl/openssl.mk
Changeset:
Modified: trunk/buildroot/package/openssl/openssl.mk
===================================================================
--- trunk/buildroot/package/openssl/openssl.mk 2008-10-06 22:46:41 UTC (rev 23611)
+++ trunk/buildroot/package/openssl/openssl.mk 2008-10-07 07:11:15 UTC (rev 23612)
@@ -8,13 +8,8 @@
OPENSSL_TARGET_ARCH:=
ifeq ($(BR2_i386),y)
-ifneq ($(ARCH),i386)
-OPENSSL_TARGET_ARCH:=i386-$(ARCH)
+OPENSSL_TARGET_ARCH:=generic32
endif
-ifeq ($(ARCH),i686)
-OPENSSL_TARGET_ARCH:=i386-i686/cmov
-endif
-endif
ifeq ($(OPENSSL_TARGET_ARCH),)
OPENSSL_TARGET_ARCH:=$(ARCH)
endif
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2008-10-13 8:10 egtvedt at uclibc.org
0 siblings, 0 replies; 38+ messages in thread
From: egtvedt at uclibc.org @ 2008-10-13 8:10 UTC (permalink / raw)
To: buildroot
Author: egtvedt
Date: 2008-10-13 01:10:35 -0700 (Mon, 13 Oct 2008)
New Revision: 23663
Log:
openssl: fix architecture specified when configuring openssl
This patch will default to linux-generic32, unless a known optimized
architecture is selected.
As of today it will select optimized config for; avr32, ia64, powerpc and
x86_64.
This fixes bug #5344.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Modified:
trunk/buildroot/package/openssl/openssl.mk
Changeset:
Modified: trunk/buildroot/package/openssl/openssl.mk
===================================================================
--- trunk/buildroot/package/openssl/openssl.mk 2008-10-12 11:20:08 UTC (rev 23662)
+++ trunk/buildroot/package/openssl/openssl.mk 2008-10-13 08:10:35 UTC (rev 23663)
@@ -6,13 +6,21 @@
OPENSSL_VERSION:=0.9.8g
OPENSSL_SITE:=http://www.openssl.org/source
-OPENSSL_TARGET_ARCH:=
-ifeq ($(BR2_i386),y)
-OPENSSL_TARGET_ARCH:=generic32
+OPENSSL_TARGET_ARCH=generic32
+
+# Some architectures are optimized in OpenSSL
+ifeq ($(BR2_ARCH),avr32)
+OPENSSL_TARGET_ARCH=avr32
endif
-ifeq ($(OPENSSL_TARGET_ARCH),)
-OPENSSL_TARGET_ARCH:=$(ARCH)
+ifeq ($(BR2_ARCH),ia64)
+OPENSSL_TARGET_ARCH=ia64
endif
+ifeq ($(BR2_ARCH),powerpc)
+OPENSSL_TARGET_ARCH=ppc
+endif
+ifeq ($(BR2_ARCH),x86_64)
+OPENSSL_TARGET_ARCH=x86_64
+endif
OPENSSL_INSTALL_STAGING = YES
OPENSSL_INSTALL_STAGING_OPT = INSTALL_PREFIX=$(STAGING_DIR) install
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2008-12-28 16:08 jacmet at uclibc.org
2009-01-06 11:38 ` Mark Jackson
0 siblings, 1 reply; 38+ messages in thread
From: jacmet at uclibc.org @ 2008-12-28 16:08 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-12-28 16:08:57 +0000 (Sun, 28 Dec 2008)
New Revision: 24578
Log:
openssl: fix uclibc 0.9.30 build
Added:
trunk/buildroot/package/openssl/openssl-0.9.8g-uclibc-susv3-legacy.patch
Changeset:
Added: trunk/buildroot/package/openssl/openssl-0.9.8g-uclibc-susv3-legacy.patch
===================================================================
--- trunk/buildroot/package/openssl/openssl-0.9.8g-uclibc-susv3-legacy.patch (rev 0)
+++ trunk/buildroot/package/openssl/openssl-0.9.8g-uclibc-susv3-legacy.patch 2008-12-28 16:08:57 UTC (rev 24578)
@@ -0,0 +1,18 @@
+sys/timeb.h / ftime are legacy, so don't enable them for uClibc
+---
+ apps/speed.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: openssl-0.9.8g/apps/speed.c
+===================================================================
+--- openssl-0.9.8g.orig/apps/speed.c
++++ openssl-0.9.8g/apps/speed.c
+@@ -113,7 +113,7 @@
+ #elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+ # define TIMES
+ #endif
+-#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
++#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) && !defined(__UCLIBC__) /* FIXME */
+ # define TIMEB
+ #endif
+
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2008-12-28 16:08 jacmet at uclibc.org
@ 2009-01-06 11:38 ` Mark Jackson
2009-01-06 12:00 ` Peter Korsgaard
0 siblings, 1 reply; 38+ messages in thread
From: Mark Jackson @ 2009-01-06 11:38 UTC (permalink / raw)
To: buildroot
jacmet at uclibc.org wrote:
> Author: jacmet
> Date: 2008-12-28 16:08:57 +0000 (Sun, 28 Dec 2008)
> New Revision: 24578
>
> Log:
> openssl: fix uclibc 0.9.30 build
>
> Added:
> trunk/buildroot/package/openssl/openssl-0.9.8g-uclibc-susv3-legacy.patch
>
>
> Changeset:
> Added: trunk/buildroot/package/openssl/openssl-0.9.8g-uclibc-susv3-legacy.patch
> ===================================================================
> --- trunk/buildroot/package/openssl/openssl-0.9.8g-uclibc-susv3-legacy.patch (rev 0)
> +++ trunk/buildroot/package/openssl/openssl-0.9.8g-uclibc-susv3-legacy.patch 2008-12-28 16:08:57 UTC (rev 24578)
> @@ -0,0 +1,18 @@
> +sys/timeb.h / ftime are legacy, so don't enable them for uClibc
> +---
> + apps/speed.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +Index: openssl-0.9.8g/apps/speed.c
> +===================================================================
> +--- openssl-0.9.8g.orig/apps/speed.c
> ++++ openssl-0.9.8g/apps/speed.c
> +@@ -113,7 +113,7 @@
> + #elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
> + # define TIMES
> + #endif
> +-#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
> ++#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) && !defined(__UCLIBC__) /* FIXME */
> + # define TIMEB
> + #endif
> +
>
This patch fails when I make openssl. Below is the make output and the
rejects file.
What other info can I supply ?
Regards
Mark
---
$ make openssl-dirclean
$ make
Checking build system dependencies:
BUILDROOT_DL_DIR clean: Ok
CC clean: Ok
CXX clean: Ok
CPP clean: Ok
CFLAGS clean: Ok
INCLUDES clean: Ok
CXXFLAGS clean: Ok
which installed: Ok
sed works: Ok (/bin/sed)
GNU make version '3.81': Ok
C compiler '/usr/bin/gcc'
C compiler version '4.3.2': Ok
C++ compiler '/usr/bin/g++'
C++ compiler version '4.3.2': Ok
awk installed: Ok
bash installed: Ok
bison installed: Ok
flex installed: Ok
gettext installed: Ok
makeinfo installed: Ok
Build system dependencies: Ok
rm -rf
/usr/local/dev/avr32/buildroot-cvs/project_build_avr32/mimc200/buildroot-config
mkdir -p /usr/local/dev/avr32/buildroot-cvs/project_build_avr32/mimc200
cp -dpRf package/config/buildroot-config
/usr/local/dev/avr32/buildroot-cvs/project_build_avr32/mimc200/buildroot-config
>>> openssl 0.9.8g Downloading
>>> openssl 0.9.8g Extracting
>>> openssl 0.9.8g Patching libtool
>>> openssl 0.9.8g Patching package/openssl
Applying openssl-0.9.8g-avr32-asm-optimizations.patch.avr32 using plaintext:
patching file apps/ca.c
patching file apps/Makefile
patching file apps/s_client.c
patching file apps/speed.c
patching file apps/s_server.c
patching file apps/s_time.c
patching file bench/dummy_rand.c
patching file bench/Makefile
patching file bench/speed-avr32.c
patching file Configure
patching file crypto/aes/asm/aes-avr32.S
patching file crypto/aes/Makefile
patching file crypto/asn1/t_x509.c
patching file crypto/asn1/x_info.c
patching file crypto/bio/bss_conn.c
patching file crypto/bio/Makefile
patching file crypto/bn/bn_asm.c
patching file crypto/bn/bn_div.c
patching file crypto/bn/bn_exp.c
patching file crypto/bn/bn_gcd.c
patching file crypto/bn/bn.h
patching file crypto/bn/bn_lcl.h
patching file crypto/bn/bn_lib.c
patching file crypto/conf/conf.h
patching file crypto/cryptlib.c
patching file crypto/des/asm/des-avr32.S
patching file crypto/des/asm/des_cbc.c
patching file crypto/des/des_locl.h
patching file crypto/des/Makefile
patching file crypto/des/spr.h
patching file crypto/dsa/dsa_depr.c
patching file crypto/ec/Makefile
patching file crypto/ecdh/ech_ossl.c
patching file crypto/ecdh/Makefile
patching file crypto/evp/Makefile
patching file crypto/Makefile
patching file crypto/o_dir.c
patching file crypto/opensslconf.h
patching file crypto/pem/pem.h
patching file crypto/rand/md_rand.c
patching file crypto/rand/rand_egd.c
patching file crypto/rand/rand_lib.c
patching file crypto/rand/rand_unix.c
patching file crypto/rsa/Makefile
patching file crypto/rsa/rsa_oaep.c
patching file crypto/rsa/rsa_pss.c
patching file crypto/ui/ui_openssl.c
patching file crypto/uid.c
patching file crypto/x509/x509.h
patching file crypto/x509v3/x509v3.h
patching file e_os2.h
patching file e_os.h
patching file ssl/bio_ssl.c
patching file ssl/Makefile
patching file test/Makefile
Applying openssl-0.9.8g-do-not-build-docs.patch using plaintext:
patching file Makefile.org
Hunk #1 succeeded at 473 with fuzz 2 (offset -319 lines).
Applying openssl-0.9.8g-uclibc-susv3-legacy.patch using plaintext:
patching file apps/speed.c
Hunk #1 FAILED at 113.
1 out of 1 hunk FAILED -- saving rejects to file apps/speed.c.rej
Patch failed! Please fix openssl-0.9.8g-uclibc-susv3-legacy.patch!
make: ***
[/usr/local/dev/avr32/buildroot-cvs/build_avr32/openssl-0.9.8g/.stamp_patched]
Error 1
mpfj at mpfj-ubuntu:/usr/local/dev/avr32/buildroot$
Here is the rejects file:-
***************
*** 113,119 ****
#elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) &&
(!defined(OPENSSL_SYS_VMS) || defined(__DECC))
# define TIMES
#endif
- #if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) &&
!defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) &&
!defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) &&
!defined(OPENSSL_SYS_VXWORKS) /* FIXME */
# define TIMEB
#endif
--- 113,119 ----
#elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) &&
(!defined(OPENSSL_SYS_VMS) || defined(__DECC))
# define TIMES
#endif
+ #if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) &&
!defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) &&
!defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) &&
!defined(OPENSSL_SYS_VXWORKS) && !defined(__UCLIBC__) /* FIXME */
# define TIMEB
#endif
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2009-01-06 11:59 jacmet at uclibc.org
0 siblings, 0 replies; 38+ messages in thread
From: jacmet at uclibc.org @ 2009-01-06 11:59 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-06 11:59:55 +0000 (Tue, 06 Jan 2009)
New Revision: 24696
Log:
openssl: remove uclibc-susv3-legacy hunk from avr32 patch
Modified:
trunk/buildroot/package/openssl/openssl-0.9.8g-avr32-asm-optimizations.patch.avr32
Changeset:
Modified: trunk/buildroot/package/openssl/openssl-0.9.8g-avr32-asm-optimizations.patch.avr32
===================================================================
--- trunk/buildroot/package/openssl/openssl-0.9.8g-avr32-asm-optimizations.patch.avr32 2009-01-06 05:51:34 UTC (rev 24695)
+++ trunk/buildroot/package/openssl/openssl-0.9.8g-avr32-asm-optimizations.patch.avr32 2009-01-06 11:59:55 UTC (rev 24696)
@@ -321,15 +321,6 @@
===================================================================
--- openssl-0.9.8g.orig/apps/speed.c 2008-09-24 11:00:04.000000000 +0200
+++ openssl-0.9.8g/apps/speed.c 2008-09-24 11:01:01.000000000 +0200
-@@ -113,7 +113,7 @@
- #elif !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
- # define TIMES
- #endif
--#if !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
-+#if !defined(OPENSSL_SYS_NEWLIB) && !defined(_UNICOS) && !defined(__OpenBSD__) && !defined(sgi) && !defined(__FreeBSD__) && !(defined(__bsdi) || defined(__bsdi__)) && !defined(_AIX) && !defined(OPENSSL_SYS_MPE) && !defined(__NetBSD__) && !defined(OPENSSL_SYS_VXWORKS) /* FIXME */
- # define TIMEB
- #endif
-
@@ -237,6 +237,11 @@
*/
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2009-01-06 11:38 ` Mark Jackson
@ 2009-01-06 12:00 ` Peter Korsgaard
2009-01-06 13:25 ` Mark Jackson
0 siblings, 1 reply; 38+ messages in thread
From: Peter Korsgaard @ 2009-01-06 12:00 UTC (permalink / raw)
To: buildroot
>>>>> "Mark" == Mark Jackson <mpfj@mimc.co.uk> writes:
Hi,
Mark> This patch fails when I make openssl. Below is the make output
Mark> and the rejects file.
Ahh, It's because the avr32 specific patch apparently also makes the
same change as openssl-0.9.8g-uclibc-susv3-legacy.patch, which it
ofcourse shouldn't do. I have fixed it in r24696.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
2009-01-06 12:00 ` Peter Korsgaard
@ 2009-01-06 13:25 ` Mark Jackson
0 siblings, 0 replies; 38+ messages in thread
From: Mark Jackson @ 2009-01-06 13:25 UTC (permalink / raw)
To: buildroot
Peter Korsgaard wrote:
>>>>>> "Mark" == Mark Jackson <mpfj@mimc.co.uk> writes:
>
> Hi,
>
> Mark> This patch fails when I make openssl. Below is the make output
> Mark> and the rejects file.
>
> Ahh, It's because the avr32 specific patch apparently also makes the
> same change as openssl-0.9.8g-uclibc-susv3-legacy.patch, which it
> ofcourse shouldn't do. I have fixed it in r24696.
>
Thank you ... it all compiles without error now.
Cheers
Mark
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2009-01-21 20:31 jacmet at uclibc.org
0 siblings, 0 replies; 38+ messages in thread
From: jacmet at uclibc.org @ 2009-01-21 20:31 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-01-21 20:31:47 +0000 (Wed, 21 Jan 2009)
New Revision: 24943
Log:
openssl: fix build without largefile support
Added:
trunk/buildroot/package/openssl/openssl-0.9.8g-dont-force-large-file.patch
Changeset:
Added: trunk/buildroot/package/openssl/openssl-0.9.8g-dont-force-large-file.patch
===================================================================
--- trunk/buildroot/package/openssl/openssl-0.9.8g-dont-force-large-file.patch (rev 0)
+++ trunk/buildroot/package/openssl/openssl-0.9.8g-dont-force-large-file.patch 2009-01-21 20:31:47 UTC (rev 24943)
@@ -0,0 +1,19 @@
+[patch]: bss_file.c: don't force largefile mode
+---
+ crypto/bio/bss_file.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+Index: openssl-0.9.8g/crypto/bio/bss_file.c
+===================================================================
+--- openssl-0.9.8g.orig/crypto/bio/bss_file.c
++++ openssl-0.9.8g/crypto/bio/bss_file.c
+@@ -78,9 +78,6 @@
+ * sequential access of large files without extra "magic" comprise *BSD,
+ * Darwin, IRIX...
+ */
+-#ifndef _FILE_OFFSET_BITS
+-#define _FILE_OFFSET_BITS 64
+-#endif
+ #endif
+
+ #include <stdio.h>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2009-02-24 0:37 hamish at uclibc.org
0 siblings, 0 replies; 38+ messages in thread
From: hamish at uclibc.org @ 2009-02-24 0:37 UTC (permalink / raw)
To: buildroot
Author: hamish
Date: 2009-02-24 00:37:06 +0000 (Tue, 24 Feb 2009)
New Revision: 25433
Log:
Bump version to 0.9.8j
Added:
trunk/buildroot/package/openssl/openssl-0.9.8j-avr32-asm-optimizations.patch.avr32
trunk/buildroot/package/openssl/openssl-0.9.8j-do-not-build-docs.patch
trunk/buildroot/package/openssl/openssl-0.9.8j-dont-force-large-file.patch
trunk/buildroot/package/openssl/openssl-0.9.8j-uclibc-susv3-legacy.patch
Removed:
trunk/buildroot/package/openssl/openssl-0.9.8g-avr32-asm-optimizations.patch.avr32
trunk/buildroot/package/openssl/openssl-0.9.8g-do-not-build-docs.patch
trunk/buildroot/package/openssl/openssl-0.9.8g-dont-force-large-file.patch
trunk/buildroot/package/openssl/openssl-0.9.8g-uclibc-susv3-legacy.patch
Modified:
trunk/buildroot/package/openssl/openssl.mk
Changeset:
Sorry, the patch is too large to include (12871 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=25433
^ permalink raw reply [flat|nested] 38+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/openssl
@ 2009-03-05 13:48 jacmet at uclibc.org
0 siblings, 0 replies; 38+ messages in thread
From: jacmet at uclibc.org @ 2009-03-05 13:48 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-03-05 13:48:29 +0000 (Thu, 05 Mar 2009)
New Revision: 25546
Log:
openssl: misc fixes
Patch by Gustavo Zacarias <gustavo@zacarias.com.ar>
Closes #151.
* Avoid fips directory completely since it just installs source file cruft
inlib
* Point openssldir to a more friendly and common /etc/ssl rather than
/usr/lib/ssl
Added:
trunk/buildroot/package/openssl/openssl-0.9.8j-nofips.patch
Modified:
trunk/buildroot/package/openssl/openssl.mk
Changeset:
Added: trunk/buildroot/package/openssl/openssl-0.9.8j-nofips.patch
===================================================================
--- trunk/buildroot/package/openssl/openssl-0.9.8j-nofips.patch (rev 0)
+++ trunk/buildroot/package/openssl/openssl-0.9.8j-nofips.patch 2009-03-05 13:48:29 UTC (rev 25546)
@@ -0,0 +1,12 @@
+diff -Nura openssl-0.9.8j/Makefile openssl-0.9.8j.nofips/Makefile
+--- openssl-0.9.8j/Makefile 2009-01-07 09:57:01.000000000 -0200
++++ openssl-0.9.8j.nofips/Makefile 2009-03-05 10:10:09.000000000 -0200
+@@ -133,7 +133,7 @@
+
+ BASEADDR=0xFB00000
+
+-DIRS= crypto fips ssl engines apps test tools
++DIRS= crypto ssl engines apps test tools
+ SHLIBDIRS= crypto ssl
+
+ # dirs in crypto to build
Modified: trunk/buildroot/package/openssl/openssl.mk
===================================================================
--- trunk/buildroot/package/openssl/openssl.mk 2009-03-05 13:40:34 UTC (rev 25545)
+++ trunk/buildroot/package/openssl/openssl.mk 2009-03-05 13:48:29 UTC (rev 25546)
@@ -38,7 +38,7 @@
./Configure \
linux-$(OPENSSL_TARGET_ARCH) \
--prefix=/usr \
- --openssldir=/usr/lib/ssl \
+ --openssldir=/etc/ssl \
threads \
shared \
no-idea \
^ permalink raw reply [flat|nested] 38+ messages in thread
end of thread, other threads:[~2009-03-05 13:48 UTC | newest]
Thread overview: 38+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-08 6:40 [Buildroot] svn commit: trunk/buildroot/package/openssl hamish at uclibc.org
2008-07-08 9:36 ` Ulf Samuelsson
2008-07-08 12:03 ` Hamish Moffatt
-- strict thread matches above, loose matches on Subject: below --
2009-03-05 13:48 jacmet at uclibc.org
2009-02-24 0:37 hamish at uclibc.org
2009-01-21 20:31 jacmet at uclibc.org
2009-01-06 11:59 jacmet at uclibc.org
2008-12-28 16:08 jacmet at uclibc.org
2009-01-06 11:38 ` Mark Jackson
2009-01-06 12:00 ` Peter Korsgaard
2009-01-06 13:25 ` Mark Jackson
2008-10-13 8:10 egtvedt at uclibc.org
2008-10-07 7:11 egtvedt at uclibc.org
2008-09-24 9:12 egtvedt at uclibc.org
2008-09-24 9:10 egtvedt at uclibc.org
2008-07-08 13:49 jacmet at uclibc.org
2008-07-08 10:13 ulf at uclibc.org
2008-07-08 10:31 ` Peter Korsgaard
2008-07-08 12:04 ` Hamish Moffatt
2008-07-08 12:25 ` Thiago A. Corrêa
2008-07-08 12:39 ` Peter Korsgaard
2008-07-08 13:16 ` Thiago A. Corrêa
2008-07-08 13:29 ` Peter Korsgaard
2008-07-08 13:35 ` Thiago A. Corrêa
2008-07-08 13:45 ` Peter Korsgaard
2008-07-08 14:56 ` Thiago A. Corrêa
2008-07-08 15:02 ` Peter Korsgaard
2008-07-08 15:34 ` John Voltz
2008-07-08 15:42 ` John Voltz
2008-07-08 16:30 ` Ulf Samuelsson
2008-07-08 16:48 ` Ulf Samuelsson
2008-07-05 7:25 ulf at uclibc.org
2008-07-05 15:55 ` Thiago A. Corrêa
2008-07-05 21:59 ` Ulf Samuelsson
2008-07-05 6:54 ulf at uclibc.org
2007-08-13 19:35 ulf at uclibc.org
2007-08-11 16:55 ulf at uclibc.org
2007-04-06 15:01 aldot at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox