summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2010-05-17 00:56:33 -0500
committer Robby Workman <rworkman@slackbuilds.org>2010-05-17 00:56:33 -0500
commita5beeb0a8566c6e8ca5dc9c9fec45fc76b30d517 (patch)
tree22a5d8e49ceb04a79768507f8db1929b8ffd4151
parenta30d9e3196a95101a19bfe98def1976a9d3b89be (diff)
downloadslackbuilds-a5beeb0a8566c6e8ca5dc9c9fec45fc76b30d517.tar.gz
slackbuilds-a5beeb0a8566c6e8ca5dc9c9fec45fc76b30d517.tar.xz
system/cdfs: Merge the good www repo version into git.
-rw-r--r--system/cdfs/cdfs-splice_not_sendfile.patch12
-rw-r--r--system/cdfs/cdfs.SlackBuild5
-rw-r--r--system/cdfs/cdfs.info2
3 files changed, 18 insertions, 1 deletions
diff --git a/system/cdfs/cdfs-splice_not_sendfile.patch b/system/cdfs/cdfs-splice_not_sendfile.patch
new file mode 100644
index 0000000000..f38cfb803a
--- /dev/null
+++ b/system/cdfs/cdfs-splice_not_sendfile.patch
@@ -0,0 +1,12 @@
+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 754c48d610..8fead234fc 100644
--- a/system/cdfs/cdfs.SlackBuild
+++ b/system/cdfs/cdfs.SlackBuild
@@ -50,6 +50,11 @@ 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
+
make KDIR=/lib/modules/${KERNEL}/build
mkdir -p $PKG/lib/modules/${KERNEL}/extra
diff --git a/system/cdfs/cdfs.info b/system/cdfs/cdfs.info
index c3add40091..d3731a315a 100644
--- a/system/cdfs/cdfs.info
+++ b/system/cdfs/cdfs.info
@@ -3,7 +3,7 @@ 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"
DOWNLOAD_x86_64=""
-MD5SUM="ac64c014a90e3c488394832ea29605b3"
+MD5SUM="84366b903d6beb6ddca5ab457bb8ec33"
MD5SUM_x86_64=""
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"