From nobody Fri Sep 09 21:17:17 2022 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 4MPTMy2l8Qz4cLwn; Fri, 9 Sep 2022 21:17:18 +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 4MPTMy2HCBz3XZJ; Fri, 9 Sep 2022 21:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662758238; 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=o8qL9qpP+OXfa3yaHUPYYNqjMlUk27vKQKCnh1HWdGc=; b=jqLpE2YYx096e/q1vSASPKCRS8w+PUxaOMu+YU252vx+QpmnkLU8H7NM09nu5pL/cCXQA4 t6M/zYsEMrq0YghYCH76L1JllGKNlXVGC6CChUPSOhF2/9EMySvaF0s+na8IFfHZm2+FDe mrD0kOMXrPv4ZAlfWizpc/cFPnBGV/+33OQkzjS+rrcc4GxFhhbDyr9CMsz+oe/dk0ScP8 EMCWU8VYLLpAnh/z3xbRiU1V/k7kGntQ+kads7g6fJ/wI/TA2FM7DeNg1om6dQaq80OcTA 6MvVUFnNaUZtYe7iJEBHH16y3t4mcFT7HyOo8MrUsJ9qeDFy36Z/pgTaPwK8qA== 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 4MPTMy1680z1KkR; Fri, 9 Sep 2022 21:17:18 +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 289LHHFE044033; Fri, 9 Sep 2022 21:17:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 289LHH3R044032; Fri, 9 Sep 2022 21:17:17 GMT (envelope-from git) Date: Fri, 9 Sep 2022 21:17:17 GMT Message-Id: <202209092117.289LHH3R044032@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d2bf901d4386 - main - sysutils/nix: Update to 2.3.11 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: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2bf901d4386be8c01c363d47a9513b22a452f83 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662758238; 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=o8qL9qpP+OXfa3yaHUPYYNqjMlUk27vKQKCnh1HWdGc=; b=v+K1bvaV4+q1ZTQ8OWtDLst/xq+Nl8VnNYNJ8I9cXcCgDT2FgL/flUmD9JQKC+6jaut/Ih TQDP+us4GUQe9KLqnQ4bU653xncTR7vqInObWVH3d3GoBl5mvkURGaZx+nzpuf2T+qy/UK uMGxumf6Ow9XlQy5GJVx+HY0AZnFVjYIOWYvb4S82hpGPVLGBBH1FrNA69ITOJxQvH+tGy wOaHOW3QOrP0lz5dnKzdgGCigPO0E32Bcc3Uv4t21O1ckcL/8VbPTxxttGAOYjp0ZSZPu7 Fz09eFOdkCtr815FGnBe4xBgKiiRjM7zOUr+JDnkHtwuIzRu8xdk+7G7lC9IYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662758238; a=rsa-sha256; cv=none; b=Y+CXQ1XLwsa+EfT8qZmLXKobF90dqOgj5bI7NWfHlmsXjTu0ts10gtOfvA68wvvApCBr+f 2lqFWgJY/y49zDraAhk7l6Ws5nwudawZZbvjnVu+JFTTmF938Gx5MKbnmHiWKX22QOLl1P 1eA6iof2G8JRWOs7UQoNot4VfRDF+V3jTeJE2XPZORNwurYt6+ouRqQL7NK7vKXLltEVtZ yRUoK05dQB0aDjlIgsu74CQ30bMiejDBV4CX/hebEA138eYiqdKEhUqdZ8kMH3Jas7QN4D OilyIVkXjhliU6omzzLJK32KAGu2gH8tk5vCKXQTs+s0PDR0jATaXYsnA3QdJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2bf901d4386be8c01c363d47a9513b22a452f83 commit d2bf901d4386be8c01c363d47a9513b22a452f83 Author: Lincoln Auster AuthorDate: 2022-08-22 18:44:17 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-09-09 21:13:53 +0000 sysutils/nix: Update to 2.3.11 --- sysutils/nix/Makefile | 3 +- sysutils/nix/distinfo | 6 +- .../patch-src_libstore_s3-binary-cache-store.cc | 104 --------------------- 3 files changed, 4 insertions(+), 109 deletions(-) diff --git a/sysutils/nix/Makefile b/sysutils/nix/Makefile index e0e506509d47..666d4acc01fb 100644 --- a/sysutils/nix/Makefile +++ b/sysutils/nix/Makefile @@ -1,6 +1,5 @@ PORTNAME= nix -DISTVERSION= 2.3.10 -PORTREVISION= 3 +DISTVERSION= 2.3.11 CATEGORIES= sysutils PATCH_SITES= https://github.com/NixOS/nix/commit/ PATCHFILES= 7c112351d9e941567e64063638396259546d9a48.patch:-p1 # libutil: EPERM from kill(-1, ...) is fine #4530 diff --git a/sysutils/nix/distinfo b/sysutils/nix/distinfo index 55f397307459..eaa7d35673d2 100644 --- a/sysutils/nix/distinfo +++ b/sysutils/nix/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1612780772 -SHA256 (NixOS-nix-2.3.10_GH0.tar.gz) = 04e1c7c625b753df35bf0e0a952d1a886fd6c6b582190832d57a7269241b4b50 -SIZE (NixOS-nix-2.3.10_GH0.tar.gz) = 903852 +TIMESTAMP = 1661019919 +SHA256 (NixOS-nix-2.3.11_GH0.tar.gz) = 3980c8c84f9d8969d949a05557819686c8ddedb9217e18a26396f67fc353b6e4 +SIZE (NixOS-nix-2.3.11_GH0.tar.gz) = 904939 SHA256 (7c112351d9e941567e64063638396259546d9a48.patch) = 22d513a2337a61d5cebf7ed1542b9d72d6cbc57f99bcd10f3e311870e71d9e3a SIZE (7c112351d9e941567e64063638396259546d9a48.patch) = 2050 diff --git a/sysutils/nix/files/patch-src_libstore_s3-binary-cache-store.cc b/sysutils/nix/files/patch-src_libstore_s3-binary-cache-store.cc deleted file mode 100644 index 8c9de342292f..000000000000 --- a/sysutils/nix/files/patch-src_libstore_s3-binary-cache-store.cc +++ /dev/null @@ -1,104 +0,0 @@ ---- src/libstore/s3-binary-cache-store.cc.orig 2019-10-10 13:03:46 UTC -+++ src/libstore/s3-binary-cache-store.cc -@@ -44,7 +44,7 @@ R && checkAws(const FormatOrString & fs, Aws::Utils::O - if (!outcome.IsSuccess()) - throw S3Error( - outcome.GetError().GetErrorType(), -- fs.s + ": " + outcome.GetError().GetMessage()); -+ fs.s + ": " + outcome.GetError().GetMessage().c_str()); - return outcome.GetResultWithOwnership(); - } - -@@ -54,8 +54,10 @@ class AwsLogger : public Aws::Utils::Logging::Formatte - - void ProcessFormattedStatement(Aws::String && statement) override - { -- debug("AWS: %s", chomp(statement)); -+ debug("AWS: %s", chomp((const std::string &)statement)); - } -+ -+ void Flush() override {} - }; - - static void initAWS() -@@ -139,8 +141,8 @@ S3Helper::DownloadResult S3Helper::getObject( - - auto request = - Aws::S3::Model::GetObjectRequest() -- .WithBucket(bucketName) -- .WithKey(key); -+ .WithBucket(bucketName.c_str()) -+ .WithKey(key.c_str()); - - request.SetResponseStreamFactory([&]() { - return Aws::New("STRINGSTREAM"); -@@ -155,7 +157,7 @@ S3Helper::DownloadResult S3Helper::getObject( - auto result = checkAws(fmt("AWS error fetching '%s'", key), - client->GetObject(request)); - -- res.data = decompress(result.GetContentEncoding(), -+ res.data = decompress(result.GetContentEncoding().c_str(), - dynamic_cast(result.GetBody()).str()); - - } catch (S3Error & e) { -@@ -238,8 +240,8 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheSt - - auto res = s3Helper.client->HeadObject( - Aws::S3::Model::HeadObjectRequest() -- .WithBucket(bucketName) -- .WithKey(path)); -+ .WithBucket(bucketName.c_str()) -+ .WithKey(path.c_str())); - - if (!res.IsSuccess()) { - auto & error = res.GetError(); -@@ -302,7 +304,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheSt - - std::shared_ptr transferHandle = - transferManager->UploadFile( -- stream, bucketName, path, mimeType, -+ stream, bucketName.c_str(), path.c_str(), mimeType.c_str(), - Aws::Map(), - nullptr /*, contentEncoding */); - -@@ -320,13 +322,13 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheSt - - auto request = - Aws::S3::Model::PutObjectRequest() -- .WithBucket(bucketName) -- .WithKey(path); -+ .WithBucket(bucketName.c_str()) -+ .WithKey(path.c_str()); - -- request.SetContentType(mimeType); -+ request.SetContentType(mimeType.c_str()); - - if (contentEncoding != "") -- request.SetContentEncoding(contentEncoding); -+ request.SetContentEncoding(contentEncoding.c_str()); - - auto stream = std::make_shared(data); - -@@ -393,9 +395,9 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheSt - auto res = checkAws(format("AWS error listing bucket '%s'") % bucketName, - s3Helper.client->ListObjects( - Aws::S3::Model::ListObjectsRequest() -- .WithBucket(bucketName) -+ .WithBucket(bucketName.c_str()) - .WithDelimiter("/") -- .WithMarker(marker))); -+ .WithMarker(marker.c_str()))); - - auto & contents = res.GetContents(); - -@@ -404,8 +406,8 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheSt - - for (auto object : contents) { - auto & key = object.GetKey(); -- if (key.size() != 40 || !hasSuffix(key, ".narinfo")) continue; -- paths.insert(storeDir + "/" + key.substr(0, key.size() - 8)); -+ if (key.size() != 40 || !hasSuffix(key.c_str(), ".narinfo")) continue; -+ paths.insert(storeDir + "/" + key.substr(0, key.size() - 8).c_str()); - } - - marker = res.GetNextMarker();