Skip to Content.
Sympa Menu

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

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 (4f43226052602f6ea3376f3dde0aa869ffbf06b8)
  • Date: Wed, 12 Apr 2017 17:02:05 +0000

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

net/i2pd/DETAILS | 5 +---
net/i2pd/HISTORY | 5 ++++
net/i2pd/INSTALL | 2 -
net/i2pd/gcc46.patch | 47
----------------------------------------------
net/i2pd/gcc46_upnp.patch | 8 +++----
5 files changed, 12 insertions(+), 55 deletions(-)

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

i2pd: => 2.13.0

diff --git a/net/i2pd/DETAILS b/net/i2pd/DETAILS
index c7dbda3..da77b87 100755
--- a/net/i2pd/DETAILS
+++ b/net/i2pd/DETAILS
@@ -1,10 +1,9 @@
SPELL=i2pd
- VERSION=2.12.0
+ VERSION=2.13.0
SOURCE=${SPELL}-${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/PurpleI2P/${SPELL}/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha256:afb763aea2a4f4b51e327352d5da82ec08e84735d28db9af7710563a117fc648:UPSTREAM_HASH
+
SOURCE_HASH=sha512:146e68559f44bcc8447857a0deb8be4a59d1b8032826af368355f9e9309b619a3575f99fed2b45071784c728a2265cb6446e816baf797b71aeffa09d1cbdd004
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- DOCS="docs/configuration.md docs/usage.md"
DOC_DIRS=""
WEB_SITE=https://github.com/PurpleI2P/i2pd
LICENSE[0]=BSD
diff --git a/net/i2pd/HISTORY b/net/i2pd/HISTORY
index 19698a2..72f3da3 100644
--- a/net/i2pd/HISTORY
+++ b/net/i2pd/HISTORY
@@ -1,3 +1,8 @@
+2017-04-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.13.0; drop docs
+ * INSTALL: updated configs' paths
+ * gcc46{,_upnp}.patch: updated
+
2017-02-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.12.0
* gcc46.patch: updated
diff --git a/net/i2pd/INSTALL b/net/i2pd/INSTALL
index 1e980db..05aa15d 100755
--- a/net/i2pd/INSTALL
+++ b/net/i2pd/INSTALL
@@ -12,7 +12,7 @@ ln -vsf "${TRACK_ROOT}/usr/share/i2pd/certificates" \
install -vm 755 -d "${INSTALL_ROOT}/etc/i2pd" &&

for cf in i2pd.conf subscriptions.txt tunnels.conf; do
- install_config_file docs/${cf} "${INSTALL_ROOT}/etc/i2pd/${cf}" &&
+ install_config_file contrib/${cf} "${INSTALL_ROOT}/etc/i2pd/${cf}" &&

ln -vsf "${TRACK_ROOT}/etc/i2pd/${cf}" "${INSTALL_ROOT}/var/lib/i2pd/${cf}"
done &&
diff --git a/net/i2pd/gcc46.patch b/net/i2pd/gcc46.patch
index fbe907d..c70eb64 100644
--- a/net/i2pd/gcc46.patch
+++ b/net/i2pd/gcc46.patch
@@ -114,50 +114,3 @@
};
#endif

---- NTCPSession.cpp.orig
-+++ NTCPSession.cpp
-@@ -167,7 +167,13 @@ namespace transport
- return;
- }
- }
--
-+#if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 7)
-+// due the bug in gcc 4.7. std::shared_future.get() is not const
-+ if (!m_DHKeysPair)
-+ m_DHKeysPair = transports.GetNextDHKeysPair
();
-+ CreateAESKey (m_Establisher->phase1.pubKey);
-+ SendPhase2 ();
-+#else
- // TODO: check for number of pending keys
- auto s = shared_from_this ();
- auto keyCreated = std::async (std::launch::async, [s]
()
-@@ -180,7 +186,8 @@ namespace transport
- {
- keyCreated.get ();
- s->SendPhase2 ();
-- });
-+ });
-+#endif
- }
- }
-
-@@ -239,6 +246,11 @@ namespace transport
- }
- else
- {
-+#if (__GNUC__ == 4) && (__GNUC_MINOR__ <= 7)
-+// due the bug in gcc 4.7. std::shared_future.get() is not const
-+ CreateAESKey (m_Establisher->phase2.pubKey);
-+ HandlePhase2 ();
-+#else
- auto s = shared_from_this ();
- // create AES key in separate thread
- auto keyCreated = std::async (std::launch::async, [s]
()
-@@ -251,6 +263,7 @@ namespace transport
- keyCreated.get (); // we might wait
if no more pending operations
- s->HandlePhase2 ();
- });
-+#endif
- }
- }
-
diff --git a/net/i2pd/gcc46_upnp.patch b/net/i2pd/gcc46_upnp.patch
index 5119a09..b9b4739 100644
--- a/net/i2pd/gcc46_upnp.patch
+++ b/net/i2pd/gcc46_upnp.patch
@@ -19,8 +19,8 @@
{
namespace transport
{
-- UPnP::UPnP () : m_IsRunning(false), m_Thread (nullptr), m_Timer
(m_Service)
-+ UPnP::UPnP () : m_IsRunning(false), m_Thread (nullptr), m_Timer
(m_Service), m_MulticastIf(0), m_Minissdpdpath(0), m_Devlist(0)
- {
- }
+- UPnP::UPnP () : m_IsRunning(false), m_Thread (nullptr), m_Timer
(m_Service)
++ UPnP::UPnP () : m_IsRunning(false), m_Thread (nullptr), m_Timer
(m_Service), m_MulticastIf(0), m_Minissdpdpath(0), m_Devlist(0)
+ {
+ }




  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4f43226052602f6ea3376f3dde0aa869ffbf06b8), Vlad Glagolev, 04/12/2017

Archive powered by MHonArc 2.6.24.

Top of Page