diff mbox series

[12/19] squidguard: Fix compliation with GCC 14

Message ID	20240819100608.991138-13-michael.tremer@ipfire.org
State	Staged
Commit	859a8aadaaccb29205df0f6d61131059a19392ad
Headers	From: Michael Tremer <michael.tremer@ipfire.org> 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> References: <20240819100608.991138-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: H4LTITCQICKXVSFDOKDZX4VDKP7FJAQE CC: Michael Tremer <michael.tremer@ipfire.org> Precedence: list Archived-At: <https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/message/H4LTITCQICKXVSFDOKDZX4VDKP7FJAQE/>
Series	[01/19] expect: Fix build with GCC 14.2 \| [01/19] expect: Fix build with GCC 14.2 [02/19] coreutils: Drop uname patch [03/19] glibc: Update to 2.40 [04/19] make.sh: Bump the toolchain version [05/19] GCC: Update to 14.2.0 [06/19] misc-progs: Fix compilation with GCC 14 [07/19] whatmask: Fix build with GCC 14 [08/19] ntp: Fix build with GCC 14 [09/19] setup: Fix compilation issues with GCC 14 [10/19] autoconf-archive: New package [11/19] berkeley: Fix build with GCC 14 [12/19] squidguard: Fix compliation with GCC 14 [13/19] ghostscript: Fix compilation with GCC 14 [14/19] collectd: Ignore compiler errors [15/19] syslinux: Fix build with GCC 14 [16/19] tftpd: Fix build with GCC 14 [17/19] telnet: Fix build with GCC 14 [18/19] lcdproc: Fix build with GCC 14 [19/19] gnupg: This package no longer seems to be able to link against LDAP

Commit Message

Michael Tremer Aug. 19, 2024, 10:06 a.m. UTC

  Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 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 mbox series

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-stdlib.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidguard-1.6.0-configure.patch
 	cd $(DIR_APP) && ./autogen.sh
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
diff --git a/src/patches/squidguard-1.6.0-configure.patch b/src/patches/squidguard-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 = ldap_init("localhost", LDAP_PORT);
+-           exit(0);
++           return 0;
+         }
+         ]])],,[
+            echo
+@@ -358,8 +358,8 @@
+ #endif
+         ver = major + ((float) minor / 1000);
+         if (ver >= 2.006)
+-			exit (0);
+-		exit (1);
++			return 0;
++		return 1;
+ 	}	
+ 	]])],
+ 	[db_ok_version=yes],
+@@ -396,8 +396,8 @@
+ #endif
+         ver = major + ((float) minor / 1000);
+         if (ver > 2.007 && ver < 3.002)
+-			exit (1);
+-		exit (0);
++			return 1;
++		return 0;
+ 	}	
+ 	]])],
+ 	[db_ok_version=yes],
+@@ -432,8 +432,8 @@
+ #endif
+         ver = major + ((float) minor / 1000);
+         if (ver >= 3.002)
+-			exit (0);
+-		exit (1);
++			return 0;
++		return 1;
+ 	}	
+ 	]])],
+ 	[dbg2_ok_version=yes],
+@@ -460,8 +460,8 @@
+ #endif
+         ver = major + ((float) minor / 1000);
+         if (ver >= 4.002)
+-			exit (0);
+-		exit (1);
++			return 0;
++		return 1;
+ 	}	
+ 	]])],
+ 	[dbg3_ok_version=yes],
diff --git a/src/patches/squidguard-1.6.0-stdlib.patch b/src/patches/squidguard-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="$LIBS -ldb"
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+     #include <db.h>
++    #ifdef HAVE_STDLIB_H
++        #include <stdlib.h>
++    #endif
+     int main() 
+     {
+         int major, minor, patch;
+@@ -377,6 +378,9 @@
+ 
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+     #include <db.h>
++    #ifdef HAVE_STDLIB_H
++        #include <stdlib.h>
++    #endif
+     int main() 
+     {
+         int major, minor, patch;