diff options
| -rwxr-xr-x | contrib/build-openssl-mingw-cross.sh | 2 | ||||
| -rwxr-xr-x | contrib/make-mingw-release.sh | 2 | ||||
| -rw-r--r-- | contrib/openssl-1.1.0h-configure.patch | 32 |
3 files changed, 34 insertions, 2 deletions
diff --git a/contrib/build-openssl-mingw-cross.sh b/contrib/build-openssl-mingw-cross.sh index 4c00f5d..332ef61 100755 --- a/contrib/build-openssl-mingw-cross.sh +++ b/contrib/build-openssl-mingw-cross.sh @@ -1,6 +1,6 @@ #!/bin/sh set -e -OPENSSL=openssl-1.0.2h +OPENSSL=openssl-1.1.0h BASE=`pwd` wget http://openssl.org/source/$OPENSSL.tar.gz -O - | tar xz diff --git a/contrib/make-mingw-release.sh b/contrib/make-mingw-release.sh index 4df517a..673b73c 100755 --- a/contrib/make-mingw-release.sh +++ b/contrib/make-mingw-release.sh @@ -14,7 +14,7 @@ for target in w32 w64; do cp anytun-$target/*.exe anytun-$VER-$target cp $LIBGCC_DLL $LIBSTDCPP_DLL anytun-$VER-$target cp boost-$target/lib/libboost_{date_time,serialization,system,thread_win32,chrono}.dll anytun-$VER-$target - cp openssl-$target/bin/libeay32.dll anytun-$VER-$target + cp openssl-$target/bin/{libeay32.dll,libcrypto*.dll} anytun-$VER-$target cp anytun-example.bat anytun-$VER-$target cp ../{AUTHORS,ChangeLog,LICENSE,README,version} anytun-$VER-$target cp -r tap?? anytun-$VER-$target diff --git a/contrib/openssl-1.1.0h-configure.patch b/contrib/openssl-1.1.0h-configure.patch new file mode 100644 index 0000000..54363f6 --- /dev/null +++ b/contrib/openssl-1.1.0h-configure.patch @@ -0,0 +1,32 @@ +diff -Nur openssl-1.1.0h.orig/config openssl-1.1.0h/config +--- openssl-1.1.0h.orig/config 2018-06-09 01:39:38.845245228 +0200 ++++ openssl-1.1.0h/config 2018-06-09 01:43:01.715723809 +0200 +@@ -843,11 +843,11 @@ + options="$options $CONFIG_OPTIONS" + fi + +-if expr "$options" : '.*no\-asm' > /dev/null; then :; else +- sh -c "$CROSS_COMPILE${CC:-gcc} -Wa,--help -c -o /tmp/null.$$.o -x assembler /dev/null && rm /tmp/null.$$.o" 2>&1 | \ +- grep \\--noexecstack >/dev/null && \ +- options="$options -Wa,--noexecstack" +-fi ++#if expr "$options" : '.*no\-asm' > /dev/null; then :; else ++# sh -c "$CROSS_COMPILE${CC:-gcc} -Wa,--help -c -o /tmp/null.$$.o -x assembler /dev/null && rm /tmp/null.$$.o" 2>&1 | \ ++# grep \\--noexecstack >/dev/null && \ ++# options="$options -Wa,--noexecstack" ++#fi + + # gcc < 2.8 does not support -march=ultrasparc + if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ] +diff -Nur openssl-1.1.0h.orig/Configure openssl-1.1.0h/Configure +--- openssl-1.1.0h.orig/Configure 2018-06-09 01:39:38.845245228 +0200 ++++ openssl-1.1.0h/Configure 2018-06-09 01:47:30.473859795 +0200 +@@ -741,7 +741,7 @@ + } + else + { +- die "target already defined - $target (offending arg: $_)\n" if ($target ne ""); ++ # die "target already defined - $target (offending arg: $_)\n" if ($target ne ""); + $target=$_; + } + unless ($_ eq $target || /^no-/ || /^disable-/) |