bump product version to 4.1.6.2
[LibreOffice.git] / openssl / openssllnx.patch
blobb3c99c9d52bc84e4becd8c0a45d148e8642009da
1 --- build/openssl-0.9.8v/Configure-old 2010-04-17 13:51:42.000000000 +0200
2 +++ build/openssl-0.9.8v/Configure 2010-04-17 13:52:03.000000000 +0200
3 @@ -388,6 +388,9 @@
5 "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)",
7 +"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
8 +"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -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)",
10 "nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
11 "nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
13 --- build/openssl-0.9.8v/Makefile.org 2010-01-27 17:06:36.000000000 +0100
14 +++ build/openssl-0.9.8v/Makefile.org 2010-09-20 09:24:00.000000000 +0100
15 @@ -199,7 +199,7 @@
17 BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
18 CC='${CC}' CFLAG='${CFLAG}' \
19 - AS='${CC}' ASFLAG='${CFLAG} -c' \
20 + AS='${CC}' ASFLAG='${CFLAG} -c -Wa,--noexecstack' \
21 AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
22 SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)' \
23 INSTALL_PREFIX='${INSTALL_PREFIX}' \
24 --- misc/openssl-0.9.8v/config 2009-02-16 09:43:41.000000000 +0100
25 +++ build/openssl-0.9.8v/config 2009-03-30 08:59:09.588448000 +0200
26 @@ -399,27 +399,21 @@
27 # this is where the translation occurs into SSLeay terms
28 # ---------------------------------------------------------------------------
30 -GCCVER=`(gcc -dumpversion) 2>/dev/null`
31 -if [ "$GCCVER" != "" ]; then
32 - # then strip off whatever prefix egcs prepends the number with...
33 - # Hopefully, this will work for any future prefixes as well.
34 - GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
35 - # Since gcc 3.1 gcc --version behaviour has changed. gcc -dumpversion
36 - # does give us what we want though, so we use that. We just just the
37 - # major and minor version numbers.
38 - # peak single digit before and after first dot, e.g. 2.95.1 gives 29
39 - GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
40 -fi
42 -# Only set CC if not supplied already
43 -if [ -z "$CC" ]; then
44 -# figure out if gcc is available and if so we use it otherwise
45 -# we fallback to whatever cc does on the system
46 - if [ "$GCCVER" != "" ]; then
47 - CC=gcc
48 - else
49 - CC=cc
50 - fi
51 +if [ -z "$CC" ];then
52 + GCCVER=`(gcc -dumpversion) 2>/dev/null`
53 + if [ "$GCCVER" != "" ]; then
54 + CC=gcc
55 + # then strip off whatever prefix egcs prepends the number with...
56 + # Hopefully, this will work for any future prefixes as well.
57 + GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
58 + # Since gcc 3.1 gcc --version behaviour has changed. gcc -dumpversion
59 + # does give us what we want though, so we use that. We just just the
60 + # major and minor version numbers.
61 + # peak single digit before and after first dot, e.g. 2.95.1 gives 29
62 + GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
63 + else
64 + CC=cc
65 + fi
67 GCCVER=${GCCVER:-0}
68 if [ "$SYSTEM" = "HP-UX" ];then