From cc01a260834925e5a71ceca9cf91b0f9421e0631 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Wed, 14 Feb 2024 13:38:22 +0000
Subject: [PATCH 01/23] newnode-helper 2.1.4 (new formula)

---
 Formula/n/newnode-helper.rb | 39 +++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 Formula/n/newnode-helper.rb

diff --git a/Formula/n/newnode-helper.rb b/Formula/n/newnode-helper.rb
new file mode 100644
index 0000000000000..b4cc0b66befe9
--- /dev/null
+++ b/Formula/n/newnode-helper.rb
@@ -0,0 +1,39 @@
+class NewnodeHelper < Formula
+  desc "Web proxy that uses a distributed p2p network to circumvent censorship"
+  homepage "https://www.newnode.com/newnode-vpn"
+  url "https://github.com/clostra/newnode.git",
+    tag: "2.1.4", revision: "c42a04ded55cfdff857878f4d9234950e530bb00"
+  license ""
+
+  depends_on xcode: ["9.3", :build]
+  depends_on "automake"
+  depends_on "coreutils"
+  depends_on "libtool"
+  depends_on "mbedtls@2"
+  depends_on "wget"
+
+  def install
+    system "git", "clone", "--recurse-submodules", "https://github.com/clostra/newnode.git"
+    system "cd newnode && ./build.sh"
+    bin.install "newnode/client" => "newnode-helper"
+    path = (var/"newnode-helper")
+    path.mkpath
+    path.chmod 0775
+  end
+
+  service do
+    run [opt_bin/"newnode-helper", "-p", "8006", "-v"]
+    keep_alive true
+    working_dir var/"newnode-helper"
+    log_path var/"log/newnode-helper.log"
+    error_log_path var/"log/newnode-helper-error.log"
+  end
+
+  test do
+    # use wget to try to download a file via the newnode's HTTP proxy
+    # if that works, newnode vpn is working
+    ENV["https_proxy"] = "http://localhost:8006"
+    sleep 5
+    system "wget", "https://brew.sh"
+  end
+end

From 9d53b496b3e54f7d48b337a881793ad24ef1bdb0 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Wed, 14 Feb 2024 13:50:33 +0000
Subject: [PATCH 02/23] filled in the license

---
 Formula/n/newnode-helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Formula/n/newnode-helper.rb b/Formula/n/newnode-helper.rb
index b4cc0b66befe9..049989b29b029 100644
--- a/Formula/n/newnode-helper.rb
+++ b/Formula/n/newnode-helper.rb
@@ -3,7 +3,7 @@ class NewnodeHelper < Formula
   homepage "https://www.newnode.com/newnode-vpn"
   url "https://github.com/clostra/newnode.git",
     tag: "2.1.4", revision: "c42a04ded55cfdff857878f4d9234950e530bb00"
-  license ""
+  license "GPL-2.0-only"
 
   depends_on xcode: ["9.3", :build]
   depends_on "automake"

From 1003532471d1525627793bb280976efb16d9de78 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Wed, 14 Feb 2024 13:59:07 +0000
Subject: [PATCH 03/23] removed extra cloning

---
 Formula/n/newnode-helper.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Formula/n/newnode-helper.rb b/Formula/n/newnode-helper.rb
index 049989b29b029..511016ad2619f 100644
--- a/Formula/n/newnode-helper.rb
+++ b/Formula/n/newnode-helper.rb
@@ -13,16 +13,15 @@ class NewnodeHelper < Formula
   depends_on "wget"
 
   def install
-    system "git", "clone", "--recurse-submodules", "https://github.com/clostra/newnode.git"
-    system "cd newnode && ./build.sh"
-    bin.install "newnode/client" => "newnode-helper"
+    system "./build.sh"
+    bin.install "client" => "newnode-helper"
     path = (var/"newnode-helper")
     path.mkpath
     path.chmod 0775
   end
 
   service do
-    run [opt_bin/"newnode-helper", "-p", "8006", "-v"]
+    run [opt_bin/"newnode-helper", "-p", "8006"]
     keep_alive true
     working_dir var/"newnode-helper"
     log_path var/"log/newnode-helper.log"

From 4984c907109149e207a2766e273a4794f41cfd63 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Wed, 21 Feb 2024 22:58:41 +0000
Subject: [PATCH 04/23] removed wget dependency

