Revision: 7351
http://sourceforge.net/p/ipcop/svn/7351
Author: owes
Date: 2014-03-21 20:45:56 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
Update openssl to 1.0.1f
Modified Paths:
--------------
ipcop/trunk/lfs/openssl
ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
ipcop/trunk/updates/2.1.3/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/openssl-1.0.1e_upstream.patch
Modified: ipcop/trunk/lfs/openssl
===================================================================
--- ipcop/trunk/lfs/openssl 2014-03-21 20:39:18 UTC (rev 7350)
+++ ipcop/trunk/lfs/openssl 2014-03-21 20:45:56 UTC (rev 7351)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = openssl
-VER = 1.0.1e
+VER = 1.0.1f
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 66bf6f10f060d561929de96f9dfe5b8c
+$(DL_FILE)_MD5 = f26b09c028a0541cab33da697d522b25
install : $(TARGET)
@@ -81,8 +81,6 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- # add 3 bugs fixes from upstream tree
- cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(PKG_NAME)-1.0.1e_upstream.patch
# Let still use our CFLAG but give the -O3 the developpers coded for
cd $(DIR_APP) && sed -i -e 's/-O3/$(CFLAGS) -O3/' Configure
Deleted: ipcop/trunk/src/patches/openssl-1.0.1e_upstream.patch
===================================================================
--- ipcop/trunk/src/patches/openssl-1.0.1e_upstream.patch 2014-03-21
20:39:18 UTC (rev 7350)
+++ ipcop/trunk/src/patches/openssl-1.0.1e_upstream.patch 2014-03-21
20:45:56 UTC (rev 7351)
@@ -1,82 +0,0 @@
-A few upstream bug fix patches just after 1.0.1e release
-git show cbf9b4aed3e209fe8a39e1d6f55aaf46d1369dc4
-git show 147dbb2fe3bead7a10e2f280261b661ce7af7adc
-git show 9fe4603b8245425a4c46986ed000fca054231253
-
-
-commit cbf9b4aed3e209fe8a39e1d6f55aaf46d1369dc4
-Author: Dr. Stephen Henson <st...@openssl.org>
-Date: Mon Feb 11 18:17:50 2013 +0000
-
- Fix in ssltest is no-ssl2 configured
-
-diff --git a/ssl/ssltest.c b/ssl/ssltest.c
-index 316bbb0..4f80be8 100644
---- a/ssl/ssltest.c
-+++ b/ssl/ssltest.c
-@@ -881,7 +881,13 @@ bad:
- meth=SSLv23_method();
- #else
- #ifdef OPENSSL_NO_SSL2
-- meth=SSLv3_method();
-+ if (tls1)
-+ meth=TLSv1_method();
-+ else
-+ if (ssl3)
-+ meth=SSLv3_method();
-+ else
-+ meth=SSLv23_method();
- #else
- meth=SSLv2_method();
- #endif
-commit 147dbb2fe3bead7a10e2f280261b661ce7af7adc
-Author: Dr. Stephen Henson <st...@openssl.org>
-Date: Mon Feb 11 18:24:03 2013 +0000
-
- Fix for SSL_get_certificate
-
- Now we set the current certificate to the one used by a server
- there is no need to call ssl_get_server_send_cert which will
- fail if we haven't sent a certificate yet.
-
-diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
-index 14d143d..ff5a85a 100644
---- a/ssl/ssl_lib.c
-+++ b/ssl/ssl_lib.c
-@@ -2792,9 +2792,7 @@ void ssl_clear_cipher_ctx(SSL *s)
- /* Fix this function so that it takes an optional type parameter */
- X509 *SSL_get_certificate(const SSL *s)
- {
-- if (s->server)
-- return(ssl_get_server_send_cert(s));
-- else if (s->cert != NULL)
-+ if (s->cert != NULL)
- return(s->cert->key->x509);
- else
- return(NULL);
-commit 9fe4603b8245425a4c46986ed000fca054231253
-Author: David Woodhouse <dw...@infradead.org>
-Date: Tue Feb 12 14:55:32 2013 +0000
-
- Check DTLS_BAD_VER for version number.
-
- The version check for DTLS1_VERSION was redundant as
- DTLS1_VERSION > TLS1_1_VERSION, however we do need to
- check for DTLS1_BAD_VER for compatibility.
-
- PR:2984
- (cherry picked from commit d980abb22e22661e98e5cee33d760ab0c7584ecc)
-
-diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
-index 02edf3f..443a31e 100644
---- a/ssl/s3_cbc.c
-+++ b/ssl/s3_cbc.c
-@@ -148,7 +148,7 @@ int tls1_cbc_remove_padding(const SSL* s,
- unsigned padding_length, good, to_check, i;
- const unsigned overhead = 1 /* padding length byte */ + mac_size;
- /* Check if version requires explicit IV */
-- if (s->version >= TLS1_1_VERSION || s->version == DTLS1_VERSION)
-+ if (s->version >= TLS1_1_VERSION || s->version == DTLS1_BAD_VER)
- {
- /* These lengths are all public so we can test them in
- * non-constant time.
Modified: ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3
===================================================================
--- ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-21 20:39:18 UTC
(rev 7350)
+++ ipcop/trunk/updates/2.1.3/ROOTFILES.i486-2.1.3 2014-03-21 20:45:56 UTC
(rev 7351)
@@ -189,6 +189,13 @@
/usr/lib/libldap-2.4.so.2
/usr/lib/libldap-2.4.so.2.10.2
##
+## openssl-1.0.1f
+/usr/bin/openssl
+/usr/lib/libcrypto.so
+/usr/lib/libcrypto.so.1.0.0
+/usr/lib/libssl.so
+/usr/lib/libssl.so.1.0.0
+##
## pango-1.36.3
/etc/pango/pango.modules
/usr/lib/libpango-1.0.so.0
Modified: ipcop/trunk/updates/2.1.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.3/information.xml 2014-03-21 20:39:18 UTC (rev
7350)
+++ ipcop/trunk/updates/2.1.3/information.xml 2014-03-21 20:45:56 UTC (rev
7351)
@@ -8,7 +8,8 @@
Add harfbuzz.<br />
Upgrade apcid to 2.0.22, bind to 9.9.5, cairo to 1.12.16, coreutils to
8.22, db to 6.0.30, e2fsprogs to 1.42.9, ethtool to 3.13,
fcron to 3.1.2, freetype to 2.5.3, glib to 2.38.2, gnupg to 1.4.16,
- iproute2 to 3.12.0, libgcrypt to 1.6.1, libgpg-error to 1.12, libnl to
3.2.24, libpng to 1.6.10, logrotate to 3.8.7, openldap to 2.4.39,
+ iproute2 to 3.12.0, libgcrypt to 1.6.1, libgpg-error to 1.12, libnl to
3.2.24, libpng to 1.6.10, logrotate to 3.8.7,
+ openldap to 2.4.39, openssl to 1.0.1f,
pango to 1.36.3, pcre to 8.34, procps to 3.3.9, psmisc to 22.21,
readline to 6.3, sqlite to 3.8.4.1,
squid-langpack to 20140220, tzdata to 2014a, ulogd to 2.0.3,
util-linux to 2.24.1.</description>
<previousversion>2.1.2</previousversion>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
