[gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/files/

[gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/files/

[Sergei Trofimovich]

commit:     8539ca7961a6022b70a21a2522d3ae63bc671a1c
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 24 17:50:04 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Feb 24 18:02:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8539ca79

net-ftp/vsftpd: restore still used patch, bug #678680

Closes: https://bugs.gentoo.org/678680
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/vsftpd/files/vsftpd-3.0.2-alpha.patch | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.2-alpha.patch b/net-ftp/vsftpd/files/vsftpd-3.0.2-alpha.patch
new file mode 100644
index 00000000000..2445bb54467
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-3.0.2-alpha.patch
@@ -0,0 +1,16 @@
+Author: Michael Cree <mcree@orcon.net.nz>
+Description: Fixing FTBFS on alpha (Closes: #656182).
+
+diff -Naurp vsftpd.orig/sysdeputil.c vsftpd/sysdeputil.c
+--- vsftpd.orig/sysdeputil.c	2010-03-26 04:25:33.000000000 +0100
++++ vsftpd/sysdeputil.c	2012-01-21 10:53:37.353802546 +0100
+@@ -81,6 +81,9 @@
+   #include <linux/unistd.h>
+   #include <errno.h>
+   #include <syscall.h>
++  #if defined(__alpha__)
++    #define __NR_getpid  __NR_getxpid
++  #endif
+ #endif
+ 
+ #if defined(__linux__) && !defined(__ia64__) && !defined(__s390__)

[gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/files/

[Andreas Sturmlechner]

commit:     786fdc1214f6f2698d09f8256c8f42b35e493257
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Mar  1 16:55:34 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  2 00:02:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=786fdc12

net-ftp/vsftpd: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-ftp/vsftpd/files/vsftpd-3.0.2-aslim.patch | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.2-aslim.patch b/net-ftp/vsftpd/files/vsftpd-3.0.2-aslim.patch
deleted file mode 100644
index 9a8f8ea0e25..00000000000
--- a/net-ftp/vsftpd/files/vsftpd-3.0.2-aslim.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=522412
-https://bugzilla.redhat.com/show_bug.cgi?id=913519
---- a/defs.h	2014-09-13 12:04:15.953079704 +0200
-+++ b/defs.h	2014-09-13 12:04:48.677080716 +0200
-@@ -19,7 +19,7 @@
- /* Must be at least the size of VSFTP_MAX_COMMAND_LINE, VSFTP_DIR_BUFSIZE and
-    VSFTP_DATA_BUFSIZE*2 */
- #define VSFTP_PRIVSOCK_MAXSTR   VSFTP_DATA_BUFSIZE * 2
--#define VSFTP_AS_LIMIT          100UL * 1024 * 1024
-+#define VSFTP_AS_LIMIT          400UL * 1024 * 1024
- 
- #endif /* VSF_DEFS_H */
-