Date: Monday, October 10, 2016 @ 12:08:59 Author: heftig Revision: 191871
archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: cdemu-daemon/repos/community-testing-i686/ cdemu-daemon/repos/community-testing-i686/PKGBUILD (from rev 191870, cdemu-daemon/trunk/PKGBUILD) cdemu-daemon/repos/community-testing-i686/cdemu-daemon.install (from rev 191870, cdemu-daemon/trunk/cdemu-daemon.install) cdemu-daemon/repos/community-testing-i686/system-arch.patch (from rev 191870, cdemu-daemon/trunk/system-arch.patch) cdemu-daemon/repos/community-testing-x86_64/ cdemu-daemon/repos/community-testing-x86_64/PKGBUILD (from rev 191870, cdemu-daemon/trunk/PKGBUILD) cdemu-daemon/repos/community-testing-x86_64/cdemu-daemon.install (from rev 191870, cdemu-daemon/trunk/cdemu-daemon.install) cdemu-daemon/repos/community-testing-x86_64/system-arch.patch (from rev 191870, cdemu-daemon/trunk/system-arch.patch) -----------------------------------------------+ community-testing-i686/PKGBUILD | 54 ++++++++++ community-testing-i686/cdemu-daemon.install | 42 ++++++++ community-testing-i686/system-arch.patch | 124 ++++++++++++++++++++++++ community-testing-x86_64/PKGBUILD | 54 ++++++++++ community-testing-x86_64/cdemu-daemon.install | 42 ++++++++ community-testing-x86_64/system-arch.patch | 124 ++++++++++++++++++++++++ 6 files changed, 440 insertions(+) Copied: cdemu-daemon/repos/community-testing-i686/PKGBUILD (from rev 191870, cdemu-daemon/trunk/PKGBUILD) =================================================================== --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2016-10-10 12:08:59 UTC (rev 191871) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Ray Rashif <sc...@archlinux.org> +# Contributor: Mateusz Herych <heni...@gmail.com> +# Contributor: Charles Lindsay <char...@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-testing-i686/cdemu-daemon.install (from rev 191870, cdemu-daemon/trunk/cdemu-daemon.install) =================================================================== --- community-testing-i686/cdemu-daemon.install (rev 0) +++ community-testing-i686/cdemu-daemon.install 2016-10-10 12:08:59 UTC (rev 191871) @@ -0,0 +1,42 @@ +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-testing-i686/system-arch.patch (from rev 191870, cdemu-daemon/trunk/system-arch.patch) =================================================================== --- community-testing-i686/system-arch.patch (rev 0) +++ community-testing-i686/system-arch.patch 2016-10-10 12:08:59 UTC (rev 191871) @@ -0,0 +1,124 @@ +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-testing-x86_64/PKGBUILD (from rev 191870, cdemu-daemon/trunk/PKGBUILD) =================================================================== --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2016-10-10 12:08:59 UTC (rev 191871) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Ray Rashif <sc...@archlinux.org> +# Contributor: Mateusz Herych <heni...@gmail.com> +# Contributor: Charles Lindsay <char...@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-testing-x86_64/cdemu-daemon.install (from rev 191870, cdemu-daemon/trunk/cdemu-daemon.install) =================================================================== --- community-testing-x86_64/cdemu-daemon.install (rev 0) +++ community-testing-x86_64/cdemu-daemon.install 2016-10-10 12:08:59 UTC (rev 191871) @@ -0,0 +1,42 @@ +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-testing-x86_64/system-arch.patch (from rev 191870, cdemu-daemon/trunk/system-arch.patch) =================================================================== --- community-testing-x86_64/system-arch.patch (rev 0) +++ community-testing-x86_64/system-arch.patch 2016-10-10 12:08:59 UTC (rev 191871) @@ -0,0 +1,124 @@ +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