[prev in list] [next in list] [prev in thread] [next in thread] 

List:       calendarserver-changes
Subject:    [CalendarServer-changes] [15754] CalendarServer/trunk/bin/_build.sh
From:       source_changes () macosforge ! org
Date:       2016-07-07 18:53:32
Message-ID: 20160707185332.5D7ED140ED8 () svn ! calendarserver ! org
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Revision: 15754
          http://trac.calendarserver.org//changeset/15754
Author:   dre@apple.com
Date:     2016-07-07 11:53:32 -0700 (Thu, 07 Jul 2016)
Log Message:
-----------
OpenSSL 0.9.8 is deprecated, update to 1.0.2h

Modified Paths:
--------------
    CalendarServer/trunk/bin/_build.sh

Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh	2016-07-07 16:37:13 UTC (rev 15753)
+++ CalendarServer/trunk/bin/_build.sh	2016-07-07 18:53:32 UTC (rev 15754)
@@ -168,6 +168,13 @@
         use_openssl="false"
         ;;
     esac;
+  else
+    case "$(uname -s)" in
+      Darwin)
+        # Needed to build OpenSSL 64-bit on OS X
+        export KERNEL_BITS=64
+        ;;
+    esac
   fi;  
   conditional_set requirements "${default_requirements}"
   
@@ -490,7 +497,7 @@
   if [ ${use_openssl} == "true" ]; then
     ruler;
 
-    local min_ssl_version="9470095";  # OpenSSL 0.9.8zf
+    local min_ssl_version="268443791";  # OpenSSL 1.0.2h
 
     local ssl_version="$(c_macro openssl/ssl.h OPENSSL_VERSION_NUMBER)";
     if [ -z "${ssl_version}" ]; then ssl_version="0x0"; fi;
@@ -499,13 +506,13 @@
     if [ "${ssl_version}" -ge "${min_ssl_version}" ]; then
       using_system "OpenSSL";
     else
-      local v="0.9.8zh";
+      local v="1.0.2h";
       local n="openssl";
       local p="${n}-${v}";
 
       # use 'config' instead of 'configure'; 'make' instead of 'jmake'.
       # also pass 'shared' to config to build shared libs.
-      c_dependency -c "config" -s "3ff71636bea85a99f4d76a10d119c09bda0421e3" \
+      c_dependency -c "config" -s "577585f5f5d299c44dd3c993d3c0ac7a219e4949" \
         -p "make depend" -b "make" \
         "openssl" "${p}" \
         "http://www.openssl.org/source/${p}.tar.gz" "shared";

[Attachment #5 (text/html)]

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[15754] CalendarServer/trunk/bin/_build.sh</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt;  } #msg dl a { font-weight: \
bold} #msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
 #patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
                .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.calendarserver.org//changeset/15754">15754</a></dd> <dt>Author</dt> \
<dd>dre@apple.com</dd> <dt>Date</dt> <dd>2016-07-07 11:53:32 -0700 (Thu, 07 Jul \
2016)</dd> </dl>

<h3>Log Message</h3>
<pre>OpenSSL 0.9.8 is deprecated, update to 1.0.2h</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/_build.sh (15753 => \
15754)</h4> <pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh	2016-07-07 16:37:13 UTC \
                (rev 15753)
+++ CalendarServer/trunk/bin/_build.sh	2016-07-07 18:53:32 UTC (rev 15754)
</span><span class="lines">@@ -168,6 +168,13 @@
</span><span class="cx">         use_openssl=&quot;false&quot;
</span><span class="cx">         ;;
</span><span class="cx">     esac;
</span><ins>+  else
+    case &quot;$(uname -s)&quot; in
+      Darwin)
+        # Needed to build OpenSSL 64-bit on OS X
+        export KERNEL_BITS=64
+        ;;
+    esac
</ins><span class="cx">   fi;  
</span><span class="cx">   conditional_set requirements \
&quot;${default_requirements}&quot; </span><span class="cx">   
</span><span class="lines">@@ -490,7 +497,7 @@
</span><span class="cx">   if [ ${use_openssl} == &quot;true&quot; ]; then
</span><span class="cx">     ruler;
</span><span class="cx"> 
</span><del>-    local min_ssl_version=&quot;9470095&quot;;  # OpenSSL 0.9.8zf
</del><ins>+    local min_ssl_version=&quot;268443791&quot;;  # OpenSSL 1.0.2h
</ins><span class="cx"> 
</span><span class="cx">     local ssl_version=&quot;$(c_macro openssl/ssl.h \
OPENSSL_VERSION_NUMBER)&quot;; </span><span class="cx">     if [ -z \
&quot;${ssl_version}&quot; ]; then ssl_version=&quot;0x0&quot;; fi; </span><span \
class="lines">@@ -499,13 +506,13 @@ </span><span class="cx">     if [ \
&quot;${ssl_version}&quot; -ge &quot;${min_ssl_version}&quot; ]; then </span><span \
class="cx">       using_system &quot;OpenSSL&quot;; </span><span class="cx">     else
</span><del>-      local v=&quot;0.9.8zh&quot;;
</del><ins>+      local v=&quot;1.0.2h&quot;;
</ins><span class="cx">       local n=&quot;openssl&quot;;
</span><span class="cx">       local p=&quot;${n}-${v}&quot;;
</span><span class="cx"> 
</span><span class="cx">       # use 'config' instead of 'configure'; 'make' instead \
of 'jmake'. </span><span class="cx">       # also pass 'shared' to config to build \
shared libs. </span><del>-      c_dependency -c &quot;config&quot; -s \
&quot;3ff71636bea85a99f4d76a10d119c09bda0421e3&quot; \ </del><ins>+      c_dependency \
-c &quot;config&quot; -s &quot;577585f5f5d299c44dd3c993d3c0ac7a219e4949&quot; \ \
</ins><span class="cx">         -p &quot;make depend&quot; -b &quot;make&quot; \ \
</span><span class="cx">         &quot;openssl&quot; &quot;${p}&quot; \ </span><span \
class="cx">         &quot;http://www.openssl.org/source/${p}.tar.gz&quot; \
&quot;shared&quot;; </span></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/calendarserver-changes


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic