Fix building on alpha due to missing __NR_getpid syscall. Bug #405829. Keyword it on ~alpha

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

4 files changed, 50 insertions, 5 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/Manifest b/net-ftp/vsftpd/Manifest
index 318d3f2c18b1..44cb23b586be 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX vsftpd-2.1.0-caps.patch 575 SHA256 4888021a25625041746b91025af0c2a2cb1fde758eda1d6c94098d4de0c1e370 SHA512 aeb407d9d0cf3940bc0fb1ef76c23cd19f68293e64d8a6a64e2a271b624a237fa3721b6a3476d59f0c6fabf69a418f9577fde351aba0e9aa96dc1362c02e1524 WHIRLPOOL bfad7367797f0fd0da502d9ebdcf13364123742642d384fb44220c0af2370997c5fbf9e72bf9eaabf47a449650702b1b73ac165a49ebc8687cb624e0caccbf99
 AUX vsftpd-2.2.0-dont-link-caps.patch 806 SHA256 fd164d4702ae866cb06ad245653b4f25c73d1d701a211b1f972b45b98ab55dd2 SHA512 b162f3afcc135bdecea63ef24a1f321e6723a1218a96a8897b3db67338f5cdceb6178c7cd0a155dee80af3e7b9198610562de7cff6986e7dfc93df79b5ee501c WHIRLPOOL cd7c6a94cc094af32097031aeca93873604d86f1d2ddaeb4980a18c82ab0061e95ca36484f157b68db9f81456e71fa02a6d01520f7ca9487bd2a266458c5a4cd
 AUX vsftpd-2.2.0-gentoo.patch 11049 SHA256 e1737c941837aaf8e060a649903934174528704feffd100f86180a7ec68f3760 SHA512 2c1ff970d92ae1646430aa5f1ffbf1f846d97765b19a9ea15355ce556ff493f8d0eb8564ec20afda32ac4fb04407b9618db64f0f5aab230a9e6a9ce513a22978 WHIRLPOOL 180088b91c055ef6bc74f796875bbcd6e3f7379587941d106eabaf6036c162340ff570ea7fdeea397e37a1d00db176feeb76c4c3b77de9766e60f29efae9a595
@@ -5,6 +8,7 @@ AUX vsftpd-2.3.2-as-needed.patch 423 SHA256 ad393655b30887294dfcf46fe63ea24e3339
 AUX vsftpd-2.3.2-kerberos.patch 842 SHA256 d86bed62c0fd22372f4704a12d7f75ce42fc15765ceec802b4b0c5680bc9c200 SHA512 94c743b4f78f41aba4427b6e75b8d85d57a1eec6eb89e0ca93f47c0e5ccdb31a80eb28cfeb3c50cce5cbf5909646150aec762d8b250650dcfbaa6ad190271af8 WHIRLPOOL 53ff6a29d84e23584f7ca873cb715369e636f0d1739fd1a591cc400f6ebe59aa28547a1a6d9b9681822d678e007750c81189c8ed296199eb56d9e77ddd4c7fcf
 AUX vsftpd-2.3.5-gentoo.patch 8560 SHA256 227fc60234c002d756d6a4f0867b6f7cf63315cb53dda78a1ef62ea5ccc61bdd SHA512 dbe8a022b9dd4bfdf5c0138aa0ad13311d4a52e7671888fc2018992e7906c2aab53355d2ab24cc4e1f19c358a5202eb9965bf3ca9180d6b9d369d451c7c656b3 WHIRLPOOL 40aaeeab47b1775d3b035a91810bc8e67d573d2d51de886d80aa44c96ac92c21154a3e214faf6f7d890b8e18626cdd8e3b28df5b203df3817929c40aeb9400ec
 AUX vsftpd-3.0.0-Makefile.patch 1093 SHA256 e654f707a4c1da2433b28e35a05e1dd92fee35f4582e458e64066f30b75db7de SHA512 66217e5be8e5a7b819c0a38ee8ac9e84ea5937c7285843d1de5b8361211ea86816551b440bf9d5c89c9f874e867c9f50590a2e8a50dbd313fcde1d5d4ea6ab4e WHIRLPOOL 1b031f17fd4176e1d42f2b955b7656d2d281db46fc768f52063e009028224e20dc50b82f93f8c21842cffad82cba3492dfd8ff740ec72d3ad07caad825be73b0
