Fix files/zfs-0.6.0_rc9-bsd-init.patch

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

2 files changed, 44 insertions, 1 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index c07b254e7412..8208243554d2 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/zfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.37 2012/07/11 19:39:31 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.38 2012/07/11 19:45:53 ryao Exp $
+
+  11 Jul 2012; Richard Yao <ryao@gentoo.org>
+  +files/zfs-0.6.0_rc9-bsd-init.patch:
+  Fix files/zfs-0.6.0_rc9-bsd-init.patch
 
   11 Jul 2012; Richard Yao <ryao@gentoo.org> files/zfs-0.6.0_rc9-bsd-init.patch:
   Fix CVS keyword substitution in patch file
diff --git a/sys-fs/zfs/files/zfs-0.6.0_rc9-bsd-init.patch b/sys-fs/zfs/files/zfs-0.6.0_rc9-bsd-init.patch
new file mode 100644
index 000000000000..0d8fc1da1a55
--- /dev/null
+++ b/sys-fs/zfs/files/zfs-0.6.0_rc9-bsd-init.patch
@@ -0,0 +1,39 @@
+commit 0ac83722a09ccb15067cad91217103474b58dadf
+Author: Richard Yao <ryao@cs.stonybrook.edu>
+Date:   Tue Jul 10 09:27:09 2012 -0400
+
+    Relicense zfs.gentoo.in from GPLv2 to 2-clause BSD
+    
+    As the Gentoo sys-fs/zfs maintainer, I receive license compatibility
+    questions and at times, those questions can be harassing. I feel that
+    the presence of the GPL in Gentoo's package metadata promotes such
+    questions.  zfs.gentoo.in is the only GPLv2 licensed file in ZFS, so I
+    have taken the liberty of contacting all contributors to this file to
+    request permission to relicense it.
+    
+    All of the contributors to this file have agreed to relicense it under
+    the 2-clause BSD license. I have added their Signed-offs to this commit,
+    in order of first contribution. Thankyou everyone for being so
+    understanding.
+    
+    Signed-off-by: devsk <devsku@gmail.com>
+    Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
+    Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+    Signed-off-by: Andrew Tselischev <andrewtselischev@gmail.com>
+    Signed-off-by: Zachary Bedell <zac@thebedells.org>
+    Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
+    Signed-off-by: Kyle Fuller <inbox@kylefuller.co.uk>
+    Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
+
+diff --git a/etc/init.d/zfs.gentoo.in b/etc/init.d/zfs.gentoo.in
+index 957be99..df883cf 100644
+--- a/etc/init.d/zfs.gentoo.in
++++ b/etc/init.d/zfs.gentoo.in
+@@ -1,6 +1,6 @@
+ #!/sbin/runscript
+ # Copyright 1999-2011 Gentoo Foundation
+-# Distributed under the terms of the GNU General Public License v2
++# Released under the 2-clause BSD license.
+ # $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/files/zfs,v 0.9 2011/04/30 10:13:43 devsk Exp $
+
+ depend()