aboutsummaryrefslogtreecommitdiff
path: root/system/cdemu-daemon
diff options
context:
space:
mode:
authorNiels Horn <niels.horn@gmail.com>2010-11-25 23:58:08 +0100
committerHeinz Wiesinger <pprkut@slackbuilds.org>2010-11-25 23:58:08 +0100
commitda2dfb1a62b2ab523807dac96813a899e6add7db (patch)
tree3016cbfdf2400c36c494e83a58702a6a45b373ae /system/cdemu-daemon
parent8957dc6daae7423bdda8c12c053e201e7d8ba112 (diff)
system/cdemu-daemon: Updated for version 1.3.0 and new maintainer
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
Diffstat (limited to 'system/cdemu-daemon')
-rw-r--r--system/cdemu-daemon/README6
-rw-r--r--system/cdemu-daemon/cdemu-daemon-1.1.0-cdemud-daemon.diff30
-rw-r--r--system/cdemu-daemon/cdemu-daemon.SlackBuild22
-rw-r--r--system/cdemu-daemon/cdemu-daemon.info12
-rw-r--r--system/cdemu-daemon/rc.cdemud6
5 files changed, 19 insertions, 57 deletions
diff --git a/system/cdemu-daemon/README b/system/cdemu-daemon/README
index 1b2df24079131..5e90f0284d13e 100644
--- a/system/cdemu-daemon/README
+++ b/system/cdemu-daemon/README
@@ -3,7 +3,7 @@ a free, GPL CD/DVD-ROM device emulator for linux.
This SlackBuild uses group cdrom as default.
To use another group ex. cdemu run the script like this:
-GROUP=cdemu ./cdemu-daemon.SlackBuild
-cdemu-daemon requires libdaemon, libmirage, and vhba-module, all of
-which are available from SlackBuilds.org
+ GROUP=cdemu ./cdemu-daemon.SlackBuild
+
+This requires libdaemon, libmirage, and vhba-module.
diff --git a/system/cdemu-daemon/cdemu-daemon-1.1.0-cdemud-daemon.diff b/system/cdemu-daemon/cdemu-daemon-1.1.0-cdemud-daemon.diff
deleted file mode 100644
index aeabac7cd1f94..0000000000000
--- a/system/cdemu-daemon/cdemu-daemon-1.1.0-cdemud-daemon.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- trunk/cdemu-daemon/src/cdemud-daemon.c 2008/07/25 20:39:19 406
-+++ trunk/cdemu-daemon/src/cdemud-daemon.c 2008/07/25 20:39:47 407
-@@ -30,19 +30,19 @@
- #define BUF_SIZE (512 * (MAX_SECTORS + OTHER_SECTORS))
-
- struct vhba_request {
-- __u32 tag;
-- __u32 lun;
-+ guint32 tag;
-+ guint32 lun;
- #define MAX_COMMAND_SIZE 16
-
-- __u8 cdb[MAX_COMMAND_SIZE];
-- __u8 cdb_len;
-- __u32 data_len;
-+ guint8 cdb[MAX_COMMAND_SIZE];
-+ guint8 cdb_len;
-+ guint32 data_len;
- };
-
- struct vhba_response {
-- __u32 tag;
-- __u32 status;
-- __u32 data_len;
-+ guint32 tag;
-+ guint32 status;
-+ guint32 data_len;
- };
-
-
diff --git a/system/cdemu-daemon/cdemu-daemon.SlackBuild b/system/cdemu-daemon/cdemu-daemon.SlackBuild
index 8a3c760d6e855..d5b0441184cc1 100644
--- a/system/cdemu-daemon/cdemu-daemon.SlackBuild
+++ b/system/cdemu-daemon/cdemu-daemon.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for cdemu-daemon
#
# Copyright 2008 Niklas "Nille" Åkerström
+# Copyright 2010 Niels Horn
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,17 +23,18 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Maintained as of version 1.3.0 by Niels Horn <niels.horn@gmail.com>
+# Revision date: 2010/11/20
+
PRGNAM=cdemu-daemon
-VERSION=1.1.0
+VERSION=${VERSION:-1.3.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -64,13 +66,11 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R a-s,u+rw,go+r-w .
-patch -p2 -i $CWD/cdemu-daemon-1.1.0-cdemud-daemon.diff
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -98,10 +98,8 @@ mkdir -p $PKG/etc/udev/rules.d
echo 'KERNEL=="vhba_ctl", NAME="%k", MODE="0660", OWNER="root", GROUP="'$GROUP'"' \
> $PKG/etc/udev/rules.d/99-vhba.rules.new
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp AUTHORS ChangeLog COPYING NEWS README $CWD/README.SLACKWARE \
@@ -114,7 +112,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
-if [ "$1" = "--cleanup" ]; then
- rm -rf $PKG $TMP/$PRGNAM-$VERSION
- fi
diff --git a/system/cdemu-daemon/cdemu-daemon.info b/system/cdemu-daemon/cdemu-daemon.info
index 50318bb6f8273..77c0b5d07921a 100644
--- a/system/cdemu-daemon/cdemu-daemon.info
+++ b/system/cdemu-daemon/cdemu-daemon.info
@@ -1,10 +1,10 @@
PRGNAM="cdemu-daemon"
-VERSION="1.1.0"
+VERSION="1.3.0"
HOMEPAGE="http://cdemu.sourceforge.net/pkg_daemon.php"
-DOWNLOAD="http://downloads.sourceforge.net/cdemu/cdemu-daemon-1.1.0.tar.bz2"
-MD5SUM="0118e5f590d7c0e1b02027b718880ac6"
+DOWNLOAD="http://downloads.sourceforge.net/cdemu/cdemu-daemon-1.3.0.tar.gz"
+MD5SUM="4ec07bd202ac1dcc2f352fc394268d67"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-MAINTAINER="Niklas 'Nille' �kerstr�m"
-EMAIL="nille.kungen[AT]gmail.com"
-APPROVED="dsomero,rworkman,pprkut"
+MAINTAINER="Niels Horn"
+EMAIL="niels.horn@gmail.com"
+APPROVED="pprkut"
diff --git a/system/cdemu-daemon/rc.cdemud b/system/cdemu-daemon/rc.cdemud
index 5be12abe3b8d4..c793981c825e5 100644
--- a/system/cdemu-daemon/rc.cdemud
+++ b/system/cdemu-daemon/rc.cdemud
@@ -12,6 +12,7 @@
# This script is based on the ubuntu and fedora init script.
# Modified by Nille Åkerström
+# Modifies by Niels Horn <niels.horn@gmail.com>
NAME="cdemud"
DESC="cdemu-daemon"
@@ -162,11 +163,8 @@ case "$1" in
"restart")
restart
;;
- "force-reload" | "reload")
- echo "Warning: Not implemented"
- ;;
*)
- echo "Usage: $0 {start|stop|restart|force-reload|reload}"
+ echo "Usage: $0 {start|stop|restart}"
;;
esac