add temporary blocker until www-servers/publicfile is fixed (bug #248485)

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28-gentoo i686

4 files changed, 17 insertions, 21 deletions

diff --git a/net-ftp/netkit-ftpd/ChangeLog b/net-ftp/netkit-ftpd/ChangeLog
index f90305ddaca0..d5d464e64dc1 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.22 2008/10/30 19:10:02 dertobi123 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-ftpd/ChangeLog,v 1.23 2009/01/03 18:36:26 bangert Exp $
+
+  03 Jan 2009; Thilo Bangert <bangert@gentoo.org>
+  netkit-ftpd-0.17-r7.ebuild, netkit-ftpd-0.17-r8.ebuild:
+  add temporary blocker until www-servers/publicfile is fixed (bug #248485)
 
   30 Oct 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   netkit-ftpd-0.17-r8.ebuild:
diff --git a/net-ftp/netkit-ftpd/Manifest b/net-ftp/netkit-ftpd/Manifest
index 42c7439cf654..b44844de7a58 100644
--- a/net-ftp/netkit-ftpd/Manifest
+++ b/net-ftp/netkit-ftpd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ftp.xinetd 318 RMD160 fbb913e2ec08c7cbd08b1a520ca8893c21919cf3 SHA1 90b9af1d19230098a45d2995d5271d5343be0a16 SHA256 e55e99f3b978648f9e126f31caae7b7ab870e310dd29dc2120723bae9addd24f
 AUX netkit-ftpd-0.17-CVE-2008-4247.patch 2909 RMD160 5c08da76eadd1c4e4c72ad48eb14c73cbcbfcb34 SHA1 f0b17858619cf72d9b26f8a4ac0910dc8978d928 SHA256 fa585fd8499a8670015f35cc31f2b15ca2781ae9635a1eb4c1541eb18c9bdd4d
 AUX netkit-ftpd-0.17-build.patch 862 RMD160 601b57beddbc66386173721c4777084121c3f761 SHA1 49b3d2ebf5ee837a72c02757e7a08d1b9fd3490f SHA256 2dabb6d6df74c15a1f97ea6fa90ed9ed7f437c5ebeb26f6ba4183362119b769c
@@ -13,14 +10,7 @@ AUX netkit-ftpd-0.17-setguid.patch 1809 RMD160 971cb07d1060d6bc7c721d506bbabd3a2
 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 1693 RMD160 661727f3f658b700cedce79051324d5b9ffaee66 SHA1 95581e8a2a6a7055eebc7a3c17476f6c55026c3a SHA256 8a69da99d7afc4046306b3009df181e1eedff1786b347eb7a684880019e24e08
-EBUILD netkit-ftpd-0.17-r8.ebuild 1748 RMD160 d297b24d6eca8700d042026cab83157453fff922 SHA1 d9280e30fe0fc0a524cb80a7f10ee3bed50825bc SHA256 88f2497a1d73c7575bf92f3a5fbc9c9f39c943b6bdfff7fef3fb3485b18b8849
-MISC ChangeLog 7612 RMD160 a7393dafed4dc7005a4fc39418b734cc019a9581 SHA1 c646a2f430186c28f4049788b93663b7a45875a0 SHA256 f4638ba68bea24be2f1c123a67d8c63fd43bd5e1c36785bc292032821ebddcb3
+EBUILD netkit-ftpd-0.17-r7.ebuild 1720 RMD160 b45ba039d31fedaf66ad0074722712191811a6c6 SHA1 61e7724966b057f2e3192e10e1b05a3c42a2269d SHA256 b37f2460c3abffad48a72326972c08551c5f5152b8a2e2c58dd5ec3b890a0ecb
+EBUILD netkit-ftpd-0.17-r8.ebuild 1774 RMD160 77c69f2e39407d7f79e5f986053fcbc601cfcdae SHA1 df4de6901a34c7036894595f1f461ee208751951 SHA256 2eba344525dfc818c59b9556df7fc8029169842765ec15715b1475a002189f87
+MISC ChangeLog 7794 RMD160 0d81ba10d0a1f6fe6697f86d4f0495729c51e43f SHA1 fc11b30d6404b675ffffa8b6334d6062b0fef317 SHA256 20b5e859abcb1003c650ffff1a07c1b1887a9fdcdefe20ad47ffe81fd1853af2
 MISC metadata.xml 165 RMD160 1c3eeab5c3fc7c211e19ce70d30db054b3448591 SHA1 e5bc9fac08f72762fdc827e1b520ed403667be37 SHA256 0879c713d0d1ea2f39c1088bf4717b1328b4ab06d6f5dd6968c5559750422ae6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkSVvsACgkQ67wieSYcaxdG+QCeKtj0o39WI9uxzeErWjyivvlQ
-mLUAn2UNR9F0rA4iW6nU2Hh43ecf6qF5
-=z95V
------END PGP SIGNATURE-----
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 e4071e3932ba..64e3608abe9b 100644
--- a/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r7.ebuild
+++ b/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.10 2008/05/11 19:10:29 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r7.ebuild,v 1.11 2009/01/03 18:36:26 bangert Exp $
 
 inherit eutils ssl-cert toolchain-funcs
 
@@ -17,7 +17,8 @@ IUSE="ssl"
 
 DEPEND="ssl? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}
-	virtual/inetd"
+	virtual/inetd
+	!www-servers/publicfile"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r8.ebuild b/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r8.ebuild
index c80cd21bec2e..2fb34a56111b 100644
--- a/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r8.ebuild
+++ b/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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-r8.ebuild,v 1.5 2008/11/06 02:31:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r8.ebuild,v 1.6 2009/01/03 18:36:26 bangert Exp $
 
 inherit eutils ssl-cert toolchain-funcs
 
@@ -17,7 +17,8 @@ IUSE="ssl"
 
 DEPEND="ssl? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}
-	virtual/inetd"
+	virtual/inetd
+	!www-servers/publicfile"
 
 S=${WORKDIR}/${MY_P}