Fixes and improvement for Interix

* Not only interix-3, but also treat all interix release, allow to build on SUA.
* Gave up randomized image base, use 0x5e000000, as in mk/platform/Interix.mk.
  It is workaround of PR 42369.
* Use -D_REENTRANT flags for threads.
* replace -Wl,soname= linker flags with -Wl,h, for Interix

4 files changed, 17 insertions, 10 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index be6e6c5c41e..bb0cb9e838e 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2009/06/10 13:57:08 tez Exp $
+# $NetBSD: Makefile,v 1.141 2009/12/25 11:58:06 obache Exp $
 
 OPENSSL_SNAPSHOT?=	# empty
 OPENSSL_STABLE?=	# empty
@@ -94,6 +94,13 @@ SUBST_STAGE.dl=		post-configure
 SUBST_FILES.dl=		Makefile apps/Makefile crypto/Makefile \
 			crypto/pkcs7/Makefile test/Makefile
 SUBST_SED.dl=		-e 's,^EX_LIBS=,EX_LIBS=${DL_LDFLAGS:Q} ,g'
+
+.elif ${OPSYS} == "Interix"
+
+SUBST_CLASSES+=		soname
+SUBST_STAGE.soname=	post-configure
+SUBST_FILES.soname=	Makefile.shared
+SUBST_SED.soname=	-e 's/-Wl,-soname=/-Wl,-h,/g'
 .endif
 
 .include "../../security/openssl/options.mk"
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 286fd16eea3..203c81f625a 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.68 2009/06/10 13:57:08 tez Exp $
+$NetBSD: distinfo,v 1.69 2009/12/25 11:58:06 obache Exp $
 
 SHA1 (openssl-0.9.8k.tar.gz) = 3ba079f91d3c1ec90a36dcd1d43857165035703f
 RMD160 (openssl-0.9.8k.tar.gz) = 496df7a5d33457b0d8e3b930a8e5cf068923182c
 Size (openssl-0.9.8k.tar.gz) = 3852259 bytes
-SHA1 (patch-aa) = b28ec662bf0586e31d59cab45e3a28b91b10dac1
-SHA1 (patch-ac) = 7d03d0effcde4237216e9da4f38a318b0d1ae67d
+SHA1 (patch-aa) = 7191fd8bc34b384f44a9a7c238a556f251ab01c9
+SHA1 (patch-ac) = 1b0954f97524b3896bef562d1b13fa9aec1f0dec
 SHA1 (patch-ad) = bb86ac463fc4ab8b485df5f1a4fb9c13c1fc41c3
 SHA1 (patch-ae) = 7a58f1765a3761321dcc8dafc5fe2e33207be480
 SHA1 (patch-af) = 1eda5a96835b65d325c77ce5d39f1e524815a3c7
diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa
index 9033971357d..ed8b93aecba 100644
--- a/security/openssl/patches/patch-aa
+++ b/security/openssl/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.20 2008/01/17 06:42:48 tnn Exp $
+$NetBSD: patch-aa,v 1.21 2009/12/25 11:58:06 obache Exp $
 
 --- config.orig	2007-08-01 13:21:35.000000000 +0200
 +++ config	2007-10-21 13:18:53.000000000 +0200
@@ -14,8 +14,8 @@ $NetBSD: patch-aa,v 1.20 2008/01/17 06:42:48 tnn Exp $
  	echo "mips4-sgi-irix64"; exit 0
  	;;
  
-+    Interix:3.*)
-+	echo "i386-pc-interix3"; exit 0
++    Interix:*)
++	echo "i386-pc-interix"; exit 0
 +	;;
 +
      Linux:[2-9].*)
@@ -63,7 +63,7 @@ $NetBSD: patch-aa,v 1.20 2008/01/17 06:42:48 tnn Exp $
  			esac ;;
    *-*-*bsd*)		OUT="BSD-generic32" ;;
  
-+  *-*-interix3)		OUT="Interix3" ;;
++  *-*-interix)		OUT="Interix" ;;
 +
    *-*-osf)		OUT="osf1-alpha-cc" ;;
    *-*-tru64)		OUT="tru64-alpha-cc" ;;
diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac
index 3104bbb7406..67ec4004446 100644
--- a/security/openssl/patches/patch-ac
+++ b/security/openssl/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.35 2009/04/16 09:50:37 tnn Exp $
+$NetBSD: patch-ac,v 1.36 2009/12/25 11:58:06 obache Exp $
 
 --- Configure.orig	2007-09-16 14:24:17.000000000 +0200
 +++ Configure	2007-10-21 13:21:36.000000000 +0200
@@ -39,7 +39,7 @@ $NetBSD: patch-ac,v 1.35 2009/04/16 09:50:37 tnn Exp $
 +"NetBSD-x86-aout", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-x86-elf", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -DMD32_REG_T=int -O2::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"Interix3","gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:bsd-gcc-shared::-Wl,--image-base,\$\$((\$\$RANDOM /1024*1048576+1577058304)):.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"Interix","gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:bsd-gcc-shared::-Wl,--image-base,0x5e000000:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"DragonFly-i386",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +
  "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",