Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-ftp/tftp-hpa: tftp-hpa-0.49-r1.ebuild tftp-hpa-5.0.ebuild ChangeLog
Date: Wed, 06 Apr 2011 05:29:27
Message-Id: 20110406052917.539D820054@flycatcher.gentoo.org
ulm         11/04/06 05:29:17

  Modified:             tftp-hpa-0.49-r1.ebuild tftp-hpa-5.0.ebuild
                        ChangeLog
  Log:
  Add blocker against atftp too.
  
  (Portage version: 2.1.9.45/cvs/Linux x86_64)

Revision  Changes    Path
1.11                 net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild?r1=1.10&r2=1.11

Index: tftp-hpa-0.49-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tftp-hpa-0.49-r1.ebuild	22 Mar 2011 20:53:06 -0000	1.10
+++ tftp-hpa-0.49-r1.ebuild	6 Apr 2011 05:29:17 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild,v 1.10 2011/03/22 20:53:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild,v 1.11 2011/04/06 05:29:17 ulm Exp $
 
 DESCRIPTION="port of the OpenBSD TFTP server"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
@@ -12,6 +12,7 @@
 IUSE="ipv6 readline selinux tcpd"
 
 RDEPEND="selinux? ( sec-policy/selinux-tftpd )
+	!net-ftp/atftp
 	!net-ftp/netkit-tftp"
 DEPEND="${RDEPEND}
 	readline? ( sys-libs/readline )



1.5                  net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild?r1=1.4&r2=1.5

Index: tftp-hpa-5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tftp-hpa-5.0.ebuild	22 Mar 2011 20:53:06 -0000	1.4
+++ tftp-hpa-5.0.ebuild	6 Apr 2011 05:29:17 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild,v 1.4 2011/03/22 20:53:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild,v 1.5 2011/04/06 05:29:17 ulm Exp $
 
 DESCRIPTION="port of the OpenBSD TFTP server"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
@@ -12,6 +12,7 @@
 IUSE="ipv6 readline selinux tcpd"
 
 RDEPEND="selinux? ( sec-policy/selinux-tftpd )
+	!net-ftp/atftp
 	!net-ftp/netkit-tftp"
 DEPEND="${RDEPEND}
 	readline? ( sys-libs/readline )



1.48                 net-ftp/tftp-hpa/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/tftp-hpa/ChangeLog?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/tftp-hpa/ChangeLog?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/tftp-hpa/ChangeLog?r1=1.47&r2=1.48

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ChangeLog	22 Mar 2011 20:53:06 -0000	1.47
+++ ChangeLog	6 Apr 2011 05:29:17 -0000	1.48
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/tftp-hpa
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.47 2011/03/22 20:53:06 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/ChangeLog,v 1.48 2011/04/06 05:29:17 ulm Exp $
+
+  06 Apr 2011; Ulrich Mueller <ulm@g.o> tftp-hpa-0.49-r1.ebuild,
+  tftp-hpa-5.0.ebuild:
+  Add blocker against atftp too.
 
   22 Mar 2011; Ulrich Mueller <ulm@g.o> tftp-hpa-0.49-r1.ebuild,
   tftp-hpa-5.0.ebuild: