Date: Saturday, June 8, 2013 @ 02:26:33 Author: heftig Revision: 92540
2.1.0 Added: cdemu-daemon/trunk/system-arch.patch Modified: cdemu-daemon/trunk/PKGBUILD cdemu-daemon/trunk/cdemu-daemon.install Deleted: cdemu-daemon/trunk/cdemu-daemon-dbus.conf cdemu-daemon/trunk/cdemu-daemon.conf cdemu-daemon/trunk/cdemu-daemon.service cdemu-daemon/trunk/system.patch ------------------------+ PKGBUILD | 59 +++++++--------------- cdemu-daemon-dbus.conf | 24 --------- cdemu-daemon.conf | 8 --- cdemu-daemon.install | 2 cdemu-daemon.service | 10 --- system-arch.patch | 121 +++++++++++++++++++++++++++++++++++++++++++++++ system.patch | 22 -------- 7 files changed, 143 insertions(+), 103 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-06-07 23:56:43 UTC (rev 92539) +++ PKGBUILD 2013-06-08 00:26:33 UTC (rev 92540) @@ -5,7 +5,7 @@ # Contributor: Charles Lindsay <char...@chaoslizard.org> pkgname=cdemu-daemon -pkgver=2.0.0 +pkgver=2.1.0 pkgrel=1 pkgdesc="CD/DVD-ROM device emulator daemon" arch=(i686 x86_64) @@ -15,59 +15,40 @@ makedepends=(cmake) optdepends=('alsa-lib: to enable the ALSA audio driver' 'pulseaudio: to enable the PA audio driver') -backup=('etc/conf.d/cdemu-daemon' - 'etc/dbus-1/system.d/cdemu-daemon-dbus.conf') -install=$pkgname.install +backup=(etc/conf.d/cdemu-daemon + etc/dbus-1/system.d/cdemu-daemon-dbus.conf) +install=cdemu-daemon.install source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" - 'cdemu-daemon.conf' 'system.patch' 'cdemu-daemon.service' - 'cdemu-daemon-dbus.conf') -md5sums=('8f6ad3a9f758938e1572046bccc30417' - '6f31ad7a64d320cf4d6820432184070b' - '60c41731d4dce7b67e1a30dc42d2f274' - '99f35b4640529d30ea40224386dd6f4f' - '55619a492de4ef06b0759b5e4358bcbb') + system-arch.patch) +sha256sums=('8224a5d8d16cbd9a2294e9c7ab544d61059d9870023e48705699af7366846580' + '29507da7367983bdc5f541e9f9252f189412041076842b8d08a5c4dac29f23cd') -build() { +prepare() { + mkdir build cd $pkgname-$pkgver - mkdir build; cd build - cmake .. \ + # Patch system daemon for Arch-friendlyness + # It's disabled by default. Should we even ship it? + patch -Np1 -i ../system-arch.patch +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ -DCMAKE_INSTALL_SYSCONFDIR=/etc \ - -DCMAKE_INSTALL_LIBEXECDIR=lib/$pkgname \ - -DSYSTEM_BUS_SERVICE=on # This is disabled by default. Should we even ship it? + -DCMAKE_INSTALL_LIBEXECDIR=lib/$pkgname make } package() { - cd $pkgname-$pkgver/build + cd build make DESTDIR="$pkgdir" install install -d "$pkgdir/usr/lib/modules-load.d" echo vhba > "$pkgdir/usr/lib/modules-load.d/cdemu.conf" - - # - # All the following stuff concerns the system bus service - # - - cd ../.. - - # make things Arch-friendly - patch "$pkgdir/usr/lib/cdemu-daemon/cdemu-daemon-system.sh" system.patch - - # Custom dbus policy, tightening security to console and 'cdemu' group - install -m644 cdemu-daemon-dbus.conf \ - "$pkgdir/etc/dbus-1/system.d/cdemu-daemon-dbus.conf" - - # the system daemon configuration - install -Dm644 cdemu-daemon.conf "$pkgdir/etc/conf.d/cdemu-daemon" - - # for systemd - install -Dm644 cdemu-daemon.service \ - "$pkgdir/usr/lib/systemd/system/cdemu-daemon.service" - echo SystemdService=cdemu-daemon.service >> \ - "$pkgdir/usr/share/dbus-1/system-services/net.sf.cdemu.CDEmuDaemon.service" } # vim:set ts=2 sw=2 et: Deleted: cdemu-daemon-dbus.conf =================================================================== --- cdemu-daemon-dbus.conf 2013-06-07 23:56:43 UTC (rev 92539) +++ cdemu-daemon-dbus.conf 2013-06-08 00:26:33 UTC (rev 92540) @@ -1,24 +0,0 @@ -<!DOCTYPE busconfig PUBLIC - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - -<busconfig> - <!-- Only root can own the CDEmuDaemon service on bus --> - <policy user="root"> - <allow own="net.sf.cdemu.CDEmuDaemon"/> - </policy> - <policy group="root"> - <allow own="net.sf.cdemu.CDEmuDaemon"/> - </policy> - - <!-- Allow users at the console to invoke methods on the interface --> - <policy at_console="true"> - <allow send_destination="net.sf.cdemu.CDEmuDaemon"/> - </policy> - - <!-- Allow users in the 'cdemu' group to invoke methods on the interface --> - <policy group="cdemu"> - <allow send_destination="net.sf.cdemu.CDEmuDaemon"/> - </policy> -</busconfig> - Deleted: cdemu-daemon.conf =================================================================== --- cdemu-daemon.conf 2013-06-07 23:56:43 UTC (rev 92539) +++ cdemu-daemon.conf 2013-06-08 00:26:33 UTC (rev 92540) @@ -1,8 +0,0 @@ -# how many optical drives to emulate -NUM_DEVICES=2 - -# audio backend (null, alsa or pulse) -AUDIO_DRIVER=null - -# log file -LOG_FILE=/var/log/cdemud.log Modified: cdemu-daemon.install =================================================================== --- cdemu-daemon.install 2013-06-07 23:56:43 UTC (rev 92539) +++ cdemu-daemon.install 2013-06-08 00:26:33 UTC (rev 92540) @@ -16,6 +16,8 @@ post_upgrade $1 $1 + modprobe vhba + return 0 } Deleted: cdemu-daemon.service =================================================================== --- cdemu-daemon.service 2013-06-07 23:56:43 UTC (rev 92539) +++ cdemu-daemon.service 2013-06-08 00:26:33 UTC (rev 92540) @@ -1,10 +0,0 @@ -[Unit] -Description=CDEmu Daemon - -[Service] -Type=dbus -BusName=net.sf.cdemu.CDEmuDaemon -ExecStart=/usr/lib/cdemu-daemon/cdemu-daemon-system.sh - -[Install] -WantedBy=multi-user.target Added: system-arch.patch =================================================================== --- system-arch.patch (rev 0) +++ system-arch.patch 2013-06-08 00:26:33 UTC (rev 92540) @@ -0,0 +1,121 @@ +diff -u -rN cdemu-daemon-2.1.0/CMakeLists.txt cdemu-daemon-2.1.0-arch/CMakeLists.txt +--- cdemu-daemon-2.1.0/CMakeLists.txt 2013-06-07 21:33:53.000000000 +0200 ++++ cdemu-daemon-2.1.0-arch/CMakeLists.txt 2013-06-08 02:20:15.948655947 +0200 +@@ -18,7 +18,7 @@ + include (FileList) + + # Options +-option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" off) ++option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" on) + option (SESSION_BUS_SERVICE "Install CDEmu daemon as D-Bus session bus service" on) + + # If install prefix is /usr, override the sysconf dir to be /etc instead of /usr/etc +@@ -46,6 +46,10 @@ + ${PROJECT_SOURCE_DIR}/system/net.sf.cdemu.CDEmuDaemon.service.in + ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service + ) ++configure_file ( ++ ${PROJECT_SOURCE_DIR}/system/cdemu-daemon.service.in ++ ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service ++) + + # Global definitions + add_definitions (-std=gnu99) #NOTE: Compilation bugs out on using signals and -std=c99 +@@ -104,6 +108,10 @@ + DESTINATION ${CMAKE_INSTALL_LIBEXECDIR} + ) + install ( ++ FILES ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system/ ++ ) ++ install ( + FILES ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service + DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/ + ) +@@ -111,5 +119,10 @@ + FILES system/cdemu-daemon-dbus.conf + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d + ) ++ install ( ++ FILES system/cdemu-daemon.conf ++ RENAME cdemu-daemon ++ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/conf.d ++ ) + endif () + +diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon.conf cdemu-daemon-2.1.0-arch/system/cdemu-daemon.conf +--- cdemu-daemon-2.1.0/system/cdemu-daemon.conf 1970-01-01 01:00:00.000000000 +0100 ++++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon.conf 2013-06-08 02:12:19.032035389 +0200 +@@ -0,0 +1,8 @@ ++# how many optical drives to emulate ++#NUM_DEVICES=1 ++ ++# audio backend (null, default, alsa, or pulse) ++#AUDIO_DRIVER=null ++ ++# log file ++#LOG_FILE=/var/log/cdemu-daemon.log +diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon-dbus.conf cdemu-daemon-2.1.0-arch/system/cdemu-daemon-dbus.conf +--- cdemu-daemon-2.1.0/system/cdemu-daemon-dbus.conf 2013-06-07 21:33:53.000000000 +0200 ++++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon-dbus.conf 2013-06-08 02:11:52.922220389 +0200 +@@ -11,8 +11,13 @@ + <allow own="net.sf.cdemu.CDEmuDaemon"/> + </policy> + +- <!-- Allow anyone to invoke methods on the interface --> +- <policy context="default"> ++ <!-- Allow users at the console to invoke methods on the interface --> ++ <policy at_console="true"> ++ <allow send_destination="net.sf.cdemu.CDEmuDaemon"/> ++ </policy> ++ ++ <!-- Allow users in the 'cdemu' group to invoke methods on the interface --> ++ <policy group="cdemu"> + <allow send_destination="net.sf.cdemu.CDEmuDaemon"/> + </policy> + </busconfig> +diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon.service.in cdemu-daemon-2.1.0-arch/system/cdemu-daemon.service.in +--- cdemu-daemon-2.1.0/system/cdemu-daemon.service.in 1970-01-01 01:00:00.000000000 +0100 ++++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon.service.in 2013-06-08 02:13:08.331686074 +0200 +@@ -0,0 +1,10 @@ ++[Unit] ++Description=CDEmu Daemon ++ ++[Service] ++Type=dbus ++BusName=net.sf.cdemu.CDEmuDaemon ++ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/cdemu-daemon-system.sh ++ ++[Install] ++WantedBy=multi-user.target +diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon-system.sh cdemu-daemon-2.1.0-arch/system/cdemu-daemon-system.sh +--- cdemu-daemon-2.1.0/system/cdemu-daemon-system.sh 2013-06-07 21:33:53.000000000 +0200 ++++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon-system.sh 2013-06-08 02:11:53.152218760 +0200 +@@ -1,15 +1,15 @@ + #!/bin/sh + # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional + # configuration (number of devices, audio driver, log file) are read +-# from /etc/sysconfig/cdemu-daemon ++# from /etc/conf.d/cdemu-daemon + + # Default settings + NUM_DEVICES=1 + AUDIO_DRIVER=null +-LOG_FILE=/tmp/cdemu-daemon.log ++LOG_FILE=/var/log/cdemu-daemon.log + + # Read the settings +-CONFIG_FILE=/etc/sysconfig/cdemu-daemon ++CONFIG_FILE=/etc/conf.d/cdemu-daemon + + if [ -f ${CONFIG_FILE} ]; then + . ${CONFIG_FILE}; +diff -u -rN cdemu-daemon-2.1.0/system/net.sf.cdemu.CDEmuDaemon.service.in cdemu-daemon-2.1.0-arch/system/net.sf.cdemu.CDEmuDaemon.service.in +--- cdemu-daemon-2.1.0/system/net.sf.cdemu.CDEmuDaemon.service.in 2013-06-07 21:33:53.000000000 +0200 ++++ cdemu-daemon-2.1.0-arch/system/net.sf.cdemu.CDEmuDaemon.service.in 2013-06-08 02:14:26.824463231 +0200 +@@ -2,4 +2,4 @@ + Name=net.sf.cdemu.CdemuDaemon + Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/cdemu-daemon-system.sh + User=root +- ++SystemdService=cdemu-daemon.service Deleted: system.patch =================================================================== --- system.patch 2013-06-07 23:56:43 UTC (rev 92539) +++ system.patch 2013-06-08 00:26:33 UTC (rev 92540) @@ -1,22 +0,0 @@ -diff -aur cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh ---- cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh 2012-03-25 16:35:40.581171312 +0800 -+++ cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh 2012-03-25 16:36:48.810801678 +0800 -@@ -1,15 +1,15 @@ - #!/bin/sh - # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional - # configuration (number of devices, audio driver, log file) are read --# from /etc/sysconfig/cdemu-daemon -+# from /etc/conf.d/cdemu-daemon - - # Default settings - NUM_DEVICES=2 - AUDIO_DRIVER=null --LOG_FILE=/tmp/cdemu-daemon.log -+LOG_FILE=/var/log/cdemu-daemon.log - - # Read the settings --CONFIG_FILE=/etc/sysconfig/cdemu-daemon -+CONFIG_FILE=/etc/conf.d/cdemu-daemon - - if [ -f ${CONFIG_FILE} ]; then - . ${CONFIG_FILE};