···

       
1
       
1
       
-
       
This patch, to be applied after `cert-file.patch', fixes compilation

     

       
2
       
2
       
-
       
on GNU/Hurd where `PATH_MAX' is not defined.

     

       
3
       
3
       
-
       


     

       
4
       
4
       
-
       
diff -ubB --show-c-function openssl-1.0.0e/crypto/x509/x509_def.c.orig openssl-1.0.0e/crypto/x509/x509_def.c

     

       
5
       
5
       
-
       
--- openssl-1.0.0e/crypto/x509/x509_def.c.orig	2012-01-06 00:08:48.000000000 +0100

     

       
6
       
6
       
-
       
+++ openssl-1.0.0e/crypto/x509/x509_def.c	2012-01-06 00:11:29.000000000 +0100

     

       
7
       
7
       
-
       
@@ -58,6 +58,7 @@

     

       
8
       
8
       
-
       
 

     

       
9
       
9
       
-
       
 #include <stdio.h>

     

       
10
       
10
       
-
       
 #include <stdlib.h>

     

       
11
       
11
       
-
       
+#include <string.h>

     

       
12
       
12
       
-
       
 #include <limits.h>

     

       
13
       
13
       
-
       
 #include <unistd.h>

     

       
14
       
14
       
-
       
 #include <sys/types.h>

     

       
15
       
15
       
-
       