further inspection of https://github.com/clostra/newnode/blob/master/build.sh and subsequent build tests confirm that wget isnt needed on mac os
---
 Formula/n/newnode-helper.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Formula/n/newnode-helper.rb b/Formula/n/newnode-helper.rb
index 511016ad2619f..e08833e764a11 100644
--- a/Formula/n/newnode-helper.rb
+++ b/Formula/n/newnode-helper.rb
@@ -10,7 +10,6 @@ class NewnodeHelper < Formula
   depends_on "coreutils"
   depends_on "libtool"
   depends_on "mbedtls@2"
-  depends_on "wget"
 
   def install
     system "./build.sh"

From 669f2db4d9744025ad23cb5125136e9210a651d5 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Thu, 22 Feb 2024 00:24:52 +0000
Subject: [PATCH 05/23] fork proxy in test

instead of assuming that the proxy is already run as a service, run it in a fork and kill at completion
---
 Formula/n/newnode-helper.rb | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/Formula/n/newnode-helper.rb b/Formula/n/newnode-helper.rb
index e08833e764a11..d691f72d7f1b2 100644
--- a/Formula/n/newnode-helper.rb
+++ b/Formula/n/newnode-helper.rb
@@ -30,8 +30,24 @@ def install
   test do
     # use wget to try to download a file via the newnode's HTTP proxy
     # if that works, newnode vpn is working
-    ENV["https_proxy"] = "http://localhost:8006"
+    pid = fork do
+      exec "#{opt_bin}/newnode-helper", "-p", "8006"
+    end
     sleep 5
-    system "wget", "https://brew.sh"
+
+    ENV["https_proxy"] = "http://localhost:8006"
+    begin
+      system "wget", "https://brew.sh"
+    ensure
+      Process.kill("TERM", pid)
+      begin
+        Timeout.timeout(5) do
+          Process.wait(pid)
+        end
+      rescue Timeout::Error
+        Process.kill("KILL", pid) # Forcefully kill if not terminated after timeout
+        Process.wait(pid)
+      end
+    end
   end
 end

From 3d132b827e1be8ae45ed5e19bc123b235f347ff3 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Thu, 22 Feb 2024 00:43:33 +0000
Subject: [PATCH 06/23] disable linux builds for now

linux builds currently rely on a hard-coded wget binary, which needs to change upstream to non-hardcoded binary
---
 Formula/n/newnode-helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Formula/n/newnode-helper.rb b/Formula/n/newnode-helper.rb
index d691f72d7f1b2..765de73de1313 100644
--- a/Formula/n/newnode-helper.rb
+++ b/Formula/n/newnode-helper.rb
@@ -6,6 +6,7 @@ class NewnodeHelper < Formula
   license "GPL-2.0-only"
 
   depends_on xcode: ["9.3", :build]
+  depends_on :macos
   depends_on "automake"
   depends_on "coreutils"
   depends_on "libtool"

From 3fdbb122d2e11656a7b221346e595ee852be1042 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Thu, 22 Feb 2024 00:51:30 +0000
Subject: [PATCH 07/23] fix ordering

fix brew audit fail due to non-alphabetic ordering of dependencies
---
 Formula/n/newnode-helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Formula/n/newnode-helper.rb b/Formula/n/newnode-helper.rb
index 765de73de1313..f028f6328d3de 100644
--- a/Formula/n/newnode-helper.rb
+++ b/Formula/n/newnode-helper.rb
@@ -6,10 +6,10 @@ class NewnodeHelper < Formula
   license "GPL-2.0-only"
 
   depends_on xcode: ["9.3", :build]
-  depends_on :macos
   depends_on "automake"
   depends_on "coreutils"
   depends_on "libtool"
+  depends_on :macos
   depends_on "mbedtls@2"
 
   def install

From 5777bd3518f1efabb70d7520b447c463c980fb39 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Thu, 22 Feb 2024 01:22:18 +0000
Subject: [PATCH 08/23] added build dependencies

most of the dependencies specified so far are actually build-time only, and pkg-config was not specified at all
---
 Formula/n/newnode-helper.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Formula/n/newnode-helper.rb b/Formula/n/newnode-helper.rb
