[Git][debian-proftpd-team/proftpd-mod-clamav][master] Add patch gcc-15.diff to fix compilation with gcc-15.

[Hilmar Preuße (@hilmar)]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd-mod-clamav


Commits:
a4917969 by Hilmar Preuße at 2025-04-12T15:23:12+02:00
Add patch gcc-15.diff to fix compilation with gcc-15.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/gcc-15.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -4,6 +4,7 @@ proftpd-mod-clamav (0.14~rc2-5) UNRELEASED; urgency=medium
   * Update debian/gitlab-ci.yml file; Disable REPROTEST for now.
   * Add patch 19.patch to make the module compatible to the upcoming
     proftp v1.3.9.
+  * Add patch gcc-15.diff to fix compilation with gcc-15.
 
  -- Hilmar Preuße <hille42 at debian.org>  Wed, 06 Nov 2024 18:20:11 +0100
 


=====================================
debian/patches/gcc-15.diff
=====================================
@@ -0,0 +1,68 @@
+--- proftpd-mod-clamav.orig/mod_clamav.c
++++ proftpd-mod-clamav/mod_clamav.c
+@@ -659,18 +659,18 @@
+  * Configuration setter: ClamAV
+  */
+ MODRET set_clamav(cmd_rec *cmd) {
+-  int bool = -1;
++  int boolean = -1;
+   config_rec *c = NULL;
+ 
+   CHECK_ARGS(cmd, 1);
+   CHECK_CONF(cmd, CONF_ROOT|CONF_LIMIT|CONF_VIRTUAL|CONF_GLOBAL|CONF_DIR);
+ 
+-  if ((bool = get_boolean(cmd,1)) == -1)
++  if ((boolean = get_boolean(cmd,1)) == -1)
+     CONF_ERROR(cmd, "expected Boolean parameter");
+ 
+   c = add_config_param(cmd->argv[0], 1, NULL);
+   c->argv[0] = pcalloc(c->pool, sizeof(unsigned char));
+-  *((unsigned char *) c->argv[0]) = bool;
++  *((unsigned char *) c->argv[0]) = boolean;
+   c->flags |= CF_MERGEDOWN;
+ 
+   return PR_HANDLED(cmd);
+@@ -680,18 +680,18 @@
+  * Configuration setter: ClamStream
+  */
+ MODRET set_clamstream(cmd_rec *cmd) {
+-  int bool = -1;
++  int boolean = -1;
+   config_rec *c = NULL;
+ 
+   CHECK_ARGS(cmd, 1);
+   CHECK_CONF(cmd, CONF_ROOT|CONF_LIMIT|CONF_VIRTUAL|CONF_GLOBAL|CONF_DIR);
+ 
+-  if ((bool = get_boolean(cmd,1)) == -1)
++  if ((boolean = get_boolean(cmd,1)) == -1)
+     CONF_ERROR(cmd, "expected Boolean parameter");
+ 
+   c = add_config_param(cmd->argv[0], 1, NULL);
+   c->argv[0] = pcalloc(c->pool, sizeof(unsigned char));
+-  *((unsigned char *) c->argv[0]) = bool;
++  *((unsigned char *) c->argv[0]) = boolean;
+   c->flags |= CF_MERGEDOWN;
+ 
+   return PR_HANDLED(cmd);
+@@ -701,18 +701,18 @@
+  * Configuration setter: ClamFailsafe
+  */
+ MODRET set_clamfailsafe(cmd_rec *cmd) {
+-  int bool = -1;
++  int boolean = -1;
+   config_rec *c = NULL;
+ 
+   CHECK_ARGS(cmd, 1);
+   CHECK_CONF(cmd, CONF_ROOT|CONF_LIMIT|CONF_VIRTUAL|CONF_GLOBAL|CONF_DIR);
+ 
+-  if ((bool = get_boolean(cmd, 1)) == -1)
++  if ((boolean = get_boolean(cmd, 1)) == -1)
+     CONF_ERROR(cmd, "expected Boolean parameter");
+ 
+   c = add_config_param(cmd->argv[0], 1, NULL);
+   c->argv[0] = pcalloc(c->pool, sizeof(unsigned char));
+-  *((unsigned char *) c->argv[0]) = bool;
++  *((unsigned char *) c->argv[0]) = boolean;
+   c->flags |= CF_MERGEDOWN;
+ 
+   return PR_HANDLED(cmd);


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 19.patch
+gcc-15.diff



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-clamav/-/commit/a49179698e5c5b002fba431f287480856f27b1e5

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-clamav/-/commit/a49179698e5c5b002fba431f287480856f27b1e5
You're receiving this email because of your account on salsa.debian.org.