12:09 p.m.
Author: mladen.turk(a)jboss.com
Date: 2007-10-19 06:09:10 -0400 (Fri, 19 Oct 2007)
New Revision: 1139
Added:
trunk/build/patch/openssl-0.9.8g.patch
Removed:
trunk/build/patch/openssl-0.9.8f.patch
Log:
Remove broken OpenSSL version
Deleted: trunk/build/patch/openssl-0.9.8f.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8f.patch 2007-10-18 16:13:07 UTC (rev 1138)
+++ trunk/build/patch/openssl-0.9.8f.patch 2007-10-19 10:09:10 UTC (rev 1139)
@@ -1,93 +0,0 @@
---- util/mk1mf.pl
-+++ util/mk1mf.pl
-@@ -333,24 +333,24 @@
- if ($shlib)
- {
- $extra_install= <<"EOF";
-- \$(CP) \$(O_SSL) \$(INSTALLTOP)${o}bin
-- \$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}bin
-- \$(CP) \$(L_SSL) \$(INSTALLTOP)${o}lib
-- \$(CP) \$(L_CRYPTO) \$(INSTALLTOP)${o}lib
-+ \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}bin\"
-+ \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}bin\"
-+ \$(CP) \"\$(L_SSL)\" \"\$(INSTALLTOP)${o}lib\"
-+ \$(CP) \"\$(L_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
- EOF
- if ($no_static_engine)
- {
- $extra_install .= <<"EOF"
-- \$(MKDIR) \$(INSTALLTOP)${o}lib${o}engines
-- \$(CP) \$(E_SHLIB) \$(INSTALLTOP)${o}lib${o}engines
-+ \$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"
-+ \$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\"
- EOF
- }
- }
- else
- {
- $extra_install= <<"EOF";
-- \$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib
-- \$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib
-+ \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}lib\"
-+ \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
- EOF
- $ex_libs .= " $zlib_lib" if $zlib_opt == 1;
- }
-@@ -492,7 +492,7 @@
- $banner
-
- \$(TMP_D):
-- \$(MKDIR) \$(TMP_D)
-+ \$(MKDIR) \"\$(TMP_D)\"
- # NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different
- #\$(BIN_D):
- # \$(MKDIR) \$(BIN_D)
-@@ -501,13 +501,13 @@
- # \$(MKDIR) \$(TEST_D)
-
- \$(LIB_D):
-- \$(MKDIR) \$(LIB_D)
-+ \$(MKDIR) \"\$(LIB_D)\"
-
- \$(INCO_D): \$(INC_D)
-- \$(MKDIR) \$(INCO_D)
-+ \$(MKDIR) \"\$(INCO_D)\"
-
- \$(INC_D):
-- \$(MKDIR) \$(INC_D)
-+ \$(MKDIR) \"\$(INC_D)\"
-
- headers: \$(HEADER) \$(EXHEADER)
- @
-@@ -517,14 +517,14 @@
- exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
-
- install: all
-- \$(MKDIR) \$(INSTALLTOP)
-- \$(MKDIR) \$(INSTALLTOP)${o}bin
-- \$(MKDIR) \$(INSTALLTOP)${o}include
-- \$(MKDIR) \$(INSTALLTOP)${o}include${o}openssl
-- \$(MKDIR) \$(INSTALLTOP)${o}lib
-- \$(CP) \$(INCO_D)${o}*.\[ch\] \$(INSTALLTOP)${o}include${o}openssl
-- \$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin
-- \$(CP) apps${o}openssl.cnf \$(INSTALLTOP)
-+ \$(MKDIR) \"\$(INSTALLTOP)\"
-+ \$(MKDIR) \"\$(INSTALLTOP)${o}bin\"
-+ \$(MKDIR) \"\$(INSTALLTOP)${o}include\"
-+ \$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"
-+ \$(MKDIR) \"\$(INSTALLTOP)${o}lib\"
-+ \$(CP) \"\$(INCO_D)${o}*.\[ch\]\"
\"\$(INSTALLTOP)${o}include${o}openssl\"
-+ \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep\" \"\$(INSTALLTOP)${o}bin\"
-+ \$(CP) \"apps${o}openssl.cnf\" \"\$(INSTALLTOP)\"
- $extra_install
-
-
-@@ -969,7 +969,7 @@
- if ($n =~ /bss_file/)
- { $pp=".c"; }
- else { $pp=$p; }
-- $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \$(SRC_D)$o$_$pp
$to${o}$n$pp\n\n";
-+ $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \"\$(SRC_D)$o$_$pp\"
\"$to${o}$n$pp\"\n\n";
- }
- return($ret);
- }
Added: trunk/build/patch/openssl-0.9.8g.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8g.patch (rev 0)
+++ trunk/build/patch/openssl-0.9.8g.patch 2007-10-19 10:09:10 UTC (rev 1139)
@@ -0,0 +1,93 @@
+--- util/mk1mf.pl
++++ util/mk1mf.pl
+@@ -333,24 +333,24 @@
+ if ($shlib)
+ {
+ $extra_install= <<"EOF";
+- \$(CP) \$(O_SSL) \$(INSTALLTOP)${o}bin
+- \$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}bin
+- \$(CP) \$(L_SSL) \$(INSTALLTOP)${o}lib
+- \$(CP) \$(L_CRYPTO) \$(INSTALLTOP)${o}lib
++ \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}bin\"
++ \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}bin\"
++ \$(CP) \"\$(L_SSL)\" \"\$(INSTALLTOP)${o}lib\"
++ \$(CP) \"\$(L_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
+ EOF
+ if ($no_static_engine)
+ {
+ $extra_install .= <<"EOF"
+- \$(MKDIR) \$(INSTALLTOP)${o}lib${o}engines
+- \$(CP) \$(E_SHLIB) \$(INSTALLTOP)${o}lib${o}engines
++ \$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"
++ \$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\"
+ EOF
+ }
+ }
+ else
+ {
+ $extra_install= <<"EOF";
+- \$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib
+- \$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib
++ \$(CP) \"\$(O_SSL)\" \"\$(INSTALLTOP)${o}lib\"
++ \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
+ EOF
+ $ex_libs .= " $zlib_lib" if $zlib_opt == 1;
+ }
+@@ -492,7 +492,7 @@
+ $banner
+
+ \$(TMP_D):
+- \$(MKDIR) \$(TMP_D)
++ \$(MKDIR) \"\$(TMP_D)\"
+ # NB: uncomment out these lines if BIN_D, TEST_D and LIB_D are different
+ #\$(BIN_D):
+ # \$(MKDIR) \$(BIN_D)
+@@ -501,13 +501,13 @@
+ # \$(MKDIR) \$(TEST_D)
+
+ \$(LIB_D):
+- \$(MKDIR) \$(LIB_D)
++ \$(MKDIR) \"\$(LIB_D)\"
+
+ \$(INCO_D): \$(INC_D)
+- \$(MKDIR) \$(INCO_D)
++ \$(MKDIR) \"\$(INCO_D)\"
+
+ \$(INC_D):
+- \$(MKDIR) \$(INC_D)
++ \$(MKDIR) \"\$(INC_D)\"
+
+ headers: \$(HEADER) \$(EXHEADER)
+ @
+@@ -517,14 +517,14 @@
+ exe: \$(T_EXE) \$(BIN_D)$o\$(E_EXE)$exep
+
+ install: all
+- \$(MKDIR) \$(INSTALLTOP)
+- \$(MKDIR) \$(INSTALLTOP)${o}bin
+- \$(MKDIR) \$(INSTALLTOP)${o}include
+- \$(MKDIR) \$(INSTALLTOP)${o}include${o}openssl
+- \$(MKDIR) \$(INSTALLTOP)${o}lib
+- \$(CP) \$(INCO_D)${o}*.\[ch\] \$(INSTALLTOP)${o}include${o}openssl
+- \$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin
+- \$(CP) apps${o}openssl.cnf \$(INSTALLTOP)
++ \$(MKDIR) \"\$(INSTALLTOP)\"
++ \$(MKDIR) \"\$(INSTALLTOP)${o}bin\"
++ \$(MKDIR) \"\$(INSTALLTOP)${o}include\"
++ \$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"
++ \$(MKDIR) \"\$(INSTALLTOP)${o}lib\"
++ \$(CP) \"\$(INCO_D)${o}*.\[ch\]\"
\"\$(INSTALLTOP)${o}include${o}openssl\"
++ \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep\" \"\$(INSTALLTOP)${o}bin\"
++ \$(CP) \"apps${o}openssl.cnf\" \"\$(INSTALLTOP)\"
+ $extra_install
+
+
+@@ -969,7 +969,7 @@
+ if ($n =~ /bss_file/)
+ { $pp=".c"; }
+ else { $pp=$p; }
+- $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \$(SRC_D)$o$_$pp
$to${o}$n$pp\n\n";
++ $ret.="$to${o}$n$pp: \$(SRC_D)$o$_$pp\n\t\$(CP) \"\$(SRC_D)$o$_$pp\"
\"$to${o}$n$pp\"\n\n";
+ }
+ return($ret);
+ }