Fix building with recent kernels, bug #373489 by Mathieu Zhang, Guy and Karata. Drop old.

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

6 files changed, 48 insertions, 73 deletions

diff --git a/sys-fs/cdfs/ChangeLog b/sys-fs/cdfs/ChangeLog
index d2dfb863cd58..ea328697d9b9 100644
--- a/sys-fs/cdfs/ChangeLog
+++ b/sys-fs/cdfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/cdfs
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/ChangeLog,v 1.12 2010/06/15 07:26:00 tove Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/ChangeLog,v 1.13 2012/02/25 12:36:04 pacho Exp $
+
+  25 Feb 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/cdfs-2.6.27-kernel-2.6.39.patch, -cdfs-2.6.19.ebuild,
+  -cdfs-2.6.23.ebuild, cdfs-2.6.27.ebuild:
+  Fix building with recent kernels, bug #373489 by Mathieu Zhang, Guy and
+  Karata. Drop old.
 
   15 Jun 2010; Torsten Veller <tove@gentoo.org> cdfs-2.6.19.ebuild,
   cdfs-2.6.23.ebuild, cdfs-2.6.27.ebuild:
diff --git a/sys-fs/cdfs/Manifest b/sys-fs/cdfs/Manifest
index b2fd0edc472d..3113d49487bd 100644
--- a/sys-fs/cdfs/Manifest
+++ b/sys-fs/cdfs/Manifest
@@ -1,22 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX cdfs-2.6.19-kernel-2.6.22.patch 669 RMD160 678e4ddd1af3201afd76e641b989d07bd68dd365 SHA1 204704add7ca868a8e1f43e4b13793ac70573c1c SHA256 517dd2271dde6620caacb43a97a6ab02807b428eba581959b1663946fd511731
 AUX cdfs-2.6.27-kernel-2.6.28.patch 327 RMD160 76fce29f86f89520605804b245ea461b1fef31bd SHA1 21fd251adc11e5a77738fe0e228e663b599f7f7f SHA256 3da88a48a07a34c8696ea3a391450e4cd676a1242b919b8adbdeeaa851452225
-DIST cdfs-2.6.19.tar.bz2 30321 RMD160 000aa4ff63a759d164a659bc1261cb698d71fffe SHA1 f4135ae8081cbd15b38d6e1a18e5ea805c411fa5 SHA256 f6114ba2cde7ce0ca24c31b6237b327216b5b2a8aa0fb07366ebf827a5d9ffe3
-DIST cdfs-2.6.23.tar.bz2 26197 RMD160 8556d95ca12848609c669827185926880a8fe6bb SHA1 e5ebc2727d692ae46e39b9e65a5fa797e913ceca SHA256 97f3e20dd264996549687663e5cad60ef6277f9f73bea357ab769ae6339504b6
+AUX cdfs-2.6.27-kernel-2.6.39.patch 1078 RMD160 d7817c576be1130bc24524fc20d80d9f54a01659 SHA1 46727a9bc9a646ba953f2a87e24bdb7e9e1c2ff3 SHA256 17415a1fc7fc30efa5eff03d661e216103980d2ed9df3ca590e923ae7302b307
 DIST cdfs-2.6.27.tar.bz2 30806 RMD160 4a0a2f960cd40d5dccd5a31ced4e7287bbdcf6ce SHA1 baf7a50f03baa23bb8d463361b87eea139b042ba SHA256 1482bdea690bfdae1258432c2cb7831bf5bffe855700c80d014b64189b9e3bc0
-EBUILD cdfs-2.6.19.ebuild 733 RMD160 5f8b7c6a6913e293f8280b8330d1d8937cc6274c SHA1 feca45bb116d1c6bd6c7641aec769cc1aec5892a SHA256 89fdc63d47bd55bd2ae139b47c349064eff52902fdde1c4a43ebf1f0a861200e
-EBUILD cdfs-2.6.23.ebuild 741 RMD160 afa26ebbc8355390956acf823bb1d882dd63d553 SHA1 935395f98f3e733d345e92896fbea8ae4e7746db SHA256 b3d050ce60ec721b1bca1cb5998b78177e6de0bef60c9d199532735ab5fa2460
-EBUILD cdfs-2.6.27.ebuild 788 RMD160 b8115719e5efea176328e087b37bf97276311df3 SHA1 43e795c5b9dfd306202aab9d855654eb31cdb907 SHA256 f1eb77ee6851e4c70a4bc00d06b27acf537db1964c686689ed86864a226788a3
-MISC ChangeLog 2079 RMD160 0004d05012830f10324de765231ff0e19f942f00 SHA1 5c4dbb19e7aa4468cf33a9f507ac12a3aa31922d SHA256 dd521d035efdc700317df9807e8eee3d2015688c77f20af15f45e620a28dfef6
+EBUILD cdfs-2.6.27.ebuild 820 RMD160 bb3ef0647863711b2a40e57c9789fa7db297a6e5 SHA1 2537d23e84409dea940ccd14213522d45d2e3434 SHA256 2d65e00d58b21f79ea536c8c84aa0249c27f73eb51f3e18510e866908f6741aa
+MISC ChangeLog 2327 RMD160 2e826b10f3a4f1a9f536f5aae0a338f1d1b43f73 SHA1 e6da39b06ad916627444ab4435de141d96dab96d SHA256 7e553ae9fc59fc19b9cad87c178c903859abf63645a931e8f8f139e9fbafd6d4
 MISC metadata.xml 212 RMD160 f278ca2a473dd949f7d0f359c432cfe4ed026e71 SHA1 b67d9ec2368a50032f536d14dbd7f105b25191cf SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59s3UACgkQfXuS5UK5QB17MQP/QjJw0yfDkU0e9/gJ2Q4ynoLf
