Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f4578f2f0fd98cc6cf8ea2fe0f1bd091207317cf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f4578f2f0fd98cc6cf8ea2fe0f1bd091207317cf)
  • Date: Wed, 21 Dec 2016 20:21:12 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/i2pd/CONFIGURE | 6 +++-
net/i2pd/DETAILS | 4 +-
net/i2pd/HISTORY | 6 ++++
net/i2pd/PRE_BUILD | 2 -
net/i2pd/gcc46.patch | 69
+++++++++++++++++++++++++++++++++++++++++++-----
net/i2pd/libressl.patch | 11 -------
6 files changed, 76 insertions(+), 22 deletions(-)

New commits:
commit f4578f2f0fd98cc6cf8ea2fe0f1bd091207317cf
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

i2pd: => 2.11.0

diff --git a/net/i2pd/CONFIGURE b/net/i2pd/CONFIGURE
index 1ae3839..52611f5 100755
--- a/net/i2pd/CONFIGURE
+++ b/net/i2pd/CONFIGURE
@@ -1,3 +1,7 @@
config_query_option I2PD_OPTS "Enable MeshNet support?" n \
"USE_MESHNET=yes" \
- "USE_MESHNET=no"
+ "USE_MESHNET=no" &&
+
+config_query_option I2PD_OPTS "Enable WebSockets support?" n \
+ "WEBSOCKETS=yes" \
+ "WEBSOCKETS=no"
diff --git a/net/i2pd/DETAILS b/net/i2pd/DETAILS
index a20ba7b..e422939 100755
--- a/net/i2pd/DETAILS
+++ b/net/i2pd/DETAILS
@@ -1,8 +1,8 @@
SPELL=i2pd
- VERSION=2.10.0
+ VERSION=2.11.0
SOURCE=${SPELL}-${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/PurpleI2P/${SPELL}/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha256:614d746e4d0b13433de56eb0492a6a4aa36a5b43ab88f12429ed5bd20baa78a0:UPSTREAM_HASH
+
SOURCE_HASH=sha256:4d7946e33a6a1dd4439590ea23b494f36e6fbcb81f7b36857bf264413a19e9db:UPSTREAM_HASH
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
DOCS="docs/configuration.md docs/usage.md"
DOC_DIRS=""
diff --git a/net/i2pd/HISTORY b/net/i2pd/HISTORY
index 891f8eb..db49b97 100644
--- a/net/i2pd/HISTORY
+++ b/net/i2pd/HISTORY
@@ -1,3 +1,9 @@
+2016-12-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.11.0
+ * CONFIGURE: added WebSockets option
+ * gcc46.patch: updated
+ * libressl.patch: dropped, fixed by upstream
+
2016-10-20 Vlad Glagolev <stealth AT sourcemage.org>
* INSTALL: added forgotten /var/lib/i2pd

diff --git a/net/i2pd/PRE_BUILD b/net/i2pd/PRE_BUILD
index accc62b..f1af7bd 100755
--- a/net/i2pd/PRE_BUILD
+++ b/net/i2pd/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

-patch -p0 < "${SPELL_DIRECTORY}/libressl.patch" &&
-
if spell_ok gcc && is_version_less $(installed_version gcc) 4.7; then
patch -p0 < "${SPELL_DIRECTORY}/gcc46.patch" &&

diff --git a/net/i2pd/gcc46.patch b/net/i2pd/gcc46.patch
index d7ed689..2c3db93 100644
--- a/net/i2pd/gcc46.patch
+++ b/net/i2pd/gcc46.patch
@@ -29,11 +29,24 @@
{
m_InboundTunnels.push_back (newTunnel);
auto pool = newTunnel->GetTunnelPool ();
---- TunnelPool.cpp.orig 2016-10-17 00:37:40.000000000 -0400
-+++ TunnelPool.cpp 2016-10-19 19:59:27.000000000 -0400
-@@ -9,6 +9,12 @@
- #include "Log.h"
- #include "TunnelPool.h"
+--- TunnelPool.h.orig
++++ TunnelPool.h
+@@ -106,8 +106,8 @@ namespace tunnel
+ std::mutex m_CustomPeerSelectorMutex;
+ TunnelPeerSelector m_CustomPeerSelector;
+
+- uint64_t m_MinLatency=0; // if > 0 this tunnel pool will try
building tunnels with minimum latency by ms
+- uint64_t m_MaxLatency=0; // if > 0 this tunnel pool will try
building tunnels with maximum latency by ms
++ uint64_t m_MinLatency; // if > 0 this tunnel pool will try
building tunnels with minimum latency by ms
++ uint64_t m_MaxLatency; // if > 0 this tunnel pool will try
building tunnels with maximum latency by ms
+
+ public:
+
+--- TunnelPool.cpp.orig
++++ TunnelPool.cpp
+@@ -14,6 +14,12 @@
+ #include "Event.h"
+ #endif

+template<typename T> struct decltype_t {
+ typedef T type;
@@ -44,7 +57,16 @@
namespace i2p
{
namespace tunnel
-@@ -285,7 +291,7 @@
+@@ -22,7 +28,7 @@ namespace tunnel
+ TunnelPool::TunnelPool (int numInboundHops, int numOutboundHops, int
numInboundTunnels, int numOutboundTunnels):
+ m_NumInboundHops (numInboundHops), m_NumOutboundHops
(numOutboundHops),
+ m_NumInboundTunnels (numInboundTunnels), m_NumOutboundTunnels
(numOutboundTunnels), m_IsActive (true),
+- m_CustomPeerSelector(nullptr)
++ m_CustomPeerSelector(nullptr), m_MinLatency(0),
m_MaxLatency(0)
+ {
+ }
+
+@@ -322,7 +328,7 @@ namespace tunnel
buf += 4;
uint64_t timestamp = bufbe64toh (buf);

@@ -53,3 +75,38 @@
bool found = false;
{
std::unique_lock<std::mutex> l(m_TestsMutex);
+--- Event.h.orig
++++ Event.h
+@@ -21,11 +21,12 @@
+ class EventCore
+ {
+ public:
++ EventCore(): m_listener(nullptr) {}
+ void QueueEvent(const EventType & ev);
+ void SetListener(EventListener * l);
+
+ private:
+- EventListener * m_listener = nullptr;
++ EventListener * m_listener;
+ };
+ #ifdef WITH_EVENTS
+ extern EventCore core;
+--- Log.cpp.orig
++++ Log.cpp
+@@ -30,11 +30,11 @@
+ static const char *LogMsgColors[] = { "", "", "", "", "" };
+ #else /* UNIX */
+ static const char *LogMsgColors[] = {
+- [eLogError] = "\033[1;31m", /* red */
+- [eLogWarning] = "\033[1;33m", /* yellow */
+- [eLogInfo] = "\033[1;36m", /* cyan */
+- [eLogDebug] = "\033[1;34m", /* blue */
+- [eNumLogLevels] = "\033[0m", /* reset */
++ "\033[1;31m", /* red */
++ "\033[1;33m", /* yellow */
++ "\033[1;36m", /* cyan */
++ "\033[1;34m", /* blue */
++ "\033[0m", /* reset */
+ };
+ #endif
+
diff --git a/net/i2pd/libressl.patch b/net/i2pd/libressl.patch
deleted file mode 100644
index f01a277..0000000
--- a/net/i2pd/libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Crypto.h.orig 2016-10-17 00:37:40.000000000 -0400
-+++ Crypto.h 2016-10-19 19:52:24.209961151 -0400
-@@ -282,7 +282,7 @@
-
- // take care about openssl version
- #include <openssl/opensslv.h>
--#if (OPENSSL_VERSION_NUMBER < 0x010100000) // 1.1.0
-+#if (OPENSSL_VERSION_NUMBER < 0x010100000) ||
defined(LIBRESSL_VERSION_NUMBER)
- // define getters and setters introduced in 1.1.0
- inline int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g) { d->p =
p; d->q = q; d->g = g; return 1; }
- inline int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key) {
d->pub_key = pub_key; d->priv_key = priv_key; return 1; }



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f4578f2f0fd98cc6cf8ea2fe0f1bd091207317cf), Vlad Glagolev, 12/21/2016

Archive powered by MHonArc 2.6.24.

Top of Page