[Git][debian-proftpd-team/proftpd][master] More post-release patches.

[Hilmar Preuße (@hilmar)]

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


Commits:
db6873af by Hilmar Preuße at 2026-10-31T00:27:56+01:00
More post-release patches.

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/0f91a0f088312da4862d1f882cdf998e78fa3795.diff
- + debian/patches/c4515f5bd4236a803213c9df926e4094c4b003f2.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,7 @@
 proftpd-dfsg (1.3.9e~dfsg-2) UNRELEASED; urgency=medium
 
   * Remove obsolete patches.
-  * Apply patch for upstream issue #2411.
+  * Apply patch for upstream issue #2411 + further post release patches.
   * Apply patch to disable netaddr_get_addr2_test (fails on loong64).
 
  -- Hilmar Preuße <hille42 at debian.org>  Tue, 27 Oct 2026 21:36:28 +0100


=====================================
debian/patches/0f91a0f088312da4862d1f882cdf998e78fa3795.diff
=====================================
@@ -0,0 +1,24 @@
+From 0f91a0f088312da4862d1f882cdf998e78fa3795 Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj at castaglia.org>
+Date: Wed, 28 Oct 2026 11:38:27 -0700
+Subject: [PATCH] Issue #2388: Unfortunately, I inadvertently reverted the
+ permission changes for this issue.
+
+In https://github.com/proftpd/proftpd/commit/e1d27608c4b6e081312b3a7cadda93e369874adb I use elevated privileges, which is good, but that also reverted the actual permission change, which is bad.
+---
+ contrib/mod_ban.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/mod_ban.c b/contrib/mod_ban.c
+index b76f08dd07..e8669a8245 100644
+--- a/contrib/mod_ban.c
++++ b/contrib/mod_ban.c
+@@ -832,7 +832,7 @@ static struct ban_data *ban_get_shm(pr_fh_t *tabfh) {
+    */
+ 
+   PRIVS_ROOT
+-  shmid = shmget(key, sizeof(struct ban_data), IPC_CREAT|IPC_EXCL|0666);
++  shmid = shmget(key, sizeof(struct ban_data), IPC_CREAT|IPC_EXCL|0600);
+   xerrno = errno;
+   PRIVS_RELINQUISH
+ 


=====================================
debian/patches/c4515f5bd4236a803213c9df926e4094c4b003f2.diff
=====================================
@@ -0,0 +1,29 @@
+From c4515f5bd4236a803213c9df926e4094c4b003f2 Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj at castaglia.org>
+Date: Tue, 15 Sep 2026 09:12:09 -0700
+Subject: [PATCH] Avoid potential null pointer dereference in helper function
+ for Issue #2319.
+
+---
+ modules/mod_auth.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/modules/mod_auth.c b/modules/mod_auth.c
+index ac173af8d..42857f776 100644
+--- a/modules/mod_auth.c
++++ b/modules/mod_auth.c
+@@ -142,9 +142,12 @@ static int auth_session_timeout_cb(CALLBACK_FRAME) {
+ }
+ 
+ static void reset_authenticated_without_pass(cmd_rec *cmd) {
+-  unsigned char *authenticated;
++  unsigned char *authenticated = NULL;
++
++  if (cmd != NULL) {
++    authenticated = get_param_ptr(cmd->server->conf, "authenticated", FALSE);
++  }
+ 
+-  authenticated = get_param_ptr(cmd->server->conf, "authenticated", FALSE);
+   if (authenticated != NULL) {
+     remove_config(main_server->conf, "authenticated", FALSE);
+   }


=====================================
debian/patches/series
=====================================
@@ -12,3 +12,5 @@ odbc
 04_disable_base_netaddr_get_addr_test2.diff
 #ca9a7469ced3a7baf8ab9cc97f7c6b4c5ee3de75.diff
 933abc9ae115ffc59e4b2a98495ec267bf341d23.diff
+0f91a0f088312da4862d1f882cdf998e78fa3795.diff
+c4515f5bd4236a803213c9df926e4094c4b003f2.diff



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

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/db6873af7c96c7dceb9e115f1f11b5703292411e
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help