packages: pure-ftpd/pure-ftpd-allauth.patch - adjusted to support SHA1 pass...

[marti]

Author: marti                        Date: Tue May  3 13:09:03 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjusted to support SHA1 password hashing in MySQL and PostgreSQL backends

---- Files affected:
packages/pure-ftpd:
   pure-ftpd-allauth.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/pure-ftpd/pure-ftpd-allauth.patch
diff -u packages/pure-ftpd/pure-ftpd-allauth.patch:1.1 packages/pure-ftpd/pure-ftpd-allauth.patch:1.2
--- packages/pure-ftpd/pure-ftpd-allauth.patch:1.1	Wed Jun 30 12:08:19 2010
+++ packages/pure-ftpd/pure-ftpd-allauth.patch	Tue May  3 15:08:58 2011
@@ -1,47 +1,59 @@
---- 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"
+diff -ur pure-ftpd-1.0.32-orig/src/log_mysql.c pure-ftpd-1.0.32/src/log_mysql.c
+--- pure-ftpd-1.0.32-orig/src/log_mysql.c	2011-05-02 03:22:54.000000000 +0200
++++ pure-ftpd-1.0.32/src/log_mysql.c	2011-05-03 15:03:15.260126158 +0200
+@@ -418,6 +418,12 @@
+         crypto_mysql++;
+         crypto_md5++;
+         crypto_sha1++;
++	} else if (strcasecmp(crypto, PASSWD_SQL_ALL) == 0) {
++	    crypto_crypt++;
++	    crypto_mysql++;
++	    crypto_md5++;
++		crypto_sha1++;
++		crypto_plain++;
+     } else if (strcasecmp(crypto, PASSWD_SQL_CRYPT) == 0) {
+         crypto_crypt++;
+     } else if (strcasecmp(crypto, PASSWD_SQL_MYSQL) == 0) {
+Tylko w pure-ftpd-1.0.32/src: log_mysql.c~
+diff -ur pure-ftpd-1.0.32-orig/src/log_mysql.h pure-ftpd-1.0.32/src/log_mysql.h
+--- pure-ftpd-1.0.32-orig/src/log_mysql.h	2011-05-02 03:22:54.000000000 +0200
++++ pure-ftpd-1.0.32/src/log_mysql.h	2011-05-03 14:59:07.458751212 +0200
+@@ -7,6 +7,7 @@
  #define PASSWD_SQL_MD5 "md5"
+ #define PASSWD_SQL_SHA1 "sha1"
  #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 @@
+Tylko w pure-ftpd-1.0.32/src: log_mysql.h~
+diff -ur pure-ftpd-1.0.32-orig/src/log_pgsql.c pure-ftpd-1.0.32/src/log_pgsql.c
+--- pure-ftpd-1.0.32-orig/src/log_pgsql.c	2011-05-02 03:22:54.000000000 +0200
++++ pure-ftpd-1.0.32/src/log_pgsql.c	2011-05-03 15:05:12.612160786 +0200
+@@ -495,7 +495,12 @@
          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_sha1++;        
+-    } else if (strcasecmp(crypto, PASSWD_SQL_CRYPT) == 0) {
++	} else if (strcasecmp(crypto, PASSWD_SQL_ANY) == 0) {
++	    crypto_crypt++;
++	    crypto_md5++;
++		crypto_sha1++;
++		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"
+     } else if (strcasecmp(crypto, PASSWD_SQL_MD5) == 0) {
+         crypto_md5++;
+Tylko w pure-ftpd-1.0.32/src: log_pgsql.c~
+diff -ur pure-ftpd-1.0.32-orig/src/log_pgsql.h pure-ftpd-1.0.32/src/log_pgsql.h
+--- pure-ftpd-1.0.32-orig/src/log_pgsql.h	2011-05-02 03:22:54.000000000 +0200
++++ pure-ftpd-1.0.32/src/log_pgsql.h	2011-05-03 15:03:51.931803577 +0200
+@@ -7,6 +7,7 @@
  #define PASSWD_SQL_MD5 "md5"
+ #define PASSWD_SQL_SHA1 "sha1"
  #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) {
+Tylko w pure-ftpd-1.0.32/src: log_pgsql.h~
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pure-ftpd/pure-ftpd-allauth.patch?r1=1.1&r2=1.2&f=u