Changeset 4873


Ignore:
Timestamp:
2006-09-29T19:28:27+02:00 (11 years ago)
Author:
nbd
Message:

sync openssl in wr and ng, update to 0.9.8d for security fixes

Location:
branches
Files:
1 added
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • branches/buildroot-ng/openwrt/package/openssl/Makefile

    r4855 r4873  
    1010 
    1111PKG_NAME:=openssl 
    12 PKG_VERSION:=0.9.8b 
     12PKG_VERSION:=0.9.8d 
    1313PKG_RELEASE:=1 
    1414 
     
    1818        ftp://ftp.webmonster.de/pub/openssl/source/ \ 
    1919        ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ 
    20 PKG_MD5SUM:=12cedbeb6813a0d7919dbf1f82134b86 
     20PKG_MD5SUM:=8ed1853538e1d05a1f5ada61ebf8bffa 
    2121PKG_CAT:=zcat 
    2222 
     
    6767 
    6868define Build/Configure 
    69         $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure 
    70         $(SED) s/OPENWRT_OPTIMIZATION_FLAGS/$(BR2_TARGET_OPTIMIZATION)/g $(PKG_BUILD_DIR)/Configure 
    7169        (cd $(PKG_BUILD_DIR); \ 
    7270                ./Configure linux-openwrt \ 
     
    8684        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ 
    8785                MAKEDEPPROG="$(TARGET_CROSS)gcc" \ 
     86                OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ 
    8887                depend 
    8988        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ 
     
    9190                AR="$(TARGET_CROSS)ar r" \ 
    9291                RANLIB="$(TARGET_CROSS)ranlib" \ 
     92                OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ 
    9393                all build-shared 
    9494        # Work around openssl build bug to link libssl.so with libcrypto.so. 
     
    9696        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ 
    9797                CC="$(TARGET_CC)" \ 
    98                 CCOPTS="$(TARGET_CFLAGS) -fomit-frame-pointer" \ 
     98                OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ 
    9999                do_linux-shared 
    100100        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ 
  • branches/buildroot-ng/openwrt/package/openssl/patches/110-optimize-for-size.patch

    r3457 r4873  
    77 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}", 
    88+# OpenWrt targets 
    9 +"linux-openwrt","gcc:-DTERMIO OPENWRT_OPTIMIZATION_FLAGS -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
     9+"linux-openwrt","gcc:-DTERMIO \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
    1010  
    1111 #### *BSD [do see comment about ${BSDthreads} above!] 
  • branches/whiterussian/openwrt/package/openssl/Makefile

    r4782 r4873  
    44 
    55PKG_NAME:=openssl 
    6 PKG_VERSION:=0.9.7k 
    7 PKG_RELEASE:=3 
    8 PKG_MD5SUM:=be6bba1d67b26eabb48cf1774925416f 
     6PKG_VERSION:=0.9.8d 
     7PKG_RELEASE:=1 
     8PKG_MD5SUM:=8ed1853538e1d05a1f5ada61ebf8bffa 
    99 
    1010PKG_SOURCE_URL:=http://www.openssl.org/source/ \ 
     
    1818PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install 
    1919 
    20 OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 
     20OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-rmd160 no-aes192 
     21OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines 
     22 
    2123 
    2224include $(TOPDIR)/package/rules.mk 
     
    2830 
    2931$(PKG_BUILD_DIR)/.configured: 
    30         $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure 
    3132        (cd $(PKG_BUILD_DIR); \ 
    3233                PATH=$(TARGET_PATH) \ 
    33                 ./Configure linux-$(ARCH) \ 
    34                   --prefix=/usr \ 
    35                   --openssldir=/etc/ssl \ 
    36                   -I$(STAGING_DIR)/usr/include \ 
    37                   -L$(STAGING_DIR)/usr/lib -ldl \ 
    38                   $(OPENSSL_NO_CIPHERS) \ 
    39                   shared no-asm no-ec no-engine no-err no-fips no-hw no-krb5 no-threads zlib-dynamic \ 
     34                ./Configure linux-openwrt \ 
     35                        --prefix=/usr \ 
     36                        --openssldir=/etc/ssl \ 
     37                        -I$(STAGING_DIR)/usr/include \ 
     38                        -L$(STAGING_DIR)/usr/lib -ldl \ 
     39                        -DOPENSSL_SMALL_FOOTPRINT \ 
     40                        $(OPENSSL_NO_CIPHERS) \ 
     41                        $(OPENSSL_OPTIONS) \ 
    4042        ) 
    4143        touch $@ 
     
    4951        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ 
    5052                CC="$(TARGET_CC)" \ 
    51                 CCOPTS="$(TARGET_CFLAGS) -fomit-frame-pointer" \ 
     53                OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ 
    5254                AR="$(TARGET_CROSS)ar r" \ 
    5355                RANLIB="$(TARGET_CROSS)ranlib" \ 
     
    5759        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ 
    5860                CC=$(TARGET_CC) \ 
    59                 CCOPTS="$(TARGET_CFLAGS) -fomit-frame-pointer" \ 
     61                OPENWRT_OPTIMIZATION_FLAGS="$(TARGET_CFLAGS)" \ 
    6062                do_linux-shared 
    6163        $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ 
  • branches/whiterussian/openwrt/package/openssl/patches/110-optimize-for-size.patch

    r2500 r4873  
    1 diff -Nur openssl-0.9.7g/Configure openssl-0.9.7g-Os/Configure 
    2 --- openssl-0.9.7g/Configure    2005-04-07 18:06:01.000000000 +0200 
    3 +++ openssl-0.9.7g-Os/Configure 2005-05-01 00:13:09.000000000 +0200 
    4 @@ -401,8 +401,9 @@ 
    5  "debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
    6  "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -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)", 
    7  "linux-aout",  "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", 
    8 -"linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
    9 -"linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
    10 +"linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO \$(CCOPTS) -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
    11 +"linux-mips",   "gcc:-DB_ENDIAN -DTERMIO \$(CCOPTS) -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
    12 +"linux-i386",  "gcc:-DL_ENDIAN -DTERMIO \$(CCOPTS) -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
    13  "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc32.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
    14  # -bpowerpc64-linux is transient option, -m64 should be the one to use... 
    15  "linux-ppc64",  "gcc:-bpowerpc64-linux -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:asm/linux_ppc64.o:::::::::dlfcn:linux-shared:-fPIC:-bpowerpc64-linux:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
     1diff -ur openssl-0.9.8a/Configure openssl-0.9.8a-owrt/Configure 
     2--- openssl-0.9.8a/Configure    2005-08-02 12:59:42.000000000 +0200 
     3+++ openssl-0.9.8a-owrt/Configure       2006-03-23 14:16:35.000000000 +0100 
     4@@ -353,6 +353,8 @@ 
     5 "linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
     6 "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}", 
     7 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}", 
     8+# OpenWrt targets 
     9+"linux-openwrt","gcc:-DTERMIO \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
     10  
     11 #### *BSD [do see comment about ${BSDthreads} above!] 
     12 "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", 
  • branches/whiterussian/openwrt/package/openssl/patches/140-makefile-dirs.patch

    r4775 r4873  
     1--- openssl-0.9.8a/Makefile.org 2006-02-21 20:57:45.000000000 -0800 
     2+++ openssl-0.9.8a-new/Makefile.org     2006-02-21 21:37:11.000000000 -0800 
     3@@ -100,7 +100,7 @@ 
     4 KRB5_INCLUDES= 
     5 LIBKRB5= 
     6  
     7-DIRS=   crypto ssl engines apps test tools 
     8+DIRS=   crypto ssl apps 
     9 SHLIBDIRS= crypto ssl 
     10  
     11 # dirs in crypto to build 
  • branches/whiterussian/openwrt/package/openssl/patches/160-disable_doc_tests.patch

    r4775 r4873  
    1 diff -Nur openssl-0.9.7k.orig/Makefile openssl-0.9.7k/Makefile 
    2 --- openssl-0.9.7k.orig/Makefile        2006-09-05 10:40:05.000000000 +0200 
    3 +++ openssl-0.9.7k/Makefile     2006-09-06 18:09:28.000000000 +0200 
    4 @@ -196,7 +196,7 @@ 
    5  # we might set SHLIB_MARK to '$(SHARED_LIBS)'. 
    6  SHLIB_MARK= 
     1diff -urN openssl-0.9.8a/Makefile openssl-0.9.8a.new/Makefile 
     2--- openssl-0.9.8a/Makefile     2005-10-11 12:21:48.000000000 +0200 
     3+++ openssl-0.9.8a.new/Makefile 2006-03-29 15:23:28.107586680 +0200 
     4@@ -102,7 +102,7 @@ 
     5 KRB5_INCLUDES= 
     6 LIBKRB5= 
    77  
    8 -DIRS=   crypto fips-1.0 ssl $(SHLIB_MARK) apps test tools 
    9 +DIRS=   crypto fips-1.0 ssl $(SHLIB_MARK) apps tools 
     8-DIRS=   crypto ssl engines apps test tools 
     9+DIRS=   crypto ssl engines apps tools 
    1010 SHLIBDIRS= crypto ssl 
    1111  
    1212 # dirs in crypto to build 
    13 @@ -211,7 +211,7 @@ 
     13@@ -119,7 +119,7 @@ 
    1414  
    1515 # tests to perform.  "alltests" is a special word indicating that all tests 
    1616 # should be performed. 
    1717-TESTS = alltests 
    18 +TESTS = 
     18+TESTS =  
    1919  
    2020 MAKEFILE= Makefile 
    2121  
    22 @@ -223,7 +223,7 @@ 
     22@@ -131,7 +131,7 @@ 
    2323  
    2424 TOP=    . 
     
    2929 LIBS=   libcrypto.a libssl.a 
    3030 SHARED_CRYPTO=libcrypto$(SHLIB_EXT) 
    31 @@ -781,7 +781,7 @@ 
     31@@ -204,7 +204,7 @@ 
     32        @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV) 
     33  
     34 sub_all: build_all 
     35-build_all: build_libs build_apps build_tests build_tools 
     36+build_all: build_libs build_apps build_tools 
     37  
     38 build_libs: build_crypto build_ssl build_engines 
     39  
     40@@ -454,7 +454,7 @@ 
    3241 dist_pem_h: 
    33         (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean) 
     42        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) 
    3443  
    3544-install: all install_docs install_sw 
     
    3847 install_sw: 
    3948        @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ 
    40 diff -Nur openssl-0.9.7k.orig/Makefile.org openssl-0.9.7k/Makefile.org 
    41 --- openssl-0.9.7k.orig/Makefile.org    2006-04-24 15:32:57.000000000 +0200 
    42 +++ openssl-0.9.7k/Makefile.org 2006-09-06 18:10:05.000000000 +0200 
    43 @@ -194,7 +194,7 @@ 
    44  # we might set SHLIB_MARK to '$(SHARED_LIBS)'. 
    45  SHLIB_MARK= 
    46   
    47 -DIRS=   crypto fips-1.0 ssl $(SHLIB_MARK) apps test tools 
    48 +DIRS=   crypto ssl apps 
    49  SHLIBDIRS= crypto ssl 
    50   
    51  # dirs in crypto to build 
    52 @@ -209,7 +209,7 @@ 
    53   
    54  # tests to perform.  "alltests" is a special word indicating that all tests 
    55  # should be performed. 
    56 -TESTS = alltests 
    57 +TESTS = 
    58   
    59  MAKEFILE= Makefile 
    60   
    61 @@ -221,7 +221,7 @@ 
    62   
    63  TOP=    . 
    64  ONEDIRS=out tmp 
    65 -EDIRS=  times doc bugs util include certs ms shlib mt demos perl sf dep VMS 
    66 +EDIRS=  times bugs util include certs ms shlib mt demos perl sf dep VMS 
    67  WDIRS=  windows 
    68  LIBS=   libcrypto.a libssl.a 
    69  SHARED_CRYPTO=libcrypto$(SHLIB_EXT) 
    70 @@ -779,7 +779,7 @@ 
     49diff -urN openssl-0.9.8b/Makefile.org openssl-0.9.8b.new/Makefile.org 
     50--- openssl-0.9.8b/Makefile.org 2006-09-01 19:34:51.000000000 +0200 
     51+++ openssl-0.9.8b.new/Makefile.org     2006-09-01 19:36:38.000000000 +0200 
     52@@ -473,7 +473,7 @@ 
    7153 dist_pem_h: 
    72         (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean) 
     54        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) 
    7355  
    7456-install: all install_docs install_sw 
Note: See TracChangeset for help on using the changeset viewer.