{lib,}i2pd: bumped version and removed obsolete build options

diff --git a/i2pd/distinfo b/i2pd/distinfo
index 6464e5aac4993138fb5b6ab51a516614e7483647..847c8f1aa031637883f5eba5cd1fabecbf5ff267 100644 (file)
--- a/i2pd/distinfo
+++ b/i2pd/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (i2pd/i2pd-2.23.0.tar.gz) = 62ae337bb5ca84db6223327359c817936f09af6c
-RMD160 (i2pd/i2pd-2.23.0.tar.gz) = 284b8804eba2e67e9e396a9b61bef5ef0be5a3f4
-SHA512 (i2pd/i2pd-2.23.0.tar.gz) = b547fa5b4ab3fbdf51cded846966b702304cc3dcbafbf3b4fc0e93e1907e45a649dd19eabc851309dfb7d3aa8ef84eefcb2cf1a3cda8549f90200da54df06923
-Size (i2pd/i2pd-2.23.0.tar.gz) = 1008677 bytes
+SHA1 (i2pd/i2pd-2.31.0.tar.gz) = 8a67270764ac72025f551b08c5026c6747cff358
+RMD160 (i2pd/i2pd-2.31.0.tar.gz) = ee028f21e63e1b001480a641bf863a0b5ddc930b
+SHA512 (i2pd/i2pd-2.31.0.tar.gz) = af1583c6c2fb2073d6d3d32f0b394da3f1bc4a3d232aa47880f457447c6592801c48f6a05b1a7d2955c58d888c4c574e15082bf2583921797e24e5cda4c188e0
+Size (i2pd/i2pd-2.31.0.tar.gz) = 1092238 bytes
 SHA1 (patch-CMakeLists.txt) = 515c2dd83e19154ea44b4c8c29ee39ee8bf223f6

diff --git a/libi2pd/Makefile.common b/libi2pd/Makefile.common
index c5045e008e88db63c5f765ef108e1bdbacdfbb74..f64718bf24c09134365a7a41f1ce824f4fd65024 100644 (file)
--- a/libi2pd/Makefile.common
+++ b/libi2pd/Makefile.common
@@ -3,7 +3,7 @@
 # used by wip/i2pd-git/Makefile
 
 GITHUB_PROJECT=        i2pd
-I2PD_VERSION=  2.23.0
+I2PD_VERSION=  2.31.0
 DISTNAME=      i2pd-${I2PD_VERSION}
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=PurpleI2P/}

diff --git a/libi2pd/distinfo b/libi2pd/distinfo
index ae3fc4f8bf385e7c75092680819c87ae4ba8e746..7fd4acec600752c1383551ebd781d30f57cd7727 100644 (file)
--- a/libi2pd/distinfo
+++ b/libi2pd/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (i2pd/i2pd-2.18.0.tar.gz) = 2c1e6750d874b3369ae3102ba50dad9292dedad4
-RMD160 (i2pd/i2pd-2.18.0.tar.gz) = 94a0edda2fdcd7ee0ae4d1478ba63dd35464d386
-SHA512 (i2pd/i2pd-2.18.0.tar.gz) = dc8e0f4df25188e4d72ea6ffa2c36e48a7d2103d025730b40e226ab631724a9a07a4dc03a1a3d08328972c98020c44535661820add80374f1dabdf3fc848ef84
-Size (i2pd/i2pd-2.18.0.tar.gz) = 1868440 bytes
+SHA1 (i2pd/i2pd-2.31.0.tar.gz) = 8a67270764ac72025f551b08c5026c6747cff358
+RMD160 (i2pd/i2pd-2.31.0.tar.gz) = ee028f21e63e1b001480a641bf863a0b5ddc930b
+SHA512 (i2pd/i2pd-2.31.0.tar.gz) = af1583c6c2fb2073d6d3d32f0b394da3f1bc4a3d232aa47880f457447c6592801c48f6a05b1a7d2955c58d888c4c574e15082bf2583921797e24e5cda4c188e0
+Size (i2pd/i2pd-2.31.0.tar.gz) = 1092238 bytes
 SHA1 (patch-CMakeLists.txt) = 6f7b399e83de05fc00a401bab62c0132263ecaed
 SHA1 (patch-I2PEndian.h) = 4ce5f3c4f1a0e7e7be65518299b26420cc1c3763
 SHA1 (patch-NTCPSession.cpp) = ae87892d65a0e6e088059f14c9a1c62c37feaca3

diff --git a/libi2pd/options.mk b/libi2pd/options.mk
index c5f4c68bf5ee9baad601ba4c72644cb6300bd822..fc68b843ea256d4ee25a51213ff5c4a7bd74120b 100644 (file)
--- a/libi2pd/options.mk
+++ b/libi2pd/options.mk
@@ -34,22 +34,3 @@ CMAKE_ARGS+= -DWITH_AESNI=ON
 .else
 CMAKE_ARGS+=   -DWITH_AESNI=OFF
 .endif
-
-###
-### Used when building i2lua
-###
-.if !empty(PKG_OPTIONS:Mi2lua)
-CMAKE_ARGS+=   -DWITH_I2LUA=yes
-.else
-CMAKE_ARGS+=   -DWITH_I2LUA=no
-.endif
-
-###
-### Enable websocket server
-###
-.if !empty(PKG_OPTIONS:Mwebsockets)
-CMAKE_ARGS+=   -DWITH_WEBSOCKETS=yes
-.include "../../net/websocketpp/buildlink3.mk"
-.else
-CMAKE_ARGS+=   -DWITH_WEBSOCKETS=no
-.endif