Cleanup contrib/libs/ngtcp2 import routine

Preserve original file structure and
remove excessive hacks applied during `post_install()`
thus allow further updates to be done automatically.
commit_hash:3b4e377996c12e4bc99b7bb74423f12a7e039f7b

Author: georgthegreat

contrib/libs/curl/.yandex_meta/__init__.py

@@ -83,9 +83,6 @@ def post_install(self):
 
         # add ifaddrs implementation if needed
         m.PEERDIR.add("contrib/libs/libc_compat")
-        m.PEERDIR.add("contrib/libs/openssl")
-        m.PEERDIR.add("contrib/libs/ngtcp2")
-        m.PEERDIR.add("contrib/libs/nghttp3")
 
         # make c-ares dependency conditional,
         # but leave ADDINCL in place to make CONFIGURE work

contrib/libs/curl/.yandex_meta/override.nix

@@ -29,6 +29,7 @@ in rec {
   ];
 
   configureFlags = [
+    "--build=x86_64-pc-linux-gnu"
     "--disable-manual"
     "--disable-ldap"
     "--disable-ldaps"
@@ -41,6 +42,7 @@ in rec {
     "--with-ngtcp2"
     "--without-gnutls"
     "--without-libidn2"
+    "--without-libpsl"
     "--without-librtmp"
     "--without-wolfssl"
   ];

contrib/libs/curl/lib/curl_config-linux.h

@@ -161,7 +161,7 @@
 #define HAVE_ALARM 1
 
 /* Define to 1 if you have the `arc4random' function. */
-/* #undef HAVE_ARC4RANDOM */
+#define HAVE_ARC4RANDOM 1
 
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #define HAVE_ARPA_INET_H 1

contrib/libs/curl/ya.make

@@ -1,4 +1,4 @@
-# Generated by devtools/yamaker from nixpkgs 22.11.
+# Generated by devtools/yamaker from nixpkgs 24.05.
 
 LIBRARY()
 
@@ -31,6 +31,7 @@ ADDINCL(
     GLOBAL contrib/libs/curl/include
     contrib/libs/c-ares/include
     contrib/libs/curl/lib
+    contrib/libs/ngtcp2/crypto/includes
     contrib/libs/zstd/include
 )
 

contrib/libs/ngtcp2/.yandex_meta/__init__.py

@@ -1,31 +1,20 @@
-from devtools.yamaker import fileutil
 from devtools.yamaker.project import CMakeNinjaNixProject
 
 
-def post_install(self):
-    for fname in ["quictls/quictls.c", "shared.c", "shared.h"]:
-        fileutil.copy([f"{self.srcdir}/crypto/{fname}"], f"{self.dstdir}/lib/")
-    for fname in ["quictls.c", "shared.c", "shared.h"]:
-        fileutil.rename(f"{self.dstdir}/lib/{fname}", f"ngtcp2_crypto_{fname}")
-    for fname in [
-        "crypto/includes/ngtcp2/ngtcp2_crypto.h",
-        "crypto/includes/ngtcp2/ngtcp2_crypto_quictls.h",
-        "lib/ngtcp2_macro.h",
-        "lib/ngtcp2_net.h",
-    ]:
-        fileutil.copy([f"{self.srcdir}/{fname}"], f"{self.dstdir}/lib/includes/ngtcp2/")
-    with self.yamakes["."] as m:
-        m.PEERDIR.add("contrib/libs/openssl")
-        m.SRCS.add("lib/ngtcp2_crypto_quictls.c")
-        m.SRCS.add("lib/ngtcp2_crypto_shared.c")
-
-
 ngtcp2 = CMakeNinjaNixProject(
     license="MIT",
     owners=["g:devtools-contrib", "g:yandex-io"],
     nixattr="ngtcp2",
     arcdir="contrib/libs/ngtcp2",
-    disable_includes=["openssl/core_names.h"],
+    disable_includes=[
+        "openssl/core_names.h",
+    ],
     platform_dispatchers=["config.h"],
-    post_install=post_install,
+    install_targets=[
+        "ngtcp2",
+        "ngtcp2_crypto_quictls",
+    ],
+    put_with={
+        "ngtcp2": ["ngtcp2_crypto_quictls"],
+    },
 )

contrib/libs/ngtcp2/.yandex_meta/devtools.copyrights.report

@@ -91,7 +91,6 @@ BELONGS ya.make
         Score           : 100.00
         Match type      : COPYRIGHT
     Files with this license:
-        lib/includes/ngtcp2/ngtcp2_net.h [4:4]
         lib/ngtcp2_balloc.c [4:4]
         lib/ngtcp2_balloc.h [4:4]
         lib/ngtcp2_net.h [4:4]
@@ -165,7 +164,6 @@ BELONGS ya.make
         Match type      : COPYRIGHT
     Files with this license:
         lib/includes/ngtcp2/ngtcp2.h [4:5]
-        lib/includes/ngtcp2/ngtcp2_macro.h [4:4]
         lib/ngtcp2_acktr.c [4:4]
         lib/ngtcp2_acktr.h [4:4]
         lib/ngtcp2_buf.c [4:4]
@@ -255,13 +253,13 @@ BELONGS ya.make
         Score           : 100.00
         Match type      : COPYRIGHT
     Files with this license:
-        lib/includes/ngtcp2/ngtcp2_crypto.h [4:4]
-        lib/includes/ngtcp2/ngtcp2_crypto_quictls.h [4:4]
+        crypto/includes/ngtcp2/ngtcp2_crypto.h [4:4]
+        crypto/includes/ngtcp2/ngtcp2_crypto_quictls.h [4:4]
+        crypto/quictls/quictls.c [4:4]
+        crypto/shared.c [4:4]
+        crypto/shared.h [4:4]
         lib/ngtcp2_addr.c [4:4]
         lib/ngtcp2_addr.h [4:4]
-        lib/ngtcp2_crypto_quictls.c [4:4]
-        lib/ngtcp2_crypto_shared.c [4:4]
-        lib/ngtcp2_crypto_shared.h [4:4]
         lib/ngtcp2_path.c [4:4]
         lib/ngtcp2_path.h [4:4]
         lib/ngtcp2_pv.c [4:4]

contrib/libs/ngtcp2/.yandex_meta/devtools.licenses.report

@@ -87,19 +87,20 @@ BELONGS ya.make
 
 KEEP     MIT                  a3a8f7feced3937b87cd090ba748e24b
 BELONGS ya.make
-FILE_INCLUDE AUTHORS found in files: lib/includes/ngtcp2/ngtcp2.h at line 21, lib/includes/ngtcp2/ngtcp2_crypto.h at line 20, lib/includes/ngtcp2/ngtcp2_crypto_quictls.h at line 20, lib/includes/ngtcp2/ngtcp2_macro.h at line 20, lib/includes/ngtcp2/ngtcp2_net.h at line 20, lib/includes/ngtcp2/version.h at line 20, lib/ngtcp2_acktr.c at line 20, lib/ngtcp2_acktr.h at line 20, lib/ngtcp2_addr.c at line 20, lib/ngtcp2_addr.h at line 20, lib/ngtcp2_balloc.c at line 20, lib/ngtcp2_balloc.h at line 20, lib/ngtcp2_bbr.c at line 20, lib/ngtcp2_bbr.h at line 20, lib/ngtcp2_buf.c at line 20, lib/ngtcp2_buf.h at line 20, lib/ngtcp2_cc.c at line 20, lib/ngtcp2_cc.h at line 20, lib/ngtcp2_cid.c at line 20, lib/ngtcp2_cid.h at line 20, lib/ngtcp2_conn.c at line 20, lib/ngtcp2_conn.h at line 20, lib/ngtcp2_conn_stat.h at line 20, lib/ngtcp2_conv.c at line 20, lib/ngtcp2_conv.h at line 20, lib/ngtcp2_crypto.c at line 20, lib/ngtcp2_crypto.h at line 20, lib/ngtcp2_crypto_quictls.c at line 20, lib/ngtcp2_crypto_shared.c at line 20, lib/ngtcp2_crypto_shared.h at line 20, lib/ngtcp2_err.c at line 20, lib/ngtcp2_err.h at line 20, lib/ngtcp2_frame_chain.c at line 20, lib/ngtcp2_frame_chain.h at line 20, lib/ngtcp2_gaptr.c at line 20, lib/ngtcp2_gaptr.h at line 20, lib/ngtcp2_idtr.c at line 20, lib/ngtcp2_idtr.h at line 20, lib/ngtcp2_ksl.c at line 20, lib/ngtcp2_ksl.h at line 20, lib/ngtcp2_log.c at line 20, lib/ngtcp2_log.h at line 20, lib/ngtcp2_macro.h at line 20, lib/ngtcp2_map.c at line 21, lib/ngtcp2_map.h at line 21, lib/ngtcp2_mem.c at line 21, lib/ngtcp2_mem.h at line 21, lib/ngtcp2_net.h at line 20, lib/ngtcp2_objalloc.c at line 20, lib/ngtcp2_objalloc.h at line 20, lib/ngtcp2_opl.c at line 20, lib/ngtcp2_opl.h at line 20, lib/ngtcp2_path.c at line 20, lib/ngtcp2_path.h at line 20, lib/ngtcp2_pkt.c at line 20, lib/ngtcp2_pkt.h at line 20, lib/ngtcp2_pktns_id.h at line 20, lib/ngtcp2_pmtud.c at line 20, lib/ngtcp2_pmtud.h at line 20, lib/ngtcp2_ppe.c at line 20, lib/ngtcp2_ppe.h at line 20, lib/ngtcp2_pq.c at line 21, lib/ngtcp2_pq.h at line 21, lib/ngtcp2_pv.c at line 20, lib/ngtcp2_pv.h at line 20, lib/ngtcp2_qlog.c at line 20, lib/ngtcp2_qlog.h at line 20, lib/ngtcp2_range.c at line 20, lib/ngtcp2_range.h at line 20, lib/ngtcp2_rcvry.h at line 20, lib/ngtcp2_ringbuf.c at line 20, lib/ngtcp2_ringbuf.h at line 20, lib/ngtcp2_rob.c at line 20, lib/ngtcp2_rob.h at line 20, lib/ngtcp2_rst.c at line 20, lib/ngtcp2_rst.h at line 20, lib/ngtcp2_rtb.c at line 20, lib/ngtcp2_rtb.h at line 20, lib/ngtcp2_settings.c at line 20, lib/ngtcp2_settings.h at line 20, lib/ngtcp2_str.c at line 20, lib/ngtcp2_str.h at line 20, lib/ngtcp2_strm.c at line 20, lib/ngtcp2_strm.h at line 20, lib/ngtcp2_transport_params.c at line 20, lib/ngtcp2_transport_params.h at line 20, lib/ngtcp2_tstamp.h at line 20, lib/ngtcp2_unreachable.c at line 20, lib/ngtcp2_unreachable.h at line 20, lib/ngtcp2_vec.c at line 20, lib/ngtcp2_vec.h at line 20, lib/ngtcp2_version.c at line 20, lib/ngtcp2_window_filter.c at line 20, lib/ngtcp2_window_filter.h at line 20
+FILE_INCLUDE AUTHORS found in files: crypto/includes/ngtcp2/ngtcp2_crypto.h at line 20, crypto/includes/ngtcp2/ngtcp2_crypto_quictls.h at line 20, crypto/quictls/quictls.c at line 20, crypto/shared.c at line 20, crypto/shared.h at line 20, lib/includes/ngtcp2/ngtcp2.h at line 21, lib/includes/ngtcp2/version.h at line 20, lib/ngtcp2_acktr.c at line 20, lib/ngtcp2_acktr.h at line 20, lib/ngtcp2_addr.c at line 20, lib/ngtcp2_addr.h at line 20, lib/ngtcp2_balloc.c at line 20, lib/ngtcp2_balloc.h at line 20, lib/ngtcp2_bbr.c at line 20, lib/ngtcp2_bbr.h at line 20, lib/ngtcp2_buf.c at line 20, lib/ngtcp2_buf.h at line 20, lib/ngtcp2_cc.c at line 20, lib/ngtcp2_cc.h at line 20, lib/ngtcp2_cid.c at line 20, lib/ngtcp2_cid.h at line 20, lib/ngtcp2_conn.c at line 20, lib/ngtcp2_conn.h at line 20, lib/ngtcp2_conn_stat.h at line 20, lib/ngtcp2_conv.c at line 20, lib/ngtcp2_conv.h at line 20, lib/ngtcp2_crypto.c at line 20, lib/ngtcp2_crypto.h at line 20, lib/ngtcp2_err.c at line 20, lib/ngtcp2_err.h at line 20, lib/ngtcp2_frame_chain.c at line 20, lib/ngtcp2_frame_chain.h at line 20, lib/ngtcp2_gaptr.c at line 20, lib/ngtcp2_gaptr.h at line 20, lib/ngtcp2_idtr.c at line 20, lib/ngtcp2_idtr.h at line 20, lib/ngtcp2_ksl.c at line 20, lib/ngtcp2_ksl.h at line 20, lib/ngtcp2_log.c at line 20, lib/ngtcp2_log.h at line 20, lib/ngtcp2_macro.h at line 20, lib/ngtcp2_map.c at line 21, lib/ngtcp2_map.h at line 21, lib/ngtcp2_mem.c at line 21, lib/ngtcp2_mem.h at line 21, lib/ngtcp2_net.h at line 20, lib/ngtcp2_objalloc.c at line 20, lib/ngtcp2_objalloc.h at line 20, lib/ngtcp2_opl.c at line 20, lib/ngtcp2_opl.h at line 20, lib/ngtcp2_path.c at line 20, lib/ngtcp2_path.h at line 20, lib/ngtcp2_pkt.c at line 20, lib/ngtcp2_pkt.h at line 20, lib/ngtcp2_pktns_id.h at line 20, lib/ngtcp2_pmtud.c at line 20, lib/ngtcp2_pmtud.h at line 20, lib/ngtcp2_ppe.c at line 20, lib/ngtcp2_ppe.h at line 20, lib/ngtcp2_pq.c at line 21, lib/ngtcp2_pq.h at line 21, lib/ngtcp2_pv.c at line 20, lib/ngtcp2_pv.h at line 20, lib/ngtcp2_qlog.c at line 20, lib/ngtcp2_qlog.h at line 20, lib/ngtcp2_range.c at line 20, lib/ngtcp2_range.h at line 20, lib/ngtcp2_rcvry.h at line 20, lib/ngtcp2_ringbuf.c at line 20, lib/ngtcp2_ringbuf.h at line 20, lib/ngtcp2_rob.c at line 20, lib/ngtcp2_rob.h at line 20, lib/ngtcp2_rst.c at line 20, lib/ngtcp2_rst.h at line 20, lib/ngtcp2_rtb.c at line 20, lib/ngtcp2_rtb.h at line 20, lib/ngtcp2_settings.c at line 20, lib/ngtcp2_settings.h at line 20, lib/ngtcp2_str.c at line 20, lib/ngtcp2_str.h at line 20, lib/ngtcp2_strm.c at line 20, lib/ngtcp2_strm.h at line 20, lib/ngtcp2_transport_params.c at line 20, lib/ngtcp2_transport_params.h at line 20, lib/ngtcp2_tstamp.h at line 20, lib/ngtcp2_unreachable.c at line 20, lib/ngtcp2_unreachable.h at line 20, lib/ngtcp2_vec.c at line 20, lib/ngtcp2_vec.h at line 20, lib/ngtcp2_version.c at line 20, lib/ngtcp2_window_filter.c at line 20, lib/ngtcp2_window_filter.h at line 20
     Note: matched license text is too long. Read it in the source files.
     Scancode info:
         Original SPDX id: MIT
         Score           : 100.00
         Match type      : TEXT
         Links           : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT
     Files with this license:
+        crypto/includes/ngtcp2/ngtcp2_crypto.h [6:23]
+        crypto/includes/ngtcp2/ngtcp2_crypto_quictls.h [6:23]
+        crypto/quictls/quictls.c [6:23]
+        crypto/shared.c [6:23]
+        crypto/shared.h [6:23]
         lib/includes/ngtcp2/ngtcp2.h [7:24]
-        lib/includes/ngtcp2/ngtcp2_crypto.h [6:23]
-        lib/includes/ngtcp2/ngtcp2_crypto_quictls.h [6:23]
-        lib/includes/ngtcp2/ngtcp2_macro.h [6:23]
-        lib/includes/ngtcp2/ngtcp2_net.h [6:23]
         lib/includes/ngtcp2/version.h [6:23]
         lib/ngtcp2_acktr.c [6:23]
         lib/ngtcp2_acktr.h [6:23]
@@ -122,9 +123,6 @@ FILE_INCLUDE AUTHORS found in files: lib/includes/ngtcp2/ngtcp2.h at line 21, li
         lib/ngtcp2_conv.h [6:23]
         lib/ngtcp2_crypto.c [6:23]
         lib/ngtcp2_crypto.h [6:23]
-        lib/ngtcp2_crypto_quictls.c [6:23]
-        lib/ngtcp2_crypto_shared.c [6:23]
-        lib/ngtcp2_crypto_shared.h [6:23]
         lib/ngtcp2_err.c [6:23]
         lib/ngtcp2_err.h [6:23]
         lib/ngtcp2_frame_chain.c [6:23]

contrib/libs/ngtcp2/.yandex_meta/override.nix

@@ -1,20 +1,16 @@
 pkgs: attrs: with pkgs; rec {
-    name = "ngtcp2";
-    version = "1.8.1";
+  version = "1.8.1";
 
-    nativeBuildInputs = [
-      autoreconfHook cmake pkg-config autoconf libtool automake openssl
-    ];
+  src = fetchurl {
+    url = "https://github.com/ngtcp2/ngtcp2/releases/download/v${version}/ngtcp2-${version}.tar.xz";
+    hash = "sha256-rIRKees/FT5Mzc/szt9CxXqzUruKuS7IrF00F6ec+xE=";
+  };
 
-    # without this nix tries to fetch and build quictls
-    buildInputs = [ ];
+  patches = [];
 
-    src = fetchurl {
-      url = "https://github.com/ngtcp2/ngtcp2/releases/download/v${version}/ngtcp2-${version}.tar.xz";
-      hash = "sha256-rIRKees/FT5Mzc/szt9CxXqzUruKuS7IrF00F6ec+xE=";
-    };
-
-    patches = [
-        ./001_crypto_includes.patch
-    ];
+  buildInputs = [
+    libev
+    nghttp3
+    quictls
+  ];
 }