- make netkit-ftpd cross compile aware

Package-Manager: portage-2.1.4.4

4 files changed, 57 insertions, 5 deletions

diff --git a/net-ftp/netkit-ftpd/ChangeLog b/net-ftp/netkit-ftpd/ChangeLog
index 0fe1ea3edc9c..6133131be3e6 100644
--- a/net-ftp/netkit-ftpd/ChangeLog
+++ b/net-ftp/netkit-ftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/netkit-ftpd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-ftpd/ChangeLog,v 1.17 2008/01/14 21:13:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-ftpd/ChangeLog,v 1.18 2008/05/11 19:10:29 solar Exp $
+
+  11 May 2008; <solar@gentoo.org> +files/netkit-ftpd-0.17-cross.patch,
+  netkit-ftpd-0.17-r7.ebuild:
+  - make netkit-ftpd cross compile aware
 
   14 Jan 2008; Ulrich Mueller <ulm@gentoo.org> -netkit-ftpd-0.17-r4.ebuild,
   -netkit-ftpd-0.17-r5.ebuild:
diff --git a/net-ftp/netkit-ftpd/Manifest b/net-ftp/netkit-ftpd/Manifest
index 09260091f45f..aa03325f90fb 100644
--- a/net-ftp/netkit-ftpd/Manifest
+++ b/net-ftp/netkit-ftpd/Manifest
@@ -2,12 +2,13 @@ AUX ftp.xinetd 318 RMD160 fbb913e2ec08c7cbd08b1a520ca8893c21919cf3 SHA1 90b9af1d
 AUX netkit-ftpd-0.17-build.patch 862 RMD160 601b57beddbc66386173721c4777084121c3f761 SHA1 49b3d2ebf5ee837a72c02757e7a08d1b9fd3490f SHA256 2dabb6d6df74c15a1f97ea6fa90ed9ed7f437c5ebeb26f6ba4183362119b769c
 AUX netkit-ftpd-0.17-cleanup-ssl.patch 279 RMD160 3bfb7342b300749b2754828ad994043c45dce3f9 SHA1 d31f8108a5e0c311ad85b95dea4571e5782e032e SHA256 110d1de5c37f29de6e9e753114d97c03742793481f1f377fd91a7b4dc5483076
 AUX netkit-ftpd-0.17-cleanup.patch 186 RMD160 4e9690b7d03cd49783bc8f2f1ca0c021eddce117 SHA1 476bbf54d6bb1a1abb373813a745dea10ada38ba SHA256 5eb8134a8be569f1fc448bb781193f1820bddd36e735b1d164de2dfd4071a12f
+AUX netkit-ftpd-0.17-cross.patch 1353 RMD160 a0b3b56b15945a3172004baa0c47354d823ca30e SHA1 e6c0232ddabb97253db547427fa21011aebf4454 SHA256 dc4af056be711835feb00ebb28505a8817a2e8f59f90627ab0307b4aea2022df
 AUX netkit-ftpd-0.17-fclose-CVE-2007-6263.patch 658 RMD160 eaad780f4978e9f1bffde66a5b06226cc045daae SHA1 4a05d978f1c1c3c855c83b0adf0e85df7dbe122b SHA256 aa233506a3322bd9363aca4423b1bbb18ad618f2d722edae614b47640f42bb65
 AUX netkit-ftpd-0.17-gcc41.patch 770 RMD160 d9c69b0b8d1ded60b399ec36e0f975f8e14e57af SHA1 87db2260da0d0ae00d558de586853794b27c168e SHA256 d5ebda1221b9dbce3ba7ddccae846da65a0c7c5e544a0a8625d93396a3a1ea50
 AUX netkit-ftpd-0.17-setguid.patch 1809 RMD160 971cb07d1060d6bc7c721d506bbabd3a2daa7e4d SHA1 90f0a2ca39b3cd24f0b990d280c16fa29f4d67ca SHA256 7cf4924713e629bce9f0e7c483332046b336480da16156d6db5fa094b6d38424
 AUX netkit-ftpd-0.17-shadowfix.patch 587 RMD160 118077a510b651086547693e0da7bf140573bd21 SHA1 9fd30dc953c996254205beae44b43aa29dccc27e SHA256 93c43a7033f24c3232438d81c5442e75cd4d38a2a6a9cf90ed73dc962d1203b6
 DIST linux-ftpd-0.17-ssl.patch 36459 RMD160 5a0d7301f69b4c1714f36419f98134f9aa0ce874 SHA1 a684c075dbc7603b40704713350c1bb95d98a4c5 SHA256 0082ee6a71fdd83f61e63166f7bbba97c204cdc67f9e1bf10f2df31590fba780
 DIST linux-ftpd-0.17.tar.gz 46763 RMD160 869e410d8f063c764c04f1d3b41b625a9d679d22 SHA1 b348e2c9561d746a42b7a24ba8730a3adc203dfb SHA256 65a0b249e38bf3c3a16dbd4d3edd2657683ca8f47b307e92007f378b21d2fa65
