diff options
| author |   Richard Yao <ryao@gentoo.org> | 2012-07-11 19:44:10 +0000 |
|---|---|---|
| committer | Richard Yao <ryao@gentoo.org> | 2012-07-11 19:44:10 +0000 |
| commit | 89ac2faf83c85c16706039a863a2b253073f29fa (patch) | |
| tree | e4db5c1e1e7d61a1de229e5438ed72c579c03009 /sys-fs/zfs | |
| parent | Marking xf86-video-r128-6.8.2-r1 ppc64 for bug 419473 (diff) | |
| download | historical-89ac2faf83c85c16706039a863a2b253073f29fa.tar.gz historical-89ac2faf83c85c16706039a863a2b253073f29fa.tar.bz2 historical-89ac2faf83c85c16706039a863a2b253073f29fa.zip | |
Remove the file in preparation to add it with `cvs add -ko`
Diffstat (limited to 'sys-fs/zfs')
| -rw-r--r-- | sys-fs/zfs/Manifest | 2 | ||||
| -rw-r--r-- | sys-fs/zfs/files/zfs-0.6.0_rc9-bsd-init.patch | 39 |
2 files changed, 1 insertions, 40 deletions
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 20b3bb26eb1c..bffa4863bf5e 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -11,5 +11,5 @@ AUX zfs-shutdown 1252 RMD160 449ba23e29486255bd04d54dfe11b77d414ba6d4 SHA1 108d2 DIST zfs-0.6.0-rc9.tar.gz 1989469 RMD160 fef1e4e4f0d122be60e3f5b8322e683b8981bac2 SHA1 fc14d86cd0124fd67d2ac80853f9ae078dee9a0d SHA256 a014475fab410caf209e99b448aeffe0070d1d9fc002fb33dd56f73dba87b1fd EBUILD zfs-0.6.0_rc9-r5.ebuild 3566 RMD160 d6360226efc74abe0c48b34abcc23444bf1f5920 SHA1 8e876d02270e516041cd257e1237cb34040266c1 SHA256 3331df0fabd54aa01226d1a311503a7a71cb71b7316ab975089a5734f137269e EBUILD zfs-9999.ebuild 3559 RMD160 faf210228cb1bf7f973559a3e19bc8886a607e27 SHA1 ecfac58d0775ff53cc4cef9e59550abb01fe4805 SHA256 97bf8fc06b62a7cea83ff538f1330c431dddd456514e4d721c794037b0eaeebf -MISC ChangeLog 6574 RMD160 46110086d9649f49b483a1152a0fdc305dfdb124 SHA1 ffcfdb474d2a1067aaf2d47142e100f1ebdb138c SHA256 0306ae99a6bbd7e1147261ffa345f9f85c33c4f443b73ba6eb9bd460e9a58fe9 +MISC ChangeLog 6700 RMD160 b2eecc1262981249b75fe1a1007e83d8b57e8163 SHA1 d3a78f6d95e17e5f4c907892e0672b411cb629ee SHA256 d62b7fa4dfc0663c8a4e3b8ab344b1ebb1ba1681fb9b4358807c3c94f9099658 MISC metadata.xml 460 RMD160 49a38cd6f7fb8464c06282672932cb5930e024b2 SHA1 2cb49a2c9bd0c05ee136ead608d7ae9a50663384 SHA256 4f32c18bfc4d75883f198b1166ad4f5d7a95deb11eca99d476f305ed31875e7d 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 deleted file mode 100644 index 0d8fc1da1a55..000000000000 --- a/sys-fs/zfs/files/zfs-0.6.0_rc9-bsd-init.patch +++ /dev/null @@ -1,39 +0,0 @@ -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() |