Revision: 7586
http://sourceforge.net/p/ipcop/svn/7586
Author: owes
Date: 2014-06-05 13:22:27 +0000 (Thu, 05 Jun 2014)
Log Message:
-----------
Update openssl to 1.0.1h
Modified Paths:
--------------
ipcop/trunk/lfs/openssl
ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
ipcop/trunk/updates/2.1.6/information.xml
Removed Paths:
-------------
ipcop/trunk/src/patches/openssl-1.0.1g_CVE-2010-5298.patch
Modified: ipcop/trunk/lfs/openssl
===================================================================
--- ipcop/trunk/lfs/openssl 2014-06-05 06:35:21 UTC (rev 7585)
+++ ipcop/trunk/lfs/openssl 2014-06-05 13:22:27 UTC (rev 7586)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = openssl
-VER = 1.0.1g
+VER = 1.0.1h
HOST_ARCH = all
OTHER_SRC = yes
@@ -51,7 +51,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = de62b43dfcd858e66a74bee1c834e959
+$(DL_FILE)_MD5 = 8d6d684a9430d5cc98a62a5d8fbda8cf
install : $(TARGET)
@@ -81,7 +81,6 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_CVE-2010-5298.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.1g_CVE-2010-5298.patch
===================================================================
--- ipcop/trunk/src/patches/openssl-1.0.1g_CVE-2010-5298.patch 2014-06-05
06:35:21 UTC (rev 7585)
+++ ipcop/trunk/src/patches/openssl-1.0.1g_CVE-2010-5298.patch 2014-06-05
13:22:27 UTC (rev 7586)
@@ -1,27 +0,0 @@
-From db978be7388852059cf54e42539a363d549c5bfd Mon Sep 17 00:00:00 2001
-From: Kurt Roeckx <k...@roeckx.be>
-Date: Sun, 13 Apr 2014 15:05:30 +0200
-Subject: [PATCH] Don't release the buffer when there still is data in it
-
-RT: 2167, 3265
----
- ssl/s3_pkt.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
-index b9e45c7..32e9207 100644
---- a/ssl/s3_pkt.c
-+++ b/ssl/s3_pkt.c
-@@ -1055,7 +1055,8 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char
*buf, int len, int peek)
- {
- s->rstate=SSL_ST_READ_HEADER;
- rr->off=0;
-- if (s->mode & SSL_MODE_RELEASE_BUFFERS)
-+ if (s->mode & SSL_MODE_RELEASE_BUFFERS &&
-+ s->s3->rbuf.left == 0)
- ssl3_release_read_buffer(s);
- }
- }
---
-1.9.1
-
Modified: ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6
===================================================================
--- ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-06-05 06:35:21 UTC
(rev 7585)
+++ ipcop/trunk/updates/2.1.6/ROOTFILES.i486-2.1.6 2014-06-05 13:22:27 UTC
(rev 7586)
@@ -107,8 +107,10 @@
/lib/firmware/rtl_nic/rtl8168g-2.fw
/lib/firmware/rtl_nic/rtl8168g-3.fw
##
-## openssl patched
-/usr/lib/libssl.so.1.0.0
+## openssl-1.0.1h
+/usr/bin/openssl
+/usr/lib/libcrypto.so
+/usr/lib/libcrypto.so.1.0.0
##
## openswan patched
/usr/libexec/ipsec/addconn
Modified: ipcop/trunk/updates/2.1.6/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.6/information.xml 2014-06-05 06:35:21 UTC (rev
7585)
+++ ipcop/trunk/updates/2.1.6/information.xml 2014-06-05 13:22:27 UTC (rev
7586)
@@ -8,7 +8,8 @@
Patch openssl for CVE-2010-5298.<br />
Upgrade linux kernel to 3.4-3 (3.4.91).<br />
Upgrade dnsmasq to 2.71, e2fsprogs to 1.42.10, fcron to 3.1.3, grep to
2.20,
- openvpn to 2.3.4, rsyslog to 7.6.3, squid to 3.4.5, syslinux to 6.02,
util-linux to 2.24.2.
+ openssl to 1.0.1h, openvpn to 2.3.4, rsyslog to 7.6.3, squid to 3.4.5,
syslinux to 6.02,
+ util-linux to 2.24.2.
Upgrade Perl modules IO-Socket-SSL to 1.988, Net-DNS to 0.75,
Net-SSLeay to 1.63.
<br />
<b>Mandatory reboot after upgrade.</b>
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/NeoTech
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
