From fcc49540af53f89ddcb6142064105719a761708d Mon Sep 17 00:00:00 2001 From: samuel40791765 Date: Fri, 15 Mar 2024 01:05:30 +0000 Subject: [PATCH] remove patch for bind9 --- .../ci/integration/bind9_patch/bind-fix.patch | 19 ------------------- tests/ci/integration/run_bind9_integration.sh | 9 --------- 2 files changed, 28 deletions(-) delete mode 100644 tests/ci/integration/bind9_patch/bind-fix.patch diff --git a/tests/ci/integration/bind9_patch/bind-fix.patch b/tests/ci/integration/bind9_patch/bind-fix.patch deleted file mode 100644 index 8629ad00d2c..00000000000 --- a/tests/ci/integration/bind9_patch/bind-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/tests/isc/Makefile.am b/tests/isc/Makefile.am -index 5cdd915..6ee1935 100644 ---- a/tests/isc/Makefile.am -+++ b/tests/isc/Makefile.am -@@ -115,10 +115,12 @@ proxyheader_test_SOURCES = \ - proxyheader_test_data.h - - proxystream_test_CPPFLAGS = \ -- $(AM_CPPFLAGS) -+ $(AM_CPPFLAGS) \ -+ $(OPENSSL_CFLAGS) - - proxystream_test_LDADD = \ -- $(LDADD) -+ $(LDADD) \ -+ $(OPENSSL_LIBS) - - proxystream_test_SOURCES = \ - proxystream_test.c \ diff --git a/tests/ci/integration/run_bind9_integration.sh b/tests/ci/integration/run_bind9_integration.sh index 92ff7dfe64e..c097d99a172 100755 --- a/tests/ci/integration/run_bind9_integration.sh +++ b/tests/ci/integration/run_bind9_integration.sh @@ -34,14 +34,6 @@ function bind9_build() { make -j ${NUM_CPU_THREADS} -k all } -# TODO: Remove this when we make an upstream contribution. -function bind9_patch() { - for patchfile in $(find -L "${BIND9_PATCH_FOLDER}" -type f -name '*.patch'); do - echo "Apply patch $patchfile..." - patch -p1 --quiet -i "$patchfile" - done -} - function bind9_run_tests() { make -j ${NUM_CPU_THREADS} check } @@ -60,7 +52,6 @@ export LD_LIBRARY_PATH="${AWS_LC_INSTALL_FOLDER}/lib" # Build bind9 from source. pushd ${BIND9_SRC_FOLDER} -bind9_patch bind9_build bind9_run_tests