Changeset 11518


Ignorieren:
Zeitstempel:
08.01.2014 16:04:53 (vor 4 Jahren)
Autor:
er13
Nachricht:

openssl:

Ort:
trunk
Dateien:
1 gelöscht
7 bearbeitet
1 verschoben

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/CHANGELOG

    r11516 r11518  
    8787    * obexftp 0.23 
    8888    * openssh 6.4p1 
     89    * openssl 1.0.1f 
    8990    * openvpn 2.3.2 
    9091    * pcre 8.34 
  • trunk/make/openssl/Config.in.libs

    r10142 r11518  
    4848 
    4949    config FREETZ_OPENSSL_VERSION_1 
    50     bool "1.0.1e" 
     50    bool "1.0.1f" 
    5151    help 
    5252        - is bigger than 0.9.8 (about 142kB) 
  • trunk/make/openssl/openssl.mk

    r10142 r11518  
    1 $(call PKG_INIT_BIN,$(if $(FREETZ_OPENSSL_VERSION_0),0.9.8y,1.0.1e)) 
     1$(call PKG_INIT_BIN,$(if $(FREETZ_OPENSSL_VERSION_0),0.9.8y,1.0.1f)) 
    22$(PKG)_LIB_VERSION:=$(call qstrip,$(FREETZ_OPENSSL_SHLIB_VERSION)) 
    33$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz 
    44$(PKG)_SOURCE_MD5_0.9.8y := 47c7fb37f78c970f1d30aa2f9e9e26d8 
    5 $(PKG)_SOURCE_MD5_1.0.1e := 66bf6f10f060d561929de96f9dfe5b8c 
     5$(PKG)_SOURCE_MD5_1.0.1f := f26b09c028a0541cab33da697d522b25 
    66$(PKG)_SOURCE_MD5        := $($(PKG)_SOURCE_MD5_$($(PKG)_VERSION)) 
    77$(PKG)_SITE:=http://www.openssl.org/source 
  • trunk/make/openssl/patches/1.0.1f/160-disable_doc_tests.openssl.patch

    r9421 r11518  
    3737    @dir=crypto; target=testapps; $(BUILD_ONE_CMD) 
    3838  
    39 @@ -537,7 +537,7 @@ 
     39@@ -538,7 +538,7 @@ 
    4040 dist_pem_h: 
    4141    (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) 
  • trunk/make/openssl/patches/1.0.1f/180-jobserver_unavailable_fix.openssl.patch

    r9421 r11518  
    3030 fips_premain_dso$(EXE_EXT): libcrypto.a 
    3131    [ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAG) -Iinclude \ 
    32 @@ -406,7 +406,7 @@ 
     32@@ -407,7 +407,7 @@ 
    3333  
    3434 clean: libclean 
     
    3939    rm -f openssl.pc libssl.pc libcrypto.pc 
    4040    rm -f speed.* .pure 
    41 @@ -422,12 +422,12 @@ 
     41@@ -423,12 +423,12 @@ 
    4242  
    4343 files: 
     
    5454 gentests: 
    5555    @(cd test && echo "generating dummy tests (if needed)..." && \ 
    56 @@ -435,7 +435,7 @@ 
     56@@ -436,7 +436,7 @@ 
    5757  
    5858 dclean: 
     
    6363 rehash: rehash.time 
    6464 rehash.time: certs apps 
    65 @@ -459,10 +459,10 @@ 
     65@@ -460,10 +460,10 @@ 
    6666    @$(PERL) util/selftest.pl 
    6767  
     
    7676 tags: 
    7777    rm -f TAGS 
    78 @@ -553,7 +553,7 @@ 
     78@@ -554,7 +554,7 @@ 
    7979    (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 
    8080    chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ 
     
    8787--- crypto/Makefile 
    8888+++ crypto/Makefile 
    89 @@ -86,17 +86,17 @@ 
     89@@ -88,17 +88,17 @@ 
    9090    @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi 
    9191  
     
    108108 # lib: $(LIB): are splitted to avoid end-less loop 
    109109 lib:   $(LIB) 
    110 @@ -112,7 +112,7 @@ 
     110@@ -114,7 +114,7 @@ 
    111111    fi 
    112112  
     
    117117 install: 
    118118    @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... 
    119 @@ -121,27 +121,27 @@ 
     119@@ -123,27 +123,27 @@ 
    120120    (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ 
    121121    chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ 
  • trunk/make/openssl/patches/1.0.1f/230-remove_timestamp_check.openssl.patch

    r9421 r11518  
    1010 # as we stick to -e, CLEARENV ensures that local variables in lower 
    1111 # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn 
    12 @@ -396,11 +396,6 @@ 
     12@@ -397,11 +397,6 @@ 
    1313        echo 'Libs.private: $(EX_LIBS)'; \ 
    1414        echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc 
  • trunk/make/openssl/patches/1.0.1f/280-no_private_libs.openssl.patch

    r10142 r11518  
    11--- Makefile.org 
    22+++ Makefile.org 
    3 @@ -364,8 +364,7 @@ 
     3@@ -365,8 +365,7 @@ 
    44        echo 'Description: OpenSSL cryptography library'; \ 
    55        echo 'Version: '$(VERSION); \ 
     
    1111  
    1212 libssl.pc: Makefile 
    13 @@ -378,8 +377,7 @@ 
     13@@ -379,8 +378,7 @@ 
    1414        echo 'Description: Secure Sockets Layer and cryptography libraries'; \ 
    1515        echo 'Version: '$(VERSION); \ 
     
    2121  
    2222 openssl.pc: Makefile 
    23 @@ -392,8 +390,7 @@ 
     23@@ -393,8 +391,7 @@ 
    2424        echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \ 
    2525        echo 'Version: '$(VERSION); \ 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.