-2hfBTRRDvB3RwYJlSgqlZTTU6HDAO2yAeHGg4unuW1kTpCymUMavUGvQZuC7QAjH
-xvs9HY0JSbeHtxCzClcxQ12F0tustjZE+QTmAUmF1uVFXcfp+uitAuxOnHJQerpE
-qJprfRd3NyBlgFud0YU=
-=LFsD
+iEYEARECAAYFAk9I1boACgkQCaWpQKGI+9RRAgCeMLwKGvB3kkjij+vcXPfEaNg/
+6WkAn1dzlNZcfmvDMdS69fDlkAqwlXEj
+=JDT9
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cdfs/cdfs-2.6.19.ebuild b/sys-fs/cdfs/cdfs-2.6.19.ebuild
deleted file mode 100644
index a4e40608ac18..000000000000
--- a/sys-fs/cdfs/cdfs-2.6.19.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/cdfs-2.6.19.ebuild,v 1.5 2010/06/15 07:26:00 tove Exp $
-
-inherit eutils linux-mod
-
-DESCRIPTION="A file system for Linux systems that 'exports' all tracks and boot images on a CD as normal files"
-HOMEPAGE="http://users.elis.ugent.be/~mronsse/cdfs/"
-SRC_URI="http://users.elis.ugent.be/~mronsse/cdfs/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-MODULE_NAMES="cdfs(fs)"
-CONFIG_CHECK="BLK_DEV_LOOP"
-BUILD_TARGETS="all"
-BUILD_PARAMS="KDIR=\"${KERNEL_DIR}\""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-kernel-2.6.22.patch
-}
diff --git a/sys-fs/cdfs/cdfs-2.6.23.ebuild b/sys-fs/cdfs/cdfs-2.6.23.ebuild
deleted file mode 100644
index 3eac2a9c8600..000000000000
--- a/sys-fs/cdfs/cdfs-2.6.23.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/cdfs-2.6.23.ebuild,v 1.3 2010/06/15 07:26:00 tove Exp $
-
-inherit eutils linux-mod
-
-DESCRIPTION="A file system for Linux systems that 'exports' all tracks and boot images on a CD as normal files"
-HOMEPAGE="http://users.elis.ugent.be/~mronsse/cdfs/"
-SRC_URI="http://users.elis.ugent.be/~mronsse/cdfs/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-MODULE_NAMES="cdfs(fs)"
-CONFIG_CHECK="BLK_DEV_LOOP"
-BUILD_TARGETS="all"
-BUILD_PARAMS="KDIR=\"${KERNEL_DIR}\""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-2.6.19-kernel-2.6.22.patch
-}
diff --git a/sys-fs/cdfs/cdfs-2.6.27.ebuild b/sys-fs/cdfs/cdfs-2.6.27.ebuild
index a97b5d5ab2e8..5a7cd081f328 100644
--- a/sys-fs/cdfs/cdfs-2.6.27.ebuild
+++ b/sys-fs/cdfs/cdfs-2.6.27.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/cdfs-2.6.27.ebuild,v 1.3 2010/06/15 07:26:00 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cdfs/cdfs-2.6.27.ebuild,v 1.4 2012/02/25 12:36:04 pacho Exp $
+
+EAPI=4
 
 inherit eutils linux-mod
 
@@ -18,10 +20,8 @@ CONFIG_CHECK="BLK_DEV_LOOP"
 BUILD_TARGETS="all"
 BUILD_PARAMS="KDIR=\"${KERNEL_DIR}\""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.6.19-kernel-2.6.22.patch
 	epatch "${FILESDIR}"/${P}-kernel-2.6.28.patch
+	epatch "${FILESDIR}"/${P}-kernel-2.6.39.patch
 }
diff --git a/sys-fs/cdfs/files/cdfs-2.6.27-kernel-2.6.39.patch b/sys-fs/cdfs/files/cdfs-2.6.27-kernel-2.6.39.patch
new file mode 100644
index 000000000000..c61be073bbf1
--- /dev/null
+++ b/sys-fs/cdfs/files/cdfs-2.6.27-kernel-2.6.39.patch
@@ -0,0 +1,26 @@
+--- root.c.old	2011-12-12 20:07:18.000000000 +0800
++++ root.c	2011-12-12 20:10:38.000000000 +0800
+@@ -597,7 +597,10 @@
+ #ifdef OLD_KERNEL
+ static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount);
+ #else
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
++static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
++  return mount_bdev(fs_type, flags, dev_name, data, cdfs_fill_super);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
+ static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
+   return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
+ #else
+@@ -609,7 +612,11 @@
+ static struct file_system_type cdfs_fs_type = {
+   .owner    = THIS_MODULE,
+   .name     = "cdfs",
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
++  .mount    = cdfs_get_sb,
++#else
+   .get_sb   = cdfs_get_sb,
++#endif
+   .kill_sb  = kill_block_super,
+   .fs_flags = FS_REQUIRES_DEV
+ };