diff --git a/d800ece16bd2d1f8f5e2d1cb98b59877b3487b10.patch b/d800ece16bd2d1f8f5e2d1cb98b59877b3487b10.patch new file mode 100644 index 0000000..8803e29 --- /dev/null +++ b/d800ece16bd2d1f8f5e2d1cb98b59877b3487b10.patch @@ -0,0 +1,35 @@ +From d800ece16bd2d1f8f5e2d1cb98b59877b3487b10 Mon Sep 17 00:00:00 2001 +From: TJ Saunders +Date: Wed, 28 Oct 2015 18:22:42 -0700 +Subject: [PATCH] Attempt to Bug#4206 by speculatively fixing possible causes. + First, reset a static string (allocated out of a pool which is cleared on + restart) to its default. Next, remove some (useless) #ifdefs which, if + mod_lang is built as a DSO/shared module, could cause problems on module + loading IFF the system does not have the expected header. + +--- + modules/mod_lang.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/modules/mod_lang.c b/modules/mod_lang.c +index 8e08f44..0170be7 100644 +--- a/modules/mod_lang.c ++++ b/modules/mod_lang.c +@@ -716,9 +716,7 @@ static void lang_postparse_ev(const void *event_data, void *user_data) { + config_rec *c; + DIR *dirh; + server_rec *s; +-#ifdef HAVE_LIBINTL_H + const char *locale_path = NULL; +-#endif + + c = find_config(main_server->conf, CONF_PARAM, "LangEngine", FALSE); + if (c) { +@@ -888,6 +886,7 @@ static void lang_postparse_ev(const void *event_data, void *user_data) { + + static void lang_restart_ev(const void *event_data, void *user_data) { + destroy_pool(lang_pool); ++ lang_curr = LANG_DEFAULT_LANG; + lang_list = NULL; + lang_aliases = NULL; + diff --git a/proftpd.spec b/proftpd.spec index 74da763..3fee76f 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -46,7 +46,7 @@ %define _hardened_build 1 #global prever rc3 -%global rpmrel 3 +%global rpmrel 4 %global mod_geoip_version 0.3 %global mod_vroot_version 0.9.4 @@ -71,6 +71,7 @@ Source11: http://www.castaglia.org/proftpd/modules/proftpd-mod-geoip-%{mod_geoi # (they are disabled by default); it is not included as part of the built package and should therefore # not fall foul of the rules against library bundling Source13: http://search.cpan.org/CPAN/authors/id/C/CL/CLEMBURG/Test-Unit-0.14.tar.gz +Patch0: https://github.com/proftpd/proftpd/commit/d800ece16bd2d1f8f5e2d1cb98b59877b3487b10.patch Patch2: proftpd.conf-no-memcached.patch Patch4: proftpd-1.3.4rc1-mod_vroot-test.patch Patch5: proftpd-1.3.4-utf8.patch @@ -219,6 +220,11 @@ cp -p mod_geoip/mod_geoip.html doc/contrib/ # Copy default config file into place cp -p %{SOURCE1} proftpd.conf +# See if we can fix crash in mod_lang +# http://bugs.proftpd.org/show_bug.cgi?id=4206 +# https://retrace.fedoraproject.org/faf/reports/10744/ +%patch0 -p1 + # If we're running the full test suite, include the mod_vroot test %patch4 -p1 -b .test_vroot @@ -507,6 +513,11 @@ fi %{_mandir}/man1/ftpwho.1* %changelog +* Thu Oct 29 2015 Paul Howarth - 1.3.5a-4 +- See if we can fix crash in mod_lang + http://bugs.proftpd.org/show_bug.cgi?id=4206 + https://retrace.fedoraproject.org/faf/reports/10744/ + * Thu Sep 10 2015 Paul Howarth - 1.3.5a-3 - Add dependency on perl(Crypt::Cracklib), needed for ftpasswd --use-cracklib