diff options
author | Ulrich Müller <ulm@gentoo.org> | 2012-12-08 22:01:16 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2012-12-08 22:01:16 +0000 |
commit | 0d95288cbac2aa1c174ad583df618238a1e60b0b (patch) | |
tree | 655881acef6c13e57c72ef07618656f5a4e61d7b /net-misc | |
parent | Version bump. Fix dependencies. Bug #444286 thanks to Agostino Sarubbo <ago@g... (diff) | |
download | gentoo-2-0d95288cbac2aa1c174ad583df618238a1e60b0b.tar.gz gentoo-2-0d95288cbac2aa1c174ad583df618238a1e60b0b.tar.bz2 gentoo-2-0d95288cbac2aa1c174ad583df618238a1e60b0b.zip |
Fix LICENSE, bugs 446536 and 426054.
(Portage version: 2.1.11.33/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/dhcp/ChangeLog | 9 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-3.1.2_p1.ebuild | 6 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-3.1.3_p1.ebuild | 6 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-4.2.1_p1.ebuild | 6 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-4.2.2-r1.ebuild | 6 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-4.2.2-r2.ebuild | 6 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-4.2.2-r3.ebuild | 6 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-4.2.2.ebuild | 6 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-4.2.3_p1.ebuild | 4 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-4.2.3_p2.ebuild | 4 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-4.2.4_p1.ebuild | 4 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild | 4 | ||||
-rw-r--r-- | net-misc/dhcp/dhcp-4.2.4_p2.ebuild | 4 |
13 files changed, 39 insertions, 32 deletions
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog index 5363c247ef23..ea828da98fe8 100644 --- a/net-misc/dhcp/ChangeLog +++ b/net-misc/dhcp/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/dhcp # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.228 2012/11/11 21:42:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.229 2012/12/08 22:01:16 ulm Exp $ + + 08 Dec 2012; Ulrich Müller <ulm@gentoo.org> dhcp-3.1.2_p1.ebuild, + dhcp-3.1.3_p1.ebuild, dhcp-4.2.1_p1.ebuild, dhcp-4.2.2.ebuild, + dhcp-4.2.2-r1.ebuild, dhcp-4.2.2-r2.ebuild, dhcp-4.2.2-r3.ebuild, + dhcp-4.2.3_p1.ebuild, dhcp-4.2.3_p2.ebuild, dhcp-4.2.4_p1.ebuild, + dhcp-4.2.4_p2.ebuild, dhcp-4.2.4_p2-r1.ebuild: + Fix LICENSE, bugs 446536 and 426054. 11 Nov 2012; Mike Frysinger <vapier@gentoo.org> dhcp-4.2.4_p2-r1.ebuild, files/dhcpd.init5, files/dhcrelay.init3: diff --git a/net-misc/dhcp/dhcp-3.1.2_p1.ebuild b/net-misc/dhcp/dhcp-3.1.2_p1.ebuild index f71242fa1cb8..13c0ece6312f 100644 --- a/net-misc/dhcp/dhcp-3.1.2_p1.ebuild +++ b/net-misc/dhcp/dhcp-3.1.2_p1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.2_p1.ebuild,v 1.10 2011/04/15 21:40:50 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.2_p1.ebuild,v 1.11 2012/12/08 22:01:16 ulm Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -13,7 +13,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol" HOMEPAGE="http://www.isc.org/products/DHCP" SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz" -LICENSE="as-is BSD" +LICENSE="ISC BSD GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" IUSE="doc minimal static selinux kernel_linux" diff --git a/net-misc/dhcp/dhcp-3.1.3_p1.ebuild b/net-misc/dhcp/dhcp-3.1.3_p1.ebuild index 1a25581bb0aa..1a44d3ef1ea3 100644 --- a/net-misc/dhcp/dhcp-3.1.3_p1.ebuild +++ b/net-misc/dhcp/dhcp-3.1.3_p1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.3_p1.ebuild,v 1.10 2011/05/01 09:50:20 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.1.3_p1.ebuild,v 1.11 2012/12/08 22:01:16 ulm Exp $ inherit eutils flag-o-matic multilib toolchain-funcs versionator @@ -14,7 +14,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol" HOMEPAGE="http://www.isc.org/products/DHCP" SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz" -LICENSE="as-is BSD" +LICENSE="ISC BSD GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" IUSE="doc minimal static selinux kernel_linux" diff --git a/net-misc/dhcp/dhcp-4.2.1_p1.ebuild b/net-misc/dhcp/dhcp-4.2.1_p1.ebuild index 24b554924bed..a442100aaab1 100644 --- a/net-misc/dhcp/dhcp-4.2.1_p1.ebuild +++ b/net-misc/dhcp/dhcp-4.2.1_p1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.1_p1.ebuild,v 1.2 2011/04/15 21:40:50 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.1_p1.ebuild,v 1.3 2012/12/08 22:01:16 ulm Exp $ EAPI="2" @@ -15,7 +15,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" HOMEPAGE="http://www.isc.org/products/DHCP" SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz" -LICENSE="as-is BSD" +LICENSE="ISC BSD GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" diff --git a/net-misc/dhcp/dhcp-4.2.2-r1.ebuild b/net-misc/dhcp/dhcp-4.2.2-r1.ebuild index 439b716cf7a1..466458d8c342 100644 --- a/net-misc/dhcp/dhcp-4.2.2-r1.ebuild +++ b/net-misc/dhcp/dhcp-4.2.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v 1.3 2011/09/19 17:14:51 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r1.ebuild,v 1.4 2012/12/08 22:01:16 ulm Exp $ EAPI="2" @@ -15,7 +15,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" HOMEPAGE="http://www.isc.org/products/DHCP" SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz" -LICENSE="as-is BSD" +LICENSE="ISC BSD GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" diff --git a/net-misc/dhcp/dhcp-4.2.2-r2.ebuild b/net-misc/dhcp/dhcp-4.2.2-r2.ebuild index 4db66418d3b5..e21941e7e701 100644 --- a/net-misc/dhcp/dhcp-4.2.2-r2.ebuild +++ b/net-misc/dhcp/dhcp-4.2.2-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r2.ebuild,v 1.10 2011/10/11 16:28:53 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r2.ebuild,v 1.11 2012/12/08 22:01:16 ulm Exp $ EAPI="2" @@ -15,7 +15,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" HOMEPAGE="http://www.isc.org/products/DHCP" SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz" -LICENSE="as-is BSD" +LICENSE="ISC BSD GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" diff --git a/net-misc/dhcp/dhcp-4.2.2-r3.ebuild b/net-misc/dhcp/dhcp-4.2.2-r3.ebuild index eea1ab424a05..249d35f11bf8 100644 --- a/net-misc/dhcp/dhcp-4.2.2-r3.ebuild +++ b/net-misc/dhcp/dhcp-4.2.2-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r3.ebuild,v 1.1 2011/12/04 22:45:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2-r3.ebuild,v 1.2 2012/12/08 22:01:16 ulm Exp $ EAPI="2" @@ -15,7 +15,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" HOMEPAGE="http://www.isc.org/products/DHCP" SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz" -LICENSE="as-is BSD" +LICENSE="ISC BSD GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" diff --git a/net-misc/dhcp/dhcp-4.2.2.ebuild b/net-misc/dhcp/dhcp-4.2.2.ebuild index 8aa447569557..82c5dc3fdfac 100644 --- a/net-misc/dhcp/dhcp-4.2.2.ebuild +++ b/net-misc/dhcp/dhcp-4.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2.ebuild,v 1.3 2011/08/27 04:58:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.2.ebuild,v 1.4 2012/12/08 22:01:16 ulm Exp $ EAPI="2" @@ -15,7 +15,7 @@ DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server" HOMEPAGE="http://www.isc.org/products/DHCP" SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz" -LICENSE="as-is BSD" +LICENSE="ISC BSD GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd" IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" diff --git a/net-misc/dhcp/dhcp-4.2.3_p1.ebuild b/net-misc/dhcp/dhcp-4.2.3_p1.ebuild index 2143e4f60e10..5f75ac9c41be 100644 --- a/net-misc/dhcp/dhcp-4.2.3_p1.ebuild +++ b/net-misc/dhcp/dhcp-4.2.3_p1.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-misc/dhcp/dhcp-4.2.3_p1.ebuild,v 1.9 2012/04/28 01:13:59 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.3_p1.ebuild,v 1.10 2012/12/08 22:01:16 ulm Exp $ EAPI="2" @@ -16,7 +16,7 @@ HOMEPAGE="http://www.isc.org/products/DHCP" SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz" -LICENSE="as-is BSD" +LICENSE="ISC BSD GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" diff --git a/net-misc/dhcp/dhcp-4.2.3_p2.ebuild b/net-misc/dhcp/dhcp-4.2.3_p2.ebuild index ec51f79d6e13..7bb0609c9059 100644 --- a/net-misc/dhcp/dhcp-4.2.3_p2.ebuild +++ b/net-misc/dhcp/dhcp-4.2.3_p2.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-misc/dhcp/dhcp-4.2.3_p2.ebuild,v 1.1 2012/05/16 05:08:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.3_p2.ebuild,v 1.2 2012/12/08 22:01:16 ulm Exp $ EAPI="4" @@ -16,7 +16,7 @@ HOMEPAGE="http://www.isc.org/products/DHCP" SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz" -LICENSE="as-is BSD" +LICENSE="ISC BSD GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" diff --git a/net-misc/dhcp/dhcp-4.2.4_p1.ebuild b/net-misc/dhcp/dhcp-4.2.4_p1.ebuild index 9c923f566f83..3f107d6d50e8 100644 --- a/net-misc/dhcp/dhcp-4.2.4_p1.ebuild +++ b/net-misc/dhcp/dhcp-4.2.4_p1.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-misc/dhcp/dhcp-4.2.4_p1.ebuild,v 1.8 2012/09/20 13:29:07 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p1.ebuild,v 1.9 2012/12/08 22:01:16 ulm Exp $ EAPI="4" @@ -16,7 +16,7 @@ HOMEPAGE="http://www.isc.org/products/DHCP" SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz" -LICENSE="as-is BSD" +LICENSE="ISC BSD GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" diff --git a/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild b/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild index f508bb1308f0..a89b518c5a7a 100644 --- a/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild +++ b/net-misc/dhcp/dhcp-4.2.4_p2-r1.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-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild,v 1.4 2012/11/11 21:42:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2-r1.ebuild,v 1.5 2012/12/08 22:01:16 ulm Exp $ EAPI="4" @@ -16,7 +16,7 @@ HOMEPAGE="http://www.isc.org/products/DHCP" SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz" -LICENSE="as-is BSD" +LICENSE="ISC BSD GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" diff --git a/net-misc/dhcp/dhcp-4.2.4_p2.ebuild b/net-misc/dhcp/dhcp-4.2.4_p2.ebuild index 106f98e5eb76..bb50f4f6cca0 100644 --- a/net-misc/dhcp/dhcp-4.2.4_p2.ebuild +++ b/net-misc/dhcp/dhcp-4.2.4_p2.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-misc/dhcp/dhcp-4.2.4_p2.ebuild,v 1.7 2012/10/13 17:00:44 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.4_p2.ebuild,v 1.8 2012/12/08 22:01:16 ulm Exp $ EAPI="4" @@ -16,7 +16,7 @@ HOMEPAGE="http://www.isc.org/products/DHCP" SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz" -LICENSE="as-is BSD" +LICENSE="ISC BSD GPL-2" # GPL-2 only for init script SLOT="0" KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="+client ipv6 kernel_linux ldap selinux +server ssl vim-syntax" |