From 91955a0b93aee5314fe8da13f24ea66d6cc5edbe Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Sat, 22 May 2010 21:34:14 -0500
Subject: system/cdfs: Fixed build on newer userspace.

---
 system/cdfs/cdfs-include_sched_h.diff      | 11 +++++++++++
 system/cdfs/cdfs-splice_not_sendfile.patch | 12 ------------
 system/cdfs/cdfs.SlackBuild                |  8 +++-----
 system/cdfs/cdfs.info                      |  2 +-
 system/cdfs/doinst.sh                      |  2 +-
 5 files changed, 16 insertions(+), 19 deletions(-)
 create mode 100644 system/cdfs/cdfs-include_sched_h.diff
 delete mode 100644 system/cdfs/cdfs-splice_not_sendfile.patch

(limited to 'system/cdfs')

diff --git a/system/cdfs/cdfs-include_sched_h.diff b/system/cdfs/cdfs-include_sched_h.diff
new file mode 100644
index 0000000000..7f75712324
--- /dev/null
+++ b/system/cdfs/cdfs-include_sched_h.diff
@@ -0,0 +1,11 @@
+diff -Nur cdfs-2.6.27.orig//root.c cdfs-2.6.27/root.c
+--- cdfs-2.6.27.orig//root.c	2009-12-21 07:38:31.000000000 -0600
++++ cdfs-2.6.27/root.c	2010-05-22 21:31:38.834543323 -0500
+@@ -25,6 +25,7 @@
+ #include "cdfs.h"
+ 
+ #include <linux/module.h>
++#include <linux/sched.h>
+ 
+ 
+ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*
diff --git a/system/cdfs/cdfs-splice_not_sendfile.patch b/system/cdfs/cdfs-splice_not_sendfile.patch
deleted file mode 100644
index f38cfb803a..0000000000
--- a/system/cdfs/cdfs-splice_not_sendfile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur a/cddata.c b/cddata.c
---- a/cddata.c	2008-12-08 07:21:37.000000000 -0600
-+++ b/cddata.c	2009-02-18 17:34:17.679224488 -0600
-@@ -82,7 +82,7 @@
-   .mmap             = generic_file_mmap
- #else
-   .mmap             = generic_file_readonly_mmap,
--  .sendfile         = generic_file_sendfile
-+  .splice_read      = generic_file_splice_read
- #endif
- };
- 
diff --git a/system/cdfs/cdfs.SlackBuild b/system/cdfs/cdfs.SlackBuild
index 8fead234fc..2d246ef694 100644
--- a/system/cdfs/cdfs.SlackBuild
+++ b/system/cdfs/cdfs.SlackBuild
@@ -25,7 +25,7 @@
 PRGNAM=cdfs
 VERSION=2.6.27
 ARCH=$(uname -m)
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 KERNEL=${KERNEL:-"$(uname -r)"}
@@ -50,10 +50,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Thanks to "MrWeatherbee" from the Arch forums for the nudge on this :)
-# http://bbs.archlinux.org/viewtopic.php?id=38894
-# sendfile() is obsolete - use splice()
-patch -p1 < $CWD/cdfs-splice_not_sendfile.patch 
+# Include linux/sched.h in root.c
+patch -p1 < $CWD/cdfs-include_sched_h.diff
 
 make KDIR=/lib/modules/${KERNEL}/build
 
diff --git a/system/cdfs/cdfs.info b/system/cdfs/cdfs.info
index e8c2214fc3..c5b6b59924 100644
--- a/system/cdfs/cdfs.info
+++ b/system/cdfs/cdfs.info
@@ -2,7 +2,7 @@ PRGNAM="cdfs"
 VERSION="2.6.27"
 HOMEPAGE="http://users.elis.ugent.be/~mronsse/cdfs/"
 DOWNLOAD="http://users.elis.ugent.be/~mronsse/cdfs/download/cdfs-2.6.27.tar.bz2"
-MD5SUM="84366b903d6beb6ddca5ab457bb8ec33"
+MD5SUM="ac64c014a90e3c488394832ea29605b3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
diff --git a/system/cdfs/doinst.sh b/system/cdfs/doinst.sh
index f786c22372..57abf59843 100644
--- a/system/cdfs/doinst.sh
+++ b/system/cdfs/doinst.sh
@@ -1,2 +1,2 @@
-chroot . /sbin/depmod -a @KERNEL@
+chroot . /sbin/depmod -ae @KERNEL@
 
-- 
cgit v1.2.3