openssl/openssl.patch openssl/openssl.spec
Git Service User
git at kolabsys.com
Tue Feb 22 15:29:19 CET 2011
openssl/openssl.patch | 272 ++++++++++++++++++++++++--------------------------
openssl/openssl.spec | 7 -
2 files changed, 140 insertions(+), 139 deletions(-)
New commits:
commit f1fb04acac4407618278fe8b407bc5b024e49d8d
Author: Christoph Wickert <wickert at kolabsys.com>
Date: Tue Feb 22 15:28:15 2011 +0100
openssl: Update to 1.0.0d (fixes CVE-2011-0014)
diff --git a/openssl/openssl.patch b/openssl/openssl.patch
index d549a72..1822321 100644
--- a/openssl/openssl.patch
+++ b/openssl/openssl.patch
@@ -1,338 +1,336 @@
-Index: Configure
---- Configure.orig 2010-01-19 22:40:54.000000000 +0100
-+++ Configure 2010-03-30 09:15:55.000000000 +0200
-@@ -34,6 +34,7 @@
+--- Configure 2011-02-22 13:16:43.082015162 +0100
++++ Configure.orig 2010-11-30 23:19:26.000000000 +0100
+@@ -34,7 +34,6 @@
# (Default: KRB5_DIR/include)
# --with-krb5-flavor Declare what flavor of Kerberos 5 is used. Currently
# supported values are "MIT" and "Heimdal". A value is required.
-+# --with-cc compiler to use for $CC (useful if cc is a disguised gcc)
+-# --with-cc compiler to use for $CC (useful if cc is a disguised gcc)
#
# --test-sanity Make a number of sanity checks on the data in this file.
# This is a debugging tool for OpenSSL developers.
-@@ -122,6 +123,7 @@
+@@ -123,7 +122,6 @@
#$bits2="THIRTY_TWO_BIT ";
my $bits1="THIRTY_TWO_BIT ";
my $bits2="SIXTY_FOUR_BIT ";
-+my $ccarg;
+-my $ccarg;
my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o:des-586.o crypt586.o:aes-586.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o";
-@@ -434,12 +436,12 @@
+@@ -436,12 +434,12 @@
#### IBM's AIX.
"aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
--"aix-gcc", "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X32",
--"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
-+"aix-gcc", "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
-+"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
+-"aix-gcc", "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
+-"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
++"aix-gcc", "gcc:-O -DB_ENDIAN::-pthread:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X32",
++"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-pthread:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-maix64 -shared -Wl,-G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64",
# Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE
# at build time. $OBJECT_MODE is respected at ./config stage!
--"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
--"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
-+"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
-+"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
+-"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
+-"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::",
++"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:${ppc32_asm}:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",
++"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:${ppc64_asm}:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",
#
# Cray T90 and similar (SDSC)
-@@ -780,6 +782,10 @@
+@@ -785,10 +783,6 @@
{
$strict_warnings = 1;
}
-+ elsif (/^--with-cc=(.*)$/)
-+ {
-+ $ccarg=$1
-+ }
+- elsif (/^--with-cc=(.*)$/)
+- {
+- $ccarg=$1
+- }
elsif (/^reconfigure/ || /^reconf/)
{
if (open(IN,"<$Makefile"))
-@@ -1058,7 +1064,7 @@
+@@ -1067,7 +1061,7 @@
print "IsMK1MF=$IsMK1MF\n";
my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
--my $cc = $fields[$idx_cc];
-+my $cc = $ccarg ? $ccarg : $fields[$idx_cc];
+-my $cc = $ccarg ? $ccarg : $fields[$idx_cc];
++my $cc = $fields[$idx_cc];
# Allow environment CC to override compiler...
if($ENV{CC}) {
$cc = $ENV{CC};
-Index: config
---- config.orig 2010-03-09 18:08:39.000000000 +0100
-+++ config 2010-03-30 09:13:58.000000000 +0200
-@@ -277,6 +277,9 @@
+--- config 2011-02-22 13:16:43.083015228 +0100
++++ config.orig 2010-03-09 18:08:39.000000000 +0100
+@@ -277,9 +277,6 @@
Power*)
echo "ppc-apple-darwin${VERSION}"
;;
-+ x86_64 )
-+ echo "x86_64-apple-darwin${VERSION}"
-+ ;;
+- x86_64 )
+- echo "x86_64-apple-darwin${VERSION}"
+- ;;
*)
echo "i686-apple-darwin${VERSION}"
;;
-@@ -407,7 +410,7 @@
+@@ -410,7 +407,7 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
--GCCVER=`(gcc -dumpversion) 2>/dev/null`
-+GCCVER=`(${CC-gcc} -dumpversion 2>/dev/null && exit; gcc -dumpversion 2>/dev/null && exit; cc --version 2>/dev/null | grep GCC >/dev/null && cc -dumpversion )`
+-GCCVER=`(${CC-gcc} -dumpversion 2>/dev/null && exit; gcc -dumpversion 2>/dev/null && exit; cc --version 2>/dev/null | grep GCC >/dev/null && cc -dumpversion )`
++GCCVER=`(gcc -dumpversion) 2>/dev/null`
if [ "$GCCVER" != "" ]; then
# then strip off whatever prefix egcs prepends the number with...
# Hopefully, this will work for any future prefixes as well.
-@@ -425,8 +428,14 @@
+@@ -428,14 +425,8 @@
# we fallback to whatever cc does on the system
if [ "$GCCVER" != "" ]; then
CC=gcc
-+ SUFFIX=gcc
+- SUFFIX=gcc
else
CC=cc
-+ SUFFIX=cc
-+ fi
-+else
-+ if [ "$GCCVER" != "" ]; then
-+ SUFFIX=gcc
+- SUFFIX=cc
+- fi
+-else
+- if [ "$GCCVER" != "" ]; then
+- SUFFIX=gcc
fi
fi
GCCVER=${GCCVER:-0}
-@@ -436,7 +445,7 @@
+@@ -445,7 +436,7 @@
if [ $GCCVER -ge 30 ]; then
# PA64 support only came in with gcc 3.0.x.
# We check if the preprocessor symbol __LP64__ is defined...
-- if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
-+ if echo "__LP64__" | $CC -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
+- if echo "__LP64__" | $CC -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
++ if echo "__LP64__" | gcc -v -E -x c - 2>/dev/null | grep "^__LP64__" 2>&1 > /dev/null; then
: # __LP64__ has slipped through, it therefore is not defined
else
GCC_BITS="64"
-@@ -447,13 +456,14 @@
+@@ -456,14 +447,13 @@
if [ $GCCVER -ge 30 ]; then
# 64-bit ABI isn't officially supported in gcc 3.0, but it appears
# to be working, at the very least 'make test' passes...
-- if gcc -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then
-+ if $CC -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then
+- if $CC -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then
++ if gcc -v -E -x c /dev/null 2>&1 | grep __arch64__ > /dev/null; then
GCC_ARCH="-m64"
else
GCC_ARCH="-m32"
fi
fi
# check for WorkShop C, expected output is "cc: blah-blah C x.x"
-+ if [ $GCCVER -eq 0 ]; then
+- if [ $GCCVER -eq 0 ]; then
CCVER=`(cc -V 2>&1) 2>/dev/null | \
egrep -e '^cc: .* C [0-9]\.[0-9]' | \
sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'`
-@@ -466,6 +476,7 @@
- sleep 5
+@@ -477,7 +467,6 @@
fi
fi
-+ fi
- fi
+ fi
+-fi
if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then
-@@ -483,6 +494,7 @@
+ # check for Compaq C, expected output is "blah-blah C Vx.x"
+@@ -494,7 +483,6 @@
if [ "${SYSTEM}" = "AIX" ]; then # favor vendor cc over gcc
(cc) 2>&1 | grep -iv "not found" > /dev/null && CC=cc
-+ (gcc) 2>&1 | grep -iv "not found" > /dev/null && CC=gcc
+- (gcc) 2>&1 | grep -iv "not found" > /dev/null && CC=gcc
fi
CCVER=${CCVER:-0}
-@@ -508,7 +520,7 @@
+@@ -520,7 +508,7 @@
if [ $CPU -ge 4000 ]; then
options="$options -mips2"
fi
-- OUT="irix-$CC"
-+ OUT="irix-$SUFFIX"
+- OUT="irix-$SUFFIX"
++ OUT="irix-$CC"
;;
mips3-sgi-irix)
#CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
-@@ -518,11 +530,11 @@
+@@ -530,11 +518,11 @@
#else
# options="$options -mips3"
#fi
-- OUT="irix-mips3-$CC"
-+ OUT="irix-mips3-$SUFFIX"
+- OUT="irix-mips3-$SUFFIX"
++ OUT="irix-mips3-$CC"
;;
mips4-sgi-irix64)
echo "WARNING! If you wish to build 64-bit library, then you have to"
-- echo " invoke './Configure irix64-mips4-$CC' *manually*."
-+ echo " invoke './Configure irix64-mips4-$SUFFIX' *manually*."
+- echo " invoke './Configure irix64-mips4-$SUFFIX' *manually*."
++ echo " invoke './Configure irix64-mips4-$CC' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
(trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
-@@ -534,7 +546,7 @@
+@@ -546,7 +534,7 @@
#else
# options="$options -mips3"
#fi
-- OUT="irix-mips3-$CC"
-+ OUT="irix-mips3-$SUFFIX"
+- OUT="irix-mips3-$SUFFIX"
++ OUT="irix-mips3-$CC"
;;
ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
ppc-apple-darwin*)
-@@ -559,13 +571,16 @@
+@@ -571,16 +559,13 @@
fi
fi
OUT="darwin-i386-cc" ;;
-+ x86_64-apple-darwin*)
-+ OUT="darwin64-x86_64-cc"
-+ ;;
+- x86_64-apple-darwin*)
+- OUT="darwin64-x86_64-cc"
+- ;;
alpha-*-linux2)
ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
case ${ISA:-generic} in
-- *[678]) OUT="linux-alpha+bwx-$CC" ;;
-- *) OUT="linux-alpha-$CC" ;;
-+ *[678]) OUT="linux-alpha+bwx-$SUFFIX" ;;
-+ *) OUT="linux-alpha-$SUFFIX" ;;
+- *[678]) OUT="linux-alpha+bwx-$SUFFIX" ;;
+- *) OUT="linux-alpha-$SUFFIX" ;;
++ *[678]) OUT="linux-alpha+bwx-$CC" ;;
++ *) OUT="linux-alpha-$CC" ;;
esac
-- if [ "$CC" = "gcc" ]; then
-+ if [ $GCCVER -gt 0 ]; then
+- if [ $GCCVER -gt 0 ]; then
++ if [ "$CC" = "gcc" ]; then
case ${ISA:-generic} in
EV5|EV45) options="$options -mcpu=ev5";;
EV56|PCA56) options="$options -mcpu=ev56";;
-@@ -632,7 +647,7 @@
+@@ -647,7 +632,7 @@
s390x-*-linux2) OUT="linux-s390x" ;;
x86_64-*-linux?) OUT="linux-x86_64" ;;
*86-*-linux2) OUT="linux-elf"
-- if [ "$GCCVER" -gt 28 ]; then
-+ if [ $GCCVER -gt 28 ]; then
+- if [ $GCCVER -gt 28 ]; then
++ if [ "$GCCVER" -gt 28 ]; then
if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
options="$options -march=pentium"
fi
-@@ -646,17 +661,17 @@
+@@ -661,17 +646,17 @@
*-*-linux1) OUT="linux-aout" ;;
*-*-linux2) OUT="linux-generic32" ;;
sun4[uv]*-*-solaris2)
-- OUT="solaris-sparcv9-$CC"
-+ OUT="solaris-sparcv9-$SUFFIX"
+- OUT="solaris-sparcv9-$SUFFIX"
++ OUT="solaris-sparcv9-$CC"
ISA64=`(isalist) 2>/dev/null | grep sparcv9`
if [ "$ISA64" != "" ]; then
-- if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then
-+ if [ $GCCVER -eq 0 -a $CCVER -ge 50 ]; then
+- if [ $GCCVER -eq 0 -a $CCVER -ge 50 ]; then
++ if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to"
echo " invoke './Configure solaris64-sparcv9-cc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort."
(trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi
-- elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then
-+ elif [ $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
+- elif [ $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
++ elif [ "$CC" = "gcc" -a "$GCC_ARCH" = "-m64" ]; then
# $GCC_ARCH denotes default ABI chosen by compiler driver
# (first one found on the $PATH). I assume that user
# expects certain consistency with the rest of his builds
-@@ -679,21 +694,21 @@
+@@ -694,21 +679,21 @@
fi
fi
;;
-- sun4m-*-solaris2) OUT="solaris-sparcv8-$CC" ;;
-- sun4d-*-solaris2) OUT="solaris-sparcv8-$CC" ;;
-- sun4*-*-solaris2) OUT="solaris-sparcv7-$CC" ;;
-+ sun4m-*-solaris2) OUT="solaris-sparcv8-$SUFFIX" ;;
-+ sun4d-*-solaris2) OUT="solaris-sparcv8-$SUFFIX" ;;
-+ sun4*-*-solaris2) OUT="solaris-sparcv7-$SUFFIX" ;;
+- sun4m-*-solaris2) OUT="solaris-sparcv8-$SUFFIX" ;;
+- sun4d-*-solaris2) OUT="solaris-sparcv8-$SUFFIX" ;;
+- sun4*-*-solaris2) OUT="solaris-sparcv7-$SUFFIX" ;;
++ sun4m-*-solaris2) OUT="solaris-sparcv8-$CC" ;;
++ sun4d-*-solaris2) OUT="solaris-sparcv8-$CC" ;;
++ sun4*-*-solaris2) OUT="solaris-sparcv7-$CC" ;;
*86*-*-solaris2)
ISA64=`(isalist) 2>/dev/null | grep amd64`
-- if [ "$ISA64" != "" ]; then
-- OUT="solaris64-x86_64-$CC"
-+ if [ "$ISA64" != "" -a $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
-+ OUT="solaris64-x86_64-$SUFFIX"
+- if [ "$ISA64" != "" -a $GCCVER -gt 0 -a "$GCC_ARCH" = "-m64" ]; then
+- OUT="solaris64-x86_64-$SUFFIX"
++ if [ "$ISA64" != "" ]; then
++ OUT="solaris64-x86_64-$CC"
else
-- OUT="solaris-x86-$CC"
-+ OUT="solaris-x86-$SUFFIX"
+- OUT="solaris-x86-$SUFFIX"
++ OUT="solaris-x86-$CC"
if [ `uname -r | sed -e 's/5\.//'` -lt 10 ]; then
options="$options no-sse2"
fi
fi
;;
-- *-*-sunos4) OUT="sunos-$CC" ;;
-+ *-*-sunos4) OUT="sunos-$SUFFIX" ;;
+- *-*-sunos4) OUT="sunos-$SUFFIX" ;;
++ *-*-sunos4) OUT="sunos-$CC" ;;
*86*-*-bsdi4) OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
alpha*-*-*bsd*) OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
-@@ -717,7 +732,7 @@
+@@ -732,7 +717,7 @@
*-*-osf) OUT="osf1-alpha-cc" ;;
*-*-tru64) OUT="tru64-alpha-cc" ;;
*-*-[Uu]nix[Ww]are7)
-- if [ "$CC" = "gcc" ]; then
-+ if [ $GCCVER -gt 0 ]; then
+- if [ $GCCVER -gt 0 ]; then
++ if [ "$CC" = "gcc" ]; then
OUT="unixware-7-gcc" ; options="$options no-sse2"
else
OUT="unixware-7" ; options="$options no-sse2 -D__i386__"
-@@ -728,12 +743,12 @@
+@@ -743,12 +728,12 @@
*-*-vos)
options="$options no-threads no-shared no-asm no-dso"
EXE=".pm"
-- OUT="vos-$CC" ;;
-+ OUT="vos-$SUFFIX" ;;
+- OUT="vos-$SUFFIX" ;;
++ OUT="vos-$CC" ;;
BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;
RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
*-siemens-sysv4) OUT="SINIX" ;;
*-hpux1*)
-- if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then
-+ if [ $GCCVER -gt 0 -a $GCC_BITS = "64" ]; then
+- if [ $GCCVER -gt 0 -a $GCC_BITS = "64" ]; then
++ if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then
OUT="hpux64-parisc2-gcc"
fi
KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
-@@ -751,8 +766,8 @@
+@@ -766,8 +751,8 @@
fi
OUT="hpux64-ia64-cc"
elif [ $CPU_VERSION -ge 532 ]; then # PA-RISC 2.x CPU
-- OUT=${OUT:-"hpux-parisc2-${CC}"}
-- if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
-+ OUT=${OUT:-"hpux-parisc2-${SUFFIX}"}
-+ if [ $KERNEL_BITS -eq 64 -a $GCCVER -eq 0 ]; then
+- OUT=${OUT:-"hpux-parisc2-${SUFFIX}"}
+- if [ $KERNEL_BITS -eq 64 -a $GCCVER -eq 0 ]; then
++ OUT=${OUT:-"hpux-parisc2-${CC}"}
++ if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
echo "WARNING! If you wish to build 64-bit library then you have to"
echo " invoke './Configure hpux64-parisc2-cc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then
-@@ -761,19 +776,19 @@
+@@ -776,19 +761,19 @@
fi
fi
elif [ $CPU_VERSION -ge 528 ]; then # PA-RISC 1.1+ CPU
-- OUT="hpux-parisc-${CC}"
-+ OUT="hpux-parisc-${SUFFIX}"
+- OUT="hpux-parisc-${SUFFIX}"
++ OUT="hpux-parisc-${CC}"
elif [ $CPU_VERSION -ge 523 ]; then # PA-RISC 1.0 CPU
-- OUT="hpux-parisc-${CC}"
-+ OUT="hpux-parisc-${SUFFIX}"
+- OUT="hpux-parisc-${SUFFIX}"
++ OUT="hpux-parisc-${CC}"
else # Motorola(?) CPU
-- OUT="hpux-$CC"
-+ OUT="hpux-$SUFFIX"
+- OUT="hpux-$SUFFIX"
++ OUT="hpux-$CC"
fi
options="$options -D_REENTRANT" ;;
-- *-hpux) OUT="hpux-parisc-$CC" ;;
-+ *-hpux) OUT="hpux-parisc-$SUFFIX" ;;
+- *-hpux) OUT="hpux-parisc-$SUFFIX" ;;
++ *-hpux) OUT="hpux-parisc-$CC" ;;
*-aix)
KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
KERNEL_BITS=${KERNEL_BITS:-32}
OBJECT_MODE=${OBJECT_MODE:-32}
-- if [ "$CC" = "gcc" ]; then
-+ if [ $GCCVER -gt 0 ]; then
+- if [ $GCCVER -gt 0 ]; then
++ if [ "$CC" = "gcc" ]; then
OUT="aix-gcc"
if [ $OBJECT_MODE -eq 64 ]; then
echo 'Your $OBJECT_MODE was found to be set to 64'
-@@ -875,7 +890,7 @@
+@@ -890,7 +875,7 @@
#fi
if [ -z "$OUT" ]; then
-- OUT="$CC"
-+ OUT="$SUFFIX"
+- OUT="$SUFFIX"
++ OUT="$CC"
fi
if [ ".$PERL" = . ] ; then
-@@ -907,9 +922,9 @@
+@@ -922,9 +907,9 @@
# compiler for the platform ... in which case we add it on
# the end ... otherwise we leave it off
--$PERL ./Configure LIST | grep "$OUT-$CC" > /dev/null
-+$PERL ./Configure LIST | grep "$OUT-$SUFFIX" > /dev/null
+-$PERL ./Configure LIST | grep "$OUT-$SUFFIX" > /dev/null
++$PERL ./Configure LIST | grep "$OUT-$CC" > /dev/null
if [ $? = "0" ]; then
-- OUT="$OUT-$CC"
-+ OUT="$OUT-$SUFFIX"
+- OUT="$OUT-$SUFFIX"
++ OUT="$OUT-$CC"
fi
OUT="$PREFIX$OUT"
-@@ -919,9 +934,9 @@
+@@ -934,9 +919,9 @@
echo Configuring for $OUT
if [ "$TEST" = "true" ]; then
-- echo $PERL ./Configure $OUT $options
-+ echo $PERL ./Configure $OUT --with-cc=$CC $options
+- echo $PERL ./Configure $OUT --with-cc=$CC $options
++ echo $PERL ./Configure $OUT $options
else
-- $PERL ./Configure $OUT $options
-+ $PERL ./Configure $OUT --with-cc=$CC $options
+- $PERL ./Configure $OUT --with-cc=$CC $options
++ $PERL ./Configure $OUT $options
fi
else
echo "This system ($OUT) is not supported. See file INSTALL for details."
diff --git a/openssl/openssl.spec b/openssl/openssl.spec
index 2fc76f2..b6c2cb4 100644
--- a/openssl/openssl.spec
+++ b/openssl/openssl.spec
@@ -22,7 +22,7 @@
##
# package version
-%define V_openssl 1.0.0c
+%define V_openssl 1.0.0d
%define V_zlib 1.2.5
# package information
@@ -184,5 +184,8 @@ AutoReqProv: no
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 22 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0d-20110222
+- Update to 1.0.0d (fixes CVE-2011-0014)
+
* Thu Dec 09 2010 Christoph Wickert <wickert at kolabsys.com> - 1.0.0c-20101209
-- Update to 1.0.0c
+- Update to 1.0.0c (fixes CVE-2010-4252)
More information about the commits
mailing list