<!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>[143218] trunk/dports/devel/libcryptopp</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="https://trac.macports.org/changeset/143218">143218</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-12-07 16:42:13 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>libcryptopp: update to 5.6.3, openmaintainer</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibcryptoppPortfile">trunk/dports/devel/libcryptopp/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibcryptoppfilespatchconfighdiff">trunk/dports/devel/libcryptopp/files/patch-config.h.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevellibcryptoppfilescve20152141patch">trunk/dports/devel/libcryptopp/files/cve-2015-2141.patch</a></li>
<li><a href="#trunkdportsdevellibcryptoppfilespatchGNUmakefilediff">trunk/dports/devel/libcryptopp/files/patch-GNUmakefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevellibcryptoppPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/libcryptopp/Portfile (143217 => 143218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libcryptopp/Portfile 2015-12-07 23:57:14 UTC (rev 143217)
+++ trunk/dports/devel/libcryptopp/Portfile 2015-12-08 00:42:13 UTC (rev 143218)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name libcryptopp
</span><del>-version 5.6.2
-revision 3
</del><ins>+version 5.6.3
</ins><span class="cx"> categories devel security
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers raphael openmaintainer
</span><span class="lines">@@ -20,25 +19,28 @@
</span><span class="cx"> ${homepage}
</span><span class="cx"> distname cryptopp[strsed ${version} {g/\.//}]
</span><span class="cx">
</span><del>-checksums rmd160 b41af768b3a5ba927dac44ec554dc2095e21b1bb \
- sha256 5cbfd2fcb4a6b3aab35902e2e0f3b59d9171fee12b3fc2b363e1801dfec53574
</del><ins>+checksums rmd160 764c453eba44a95d52135966280216530ab0e35d \
+ sha256 9390670a14170dd0f48a6b6b06f74269ef4b056d4718a1a329f6f6069dc957c9
</ins><span class="cx">
</span><span class="cx"> use_zip yes
</span><span class="cx"> extract.mkdir yes
</span><span class="cx">
</span><del>-patchfiles patch-GNUmakefile.diff \
- cve-2015-2141.patch
-post-patch {
- reinplace "s|@@PREFIX@@|${prefix}|" ${worksrcpath}/GNUmakefile
-}
</del><ins>+patchfiles patch-config.h.diff
</ins><span class="cx">
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span><ins>+proc _get_cryptopp_init_priority_flag {compiler} {
+ if {[string match "macports-gcc*" $compiler]} {
+ return " -DMACPORTS_GCC_COMPILER"
+ }
+ return ""
+}
+
</ins><span class="cx"> build.type gnu
</span><span class="cx"> build.target dynamic static cryptest.exe
</span><del>-build.env-append CXXFLAGS="[get_canonical_archflags cxx]"
</del><ins>+build.env-append CXXFLAGS="[get_canonical_archflags cxx] -DNDEBUG [_get_cryptopp_init_priority_flag ${configure.compiler}]"
</ins><span class="cx"> build.args-append CXX=${configure.cxx}
</span><span class="cx">
</span><span class="cx"> test.run yes
</span></span></pre></div>
<a id="trunkdportsdevellibcryptoppfilescve20152141patch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libcryptopp/files/cve-2015-2141.patch (143217 => 143218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libcryptopp/files/cve-2015-2141.patch 2015-12-07 23:57:14 UTC (rev 143217)
+++ trunk/dports/devel/libcryptopp/files/cve-2015-2141.patch 2015-12-08 00:42:13 UTC (rev 143218)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-Upstream-Status: Backport
-Upstream-URL: https://github.com/weidai11/cryptopp/commit/9425e16437439e68c7d96abef922167d68fafaff
-Fixes: CVE-2015-2141
-
-From 9425e16437439e68c7d96abef922167d68fafaff Mon Sep 17 00:00:00 2001
-From: Jeffrey Walton <noloader@gmail.com>
-Date: Sat, 27 Jun 2015 17:56:01 -0400
-Subject: [PATCH] Fix for CVE-2015-2141. Thanks to Evgeny Sidorov for
- reporting. Squaring to satisfy Jacobi requirements suggested by JPM.
-
----
- rw.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/rw.cpp b/rw.cpp
-index cdd9f2d..0b9318b 100644
---- ./rw.cpp
-+++ ./rw.cpp
-@@ -126,10 +126,16 @@ Integer InvertibleRWFunction::CalculateInverse(RandomNumberGenerator &rng, const
- DoQuickSanityCheck();
- ModularArithmetic modn(m_n);
- Integer r, rInv;
-- do { // do this in a loop for people using small numbers for testing
-+
-+ // do this in a loop for people using small numbers for testing
-+ do {
- r.Randomize(rng, Integer::One(), m_n - Integer::One());
-+ // Fix for CVE-2015-2141. Thanks to Evgeny Sidorov for reporting.
-+ // Squaring to satisfy Jacobi requirements suggested by JPM.
-+ r = modn.Square(r);
- rInv = modn.MultiplicativeInverse(r);
- } while (rInv.IsZero());
-+
- Integer re = modn.Square(r);
- re = modn.Multiply(re, x); // blind
-
</del></span></pre></div>
<a id="trunkdportsdevellibcryptoppfilespatchGNUmakefilediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/libcryptopp/files/patch-GNUmakefile.diff (143217 => 143218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libcryptopp/files/patch-GNUmakefile.diff 2015-12-07 23:57:14 UTC (rev 143217)
+++ trunk/dports/devel/libcryptopp/files/patch-GNUmakefile.diff 2015-12-08 00:42:13 UTC (rev 143218)
</span><span class="lines">@@ -1,63 +0,0 @@
</span><del>---- GNUmakefile.orig 2015-07-02 15:54:47.000000000 +0200
-+++ GNUmakefile 2015-07-02 16:06:53.000000000 +0200
-@@ -1,7 +1,7 @@
--CXXFLAGS = -DNDEBUG -g -O2
-+CXXFLAGS += -DNDEBUG -g -O2
- # -O3 fails to link on Cygwin GCC version 4.5.3
- # -fPIC is supported. Please report any breakage of -fPIC as a bug.
--# CXXFLAGS += -fPIC
-+CXXFLAGS += -fPIC
- # the following options reduce code size, but breaks link or makes link very slow on some systems
- # CXXFLAGS += -ffunction-sections -fdata-sections
- # LDFLAGS += -Wl,--gc-sections
-@@ -36,9 +36,7 @@
- GAS219_OR_LATER = $(shell $(CXX) -xc -c /dev/null -Wa,-v -o/dev/null 2>&1 | $(EGREP) -c "GNU assembler version (2\.19|2\.[2-9]|[3-9])")
-
- ifneq ($(GCC42_OR_LATER),0)
--ifeq ($(UNAME),Darwin)
--CXXFLAGS += -arch x86_64 -arch i386
--else
-+ifneq ($(UNAME),Darwin)
- CXXFLAGS += -march=native
- endif
- endif
-@@ -139,33 +137,33 @@
-
- all: cryptest.exe
- static: libcryptopp.a
--dynamic: libcryptopp.so
-+dynamic: libcryptopp.dylib
-
- test: cryptest.exe
- ./cryptest.exe v
-
- clean:
-- -$(RM) cryptest.exe libcryptopp.a libcryptopp.so $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTI MPORTOBJS) $(DLLTESTOBJS)
-+ -$(RM) cryptest.exe libcryptopp.a libcryptopp.dylib $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTI MPORTOBJS) $(DLLTESTOBJS)
-
- install:
- $(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin
- -$(CP) *.h $(PREFIX)/include/cryptopp
- -$(CP) *.a $(PREFIX)/lib
-- -$(CP) *.so $(PREFIX)/lib
-+ -$(CP) *.dylib $(PREFIX)/lib
- -$(CP) *.exe $(PREFIX)/bin
-
- remove:
- -$(RM) -rf $(PREFIX)/include/cryptopp
- -$(RM) $(PREFIX)/lib/libcryptopp.a
-- -$(RM) $(PREFIX)/lib/libcryptopp.so
-+ -$(RM) $(PREFIX)/lib/libcryptopp.dylib
- -$(RM) $(PREFIX)/bin/cryptest.exe
-
- libcryptopp.a: $(LIBOBJS)
- $(AR) $(ARFLAGS) $@ $(LIBOBJS)
- $(RANLIB) $@
-
--libcryptopp.so: $(LIBOBJS)
-- $(CXX) -shared -o $@ $(LIBOBJS)
-+libcryptopp.dylib: $(LIBOBJS)
-+ $(CXX) -dynamiclib -install_name @@PREFIX@@/lib/$@ -o $@ $(LIBOBJS)
-
- cryptest.exe: libcryptopp.a $(TESTOBJS)
- $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS)
</del></span></pre></div>
<a id="trunkdportsdevellibcryptoppfilespatchconfighdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/libcryptopp/files/patch-config.h.diff (0 => 143218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/libcryptopp/files/patch-config.h.diff (rev 0)
+++ trunk/dports/devel/libcryptopp/files/patch-config.h.diff 2015-12-08 00:42:13 UTC (rev 143218)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- config.h.orig 2015-12-08 01:27:33.000000000 +0100
++++ config.h 2015-12-08 01:30:14.000000000 +0100
+@@ -40,7 +40,7 @@
+ // Define this to ensure C/C++ standard compliance and respect for GCC aliasing rules and other alignment fodder. If you
+ // experience a break with GCC at -O3, you should try this first. Guard it in case its set on the command line (and it differs).
+ #ifndef CRYPTOPP_NO_UNALIGNED_DATA_ACCESS
+-// # define CRYPTOPP_NO_UNALIGNED_DATA_ACCESS
++# define CRYPTOPP_NO_UNALIGNED_DATA_ACCESS
+ #endif
+
+ // ***************** Less Important Settings ***************
+@@ -95,7 +95,7 @@
+ // Under GCC, the library uses init_priority attribute in the range
+ // [CRYPTOPP_INIT_PRIORITY, CRYPTOPP_INIT_PRIORITY+100]. Under Windows,
+ // CRYPTOPP_INIT_PRIORITY enlists "#pragma init_seg(lib)".
+-// #define CRYPTOPP_INIT_PRIORITY 250
++#define CRYPTOPP_INIT_PRIORITY 250
+
+ // CRYPTOPP_USER_PRIORITY is for other libraries and user code that is using Crypto++
+ // and managing C++ static object creation. It is guaranteed not to conflict with
</ins></span></pre>
</div>
</div>
</body>
</html>