From 72c8977b3b4b3b8c905bd53db7557cf6bc8963db Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 19 May 2023 21:14:13 +0800 Subject: [PATCH] ipfs-http-client: remove package This package lacks proper maintenance in both upstream and here. Signed-off-by: Tianling Shen --- libs/ipfs-http-client/Makefile | 81 ------ .../patches/001-add-srv-addr.patch | 251 ------------------ 2 files changed, 332 deletions(-) delete mode 100644 libs/ipfs-http-client/Makefile delete mode 100644 libs/ipfs-http-client/patches/001-add-srv-addr.patch diff --git a/libs/ipfs-http-client/Makefile b/libs/ipfs-http-client/Makefile deleted file mode 100644 index 6a853eb6e..000000000 --- a/libs/ipfs-http-client/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# -# This is free software, licensed under the GNU General Public License v2. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ipfs-http-client -PKG_RELEASE:=2 - -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/vasild/cpp-ipfs-http-client.git -PKG_SOURCE_DATE:=2021-03-01 -PKG_SOURCE_VERSION:=27f6439303f7afb5b8b2e4154f4269ba296059c7 -PKG_MIRROR_HASH:=61814d666bbd927750a0af7d350ad8ba27c2a78e0b5f5196ec4e0b5049ef2690 - -PKG_MAINTAINER:=Leonid Esman -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE.MIT - -PKG_BUILD_DEPENDS:=nlohmannjson - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/ipfs-http-client/Default/description - IPFS (the InterPlanetary File System) is the Distributed Web. - Specs, docs, sources, links: https://ipfs.io/ and https://github.com/ipfs. - This is Vasil Dimov's C++ IPFS HTTP API client library. -endef - -define Package/libipfs-http-client - SECTION:=libs - CATEGORY:=Libraries - TITLE:=IPFS client library - URL:=https://github.com/vasild/cpp-ipfs-http-client - DEPENDS:= +libcurl +libstdcpp +libatomic -endef - -define Package/libipfs-http-client/description - $(call Package/ipfs-http-client/Default/description) - This package contains shared library. -endef - -define Package/ipfs-http-client-tests - SECTION:=utils - CATEGORY:=Utilities - TITLE:=IPFS client library tests - URL:=https://github.com/vasild/cpp-ipfs-http-client - DEPENDS:=+libipfs-http-client +libcurl -endef - -define Package/ipfs-http-client-tests/description - $(call Package/ipfs-http-client/Default/description) - This package contains library tests. -endef - -CMAKE_OPTIONS += \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_TESTING=ON - -define Package/libipfs-http-client/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipfs-http-client.so* $(1)/usr/lib -endef - -define Package/ipfs-http-client-tests/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_block $(1)/usr/bin/ipfs-block - $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_config $(1)/usr/bin/ipfs-config - $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_dht $(1)/usr/bin/ipfs-dht - $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_files $(1)/usr/bin/ipfs-files - $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_generic $(1)/usr/bin/ipfs-generic - $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_key $(1)/usr/bin/ipfs-key - $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_name $(1)/usr/bin/ipfs-name - $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_object $(1)/usr/bin/ipfs-object - $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_pin $(1)/usr/bin/ipfs-pin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_swarm $(1)/usr/bin/ipfs-swarm -endef - -$(eval $(call BuildPackage,libipfs-http-client)) -$(eval $(call BuildPackage,ipfs-http-client-tests)) diff --git a/libs/ipfs-http-client/patches/001-add-srv-addr.patch b/libs/ipfs-http-client/patches/001-add-srv-addr.patch deleted file mode 100644 index d2fe784ca..000000000 --- a/libs/ipfs-http-client/patches/001-add-srv-addr.patch +++ /dev/null @@ -1,251 +0,0 @@ ---- a/test/test_block.cc -+++ b/test/test_block.cc -@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE - #include - #include - --int main(int, char**) { -+int main(int argc, char** argv) { -+ char addr127001[]="127.0.0.1"; -+ char *srvaddr; -+ if (argc<2) -+ srvaddr=addr127001; -+ else -+ srvaddr=argv[1]; -+ - try { -- ipfs::Client client("localhost", 5001); -+ ipfs::Client client(srvaddr, 5001); - - /** [ipfs::Client::BlockPut] */ - ipfs::Json block; ---- a/test/test_config.cc -+++ b/test/test_config.cc -@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE - #include - #include - --int main(int, char**) { -+int main(int argc, char** argv) { -+ char addr127001[]="127.0.0.1"; -+ char *srvaddr; -+ if (argc<2) -+ srvaddr=addr127001; -+ else -+ srvaddr=argv[1]; -+ - try { -- ipfs::Client client("localhost", 5001); -+ ipfs::Client client(srvaddr, 5001); - - /** [ipfs::Client::ConfigSet] */ - client.ConfigSet("Datastore.StorageMax", "20GB"); ---- a/test/test_dht.cc -+++ b/test/test_dht.cc -@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE - #include - #include - --int main(int, char**) { -+int main(int argc, char** argv) { -+ char addr127001[]="127.0.0.1"; -+ char *srvaddr; -+ if (argc<2) -+ srvaddr=addr127001; -+ else -+ srvaddr=argv[1]; -+ - try { -- ipfs::Client client("localhost", 5001); -+ ipfs::Client client(srvaddr, 5001); - - ipfs::Json add_result; - client.FilesAdd( ---- a/test/test_error.cc -+++ b/test/test_error.cc -@@ -35,16 +35,23 @@ extern std::string replace_body; - } - } // namespace ipfs - --int main(int, char**) { -+int main(int argc, char** argv) { -+ char addr127001[]="127.0.0.1"; -+ char *srvaddr; -+ if (argc<2) -+ srvaddr=addr127001; -+ else -+ srvaddr=argv[1]; -+ - try { -- ipfs::Client client_cant_connect("localhost", 57); -+ ipfs::Client client_cant_connect(srvaddr, 57); - - ipfs::test::must_fail("client.Version()", [&client_cant_connect]() { - ipfs::Json version; - client_cant_connect.Version(&version); - }); - -- ipfs::Client client("localhost", 5001); -+ ipfs::Client client(srvaddr, 5001); - - std::string object_id; - client.ObjectNew(&object_id); ---- a/test/test_files.cc -+++ b/test/test_files.cc -@@ -24,10 +24,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE - #include - #include - --int main(int, char**) { -+int main(int argc, char** argv) { -+ char addr127001[]="127.0.0.1"; -+ char *srvaddr; -+ if (argc<2) -+ srvaddr=addr127001; -+ else -+ srvaddr=argv[1]; -+ - try { - // Try Files API tests with time-out setting of 20 seconds -- ipfs::Client client("localhost", 5001, "20s"); -+ ipfs::Client client(srvaddr, 5001, "20s"); - - /** [ipfs::Client::FilesGet] */ - std::stringstream contents; ---- a/test/test_generic.cc -+++ b/test/test_generic.cc -@@ -24,11 +24,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE - #include - #include - --int main(int, char**) { -+int main(int argc, char** argv) { -+ char addr127001[]="127.0.0.1"; -+ char *srvaddr; -+ if (argc<2) -+ srvaddr=addr127001; -+ else -+ srvaddr=argv[1]; -+ - try { - // Test client constructor - /** [ipfs::Client::Client] */ -- ipfs::Client client("localhost", 5001); -+ ipfs::Client client(srvaddr, 5001); - /** [ipfs::Client::Client] */ - - // Test client constructor with additional parameters -@@ -38,7 +45,7 @@ int main(int, char**) { - ipfs::Client clientA(client); - clientA = client; - ipfs::Client clientB(std::move(clientA)); -- ipfs::Client clientC("localhost", 5001); -+ ipfs::Client clientC(srvaddr, 5001); - clientC = std::move(clientB); - - #pragma GCC diagnostic push ---- a/test/test_key.cc -+++ b/test/test_key.cc -@@ -26,9 +26,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE - - using Json = nlohmann::json; - --int main(int, char**) { -+int main(int argc, char** argv) { -+ char addr127001[]="127.0.0.1"; -+ char *srvaddr; -+ if (argc<2) -+ srvaddr=addr127001; -+ else -+ srvaddr=argv[1]; -+ - try { -- ipfs::Client client("localhost", 5001); -+ ipfs::Client client(srvaddr, 5001); - - /** [ipfs::Client::KeyGen] */ - std::string key_id; ---- a/test/test_name.cc -+++ b/test/test_name.cc -@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE - #include - #include - --int main(int, char**) { -+int main(int argc, char** argv) { -+ char addr127001[]="127.0.0.1"; -+ char *srvaddr; -+ if (argc<2) -+ srvaddr=addr127001; -+ else -+ srvaddr=argv[1]; -+ - try { -- ipfs::Client client("localhost", 5001); -+ ipfs::Client client(srvaddr, 5001); - - // We need a key here, so as not to clobber the "self" key. - std::string key_id; ---- a/test/test_object.cc -+++ b/test/test_object.cc -@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE - #include - #include - --int main(int, char**) { -+int main(int argc, char** argv) { -+ char addr127001[]="127.0.0.1"; -+ char *srvaddr; -+ if (argc<2) -+ srvaddr=addr127001; -+ else -+ srvaddr=argv[1]; -+ - try { -- ipfs::Client client("localhost", 5001); -+ ipfs::Client client(srvaddr, 5001); - - /** [ipfs::Client::ObjectNew] */ - std::string object_id; ---- a/test/test_pin.cc -+++ b/test/test_pin.cc -@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE - #include - #include - --int main(int, char**) { -+int main(int argc, char** argv) { -+ char addr127001[]="127.0.0.1"; -+ char *srvaddr; -+ if (argc<2) -+ srvaddr=addr127001; -+ else -+ srvaddr=argv[1]; -+ - try { -- ipfs::Client client("localhost", 5001); -+ ipfs::Client client(srvaddr, 5001); - - std::string object_id; - ---- a/test/test_swarm.cc -+++ b/test/test_swarm.cc -@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE - #include - #include - --int main(int, char**) { -+int main(int argc, char** argv) { -+ char addr127001[]="127.0.0.1"; -+ char *srvaddr; -+ if (argc<2) -+ srvaddr=addr127001; -+ else -+ srvaddr=argv[1]; -+ - try { -- ipfs::Client client("localhost", 5001); -+ ipfs::Client client(srvaddr, 5001); - - /** [ipfs::Client::SwarmAddrs] */ - ipfs::Json addresses;