From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Mar 2014 19:34:05 +0000 (-0300)
Subject: socat: security bump to version 2.0.0-b7
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=442f13779ec07a0c9716b04461becf5381205999;p=buildroot.git

socat: security bump to version 2.0.0-b7

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

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/socat/socat-001-no-documentation.patch b/package/socat/socat-001-no-documentation.patch
new file mode 100644
index 0000000000..ce088dfafc
--- /dev/null
+++ b/package/socat/socat-001-no-documentation.patch
@@ -0,0 +1,37 @@
+socat: disable documentation build/installation
+
+The documentation generation process requires a special yold2man
+program, for which we don't have a package in Buildroot. Since we
+generally don't care much about documentation of packages, just adjust
+the package Makefile.in to not build/install its documentation.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -93,7 +93,7 @@
+ 	Config/Makefile.Cygwin-1-5-25 Config/config.Cygwin-1-5-25.h \
+ 	Config/Makefile.MacOSX-10-5 Config/config.MacOSX-10-5.h
+ 
+-all: progs doc
++all: progs
+ 
+ scmclean: gitclean
+ 
+@@ -136,13 +136,11 @@
+ strip: progs
+ 	strip $(PROGS)
+ 
+-install: progs $(srcdir)/doc/socat.1
++install: progs
+ 	mkdir -p $(DESTDIR)$(BINDEST)
+ 	$(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST)
+ 	$(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST)
+ 	$(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST)
+-	mkdir -p $(DESTDIR)$(MANDEST)/man1
+-	$(INSTALL) -m 644 $(srcdir)/doc/socat.1 $(DESTDIR)$(MANDEST)/man1/
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(BINDEST)/socat
diff --git a/package/socat/socat-no-documentation.patch b/package/socat/socat-no-documentation.patch
deleted file mode 100644
index ce088dfafc..0000000000
--- a/package/socat/socat-no-documentation.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-socat: disable documentation build/installation
-
-The documentation generation process requires a special yold2man
-program, for which we don't have a package in Buildroot. Since we
-generally don't care much about documentation of packages, just adjust
-the package Makefile.in to not build/install its documentation.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -93,7 +93,7 @@
- 	Config/Makefile.Cygwin-1-5-25 Config/config.Cygwin-1-5-25.h \
- 	Config/Makefile.MacOSX-10-5 Config/config.MacOSX-10-5.h
- 
--all: progs doc
-+all: progs
- 
- scmclean: gitclean
- 
-@@ -136,13 +136,11 @@
- strip: progs
- 	strip $(PROGS)
- 
--install: progs $(srcdir)/doc/socat.1
-+install: progs
- 	mkdir -p $(DESTDIR)$(BINDEST)
- 	$(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST)
- 	$(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST)
- 	$(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST)
--	mkdir -p $(DESTDIR)$(MANDEST)/man1
--	$(INSTALL) -m 644 $(srcdir)/doc/socat.1 $(DESTDIR)$(MANDEST)/man1/
- 
- uninstall:
- 	rm -f $(DESTDIR)$(BINDEST)/socat
diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index df60961c82..6ae67a9f53 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -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