From 0982f3f57fe66d7af4302ef4920c90e09e52aba5da8c5a4142486e0a8915ba46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Feb 2022 19:42:35 +0000 Subject: [PATCH] Revert undocumented config file format changes. OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=154 --- ...ndocumented-config-file-format-changes.patch | 17 +++++++++++++++++ vsftpd.changes | 7 +++++++ vsftpd.spec | 1 + 3 files changed, 25 insertions(+) create mode 100644 revert-undocumented-config-file-format-changes.patch diff --git a/revert-undocumented-config-file-format-changes.patch b/revert-undocumented-config-file-format-changes.patch new file mode 100644 index 0000000..6ba0610 --- /dev/null +++ b/revert-undocumented-config-file-format-changes.patch @@ -0,0 +1,17 @@ +Index: vsftpd-3.0.5/parseconf.c +=================================================================== +--- vsftpd-3.0.5.orig/parseconf.c 2022-02-01 20:35:02.703078850 +0100 ++++ vsftpd-3.0.5/parseconf.c 2022-02-01 20:35:44.042486850 +0100 +@@ -85,9 +85,9 @@ parseconf_bool_array[] = + { "ssl_sslv2", &tunable_sslv2 }, + { "ssl_sslv3", &tunable_sslv3 }, + { "ssl_tlsv1", &tunable_tlsv1 }, +- { "ssl_tlsv11", &tunable_tlsv1_1 }, +- { "ssl_tlsv12", &tunable_tlsv1_2 }, +- { "ssl_tlsv13", &tunable_tlsv1_3 }, ++ { "ssl_tlsv1_1", &tunable_tlsv1_1 }, ++ { "ssl_tlsv1_2", &tunable_tlsv1_2 }, ++ { "ssl_tlsv1_3", &tunable_tlsv1_3 }, + { "tilde_user_enable", &tunable_tilde_user_enable }, + { "force_anon_logins_ssl", &tunable_force_anon_logins_ssl }, + { "force_anon_data_ssl", &tunable_force_anon_data_ssl }, diff --git a/vsftpd.changes b/vsftpd.changes index b506754..99264ec 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -25,6 +25,13 @@ Tue Feb 1 18:42:41 UTC 2022 - Peter Simons * vsftpd-2.0.5-vuser.patch * vsftpd-2.3.5-conf.patch +- Apply "revert-undocument-config-file-changes.patch" to revert the + "ssl_tlsv1_X"-style config file options back to their original + spelling. The changes that dropped the underscore from the + version numbers in release 3.0.4 breaks existing configurations + and it was never documented anywhere -- not in the package's + changelog and not in the packages's own man page. + ------------------------------------------------------------------- Wed Jan 5 10:21:02 UTC 2022 - Johannes Segitz diff --git a/vsftpd.spec b/vsftpd.spec index 128ea8a..de38179 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -92,6 +92,7 @@ Patch37: vsftpd-openlog-force.patch Patch38: vsftpd-seccomp-getrandom.patch Patch39: vsftpd-seccomp-ssl.patch Patch40: vsftpd-seccomp-wait4.patch +Patch41: revert-undocumented-config-file-format-changes.patch BuildRequires: libcap-devel BuildRequires: libopenssl-devel BuildRequires: pam-devel