-EBUILD netkit-ftpd-0.17-r7.ebuild 1625 RMD160 bb95b03e2a847a56fd5d0ad6689dcc1ac86c4cda SHA1 cf0ac7bb3905dc9a1e6f752228c0801f4ecfb5f3 SHA256 6e165799acaaab4d31ca23e3c40296a05523686ac2c80c383dbf9e6496a8be0e
-MISC ChangeLog 6928 RMD160 b39a9e40ab1241bace3ed7b6971f514a9230b75c SHA1 93c025bffb05b45ba3f209c1f1e5a24b4ffc41b7 SHA256 38fa938f63634fc85c09719258e3c94e12ef277eb48b6ef89af81a40178705d6
+EBUILD netkit-ftpd-0.17-r7.ebuild 1693 RMD160 661727f3f658b700cedce79051324d5b9ffaee66 SHA1 95581e8a2a6a7055eebc7a3c17476f6c55026c3a SHA256 8a69da99d7afc4046306b3009df181e1eedff1786b347eb7a684880019e24e08
+MISC ChangeLog 7073 RMD160 ec9dec5aaaad783f16bd4b6e17763fcab7b44994 SHA1 f8daaaf664154b7ff341a20e5a9072d39ec85454 SHA256 afdfd3183be51aab6829990c931e137d41146b42115461f726ee62eb9995e2f1
 MISC metadata.xml 165 RMD160 1c3eeab5c3fc7c211e19ce70d30db054b3448591 SHA1 e5bc9fac08f72762fdc827e1b520ed403667be37 SHA256 0879c713d0d1ea2f39c1088bf4717b1328b4ab06d6f5dd6968c5559750422ae6
diff --git a/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cross.patch b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cross.patch
new file mode 100644
index 000000000000..cb6ad986a914
--- /dev/null
+++ b/net-ftp/netkit-ftpd/files/netkit-ftpd-0.17-cross.patch
@@ -0,0 +1,45 @@
+--- configure.orig	2008-05-11 12:02:50.000000000 -0700
++++ configure	2008-05-11 12:04:14.000000000 -0700
+@@ -93,7 +93,7 @@
+     echo -n 'Checking if C compiler works... '
+     if (
+           $CC __conftest.c -o __conftest || exit 1
+-          ./__conftest || exit 1
++          [ -e __conftest ] || exit 1
+        ) >/dev/null 2>&1; then
+          echo 'yes'
+      else
+@@ -169,13 +169,13 @@
+ EOF
+ if (
+       $CC $CFLAGS  __conftest.c  -o __conftest || exit 1
+-      ./__conftest || exit 1
++      [ -e __conftest ] || exit 1
+    ) >/dev/null 2>&1; then
+     echo 'yes'
+ else
+     if (
+           $CC $CFLAGS -D__USE_BSD_SIGNAL __conftest.c  -o __conftest || exit 1
+-          ./__conftest || exit 1
++          [ -e ./__conftest ] || exit 1
+        ) >/dev/null 2>&1; then
+         echo '-D__USE_BSD_SIGNAL'
+         CFLAGS="$CFLAGS -D__USE_BSD_SIGNAL"
+@@ -311,7 +311,7 @@
+ else
+     if (
+           $CC $CFLAGS -D_GNU_SOURCE __conftest.c  -o __conftest || exit 1
+-          ./__conftest || exit 1
++          [ -e ./__conftest ] || exit 1
+        ) >/dev/null 2>&1; then
+         echo '-D_GNU_SOURCE'
+         CFLAGS="$CFLAGS -D_GNU_SOURCE"
+@@ -342,7 +342,7 @@
+ EOF
+ if (
+       $CC $CFLAGS  __conftest.c $LIBBSD -o __conftest || exit 1
+-      ./__conftest || exit 1
++      [ -e ./__conftest ] || exit 1
+    ) >/dev/null 2>&1; then
+     echo 'ok'
+ else
diff --git a/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r7.ebuild b/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r7.ebuild
index 86f898741899..e4071e3932ba 100644
--- a/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r7.ebuild
+++ b/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r7.ebuild,v 1.9 2008/01/14 19:40:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r7.ebuild,v 1.10 2008/05/11 19:10:29 solar Exp $
 
-inherit eutils ssl-cert
+inherit eutils ssl-cert toolchain-funcs
 
 MY_P="linux-ftpd-${PV}"
 DESCRIPTION="The netkit FTP server with optional SSL support"
@@ -30,10 +30,12 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-shadowfix.patch
 	epatch "${FILESDIR}"/${P}-gcc41.patch
 	epatch "${FILESDIR}"/${P}-setguid.patch
+	epatch "${FILESDIR}"/${P}-cross.patch
 	use ssl && epatch "${FILESDIR}"/${P}-fclose-CVE-2007-6263.patch #199206
 }
 
 src_compile() {
+	tc-export CC
 	./configure --prefix=/usr || die "configure failed"
 	emake || die "parallel make failed"
 }