From nobody Wed Sep 18 06:19:05 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X7pQ15SPZz5W05B; Wed, 18 Sep 2024 06:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X7pQ13y0Vz4FXV; Wed, 18 Sep 2024 06:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726640345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BP3HTADKsfttdaXdrSSEiu3o353otV7Mm1OaPy/5ok4=; b=xYPLUz6yiH/no3/mJ1f2nTrMLre/BF77C1F/B0z8LP0W/3u65UdeElhkepXssPZ8Zckwy3 OPpncTJjE6muauIkydcOeHa1tOGv+JOCwBHsTtT10vywf8F8s2anLEIf0yh22oZO8wdv7W RI3sv25Sahdli3SsOA6F/eGc+BwTlCf5KsePVOa4tTlYztMJiKXeJDzbqMNbPFkeZ9zX+3 8OoM2VDX6FbdQMoEJqHd+PKPOPjazNk9ahJTN9SA5Gp3w5Z83JBo0OBkTjRct7vOZWh3pM rfx2ZQrYxTCDN/maQcwKFX3nkk6YMiAepy9vmphdTjydurN2wnFX/4NY81FFgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726640345; a=rsa-sha256; cv=none; b=gJJ9tEPa4/893DxxtpwA6hR/vaG55EKm9hBaXRq5rjnhr0i2IcQEw/iQAhajfI4BeeyNdn hoWf6cmojiPg30LK5n0cRQxgpsh44USebu/LDC3fA6jov4YSAVWG7ihQSyRPPgvi73vUUo A+D52X6Jj2zcRmZzN3dcXTD9kMQLL1b6WLIyTwbQyO+r5W4081BgObl+Q2shTpEnmXotkw UEMRsjHtyEE5fwp+EMOLY7yr49SDrk5YNTRMSrQkskjI7B3p232Ffulh99kG8AkrlAF8j8 g0x1LYeZA50v/DhGoVhSTBKGlbibrpEyub2vvso+aZdFnA4mOwEbrvVvjMcPyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726640345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BP3HTADKsfttdaXdrSSEiu3o353otV7Mm1OaPy/5ok4=; b=b8fnQK63WxBi82j2HWj4P8Jxw+Y0gP8CONQ+DAKk42dteVMA7hyZ7yxMiE3elHPdNUBjzt ila+PagX3jSHO3KFlAiBkmNOBQjvfPvrZhJoKl+o8XpvQn6k/CqScAmB3mGMVLHBtriR7K TQj8uUT+GP1WiV9UBjVZdCno/evXknRLhIfNF2/+Hdj5r44CmxOIfAy6LuZDI9EUJSBsbG TumIDpoBpoDn5mgeQtMqIWHAcHiWlXrr28QmYJomappjfrtpIrmBY0SFeQ3VT1j3bhwhNm 3uYysxBCVzcqJ5SHcw9hHoE4hAJ01dmkJhZmIjyAXCh6DB5caVE0GNRXFTr74Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X7pQ12YKBz19Z1; Wed, 18 Sep 2024 06:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48I6J5CX032690; Wed, 18 Sep 2024 06:19:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48I6J514032687; Wed, 18 Sep 2024 06:19:05 GMT (envelope-from git) Date: Wed, 18 Sep 2024 06:19:05 GMT Message-Id: <202409180619.48I6J514032687@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: a45b8911bcec - main - www/ls-qpack: Update to 2.5.5 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a45b8911bcec42593e8fbe32752e9ec25369e930 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=a45b8911bcec42593e8fbe32752e9ec25369e930 commit a45b8911bcec42593e8fbe32752e9ec25369e930 Author: Po-Chuan Hsieh AuthorDate: 2024-09-18 05:56:08 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-09-18 06:13:09 +0000 www/ls-qpack: Update to 2.5.5 Changes: https://github.com/litespeedtech/ls-qpack/releases --- www/ls-qpack/Makefile | 19 ++++++------------- www/ls-qpack/distinfo | 6 +++--- www/ls-qpack/files/patch-CMakeLists.txt | 16 ---------------- www/ls-qpack/files/patch-bin-CMakeLists.txt | 12 ------------ www/ls-qpack/files/patch-bin-interop-decode.c | 11 ----------- www/ls-qpack/pkg-plist | 6 +++++- 6 files changed, 14 insertions(+), 56 deletions(-) diff --git a/www/ls-qpack/Makefile b/www/ls-qpack/Makefile index ec0399f47296..ea908919f94b 100644 --- a/www/ls-qpack/Makefile +++ b/www/ls-qpack/Makefile @@ -1,5 +1,5 @@ PORTNAME= ls-qpack -PORTVERSION= 2.5.4 +PORTVERSION= 2.5.5 DISTVERSIONPREFIX= v CATEGORIES= www @@ -12,10 +12,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libxxhash.so:devel/xxhash -USES= cmake compiler:c11 +USES= cmake compiler:c11 pathfix pkgconfig -CMAKE_OFF= LSQPACK_TESTS -CMAKE_ON= BUILD_SHARED_LIBS LSQPACK_BIN LSQPACK_XXH +CMAKE_OFF= LSQPACK_TESTS LSQPACK_XXH +CMAKE_ON= BUILD_SHARED_LIBS LSQPACK_BIN GH_ACCOUNT= litespeedtech USE_GITHUB= yes @@ -24,14 +24,7 @@ post-patch: # Clean up bundled libraries @${RM} -r ${WRKSRC}/deps/ -do-install: - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/encode-int ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/fuzz-decode ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/interop-decode ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/interop-encode ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/huff-tables.h ${STAGEDIR}${PREFIX}/include/ - ${INSTALL_DATA} ${WRKSRC}/lsqpack.h ${STAGEDIR}${PREFIX}/include/ - ${INSTALL_DATA} ${WRKSRC}/lsxpack_header.h ${STAGEDIR}${PREFIX}/include/ - ${INSTALL_LIB} ${INSTALL_WRKSRC}/libls-qpack.so ${STAGEDIR}${PREFIX}/lib/ +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* .include diff --git a/www/ls-qpack/distinfo b/www/ls-qpack/distinfo index c1f93052c0ec..8853f2544ac9 100644 --- a/www/ls-qpack/distinfo +++ b/www/ls-qpack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1703227824 -SHA256 (litespeedtech-ls-qpack-v2.5.4_GH0.tar.gz) = 56b96190a1943d75ef8d384b13cd4592a72e3e2d84284f78d7f8adabbc717f3e -SIZE (litespeedtech-ls-qpack-v2.5.4_GH0.tar.gz) = 708563 +TIMESTAMP = 1726487326 +SHA256 (litespeedtech-ls-qpack-v2.5.5_GH0.tar.gz) = 71c95067e99bb5e889119bd6208fe2b03a0b9b8f386ef5f3bbcb9e3765bcf0cb +SIZE (litespeedtech-ls-qpack-v2.5.5_GH0.tar.gz) = 709160 diff --git a/www/ls-qpack/files/patch-CMakeLists.txt b/www/ls-qpack/files/patch-CMakeLists.txt deleted file mode 100644 index 709abdba2ba1..000000000000 --- a/www/ls-qpack/files/patch-CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ ---- CMakeLists.txt.orig 2020-05-28 18:23:09 UTC -+++ CMakeLists.txt -@@ -20,9 +20,11 @@ add_library(ls-qpack "") - target_include_directories(ls-qpack PUBLIC .) - target_sources(ls-qpack PRIVATE lsqpack.c) - --target_include_directories(ls-qpack PRIVATE deps/xxhash/) - if(LSQPACK_XXH) -- target_sources(ls-qpack PRIVATE deps/xxhash/xxhash.c) -+ find_path(XXHASH_INCLUDE_DIR xxhash.h) -+ find_library(XXHASH_LIBRARY xxhash) -+ include_directories(${XXHASH_INCLUDE_DIR}) -+ link_libraries(${XXHASH_LIBRARY}) - endif() - - if(MSVC) diff --git a/www/ls-qpack/files/patch-bin-CMakeLists.txt b/www/ls-qpack/files/patch-bin-CMakeLists.txt deleted file mode 100644 index 552f48834ceb..000000000000 --- a/www/ls-qpack/files/patch-bin-CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- bin/CMakeLists.txt.orig 2020-05-28 18:23:09 UTC -+++ bin/CMakeLists.txt -@@ -2,8 +2,7 @@ function(lsqpack_add_executable TARGET) - add_executable(${TARGET} "") - target_link_libraries(${TARGET} PRIVATE ls-qpack) - -- target_sources(${TARGET} PRIVATE ${TARGET}.c ../deps/xxhash/xxhash.c) -- target_include_directories(${TARGET} PRIVATE ../deps/xxhash) -+ target_sources(${TARGET} PRIVATE ${TARGET}.c) - - if(MSVC) - target_include_directories(${TARGET} PRIVATE ../wincompat) diff --git a/www/ls-qpack/files/patch-bin-interop-decode.c b/www/ls-qpack/files/patch-bin-interop-decode.c deleted file mode 100644 index 58e3379c6b95..000000000000 --- a/www/ls-qpack/files/patch-bin-interop-decode.c +++ /dev/null @@ -1,11 +0,0 @@ ---- bin/interop-decode.c.orig 2020-05-28 18:23:09 UTC -+++ bin/interop-decode.c -@@ -41,7 +41,7 @@ - - #include "lsqpack.h" - #include "lsxpack_header.h" --#include "xxhash.h" -+#include - #ifndef DEBUG - #include "lsqpack-test.h" - #endif diff --git a/www/ls-qpack/pkg-plist b/www/ls-qpack/pkg-plist index 4e2554ae262d..e5d7cbb6de66 100644 --- a/www/ls-qpack/pkg-plist +++ b/www/ls-qpack/pkg-plist @@ -2,7 +2,11 @@ bin/encode-int bin/fuzz-decode bin/interop-decode bin/interop-encode -include/huff-tables.h include/lsqpack.h include/lsxpack_header.h +lib/cmake/ls-qpack/ls-qpack-config-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ls-qpack/ls-qpack-config.cmake lib/libls-qpack.so +lib/libls-qpack.so.2 +lib/libls-qpack.so.2.5.3 +libdata/pkgconfig/lsqpack.pc