index f028f6328d3de..aae0f968ed9e8 100644
--- a/Formula/n/newnode-helper.rb
+++ b/Formula/n/newnode-helper.rb
@@ -5,12 +5,14 @@ class NewnodeHelper < Formula
     tag: "2.1.4", revision: "c42a04ded55cfdff857878f4d9234950e530bb00"
   license "GPL-2.0-only"
 
+  depends_on "autoconf" => :build
+  depends_on "automake" => :build
+  depends_on "coreutils" => :build
+  depends_on "libtool" => :build
+  depends_on "mbedtls@2" => :build
+  depends_on "pkg-config" => :build
   depends_on xcode: ["9.3", :build]
-  depends_on "automake"
-  depends_on "coreutils"
-  depends_on "libtool"
   depends_on :macos
-  depends_on "mbedtls@2"
 
   def install
     system "./build.sh"
@@ -38,7 +40,7 @@ def install
 
     ENV["https_proxy"] = "http://localhost:8006"
     begin
-      system "wget", "https://brew.sh"
+      system "curl", "https://brew.sh"
     ensure
       Process.kill("TERM", pid)
       begin

From 1ece97dde7a726594b0be990bce4e0503c3e9682 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Thu, 29 Feb 2024 12:25:10 +0000
Subject: [PATCH 09/23] update to 2.1.5, no need for mbedtls

updated newnode-helper to 2.1.5, with updated dependencies and no dependency on mbedtls
---
 Formula/n/newnode-helper.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Formula/n/newnode-helper.rb b/Formula/n/newnode-helper.rb
index aae0f968ed9e8..2c09b81f78f6e 100644
--- a/Formula/n/newnode-helper.rb
+++ b/Formula/n/newnode-helper.rb
@@ -2,14 +2,13 @@ class NewnodeHelper < Formula
   desc "Web proxy that uses a distributed p2p network to circumvent censorship"
   homepage "https://www.newnode.com/newnode-vpn"
   url "https://github.com/clostra/newnode.git",
-    tag: "2.1.4", revision: "c42a04ded55cfdff857878f4d9234950e530bb00"
+    tag: "2.1.5", revision: "18a3f713267b2a08e34cbe04253df891889997a2"
   license "GPL-2.0-only"
 
   depends_on "autoconf" => :build
   depends_on "automake" => :build
   depends_on "coreutils" => :build
   depends_on "libtool" => :build
-  depends_on "mbedtls@2" => :build
   depends_on "pkg-config" => :build
   depends_on xcode: ["9.3", :build]
   depends_on :macos

From a72698498b07a0c13910e7708d515cf725666097 Mon Sep 17 00:00:00 2001
From: Kirill Rd <theoden8@tutamail.com>
Date: Mon, 4 Mar 2024 14:25:08 +0000
Subject: [PATCH 10/23] Update Formula/n/newnode-helper.rb

Co-authored-by: Sean Molenaar <SMillerDev@users.noreply.github.com>
---
 Formula/n/newnode-helper.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Formula/n/newnode-helper.rb b/Formula/n/newnode-helper.rb
index 2c09b81f78f6e..d3b0b62b857e6 100644
--- a/Formula/n/newnode-helper.rb
+++ b/Formula/n/newnode-helper.rb
@@ -30,14 +30,13 @@ def install
   end
 
   test do
-    # use wget to try to download a file via the newnode's HTTP proxy
-    # if that works, newnode vpn is working
+    port = free_port
     pid = fork do
-      exec "#{opt_bin}/newnode-helper", "-p", "8006"
+      exec bin/"newnode-helper", "-p", port.to_s
     end
     sleep 5
 
-    ENV["https_proxy"] = "http://localhost:8006"
+    ENV["https_proxy"] = "http://localhost:#{port}"
     begin
       system "curl", "https://brew.sh"
     ensure

From 032c4d8d4e5209af74a3b6af0a5cbc4ef8d331e7 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Mon, 4 Mar 2024 15:33:37 +0000
Subject: [PATCH 11/23] renamed newnode-helper.rb to newnode.rb

---
 Formula/n/{newnode-helper.rb => newnode.rb} | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
 rename Formula/n/{newnode-helper.rb => newnode.rb} (78%)

diff --git a/Formula/n/newnode-helper.rb b/Formula/n/newnode.rb
similarity index 78%
rename from Formula/n/newnode-helper.rb
rename to Formula/n/newnode.rb
index d3b0b62b857e6..b4d5aa6821662 100644
--- a/Formula/n/newnode-helper.rb
+++ b/Formula/n/newnode.rb
@@ -15,24 +15,24 @@ class NewnodeHelper < Formula
 
   def install
     system "./build.sh"
