From db5abdd50b16b4ebb45cf12c381b6eca2515d858 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 22 Jul 2020 10:53:54 -0400
Subject: [PATCH] opendht: remove --with-http-fork
This fork is deprecated and not used anymore on proxies
Also use official repo for http-parser
Change-Id: I2dcccb5616171ce20de17e805e77d72a8ebd167d
---
contrib/src/http_parser/SHA512SUMS | 2 +-
.../{http_parser-vs.patch => http-parser-vs.patch} | 0
contrib/src/http_parser/package.json | 6 +++---
contrib/src/http_parser/rules.mak | 10 +++++-----
contrib/src/opendht/rules.mak | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
rename contrib/src/http_parser/{http_parser-vs.patch => http-parser-vs.patch} (100%)
diff --git a/contrib/src/http_parser/SHA512SUMS b/contrib/src/http_parser/SHA512SUMS
index f0a06387d2..43bd43697c 100644
--- a/contrib/src/http_parser/SHA512SUMS
+++ b/contrib/src/http_parser/SHA512SUMS
@@ -1 +1 @@
-cbbeb606229488d0136b131e2270c361eeb1663fc302b5206822a4c48b7b398c04457f88d9f61528b565c318a8df526d44293df442c862b486fe3a0f45e45219 http_parser-2.9.3.tar.gz
+b45df7b94d1c51079d44687d0a7f901f44faae51df4e84c7e3fe38f130c2d809d0e7c2a146c57b3723e60732aededc246bf44eadb10a95b710963d641f9fe7cd http-parser-2.9.4.tar.gz
diff --git a/contrib/src/http_parser/http_parser-vs.patch b/contrib/src/http_parser/http-parser-vs.patch
similarity index 100%
rename from contrib/src/http_parser/http_parser-vs.patch
rename to contrib/src/http_parser/http-parser-vs.patch
diff --git a/contrib/src/http_parser/package.json b/contrib/src/http_parser/package.json
index 17491af1a7..0ae1dc3fee 100644
--- a/contrib/src/http_parser/package.json
+++ b/contrib/src/http_parser/package.json
@@ -1,10 +1,10 @@
{
"name": "http_parser",
- "version": "2.9.3",
- "url": "https://github.com/binarytrails/http_parser/archive/v__VERSION__.tar.gz",
+ "version": "2.9.4",
+ "url": "https://github.com/nodejs/http-parser/archive/v__VERSION__.tar.gz",
"deps": [],
"patches": [],
- "win_patches": ["http_parser-vs.patch"],
+ "win_patches": ["http-parser-vs.patch"],
"project_paths": ["http-parser.vcxproj"],
"with_env" : "",
"custom_scripts": {
diff --git a/contrib/src/http_parser/rules.mak b/contrib/src/http_parser/rules.mak
index a7f047ebfe..3d3fbf40ed 100644
--- a/contrib/src/http_parser/rules.mak
+++ b/contrib/src/http_parser/rules.mak
@@ -1,6 +1,6 @@
# HTTP_PARSER
-HTTP_PARSER_VERSION := 2.9.3
-HTTP_PARSER_URL := https://github.com/binarytrails/http_parser/archive/v$(HTTP_PARSER_VERSION).tar.gz
+HTTP_PARSER_VERSION := 2.9.4
+HTTP_PARSER_URL := https://github.com/nodejs/http-parser/archive/v$(HTTP_PARSER_VERSION).tar.gz
PKGS += http_parser
ifeq ($(call need_pkg,'http_parser'),)
@@ -9,12 +9,12 @@ endif
HTTP_PARSER_MAKECONF := PREFIX=$(PREFIX)
-$(TARBALLS)/http_parser-$(HTTP_PARSER_VERSION).tar.gz:
+$(TARBALLS)/http-parser-$(HTTP_PARSER_VERSION).tar.gz:
$(call download,$(HTTP_PARSER_URL))
-.sum-http_parser: http_parser-$(HTTP_PARSER_VERSION).tar.gz
+.sum-http_parser: http-parser-$(HTTP_PARSER_VERSION).tar.gz
-http_parser: http_parser-$(HTTP_PARSER_VERSION).tar.gz
+http_parser: http-parser-$(HTTP_PARSER_VERSION).tar.gz
$(UNPACK)
$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR)
$(MOVE)
diff --git a/contrib/src/opendht/rules.mak b/contrib/src/opendht/rules.mak
index d3e8d91000..57c02e01b5 100644
--- a/contrib/src/opendht/rules.mak
+++ b/contrib/src/opendht/rules.mak
@@ -42,6 +42,6 @@ opendht: opendht-$(OPENDHT_VERSION).tar.gz
.opendht: opendht .sum-opendht
mkdir -p $</m4 && $(RECONF)
- cd $< && $(HOSTVARS) $(OPENDHT_CONF) ./configure --enable-static --disable-shared --disable-tools --disable-indexation --disable-python --disable-doc --enable-proxy-server --enable-proxy-client --with-http-parser-fork --enable-push-notifications $(HOSTCONF)
+ cd $< && $(HOSTVARS) $(OPENDHT_CONF) ./configure --enable-static --disable-shared --disable-tools --disable-indexation --disable-python --disable-doc --enable-proxy-server --enable-proxy-client --enable-push-notifications $(HOSTCONF)
cd $< && $(MAKE) install
touch $@
--
GitLab