From nobody Sun Mar 12 12:21:41 2023 X-Original-To: dev-commits-ports-main@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 4PZJn14tNyz3xpsr; Sun, 12 Mar 2023 12:21:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PZJn13x4Hz3DmJ; Sun, 12 Mar 2023 12:21:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678623701; 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=DJpRIBriPvqMxULAzbxMfskXuz8IS4CFE9aPPWb0blQ=; b=FMFGgh0GyJfbOpcCwhKHsy06QJwYoFb2WC5fnDN9rFijZqXbYgFDXfVXl0u5V3+pg02n+Y BeeGZJVmBW5nmcA3UmTkD18jgrGCayNUpRs3OSQVJ3f8qPN66DJZeh4NxcyOQ4g+lWxQci UIyK+O3ydyjRnQ1xaktcRhVMuT7l+HDA+Dq50xX8pHud9PDsEoeiSQcxsg0GzlE/RCs5lw QlaNw3Y61zNbPQLOyGSaM81UkhB18n3bBpkQyM6FbwajJ2kyqSDfT7UbzTVp0q3u1NK/EU 1F0NcLaEZ7NccLP+rsmD1dbOusUV8ttItY1R2SFc1fieW2dOcbgjVULqpL/wFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678623701; 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=DJpRIBriPvqMxULAzbxMfskXuz8IS4CFE9aPPWb0blQ=; b=nlNnbBvzCLPP/Y3kq1tsyV02lMYhgLBdfP5r5C/7Qv3ihwUSbXJPR2ri4RvkFmqd7zZ9KL QqwdAgtN9T8zTT/elcJXmIvwJ1Ua8X/Ciry8VIXzDyWOOZr5EPCZbzSN5gkX5g7pJ6kQjC H1q5E4XwsmCqPdClKXsKlxKHoOVLcFevMWLDFXBxDikmuD9YJ3v7ZTn7oonT2wpNOWiJyW PVMRQeML9N1pact5WpTedoPtLseV8aqOKtos34deAV656eCkpgsUsuI+Cy3nYVpKMJFZKE F2gOqRFXMggMqZalgbnR3PfHwFxCDSQSani1WiHLpGCD6uxGT+5JPDzfdjWvNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678623701; a=rsa-sha256; cv=none; b=l2SEqPfjbwI7aKX+o4nX4gg9JRyYiuZ84N1shNhdJ4UjAxZnf2MLQHINoHVoXGuun+ekdU XZR8Gm6ZI/ysKNAQ2TeEMoxM23Sb9RtuYaXS5E53NI9VjUQac2H7en5kBHPUOaRLkhvuYC dbxoP5Zle2/mvg0/JZgH/UXbMYmZvlZuwE/Ut2jNVRiTiW2uTaxAvRPs/4e+8Xl9Y/e+eF Kf/hA5R0wz4e2mZD6M392UnSAzVbj0lacKUHcQ8IUe0YcGLQXQA2BoZLZlwfVQ5/V06+la tmZ/k1A4TSmtv2h+8BXUnTp0vw4DFPNIfPKIx27wUIpeHYFnioPTf07UOp7u0A== 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 4PZJn1318Nz19pg; Sun, 12 Mar 2023 12:21:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32CCLf7P025158; Sun, 12 Mar 2023 12:21:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32CCLf1S025157; Sun, 12 Mar 2023 12:21:41 GMT (envelope-from git) Date: Sun, 12 Mar 2023 12:21:41 GMT Message-Id: <202303121221.32CCLf1S025157@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Vanilla I. Shu" Subject: git: c703ad1ad9ff - main - archivers/snappy: update to 1.1.10. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vanilla X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c703ad1ad9ff0ecef79ec5ba1f1297328cae53ae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=c703ad1ad9ff0ecef79ec5ba1f1297328cae53ae commit c703ad1ad9ff0ecef79ec5ba1f1297328cae53ae Author: Vanilla I. Shu AuthorDate: 2023-03-12 12:21:06 +0000 Commit: Vanilla I. Shu CommitDate: 2023-03-12 12:21:31 +0000 archivers/snappy: update to 1.1.10. --- archivers/snappy/Makefile | 4 ++-- archivers/snappy/distinfo | 6 +++--- archivers/snappy/files/patch-CMakeLists.txt | 8 ++++---- archivers/snappy/files/patch-snappy.cc | 11 +++++++++++ 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile index efd5f5b516ed..ef8ebc381e43 100644 --- a/archivers/snappy/Makefile +++ b/archivers/snappy/Makefile @@ -1,6 +1,6 @@ PORTNAME= snappy -PORTVERSION= 1.1.9 -PORTREVISION= 1 +PORTVERSION= 1.1.10 +PORTREVISION= 0 CATEGORIES= archivers MAINTAINER= vanilla@FreeBSD.org diff --git a/archivers/snappy/distinfo b/archivers/snappy/distinfo index a07c71d53303..ff2ca326920c 100644 --- a/archivers/snappy/distinfo +++ b/archivers/snappy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620309917 -SHA256 (google-snappy-1.1.9_GH0.tar.gz) = 75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 -SIZE (google-snappy-1.1.9_GH0.tar.gz) = 1102382 +TIMESTAMP = 1678607829 +SHA256 (google-snappy-1.1.10_GH0.tar.gz) = 49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90 +SIZE (google-snappy-1.1.10_GH0.tar.gz) = 1105312 diff --git a/archivers/snappy/files/patch-CMakeLists.txt b/archivers/snappy/files/patch-CMakeLists.txt index 306df294b015..68d48af31447 100644 --- a/archivers/snappy/files/patch-CMakeLists.txt +++ b/archivers/snappy/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2021-05-04 22:53:34 UTC +--- CMakeLists.txt.orig 2023-03-08 23:44:00 UTC +++ CMakeLists.txt @@ -78,8 +78,10 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") @@ -13,7 +13,7 @@ endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make -@@ -213,8 +215,7 @@ configure_file( +@@ -235,8 +237,7 @@ configure_file( "snappy-stubs-public.h.in" "${PROJECT_BINARY_DIR}/snappy-stubs-public.h") @@ -23,7 +23,7 @@ PRIVATE "snappy-internal.h" "snappy-stubs-internal.h" -@@ -235,20 +236,35 @@ target_sources(snappy +@@ -257,20 +258,35 @@ target_sources(snappy $ $ ) @@ -63,7 +63,7 @@ if(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS) add_library(snappy_test_support "") target_sources(snappy_test_support -@@ -359,7 +375,7 @@ endif(SNAPPY_FUZZING_BUILD) +@@ -381,7 +397,7 @@ endif(SNAPPY_FUZZING_BUILD) include(GNUInstallDirs) if(SNAPPY_INSTALL) diff --git a/archivers/snappy/files/patch-snappy.cc b/archivers/snappy/files/patch-snappy.cc new file mode 100644 index 000000000000..f97971659540 --- /dev/null +++ b/archivers/snappy/files/patch-snappy.cc @@ -0,0 +1,11 @@ +--- snappy.cc.orig 2023-03-12 08:04:09 UTC ++++ snappy.cc +@@ -1290,7 +1290,7 @@ std::pair DecompressBranchl + DeferMemCopy(&deferred_src, &deferred_length, from, len); + } + } while (ip < ip_limit_min_slop && +- (op + deferred_length) < op_limit_min_slop); ++ (op + deferred_length) < (size_t)op_limit_min_slop); + exit: + ip--; + assert(ip <= ip_limit);