-    bin.install "client" => "newnode-helper"
-    path = (var/"newnode-helper")
+    bin.install "client" => "newnode"
+    path = (var/"newnode")
     path.mkpath
     path.chmod 0775
   end
 
   service do
-    run [opt_bin/"newnode-helper", "-p", "8006"]
+    run [opt_bin/"newnode", "-p", "8006"]
     keep_alive true
-    working_dir var/"newnode-helper"
-    log_path var/"log/newnode-helper.log"
-    error_log_path var/"log/newnode-helper-error.log"
+    working_dir var/"newnode"
+    log_path var/"log/newnode.log"
+    error_log_path var/"log/newnode-error.log"
   end
 
   test do
     port = free_port
     pid = fork do
-      exec bin/"newnode-helper", "-p", port.to_s
+      exec bin/"newnode", "-p", port.to_s
     end
     sleep 5
 

From 47a461427f9597efda4de726c96015ac6806aa66 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Tue, 5 Mar 2024 11:19:33 +0000
Subject: [PATCH 12/23] forgot to rename class

---
 Formula/n/newnode.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Formula/n/newnode.rb b/Formula/n/newnode.rb
index b4d5aa6821662..440437fd1d620 100644
--- a/Formula/n/newnode.rb
+++ b/Formula/n/newnode.rb
@@ -1,4 +1,4 @@
-class NewnodeHelper < Formula
+class Newnode < Formula
   desc "Web proxy that uses a distributed p2p network to circumvent censorship"
   homepage "https://www.newnode.com/newnode-vpn"
   url "https://github.com/clostra/newnode.git",

From 92b2426aa875214a568ecc9fd0492125e7ab8be4 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Tue, 26 Mar 2024 13:32:02 +0000
Subject: [PATCH 13/23] change working directory to cache/newnode

---
 Formula/n/newnode.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Formula/n/newnode.rb b/Formula/n/newnode.rb
index 440437fd1d620..fd3784b96d0f3 100644
--- a/Formula/n/newnode.rb
+++ b/Formula/n/newnode.rb
@@ -24,7 +24,7 @@ def install
   service do
     run [opt_bin/"newnode", "-p", "8006"]
     keep_alive true
-    working_dir var/"newnode"
+    working_dir var/"cache/newnode"
     log_path var/"log/newnode.log"
     error_log_path var/"log/newnode-error.log"
   end

From 6fd20731135d7fcaa1de25f5e81a077b094645ca Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Tue, 26 Mar 2024 13:44:35 +0000
Subject: [PATCH 14/23] fix cache mkpath

---
 Formula/n/newnode.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Formula/n/newnode.rb b/Formula/n/newnode.rb
index fd3784b96d0f3..9d3ad772eb9ee 100644
--- a/Formula/n/newnode.rb
+++ b/Formula/n/newnode.rb
@@ -16,7 +16,7 @@ class Newnode < Formula
   def install
     system "./build.sh"
     bin.install "client" => "newnode"
-    path = (var/"newnode")
+    path = (var/"cache/newnode")
     path.mkpath
     path.chmod 0775
   end

From bef4833f0059b66fdf188a68a9a94a826b430d29 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Tue, 26 Mar 2024 14:00:10 +0000
Subject: [PATCH 15/23] enable linux and replace wget with homebrews wget

---
 Formula/n/newnode.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Formula/n/newnode.rb b/Formula/n/newnode.rb
index 9d3ad772eb9ee..5387242e3f4ea 100644
--- a/Formula/n/newnode.rb
+++ b/Formula/n/newnode.rb
@@ -10,10 +10,20 @@ class Newnode < Formula
   depends_on "coreutils" => :build
   depends_on "libtool" => :build
   depends_on "pkg-config" => :build
-  depends_on xcode: ["9.3", :build]
-  depends_on :macos
+
+  on_macos do
+    depends_on xcode: ["9.3", :build]
+  end
+
+  on_linux do
+    depends_on "llvm" => :build
+    depends_on "wget"
+  end
 
   def install
