View | Details | Raw Unified | Return to bug 198765 | Differences between
and this patch

Collapse All | Expand All

(-)www/links/files/patch-config.h.in (+12 lines)
Line 0 Link Here
1
--- config.h.in.orig	2015-03-21 12:27:07 UTC
2
+++ config.h.in
3
@@ -248,6 +248,9 @@
4
 /* Define if you have the pthread_sigmask function.  */
5
 #undef HAVE_PTHREAD_SIGMASK
6
 
7
+/* Define if libcrypto has RAND_egd */
8
+#undef HAVE_RAND_EGD
9
+
10
 /* Define if you have the raise function.  */
11
 #undef HAVE_RAISE
12
 
(-)www/links/files/patch-configure (-4 / +53 lines)
Lines 1-8 Link Here
1
--- configure.orig	2011-04-19 11:36:37.000000000 -0400
1
--- configure.orig	2013-09-21 22:40:39 UTC
2
+++ configure	2011-10-18 13:48:27.000000000 -0400
2
+++ configure
3
@@ -1762,6 +1762,8 @@
3
@@ -1814,6 +1814,8 @@ else
4
   cat > conftest.$ac_ext <<EOF
4
   cat > conftest.$ac_ext <<EOF
5
 #line 1764 "configure"
5
 #line 1814 "configure"
6
 #include "confdefs.h"
6
 #include "confdefs.h"
7
+#include <sys/types.h>
7
+#include <sys/types.h>
8
+#include <netinet/in.h>
8
+#include <netinet/in.h>
Lines 9-11 Link Here
9
 #include <$ac_hdr>
9
 #include <$ac_hdr>
10
 EOF
10
 EOF
11
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
11
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
12
@@ -11001,6 +11003,48 @@ fi
13
 #endif
14
 cf_have_ssl=$cf_result
15
 
16
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAND_egd in -lcrypto" >&5
17
+$as_echo_n "checking for RAND_egd in -lcrypto... " >&6; }
18
+if ${ac_cv_lib_crypto_RAND_egd+:} false; then :
19
+  $as_echo_n "(cached) " >&6
20
+else
21
+  ac_check_lib_save_LIBS=$LIBS
22
+LIBS="-lcrypto  $LIBS"
23
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
24
+/* end confdefs.h.  */
25
+
26
+/* Override any GCC internal prototype to avoid an error.
27
+   Use char because int might match the return type of a GCC
28
+   builtin and then its argument prototype would still apply.  */
29
+#ifdef __cplusplus
30
+extern "C"
31
+#endif
32
+char RAND_egd ();
33
+int
34
+main ()
35
+{
36
+return RAND_egd ();
37
+  ;
38
+  return 0;
39
+}
40
+_ACEOF
41
+if ac_fn_c_try_link "$LINENO"; then :
42
+  ac_cv_lib_crypto_RAND_egd=yes
43
+else
44
+  ac_cv_lib_crypto_RAND_egd=no
45
+fi
46
+rm -f core conftest.err conftest.$ac_objext \
47
+    conftest$ac_exeext conftest.$ac_ext
48
+LIBS=$ac_check_lib_save_LIBS
49
+fi
50
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RAND_egd" >&5
51
+$as_echo "$ac_cv_lib_crypto_RAND_egd" >&6; }
52
+if test "x$ac_cv_lib_crypto_RAND_egd" = xyes; then :
53
+
54
+$as_echo "#define HAVE_RAND_EGD 1" >>confdefs.h
55
+
56
+fi
57
+
58
 # Check whether --with-zlib or --without-zlib was given.
59
 if test "${with_zlib+set}" = set; then
60
   withval="$with_zlib"
(-)www/links/files/patch-configure.in (+11 lines)
Line 0 Link Here
1
--- configure.in.orig	2013-09-17 00:11:46 UTC
2
+++ configure.in
3
@@ -843,6 +843,8 @@ fi
4
 #endif
5
 cf_have_ssl=$cf_result
6
 
7
+AC_CHECK_LIB(crypto, RAND_egd, AC_DEFINE(HAVE_RAND_EGD, 1, [Define if the libcrypto has RAND_egd]))
8
+
9
 AC_ARG_WITH(zlib, [  --without-zlib          compile without zlib compression],[if test "$withval" = no; then disable_zlib=yes; else disable_zlib=no; fi])
10
 AC_ARG_WITH(bzip2, [  --without-bzip2         compile without bzip2 compression],[if test "$withval" = no; then disable_bzip2=yes; else disable_bzip2=no; fi])
11
 AC_ARG_WITH(lzma, [  --without-lzma          compile without lzma compression],[if test "$withval" = no; then disable_lzma=yes; else disable_lzma=no; fi])
(-)www/links/files/patch-default.c (-4 / +4 lines)
Lines 1-7 Link Here
1
--- default.c.orig	2008-03-06 22:43:25.117856165 -0500
1
--- default.c.orig	2013-08-25 23:08:07 UTC
2
+++ default.c	2008-03-06 22:44:12.412560939 -0500
2
+++ default.c
3
@@ -400,7 +400,7 @@
3
@@ -809,7 +809,7 @@ void init_home(void)
4
 	get_system_name();
4
 	get_compiler_name();
5
 	links_home = get_home(&first_use);
5
 	links_home = get_home(&first_use);
6
 	if (!links_home) {
6
 	if (!links_home) {
7
-		fprintf(stderr, "Unable to find or create links config directory. Please check, that you have $HOME variable set correctly and that you have write permission to your home directory.\n\007");
7
-		fprintf(stderr, "Unable to find or create links config directory. Please check, that you have $HOME variable set correctly and that you have write permission to your home directory.\n\007");
(-)www/links/files/patch-https.c (+14 lines)
Line 0 Link Here
1
--- https.c.orig	2013-09-20 21:17:00 UTC
2
+++ https.c
3
@@ -36,7 +36,10 @@ SSL *getSSL(void)
4
 		unsigned os_pool_size;
5
 
6
 		const unsigned char *f = (const unsigned char *)RAND_file_name(cast_char f_randfile, sizeof(f_randfile));
7
-		if (f && RAND_egd(cast_const_char f) < 0) {
8
+#ifdef HAVE_RAND_EGD
9
+		if (f && RAND_egd(cast_const_char f) < 0) 
10
+#endif
11
+		{
12
 			/* Not an EGD, so read and write to it */
13
 			if (RAND_load_file(cast_const_char f_randfile, -1))
14
 				RAND_write_file(cast_const_char f_randfile);
(-)www/links/files/patch-types.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- types.c.orig	2012-06-06 15:49:37.000000000 -0400
1
--- types.c.orig	2013-01-23 04:42:08 UTC
2
+++ types.c	2012-06-27 02:28:56.000000000 -0400
2
+++ types.c
3
@@ -841,7 +841,8 @@
3
@@ -857,7 +857,8 @@ unsigned char *get_content_type_by_exten
4
 			ext = NULL;
4
 			ext = NULL;
5
 		}
5
 		}
6
 	if (ext) while (ext[extl] && ext[extl] != '.' && !dir_sep(ext[extl]) && !end_of_dir(url, ext[extl])) extl++;
6
 	if (ext) while (ext[extl] && ext[extl] != '.' && !dir_sep(ext[extl]) && !end_of_dir(url, ext[extl])) extl++;

Return to bug 198765