From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 12/19] squidguard: Fix compliation with GCC 14 Date: Mon, 19 Aug 2024 10:06:01 +0000 Message-ID: <20240819100608.991138-13-michael.tremer@ipfire.org> In-Reply-To: <20240819100608.991138-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0466942927095816921==" List-Id: --===============0466942927095816921== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- lfs/squidguard | 2 + src/patches/squidguard-1.6.0-configure.patch | 55 ++++++++++++++++++++ src/patches/squidguard-1.6.0-stdlib.patch | 22 ++++++++ 3 files changed, 79 insertions(+) create mode 100644 src/patches/squidguard-1.6.0-configure.patch create mode 100644 src/patches/squidguard-1.6.0-stdlib.patch diff --git a/lfs/squidguard b/lfs/squidguard index c5decc79f..b42110c5f 100644 --- a/lfs/squidguard +++ b/lfs/squidguard @@ -72,6 +72,8 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidguard-1.6.0-stdli= b.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidguard-1.6.0-confi= gure.patch cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=3D/usr \ diff --git a/src/patches/squidguard-1.6.0-configure.patch b/src/patches/squid= guard-1.6.0-configure.patch new file mode 100644 index 000000000..22c87498d --- /dev/null +++ b/src/patches/squidguard-1.6.0-configure.patch @@ -0,0 +1,55 @@ +--- squidguard-1.6.0/configure.ac~ 2024-08-06 10:40:16.797400705 +0000 ++++ squidguard-1.6.0/configure.ac 2024-08-06 10:41:36.321245621 +0000 +@@ -237,7 +237,7 @@ + { + LDAP *p; + p =3D ldap_init("localhost", LDAP_PORT); +- exit(0); ++ return 0; + } + ]])],,[ + echo +@@ -358,8 +358,8 @@ + #endif + ver =3D major + ((float) minor / 1000); + if (ver >=3D 2.006) +- exit (0); +- exit (1); ++ return 0; ++ return 1; + }=09 + ]])], + [db_ok_version=3Dyes], +@@ -396,8 +396,8 @@ + #endif + ver =3D major + ((float) minor / 1000); + if (ver > 2.007 && ver < 3.002) +- exit (1); +- exit (0); ++ return 1; ++ return 0; + }=09 + ]])], + [db_ok_version=3Dyes], +@@ -432,8 +432,8 @@ + #endif + ver =3D major + ((float) minor / 1000); + if (ver >=3D 3.002) +- exit (0); +- exit (1); ++ return 0; ++ return 1; + }=09 + ]])], + [dbg2_ok_version=3Dyes], +@@ -460,8 +460,8 @@ + #endif + ver =3D major + ((float) minor / 1000); + if (ver >=3D 4.002) +- exit (0); +- exit (1); ++ return 0; ++ return 1; + }=09 + ]])], + [dbg3_ok_version=3Dyes], diff --git a/src/patches/squidguard-1.6.0-stdlib.patch b/src/patches/squidgua= rd-1.6.0-stdlib.patch new file mode 100644 index 000000000..51489b32d --- /dev/null +++ b/src/patches/squidguard-1.6.0-stdlib.patch @@ -0,0 +1,22 @@ +--- a/configure.ac 2022-12-15 10:33:13.845801113 +0300 ++++ b/configure.ac 2022-12-15 10:33:39.828949903 +0300 +@@ -342,6 +342,9 @@ + LIBS=3D"$LIBS -ldb" + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include ++ #ifdef HAVE_STDLIB_H ++ #include ++ #endif + int main()=20 + { + int major, minor, patch; +@@ -377,6 +378,9 @@ +=20 + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include ++ #ifdef HAVE_STDLIB_H ++ #include ++ #endif + int main()=20 + { + int major, minor, patch; --=20 2.39.2 --===============0466942927095816921==--