@@ -76,14 +77,16 @@ const char *X509_get_default_cert_dir(vo

     

       
16
       
16
       
-
       
 

     

       
17
       
17
       
-
       
 const char *X509_get_default_cert_file(void)

     

       
18
       
18
       
-
       
 	{

     

       
19
       
19
       
-
       
-	static char buf[PATH_MAX] = X509_CERT_FILE;

     

       
20
       
20
       
-
       
+	static char *buf;

     

       
21
       
21
       
-
       
 	static int init = 0;

     

       
22
       
22
       
-
       
 	if (!init) {

     

       
23
       
23
       
-
       
 	    init = 1;

     

       
24
       
24
       
-
       
 	    char * s = getenv("OPENSSL_X509_CERT_FILE");

     

       
25
       
25
       
-
       
 	    if (s && getuid() == geteuid()) {

     

       
26
       
26
       
-
       
-		strncpy(buf, s, sizeof(buf));

     

       
27
       
27
       
-
       
-		buf[sizeof(buf) - 1] = 0;

     

       
28
       
28
       
-
       
+	         buf = strdup(s);

     

       
29
       
29
       
-
       
+	    }

     

       
30
       
30
       
-
       
+	    if (!s) {

     

       
31
       
31
       
-
       
+	         buf = strdup(X509_CERT_FILE);

     

       
32
       
32
       
-
       
 	    }

     

       
33
       
33
       
-
       
 	}

     

       
34
       
34
       
-
       
 	return buf;

     

···

       
1
       
1
       
-
       
diff -ru openssl-1.0.1m-orig/crypto/x509/x509_def.c openssl-1.0.1m/crypto/x509/x509_def.c

     

       
2
       
2
       
-
       
--- openssl-1.0.1m-orig/crypto/x509/x509_def.c	2015-03-19 14:19:00.000000000 +0100

     

       
3
       
3
       
-
       
+++ openssl-1.0.1m/crypto/x509/x509_def.c	2015-03-19 15:50:44.676683616 +0100

     

       
4
       
4
       
-
       
@@ -57,6 +57,10 @@

     

       
5
       
5
       
-
       
  */

     

       
6
       
6
       
-
       
 

     

       
7
       
7
       
-
       
 #include <stdio.h>

     

       
8
       
8
       
-
       
+#include <stdlib.h>

     

       
9
       
9
       
-
       
+#include <limits.h>

     

       
10
       
10
       
-
       
+#include <unistd.h>

     

       
11
       
11
       
-
       
+#include <sys/types.h>

     

       
12
       
12
       
-
       
 #include "cryptlib.h"

     

       
13
       
13
       
-
       
 #include <openssl/crypto.h>

     

       
14
       
14
       
-
       
 #include <openssl/x509.h>

     

       
15
       
15
       
-
       
@@ -78,7 +82,23 @@

     

       
16
       
16
       
-
       
 

     

       
17
       
17
       
-
       
 const char *X509_get_default_cert_file(void)

     

       
18
       
18
       
-
       
 {

     

       
19
       
19
       
-
       
-    return (X509_CERT_FILE);

     

       
20
       
20
       
-
       
+    static char buf[PATH_MAX] = X509_CERT_FILE;

     

       
21
       
21
       
-
       
+    static int init = 0;

     

       
22
       
22
       
-
       
+    if (!init) {

     

       
23
       
23
       
-
       
+        init = 1;

     

       
24
       
24
       
-
       
+        char * s = getenv("OPENSSL_X509_CERT_FILE");

     

       
25
       
25
       
-
       
+        if (s) {

     

       
26
       
26
       
-
       
+#ifndef OPENSSL_SYS_WINDOWS

     

       
27
       
27
       
-
       
+            if (getuid() == geteuid()) {

     

       
28
       
28
       
-
       
+#endif

     

       
29
       
29
       
-
       
+                strncpy(buf, s, sizeof(buf));

     

       
30
       
30
       
-
       
+                buf[sizeof(buf) - 1] = 0;

     

       
31
       
31
       
-
       
+#ifndef OPENSSL_SYS_WINDOWS

     

       
32
       
32
       
-
       
+            }

     

       
33
       
33
       
-
       
+#endif

     

       
34
       
34
       
-
       
+        }

     

       
35
       
35
       
-
       
+    }

     

       
36
       
36
       
-
       
+    return buf;

     

       
37
       
37
       
-
       
 }

     

       
38
       
38
       
-
       
 

     

       
39
       
39
       
-
       
 const char *X509_get_default_cert_dir_env(void)

     

···

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
  patchesCross = isCross: let

     

       
12
       
12
       
 
       
    isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem");

     

       
13
       
13
       
-
       
  in

     

       
14
       
14
       
-
       
    [ # Allow the location of the X509 certificate file (the CA

     

       
15
       
15
       
-
       
      # bundle) to be set through the environment variable

     

       
16
       
16
       
-
       
      # ‘OPENSSL_X509_CERT_FILE’.  This is necessary because the

     

       
17
       
17
       
-
       
      # default location ($out/ssl/cert.pem) doesn't exist, and

     

       
18
       
18
       
-
       
      # hardcoding something like /etc/ssl/cert.pem is impure and

     

       
19
       
19
       
-
       
      # cannot be overriden per-process.  For security, the

     

       
20
       
20
       
-
       
      # environment variable is ignored for setuid binaries.

     

       
21
       
21
       
-
       
      # FIXME: drop this patch; it really isn't necessary, because

     

       
22
       
22
       
-
       
      # OpenSSL already supports a ‘SSL_CERT_FILE’ variable.

     

       
23
       
23
       
-
       
      ./cert-file.patch

     

       
24
       
24
       
-
       
    ]

     

       
25
       
25
       
-
       


     

       
26
       
26
       
-
       
    ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86")

     

       
27
       
27
       
-
       
         [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually

     

       
28
       
28
       
-
       
           ./gnu.patch                # submitted upstream

     

       
29
       
29
       
-
       
         ]

     

       
30
       
30
       
-
       


     

       
31
       
31
       
-
       
    ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu")

     

       
32
       
32
       
-
       
        [ ./gnu.patch

     

       
33
       
33
       
-
       
          ./kfreebsd-gnu.patch

     

       
34
       
34
       
-
       
        ]

     

       
35
       
35
       
-
       


     

       
36
       
36
       
-
       
    ++ stdenv.lib.optional isDarwin ./darwin-arch.patch;

     

       
13
       
13
       
+
       
  in stdenv.lib.optional isDarwin ./darwin-arch.patch;

     

       
37
       
14
       
 
       


     

       
38
       
15
       
 
       
  extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch;

     

       
39
       
16
       
 
       
in

     

···

       
1
       
1
       
-
       
Patch to fix compilation on GNU/Hurd and GNU/kFreeBSD.

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
--- openssl-1.0.0e/Configure	2012-01-06 00:39:49.000000000 +0100

     

       
4
       
4
       
-
       
+++ openssl-1.0.0e/Configure	2012-01-06 00:39:51.000000000 +0100

     

       
5
       
5
       
-
       
@@ -563,7 +563,7 @@ my %table=(

     

       
6
       
6
       
-
       
 "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",

     

       
7
       
7
       
-
       
 

     

       
8
       
8
       
-
       
 ##### GNU Hurd

     

       
9
       
9
       
-
       
-"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",

     

       
10
       
10
       
-
       
+"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

     

       
11
       
11
       
-
       
 

     

       
12
       
12
       
-
       
 ##### OS/2 EMX

     

       
13
       
13
       
-
       
 "OS2-EMX", "gcc::::::::",

     

       
14
       
14
       
-
       


     

       
15
       
15
       
-
       
--- openssl-1.0.0e/crypto/dso/dso_dlfcn.c	2012-01-06 00:05:47.000000000 +0100

     

       
16
       
16
       
-
       
+++ openssl-1.0.0e/crypto/dso/dso_dlfcn.c	2012-01-06 00:21:05.000000000 +0100

     

       
17
       
17
       
-
       
@@ -60,7 +60,7 @@

     

       
18
       
18
       
-
       
    that handle _GNU_SOURCE and other similar macros.  Defining it later

     

       
19
       
19
       
-
       
    is simply too late, because those headers are protected from re-

     

       
20
       
20
       
-
       
    inclusion.  */

     

       
21
       
21
       
-
       
-#ifdef __linux

     

       
22
       
22
       
-
       
+#if defined __linux || defined __GNU__ || defined __GLIBC__

     

       
23
       
23
       
-
       
 # ifndef _GNU_SOURCE

     

       
24
       
24
       
-
       
 #  define _GNU_SOURCE	/* make sure dladdr is declared */

     

       
25
       
25
       
-
       
 # endif

     

···

       
1
       
1
       
-
       
diff -Naur openssl-1.0.0d-orig/Configure openssl-1.0.0d/Configure

     

       
2
       
2
       
-
       
--- openssl-1.0.0d-orig/Configure	2010-11-30 17:19:26.000000000 -0500

     

       
3
       
3
       
-
       
+++ openssl-1.0.0d/Configure	2011-11-16 13:52:57.614416683 -0500

     

       
4
       
4
       
-
       
@@ -563,7 +563,7 @@

     

       
5
       
5
       
-
       
 "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",

     

       
6
       
6
       
-
       
 

     

       
7
       
7
       
-
       
 ##### GNU Hurd

     

       
8
       
8
       
-
       
-"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",

     

       
9
       
9
       
-
       
+"hurd-x86","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

     

       
10
       
10
       
-
       
 

     

       
11
       
11
       
-
       
 ##### OS/2 EMX

     

       
12
       
12
       
-
       
 "OS2-EMX", "gcc::::::::",

     

···

       
1
       
1
       
-
       
Allow compilation on GNU/kFreeBSD.  Ideally, there'd be a single way to process

     

       
2
       
2
       
-
       
all glibc-based system, but the build system is soooo broken.

     

       
3
       
3
       
-
       


     

       
4
       
4
       
-
       
--- openssl-1.0.0i/config

     

       
5
       
5
       
-
       
+++ openssl-1.0.0i/config

     

       
6
       
6
       
-
       
@@ -170,6 +170,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${

     

       
7
       
7
       
-
       
 	echo "${MACHINE}-whatever-linux1"; exit 0

     

       
8
       
8
       
-
       
 	;;

     

       
9
       
9
       
-
       
 

     

       
10
       
10
       
-
       
+    GNU/kFreeBSD*)

     

       
11
       
11
       
-
       
+    	echo "kfreebsd-gnu"; exit 0;

     

       
12
       
12
       
-
       
+    	;;

     

       
13
       
13
       
-
       
+

     

       
14
       
14
       
-
       
     GNU*)

     

       
15
       
15
       
-
       
 	echo "hurd-x86"; exit 0;

     

       
16
       
16
       
-
       
 	;;

     

       
17
       
17
       
-
       
@@ -810,6 +814,7 @@ case "$GUESSOS" in

     

       
18
       
18
       
-
       
   beos-*) OUT="$GUESSOS" ;;

     

       
19
       
19
       
-
       
   x86pc-*-qnx6) OUT="QNX6-i386" ;;

     

       
20
       
20
       
-
       
   *-*-qnx6) OUT="QNX6" ;;

     

       
21
       
21
       
-
       
+  kfreebsd-gnu) OUT="kfreebsd-gnu";;

     

       
22
       
22
       
-
       
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;

     

       
23
       
23
       
-
       
 esac

     

       
24
       
24
       
-
       
 

     

       
25
       
25
       
-
       


     

       
26
       
26
       
-
       
--- openssl-1.0.0i/Configure

     

       
27
       
27
       
-
       
+++ openssl-1.0.0i/Configure

     

       
28
       
28
       
-
       
@@ -565,6 +565,9 @@ my %table=(

     

       
29
       
29
       
-
       
 ##### GNU Hurd

     

       
30
       
30
       
-
       
 "hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",

     

       
31
       
31
       
-
       
 

     

       
32
       
32
       
-
       
+##### GNU/kFreeBSD on x86_64, copied from "linux-x86_64"

     

       
33
       
33
       
-
       
+"kfreebsd-gnu",	"gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",

     

       
34
       
34
       
-
       
+

     

       
35
       
35
       
-
       
 ##### OS/2 EMX

     

       
36
       
36
       
-
       
 "OS2-EMX", "gcc::::::::",