From 874be89e40f1997d619b9611c3162198102ea075 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Thu, 11 Apr 2013 22:22:30 +0000
Subject: Pullup ticket #4117 - requested by khorben net/socat: security update

Revisions pulled up:
- net/socat/Makefile                                            1.27
- net/socat/distinfo                                            1.17

---
   Module Name:    pkgsrc
   Committed By:   khorben
   Date:           Thu Apr 11 09:38:10 UTC 2013

   Modified Files:
           pkgsrc/net/socat: Makefile distinfo

   Log Message:
   Updated socat to version 1.7.2.1

   Security update:
   "A heap based buffer overflow vulnerability has been found with data that
   happens to be output on the READLINE address." (CVE-2012-0219)

   Tested according to the official advisory at
   http://www.dest-unreach.org/socat/contrib/socat-secadv3.html

   XXX pull-up to 2013Q1
---
 net/socat/Makefile | 5 ++---
 net/socat/distinfo | 8 ++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'net')

diff --git a/net/socat/Makefile b/net/socat/Makefile
index 9bd354e4a1e..510c4b6a49a 100644
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2013/02/06 23:23:24 jperkin Exp $
+# $NetBSD: Makefile,v 1.26.2.1 2013/04/11 22:22:30 tron Exp $
 
-DISTNAME=	socat-1.7.1.3
-PKGREVISION=	1
+DISTNAME=	socat-1.7.2.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.dest-unreach.org/socat/download/
 
diff --git a/net/socat/distinfo b/net/socat/distinfo
index 0654eab8079..c4bb79fa512 100644
--- a/net/socat/distinfo
+++ b/net/socat/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2011/12/06 19:51:47 joerg Exp $
+$NetBSD: distinfo,v 1.16.12.1 2013/04/11 22:22:30 tron Exp $
 
-SHA1 (socat-1.7.1.3.tar.gz) = 5a42275da0d8a5182452b36535a74c3cdf21793b
-RMD160 (socat-1.7.1.3.tar.gz) = fa4fdb731b5bef344f6c24a5bc242ae910728d57
-Size (socat-1.7.1.3.tar.gz) = 553489 bytes
+SHA1 (socat-1.7.2.1.tar.gz) = 6e3328cc409550b2367efa8028fe4436e84eb490
+RMD160 (socat-1.7.2.1.tar.gz) = ce607505cfc4063322abe229d8f527605e93e4f5
+Size (socat-1.7.2.1.tar.gz) = 564254 bytes
 SHA1 (patch-aa) = c10b68a5ca36ec27c6e77a01f6f89a832a4862eb
 SHA1 (patch-mytypes.h) = 57769b4295812d15cee7e3d4200c5c0c365f7efd
-- 
cgit v1.2.3