[Git][debian-proftpd-team/proftpd][master] 2 commits: Fix for #1104536 in 1.3.9 branch.

[Hilmar Preuße (@hilmar)]

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


Commits:
7478a950 by Hilmar Preuße at 2025-05-13T19:33:49+02:00
Fix for #1104536 in 1.3.9 branch.

- - - - -
2d509c31 by Hilmar Preuße at 2025-05-13T19:40:34+02:00
Force loading of modules mod_ls.c & mod_xfer.c.

- - - - -


5 changed files:

- debian/changelog
- debian/proftpd-core.NEWS
- debian/proftpd-core.logrotate
- debian/proftpd-core.postinst
- debian/templates/modules.conf


Changes:

=====================================
debian/changelog
=====================================
@@ -1,7 +1,13 @@
 proftpd-dfsg (1.3.9~dfsg-2) UNRELEASED; urgency=medium
 
-  *  Add patch for Issue #1886: Fix the handling of SCP target paths
-     that might contain spaces.
+  * Add code to proftp postinst to force mod_ls.c & mod_xfer.c into
+    modules.conf in case of upgrades.
+  * Load modules mod_delay.c, mod_ls.c & mod_xfer.c in modules.conf,
+    else proftp won't start using default/sample configuration
+
+  * Add patch for Issue #1886: Fix the handling of SCP target paths
+    that might contain spaces.
+  * Ftpstats references wrong file in logrotate config (Closes: #1104536).
 
  -- Hilmar Preuße <hille42 at debian.org>  Sat, 19 Apr 2025 10:46:47 +0200
 


=====================================
debian/proftpd-core.NEWS
=====================================
@@ -1,3 +1,13 @@
+proftpd-dfsg (1.3.9~dfsg-2) UNRELEASED; urgency=high
+
+    The modules mod_ls.c & mod_xfer.c are built as modules and are needed to
+    run the Debian default configuration. We added code snippets to insert
+    the LoadModule statements into /etc/proftpd/modules.conf. Please accept
+    to overwrite the modules.conf, else the proftp server won't start after
+    upgrade.
+
+ -- Hilmar Preuße <hille42 at debian.org>  Thu, 01 May 2025 23:14:44 +0200
+
 proftpd-dfsg (1.3.8+dfsg-7) unstable; urgency=medium
 
     If you upgrade from 1.3.8+dfsg-4 (i.e. th 12.0 edition of bookworm) note


=====================================
debian/proftpd-core.logrotate
=====================================
@@ -32,6 +32,6 @@
 		# reload could be not sufficient for all logs, a restart is safer
 		invoke-rc.d proftpd restart 2>/dev/null >/dev/null || true
 		# run ftpstats on past transfer log
-		ftpstats -a -r -l 2 -d -h -f /var/log/proftpd/xferlog.0 2>/dev/null >/var/log/proftpd/xferreport || true
+		ftpstats -a -r -l 2 -d -h -f /var/log/proftpd/xferlog.1 2>/dev/null >/var/log/proftpd/xferreport || true
 	endscript
 }


=====================================
debian/proftpd-core.postinst
=====================================
@@ -97,6 +97,24 @@ add_mod_ident()
     fi
 }
 
+add_mod_ls()
+{
+    if [ -f $MODULES_NEW ] ; then
+	if ! egrep -qi "^[[:space:]]|#*LoadModule mod_ls.c" $MODULES_NEW ; then
+		perl -pi -e "s{^(ModulePath .*)}{\1\n# Debian #1103154: needed to make default config executable\n#\nLoadModule mod_ls.c\n}i;" $MODULES_NEW
+	fi
+    fi
+}
+
+add_mod_xfer()
+{
+    if [ -f $MODULES_NEW ] ; then
+	if ! egrep -qi "^[[:space:]]|#*LoadModule mod_xfer.c" $MODULES_NEW ; then
+		perl -pi -e "s{^(ModulePath .*)}{\1\n# Debian #1103154: needed to make default config executable\n#\nLoadModule mod_xfer.c\n}i;" $MODULES_NEW
+	fi
+    fi
+}
+
 replace_file () {
     file=$1
     if [ ! -f ${file} ] ; then
@@ -181,6 +199,8 @@ if [ "$1" = "configure" ]; then
     include_modules
     identlookups
     add_mod_ident
+    add_mod_ls
+    add_mod_xfer
 
     # disable old cron jobs if needed
     disable_script /etc/cron.monthly/proftpd


=====================================
debian/templates/modules.conf
=====================================
@@ -17,6 +17,11 @@ ModuleControlsACLs lsmod allow user *
 
 LoadModule mod_ctrls_admin.c
 
+# Debian #1103154: needed to make default config executable
+LoadModule mod_delay.c
+LoadModule mod_ls.c
+LoadModule mod_xfer.c
+
 # Install proftpd-mod-crypto to use this module for TLS/SSL support.
 #LoadModule mod_tls.c
 # Even these modules depend on the previous one



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/fca1c00522b6d3050716ebb9e9f67b57d8ef84b9...2d509c3189698aef24bb3dd75fddadf859c87eeb

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