| [vhffs-dev] [1431] Cleaning makefiles |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 1431
Author: beuss
Date: 2009-06-12 11:59:23 +0200 (Fri, 12 Jun 2009)
Log Message:
-----------
Cleaning makefiles
Modified Paths:
--------------
trunk/vhffs-packages/Makefile.am
Added Paths:
-----------
trunk/vhffs-packages/mysql40/mysqldb.patch.sql
trunk/vhffs-packages/mysql40/username-len.patch
trunk/vhffs-packages/mysql41/mysqldb.patch.sql
trunk/vhffs-packages/mysql41/username-len.patch
trunk/vhffs-packages/patches/pureftpd/customerproof-tf.patch
trunk/vhffs-packages/patches/pureftpd/passivemodeandssl.patch
Removed Paths:
-------------
trunk/vhffs-packages/mysql40/mysql-mysqldb.patch.sql
trunk/vhffs-packages/mysql40/mysql-username-len.patch
trunk/vhffs-packages/mysql41/mysql-mysqldb.patch.sql
trunk/vhffs-packages/mysql41/mysql-username-len.patch
trunk/vhffs-packages/patches/pureftpd/pureftpd-customerproof-tf.patch
trunk/vhffs-packages/patches/pureftpd/pureftpd-passivemodeandssl.patch
Modified: trunk/vhffs-packages/Makefile.am
===================================================================
--- trunk/vhffs-packages/Makefile.am 2009-06-12 09:57:20 UTC (rev 1430)
+++ trunk/vhffs-packages/Makefile.am 2009-06-12 09:59:23 UTC (rev 1431)
@@ -1,9 +1,14 @@
EXTRA_DIST = \
- mysql40/mysql-mysqldb.patch.sql \
+ mysql40/mysqldb.patch.sql \
mysql40/output \
- mysql40/mysql-username-len.patch \
+ mysql40/username-len.patch \
mysql40/mysql-server.README.Debian.addon \
mysql40/build \
+ mysql41/mysqldb.patch.sql \
+ mysql41/output \
+ mysql41/username-len.patch \
+ mysql41/mysql-server.README.Debian.addon \
+ mysql41/build \
oldbuildwithdput.pl \
buildall.sh \
old/php/output \
@@ -15,14 +20,8 @@
old/suphp/build \
old/suphp/argv.patch \
old/suphp/suphp.h.patch \
- mysql41/mysql-mysqldb.patch.sql \
- mysql41/output \
- mysql41/mysql-username-len.patch \
- mysql41/mysql-server.README.Debian.addon \
- mysql41/build \
- patches/pureftpd-passivemodeandssl.patch \
- patches/mysql-username-len.patch \
- patches/pureftpd-customerproof-tf.patch \
+ patches/pureftpd/passivemodeandssl.patch \
+ patches/pureftpd/customerproof-tf.patch \
pure-ftpd/output \
pure-ftpd/build \
README
Deleted: trunk/vhffs-packages/mysql40/mysql-mysqldb.patch.sql
===================================================================
--- trunk/vhffs-packages/mysql40/mysql-mysqldb.patch.sql 2009-06-12 09:57:20 UTC (rev 1430)
+++ trunk/vhffs-packages/mysql40/mysql-mysqldb.patch.sql 2009-06-12 09:59:23 UTC (rev 1431)
@@ -1,6 +0,0 @@
-USE mysql ;
-ALTER TABLE `columns_priv` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` CHAR( 128 ) BINARY NOT NULL ;
-ALTER TABLE `db` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` CHAR( 128 ) BINARY NOT NULL ;
-ALTER TABLE `host` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL ;
-ALTER TABLE `tables_priv` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` CHAR( 128 ) BINARY NOT NULL ;
-ALTER TABLE `user` CHANGE `Host` `Host` VARCHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` VARCHAR( 128 ) BINARY NOT NULL ;
Deleted: trunk/vhffs-packages/mysql40/mysql-username-len.patch
===================================================================
--- trunk/vhffs-packages/mysql40/mysql-username-len.patch 2009-06-12 09:57:20 UTC (rev 1430)
+++ trunk/vhffs-packages/mysql40/mysql-username-len.patch 2009-06-12 09:59:23 UTC (rev 1431)
@@ -1,14 +0,0 @@
-diff -Nru a/include/mysql_com.h b/include/mysql_com.h
---- a/include/mysql_com.h 2004-09-07 00:29:46.000000000 +0200
-+++ b/include/mysql_com.h 2004-11-07 23:33:36.000000000 +0100
-@@ -22,8 +22,8 @@
- #define _mysql_com_h
-
- #define NAME_LEN 64 /* Field/table name length */
--#define HOSTNAME_LENGTH 60
--#define USERNAME_LENGTH 16
-+#define HOSTNAME_LENGTH 64
-+#define USERNAME_LENGTH 128
- #define SERVER_VERSION_LENGTH 60
-
- #define LOCAL_HOST "localhost"
Copied: trunk/vhffs-packages/mysql40/mysqldb.patch.sql (from rev 1428, trunk/vhffs-packages/mysql40/mysql-mysqldb.patch.sql)
===================================================================
--- trunk/vhffs-packages/mysql40/mysqldb.patch.sql (rev 0)
+++ trunk/vhffs-packages/mysql40/mysqldb.patch.sql 2009-06-12 09:59:23 UTC (rev 1431)
@@ -0,0 +1,6 @@
+USE mysql ;
+ALTER TABLE `columns_priv` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` CHAR( 128 ) BINARY NOT NULL ;
+ALTER TABLE `db` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` CHAR( 128 ) BINARY NOT NULL ;
+ALTER TABLE `host` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL ;
+ALTER TABLE `tables_priv` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` CHAR( 128 ) BINARY NOT NULL ;
+ALTER TABLE `user` CHANGE `Host` `Host` VARCHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` VARCHAR( 128 ) BINARY NOT NULL ;
Copied: trunk/vhffs-packages/mysql40/username-len.patch (from rev 1428, trunk/vhffs-packages/mysql40/mysql-username-len.patch)
===================================================================
--- trunk/vhffs-packages/mysql40/username-len.patch (rev 0)
+++ trunk/vhffs-packages/mysql40/username-len.patch 2009-06-12 09:59:23 UTC (rev 1431)
@@ -0,0 +1,14 @@
+diff -Nru a/include/mysql_com.h b/include/mysql_com.h
+--- a/include/mysql_com.h 2004-09-07 00:29:46.000000000 +0200
++++ b/include/mysql_com.h 2004-11-07 23:33:36.000000000 +0100
+@@ -22,8 +22,8 @@
+ #define _mysql_com_h
+
+ #define NAME_LEN 64 /* Field/table name length */
+-#define HOSTNAME_LENGTH 60
+-#define USERNAME_LENGTH 16
++#define HOSTNAME_LENGTH 64
++#define USERNAME_LENGTH 128
+ #define SERVER_VERSION_LENGTH 60
+
+ #define LOCAL_HOST "localhost"
Deleted: trunk/vhffs-packages/mysql41/mysql-mysqldb.patch.sql
===================================================================
--- trunk/vhffs-packages/mysql41/mysql-mysqldb.patch.sql 2009-06-12 09:57:20 UTC (rev 1430)
+++ trunk/vhffs-packages/mysql41/mysql-mysqldb.patch.sql 2009-06-12 09:59:23 UTC (rev 1431)
@@ -1,6 +0,0 @@
-USE mysql ;
-ALTER TABLE `columns_priv` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` CHAR( 128 ) BINARY NOT NULL ;
-ALTER TABLE `db` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` CHAR( 128 ) BINARY NOT NULL ;
-ALTER TABLE `host` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL ;
-ALTER TABLE `tables_priv` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` CHAR( 128 ) BINARY NOT NULL ;
-ALTER TABLE `user` CHANGE `Host` `Host` VARCHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` VARCHAR( 128 ) BINARY NOT NULL ;
Deleted: trunk/vhffs-packages/mysql41/mysql-username-len.patch
===================================================================
--- trunk/vhffs-packages/mysql41/mysql-username-len.patch 2009-06-12 09:57:20 UTC (rev 1430)
+++ trunk/vhffs-packages/mysql41/mysql-username-len.patch 2009-06-12 09:59:23 UTC (rev 1431)
@@ -1,14 +0,0 @@
-diff -Nru a/include/mysql_com.h b/include/mysql_com.h
---- a/include/mysql_com.h 2004-09-07 00:29:46.000000000 +0200
-+++ b/include/mysql_com.h 2004-11-07 23:33:36.000000000 +0100
-@@ -22,8 +22,8 @@
- #define _mysql_com_h
-
- #define NAME_LEN 64 /* Field/table name length */
--#define HOSTNAME_LENGTH 60
--#define USERNAME_LENGTH 16
-+#define HOSTNAME_LENGTH 64
-+#define USERNAME_LENGTH 128
- #define SERVER_VERSION_LENGTH 60
-
- #define LOCAL_HOST "localhost"
Copied: trunk/vhffs-packages/mysql41/mysqldb.patch.sql (from rev 1428, trunk/vhffs-packages/mysql41/mysql-mysqldb.patch.sql)
===================================================================
--- trunk/vhffs-packages/mysql41/mysqldb.patch.sql (rev 0)
+++ trunk/vhffs-packages/mysql41/mysqldb.patch.sql 2009-06-12 09:59:23 UTC (rev 1431)
@@ -0,0 +1,6 @@
+USE mysql ;
+ALTER TABLE `columns_priv` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` CHAR( 128 ) BINARY NOT NULL ;
+ALTER TABLE `db` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` CHAR( 128 ) BINARY NOT NULL ;
+ALTER TABLE `host` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL ;
+ALTER TABLE `tables_priv` CHANGE `Host` `Host` CHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` CHAR( 128 ) BINARY NOT NULL ;
+ALTER TABLE `user` CHANGE `Host` `Host` VARCHAR( 64 ) BINARY NOT NULL , CHANGE `User` `User` VARCHAR( 128 ) BINARY NOT NULL ;
Copied: trunk/vhffs-packages/mysql41/username-len.patch (from rev 1428, trunk/vhffs-packages/mysql41/mysql-username-len.patch)
===================================================================
--- trunk/vhffs-packages/mysql41/username-len.patch (rev 0)
+++ trunk/vhffs-packages/mysql41/username-len.patch 2009-06-12 09:59:23 UTC (rev 1431)
@@ -0,0 +1,14 @@
+diff -Nru a/include/mysql_com.h b/include/mysql_com.h
+--- a/include/mysql_com.h 2004-09-07 00:29:46.000000000 +0200
++++ b/include/mysql_com.h 2004-11-07 23:33:36.000000000 +0100
+@@ -22,8 +22,8 @@
+ #define _mysql_com_h
+
+ #define NAME_LEN 64 /* Field/table name length */
+-#define HOSTNAME_LENGTH 60
+-#define USERNAME_LENGTH 16
++#define HOSTNAME_LENGTH 64
++#define USERNAME_LENGTH 128
+ #define SERVER_VERSION_LENGTH 60
+
+ #define LOCAL_HOST "localhost"
Copied: trunk/vhffs-packages/patches/pureftpd/customerproof-tf.patch (from rev 1428, trunk/vhffs-packages/patches/pureftpd/pureftpd-customerproof-tf.patch)
===================================================================
--- trunk/vhffs-packages/patches/pureftpd/customerproof-tf.patch (rev 0)
+++ trunk/vhffs-packages/patches/pureftpd/customerproof-tf.patch 2009-06-12 09:59:23 UTC (rev 1431)
@@ -0,0 +1,32 @@
+diff -Nru a/src/ftpd.c b/src/ftpd.c
+--- a/src/ftpd.c 2006-09-30 18:40:57.000000000 +0200
++++ b/src/ftpd.c 2006-09-30 18:40:45.000000000 +0200
+@@ -2499,9 +2499,14 @@
+ # endif
+ if (st2.st_ino == root_st_ino && st2.st_dev == root_st_dev) {
+ mode |= 0700;
+- } else if (be_customer_proof != 0) {
+- mode |= (S_ISDIR(st2.st_mode) ? 0700 : 0600);
+ }
++
++// TF PATCH: forces 02700 on dir, and 0400 on files
++ else if (be_customer_proof != 0) {
++ mode |= (S_ISDIR(st2.st_mode) ? 02700 : 0400);
++ }
++// TF PATCH: end
++
+ if (fchmod(fd, mode) < 0 && chmod(name, mode) < 0) {
+ failure:
+ if (fd != -1) {
+@@ -3362,6 +3367,11 @@
+ #endif
+ error(550, MSG_MKD_FAILURE);
+ } else {
++
++ // TF PATCH: force SGID upon creation of directories
++ chmod(name, (mode_t) (02777 & ~u_mask_d) );
++ // TF PATCH: end
++
+ addreply(257, "\"%s\" : " MSG_MKD_SUCCESS, name);
+ }
+ #ifdef QUOTAS
Copied: trunk/vhffs-packages/patches/pureftpd/passivemodeandssl.patch (from rev 1428, trunk/vhffs-packages/patches/pureftpd/pureftpd-passivemodeandssl.patch)
===================================================================
--- trunk/vhffs-packages/patches/pureftpd/passivemodeandssl.patch (rev 0)
+++ trunk/vhffs-packages/patches/pureftpd/passivemodeandssl.patch 2009-06-12 09:59:23 UTC (rev 1431)
@@ -0,0 +1,20 @@
+diff -Nru a/src/ftpd.c b/src/ftpd.c
+--- a/src/ftpd.c 2007-06-02 01:37:14.000000000 +0000
++++ b/src/ftpd.c 2007-06-02 01:49:57.000000000 +0000
+@@ -3443,11 +3443,11 @@
+ if (disallow_passive != 0) {
+ feat[sizeof FEAT FEAT_DEBUG FEAT_TVFS FEAT_ESTP] = 0;
+ }
+-#ifndef MINIMAL
+- else if (STORAGE_FAMILY(force_passive_ip) != 0) {
+- feat[sizeof FEAT FEAT_DEBUG FEAT_TVFS FEAT_ESTP FEAT_PASV] = 0;
+- }
+-#endif
++// TF PATCH: disable the disabling of ssl when a passive ip is forced (a pool of forwarded ports makes passive mode working again)
++// else if (STORAGE_FAMILY(force_passive_ip) != 0) {
++// feat[sizeof FEAT FEAT_DEBUG FEAT_TVFS FEAT_ESTP FEAT_PASV] = 0;
++// }
++// TF PATCH: end
+ addreply_noformat(0, feat);
+ addreply_noformat(211, "End.");
+ }
Deleted: trunk/vhffs-packages/patches/pureftpd/pureftpd-customerproof-tf.patch
===================================================================
--- trunk/vhffs-packages/patches/pureftpd/pureftpd-customerproof-tf.patch 2009-06-12 09:57:20 UTC (rev 1430)
+++ trunk/vhffs-packages/patches/pureftpd/pureftpd-customerproof-tf.patch 2009-06-12 09:59:23 UTC (rev 1431)
@@ -1,32 +0,0 @@
-diff -Nru a/src/ftpd.c b/src/ftpd.c
---- a/src/ftpd.c 2006-09-30 18:40:57.000000000 +0200
-+++ b/src/ftpd.c 2006-09-30 18:40:45.000000000 +0200
-@@ -2499,9 +2499,14 @@
- # endif
- if (st2.st_ino == root_st_ino && st2.st_dev == root_st_dev) {
- mode |= 0700;
-- } else if (be_customer_proof != 0) {
-- mode |= (S_ISDIR(st2.st_mode) ? 0700 : 0600);
- }
-+
-+// TF PATCH: forces 02700 on dir, and 0400 on files
-+ else if (be_customer_proof != 0) {
-+ mode |= (S_ISDIR(st2.st_mode) ? 02700 : 0400);
-+ }
-+// TF PATCH: end
-+
- if (fchmod(fd, mode) < 0 && chmod(name, mode) < 0) {
- failure:
- if (fd != -1) {
-@@ -3362,6 +3367,11 @@
- #endif
- error(550, MSG_MKD_FAILURE);
- } else {
-+
-+ // TF PATCH: force SGID upon creation of directories
-+ chmod(name, (mode_t) (02777 & ~u_mask_d) );
-+ // TF PATCH: end
-+
- addreply(257, "\"%s\" : " MSG_MKD_SUCCESS, name);
- }
- #ifdef QUOTAS
Deleted: trunk/vhffs-packages/patches/pureftpd/pureftpd-passivemodeandssl.patch
===================================================================
--- trunk/vhffs-packages/patches/pureftpd/pureftpd-passivemodeandssl.patch 2009-06-12 09:57:20 UTC (rev 1430)
+++ trunk/vhffs-packages/patches/pureftpd/pureftpd-passivemodeandssl.patch 2009-06-12 09:59:23 UTC (rev 1431)
@@ -1,20 +0,0 @@
-diff -Nru a/src/ftpd.c b/src/ftpd.c
---- a/src/ftpd.c 2007-06-02 01:37:14.000000000 +0000
-+++ b/src/ftpd.c 2007-06-02 01:49:57.000000000 +0000
-@@ -3443,11 +3443,11 @@
- if (disallow_passive != 0) {
- feat[sizeof FEAT FEAT_DEBUG FEAT_TVFS FEAT_ESTP] = 0;
- }
--#ifndef MINIMAL
-- else if (STORAGE_FAMILY(force_passive_ip) != 0) {
-- feat[sizeof FEAT FEAT_DEBUG FEAT_TVFS FEAT_ESTP FEAT_PASV] = 0;
-- }
--#endif
-+// TF PATCH: disable the disabling of ssl when a passive ip is forced (a pool of forwarded ports makes passive mode working again)
-+// else if (STORAGE_FAMILY(force_passive_ip) != 0) {
-+// feat[sizeof FEAT FEAT_DEBUG FEAT_TVFS FEAT_ESTP FEAT_PASV] = 0;
-+// }
-+// TF PATCH: end
- addreply_noformat(0, feat);
- addreply_noformat(211, "End.");
- }