diff --git a/60-vhba.rules b/60-vhba.rules new file mode 100644 index 0000000..5b47cb8 --- /dev/null +++ b/60-vhba.rules @@ -0,0 +1 @@ +KERNEL=="vhba_ctl", NAME="%k", MODE="0660", OWNER="root", GROUP="cdrom" diff --git a/cdemu-daemon-2.1.1.tar.bz2 b/cdemu-daemon-2.1.1.tar.bz2 deleted file mode 100644 index 7bd328d..0000000 --- a/cdemu-daemon-2.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d26782071184d555b06ad5def7d1c22916cbeb73377328879499b91e1196f36f -size 62600 diff --git a/cdemu-daemon-3.0.0.tar.bz2 b/cdemu-daemon-3.0.0.tar.bz2 new file mode 100644 index 0000000..e4bcf22 --- /dev/null +++ b/cdemu-daemon-3.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ecfdea0a57b35f5007b63882ca33d2edb568244aa854b5e5c30ffbbf3ba4f56 +size 76131 diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes index febaa1b..0534ea4 100644 --- a/cdemu-daemon.changes +++ b/cdemu-daemon.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Jul 13 08:48:46 UTC 2014 - sor.alexei@meowr.ru + +- Update to new upstream release 3.0.0 +* The CDEmu daemon now has experimental emulation of CD-R and + DVD+R disc recording, and daemon/client protocol was extended + to allow transmission of image writer parameters descriptions + from daemon to client and parameters' values back from client + to daemon. +- Remove logfile.diff patch +- Add /dev/vhba_ctl read-write access udev rule + ------------------------------------------------------------------- Sun Nov 24 11:23:28 UTC 2013 - jengelh@inai.de diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec index 3c440bc..18ac4cc 100644 --- a/cdemu-daemon.spec +++ b/cdemu-daemon.spec @@ -1,7 +1,7 @@ # # spec file for package cdemu-daemon # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,18 @@ Name: cdemu-daemon -Version: 2.1.1 +Version: 3.0.0 Release: 0 Summary: Device daemon for cdemu, a virtual CD-ROM device emulator License: GPL-2.0+ Group: System/Daemons -Url: http://cdemu.sf.net/ +Url: http://cdemu.sf.net/about/daemon/ -#Freecode-URL: https://freecode.com/projects/cdemu-for-linux #Git-Clone: git://git.code.sf.net/p/cdemu/code -#DL-URL: http://downloads.sf.net/cdemu/%name-%version.tar.bz2 Source: http://downloads.sf.net/cdemu/%name-%version.tar.bz2 +Source2: 60-vhba.rules Source3: cdemu-daemon.sysconfig Patch1: logfile.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake >= 2.8.5 BuildRequires: pkgconfig BuildRequires: pkgconfig(ao) >= 0.8.0 @@ -39,7 +37,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.28 BuildRequires: pkgconfig(gmodule-2.0) >= 2.28 BuildRequires: pkgconfig(gobject-2.0) >= 2.28 BuildRequires: pkgconfig(gthread-2.0) >= 2.28 -BuildRequires: pkgconfig(libmirage) >= 2.1.1 +BuildRequires: pkgconfig(libmirage) >= 3.0.0 %description cdemu-daemon receives SCSI commands from kernel module thorugh the @@ -57,26 +55,30 @@ that can be used by clients to control it. %patch -P 1 -p1 %build -cmake . -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ +cmake . \ + -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ -DCMAKE_INSTALL_LIBEXECDIR:PATH="%_libexecdir" \ - -DCMAKE_C_FLAGS:STRING="%optflags"; -make %{?_smp_mflags}; + -DCMAKE_C_FLAGS:STRING="%optflags" +make %{?_smp_mflags} %install -b="%buildroot"; -make install DESTDIR="$b"; -mkdir -p "$b/%_sbindir"; -mkdir -p "$b/%_localstatedir/adm/fillup-templates"; -install -pm0644 "%{S:3}" "$b/%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon"; -# Not desired -rm -Rf "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d"; +b="%buildroot" +%make_install +mkdir -p "$b/%_sbindir" "$b/%_localstatedir/adm/fillup-templates" \ + "$b/%_prefix/lib/udev/rules.d" +install -pm0644 "%{S:2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules" +install -pm0644 "%{S:3}" "$b/%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon" +# Not desired for security; it would permit a user to start a system service. +rm -rf "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d/" %files %defattr(-,root,root) +%doc AUTHORS COPYING README %_bindir/cdemu-daemon %_libexecdir/cdemu-daemon-session.sh -%_datadir/dbus-1 +%_datadir/dbus-1/ %_mandir/man8/cdemu-daemon.8* %_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon +%_prefix/lib/udev/ %changelog