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 [thread overview]
Message-ID: <20240819100608.991138-13-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20240819100608.991138-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 3289 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)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 --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;
--
2.39.2
next prev parent reply other threads:[~2024-08-19 10:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-19 10:05 Toolchain Update August 2024 Michael Tremer
2024-08-19 10:05 ` [PATCH 01/19] expect: Fix build with GCC 14.2 Michael Tremer
2024-08-19 10:05 ` [PATCH 02/19] coreutils: Drop uname patch Michael Tremer
2024-08-19 10:05 ` [PATCH 03/19] glibc: Update to 2.40 Michael Tremer
2024-08-19 10:05 ` [PATCH 04/19] make.sh: Bump the toolchain version Michael Tremer
2024-08-19 10:05 ` [PATCH 06/19] misc-progs: Fix compilation with GCC 14 Michael Tremer
2024-08-19 10:05 ` [PATCH 07/19] whatmask: Fix build " Michael Tremer
2024-08-19 10:05 ` [PATCH 08/19] ntp: " Michael Tremer
2024-08-19 10:05 ` [PATCH 09/19] setup: Fix compilation issues " Michael Tremer
2024-08-19 10:05 ` [PATCH 10/19] autoconf-archive: New package Michael Tremer
2024-08-19 10:06 ` [PATCH 11/19] berkeley: Fix build with GCC 14 Michael Tremer
2024-08-19 10:06 ` Michael Tremer [this message]
2024-08-19 10:06 ` [PATCH 13/19] ghostscript: Fix compilation " Michael Tremer
2024-08-19 10:06 ` [PATCH 14/19] collectd: Ignore compiler errors Michael Tremer
2024-08-19 10:06 ` [PATCH 15/19] syslinux: Fix build with GCC 14 Michael Tremer
2024-08-19 10:06 ` [PATCH 16/19] tftpd: " Michael Tremer
2024-08-19 10:06 ` [PATCH 17/19] telnet: " Michael Tremer
2024-08-19 10:06 ` [PATCH 18/19] lcdproc: " Michael Tremer
2024-08-19 10:06 ` [PATCH 19/19] gnupg: This package no longer seems to be able to link against LDAP Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240819100608.991138-13-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox