From 8d30dc1f4e1708ca09f9ef92657f0f821a90be5d Mon Sep 17 00:00:00 2001 From: Eivind Uggedal Date: Sun, 25 Jan 2015 20:05:51 +0000 Subject: [PATCH] socat: security update to 1.7.3.0. --- srcpkgs/socat/patches/patch-xio-openssl_c | 12 ++++++------ srcpkgs/socat/template | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/socat/patches/patch-xio-openssl_c b/srcpkgs/socat/patches/patch-xio-openssl_c index c9e1706e3e7..e348f63bbb4 100644 --- a/srcpkgs/socat/patches/patch-xio-openssl_c +++ b/srcpkgs/socat/patches/patch-xio-openssl_c @@ -46,11 +46,11 @@ $OpenBSD: patch-xio-openssl_c,v 1.2 2014/07/12 14:30:20 pascal Exp $ long int randdata; /* initialize libc random from actual microseconds */ @@ -979,7 +972,7 @@ static int openssl_SSL_ERROR_SSL(int level, const char - if (e == ((ERR_LIB_RAND<<24)| - (RAND_F_SSLEAY_RAND_BYTES<<12)| - (RAND_R_PRNG_NOT_SEEDED)) /*0x24064064*/) { + if (e == ((ERR_LIB_RAND<<24)| + (RAND_F_SSLEAY_RAND_BYTES<<12)| + (RAND_R_PRNG_NOT_SEEDED)) /*0x24064064*/) { - Error("too few entropy; use options \"egd\" or \"pseudo\""); + Error("too few entropy; use options \"pseudo\""); - return STAT_NORETRY; - } else { - Msg2(level, "%s(): %s", funcname, ERR_error_string(e, buf)); + stat = STAT_NORETRY; + } else { + Msg2(level, "%s(): %s", funcname, ERR_error_string(e, buf)); diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template index 30668a3a1bd..2d51e3bfc05 100644 --- a/srcpkgs/socat/template +++ b/srcpkgs/socat/template @@ -1,6 +1,6 @@ # Template file for 'socat' pkgname=socat -version=1.7.2.4 +version=1.7.3.0 revision=4 build_style=gnu-configure configure_args="--disable-libwrap --enable-fips @@ -13,4 +13,4 @@ maintainer="Juan RP " license="GPL-3" homepage="http://www.dest-unreach.org/socat/" distfiles="http://www.dest-unreach.org/socat/download/socat-$version.tar.bz2" -checksum=4b7739901c6fad1e460f3e5b1868fb4c2a1427febbba7a510cd2e42fd4941e09 +checksum=0767e850c0329b9fdf711c6cd468565cbbb28786ba1a8a1cbd5531d4016b3e04