Skip to content

Commit a86a342

Browse files
authored
Merge pull request Homebrew#251768 from Homebrew/ettercap-pcre2
ettercap: apply Debian's upstreamed patch for PCRE2 support
2 parents 30aec88 + 1243a2b commit a86a342

File tree

1 file changed

+17
-20
lines changed

1 file changed

+17
-20
lines changed

Formula/e/ettercap.rb

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ class Ettercap < Formula
33
homepage "https://ettercap.github.io/ettercap/"
44
license "GPL-2.0-or-later"
55
revision 2
6+
head "https://github.com/Ettercap/ettercap.git", branch: "master"
67

78
stable do
89
url "https://github.com/Ettercap/ettercap/archive/refs/tags/v0.8.3.1.tar.gz"
910
sha256 "d0c3ef88dfc284b61d3d5b64d946c1160fd04276b448519c1ae4438a9cdffaf3"
1011

11-
depends_on "pcre"
12-
1312
# Part of libmaxminddb backport that cannot be added via patch.
1413
# Remove in the next release along with corresponding install
1514
resource "GeoLite2-Country.mmdb" do
@@ -29,28 +28,25 @@ class Ettercap < Formula
2928
url "https://raw.githubusercontent.com/Homebrew/homebrew-core/1cf441a0/Patches/ettercap/libmaxminddb-backport.diff"
3029
sha256 "b7869963df256af7cfae0f9e936e6dac4ec51a8b38dcfef6ea909e81e3ab8d0e"
3130
end
31+
32+
# Apply Debian's upstreamed patch for pcre2 support. Remove in the next release.
33+
# https://github.com/Ettercap/ettercap/commit/b1686d46792aecc10662e4a8ec221c9727661878
34+
patch do
35+
url "https://sources.debian.org/data/main/e/ettercap/1%3A0.8.3.1-15/debian/patches/1170.patch"
36+
sha256 "a3c426d36f84487bbdb5d02b831df295af33373fcb59ee81254cee6807a50a4c"
37+
end
3238
end
3339

3440
no_autobump! because: :requires_manual_review
3541

3642
bottle do
37-
rebuild 1
38-
sha256 arm64_tahoe: "a1aa67d19c55d86f3cff890fdbe7ce4f46be7aaebbb3f66a76f6dbb9ee95155a"
39-
sha256 arm64_sequoia: "4c2d77df3c85c46b78d941966c625306f0d2054bb3029e14826636a8550b7785"
40-
sha256 arm64_sonoma: "314023a2a65ca174dd90a8e777a0ce694ee24619e419e893a8f3d8a82b004935"
41-
sha256 arm64_ventura: "59f3ecc8f33ff3a865e2b608b8969f8d31e77c8aa82218707cecf21ce466bf60"
42-
sha256 arm64_monterey: "ad36dab4532384d39be0e58ce0752b499bfae8cce41c317d6748479707e416d1"
43-
sha256 sonoma: "197cbb987473cb58c67447cd85f104762640df66e2e24f8ab6366539dc3fa087"
44-
sha256 ventura: "385d806561cfbb2513e6b0bb3b487312eaba6e5bdbcfffb36f6004a53f1348e8"
45-
sha256 monterey: "e09c5c23e3f73b224dd8d6be74ca8b80bf24989eaaa786b102d82f2979fda47e"
46-
sha256 arm64_linux: "b82aa41d486d4ee548e666a325bd8a2c7e1e3bfdb40c4431b151628d0995d412"
47-
sha256 x86_64_linux: "ed90068515d35787a0e19066936f3689eea7a1e7ed85ab1119ab60a71c7881d6"
48-
end
49-
50-
head do
51-
url "https://github.com/Ettercap/ettercap.git", branch: "master"
52-
53-
depends_on "pcre2"
43+
rebuild 2
44+
sha256 arm64_tahoe: "2244ce8f708f9889ff92f8861bbae03a92aac0a2cf7457bc0b334301f4bff2bd"
45+
sha256 arm64_sequoia: "6d98587a5e98e2db83bf85117ea496c15f114fab7d702459811591af756f3c7c"
46+
sha256 arm64_sonoma: "a72d69fae20cd902444c9aed9ac7c2b34861319ffc2847b0ea2d23723bb8c181"
47+
sha256 sonoma: "9c04bde58b1776e853b1b9092899d28d90270907cd644d889db1fc00f32f18d3"
48+
sha256 arm64_linux: "8f7f88b2aa5083456ebaa7694d2ddafb83c46d0d8fad766e2ea4e583e3e0ffa0"
49+
sha256 x86_64_linux: "e825ecc7c84a08331974048d31b39125c15c8d8d44d002744be0686a000a3b4a"
5450
end
5551

5652
depends_on "cmake" => :build
@@ -61,6 +57,7 @@ class Ettercap < Formula
6157
depends_on "libnet"
6258
depends_on "ncurses"
6359
depends_on "openssl@3"
60+
depends_on "pcre2"
6461

6562
uses_from_macos "bison" => :build
6663
uses_from_macos "flex" => :build
@@ -89,7 +86,7 @@ def install
8986

9087
args = %W[
9188
-DBUNDLED_LIBS=OFF
92-
-DCMAKE_INSTALL_RPATH=#{rpath}
89+
-DCMAKE_INSTALL_RPATH=#{rpath};#{rpath(source: lib/"ettercap")}
9390
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
9491
-DENABLE_CURSES=ON
9592
-DENABLE_GTK=ON

0 commit comments

Comments
 (0)