[packages/pure-ftpd] - rel 3; restore old allauth behaviour broken at upgrade to 1.0.40

arekm arekm at pld-linux.org
Thu Jul 2 15:01:20 CEST 2015


commit 352b60a32e57238fb87e15b0aae8f63b573023ca
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Jul 2 15:01:12 2015 +0200

    - rel 3; restore old allauth behaviour broken at upgrade to 1.0.40

 pure-ftpd-allauth.patch | 20 ++++++++++++++++++++
 pure-ftpd.spec          |  5 +++--
 2 files changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 9ab2af2..ad51759 100644
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -9,7 +9,7 @@
 %bcond_without	tls		# disable SSL/TLS support
 %bcond_without	cap		# disable capabilities
 
-%define	rel	2
+%define	rel	3
 Summary:	Small, fast and secure FTP server
 Summary(pl.UTF-8):	Mały, szybki i bezpieczny serwer FTP
 Name:		pure-ftpd
@@ -27,7 +27,7 @@ Source4:	ftpusers.tar.bz2
 Source5:	http://twittner.host.sk/files/pure-config/pure-config-20041201.tar.gz
 # Source5-md5:	3f2ff6b00b5c38ee11ce588ee5af6cf6
 Patch0:		%{name}-config.patch
-
+Patch1:		%{name}-allauth.patch
 Patch2:		%{name}-pure-pw_passwd.patch
 Patch3:		%{name}-mysql_config.patch
 
@@ -100,6 +100,7 @@ Ten pakiet zawiera schemat Pure-FTPd pureftpd.schema dla openldapa.
 %prep
 %setup -q -a 5
 %patch0 -p0
+%patch1 -p1
 %patch3 -p1
 
 %patch5 -p1
diff --git a/pure-ftpd-allauth.patch b/pure-ftpd-allauth.patch
new file mode 100644
index 0000000..0c86788
--- /dev/null
+++ b/pure-ftpd-allauth.patch
@@ -0,0 +1,20 @@
+--- a/src/log_mysql.c~	2015-07-02 14:57:00.000000000 +0200
++++ b/src/log_mysql.c	2015-07-02 14:57:43.001711520 +0200
+@@ -438,6 +438,7 @@ void pw_mysql_check(AuthResult * const r
+         crypto_mysql++;
+         crypto_md5++;
+         crypto_sha1++;
++        crypto_plain++;
+     } else if (strcasecmp(crypto, PASSWD_SQL_SCRYPT) == 0) {
+         crypto_scrypt++;
+     } else if (strcasecmp(crypto, PASSWD_SQL_CRYPT) == 0) {
+--- a/src/log_pgsql.c~	2015-07-02 14:57:00.000000000 +0200
++++ b/src/log_pgsql.c	2015-07-02 14:57:55.612037841 +0200
+@@ -506,6 +506,7 @@ void pw_pgsql_check(AuthResult * const r
+         crypto_crypt++;
+         crypto_md5++;
+         crypto_sha1++;
++        crypto_plain++;
+     } else if (strcasecmp(crypto, PASSWD_SQL_SCRYPT) == 0) {
+         crypto_scrypt++;
+     } else if (strcasecmp(crypto, PASSWD_SQL_CRYPT) == 0) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pure-ftpd.git/commitdiff/352b60a32e57238fb87e15b0aae8f63b573023ca



More information about the pld-cvs-commit mailing list