From 3c67623eb54053b4b8cc9ef918c6cefbf8fed610 Mon Sep 17 00:00:00 2001
From: DavidKorczynski <david@adalogics.com>
Date: Sat, 23 Jul 2022 01:14:26 +0100
Subject: [PATCH] pidgin: fix build (#8060)

* pidgin: fix build
---
 projects/pidgin/Dockerfile |  4 ++--
 projects/pidgin/build.sh   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/projects/pidgin/Dockerfile b/projects/pidgin/Dockerfile
index aa93e960d..2375c17c3 100644
--- a/projects/pidgin/Dockerfile
+++ b/projects/pidgin/Dockerfile
@@ -19,12 +19,12 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         make autoconf automake libtool pkg-config \
         zlib1g-dev zlib1g-dev:i386 liblzma-dev liblzma-dev:i386 \
-        wget intltool  sasl2-bin python3-pip
+        wget intltool  sasl2-bin python3-pip libpcre2-dev
 RUN pip3 install -U meson ninja
 
 RUN git clone --depth 1 https://gitlab.gnome.org/GNOME/glib
 RUN git clone --depth 1 https://gitlab.gnome.org/GNOME/libxml2.git
-RUN wget https://sourceforge.net/projects/pidgin/files/Pidgin/2.14.5/pidgin-2.14.5.tar.bz2
+RUN wget https://sourceforge.net/projects/pidgin/files/Pidgin/2.14.10/pidgin-2.14.10.tar.bz2
 RUN wget ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
 
 RUN git clone --depth 1 https://github.com/dvyukov/go-fuzz-corpus
diff --git a/projects/pidgin/build.sh b/projects/pidgin/build.sh
index 33bcf367e..ba8feeaa8 100644
--- a/projects/pidgin/build.sh
+++ b/projects/pidgin/build.sh
@@ -63,8 +63,8 @@ cp ${GLIB_BUILD}/glib/libglib-2.0.a ${DEPS}/
 
 # Build Pidgin
 cd $SRC 
-tar -xf pidgin-2.14.5.tar.bz2
-mv pidgin-2.14.5 pidgin
+tar -xf pidgin-2.14.10.tar.bz2
+mv pidgin-2.14.10 pidgin
 cd pidgin
 ./configure --disable-consoleui \
             --disable-shared \
@@ -106,8 +106,8 @@ for fuzzer in "${FUZZERS[@]}"; do
     -I${GLIB_BUILD} \
     -I${GLIB_BUILD}/glib \
     -I/usr/lib/x86_64-linux-gnu/glib-2.0/include \
+    -I/usr/local/include/libxml2  \
     -I/src/pidgin/libpurple/protocols/jabber \
-    -I/usr/local/include/libxml2 \
     -c $fuzzer.c \
     -o $fuzzer.o
 
@@ -115,12 +115,12 @@ for fuzzer in "${FUZZERS[@]}"; do
     -o $OUT/$fuzzer \
     /src/pidgin/libpurple/protocols/jabber/.libs/libjabber.a \
     ./.libs/libpurple.a \
-    ${DEPS}/libxml2.a \
     ${DEPS}/libgobject-2.0.a \
     ${DEPS}/libgmodule-2.0.a \
     ${DEPS}/libglib-2.0.a \
+    ${DEPS}/libxml2.a \
     ${DEPS}/libffi.a \
-    -lresolv -lz -llzma
+    -lresolv -lz -llzma -l:libpcre2-8.a
 done
 
 zip $OUT/pidgin_xml_fuzzer_seed_corpus.zip $SRC/go-fuzz-corpus/xml/corpus/*