Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (bee24b938198154546488945a7e134d2b1ce944b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (bee24b938198154546488945a7e134d2b1ce944b)
  • Date: Sun, 14 Nov 2021 01:03:29 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

ftp/curl/DEPENDS | 9 +++++++++
ftp/curl/HISTORY | 3 +++
http/ngtcp2/BUILD | 11 +++++++++++
http/ngtcp2/DEPENDS | 3 +++
http/ngtcp2/DETAILS | 5 +++++
http/ngtcp2/HISTORY | 4 ++++
http/ngtcp2/INSTALL | 7 +++++++
http/ngtcp2/PREPARE | 4 +++-
http/ngtcp2/PRE_BUILD | 6 ++++++
http/ngtcp2/PRE_SUB_DEPENDS | 5 +++++
http/ngtcp2/REPAIR^none^PRE_SUB_DEPENDS | 5 +++++
http/ngtcp2/SUB_DEPENDS | 5 +++++
12 files changed, 66 insertions(+), 1 deletion(-)

New commits:
commit bee24b938198154546488945a7e134d2b1ce944b
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

ftp/curl; added HTTP/3 support via nghttp3 & ngtcp2

commit 1248909719d7ff920c498b15fc3fe26cfb4b3fb8
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

http/ngtcp2: added option to build with quic enabled openssl

diff --git a/ftp/curl/DEPENDS b/ftp/curl/DEPENDS
index d8f56ad..291a0c5 100755
--- a/ftp/curl/DEPENDS
+++ b/ftp/curl/DEPENDS
@@ -75,6 +75,15 @@ optional_depends nghttp2 \
"--without-nghttp2" \
"for HTTP/2 support" &&

+optional_depends nghttp3 \
+ "--with-nghttp3" \
+ "--without-nghttp3" \
+ "for HTTP/3 support" &&
+
+if is_depends_enabled ${SPELL} nghttp3; then
+ depends -sub WITHSSL ngtcp2
+fi &&
+
if spell_ok brotli; then
optional_depends brotli \
"--with-brotli" \
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 34c2887..0175624 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,6 @@
+2021-11-13 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: added optional depends on nghttp3 & ngtcp2
+
2021-11-10 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 7.80.0

diff --git a/http/ngtcp2/BUILD b/http/ngtcp2/BUILD
new file mode 100755
index 0000000..2e56e2d
--- /dev/null
+++ b/http/ngtcp2/BUILD
@@ -0,0 +1,11 @@
+if [[ "${NGTCP2_WITHSSL}" == "y" ]]; then
+ cd "${SOURCE_DIRECTORY}/openssl" &&
+ ./config enable-tls1_3 no-shared
--prefix="${SOURCE_DIRECTORY}/openssl/build" &&
+ make -j${MAKE_NJOBS:-1} &&
+ make -j${MAKE_NJOBS:-1} install_sw &&
+ OPTS+=" --with-openssl" &&
+ export OPENSSL_CFLAGS="-I${SOURCE_DIRECTORY}/openssl/build/include" &&
+ export OPENSSL_LIBS="-pthread -Wl,--whole-archive -ldl -lpthread -lrt
${SOURCE_DIRECTORY}/openssl/build/lib/libssl.a
${SOURCE_DIRECTORY}/openssl/build/lib/libcrypto.a -Wl,--no-whole-archive" &&
+ cd "${SOURCE_DIRECTORY}"
+fi &&
+default_build
diff --git a/http/ngtcp2/DEPENDS b/http/ngtcp2/DEPENDS
index ad25b70..674300f 100755
--- a/http/ngtcp2/DEPENDS
+++ b/http/ngtcp2/DEPENDS
@@ -3,6 +3,9 @@ depends automake &&
depends git &&
depends pkgconfig &&
depends libtool &&
+if [[ "${NGTCP2_WITHSSL}" == "y" ]]; then
+ depends perl
+fi &&

optional_depends gnutls \
"--with-gnutls" \
diff --git a/http/ngtcp2/DETAILS b/http/ngtcp2/DETAILS
index c598d9a..5fa7179 100755
--- a/http/ngtcp2/DETAILS
+++ b/http/ngtcp2/DETAILS
@@ -6,6 +6,11 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
SOURCE_URL="git://github.com/${SPELL}/${SPELL}:${SPELL}-git:main"
SOURCE_IGNORE="volatile"
FORCE_DOWNLOAD="on"
+if [[ "${NGTCP2_WITHSSL}" == "y" ]]; then
+ SOURCE2="${SPELL}-openssl-git.tar.xz"
+
SOURCE2_URL="git://github.com/quictls/openssl:${SPELL}-openssl-git:OpenSSL_1_1_1l+quic"
+ SOURCE2_IGNORE="volatile"
+fi
WEB_SITE="https://github.com/ngtcp2/ngtcp2";
LICENSE[0]="MIT"
ENTERED="20211107"
diff --git a/http/ngtcp2/HISTORY b/http/ngtcp2/HISTORY
index b53c9cd..293fb6b 100644
--- a/http/ngtcp2/HISTORY
+++ b/http/ngtcp2/HISTORY
@@ -1,3 +1,7 @@
+2021-11-13 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD, PREPARE, *SUB_DEPENDS:
added
+ option to build with custom openssl with QUIC support
+
2021-11-07 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS, DETAILS, PRE_BUILD, PREPARE: created

diff --git a/http/ngtcp2/INSTALL b/http/ngtcp2/INSTALL
new file mode 100755
index 0000000..cff56d3
--- /dev/null
+++ b/http/ngtcp2/INSTALL
@@ -0,0 +1,7 @@
+default_install &&
+
+if [[ "${NGTCP2_WITHSSL}" == "y" ]]; then
+ mkdir -p "${INSTALL_ROOT}/usr/include/${SPELL}" &&
+ cp -a "${SOURCE_DIRECTORY}/openssl/build/include/openssl" \
+ "${INSTALL_ROOT}/usr/include/${SPELL}"
+fi
diff --git a/http/ngtcp2/PREPARE b/http/ngtcp2/PREPARE
index f8b7d7e..32b4316 100755
--- a/http/ngtcp2/PREPARE
+++ b/http/ngtcp2/PREPARE
@@ -1,2 +1,4 @@
. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch
+prepare_select_branch &&
+
+config_query NGTCP2_WITHSSL "Enable SSL crypto backend?" n
diff --git a/http/ngtcp2/PRE_BUILD b/http/ngtcp2/PRE_BUILD
index dcf04f5..556c77e 100755
--- a/http/ngtcp2/PRE_BUILD
+++ b/http/ngtcp2/PRE_BUILD
@@ -1,4 +1,10 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

+if [[ "${NGTCP2_WITHSSL}" == "y" ]]; then
+ unpack_file '2' &&
+ mv ${SPELL}-openssl-git openssl &&
+ sed "/Cflags/s;$; -I\$\{includedir\}/${SPELL};" \
+ -i crypto/openssl/libngtcp2_crypto_openssl.pc.in
+fi &&
autoreconf -i
diff --git a/http/ngtcp2/PRE_SUB_DEPENDS b/http/ngtcp2/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..020ceb3
--- /dev/null
+++ b/http/ngtcp2/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case ${THIS_SUB_DEPENDS} in
+WITHSSL) [[ "${NGTCP2_WITHSSL}" = "y" ]] ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: ${SPELL}
${THIS_SUB_DEPENDS}${DEFAULT_COLOR}"
+ return 1 ;;
+esac
diff --git a/http/ngtcp2/REPAIR^none^PRE_SUB_DEPENDS
b/http/ngtcp2/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..020ceb3
--- /dev/null
+++ b/http/ngtcp2/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case ${THIS_SUB_DEPENDS} in
+WITHSSL) [[ "${NGTCP2_WITHSSL}" = "y" ]] ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: ${SPELL}
${THIS_SUB_DEPENDS}${DEFAULT_COLOR}"
+ return 1 ;;
+esac
diff --git a/http/ngtcp2/SUB_DEPENDS b/http/ngtcp2/SUB_DEPENDS
new file mode 100755
index 0000000..bfeb31e
--- /dev/null
+++ b/http/ngtcp2/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case ${THIS_SUB_DEPENDS} in
+WITHSSL) NGTCP2_WITHSSL="y" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: ${SPELL}
${THIS_SUB_DEPENDS}${DEFAULT_COLOR}"
+ return 1 ;;
+esac



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (bee24b938198154546488945a7e134d2b1ce944b), Pavel Vinogradov, 11/13/2021

Archive powered by MHonArc 2.6.24.

Top of Page