Changeset 15872


Ignore:
Timestamp:
2009-05-15T17:21:35+02:00 (7 years ago)
Author:
nico
Message:

[8.09] [package] openssl: revert update to 0.9.8k in r15745

Location:
branches/8.09/package/openssl
Files:
6 deleted
4 edited
4 copied

Legend:

Unmodified
Added
Removed
  • branches/8.09/package/openssl/Makefile

    r15745 r15872  
    1 # 
     1#  
    22# Copyright (C) 2006-2009 OpenWrt.org 
    33# 
     
    55# See /LICENSE for more information. 
    66# 
     7# $Id$ 
    78 
    89include $(TOPDIR)/rules.mk 
    910 
    1011PKG_NAME:=openssl 
    11 PKG_VERSION:=0.9.8k 
    12 PKG_RELEASE:=2 
     12PKG_VERSION:=0.9.8i 
     13PKG_RELEASE:=3.1 
    1314 
    1415PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    1718        ftp://ftp.webmonster.de/pub/openssl/source/ \ 
    1819        ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/ 
    19 PKG_MD5SUM:=e555c6d58d276aec7fdc53363e338ab3 
    20  
    21 PKG_BUILD_DEPENDS:=ocf-crypto-headers 
     20PKG_MD5SUM:=561e00f18821c74b2b86c8c7786f9d8b 
    2221 
    2322include $(INCLUDE_DIR)/package.mk 
     
    2928 
    3029define Package/openssl/Default/description 
    31  The OpenSSL Project is a collaborative effort to develop a robust, 
    32  commercial-grade, full-featured, and Open Source toolkit implementing the 
    33  Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) 
     30 The OpenSSL Project is a collaborative effort to develop a robust,  
     31 commercial-grade, full-featured, and Open Source toolkit implementing the  
     32 Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)  
    3433 protocols as well as a full-strength general purpose cryptography library. 
    3534endef 
     
    4544define Package/libopenssl/description 
    4645$(call Package/openssl/Default/description) 
    47  This package contains the OpenSSL shared libraries, needed by other 
     46 This package contains the OpenSSL shared libraries, needed by other  
    4847 programs. 
    4948endef 
     
    7069                                        no-rmd160 no-aes192 no-ripemd no-camellia no-ans1 no-krb5 
    7170ifeq ($(BOARD),ixp4xx) 
    72 OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic \ 
     71OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-threads zlib-dynamic \ 
    7372                                        no-sse2 no-perlasm --with-cryptodev 
    7473else 
    75 OPENSSL_OPTIONS:= shared no-ec no-err no-hw no-threads zlib-dynamic \ 
     74OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-threads zlib-dynamic \ 
    7675                                        no-engines no-sse2 no-perlasm 
    7776endif 
  • branches/8.09/package/openssl/patches/120-makedepend.patch

    r15745 r15872  
    1 diff -burN openssl-0.9.8k/util/domd openssl-0.9.8k.patched/util/domd 
    2 --- openssl-0.9.8k/util/domd    2009-01-21 22:44:52.000000000 +0100 
    3 +++ openssl-0.9.8k.patched/util/domd    2009-03-26 15:46:28.600347986 +0100 
     1Index: openssl-0.9.8e/util/domd 
     2=================================================================== 
     3--- openssl-0.9.8e.orig/util/domd       2007-06-04 13:23:32.130849264 +0200 
     4+++ openssl-0.9.8e/util/domd    2007-06-04 13:23:32.408807008 +0200 
    45@@ -14,7 +14,8 @@ 
    56 cp Makefile Makefile.save 
     
    1617     sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp 
    1718     echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp 
    18 -    ${CC:-gcc} -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp 
     19-    gcc -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp 
    1920+    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp 
    2021     ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new 
  • branches/8.09/package/openssl/patches/140-makefile-dirs.patch

    r15745 r15872  
    1 --- openssl-0.9.8j/Makefile.org 2008-12-30 14:26:26.000000000 +0100 
    2 +++ openssl-0.9.8j.patched/Makefile.org 2009-01-17 13:41:52.610868317 +0100 
    3 @@ -131,7 +131,7 @@ 
     1Index: openssl-0.9.8e/Makefile.org 
     2=================================================================== 
     3--- openssl-0.9.8e.orig/Makefile.org    2007-06-04 13:23:32.048861728 +0200 
     4+++ openssl-0.9.8e/Makefile.org 2007-06-04 13:23:32.857738760 +0200 
     5@@ -104,7 +104,7 @@ 
     6 ZLIB_INCLUDE= 
     7 LIBZLIB= 
    48  
    5  BASEADDR= 
    6   
    7 -DIRS=   crypto fips ssl engines apps test tools 
    8 +DIRS=   crypto fips ssl apps 
    9  SHLIBDIRS= crypto ssl fips 
     9-DIRS=   crypto ssl engines apps test tools 
     10+DIRS=   crypto ssl apps 
     11 SHLIBDIRS= crypto ssl 
    1012  
    1113 # dirs in crypto to build 
  • branches/8.09/package/openssl/patches/160-disable_doc_tests.patch

    r15745 r15872  
    1 diff -burN openssl-0.9.8k/Makefile openssl-0.9.8k.patched/Makefile 
    2 --- openssl-0.9.8k/Makefile     2009-03-25 14:11:43.000000000 +0100 
    3 +++ openssl-0.9.8k.patched/Makefile     2009-03-26 15:28:35.483566078 +0100 
    4 @@ -133,7 +133,7 @@ 
    5   
    6  BASEADDR=0xFB00000 
     1Index: openssl-0.9.8e/Makefile 
     2=================================================================== 
     3--- openssl-0.9.8e.orig/Makefile        2007-06-04 13:23:31.995869784 +0200 
     4+++ openssl-0.9.8e/Makefile     2007-06-04 13:23:33.246679632 +0200 
     5@@ -106,7 +106,7 @@ 
     6 ZLIB_INCLUDE= 
     7 LIBZLIB= 
    78  
    89-DIRS=   crypto ssl engines apps test tools 
     
    1112  
    1213 # dirs in crypto to build 
    13 @@ -150,7 +150,7 @@ 
     14@@ -123,7 +123,7 @@ 
    1415  
    1516 # tests to perform.  "alltests" is a special word indicating that all tests 
    1617 # should be performed. 
    1718-TESTS = alltests 
    18 +TESTS = 
     19+TESTS =  
    1920  
    2021 MAKEFILE= Makefile 
    2122  
    22 @@ -162,7 +162,7 @@ 
     23@@ -135,7 +135,7 @@ 
    2324  
    2425 TOP=    . 
     
    2930 LIBS=   libcrypto.a libssl.a 
    3031 SHARED_CRYPTO=libcrypto$(SHLIB_EXT) 
    31 @@ -321,7 +321,7 @@ 
    32         ../crypto/uid.o 
     32@@ -225,7 +225,7 @@ 
     33        @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV) 
    3334  
    3435 sub_all: build_all 
     
    3637+build_all: build_libs build_apps build_tools 
    3738  
    38  build_libs: build_crypto build_fips build_ssl build_shared build_engines 
     39 build_libs: build_crypto build_ssl build_engines 
    3940  
    40 @@ -613,7 +613,7 @@ 
     41@@ -475,7 +475,7 @@ 
    4142 dist_pem_h: 
    4243        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) 
     
    4748 install_sw: 
    4849        @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ 
    49 diff -burN openssl-0.9.8k/Makefile.org openssl-0.9.8k.patched/Makefile.org 
    50 --- openssl-0.9.8k/Makefile.org 2009-03-03 23:40:29.000000000 +0100 
    51 +++ openssl-0.9.8k.patched/Makefile.org 2009-03-26 15:29:05.243750064 +0100 
    52 @@ -611,7 +611,7 @@ 
     50Index: openssl-0.9.8e/Makefile.org 
     51=================================================================== 
     52--- openssl-0.9.8e.orig/Makefile.org    2007-06-04 13:23:32.857738760 +0200 
     53+++ openssl-0.9.8e/Makefile.org 2007-06-04 13:23:33.246679632 +0200 
     54@@ -473,7 +473,7 @@ 
    5355 dist_pem_h: 
    5456        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) 
Note: See TracChangeset for help on using the changeset viewer.