[arch-commits] Commit in cdemu-daemon/repos (12 files)
Jan Steffens
heftig at archlinux.org
Mon Jun 12 20:37:05 UTC 2017
Date: Monday, June 12, 2017 @ 20:37:04
Author: heftig
Revision: 236566
archrelease: copy trunk to community-i686, community-x86_64
Added:
cdemu-daemon/repos/community-i686/0001-Patch-system-daemon-for-Arch-friendliness.patch
(from rev 236565, cdemu-daemon/trunk/0001-Patch-system-daemon-for-Arch-friendliness.patch)
cdemu-daemon/repos/community-i686/PKGBUILD
(from rev 236565, cdemu-daemon/trunk/PKGBUILD)
cdemu-daemon/repos/community-i686/cdemu-daemon.install
(from rev 236565, cdemu-daemon/trunk/cdemu-daemon.install)
cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch
(from rev 236565, cdemu-daemon/trunk/0001-Patch-system-daemon-for-Arch-friendliness.patch)
cdemu-daemon/repos/community-x86_64/PKGBUILD
(from rev 236565, cdemu-daemon/trunk/PKGBUILD)
cdemu-daemon/repos/community-x86_64/cdemu-daemon.install
(from rev 236565, cdemu-daemon/trunk/cdemu-daemon.install)
Deleted:
cdemu-daemon/repos/community-i686/PKGBUILD
cdemu-daemon/repos/community-i686/cdemu-daemon.install
cdemu-daemon/repos/community-i686/system-arch.patch
cdemu-daemon/repos/community-x86_64/PKGBUILD
cdemu-daemon/repos/community-x86_64/cdemu-daemon.install
cdemu-daemon/repos/community-x86_64/system-arch.patch
-----------------------------------------------------------------------+
/PKGBUILD | 106 +++++++
/cdemu-daemon.install | 72 ++++
community-i686/0001-Patch-system-daemon-for-Arch-friendliness.patch | 151 ++++++++++
community-i686/PKGBUILD | 54 ---
community-i686/cdemu-daemon.install | 42 --
community-i686/system-arch.patch | 124 --------
community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch | 151 ++++++++++
community-x86_64/PKGBUILD | 54 ---
community-x86_64/cdemu-daemon.install | 42 --
community-x86_64/system-arch.patch | 124 --------
10 files changed, 480 insertions(+), 440 deletions(-)
Copied: cdemu-daemon/repos/community-i686/0001-Patch-system-daemon-for-Arch-friendliness.patch (from rev 236565, cdemu-daemon/trunk/0001-Patch-system-daemon-for-Arch-friendliness.patch)
===================================================================
--- community-i686/0001-Patch-system-daemon-for-Arch-friendliness.patch (rev 0)
+++ community-i686/0001-Patch-system-daemon-for-Arch-friendliness.patch 2017-06-12 20:37:04 UTC (rev 236566)
@@ -0,0 +1,151 @@
+From 17d054bc9fb02bbb557f9de68e29e715a17f3ee6 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 12 Jun 2017 22:22:51 +0200
+Subject: [PATCH] Patch system daemon for Arch-friendliness
+
+---
+ cdemu-daemon/CMakeLists.txt | 15 ++++++++++++++-
+ cdemu-daemon/system/cdemu-daemon-dbus.conf | 9 +++++++--
+ cdemu-daemon/system/cdemu-daemon-system.sh | 6 +++---
+ cdemu-daemon/system/cdemu-daemon.conf | 8 ++++++++
+ cdemu-daemon/system/cdemu-daemon.service.in | 10 ++++++++++
+ cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in | 4 ++--
+ 6 files changed, 44 insertions(+), 8 deletions(-)
+ create mode 100644 cdemu-daemon/system/cdemu-daemon.conf
+ create mode 100644 cdemu-daemon/system/cdemu-daemon.service.in
+
+diff --git a/cdemu-daemon/CMakeLists.txt b/cdemu-daemon/CMakeLists.txt
+index 76feb818d09a57af..c6abd56b82484b6f 100644
+--- a/cdemu-daemon/CMakeLists.txt
++++ b/cdemu-daemon/CMakeLists.txt
+@@ -15,7 +15,7 @@ set (CDEMU_DAEMON_INTERFACE_VERSION_MINOR 0)
+ include (GNUInstallDirs)
+
+ # 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
+@@ -45,6 +45,10 @@ configure_file (
+ ${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=c99) # We're compiling using C99
+@@ -121,13 +125,22 @@ if (SYSTEM_BUS_SERVICE)
+ 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/
+ )
+ install (
+ 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 ()
+
+ # Translations; we use the version provided by our FindIntlTool.cmake
+diff --git a/cdemu-daemon/system/cdemu-daemon-dbus.conf b/cdemu-daemon/system/cdemu-daemon-dbus.conf
+index c450d78cf03bce6a..e86b62cf0437a9fd 100644
+--- a/cdemu-daemon/system/cdemu-daemon-dbus.conf
++++ b/cdemu-daemon/system/cdemu-daemon-dbus.conf
+@@ -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 --git a/cdemu-daemon/system/cdemu-daemon-system.sh b/cdemu-daemon/system/cdemu-daemon-system.sh
+index d9ab60aaff559400..735c24442a82e8bc 100755
+--- a/cdemu-daemon/system/cdemu-daemon-system.sh
++++ b/cdemu-daemon/system/cdemu-daemon-system.sh
+@@ -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 --git a/cdemu-daemon/system/cdemu-daemon.conf b/cdemu-daemon/system/cdemu-daemon.conf
+new file mode 100644
+index 0000000000000000..d0d6ecfebb77fbfb
+--- /dev/null
++++ b/cdemu-daemon/system/cdemu-daemon.conf
+@@ -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 --git a/cdemu-daemon/system/cdemu-daemon.service.in b/cdemu-daemon/system/cdemu-daemon.service.in
+new file mode 100644
+index 0000000000000000..43b5a61dc476e384
+--- /dev/null
++++ b/cdemu-daemon/system/cdemu-daemon.service.in
+@@ -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 --git a/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in b/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in
+index f9cf646b57c3563f..9004c310595273e4 100644
+--- a/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in
++++ b/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in
+@@ -1,5 +1,5 @@
+ [D-BUS Service]
+-Name=net.sf.cdemu.CdemuDaemon
++Name=net.sf.cdemu.CDEmuDaemon
+ Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/cdemu-daemon-system.sh
+ User=root
+-
++SystemdService=cdemu-daemon.service
+--
+2.13.1
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-06-12 20:36:39 UTC (rev 236565)
+++ community-i686/PKGBUILD 2017-06-12 20:37:04 UTC (rev 236566)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ray Rashif <schiv at archlinux.org>
-# Contributor: Mateusz Herych <heniekk at gmail.com>
-# Contributor: Charles Lindsay <charles at chaoslizard.org>
-
-pkgname=cdemu-daemon
-pkgver=3.0.5
-pkgrel=1
-pkgdesc="CD/DVD-ROM device emulator daemon"
-arch=(i686 x86_64)
-url="http://cdemu.sourceforge.net/"
-license=(GPL)
-depends=(dbus "vhba-module>=20140629" libao "libmirage>=3.0.2")
-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=cdemu-daemon.install
-source=("http://downloads.sourceforge.net/cdemu/$pkgname/$pkgname-$pkgver.tar.bz2"
- system-arch.patch)
-sha256sums=('317ca9149eb902c10a6ef9799976320b2f2d1bc42cb47ab68dbd151f5cf780b1'
- 'dee634da8b8301893f458647f536b183d1d3898e289d1ac570c189c986828cfe')
-
-prepare() {
- mkdir build
- cd $pkgname-$pkgver
-
- # 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
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-
- install -d "$pkgdir/usr/lib/modules-load.d"
- echo vhba > "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: cdemu-daemon/repos/community-i686/PKGBUILD (from rev 236565, cdemu-daemon/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-06-12 20:37:04 UTC (rev 236566)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ray Rashif <schiv at archlinux.org>
+# Contributor: Mateusz Herych <heniekk at gmail.com>
+# Contributor: Charles Lindsay <charles at chaoslizard.org>
+
+pkgname=cdemu-daemon
+pkgver=3.1.0
+pkgrel=1
+pkgdesc="CD/DVD-ROM device emulator daemon"
+arch=(i686 x86_64)
+url="http://cdemu.sourceforge.net/"
+license=(GPL)
+depends=(dbus vhba-module libao 'libmirage>=3.1.0')
+makedepends=(cmake intltool)
+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=cdemu-daemon.install
+source=("http://downloads.sourceforge.net/cdemu/$pkgname/$pkgname-$pkgver.tar.bz2"
+ 0001-Patch-system-daemon-for-Arch-friendliness.patch)
+sha256sums=('498f0f2fe2225de76acfe0b3dbf9606e4e2eb57ac9d29da9d48064b62587bc4f'
+ 'e83467d342abd979b38b3a971b97942787f5b5a0e18c569b034a636c54eb8154')
+
+prepare() {
+ mkdir build
+ cd $pkgname-$pkgver
+
+ # It's disabled by default. Should we even ship it?
+ patch -Np2 -i ../0001-Patch-system-daemon-for-Arch-friendliness.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
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ install -d "$pkgdir/usr/lib/modules-load.d"
+ echo vhba > "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/cdemu-daemon.install
===================================================================
--- community-i686/cdemu-daemon.install 2017-06-12 20:36:39 UTC (rev 236565)
+++ community-i686/cdemu-daemon.install 2017-06-12 20:37:04 UTC (rev 236566)
@@ -1,42 +0,0 @@
-post_install () {
- cat <<MSG
- > Only users with at a physical terminal or in the 'cdemu'
- group can communicate with the system daemon or make use
- of a session daemon.
-
- > If you want to output CD-Audio you need to use a session
- daemon, e.g. via "cdemu -b session". If you use ALSA and
- not PulseAudio, echo AUDIO_DRIVER=alsa > ~/.cdemu-daemon
-
- > The daemons are usually started on-demand, but a system
- daemon can be manually started via cdemu-daemon.service.
- See /etc/conf.d/cdemu-daemon for further configuration.
-
-MSG
-
- post_upgrade $1 $1
-
- modprobe vhba
-
- return 0
-}
-
-post_upgrade () {
- if (( $(vercmp $2 2.0.0) < 0)); then
- cat <<MSG
- > Configuration files and log files have been renamed in
- order to bring Arch closer to upstream. In particular,
- this affects:
- /etc/conf.d/cdemud --> /etc/conf.d/cdemu-daemon
- /var/log/cdemud.log --> /var/log/cdemu-daemon.log
- ~/.cdemud --> ~/.cdemu-daemon
- ~/.cdemud.log --> ~/.cdemu-daemon.log
- Please move your configuration.
-
-MSG
- fi
-
- return 0
-}
-
-# vim:set ts=2 sw=2 et:
Copied: cdemu-daemon/repos/community-i686/cdemu-daemon.install (from rev 236565, cdemu-daemon/trunk/cdemu-daemon.install)
===================================================================
--- community-i686/cdemu-daemon.install (rev 0)
+++ community-i686/cdemu-daemon.install 2017-06-12 20:37:04 UTC (rev 236566)
@@ -0,0 +1,36 @@
+post_install () {
+ cat <<MSG
+ > Only users with a hardware seat or in the 'cdemu' group
+ can communicate with the system daemon or make use of a
+ session daemon.
+
+ > If you want to output CD-Audio you need to use a session
+ daemon, e.g. via "cdemu -b session". If you use ALSA and
+ not PulseAudio, echo AUDIO_DRIVER=alsa > ~/.cdemu-daemon
+
+ > The daemons are usually started on-demand, but a system
+ daemon can be manually started via cdemu-daemon.service.
+ See /etc/conf.d/cdemu-daemon for further configuration.
+
+MSG
+
+ modprobe vhba
+}
+
+post_upgrade () {
+ if (( $(vercmp $2 2.0.0) < 0)); then
+ cat <<MSG
+ > Configuration files and log files have been renamed in
+ order to bring Arch closer to upstream. In particular,
+ this affects:
+ /etc/conf.d/cdemud --> /etc/conf.d/cdemu-daemon
+ /var/log/cdemud.log --> /var/log/cdemu-daemon.log
+ ~/.cdemud --> ~/.cdemu-daemon
+ ~/.cdemud.log --> ~/.cdemu-daemon.log
+ Please move your configuration.
+
+MSG
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/system-arch.patch
===================================================================
--- community-i686/system-arch.patch 2017-06-12 20:36:39 UTC (rev 236565)
+++ community-i686/system-arch.patch 2017-06-12 20:37:04 UTC (rev 236566)
@@ -1,124 +0,0 @@
-diff -u -rN cdemu-daemon-3.0.2/CMakeLists.txt cdemu-daemon-3.0.2-arch/CMakeLists.txt
---- cdemu-daemon-3.0.2/CMakeLists.txt 2014-09-28 21:19:13.000000000 +0200
-+++ cdemu-daemon-3.0.2-arch/CMakeLists.txt 2015-10-08 22:23:20.174377466 +0200
-@@ -12,7 +12,7 @@
- include (GNUInstallDirs)
-
- # 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
-@@ -40,6 +40,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=c99) # We're compiling using C99
-@@ -112,6 +116,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/
- )
-@@ -119,6 +127,11 @@
- 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 ()
-
- # *** Configuration summary ***
-diff -u -rN cdemu-daemon-3.0.2/system/cdemu-daemon.conf cdemu-daemon-3.0.2-arch/system/cdemu-daemon.conf
---- cdemu-daemon-3.0.2/system/cdemu-daemon.conf 1970-01-01 01:00:00.000000000 +0100
-+++ cdemu-daemon-3.0.2-arch/system/cdemu-daemon.conf 2015-10-08 22:23:20.174377466 +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-3.0.2/system/cdemu-daemon-dbus.conf cdemu-daemon-3.0.2-arch/system/cdemu-daemon-dbus.conf
---- cdemu-daemon-3.0.2/system/cdemu-daemon-dbus.conf 2014-09-28 21:19:13.000000000 +0200
-+++ cdemu-daemon-3.0.2-arch/system/cdemu-daemon-dbus.conf 2015-10-08 22:23:20.174377466 +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-3.0.2/system/cdemu-daemon.service.in cdemu-daemon-3.0.2-arch/system/cdemu-daemon.service.in
---- cdemu-daemon-3.0.2/system/cdemu-daemon.service.in 1970-01-01 01:00:00.000000000 +0100
-+++ cdemu-daemon-3.0.2-arch/system/cdemu-daemon.service.in 2015-10-08 22:23:20.224377272 +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-3.0.2/system/cdemu-daemon-system.sh cdemu-daemon-3.0.2-arch/system/cdemu-daemon-system.sh
---- cdemu-daemon-3.0.2/system/cdemu-daemon-system.sh 2014-09-28 21:19:13.000000000 +0200
-+++ cdemu-daemon-3.0.2-arch/system/cdemu-daemon-system.sh 2015-10-08 22:23:20.224377272 +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-3.0.2/system/net.sf.cdemu.CDEmuDaemon.service.in cdemu-daemon-3.0.2-arch/system/net.sf.cdemu.CDEmuDaemon.service.in
---- cdemu-daemon-3.0.2/system/net.sf.cdemu.CDEmuDaemon.service.in 2014-09-28 21:19:13.000000000 +0200
-+++ cdemu-daemon-3.0.2-arch/system/net.sf.cdemu.CDEmuDaemon.service.in 2015-10-08 22:23:50.247594098 +0200
-@@ -1,5 +1,5 @@
- [D-BUS Service]
--Name=net.sf.cdemu.CdemuDaemon
-+Name=net.sf.cdemu.CDEmuDaemon
- Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/cdemu-daemon-system.sh
- User=root
--
-+SystemdService=cdemu-daemon.service
Copied: cdemu-daemon/repos/community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch (from rev 236565, cdemu-daemon/trunk/0001-Patch-system-daemon-for-Arch-friendliness.patch)
===================================================================
--- community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch (rev 0)
+++ community-x86_64/0001-Patch-system-daemon-for-Arch-friendliness.patch 2017-06-12 20:37:04 UTC (rev 236566)
@@ -0,0 +1,151 @@
+From 17d054bc9fb02bbb557f9de68e29e715a17f3ee6 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 12 Jun 2017 22:22:51 +0200
+Subject: [PATCH] Patch system daemon for Arch-friendliness
+
+---
+ cdemu-daemon/CMakeLists.txt | 15 ++++++++++++++-
+ cdemu-daemon/system/cdemu-daemon-dbus.conf | 9 +++++++--
+ cdemu-daemon/system/cdemu-daemon-system.sh | 6 +++---
+ cdemu-daemon/system/cdemu-daemon.conf | 8 ++++++++
+ cdemu-daemon/system/cdemu-daemon.service.in | 10 ++++++++++
+ cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in | 4 ++--
+ 6 files changed, 44 insertions(+), 8 deletions(-)
+ create mode 100644 cdemu-daemon/system/cdemu-daemon.conf
+ create mode 100644 cdemu-daemon/system/cdemu-daemon.service.in
+
+diff --git a/cdemu-daemon/CMakeLists.txt b/cdemu-daemon/CMakeLists.txt
+index 76feb818d09a57af..c6abd56b82484b6f 100644
+--- a/cdemu-daemon/CMakeLists.txt
++++ b/cdemu-daemon/CMakeLists.txt
+@@ -15,7 +15,7 @@ set (CDEMU_DAEMON_INTERFACE_VERSION_MINOR 0)
+ include (GNUInstallDirs)
+
+ # 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
+@@ -45,6 +45,10 @@ configure_file (
+ ${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=c99) # We're compiling using C99
+@@ -121,13 +125,22 @@ if (SYSTEM_BUS_SERVICE)
+ 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/
+ )
+ install (
+ 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 ()
+
+ # Translations; we use the version provided by our FindIntlTool.cmake
+diff --git a/cdemu-daemon/system/cdemu-daemon-dbus.conf b/cdemu-daemon/system/cdemu-daemon-dbus.conf
+index c450d78cf03bce6a..e86b62cf0437a9fd 100644
+--- a/cdemu-daemon/system/cdemu-daemon-dbus.conf
++++ b/cdemu-daemon/system/cdemu-daemon-dbus.conf
+@@ -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 --git a/cdemu-daemon/system/cdemu-daemon-system.sh b/cdemu-daemon/system/cdemu-daemon-system.sh
+index d9ab60aaff559400..735c24442a82e8bc 100755
+--- a/cdemu-daemon/system/cdemu-daemon-system.sh
++++ b/cdemu-daemon/system/cdemu-daemon-system.sh
+@@ -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 --git a/cdemu-daemon/system/cdemu-daemon.conf b/cdemu-daemon/system/cdemu-daemon.conf
+new file mode 100644
+index 0000000000000000..d0d6ecfebb77fbfb
+--- /dev/null
++++ b/cdemu-daemon/system/cdemu-daemon.conf
+@@ -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 --git a/cdemu-daemon/system/cdemu-daemon.service.in b/cdemu-daemon/system/cdemu-daemon.service.in
+new file mode 100644
+index 0000000000000000..43b5a61dc476e384
+--- /dev/null
++++ b/cdemu-daemon/system/cdemu-daemon.service.in
+@@ -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 --git a/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in b/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in
+index f9cf646b57c3563f..9004c310595273e4 100644
+--- a/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in
++++ b/cdemu-daemon/system/net.sf.cdemu.CDEmuDaemon.service.in
+@@ -1,5 +1,5 @@
+ [D-BUS Service]
+-Name=net.sf.cdemu.CdemuDaemon
++Name=net.sf.cdemu.CDEmuDaemon
+ Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/cdemu-daemon-system.sh
+ User=root
+-
++SystemdService=cdemu-daemon.service
+--
+2.13.1
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-06-12 20:36:39 UTC (rev 236565)
+++ community-x86_64/PKGBUILD 2017-06-12 20:37:04 UTC (rev 236566)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ray Rashif <schiv at archlinux.org>
-# Contributor: Mateusz Herych <heniekk at gmail.com>
-# Contributor: Charles Lindsay <charles at chaoslizard.org>
-
-pkgname=cdemu-daemon
-pkgver=3.0.5
-pkgrel=1
-pkgdesc="CD/DVD-ROM device emulator daemon"
-arch=(i686 x86_64)
-url="http://cdemu.sourceforge.net/"
-license=(GPL)
-depends=(dbus "vhba-module>=20140629" libao "libmirage>=3.0.2")
-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=cdemu-daemon.install
-source=("http://downloads.sourceforge.net/cdemu/$pkgname/$pkgname-$pkgver.tar.bz2"
- system-arch.patch)
-sha256sums=('317ca9149eb902c10a6ef9799976320b2f2d1bc42cb47ab68dbd151f5cf780b1'
- 'dee634da8b8301893f458647f536b183d1d3898e289d1ac570c189c986828cfe')
-
-prepare() {
- mkdir build
- cd $pkgname-$pkgver
-
- # 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
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-
- install -d "$pkgdir/usr/lib/modules-load.d"
- echo vhba > "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: cdemu-daemon/repos/community-x86_64/PKGBUILD (from rev 236565, cdemu-daemon/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-06-12 20:37:04 UTC (rev 236566)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ray Rashif <schiv at archlinux.org>
+# Contributor: Mateusz Herych <heniekk at gmail.com>
+# Contributor: Charles Lindsay <charles at chaoslizard.org>
+
+pkgname=cdemu-daemon
+pkgver=3.1.0
+pkgrel=1
+pkgdesc="CD/DVD-ROM device emulator daemon"
+arch=(i686 x86_64)
+url="http://cdemu.sourceforge.net/"
+license=(GPL)
+depends=(dbus vhba-module libao 'libmirage>=3.1.0')
+makedepends=(cmake intltool)
+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=cdemu-daemon.install
+source=("http://downloads.sourceforge.net/cdemu/$pkgname/$pkgname-$pkgver.tar.bz2"
+ 0001-Patch-system-daemon-for-Arch-friendliness.patch)
+sha256sums=('498f0f2fe2225de76acfe0b3dbf9606e4e2eb57ac9d29da9d48064b62587bc4f'
+ 'e83467d342abd979b38b3a971b97942787f5b5a0e18c569b034a636c54eb8154')
+
+prepare() {
+ mkdir build
+ cd $pkgname-$pkgver
+
+ # It's disabled by default. Should we even ship it?
+ patch -Np2 -i ../0001-Patch-system-daemon-for-Arch-friendliness.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
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ install -d "$pkgdir/usr/lib/modules-load.d"
+ echo vhba > "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/cdemu-daemon.install
===================================================================
--- community-x86_64/cdemu-daemon.install 2017-06-12 20:36:39 UTC (rev 236565)
+++ community-x86_64/cdemu-daemon.install 2017-06-12 20:37:04 UTC (rev 236566)
@@ -1,42 +0,0 @@
-post_install () {
- cat <<MSG
- > Only users with at a physical terminal or in the 'cdemu'
- group can communicate with the system daemon or make use
- of a session daemon.
-
- > If you want to output CD-Audio you need to use a session
- daemon, e.g. via "cdemu -b session". If you use ALSA and
- not PulseAudio, echo AUDIO_DRIVER=alsa > ~/.cdemu-daemon
-
- > The daemons are usually started on-demand, but a system
- daemon can be manually started via cdemu-daemon.service.
- See /etc/conf.d/cdemu-daemon for further configuration.
-
-MSG
-
- post_upgrade $1 $1
-
- modprobe vhba
-
- return 0
-}
-
-post_upgrade () {
- if (( $(vercmp $2 2.0.0) < 0)); then
- cat <<MSG
- > Configuration files and log files have been renamed in
- order to bring Arch closer to upstream. In particular,
- this affects:
- /etc/conf.d/cdemud --> /etc/conf.d/cdemu-daemon
- /var/log/cdemud.log --> /var/log/cdemu-daemon.log
- ~/.cdemud --> ~/.cdemu-daemon
- ~/.cdemud.log --> ~/.cdemu-daemon.log
- Please move your configuration.
-
-MSG
- fi
-
- return 0
-}
-
-# vim:set ts=2 sw=2 et:
Copied: cdemu-daemon/repos/community-x86_64/cdemu-daemon.install (from rev 236565, cdemu-daemon/trunk/cdemu-daemon.install)
===================================================================
--- community-x86_64/cdemu-daemon.install (rev 0)
+++ community-x86_64/cdemu-daemon.install 2017-06-12 20:37:04 UTC (rev 236566)
@@ -0,0 +1,36 @@
+post_install () {
+ cat <<MSG
+ > Only users with a hardware seat or in the 'cdemu' group
+ can communicate with the system daemon or make use of a
+ session daemon.
+
+ > If you want to output CD-Audio you need to use a session
+ daemon, e.g. via "cdemu -b session". If you use ALSA and
+ not PulseAudio, echo AUDIO_DRIVER=alsa > ~/.cdemu-daemon
+
+ > The daemons are usually started on-demand, but a system
+ daemon can be manually started via cdemu-daemon.service.
+ See /etc/conf.d/cdemu-daemon for further configuration.
+
+MSG
+
+ modprobe vhba
+}
+
+post_upgrade () {
+ if (( $(vercmp $2 2.0.0) < 0)); then
+ cat <<MSG
+ > Configuration files and log files have been renamed in
+ order to bring Arch closer to upstream. In particular,
+ this affects:
+ /etc/conf.d/cdemud --> /etc/conf.d/cdemu-daemon
+ /var/log/cdemud.log --> /var/log/cdemu-daemon.log
+ ~/.cdemud --> ~/.cdemu-daemon
+ ~/.cdemud.log --> ~/.cdemu-daemon.log
+ Please move your configuration.
+
+MSG
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/system-arch.patch
===================================================================
--- community-x86_64/system-arch.patch 2017-06-12 20:36:39 UTC (rev 236565)
+++ community-x86_64/system-arch.patch 2017-06-12 20:37:04 UTC (rev 236566)
@@ -1,124 +0,0 @@
-diff -u -rN cdemu-daemon-3.0.2/CMakeLists.txt cdemu-daemon-3.0.2-arch/CMakeLists.txt
---- cdemu-daemon-3.0.2/CMakeLists.txt 2014-09-28 21:19:13.000000000 +0200
-+++ cdemu-daemon-3.0.2-arch/CMakeLists.txt 2015-10-08 22:23:20.174377466 +0200
-@@ -12,7 +12,7 @@
- include (GNUInstallDirs)
-
- # 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
-@@ -40,6 +40,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=c99) # We're compiling using C99
-@@ -112,6 +116,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/
- )
-@@ -119,6 +127,11 @@
- 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 ()
-
- # *** Configuration summary ***
-diff -u -rN cdemu-daemon-3.0.2/system/cdemu-daemon.conf cdemu-daemon-3.0.2-arch/system/cdemu-daemon.conf
---- cdemu-daemon-3.0.2/system/cdemu-daemon.conf 1970-01-01 01:00:00.000000000 +0100
-+++ cdemu-daemon-3.0.2-arch/system/cdemu-daemon.conf 2015-10-08 22:23:20.174377466 +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-3.0.2/system/cdemu-daemon-dbus.conf cdemu-daemon-3.0.2-arch/system/cdemu-daemon-dbus.conf
---- cdemu-daemon-3.0.2/system/cdemu-daemon-dbus.conf 2014-09-28 21:19:13.000000000 +0200
-+++ cdemu-daemon-3.0.2-arch/system/cdemu-daemon-dbus.conf 2015-10-08 22:23:20.174377466 +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-3.0.2/system/cdemu-daemon.service.in cdemu-daemon-3.0.2-arch/system/cdemu-daemon.service.in
---- cdemu-daemon-3.0.2/system/cdemu-daemon.service.in 1970-01-01 01:00:00.000000000 +0100
-+++ cdemu-daemon-3.0.2-arch/system/cdemu-daemon.service.in 2015-10-08 22:23:20.224377272 +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-3.0.2/system/cdemu-daemon-system.sh cdemu-daemon-3.0.2-arch/system/cdemu-daemon-system.sh
---- cdemu-daemon-3.0.2/system/cdemu-daemon-system.sh 2014-09-28 21:19:13.000000000 +0200
-+++ cdemu-daemon-3.0.2-arch/system/cdemu-daemon-system.sh 2015-10-08 22:23:20.224377272 +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-3.0.2/system/net.sf.cdemu.CDEmuDaemon.service.in cdemu-daemon-3.0.2-arch/system/net.sf.cdemu.CDEmuDaemon.service.in
---- cdemu-daemon-3.0.2/system/net.sf.cdemu.CDEmuDaemon.service.in 2014-09-28 21:19:13.000000000 +0200
-+++ cdemu-daemon-3.0.2-arch/system/net.sf.cdemu.CDEmuDaemon.service.in 2015-10-08 22:23:50.247594098 +0200
-@@ -1,5 +1,5 @@
- [D-BUS Service]
--Name=net.sf.cdemu.CdemuDaemon
-+Name=net.sf.cdemu.CDEmuDaemon
- Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/cdemu-daemon-system.sh
- User=root
--
-+SystemdService=cdemu-daemon.service
More information about the arch-commits
mailing list