diff --git a/proftpd-1.3.4b.tar.gz b/proftpd-1.3.4b.tar.gz deleted file mode 100644 index 55e2022..0000000 --- a/proftpd-1.3.4b.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f659585cea90fc6af34a0ffae4a90e4ed37abe92dbd9b6c311f95a436c961cb -size 7647825 diff --git a/proftpd-1.3.4b.tar.gz.asc b/proftpd-1.3.4b.tar.gz.asc deleted file mode 100644 index 08b2dbb..0000000 --- a/proftpd-1.3.4b.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEABECAAYFAlAYE/wACgkQt46JP6URl2pIgQCgwqPzMUsUx++mlK/MFTzSRL1g -e1cAoNuD1fHAQ7eQppw0hSUp7vam416k -=Za9N ------END PGP SIGNATURE----- diff --git a/proftpd-1.3.4c.tar.gz b/proftpd-1.3.4c.tar.gz new file mode 100644 index 0000000..8bea09a --- /dev/null +++ b/proftpd-1.3.4c.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb80dd422969b8c900920a30a56f5e272862275d244d3857a980f5f2386ea912 +size 7689622 diff --git a/proftpd-1.3.4c.tar.gz.asc b/proftpd-1.3.4c.tar.gz.asc new file mode 100644 index 0000000..c4e7c83 --- /dev/null +++ b/proftpd-1.3.4c.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iEYEABECAAYFAlE3iYYACgkQt46JP6URl2oSPgCfX4mzFaXUVYsHS8rz60GH7KzP +9WgAniLOpNU11NPtRAdviGnsuOLDmMGW +=Ocyb +-----END PGP SIGNATURE----- diff --git a/proftpd-1.3.4a-basic.conf.patch b/proftpd-basic.conf.patch similarity index 98% rename from proftpd-1.3.4a-basic.conf.patch rename to proftpd-basic.conf.patch index d3d67bc..18dc828 100644 --- a/proftpd-1.3.4a-basic.conf.patch +++ b/proftpd-basic.conf.patch @@ -38,7 +38,7 @@ Index: sample-configurations/basic.conf # To prevent DoS attacks, set the maximum number of child processes # to 30. If you need to allow more than 30 concurrent connections -@@ -23,43 +33,190 @@ Umask 022 +@@ -23,43 +33,192 @@ Umask 022 # in standalone mode, in inetd mode you should use an inetd server # that allows you to limit maximum number of processes per service # (such as xinetd). @@ -75,7 +75,9 @@ Index: sample-configurations/basic.conf + DeferWelcome on + #DisplayConnect /etc/proftpd/msg + -+ IdentLookups off ++ ++ IdentLookups off ++ + UseFtpUsers off + RequireValidShell off + diff --git a/proftpd-1.3.4a-dist.patch b/proftpd-dist.patch similarity index 100% rename from proftpd-1.3.4a-dist.patch rename to proftpd-dist.patch diff --git a/proftpd-1.3.4a-ftpasswd.patch b/proftpd-ftpasswd.patch similarity index 97% rename from proftpd-1.3.4a-ftpasswd.patch rename to proftpd-ftpasswd.patch index 95e9ba9..976b182 100644 --- a/proftpd-1.3.4a-ftpasswd.patch +++ b/proftpd-ftpasswd.patch @@ -13,7 +13,7 @@ Index: contrib/ftpasswd my $shell_file = "/etc/shells"; my $default_cracklib_dict = "/usr/lib/cracklib_dict"; my $cracklib_dict; -@@ -928,6 +928,46 @@ usage: $program [--help] [--hash|--group +@@ -921,6 +921,46 @@ usage: $program [--help] [--hash|--group --version Displays the version of $program. diff --git a/proftpd-no_BuildDate.patch b/proftpd-no_BuildDate.patch index 3180d01..4d3d785 100644 --- a/proftpd-no_BuildDate.patch +++ b/proftpd-no_BuildDate.patch @@ -76,5 +76,5 @@ Index: include/version.h -#include "buildstamp.h" - /* Application version (in various forms) */ - #define PROFTPD_VERSION_NUMBER 0x0001030406 - #define PROFTPD_VERSION_TEXT "1.3.4b" + #define PROFTPD_VERSION_NUMBER 0x0001030407 + #define PROFTPD_VERSION_TEXT "1.3.4c" diff --git a/proftpd-1.3.4a-strip.patch b/proftpd-strip.patch similarity index 88% rename from proftpd-1.3.4a-strip.patch rename to proftpd-strip.patch index d9c5c45..fecda7e 100644 --- a/proftpd-1.3.4a-strip.patch +++ b/proftpd-strip.patch @@ -9,7 +9,7 @@ Index: ltmain.sh - func_show_eval "$striplib $destdir/$realname" 'exit $?' + #func_show_eval "$striplib $destdir/$realname" 'exit $?' + echo "strip patch" -+ func_quote_for_expand "$striplib $destdir/$realname" ++ func_quote_for_expand "$striplib $destdir/$realname" + func_echo $func_quote_for_expand_result fi diff --git a/proftpd.changes b/proftpd.changes index b59ee72..6a691d8 100644 --- a/proftpd.changes +++ b/proftpd.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed May 1 20:35:19 UTC 2013 - chris@computersalat.de + +- update to 1.3.4c + * Added Spanish translation. + * Fixed several mod_sftp issues, including SFTPPassPhraseProvider, + handling of symlinks for REALPATH requests, and response code logging. + * Fixed symlink race for creating directories when UserOwner is in effect. + * Increased performance of FTP directory listings. +- rebase and rename patches (remove version string) + * proftpd-1.3.4a-dist.patch -> proftpd-dist.patch + * proftpd-1.3.4a-ftpasswd.patch -> proftpd-ftpasswd.patch + * proftpd-1.3.4a-strip.patch -> proftpd-strip.patch + +------------------------------------------------------------------- +Fri Feb 8 00:19:19 UTC 2013 - chris@computersalat.de + +- fix proftpd.conf (rebase basic.conf patch) + * IdentLookups is now a seperate module + IdentLookups on/off + is needed and module is not built cause crrodriguez disabled it. + ------------------------------------------------------------------- Thu Nov 29 19:03:00 CET 2012 - sbrabec@suse.cz diff --git a/proftpd.spec b/proftpd.spec index 45e4243..87e9a96 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -1,7 +1,7 @@ # # spec file for package proftpd # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ License: GPL-2.0+ Group: Productivity/Networking/Ftp/Servers # Please save your time and do not update to "rc" versions. # We only accept updates for "STABLE" Versions -Version: 1.3.4b +Version: 1.3.4c Release: 0 Url: http://www.proftpd.org/ Source0: ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz @@ -33,13 +33,13 @@ Source13: %{name}.service Source14: %{name}.conf.tmpfile Source15: %{name}.keyring #PATCH-FIX-openSUSE: pam, logrotate, xinet -Patch100: %{name}-1.3.4a-dist.patch +Patch100: %{name}-dist.patch #PATCH-FIX-openSUSE: provide a useful default config -Patch101: %{name}-1.3.4a-basic.conf.patch +Patch101: %{name}-basic.conf.patch #PATCH-FIX: provide more info on usage ;) -Patch102: %{name}-1.3.4a-ftpasswd.patch +Patch102: %{name}-ftpasswd.patch #PATCH-FIX: fix strip -Patch103: %{name}-1.3.4a-strip.patch +Patch103: %{name}-strip.patch #PATCH-FIX-openSUSE: file-contains-date-and-time Patch104: %{name}-no_BuildDate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build