Author: arekm Date: Wed Jun 30 10:08:21 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- all auth that tries all auth methods including plaintext
---- Files affected:
packages/pure-ftpd:
pure-ftpd.spec (1.193 -> 1.194)
packages/pure-ftpd:
pure-ftpd-allauth.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/pure-ftpd/pure-ftpd.spec
diff -u packages/pure-ftpd/pure-ftpd.spec:1.193
packages/pure-ftpd/pure-ftpd.spec:1.194
--- packages/pure-ftpd/pure-ftpd.spec:1.193 Mon Apr 12 07:13:39 2010
+++ packages/pure-ftpd/pure-ftpd.spec Wed Jun 30 12:08:16 2010
@@ -10,7 +10,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
@@ -32,6 +32,7 @@
Patch1: %{name}-path_to_ssl_cert_in_config.patch
Patch2: %{name}-pure-pw_passwd.patch
Patch3: %{name}-mysql_config.patch
+Patch4: %{name}-allauth.patch
Patch5: %{name}-passwd_location.patch
Patch6: %{name}-additionalgid.patch
Patch7: audit_cap.patch
@@ -95,6 +96,7 @@
%setup -q -a 5
%patch0 -p0
%patch3 -p1
+%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
@@ -227,6 +229,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.194 2010/06/30 10:08:16 arekm
+- all auth that tries all auth methods including plaintext
+
Revision 1.193 2010/04/12 05:13:39 arekm
- rel 2
================================================================
Index: packages/pure-ftpd/pure-ftpd-allauth.patch
diff -u /dev/null packages/pure-ftpd/pure-ftpd-allauth.patch:1.1
--- /dev/null Wed Jun 30 12:08:21 2010
+++ packages/pure-ftpd/pure-ftpd-allauth.patch Wed Jun 30 12:08:19 2010
@@ -0,0 +1,47 @@
+--- pure-ftpd-1.0.29/src/log_mysql.h~ 2010-03-15 16:20:25.000000000 +0100
++++ pure-ftpd-1.0.29/src/log_mysql.h 2010-06-30 11:57:43.084176772 +0200
+@@ -6,6 +6,7 @@
+ #define PASSWD_SQL_MYSQL "password"
+ #define PASSWD_SQL_MD5 "md5"
+ #define PASSWD_SQL_ANY "any"
++#define PASSWD_SQL_ALL "all"
+ #define MYSQL_DEFAULT_SERVER "localhost"
+ #define MYSQL_DEFAULT_PORT 3306
+ #define MYSQL_MAX_REQUEST_LENGTH ((size_t) 8192U)
+--- pure-ftpd-1.0.29/src/log_mysql.c~ 2010-03-15 16:20:25.000000000 +0100
++++ pure-ftpd-1.0.29/src/log_mysql.c 2010-06-30 11:58:39.120827157 +0200
+@@ -416,6 +416,11 @@
+ crypto_crypt++;
+ crypto_mysql++;
+ crypto_md5++;
++ } else if (strcasecmp(crypto, PASSWD_SQL_ALL) == 0) {
++ crypto_crypt++;
++ crypto_mysql++;
++ crypto_md5++;
++ crypto_plain++;
+ } else if (strcasecmp(crypto, PASSWD_SQL_CRYPT) == 0) {
+ crypto_crypt++;
+ } else if (strcasecmp(crypto, PASSWD_SQL_MYSQL) == 0) {
+--- pure-ftpd-1.0.29/src/log_pgsql.h~ 2010-03-15 16:20:25.000000000 +0100
++++ pure-ftpd-1.0.29/src/log_pgsql.h 2010-06-30 11:57:59.065414391 +0200
+@@ -6,6 +6,7 @@
+ #define PASSWD_SQL_PGSQL "password"
+ #define PASSWD_SQL_MD5 "md5"
+ #define PASSWD_SQL_ANY "any"
++#define PASSWD_SQL_ALL "all"
+ #define PGSQL_DEFAULT_SERVER "localhost"
+ #define PGSQL_DEFAULT_PORT 5432
+ #define PGSQL_MAX_REQUEST_LENGTH ((size_t) 8192U)
+--- pure-ftpd-1.0.29/src/log_pgsql.c~ 2010-03-15 16:20:25.000000000 +0100
++++ pure-ftpd-1.0.29/src/log_pgsql.c 2010-06-30 11:59:01.591116941 +0200
+@@ -494,6 +494,10 @@
+ if (strcasecmp(crypto, PASSWD_SQL_ANY) == 0) {
+ crypto_crypt++;
+ crypto_md5++;
++ } else if (strcasecmp(crypto, PASSWD_SQL_ANY) == 0) {
++ crypto_crypt++;
++ crypto_md5++;
++ crypto_plain++;
+ } else if (strcasecmp(crypto, PASSWD_SQL_CRYPT) == 0) {
+ crypto_crypt++;
+ } else if (strcasecmp(crypto, PASSWD_SQL_MD5) == 0) {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pure-ftpd/pure-ftpd.spec?r1=1.193&r2=1.194&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
