diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2011-04-15 17:39:43 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2011-04-15 17:39:43 +0000 |
| commit | 794ec18058ead7d28cb2ae0b2b6ab04c9c544c98 (patch) | |
| tree | cb64ef5c680a2359dfb5da291454311ff0edb936 /net-ftp | |
| parent | Import of SCM Micro scl011-bin driver, ebuild proxy-maintained by Christoph B... (diff) | |
| download | historical-794ec18058ead7d28cb2ae0b2b6ab04c9c544c98.tar.gz historical-794ec18058ead7d28cb2ae0b2b6ab04c9c544c98.tar.bz2 historical-794ec18058ead7d28cb2ae0b2b6ab04c9c544c98.zip | |
Converted proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch from CRLF to LF
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/proftpd/Manifest | 8 | ||||
| -rw-r--r-- | net-ftp/proftpd/files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch | 36 |
2 files changed, 22 insertions, 22 deletions
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index 7df862506f57..97ff05aa27bf 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch 820 RMD160 5cab2ca083c3db68eada127f41a45e2112356434 SHA1 f636015c9faab8654e4ee343b56b81e7cfdcf2c0 SHA256 55e7bc8346e005cd35060987a4e26ae109d59be05f385ad2febbc30656a9fb35 +AUX proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch 802 RMD160 1df65b4ec9a8fee9ca1fe7c87415e59ce1dae6fd SHA1 2749f5e949dc50b89651baca911b679ddf27f492 SHA256 6d793222b2d128ce963722894fb7d0743f5328cd7849c6218f6329f7c43f325f AUX proftpd-bug3586.patch 5507 RMD160 8843d2f0d4378151b34263834f7bfd88271eaece SHA1 70af05ef5c852c590a50551e7d72a16a6cd1b7ba SHA256 4e748700d4262c2340e485844d3dff76715853f3c27db877298c8eda098a4ed8 AUX proftpd.conf.sample 1275 RMD160 199b8cced06d347ef8a2033b68850fd9dd922ccd SHA1 e58e5e7856bc77e159a628717ad1c73e20c5b883 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0 AUX proftpd.initd 1563 RMD160 c30ab2c000ca31a348e0c9d92e07d93c5cba8d4e SHA1 7462aaec25c6f44928339458d450f7e386b147d4 SHA256 fe36a50fcf1a2d7b820edde94349cd68204e7b14c8a5d34f710af68ed1ce8315 @@ -25,7 +25,7 @@ MISC metadata.xml 2286 RMD160 881ef9e88e0426169393f54c68dcf91f895e898e SHA1 37ab -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk2nRPwACgkQFYEBGcdFJfKZ3QD/cf8I+D621H7+o1oNsDKwKGkJ -mP4bBBSKUys/eSqi8pAA/36sjK1+MFpbirB8I1PpCzpalh5jKotTgOJgdJQjwXJk -=2U/X +iF4EAREIAAYFAk2oguIACgkQmWq1bYTyC0MufwD+NYXPm1CosBUF0aHQ/7Xw+PFc +YamaIs9f1iCGezbGWUoA/072UAd/knBLpwe9xHyakReYOnvTLytJguduSb/XYdTz +=0X14 -----END PGP SIGNATURE----- diff --git a/net-ftp/proftpd/files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch b/net-ftp/proftpd/files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch index d2ae25b61656..7393495e617b 100644 --- a/net-ftp/proftpd/files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch +++ b/net-ftp/proftpd/files/proftpd-1.3.4_rc2-sql-groupsetfast-null-pointer.patch @@ -1,18 +1,18 @@ -Index: contrib/mod_sql.c
-===================================================================
-RCS file: /cvsroot/proftp/proftpd/contrib/mod_sql.c,v
-retrieving revision 1.210
-diff -u -r1.210 mod_sql.c
---- contrib/mod_sql.c 26 Mar 2011 00:43:27 -0000 1.210
-+++ contrib/mod_sql.c 12 Apr 2011 22:07:41 -0000
-@@ -4045,8 +4045,8 @@
- if (!cmap.groupcustomgroupsetfast) {
- where = sql_prepare_where(0, cmd, 1, cmap.groupwhere, NULL);
-
-- mr = _sql_dispatch(_sql_make_cmd(cmd->tmp_pool, 6, MOD_SQL_DEF_CONN_NAME,
-- cmap.grptable, cmap.grpfields, where, NULL), "sql_select");
-+ mr = _sql_dispatch(_sql_make_cmd(cmd->tmp_pool, 5, MOD_SQL_DEF_CONN_NAME,
-+ cmap.grptable, cmap.grpfields, where, "1"), "sql_select");
- if (check_response(mr) < 0) {
- return mr;
- }
+Index: contrib/mod_sql.c +=================================================================== +RCS file: /cvsroot/proftp/proftpd/contrib/mod_sql.c,v +retrieving revision 1.210 +diff -u -r1.210 mod_sql.c +--- contrib/mod_sql.c 26 Mar 2011 00:43:27 -0000 1.210 ++++ contrib/mod_sql.c 12 Apr 2011 22:07:41 -0000 +@@ -4045,8 +4045,8 @@ + if (!cmap.groupcustomgroupsetfast) { + where = sql_prepare_where(0, cmd, 1, cmap.groupwhere, NULL); + +- mr = _sql_dispatch(_sql_make_cmd(cmd->tmp_pool, 6, MOD_SQL_DEF_CONN_NAME, +- cmap.grptable, cmap.grpfields, where, NULL), "sql_select"); ++ mr = _sql_dispatch(_sql_make_cmd(cmd->tmp_pool, 5, MOD_SQL_DEF_CONN_NAME, ++ cmap.grptable, cmap.grpfields, where, "1"), "sql_select"); + if (check_response(mr) < 0) { + return mr; + } |