summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackware.com>2010-03-23 17:36:19 -0500
committer Michiel van Wessem <michiel@slackbuilds.org>2010-05-13 14:28:24 +0200
commite5a601defd2a069c3c481f98b47668490aaf8a73 (patch)
treef23080ac2d381c6f455ac5f1ffc76692e38b1341
parent765152504d5dbd61737ed958dae3381740497b89 (diff)
downloadslackbuilds-e5a601defd2a069c3c481f98b47668490aaf8a73.tar.gz
slackbuilds-e5a601defd2a069c3c481f98b47668490aaf8a73.tar.xz
system/cdfs: Fix build.
Upstream committed the 'cdfs-splice_not_sendfile.patch' patch that we used to apply, but they didn't bump the version - they just spun a new tarball and (of course) changed the checksum.
-rw-r--r--system/cdfs/cdfs-splice_not_sendfile.patch12
-rw-r--r--system/cdfs/cdfs.SlackBuild9
-rw-r--r--system/cdfs/cdfs.info2
3 files changed, 3 insertions, 20 deletions
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 81b52c8ea4..754c48d610 100644
--- a/system/cdfs/cdfs.SlackBuild
+++ b/system/cdfs/cdfs.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for cdfs
-# Copyright 2009 Robby Workman Northport, AL, USA
+# Copyright 2009, 2010 Robby Workman Northport, AL, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
PRGNAM=cdfs
VERSION=2.6.27
ARCH=$(uname -m)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
KERNEL=${KERNEL:-"$(uname -r)"}
@@ -50,11 +50,6 @@ 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 d3731a315a..c3add40091 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="84366b903d6beb6ddca5ab457bb8ec33"
+MD5SUM="ac64c014a90e3c488394832ea29605b3"
MD5SUM_x86_64=""
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"