Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (1a0c27b2c33dd4317e1ea8116332a3cd311c93d2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (1a0c27b2c33dd4317e1ea8116332a3cd311c93d2)
  • Date: Tue, 3 Feb 2015 10:50:43 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/socat/DEPENDS | 2 -
net/socat/DETAILS | 6 +--
net/socat/HISTORY | 6 +++
net/socat/PRE_BUILD | 6 ---
net/socat/fix-linux-errqueue.h-not-found.patch | 41
-------------------------
5 files changed, 10 insertions(+), 51 deletions(-)

New commits:
commit 1a0c27b2c33dd4317e1ea8116332a3cd311c93d2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

socat: => 1.7.3.0 [security]

diff --git a/net/socat/DEPENDS b/net/socat/DEPENDS
index c4a699c..ff27285 100755
--- a/net/socat/DEPENDS
+++ b/net/socat/DEPENDS
@@ -1,7 +1,7 @@
depends autoconf &&

optional_depends SSL '--enable-openssl' \
- '--disable-SSL' \
+ '--disable-openssl' \
'encryption support' &&
optional_depends readline '--enable-readline' \
'--disable-readline' \
diff --git a/net/socat/DETAILS b/net/socat/DETAILS
index b8f8fd4..c74d925 100755
--- a/net/socat/DETAILS
+++ b/net/socat/DETAILS
@@ -1,7 +1,7 @@
SPELL=socat
- VERSION=1.7.2.4
- SECURITY_PATCH=4
-
SOURCE_HASH=sha512:256a3fba171544733cbfd6efde884cb9f5ff52e2b5300cebbe712cbb79d3e3bc7142e2e8a93fe4faf944db8326ab2c3673ef37ef76b724f33bf65cc0f9fbf27b
+ VERSION=1.7.3.0
+ SECURITY_PATCH=5
+
SOURCE_HASH=sha512:e567efd6cd31a517ffb1622983640396c6c1db93e8cc4be01b6047ac00b2fbd8474ffb9f96d2af33d24939cddb36ee4b71deb87a5a0101b1f1fb959fa436baad
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.dest-unreach.org/$SPELL/download/$SOURCE
diff --git a/net/socat/HISTORY b/net/socat/HISTORY
index cbb959e..8f25c14 100644
--- a/net/socat/HISTORY
+++ b/net/socat/HISTORY
@@ -1,3 +1,9 @@
+2015-02-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.7.3.0; SECURITY_PATCH++ (CVE-2015-1379)
+ * DEPENDS: fixed openssl flag
+ * PRE_BUILD, fix-linux-errqueue.h-not-found.patch: dropped, fixed by
+ upstream
+
2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Add autoconf for `autoconf` in PRE_BUILD
* PRE_BUILD, fix-linux-errqueue.h-not-found.patch: Added to fix
compilation
diff --git a/net/socat/PRE_BUILD b/net/socat/PRE_BUILD
deleted file mode 100755
index 694359e..0000000
--- a/net/socat/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-message "${MESSAGE_COLOR}Fixing linux errqueue.h not
found...${DEFAULT_COLOR}" &&
-patch -p1 "${SOURCE_DIRECTORY}"/configure.in \
- "${SPELL_DIRECTORY}"/fix-linux-errqueue.h-not-found.patch &&
-cd "${SOURCE_DIRECTORY}" &&
-autoconf
diff --git a/net/socat/fix-linux-errqueue.h-not-found.patch
b/net/socat/fix-linux-errqueue.h-not-found.patch
deleted file mode 100644
index b5b5cdb..0000000
--- a/net/socat/fix-linux-errqueue.h-not-found.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# From http://patchwork.openembedded.org/patch/72771/
-configure.in: fix linux/errqueue.h not found
-
-The do_compile failed:
-...
-|tmp/work/core2-64-poky-linux/socat/1.7.2.4-r0/socat-1.7.2.4/xio-ip.c:
-In function 'xiolog_ancillary_ip':
-|tmp/work/core2-64-poky-linux/socat/1.7.2.4-r0/socat-1.7.2.4/xio-ip.c:520:12:
-error: dereferencing pointer to incomplete type
-| err->ee_errno, '\0', err->ee_origin, '\0', err->ee_type, '\0',
-| ^
-| ake: *** [xio-ip.o] Error 1
-...
-
-For 1.7.2.4, the header check of 'linux/errqueue.h ' was not correctly,
-but the old version 1.7.2.3 worked, so we reference 1.7.2.3 to fix this
-issue.
-
-Upstream-Status: Pending
-Signed-off-by: Hongxu Jia <hongxu.jia AT windriver.com>
----
- configure.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 70922f9..bdfbe98 100644
---- a/configure.in
-+++ b/configure.in
-@@ -79,8 +79,7 @@ AC_HEADER_RESOLV()
-
- AC_CHECK_HEADERS(termios.h linux/if_tun.h)
- AC_CHECK_HEADERS(net/if_dl.h)
--AC_CHECK_HEADERS(linux/types.h)
--AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [],
[#include <linux/types.h>])
-+AC_CHECK_HEADERS(linux/types.h linux/errqueue.h)
- AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h)
- AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h)
- AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h)
---
-1.8.1.2
-



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (1a0c27b2c33dd4317e1ea8116332a3cd311c93d2), Vlad Glagolev, 02/03/2015

Archive powered by MHonArc 2.6.24.

Top of Page