From b2d6eadcbdf55dc1356048bb69ab5564d5590be9 Mon Sep 17 00:00:00 2001
From: Catena cyber <35799796+catenacyber@users.noreply.github.com>
Date: Tue, 26 May 2020 02:02:18 +0200
Subject: [PATCH] Remove libpcap patch merged upstream (#3865)

---
 projects/libpcap/Dockerfile |  1 -
 projects/libpcap/build.sh   |  1 -
 projects/libpcap/patch.diff | 24 ------------------------
 3 files changed, 26 deletions(-)
 delete mode 100644 projects/libpcap/patch.diff

diff --git a/projects/libpcap/Dockerfile b/projects/libpcap/Dockerfile
index f7acf86ef..3879928e4 100644
--- a/projects/libpcap/Dockerfile
+++ b/projects/libpcap/Dockerfile
@@ -22,5 +22,4 @@ RUN git clone --depth 1 https://github.com/the-tcpdump-group/libpcap.git libpcap
 RUN git clone --depth=1 https://github.com/the-tcpdump-group/tcpdump.git tcpdump
 WORKDIR $SRC
 COPY build.sh $SRC/
-COPY patch.diff $SRC/
 
diff --git a/projects/libpcap/build.sh b/projects/libpcap/build.sh
index e44f8b83f..75463b343 100755
--- a/projects/libpcap/build.sh
+++ b/projects/libpcap/build.sh
@@ -17,7 +17,6 @@
 
 cd libpcap
 # build project
-git apply ../patch.diff
 mkdir build
 cd build
 cmake ..
diff --git a/projects/libpcap/patch.diff b/projects/libpcap/patch.diff
deleted file mode 100644
index c76b33937..000000000
--- a/projects/libpcap/patch.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/optimize.c b/optimize.c
-index 4afd063f..90e8c571 100644
---- a/optimize.c
-+++ b/optimize.c
-@@ -1888,7 +1888,7 @@ opt_root(struct block **b)
- static void
- opt_loop(opt_state_t *opt_state, struct icode *ic, int do_stmts)
- {
--
-+	int loopCounter = 0;
- #ifdef BDEBUG
- 	if (pcap_optimizer_debug > 1 || pcap_print_dot_graph) {
- 		printf("opt_loop(root, %d) begin\n", do_stmts);
-@@ -1909,6 +1909,10 @@ opt_loop(opt_state_t *opt_state, struct icode *ic, int do_stmts)
- 			opt_dump(opt_state, ic);
- 		}
- #endif
-+		loopCounter++;
-+		if (loopCounter > 1000) {
-+			break;
-+		}
- 	} while (!opt_state->done);
- }
-