+    if OS.linux?
+      inreplace "https_wget.c", "/usr/bin/wget", "#{Formula["wget"].opt_bin}/wget"
+    end
     system "./build.sh"
     bin.install "client" => "newnode"
     path = (var/"cache/newnode")

From 480e96e0ddea8196869bc5c7dd259aad97f7eb10 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Tue, 26 Mar 2024 14:04:12 +0000
Subject: [PATCH 16/23] fix audit

---
 Formula/n/newnode.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Formula/n/newnode.rb b/Formula/n/newnode.rb
index 5387242e3f4ea..c13e898324fce 100644
--- a/Formula/n/newnode.rb
+++ b/Formula/n/newnode.rb
@@ -21,9 +21,7 @@ class Newnode < Formula
   end
 
   def install
-    if OS.linux?
-      inreplace "https_wget.c", "/usr/bin/wget", "#{Formula["wget"].opt_bin}/wget"
-    end
+    inreplace "https_wget.c", "/usr/bin/wget", "#{Formula["wget"].opt_bin}/wget" if OS.linux?
     system "./build.sh"
     bin.install "client" => "newnode"
     path = (var/"cache/newnode")

From 83028ed33fdbb5fd295d7f2438a8f6804c875c3b Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Tue, 26 Mar 2024 16:54:49 +0200
Subject: [PATCH 17/23] fix linux builds

---
 Formula/n/newnode.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Formula/n/newnode.rb b/Formula/n/newnode.rb
index c13e898324fce..2de4bef19fc15 100644
--- a/Formula/n/newnode.rb
+++ b/Formula/n/newnode.rb
@@ -17,11 +17,19 @@ class Newnode < Formula
 
   on_linux do
     depends_on "llvm" => :build
+    depends_on "gnu-sed" => :build
+    depends_on "grep" => :build
     depends_on "wget"
   end
 
   def install
-    inreplace "https_wget.c", "/usr/bin/wget", "#{Formula["wget"].opt_bin}/wget" if OS.linux?
+    if OS.linux?
+      inreplace "https_wget.c", "/usr/bin/wget", "#{Formula["wget"].opt_bin}/wget"
+      ENV["SED"] = "#{Formula["gnu-sed"].opt_bin}/sed"
+      ENV["GREP"] = "#{Formula["grep"].opt_bin}/grep"
+      ENV["HOMEBREW_CC"] = "#{Formula["llvm"].opt_bin}/clang"
+      ENV["HOMEBREW_CXX"] = "#{Formula["llvm"].opt_bin}/clang++"
+    end
     system "./build.sh"
     bin.install "client" => "newnode"
     path = (var/"cache/newnode")

From 69533d08afceb970d9ae819c7473e63ba258066b Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Tue, 26 Mar 2024 14:56:57 +0000
Subject: [PATCH 18/23] fix audit

---
 Formula/n/newnode.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Formula/n/newnode.rb b/Formula/n/newnode.rb
index 2de4bef19fc15..6e376972da2cf 100644
--- a/Formula/n/newnode.rb
+++ b/Formula/n/newnode.rb
@@ -16,9 +16,9 @@ class Newnode < Formula
   end
 
   on_linux do
-    depends_on "llvm" => :build
     depends_on "gnu-sed" => :build
     depends_on "grep" => :build
+    depends_on "llvm" => :build
     depends_on "wget"
   end
 

From 73f531ac2cd95f3527f6dbee484c0f3780f92ea9 Mon Sep 17 00:00:00 2001
From: Kirill Rd <theoden8@tutamail.com>
Date: Wed, 27 Mar 2024 09:45:49 +0000
Subject: [PATCH 19/23] Update Formula/n/newnode.rb

Co-authored-by: Sean Molenaar <SMillerDev@users.noreply.github.com>
---
 Formula/n/newnode.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Formula/n/newnode.rb b/Formula/n/newnode.rb
index 6e376972da2cf..06ed2dd7b793d 100644
--- a/Formula/n/newnode.rb
+++ b/Formula/n/newnode.rb
@@ -25,8 +25,7 @@ class Newnode < Formula
   def install
     if OS.linux?
       inreplace "https_wget.c", "/usr/bin/wget", "#{Formula["wget"].opt_bin}/wget"
