diff --git a/.gitignore b/.gitignore index 3c3f0e2..da05c2a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ pure-ftpd-1.0.29.tar.bz2 /pure-ftpd-1.0.42.tar.bz2 /pure-ftpd-1.0.46.tar.bz2 /pure-ftpd-1.0.47.tar.bz2 +/pure-ftpd-1.0.48.tar.bz2 diff --git a/0001-Exit-when-given-an-invalid-cmdline-option.patch b/0001-Exit-when-given-an-invalid-cmdline-option.patch deleted file mode 100644 index 2e069d8..0000000 --- a/0001-Exit-when-given-an-invalid-cmdline-option.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8b6e9370ccbdff47107963c352caab24fdb0fcaa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= -Date: Wed, 7 Feb 2018 13:28:02 +0100 -Subject: [PATCH 1/2] Exit when given an invalid cmdline option - ---- - src/ftpd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ftpd.c b/src/ftpd.c -index e19d8de..5c77410 100644 ---- a/src/ftpd.c -+++ b/src/ftpd.c -@@ -6192,7 +6192,7 @@ int pureftpd_start(int argc, char *argv[], const char *home_directory_) - exit(EXIT_SUCCESS); - } - default: -- logfile(LOG_WARNING, MSG_ILLEGAL_OPTION); -+ die(421, LOG_ERR, MSG_ILLEGAL_OPTION); - } - } - #ifdef WITH_RFC2640 --- -2.14.3 - diff --git a/0001-Fix-postgresql-authenticate-bug.patch b/0001-Fix-postgresql-authenticate-bug.patch deleted file mode 100644 index b6044be..0000000 --- a/0001-Fix-postgresql-authenticate-bug.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a256a21e48177e1d73d7e70b2292c76ac40ffb7 Mon Sep 17 00:00:00 2001 -From: t-asaka -Date: Mon, 28 May 2018 22:29:25 +0900 -Subject: [PATCH] Fix postgresql authenticate bug - ---- - src/log_pgsql.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/log_pgsql.c b/src/log_pgsql.c -index 4df654e..3825afb 100644 ---- a/src/log_pgsql.c -+++ b/src/log_pgsql.c -@@ -504,7 +504,7 @@ void pw_pgsql_check(AuthResult * const result, - crypto_crypt++; - crypto_md5++; - crypto_sha1++; -- } else if (strcasecmp(crypto, PASSWD_SQL_ARGON2)) { -+ } else if (strcasecmp(crypto, PASSWD_SQL_ARGON2) == 0) { - crypto_argon2++; - } else if (strcasecmp(crypto, PASSWD_SQL_SCRYPT) == 0) { - crypto_scrypt++; --- -2.20.1 - diff --git a/0001-Increase-MAX_DATA_SIZE-due-to-Argon2id-requirements.patch b/0001-Increase-MAX_DATA_SIZE-due-to-Argon2id-requirements.patch deleted file mode 100644 index f9545bd..0000000 --- a/0001-Increase-MAX_DATA_SIZE-due-to-Argon2id-requirements.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 27a5c200f9643ce907118aad169279b3a66a9e8a Mon Sep 17 00:00:00 2001 -From: Frank Denis -Date: Sat, 4 Nov 2017 20:46:16 +0100 -Subject: [PATCH] Increase MAX_DATA_SIZE due to Argon2id requirements - ---- - src/ftpd.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ftpd.h b/src/ftpd.h -index 1beeab8..5bb1f6b 100644 ---- a/src/ftpd.h -+++ b/src/ftpd.h -@@ -557,7 +557,7 @@ Your platform has a very large PATH_MAX, we should not trust it. - - #ifndef MAX_DATA_SIZE - # ifdef HAVE_LIBSODIUM --# define MAX_DATA_SIZE (40 * 1024 * 1024) -+# define MAX_DATA_SIZE (70 * 1024 * 1024) - # elif defined(WITH_LDAP) || defined(WITH_MYSQL) || defined(WITH_PGSQL) - # define MAX_DATA_SIZE (16 * 1024 * 1024) /* Max memory usage - SQL/LDAP need more */ - # else --- -2.14.3 - diff --git a/0001-Temporarily-disable-TLSv1.3-support.patch b/0001-Temporarily-disable-TLSv1.3-support.patch deleted file mode 100644 index 5297028..0000000 --- a/0001-Temporarily-disable-TLSv1.3-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f9e232ffb44c96538f2a12c4bc4970f228f971cd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= -Date: Tue, 12 Feb 2019 11:17:16 +0100 -Subject: [PATCH] Temporarily disable TLSv1.3 support - -Disable TLSv1.3 until support for it is fixed in pure-ftpd. This is a -workaround for the following issue: -https://github.com/jedisct1/pure-ftpd/issues/102 ---- - src/tls.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/tls.c b/src/tls.c -index c4e2a1b..41d619f 100644 ---- a/src/tls.c -+++ b/src/tls.c -@@ -301,6 +301,10 @@ int tls_init_library(void) - # endif - # ifdef SSL_OP_NO_TLSv1_2 - SSL_CTX_clear_options(tls_ctx, SSL_OP_NO_TLSv1_2); -+# endif -+ /* Disable TLSv1.3 support until it works properly in pure-ftpd */ -+# ifdef SSL_OP_NO_TLSv1_3 -+ SSL_CTX_set_options(tls_ctx, SSL_OP_NO_TLSv1_3); - # endif - if (tlsciphersuite != NULL) { - if (SSL_CTX_set_cipher_list(tls_ctx, tlsciphersuite) != 1) { --- -2.20.1 - diff --git a/0002-Complain-when-both-options-and-config-file-are-given.patch b/0002-Complain-when-both-options-and-config-file-are-given.patch deleted file mode 100644 index 12169f7..0000000 --- a/0002-Complain-when-both-options-and-config-file-are-given.patch +++ /dev/null @@ -1,237 +0,0 @@ -From 4328fd5142d0f981687a484f4be34333432d27d1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= -Date: Wed, 7 Feb 2018 15:05:25 +0100 -Subject: [PATCH 2/2] Complain when both options and config file are given on - cmdline - ---- - src/ftpd.c | 3 +++ - src/messages_cs_cz.h | 1 + - src/messages_da.h | 1 + - src/messages_de.h | 1 + - src/messages_en.h | 1 + - src/messages_es.h | 1 + - src/messages_fr.h | 1 + - src/messages_fr_funny.h | 1 + - src/messages_hu.h | 1 + - src/messages_it.h | 1 + - src/messages_kr.h | 1 + - src/messages_nl.h | 1 + - src/messages_no.h | 1 + - src/messages_pl.h | 1 + - src/messages_pt_br.h | 1 + - src/messages_ro.h | 1 + - src/messages_ru.h | 1 + - src/messages_sk.h | 1 + - src/messages_sv.h | 1 + - src/messages_tr.h | 1 + - src/messages_zh_cn.h | 1 + - src/messages_zh_tw.h | 1 + - 22 files changed, 24 insertions(+) - -diff --git a/src/ftpd.c b/src/ftpd.c -index 5c77410..3f474d2 100644 ---- a/src/ftpd.c -+++ b/src/ftpd.c -@@ -6195,6 +6195,9 @@ int pureftpd_start(int argc, char *argv[], const char *home_directory_) - die(421, LOG_ERR, MSG_ILLEGAL_OPTION); - } - } -+ if (optind < argc) { -+ die(421, LOG_ERR, MSG_INVALID_ARGUMENT, argv[optind]); -+ } - #ifdef WITH_RFC2640 - if (charset_fs == NULL) { - charset_fs = (char *) "utf-8"; -diff --git a/src/messages_cs_cz.h b/src/messages_cs_cz.h -index ef225ba..e103b37 100644 ---- a/src/messages_cs_cz.h -+++ b/src/messages_cs_cz.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Neplatn� argument: \"%s\"" -diff --git a/src/messages_da.h b/src/messages_da.h -index ed6f77c..c79ad5a 100644 ---- a/src/messages_da.h -+++ b/src/messages_da.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_de.h b/src/messages_de.h -index e7ae9a9..cd6bc08 100644 ---- a/src/messages_de.h -+++ b/src/messages_de.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_en.h b/src/messages_en.h -index e980131..cb9abf3 100644 ---- a/src/messages_en.h -+++ b/src/messages_en.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_es.h b/src/messages_es.h -index 0c27d4f..60ed849 100644 ---- a/src/messages_es.h -+++ b/src/messages_es.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_fr.h b/src/messages_fr.h -index 7f41dae..a012c05 100644 ---- a/src/messages_fr.h -+++ b/src/messages_fr.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT doit etre precede d'une commande PBSZ reussie" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP n'a pas retourne d'attribut userPassword, verifiez les droits d'acces LDAP." - #define MSG_LDAP_INVALID_AUTH_METHOD "Methode LDAPAuthMethod invalide dans le fichier de configuration. Ce doit etre 'bind' ou 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_fr_funny.h b/src/messages_fr_funny.h -index c77e5bc..dff760b 100644 ---- a/src/messages_fr_funny.h -+++ b/src/messages_fr_funny.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT ca marche qu'apres un PBSZ reussi" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP n'a pas retourne d'attribut userPassword, ptet que les droits d'acces LDAP chient." - #define MSG_LDAP_INVALID_AUTH_METHOD "LDAPAuthMethod dans le fichier de conf, ca doit etre 'bind' ou 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_hu.h b/src/messages_hu.h -index b3beead..7c5a101 100644 ---- a/src/messages_hu.h -+++ b/src/messages_hu.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_it.h b/src/messages_it.h -index 4e6e984..e30f517 100644 ---- a/src/messages_it.h -+++ b/src/messages_it.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_kr.h b/src/messages_kr.h -index 14d8300..c9faead 100644 ---- a/src/messages_kr.h -+++ b/src/messages_kr.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_nl.h b/src/messages_nl.h -index 77efbb4..5a60d9e 100644 ---- a/src/messages_nl.h -+++ b/src/messages_nl.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "Geen userPassword attribuut aangetroffen. Controleer de toegangsrechten." - #define MSG_LDAP_INVALID_AUTH_METHOD "Onjuiste LDAPAuthMethod in de configuratie. Moet 'bind' of 'password' zijn." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_no.h b/src/messages_no.h -index f0be1b4..4c84405 100644 ---- a/src/messages_no.h -+++ b/src/messages_no.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_pl.h b/src/messages_pl.h -index c0be4d8..89d5af1 100644 ---- a/src/messages_pl.h -+++ b/src/messages_pl.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_pt_br.h b/src/messages_pt_br.h -index e5557b9..1dcfb64 100644 ---- a/src/messages_pt_br.h -+++ b/src/messages_pt_br.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_ro.h b/src/messages_ro.h -index 7bbcefe..da16a49 100644 ---- a/src/messages_ro.h -+++ b/src/messages_ro.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_ru.h b/src/messages_ru.h -index e0c1842..f0e4031 100644 ---- a/src/messages_ru.h -+++ b/src/messages_ru.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_sk.h b/src/messages_sk.h -index 24eca1b..e0ddd2a 100644 ---- a/src/messages_sk.h -+++ b/src/messages_sk.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_sv.h b/src/messages_sv.h -index b55c474..be4bbc1 100644 ---- a/src/messages_sv.h -+++ b/src/messages_sv.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_tr.h b/src/messages_tr.h -index 7d6db57..3ee84d2 100644 ---- a/src/messages_tr.h -+++ b/src/messages_tr.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_zh_cn.h b/src/messages_zh_cn.h -index a8bfc6c..93844fd 100644 ---- a/src/messages_zh_cn.h -+++ b/src/messages_zh_cn.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" -diff --git a/src/messages_zh_tw.h b/src/messages_zh_tw.h -index db99719..05581bb 100644 ---- a/src/messages_zh_tw.h -+++ b/src/messages_zh_tw.h -@@ -227,3 +227,4 @@ - #define MSG_PROT_BEFORE_PBSZ "PROT must be preceded by a successful PBSZ command" - #define MSG_WARN_LDAP_USERPASS_EMPTY "LDAP returned no userPassword attribute, check LDAP access rights." - #define MSG_LDAP_INVALID_AUTH_METHOD "Invalid LDAPAuthMethod in the configuration file. Should be 'bind' or 'password'." -+#define MSG_INVALID_ARGUMENT "Invalid argument: \"%s\"" --- -2.14.3 - diff --git a/0002-fedora-specific-config-file.patch b/0002-fedora-specific-config-file.patch index e50a695..afa6fcf 100644 --- a/0002-fedora-specific-config-file.patch +++ b/0002-fedora-specific-config-file.patch @@ -1,4 +1,4 @@ -From 23e169081a6cff2b73e521991fd9e260b49e80fa Mon Sep 17 00:00:00 2001 +From 5dbbb2948bee45ec0115146efb4a090df00f5530 Mon Sep 17 00:00:00 2001 From: rpm-build Date: Thu, 14 Sep 2017 16:41:12 +0200 Subject: [PATCH] fedora specific config file @@ -8,14 +8,14 @@ Subject: [PATCH] fedora specific config file 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pure-ftpd.conf.in b/pure-ftpd.conf.in -index a327844..597ed59 100644 +index aeb093a..e93053a 100644 --- a/pure-ftpd.conf.in +++ b/pure-ftpd.conf.in @@ -9,7 +9,7 @@ # instead of command-line options, please run the # following command : # --# @prefix@/sbin/pure-ftpd @sysconfdir@/etc/pure-ftpd.conf +-# @sbindir@/sbin/pure-ftpd @sysconfdir@/pure-ftpd.conf +# @sbindir@/pure-ftpd @sysconfdir@/pure-ftpd.conf # # Online documentation: @@ -127,5 +127,5 @@ index a327844..597ed59 100644 -- -2.14.3 +2.20.1 diff --git a/pure-ftpd.spec b/pure-ftpd.spec index 32416a7..4466de9 100644 --- a/pure-ftpd.spec +++ b/pure-ftpd.spec @@ -1,6 +1,6 @@ Name: pure-ftpd -Version: 1.0.47 -Release: 10%{?dist} +Version: 1.0.48 +Release: 1%{?dist} Summary: Lightweight, fast and secure FTP server License: BSD URL: http://www.pureftpd.org @@ -16,18 +16,6 @@ Source8: pure-ftpd-with-tls-init.service Source9: pure-ftpd-with-tls.service Patch0: 0001-modify-pam.patch Patch1: 0002-fedora-specific-config-file.patch -# Upstream patch: -Patch2: 0001-Exit-when-given-an-invalid-cmdline-option.patch -# Upstream patch: -Patch3: 0002-Complain-when-both-options-and-config-file-are-given.patch -# Upstream patch: -Patch4: 0001-Increase-MAX_DATA_SIZE-due-to-Argon2id-requirements.patch -# Upstream patch: -Patch6: 0001-Fix-postgresql-authenticate-bug.patch - -# Temporarily disable TLSv1.3 to workaround -# https://github.com/jedisct1/pure-ftpd/issues/102 -Patch7: 0001-Temporarily-disable-TLSv1.3-support.patch Provides: ftpserver BuildRequires: pam-devel, libcap-devel @@ -173,11 +161,8 @@ make -f %{_datadir}/selinux/devel/Makefile install -p -m 644 -D pureftpd.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/%{name}/pureftpd.pp popd -# Docs -install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name} -rm -f README.{MacOS-X,Windows} -install -p -m 644 README.* $RPM_BUILD_ROOT%{_docdir}/%{name} -install -p -m 644 pureftpd.schema $RPM_BUILD_ROOT%{_docdir}/%{name} +# Remove unnecessary docs +rm $RPM_BUILD_ROOT%{_docdir}/%{name}/README.MacOS-X %post %systemd_post pure-ftpd.service @@ -212,11 +197,12 @@ fi %files -%doc FAQ THANKS AUTHORS CONTACT HISTORY NEWS +%doc FAQ THANKS AUTHORS HISTORY NEWS %doc README README.Authentication-Modules README.Configuration-File %doc README.Donations README.LDAP README.MySQL README.SELinux %doc README.PGSQL README.TLS README.Virtual-Users %doc pureftpd.schema +%doc %{_docdir}/%{name}/*.conf %{_bindir}/pure-* %{_sbindir}/pure-* %if 0%{!?_without_tls:1} @@ -241,6 +227,12 @@ fi %changelog +* Fri Mar 29 2019 Ondřej Lysoněk - 1.0.48-1 +- New version +- Resolves: rhbz#1692539 +- Resolves: rhbz#1672494 +- Resolves: rhbz#1654838 + * Tue Feb 12 2019 Ondřej Lysoněk - 1.0.47-10 - Temporarily disable TLSv1.3 support until it's fully fixed diff --git a/sources b/sources index a5bbab1..da9075a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pure-ftpd-1.0.47.tar.bz2) = c1920a3f67f04635fde600fe226a7730b801e7e64658b25f1d9f9c0b35a704664be4adfb0b291594f7e0f10beade25eae9a5e6cc3b6777a3b413f3c2d9574e63 +SHA512 (pure-ftpd-1.0.48.tar.bz2) = eabcc8ba6d37e3aceb57871e80129a1db1a3ea7d2b9f57626a21f42b4978570a84006a941fe254b6af50b2432d1d391725ea512f7569fcaecfa7eb77179c2f54