- updated to 1.3.9, updated mod_clamav, updated default certificates

diff --git a/mod_clamav_gcc15.patch b/mod_clamav_gcc15.patch
new file mode 100644 (file)
index 0000000..daa1ba5
--- /dev/null
+++ b/mod_clamav_gcc15.patch
@@ -0,0 +1,80 @@
+From ea822d6aa428b47aa9681d60af8d3c3d9eae0600 Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj@castaglia.org>
+Date: Sat, 12 Apr 2025 09:02:45 -0700
+Subject: [PATCH] Issue #23: Fix compilation with newer GCC versions, which
+ complain of variables named `bool`.
+
+---
+ mod_clamav.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/mod_clamav.c b/mod_clamav.c
+index e25e99d..3be0ca6 100644
+--- a/mod_clamav.c
++++ b/mod_clamav.c
+@@ -667,18 +667,18 @@ static unsigned long parse_nbytes(char *nbytes_str, char *units_str) {
+  * Configuration setter: ClamAV
+  */
+ MODRET set_clamav(cmd_rec *cmd) {
+-  int bool = -1;
++  int engine = -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 ((engine = 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]) = engine;
+   c->flags |= CF_MERGEDOWN;
+ 
+   return PR_HANDLED(cmd);
+@@ -688,18 +688,18 @@ MODRET set_clamav(cmd_rec *cmd) {
+  * Configuration setter: ClamStream
+  */
+ MODRET set_clamstream(cmd_rec *cmd) {
+-  int bool = -1;
++  int use_stream = -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 ((use_stream = 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]) = use_stream;
+   c->flags |= CF_MERGEDOWN;
+ 
+   return PR_HANDLED(cmd);
+@@ -709,18 +709,18 @@ MODRET set_clamstream(cmd_rec *cmd) {
+  * Configuration setter: ClamFailsafe
+  */
+ MODRET set_clamfailsafe(cmd_rec *cmd) {
+-  int bool = -1;
++  int use_failsafe = -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 ((use_failsafe = 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]) = use_failsafe;
+   c->flags |= CF_MERGEDOWN;
+ 
+   return PR_HANDLED(cmd);

diff --git a/proftpd-server.crt b/proftpd-server.crt
index 62d81d88d36e4e2cac477a1225f6c3d085a2ee6b..7bbf4dd576f83a343cf5d2c636f95e3fd0eec320 100644 (file)
--- a/proftpd-server.crt
+++ b/proftpd-server.crt
@@ -1,17 +1,34 @@
 -----BEGIN CERTIFICATE-----
-MIICFjCCAX+gAwIBAgIBATANBgkqhkiG9w0BAQQFADBQMRowGAYDVQQKExFEdW1t
-eSBjZXJ0aWZpY2F0ZTEbMBkGA1UECxMSSGFzIHRvIGJlIHJlcGxhY2VkMRUwEwYD
-VQQDEwx3d3cuYWR2eC5jb20wHhcNMDEwNDA5MDg0NjUyWhcNMDIwNDA5MDg0NjUy
-WjBSMSEwHwYDVQQKExhBZHZhbmNlZCBFeHRyYW5ldCBTZXJ2ZXIxGTAXBgNVBAsT
-EFRlc3QgQ2VydGlmaWNhdGUxEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAoRtceA5d+grmrN76yHT4TQvbLQqvTsq2fFafNBT/
-DdSh05okHdTldu8kgTvBzpLPuOQvSwy2SzQLwF6nmzWdfY21U33NARp46i/QWD3V
-rgIXuhXtToTnkEE6/OGq5KeELgF/EKSXLXkDydyHg9mFlh/J/kKtjv3wtIHceOGn
-E18CAwEAATANBgkqhkiG9w0BAQQFAAOBgQCShXMRerTzEJMkIdCDD+ZkOetE65j0
-mkgAGT4etmSiUmNWXy/P26zh1P51YeS4TZFpXxgONVK9PIywhhkVNB8JFdXYKbxW
-0h0caVoEHwnfkSERcBVffxaZEDtWa95nxD8pHiZ+++PPOV1P29Ta2j23MWq2JitY
-U2Y59HXWwglSaQ==
+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
+Gr15HUY4A6V4E5fvVw==
 -----END CERTIFICATE-----
-
-
-#DUMMY
\ No newline at end of file

diff --git a/proftpd-server.key b/proftpd-server.key
index 08c373cc9f258a0b201abbc9763b82ee141ddced..d00da4b0ff4aa64c65c6dc9e3c9381226952914b 100644 (file)
--- a/proftpd-server.key
+++ b/proftpd-server.key
@@ -1,18 +1,52 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQChG1x4Dl36Cuas3vrIdPhNC9stCq9OyrZ8Vp80FP8N1KHTmiQd
-1OV27ySBO8HOks+45C9LDLZLNAvAXqebNZ19jbVTfc0BGnjqL9BYPdWuAhe6Fe1O
-hOeQQTr84arkp4QuAX8QpJcteQPJ3IeD2YWWH8n+Qq2O/fC0gdx44acTXwIDAQAB
-AoGASjM323OChO8QXv4zsq9szM9xGsWZCEkE0y9yE6K39b7A6ZxMlhC/vo9V2M+U
-63dihF1UCtTIAMrvvqHZv/pplfbUJDAeNm38BBlA/ZQL8iV9qxNrBEfBkLi5AtcR
-vJq5NitAE+vpcn00QNs7EKflRwi5arQOBGqS9c3uPimtOcECQQDQc9onX9kZuzz6
-69GQYkkj3dkZx6lCtDDexTWkM1yXGVSjvFA7fZOKJRNkGgc6iwbnTsEJfaEC9j7r
-AkF7/92dAkEAxdrbwKjx4/OZnve82O4VRGkZFo6c47QDXCKhlRdJzrBSCNOnRaLx
-vjtYXbqq8BPgdGO72pj1TaAlp1+kxdYiKwJBALBhtzAl/C+3rUusirCfWcANkgws
-U95rVgbJ3C/KfggkmOfLCiCsi1ETOiszkvZIeVjz3IdJVBqLfoWgbQSdZkkCQQDF
-WpBWdW6KnSL/0Uda7ujhyx+OQ4S1EItFbPnV+FvTwkahrVUtfeI6iYGURK1bOchq
-8EyiOG5/Fp5YfGukNvrvAkBT5AAvfk6nFHshdHDhTZs+5TE24g0aTtMEQc82cobd
-JG5vFxybo3z1l1QU4/pG3jP847/6HtZCxZ/J0xLATJml
------END RSA PRIVATE KEY-----
-
-
-#DUMMY
\ No newline at end of file
+-----BEGIN PRIVATE KEY-----
+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
+SMNgvxbVInbT7wFAlEK3i+ol1nhOOA==
+-----END PRIVATE KEY-----

diff --git a/proftpd.spec b/proftpd.spec
index 1885e9d2cf8812e6143259a5fe08d5ac54c9875d..0ec511182a9bc2e7f1b65ed8b13fd3d71dd0e7e9 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -18,7 +18,7 @@
 %bcond_without wrap2file       # wrap2 file support
 
 #
-%define                mod_clamav_version      0.13
+%define                mod_clamav_version      master
 
 Summary:       PROfessional FTP Daemon with apache-like configuration syntax
 Summary(es.UTF-8):     Servidor FTP profesional, con sintaxis de configuración semejante a la del apache
@@ -26,16 +26,17 @@ Summary(pl.UTF-8):  PROfesionalny serwer FTP
 Summary(pt_BR.UTF-8):  Servidor FTP profissional, com sintaxe de configuração semelhante à do apache
 Summary(zh_CN.UTF-8):  易于管理的,安全的 FTP 服务器
 Name:          proftpd
-Version:       1.3.8c
+Version:       1.3.9
 Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Daemons
 Source0:       ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz
-# Source0-md5: 790e3d6221eb5a195dde6da5e4f17dff
+# Source0-md5: 760b2bf912e4ac26b5f1aa9d25b440c6
 # https://github.com/jbenden/mod_clamav/releases
-Source1:       https://github.com/jbenden/mod_clamav/archive/v%{mod_clamav_version}/mod_clamav-%{mod_clamav_version}.tar.gz
-# Source1-md5: 955269eb8b00ebcc217bbd6f74df4e1c
+#Source1:      https://github.com/jbenden/mod_clamav/archive/v%{mod_clamav_version}/mod_clamav-%{mod_clamav_version}.tar.gz
+Source1:       mod_clamav-20240420.tar.gz
+# Source1-md5: eac905d0a5777ff43e9dceaa5ccb9748
 Source2:       %{name}.conf
 Source3:       ftp.pamd
 Source4:       %{name}.inetd
@@ -54,7 +55,7 @@ Patch0:               %{name}-paths.patch
 Patch1:                %{name}-noautopriv.patch
 Patch2:                %{name}-wtmp.patch
 Patch3:                %{name}-pool.patch
-Patch4:                %{name}-link.patch
+Patch4:                mod_clamav_gcc15.patch
 URL:           http://www.proftpd.org/
 BuildRequires: GeoIP-devel
 BuildRequires: acl-devel
@@ -174,7 +175,7 @@ Obsoletes:  heimdal-ftpd
 Obsoletes:     krb5-ftpd
 Obsoletes:     linux-ftpd
 Obsoletes:     muddleftpd
-Obsoletes:     proftpd-standalone
+Obsoletes:     proftpd-standalone <= %{epoch}:%{version}-%{release}
 Obsoletes:     pure-ftpd
 Obsoletes:     troll-ftpd
 Obsoletes:     vsftpd
@@ -209,7 +210,7 @@ Obsoletes:  heimdal-ftpd
 Obsoletes:     krb5-ftpd
 Obsoletes:     linux-ftpd
 Obsoletes:     muddleftpd
-Obsoletes:     proftpd-inetd
+Obsoletes:     proftpd-inetd <= %{epoch}:%{version}-%{release}
 Obsoletes:     pure-ftpd
 Obsoletes:     troll-ftpd
 Obsoletes:     vsftpd
@@ -556,12 +557,14 @@ Moduł zapewniający serwerowi ProFTPD obsługę protokołu SFTP
 http://www.proftpd.org/docs/contrib/mod_sftp.html
 
 %prep
-%setup -q -n %{name}-%{version}%{?_rc} -a1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%setup -q -n %{name}-%{version} -a1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+cd mod_clamav-%{mod_clamav_version}
+%patch -P4 -p1
+cd ..
 
 # mod_clamav
 # no patch as of 0.13
@@ -702,7 +705,6 @@ ln -sf proftpd $RPM_BUILD_ROOT%{_sbindir}/ftpd
 %{__rm} $RPM_BUILD_ROOT%{_libexecdir}/*.la
 
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/ftpusers-path.diff*
-%{__rm} include/mod_sftp/confdefs.h
 cp -aL include/* config.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 
 %{__mv} $RPM_BUILD_ROOT%{_localedir}/bg{_BG,}
@@ -809,8 +811,8 @@ fi
 
 %files common -f %{name}.lang
 %defattr(644,root,root,755)
-%doc CREDITS ChangeLog NEWS README.md README.modules RELEASE_NOTES
-%doc doc/{*.html,contrib,howto,modules} sample-configurations/*.conf
+%doc CREDITS ChangeLog NEWS README.md RELEASE_NOTES
+%doc doc/{*.html,contrib,directives,howto,modules,utils} sample-configurations/*.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/proftpd
 %dir %attr(750,root,ftp) %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/proftpd.conf
@@ -892,7 +894,6 @@ fi
 %if %{with ldap}
 %files mod_ldap
 %defattr(644,root,root,755)
-%doc README.LDAP
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_ldap.conf
 %attr(755,root,root) %{_libexecdir}/mod_ldap.so
 %endif