-      ENV["SED"] = "#{Formula["gnu-sed"].opt_bin}/sed"
-      ENV["GREP"] = "#{Formula["grep"].opt_bin}/grep"
+      ENV.prepend_path "PATH", Formula["gnu-sed"].opt_libexec/"gnubin"
       ENV["HOMEBREW_CC"] = "#{Formula["llvm"].opt_bin}/clang"
       ENV["HOMEBREW_CXX"] = "#{Formula["llvm"].opt_bin}/clang++"
     end

From f7160d842baea2aa4f046bf2e2a425a0ae0020e4 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Thu, 11 Apr 2024 13:31:44 +0100
Subject: [PATCH 20/23] formatted revision

---
 Formula/n/newnode.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Formula/n/newnode.rb b/Formula/n/newnode.rb
index 06ed2dd7b793d..3a5ccae20857a 100644
--- a/Formula/n/newnode.rb
+++ b/Formula/n/newnode.rb
@@ -2,7 +2,8 @@ class Newnode < Formula
   desc "Web proxy that uses a distributed p2p network to circumvent censorship"
   homepage "https://www.newnode.com/newnode-vpn"
   url "https://github.com/clostra/newnode.git",
-    tag: "2.1.5", revision: "18a3f713267b2a08e34cbe04253df891889997a2"
+    tag: "2.1.5",
+    revision: "18a3f713267b2a08e34cbe04253df891889997a2"
   license "GPL-2.0-only"
 
   depends_on "autoconf" => :build

From b57c19148f56f47043b32d690e308ecfa9ca02d4 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Thu, 11 Apr 2024 14:01:34 +0100
Subject: [PATCH 21/23] no need to double kill

---
 Formula/n/newnode.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Formula/n/newnode.rb b/Formula/n/newnode.rb
index 3a5ccae20857a..374416810d02d 100644
--- a/Formula/n/newnode.rb
+++ b/Formula/n/newnode.rb
@@ -56,15 +56,8 @@ def install
     begin
       system "curl", "https://brew.sh"
     ensure
+      sleep 5
       Process.kill("TERM", pid)
-      begin
-        Timeout.timeout(5) do
-          Process.wait(pid)
-        end
-      rescue Timeout::Error
-        Process.kill("KILL", pid) # Forcefully kill if not terminated after timeout
-        Process.wait(pid)
-      end
     end
   end
 end

From d282a5eaac67a77a9bf4dcd7b13707a381528b48 Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Thu, 11 Apr 2024 14:06:42 +0100
Subject: [PATCH 22/23] fix audit

---
 Formula/n/newnode.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Formula/n/newnode.rb b/Formula/n/newnode.rb
index 374416810d02d..86a2a0572e4f8 100644
--- a/Formula/n/newnode.rb
+++ b/Formula/n/newnode.rb
@@ -2,7 +2,7 @@ class Newnode < Formula
   desc "Web proxy that uses a distributed p2p network to circumvent censorship"
   homepage "https://www.newnode.com/newnode-vpn"
   url "https://github.com/clostra/newnode.git",
-    tag: "2.1.5",
+    tag:      "2.1.5",
     revision: "18a3f713267b2a08e34cbe04253df891889997a2"
   license "GPL-2.0-only"
 

From 42a477f1aa679aedba8ba6c6e107ab8e7894b35c Mon Sep 17 00:00:00 2001
From: Kirill Rodriguez <theoden8@tutamail.com>
Date: Thu, 11 Apr 2024 15:18:58 +0100
Subject: [PATCH 23/23] fails_with :gcc

---
 Formula/n/newnode.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Formula/n/newnode.rb b/Formula/n/newnode.rb
index 86a2a0572e4f8..fd4fd23b563b5 100644
--- a/Formula/n/newnode.rb
+++ b/Formula/n/newnode.rb
@@ -23,12 +23,14 @@ class Newnode < Formula
     depends_on "wget"
   end
 
+  fails_with :gcc do
+    cause "Requires -fblocks support"
+  end
+
   def install
     if OS.linux?
       inreplace "https_wget.c", "/usr/bin/wget", "#{Formula["wget"].opt_bin}/wget"
       ENV.prepend_path "PATH", Formula["gnu-sed"].opt_libexec/"gnubin"
-      ENV["HOMEBREW_CC"] = "#{Formula["llvm"].opt_bin}/clang"
-      ENV["HOMEBREW_CXX"] = "#{Formula["llvm"].opt_bin}/clang++"
     end
     system "./build.sh"
     bin.install "client" => "newnode"