3 files changed, 10 insertions, 13 deletions

diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 08f05d952f58..97ad10b0b72a 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	openssl
 PORTVERSION=	0.9.7m
 PORTREVISION?=	0
 .else
-PORTVERSION=	0.9.8g
+PORTVERSION=	0.9.8h
 PORTREVISION?=	0
 .endif
 CATEGORIES=	security devel
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 6b084c5171e2..556741f6c9ee 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,6 +1,3 @@
-MD5 (openssl-0.9.7m.tar.gz) = 74a4d1b87e1e6e1ec95dbe58cb4c5b9a
-SHA256 (openssl-0.9.7m.tar.gz) = c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572
-SIZE (openssl-0.9.7m.tar.gz) = 3303943
-MD5 (openssl-0.9.8g.tar.gz) = acf70a16359bf3658bdfb74bda1c4419
-SHA256 (openssl-0.9.8g.tar.gz) = 0e26886845de95716c9f1b9b75c0e06e9d4075d2bdc9e11504eaa5f7ee901cf0
-SIZE (openssl-0.9.8g.tar.gz) = 3354792
+MD5 (openssl-0.9.8h.tar.gz) = 7d3d41dafc76cf2fcb5559963b5783b3
+SHA256 (openssl-0.9.8h.tar.gz) = 224e1ca3aeeda8acc72e5c48b34843904b9d585aaadb4d5a15524c25f6c6a1ce
+SIZE (openssl-0.9.8h.tar.gz) = 3439981
diff --git a/security/openssl/files-beta/patch-Configure b/security/openssl/files-beta/patch-Configure
index 11983a23cee8..691fe7b848af 100644
--- a/security/openssl/files-beta/patch-Configure
+++ b/security/openssl/files-beta/patch-Configure
@@ -1,6 +1,6 @@
---- Configure.orig	Tue Jul  5 01:24:11 2005
-+++ Configure	Sun Jul 10 13:37:03 2005
-@@ -130,7 +130,7 @@
+--- Configure.orig	2008-05-02 01:11:30.000000000 +0200
++++ Configure	2008-05-29 13:55:51.000000000 +0200
+@@ -132,7 +132,7 @@
  # which has to be accompanied by explicit -D_THREAD_SAFE and
  # sometimes -D_REENTRANT. FreeBSD 5.x expands it as -lc_r, which
  # seems to be sufficient?
@@ -9,7 +9,7 @@
  
  #config-string	$cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags
  
-@@ -355,19 +355,20 @@
+@@ -359,19 +359,20 @@
  "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
  
  #### *BSD [do see comment about ${BSDthreads} above!]
@@ -21,7 +21,7 @@
 +"BSD-generic32","$ENV{'FREEBSDCC'}:-DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
 +"BSD-x86",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
 +"BSD-x86-elf",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
-+"debug-BSD-x86-elf",	"$ENV{FREEBSDCC}:-DL_ENDIAN -DTERMIOS -O3 -Wall $ENV{'CFLAGS'} -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
++"debug-BSD-x86-elf",	"$ENV{'FREEBSDCC'}:-DL_ENDIAN -DTERMIOS -O3 -Wall -g $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
 +"BSD-sparcv8",	"$ENV{'FREEBSDCC'}:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
  
 -"BSD-generic64","gcc:-DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -29,7 +29,7 @@
  # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
  # simply *happens* to work around a compiler bug in gcc 3.3.3,
  # triggered by RIPEMD160 code.
--"BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::md5-sparcv9.o::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 -"BSD-ia64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 -"BSD-x86_64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"BSD-sparc64",	"$ENV{'FREEBSDCC'}:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall $ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",