From eca9cf0d78b55c2263ea6f679d6f0a5d8b1cc3f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sat, 28 Oct 2017 20:19:44 +0200 Subject: [PATCH] - up to 1.0.47 --- pure-ftpd-allauth.patch | 17 ++++++++--------- pure-ftpd.spec | 6 +++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pure-ftpd-allauth.patch b/pure-ftpd-allauth.patch index 054931d..b95f2e5 100644 --- a/pure-ftpd-allauth.patch +++ b/pure-ftpd-allauth.patch @@ -1,21 +1,20 @@ ---- a/src/log_mysql.c~ 2017-04-24 16:32:45.000000000 +0200 -+++ b/src/log_mysql.c 2017-10-04 12:42:27.961678871 +0200 +--- pure-ftpd-1.0.47/src/log_mysql.c~ 2017-08-20 16:51:05.000000000 +0200 ++++ pure-ftpd-1.0.47/src/log_mysql.c 2017-10-28 20:17:43.638635689 +0200 @@ -429,6 +429,7 @@ void pw_mysql_check(AuthResult * const r crypto_mysql++; crypto_md5++; crypto_sha1++; + crypto_plain++; - } else if (strcasecmp(crypto, PASSWD_SQL_ARGON2I) == 0) { - crypto_argon2i++; + } else if (strcasecmp(crypto, PASSWD_SQL_ARGON2) == 0) { + crypto_argon2++; } else if (strcasecmp(crypto, PASSWD_SQL_SCRYPT) == 0) { - ---- a/src/log_pgsql.c~ 2017-04-24 16:32:45.000000000 +0200 -+++ b/src/log_pgsql.c 2017-10-04 12:42:57.562469704 +0200 +--- pure-ftpd-1.0.47/src/log_pgsql.c~ 2017-08-20 16:51:15.000000000 +0200 ++++ pure-ftpd-1.0.47/src/log_pgsql.c 2017-10-28 20:18:08.135958914 +0200 @@ -504,6 +504,7 @@ void pw_pgsql_check(AuthResult * const r crypto_crypt++; crypto_md5++; crypto_sha1++; + crypto_plain++; - } else if (strcasecmp(crypto, PASSWD_SQL_ARGON2I) == 0) { - crypto_argon2i++; + } else if (strcasecmp(crypto, PASSWD_SQL_ARGON2)) { + crypto_argon2++; } else if (strcasecmp(crypto, PASSWD_SQL_SCRYPT) == 0) { diff --git a/pure-ftpd.spec b/pure-ftpd.spec index 68c4749..09c958b 100644 --- a/pure-ftpd.spec +++ b/pure-ftpd.spec @@ -9,16 +9,16 @@ %bcond_without tls # disable SSL/TLS support %bcond_without cap # disable capabilities -%define rel 2 +%define rel 1 Summary: Small, fast and secure FTP server Summary(pl.UTF-8): Mały, szybki i bezpieczny serwer FTP Name: pure-ftpd -Version: 1.0.46 +Version: 1.0.47 Release: %{rel}%{?with_extra:extra} License: BSD-like%{?with_extra:, GLPv2 for pure-config due to libcfg+ license} Group: Daemons Source0: http://download.pureftpd.org/pub/pure-ftpd/releases/%{name}-%{version}.tar.bz2 -# Source0-md5: efce5529c1f0a39dafdd532c619503f1 +# Source0-md5: a41fa531c0d21bd3416dd524d75495ae Source1: %{name}.pamd Source2: %{name}.init Source3: %{name}.sysconfig -- 2.43.0