+AUX vsftpd-3.0.2-alpha.patch 525 SHA256 e544547b4f665e40e5a55e411946e37c2493dfe0391ba9ef6760ba889f7a9c98 SHA512 5d9639bf7fa08bfce5cbbc79c59445e099c42adec6dc1a3e14e6a9586c53a082e0c712625a3de62418fd0f0bd253b6b673a700157be07ab114770707739a6c38 WHIRLPOOL c08ddd9fb7aa60c4e1a84a95c3f390cff279d060c6d63464b5defbf4aa9765bf35c717506cb404cc937d4b6b7307d63ed906c796e4409ff7d5494fc2c1ee3b85
 AUX vsftpd.conf 3842 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0 SHA512 ab6c74a22eb30e504efca095ecb0675e058bd4290e4cd926433d011ec8423a33bc1da4d25d4de295e6ab8f001e1d4b3da03340b1b279fdc95461d393ab4f64d8 WHIRLPOOL 00ab13614d97e52c2b0e88587feb7276991090a0e94244695420dd87993fb25d30ea461bc4fc3770a38043cb09b3a714ddfc869c98d29033a61740018acbdf9a
 AUX vsftpd.init 1922 SHA256 78941ea7744d65d4674b4df8ecee6df91e6ed601c47d64ce1f489af56ea250e2 SHA512 c652b6fc4b56810b7163fefa5e9e00cdb935d14034ab59d7bddc825675ab9de618f7cc3020a12ceb2d5b9d4344edcfaa9ad51a94fcf61ce8d3906be159e083de WHIRLPOOL dfa9c7f9650f91abbc510301c5bfebf02e5bd4c54e95580f575cacf4ecba2fa2d6d39a050e86fd8247dc8586da8ef53039419b54d45f9f71cfe9a670b853127d
 AUX vsftpd.logrotate 53 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3 SHA512 6b0d718ffdc0b6a68d5092b36a03106d2c4e4fa6873a178c85345acfb3847ef839a475eadb56171d79ec243ae2bf8725cae0ae486b182afe065b181f87c831c5 WHIRLPOOL e155b30b59319cc5dac69c7446273ab20b4e56f696cce6ab8c83c3310529e0da70969edefaf94c912f121d3df526368ad9aafd291c6cf2f6a9b2d7b69d88b0aa
@@ -21,6 +25,23 @@ EBUILD vsftpd-2.3.2.ebuild 3128 SHA256 c0241d0f25dff6ecfb4b4d47152a7ff62be23fad6
 EBUILD vsftpd-2.3.4.ebuild 3282 SHA256 b2d6073e8a200c103d506018550f4b9e195b6468c0b1d9d7f49996c1ab75b8da SHA512 8551a76651898cfde32600e236807f51708c5bea7de7d84eb7ce8934a5671dc427d571cc0477071138bc2eb2ca0b998dc9a4f16c85058d918ae445ec9b085906 WHIRLPOOL 8cbf90f59e2311f3756188b0e0ec5b403459897262955ea36a5725956dd621119e2996e610b48a22521962859613248be589ae2924a12bcae651c2c8e8b825ca
 EBUILD vsftpd-2.3.5.ebuild 3116 SHA256 3d93968516e12ca228f6138eed946d23f9e8890f2cf3750fcd3ea95bda35391b SHA512 792ed9806b4414435ab7082cc3cbab037e394e8dcc8119fe7b73e241babaf6d6f46129dcabc25d2cce97b74b89a1230f145dea0f2fc0909c9fcc0ba2a5610591 WHIRLPOOL 1730280995a9b9ea602803fc10f1f9326a7cecd52aa4eda9a8f63300d64ef25bbd9b085103afdaa4409f18fe02c1c9c58e6b7c8c7557ad2e181707284725080e
 EBUILD vsftpd-3.0.0.ebuild 3102 SHA256 e82828dd9a0854cd2434101789997cdf46b6841c367c6cd789c893c77cef385c SHA512 fb26ef56475cb9ff8f0539fb4d7616e613961e7371b4e85cb9248718dd35b9cfd0eaf10a7ff864e54ffcab133d5b24c9798bb4934a985d832d6b5d8419c967ca WHIRLPOOL dff1207ff085fe21dfff30d7eca9ec50cdb65949e0f87de0d529dc592bd8b50002afb5b393ab64e09f92d6be472f84ee07fd1efca479c902775e32ee142c7f1a
