Update stunnel to 4.25 (#3657)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@11683 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@ -1,15 +1,14 @@
|
||||
diff -baurN stunnel-4.16.orig/configure stunnel-4.16/configure
|
||||
--- stunnel-4.16.orig/configure 2006-11-03 16:33:56.000000000 +0100
|
||||
+++ stunnel-4.16/configure 2006-11-03 16:36:48.000000000 +0100
|
||||
@@ -20850,56 +20850,56 @@
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -20898,56 +20898,56 @@
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
-
|
||||
-{ echo "$as_me:$LINENO: **************************************** PTY device files" >&5
|
||||
-echo "$as_me: **************************************** PTY device files" >&6;}
|
||||
-echo "$as_me:$LINENO: checking for \"/dev/ptmx\"" >&5
|
||||
-echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6
|
||||
-{ echo "$as_me:$LINENO: checking for \"/dev/ptmx\"" >&5
|
||||
-echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6; }
|
||||
-if test "${ac_cv_file___dev_ptmx_+set}" = set; then
|
||||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
-else
|
||||
@ -23,14 +22,14 @@ diff -baurN stunnel-4.16.orig/configure stunnel-4.16/configure
|
||||
- ac_cv_file___dev_ptmx_=no
|
||||
-fi
|
||||
-fi
|
||||
-echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptmx_" >&5
|
||||
-echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6
|
||||
-{ echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptmx_" >&5
|
||||
-echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6; }
|
||||
-if test $ac_cv_file___dev_ptmx_ = yes; then
|
||||
+#
|
||||
+#{ echo "$as_me:$LINENO: **************************************** PTY device files" >&5
|
||||
+#echo "$as_me: **************************************** PTY device files" >&6;}
|
||||
+#echo "$as_me:$LINENO: checking for \"/dev/ptmx\"" >&5
|
||||
+#echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6
|
||||
+#{ echo "$as_me:$LINENO: checking for \"/dev/ptmx\"" >&5
|
||||
+#echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6; }
|
||||
+#if test "${ac_cv_file___dev_ptmx_+set}" = set; then
|
||||
+# echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
+#else
|
||||
@ -44,8 +43,8 @@ diff -baurN stunnel-4.16.orig/configure stunnel-4.16/configure
|
||||
+# ac_cv_file___dev_ptmx_=no
|
||||
+#fi
|
||||
+#fi
|
||||
+#echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptmx_" >&5
|
||||
+#echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6
|
||||
+#{ echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptmx_" >&5
|
||||
+#echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6; }
|
||||
+#if test $ac_cv_file___dev_ptmx_ = yes; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
-#define HAVE_DEV_PTMX 1
|
||||
@ -55,8 +54,8 @@ diff -baurN stunnel-4.16.orig/configure stunnel-4.16/configure
|
||||
-fi
|
||||
+#fi
|
||||
|
||||
-echo "$as_me:$LINENO: checking for \"/dev/ptc\"" >&5
|
||||
-echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6
|
||||
-{ echo "$as_me:$LINENO: checking for \"/dev/ptc\"" >&5
|
||||
-echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6; }
|
||||
-if test "${ac_cv_file___dev_ptc_+set}" = set; then
|
||||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
-else
|
||||
@ -70,11 +69,11 @@ diff -baurN stunnel-4.16.orig/configure stunnel-4.16/configure
|
||||
- ac_cv_file___dev_ptc_=no
|
||||
-fi
|
||||
-fi
|
||||
-echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptc_" >&5
|
||||
-echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6
|
||||
-{ echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptc_" >&5
|
||||
-echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6; }
|
||||
-if test $ac_cv_file___dev_ptc_ = yes; then
|
||||
+#echo "$as_me:$LINENO: checking for \"/dev/ptc\"" >&5
|
||||
+#echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6
|
||||
+#{ echo "$as_me:$LINENO: checking for \"/dev/ptc\"" >&5
|
||||
+#echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6; }
|
||||
+#if test "${ac_cv_file___dev_ptc_+set}" = set; then
|
||||
+# echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
+#else
|
||||
@ -88,8 +87,8 @@ diff -baurN stunnel-4.16.orig/configure stunnel-4.16/configure
|
||||
+# ac_cv_file___dev_ptc_=no
|
||||
+#fi
|
||||
+#fi
|
||||
+#echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptc_" >&5
|
||||
+#echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6
|
||||
+#{ echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptc_" >&5
|
||||
+#echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6; }
|
||||
+#if test $ac_cv_file___dev_ptc_ = yes; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
-#define HAVE_DEV_PTS_AND_PTC 1
|
||||
@ -101,17 +100,14 @@ diff -baurN stunnel-4.16.orig/configure stunnel-4.16/configure
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: **************************************** entropy" >&5
|
||||
diff -baurN stunnel-4.16.orig/configure stunnel-4.16/configure
|
||||
--- stunnel-4.16.orig/configure 2006-11-03 16:45:32.000000000 +0100
|
||||
+++ stunnel-4.16/configure 2006-11-03 16:46:42.000000000 +0100
|
||||
@@ -23157,8 +23157,8 @@
|
||||
@@ -23394,8 +23394,8 @@
|
||||
|
||||
|
||||
# Add SSL includes and libraries
|
||||
-CFLAGS="$CFLAGS -I$ssldir/include"
|
||||
-LIBS="$LIBS -L$ssldir/lib -lssl -lcrypto"
|
||||
+CFLAGS="$CFLAGS "
|
||||
+CFLAGS="$CFLAGS"
|
||||
+LIBS="$LIBS -lssl -lcrypto"
|
||||
|
||||
# Check for obsolete RSAref library
|
||||
echo "$as_me:$LINENO: checking for obsolete RSAref library" >&5
|
||||
{ echo "$as_me:$LINENO: checking for obsolete RSAref library" >&5
|
||||
|
Reference in New Issue
Block a user