Skip to contentSkip to conversation

socat: security bump to version 2.0.0-b7

PATCH New Gustavo Zacarias 2 participants 3 messages Mar 10, 2014 – Mar 11, 2014

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/2 socat: security bump to version 2.0.0-b7

Fixes CVE-2014-0019.
Also rename patch according to policy.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 .../{socat-no-documentation.patch => socat-001-no-documentation.patch}  | 0
 package/socat/socat.mk                                                  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename package/socat/{socat-no-documentation.patch => socat-001-no-documentation.patch} (100%)
package/socat/socat-001-no-documentation.patch renamed from package/socat/socat-no-documentation.patch +0 -0
similarity index 100%
rename from package/socat/socat-no-documentation.patch
rename to package/socat/socat-001-no-documentation.patch
package/socat/socat.mk +1 -1
index df60961..6ae67a9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SOCAT_VERSION = 2.0.0-b6
+SOCAT_VERSION = 2.0.0-b7
 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
 SOCAT_SITE = http://www.dest-unreach.org/socat/download/
 SOCAT_LICENSE = GPLv2
Signature · 1 line
1.8.3.2
author
#1 lore raw

PATCH 2/2 socat: add optional openssl and readline support

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/socat/socat.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)
package/socat/socat.mk +12 -0
index 6ae67a9..7172ea0 100644
@@ -21,6 +21,18 @@ SOCAT_CONF_ENV = sc_cv_termios_ispeed=no \
 
 SOCAT_DEPENDENCIES = host-autoconf
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+	SOCAT_DEPENDENCIES += openssl
+else
+	SOCAT_CONF_OPT += --disable-openssl
+endif
+
+ifeq ($(BR2_PACKAGE_READLINE),y)
+	SOCAT_DEPENDENCIES += readline
+else
+	SOCAT_CONF_OPT += --disable-readline
+endif
+
 define SOCAT_RUN_AUTOCONF
 	(cd $(@D); $(HOST_DIR)/usr/bin/autoconf)
 endef
Signature · 1 line
1.8.3.2