-EBUILD vsftpd-3.0.2.ebuild 3103 SHA256 134c2a0e59c5d5a56757d179a43bae6093d6a5db1cf9951670fc50e387242af4 SHA512 2ad5655d37090c411380e300ed2635eff074abd85e7878d8efab93061efb4a08e1a41c6170d08a8f5a8d0623368f48c1fb64908718b316098611db8ce5305e34 WHIRLPOOL 3774ef15bd8f7a7bbe5382c045bf92b59afed77b9755732ea2da02cf1a9e7ca870f487d7b750ee672f944fa06b0898760fcd96bc625a859c84f28935052a5294
-MISC ChangeLog 22557 SHA256 3ef5d9e4baf6b0a9a579c8c6bbe4109fa928e69198cb05d99b73c9c41707b365 SHA512 77f3d644ba2cd9dc42b69be9c0d07b9ae50e8d11a124d89e0bddbb06fa79a19b12a0ca0f6bd49ecd72b1a8491bced2c2e20b5e0f32facb52345c87f370233b93 WHIRLPOOL 2ffc62ef5949afda4e93622a348e2e985d09828987bca0f5e74888a9ed56d8b030141bf34b24e141927080039c6cf77c1ed0cede9ed980f9a4ebbb7086d6efcb
+EBUILD vsftpd-3.0.2.ebuild 3200 SHA256 b5fce87ba4953a4c883b47bf2fbe66e60c6fe6f3eae81de3e5a04253d6758d19 SHA512 c419a0677203eb757d816f291c525641467df58e17a59f431a956ddeaa74464a462030fc09fbdf199cf54f29ae58706f23e7cea7d65daed71cb389bf0a1429e9 WHIRLPOOL 66bb6d68bbafbc8ce1b186be82cb28c401481815dbc5eb3d73dba97922ac9709496418511fce38d8bf7b2f9fd447d877fd0f3de4862abcc52de30ad243d0e455
+MISC ChangeLog 22768 SHA256 efd32d010db484726b21cae81279ab62aab2613a7ad35ddabf916add6b05949b SHA512 a6cc5b45b1b42199cd3f644a0f07d6af00f5a56e8ed7c8ce5674f55a0dd88dd0e0a129219b882328e60fd2361503ea9feb0edf2ded898a6ac09792dbaf2a3b0d WHIRLPOOL 20d9517fa62f820c60ba2349de33725bf9dd4509da5f81eb7bc69540b38b70bd036cf29f19b468e42ab5c35032fe66babffa0572f895ca08e657a8634eaa9dff
 MISC metadata.xml 632 SHA256 f046fba5995e07181957c2bd98cc334d6ce9ab0c18cfeb97cac967d25dbb7fb5 SHA512 79bbfa7c635c09d228d1dd1fe34828a5813e42e275c83b1d934cbadf82907211339097d157ddcd7d8f318f2693e4c3816c8441c2706db12100ad2c00df3b3784 WHIRLPOOL ec78e595bd31800d611ab08a90c4ebeb3163aac3e9f846672f9b531a213e098e5f05e73f969a1b2a9446d085f0b284ccf4314ad701f67b8c4f3035d1f5533c23
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQp+GWAAoJEPqDWhW0r/LC5qYP/iBKIJDk2gVEbtylRobQ3c9y
+9BbsZJ6ZGCFB9IjGTKOAO/O6gZjn3f/n9dKRBkA/j814PLWhtes/MQ7oPebtGf6K
+6UqlKamDAD8HH9M9Hn/+2xfWBZMYmKTZ10KzE8Qu72U6N8ipNRxZmkvm7+TG6Hr+
+f8dOy009AB+ufn3fQSd38ulqfwlBOiMW7QDYuvUqbnGKJhOG1csKomJmf1sarjm1
+N/Z4JFUm8rzNUecpFyafDqtPQo0QzkpMPTxYW9mFEXSd3ZraDqLtV3ok36l2Z75J
+zgvpVFe4QnBb/KimmYE7CxN0EUWl8X9TcfitkqwPkykloX1rnmuLI2SUL7b2TVpO
+/uVavbEv7PURiwBZ/sywrnNI1t/YdeI61WVfShrCXBevMXbYCijjSnFBkQt7xcMz
+EklIB3WiLV4Eo6THoU90AgMXOIyOq/FZf81i/YK6m9S4vUo1MO8js5ELfyMuCwTT
+VQfqN9bote0arQ4t9ju+AGHDrxv9naC82G/09hXv2EJdFelnoTE5CbSpRD630eC2
+JqEL0mStFd9U07FaMegJx/PuQAUlo3iCCg5J9LFWPajV9u/hTgx9iMA38F7GNuy3
+t3Rx2lj6fDaU2DReRlYuJ92unsDdQgbily8C1FQCePL3mrk2jvjZm2LSbS9VjfA2
+OqJxdxtezN/hznlRgPmI
+=qZSP
+-----END PGP SIGNATURE-----
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