diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2012-11-17 19:12:21 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2012-11-17 19:12:21 +0000 |
| commit | 4d306d30c99d64af4ce69f4e389400772bdf829c (patch) | |
| tree | b53ca84965616820b6c7804474db380b1e53dbf6 /net-ftp | |
| parent | Replace DOC with DOCS. Bug #442964. Thanks to Denis M. (Phr33d0m) (diff) | |
| download | gentoo-2-4d306d30c99d64af4ce69f4e389400772bdf829c.tar.gz gentoo-2-4d306d30c99d64af4ce69f4e389400772bdf829c.tar.bz2 gentoo-2-4d306d30c99d64af4ce69f4e389400772bdf829c.zip | |
Fix building on alpha due to missing __NR_getpid syscall. Bug #405829. Keyword it on ~alpha
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/vsftpd/ChangeLog | 7 | ||||
| -rw-r--r-- | net-ftp/vsftpd/files/vsftpd-3.0.2-alpha.patch | 16 | ||||
| -rw-r--r-- | net-ftp/vsftpd/vsftpd-3.0.2.ebuild | 7 |
3 files changed, 27 insertions, 3 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog index 9b7cbf670773..96a92cf2b0e6 100644 --- a/net-ftp/vsftpd/ChangeLog +++ b/net-ftp/vsftpd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-ftp/vsftpd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.159 2012/11/14 16:33:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.160 2012/11/17 19:12:21 hwoarang Exp $ + + 17 Nov 2012; Markos Chandras <hwoarang@gentoo.org> + +files/vsftpd-3.0.2-alpha.patch, vsftpd-3.0.2.ebuild: + Fix building on alpha due to missing __NR_getpid syscall. Bug #405829. Keyword + it on ~alpha 14 Nov 2012; Agostino Sarubbo <ago@gentoo.org> vsftpd-3.0.2.ebuild: Stable for amd64, wrt bug #441728 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 000000000000..2445bb54467c --- /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__) diff --git a/net-ftp/vsftpd/vsftpd-3.0.2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.2.ebuild index 02482130d547..8d62ec4863c4 100644 --- a/net-ftp/vsftpd/vsftpd-3.0.2.ebuild +++ b/net-ftp/vsftpd/vsftpd-3.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-3.0.2.ebuild,v 1.3 2012/11/14 16:33:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-3.0.2.ebuild,v 1.4 2012/11/17 19:12:21 hwoarang Exp $ EAPI="4" @@ -12,7 +12,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="caps pam tcpd ssl selinux xinetd" DEPEND="caps? ( >=sys-libs/libcap-2 ) @@ -35,6 +35,9 @@ src_prepare() { # Fix building without the libcap epatch "${FILESDIR}/${PN}-2.1.0-caps.patch" + # Fix building on alpha. Bug #405829 + epatch "${FILESDIR}/${PN}-3.0.2-alpha.patch" + # Configure vsftpd build defaults use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h |