[Astlinux-commits] SF.net SVN: astlinux:[6497] branches/1.0/package/stunnel

[<abe...@us...>]

Revision: 6497
          http://sourceforge.net/p/astlinux/code/6497
Author:   abelbeck
Date:     2014-04-11 16:45:55 +0000 (Fri, 11 Apr 2014)
Log Message:
-----------
stunnel, version bump to 5.01, security fix CVE-2014-0016

Modified Paths:
--------------
    branches/1.0/package/stunnel/stunnel-configure.patch
    branches/1.0/package/stunnel/stunnel.mk

Modified: branches/1.0/package/stunnel/stunnel-configure.patch
===================================================================
--- branches/1.0/package/stunnel/stunnel-configure.patch	2014-04-08 23:22:42 UTC (rev 6496)
+++ branches/1.0/package/stunnel/stunnel-configure.patch	2014-04-11 16:45:55 UTC (rev 6497)
@@ -1,23 +1,23 @@
---- stunnel-4.35/configure.ac.orig	2011-04-14 10:12:02.000000000 -0500
-+++ stunnel-4.35/configure.ac	2011-04-14 10:17:29.000000000 -0500
-@@ -73,7 +73,8 @@
-     AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX))
-     AC_CHECK_FILE("/dev/ptc", AC_DEFINE(HAVE_DEV_PTS_AND_PTC))
+--- stunnel-5.01/configure.ac.orig	2014-04-11 10:43:39.000000000 -0500
++++ stunnel-5.01/configure.ac	2014-04-11 10:49:05.000000000 -0500
+@@ -120,7 +120,8 @@
+     AC_CHECK_FILE("/dev/ptc", AC_DEFINE([HAVE_DEV_PTS_AND_PTC], [1],
+         [Define to 1 if you have '/dev/ptc' device.]))
  else
 -    AC_MSG_WARN([cross-compilation: assuming /dev/ptmx and /dev/ptc are not available])
-+    AC_DEFINE(HAVE_DEV_PTMX)
-+    AC_MSG_WARN([cross-compilation: assuming /dev/ptmx])
++    AC_DEFINE([HAVE_DEV_PTMX], [1], [Define to 1 if you have '/dev/ptmx' device.])
++    AC_MSG_WARN([cross-compilation: assuming /dev/ptmx is available])
  fi
  
  AC_MSG_NOTICE([**************************************** entropy sources])
-@@ -103,7 +104,9 @@
-         AC_DEFINE_UNQUOTED(RANDOM_FILE, "$RANDOM_FILE")
+@@ -148,7 +149,9 @@
+         AC_DEFINE_UNQUOTED([RANDOM_FILE], ["$RANDOM_FILE"], [Random file path])
      fi
  else
 -    AC_MSG_WARN([cross-compilation: assuming entropy sources are not available])
 +    RANDOM_FILE="/dev/urandom"
-+    AC_DEFINE_UNQUOTED(RANDOM_FILE, "$RANDOM_FILE")
-+    AC_MSG_WARN([cross-compilation: assuming entropy source /dev/urandom])
++    AC_DEFINE_UNQUOTED([RANDOM_FILE], ["$RANDOM_FILE"], [Random file path])
++    AC_MSG_WARN([cross-compilation: assuming entropy source /dev/urandom is available])
  fi
  
  AC_MSG_NOTICE([**************************************** default group])

Modified: branches/1.0/package/stunnel/stunnel.mk
===================================================================
--- branches/1.0/package/stunnel/stunnel.mk	2014-04-08 23:22:42 UTC (rev 6496)
+++ branches/1.0/package/stunnel/stunnel.mk	2014-04-11 16:45:55 UTC (rev 6497)
@@ -4,10 +4,13 @@
 #
 #############################################################
 
-STUNNEL_VERSION = 4.56
-STUNNEL_SITE = http://ftp.nluug.nl/pub/networking/stunnel/archive/4.x
+STUNNEL_VERSION = 5.01
+STUNNEL_SITE = http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x
 STUNNEL_DEPENDENCIES = openssl
 
+# We're patching configure.ac
+STUNNEL_AUTORECONF = YES
+
 STUNNEL_CONF_OPT += \
 	--with-ssl=$(STAGING_DIR)/usr \
 	--localstatedir=/var \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.