[Git][debian-proftpd-team/proftpd][master] upstream #1754

[Hilmar Preuße (@hilmar)]

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


Commits:
ed194c66 by Hilmar Preuße at 2024-10-05T16:30:29+02:00
upstream #1754

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/784a8e28332059cd6f41e7bcfbdc9b0142fe2c13.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -3,6 +3,8 @@ proftpd-dfsg (1.3.8.b+dfsg-3) UNRELEASED; urgency=medium
   * Patches:
     - Fetch pubkey from certificate before extracting its
       parameters (upstream #1769)
+    - configure: Use char ** for the iconv input argument
+      (upstream #1754)
   * Add mod_delay, mod_ls, mod_xfer to the list of core modules.
 
   [ Sergio Durigan Junior ]


=====================================
debian/patches/784a8e28332059cd6f41e7bcfbdc9b0142fe2c13.diff
=====================================
@@ -0,0 +1,36 @@
+From 784a8e28332059cd6f41e7bcfbdc9b0142fe2c13 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer at redhat.com>
+Date: Sat, 6 Jan 2024 20:55:32 +0100
+Subject: [PATCH] configure: Use char ** for the iconv input argument (#1754)
+
+The standard iconv function uses char ** even for the input buffer.
+Using the incompatible const char ** type causes the check to fail if
+the compiler treats such type errors as errors, instead of merely
+warning about it.
+---
+ configure    | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- proftpd.orig/configure
++++ proftpd/configure
+@@ -21419,7 +21419,7 @@
+ {
+ 
+     size_t res, in_len = 0, out_len = 0;
+-    const char *in = NULL;
++    char *in = NULL;
+     char *out = NULL;
+     res = iconv((iconv_t)-1, &in, &in_len, &out, &out_len);
+ 
+--- proftpd.orig/configure.in
++++ proftpd/configure.in
+@@ -2044,7 +2044,7 @@
+   ],
+   [ 
+     size_t res, in_len = 0, out_len = 0;
+-    const char *in = NULL;
++    char *in = NULL;
+     char *out = NULL;
+     res = iconv((iconv_t)-1, &in, &in_len, &out, &out_len);
+   ],


=====================================
debian/patches/series
=====================================
@@ -15,3 +15,4 @@ odbc
 85ff1cb9fb2feaae9928b50d05afd657fec3cfb4.diff
 # https://github.com/proftpd/proftpd/issues/1831
 03_disable_failing_coding_tests.diff
+784a8e28332059cd6f41e7bcfbdc9b0142fe2c13.diff



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/ed194c66f03c3e75e4e76b6e76d51f0bf962ae2f

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