diff --git a/common/environment/setup/install.sh b/common/environment/setup/install.sh index 9a5ec82c264..9faa80e24e5 100644 --- a/common/environment/setup/install.sh +++ b/common/environment/setup/install.sh @@ -27,6 +27,15 @@ _vsv() { vmkdir etc/sv vcopy "${FILESDIR}/$service" etc/sv + chmod +x ${PKGDESTDIR}/etc/sv/${service}/run + if [ -r ${PKGDESTDIR}/etc/sv/${service}/finish ]; then + chmod +x ${PKGDESTDIR}/etc/sv/${service}/finish + fi + ln -s /run/runit/supervise.${service} ${PKGDESTDIR}/etc/sv/${service}/supervise + if [ -r ${PKGDESTDIR}/etc/sv/${service}/log/run ]; then + chmod +x ${PKGDESTDIR}/etc/sv/${service}/log/run + ln -s /run/runit/supervise.${service}-log ${PKGDESTDIR}/etc/sv/${service}/log/supervise + fi } _vbin() { diff --git a/srcpkgs/NetworkManager/files/NetworkManager/run b/srcpkgs/NetworkManager/files/NetworkManager/run new file mode 100755 index 00000000000..17e0b14681f --- /dev/null +++ b/srcpkgs/NetworkManager/files/NetworkManager/run @@ -0,0 +1,7 @@ +#!/bin/sh +sv check dbus >/dev/null || exit 1 +# Create required dirs +[ ! -d /etc/NetworkManager/dispatcher.d ] && mkdir -m0755 -p /etc/NetworkManager/dispatcher.d +[ ! -d /etc/NetworkManager/system-connections ] && mkdir -m0755 -p /etc/NetworkManager/system-connections +[ ! -d /var/lib/NetworkManager ] && mkdir -m0700 -p /var/lib/NetworkManager +exec NetworkManager -n diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index e51af6b6e27..8689dd8c584 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,7 +1,7 @@ # Template file for 'NetworkManager' pkgname=NetworkManager version=0.9.10.0 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no @@ -30,7 +30,7 @@ makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel lib32disabled=yes depends="dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant ModemManager mobile-broadband-provider-info" conf_files="/etc/${pkgname}/${pkgname}.conf" -systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on" +replaces="runit-void<20141013_2" # Package build options build_options="gir systemd" @@ -50,6 +50,7 @@ if [ "$build_option_systemd" ]; then configure_args+=" --with-session-tracking=systemd --with-suspend-resume=systemd" configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system" makedepends+=" systemd-devel" + systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on" else configure_args+=" --with-session-tracking=consolekit --with-suspend-resume=upower" fi @@ -63,9 +64,12 @@ pre_configure() { post_install() { vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname} - vinstall ${FILESDIR}/tmpfilesd 644 usr/lib/tmpfiles.d ${pkgname}.conf + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/tmpfilesd 644 usr/lib/tmpfiles.d ${pkgname}.conf + fi # remove unused stuff rm -rf ${DESTDIR}/etc/init.d + vsv ${pkgname} } libnm_package() { @@ -78,7 +82,6 @@ libnm_package() { fi } } - NetworkManager-devel_package() { depends="dbus-glib-devel libnm-${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/acpid/files/acpid/run b/srcpkgs/acpid/files/acpid/run new file mode 100755 index 00000000000..5baf800e57c --- /dev/null +++ b/srcpkgs/acpid/files/acpid/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec acpid -f diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template index 53faa0785d8..6d7be1a30ae 100644 --- a/srcpkgs/acpid/template +++ b/srcpkgs/acpid/template @@ -1,7 +1,8 @@ # Template file for 'acpid' pkgname=acpid version=2.0.23 -revision=1 +revision=2 +replaces="runit-void<20141013_2" build_style=gnu-configure conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh" short_desc="The ACPI Daemon (acpid) With Netlink Support" @@ -23,4 +24,5 @@ post_install() { fi vinstall ${FILESDIR}/handler.sh 755 etc/acpi vinstall ${FILESDIR}/anything 644 etc/acpi/events + vsv acpid } diff --git a/srcpkgs/alsa-utils/files/alsa/finish b/srcpkgs/alsa-utils/files/alsa/finish new file mode 100755 index 00000000000..14392586afa --- /dev/null +++ b/srcpkgs/alsa-utils/files/alsa/finish @@ -0,0 +1,3 @@ +#!/bin/sh +set -e +exec alsactl store diff --git a/srcpkgs/alsa-utils/files/alsa/run b/srcpkgs/alsa-utils/files/alsa/run new file mode 100755 index 00000000000..728c4c8dd76 --- /dev/null +++ b/srcpkgs/alsa-utils/files/alsa/run @@ -0,0 +1,4 @@ +#!/bin/sh +set -e +alsactl restore +exec chpst -b alsa pause diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template index 7b6bb0ce152..8084e678f1a 100644 --- a/srcpkgs/alsa-utils/template +++ b/srcpkgs/alsa-utils/template @@ -1,7 +1,8 @@ # Template build file for 'alsa-utils'. pkgname=alsa-utils version=1.0.28 -revision=2 +revision=3 +replaces="runit-void<20141013_2" build_style=gnu-configure configure_args="--with-udev-rules-dir=/usr/lib/udev/rules.d -disable-alsaconf" hostmakedepends="pkg-config xmlto" @@ -25,4 +26,5 @@ post_install() { # Install required udev rules file. make -C alsactl 90-alsa-restore.rules vinstall alsactl/90-alsa-restore.rules 644 usr/lib/udev/rules.d + vsv alsa } diff --git a/srcpkgs/apache/files/apache/run b/srcpkgs/apache/files/apache/run new file mode 100755 index 00000000000..5fcf6470fbf --- /dev/null +++ b/srcpkgs/apache/files/apache/run @@ -0,0 +1,5 @@ +#!/bin/sh +mkdir -p /run/httpd || exit 1 +chmod 0710 /run/httpd || exit 1 +chown root:httpd /run/httpd || exit 1 +exec httpd -DNO_DETACH diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index be1030aff6e..0dc11661f3d 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,7 +1,7 @@ # Template file for 'apache' pkgname=apache version=2.4.10 -revision=2 +revision=3 wrksrc=httpd-${version} build_style=gnu-configure configure_args="--prefix= --enable-pie --enable-modules=all @@ -44,6 +44,7 @@ license="Apache-2.0" distfiles="http://www.apache.org/dist/httpd/httpd-${version}.tar.bz2" checksum=176c4dac1a745f07b7b91e7f4fd48f9c48049fa6f088efe758d61d9738669c6a +replaces="runit-void<20141013_2" system_accounts="httpd" httpd_descr="Apache HTTP server" httpd_homedir="/srv/httpd" @@ -59,6 +60,9 @@ if [ "$build_option_systemd" ]; then fi pre_configure() { + # SSL_CTX_use_certificate_chain() conflicts with libressl-2.1. + sed -e 's,SSL_CTX_use_certificate_chain,_SSL_CTX_use_certificate_chain,g' -i modules/ssl/*.[ch] + # set default user sed -e 's#User daemon#User httpd#' \ -e 's#Group daemon#Group httpd#' \ @@ -100,6 +104,8 @@ post_install() { vinstall ${FILESDIR}/apache.tmpfiles 644 usr/lib/tmpfiles.d apache.conf fi + vsv apache + rm -rf ${DESTDIR}/etc/httpd/original } diff --git a/srcpkgs/atop/files/atop/run b/srcpkgs/atop/files/atop/run new file mode 100755 index 00000000000..7f6aeb8dbd9 --- /dev/null +++ b/srcpkgs/atop/files/atop/run @@ -0,0 +1,3 @@ +#!/bin/sh +mkdir -p /var/log/atop || exit 1 +exec atop -a -w /var/log/atop/atop_$(date +%Y%m%d) 600 diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template index ed9e4f59cc9..f225ae69028 100644 --- a/srcpkgs/atop/template +++ b/srcpkgs/atop/template @@ -2,8 +2,10 @@ pkgname=atop version=2.0.2 wrksrc=atop-${version} -revision=2 +revision=3 build_style=gnu-makefile +build_options="systemd" +replaces="runit-void<20141013_2" makedepends="ncurses-devel zlib-devel" short_desc="A system and process level monitor" maintainer="Juan RP " @@ -12,11 +14,9 @@ homepage="http://www.atoptool.nl/" distfiles="http://www.atoptool.nl/download/$pkgname-$version.tar.gz" checksum=a620dbe0de7c7ee004949b201bed27559a8dd6cbdee651c7a3e15fc584723409 -build_options="systemd" -if [ "$build_option_systemd" ]; then - systemd_services="atop.service true" -fi - +pre_install() { + sed -i '/chown/d' Makefile +} post_install() { # Remove unused stuff. rm -f ${DESTDIR}/usr/bin/atop{,sar}-2.0 @@ -25,4 +25,5 @@ post_install() { # systemd service vinstall atop.service 644 usr/lib/systemd/system fi + vsv atop } diff --git a/srcpkgs/avahi/files/avahi-daemon/run b/srcpkgs/avahi/files/avahi-daemon/run new file mode 100755 index 00000000000..6b78be21887 --- /dev/null +++ b/srcpkgs/avahi/files/avahi-daemon/run @@ -0,0 +1,3 @@ +#!/bin/sh +sv check dbus >/dev/null || exit 1 +exec avahi-daemon -s diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template index a91d3256f4d..ef408fb146a 100644 --- a/srcpkgs/avahi/template +++ b/srcpkgs/avahi/template @@ -1,7 +1,7 @@ # Template file for 'avahi' pkgname=avahi version=0.6.31 -revision=17 +revision=18 build_style=gnu-configure configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl @@ -28,6 +28,7 @@ conf_files=" /etc/avahi/hosts /etc/avahi/avahi-dnsconfd.action" system_accounts="avahi:23" +replaces="runit-void<20141013_2" build_options="systemd" if [ "$build_option_systemd" ]; then @@ -46,10 +47,10 @@ post_extract() { # Switch to /run to not depend on /var/run being a symlink. sed -e 's,\(avahi_runtime_dir=\).*,\1\"/run\",' -i ${wrksrc}/configure } - post_install() { # Enable 'disallow_other_stacks' option by default. sed -e 's,\#\(disallow-other-stacks\).*,\1=yes,' -i ${DESTDIR}/etc/avahi/avahi-daemon.conf + vsv avahi-daemon } avahi-autoipd_package() { @@ -61,7 +62,6 @@ avahi-autoipd_package() { vmove etc/avahi/avahi-autoipd.action } } - avahi-compat-libs-devel_package() { depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}" short_desc="Avahi compat libraries - development files" @@ -72,7 +72,6 @@ avahi-compat-libs-devel_package() { vmove usr/lib/libdns_sd.so } } - avahi-compat-libs_package() { short_desc="Avahi compatiblity shared libraries" pkg_install() { @@ -80,7 +79,6 @@ avahi-compat-libs_package() { vmove "usr/lib/libdns_sd.so.*" } } - avahi-libs-devel_package() { depends="dbus-devel avahi-libs-${version}_${revision}" short_desc="Avahi core libraries - development files" @@ -95,7 +93,6 @@ avahi-libs-devel_package() { vmove usr/lib/libavahi-common.so } } - avahi-libs_package() { short_desc="Avahi shared libraries" pkg_install() { @@ -104,7 +101,6 @@ avahi-libs_package() { vmove "usr/lib/libavahi-common.so.*" } } - avahi-utils_package() { short_desc="Avahi browsing, publishing and discovery utilities" pkg_install() { diff --git a/srcpkgs/bind/files/named/run b/srcpkgs/bind/files/named/run new file mode 100755 index 00000000000..9b510127a30 --- /dev/null +++ b/srcpkgs/bind/files/named/run @@ -0,0 +1,4 @@ +#!/bin/sh +mkdir -p /var/run/named || exit 1 +chown named:named /var/run/named || exit 1 +exec named -u named -f -c /etc/named/named.conf diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index 0838171345d..230fc16c599 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -4,7 +4,7 @@ _distver=9.9.5 _patchver=P1 version=${_distver}${_patchver} wrksrc=${pkgname}-${_distver}-${_patchver} -revision=3 +revision=4 short_desc="Berkeley Internet Name Domain server" maintainer="Juan RP " license="ISC" @@ -27,11 +27,8 @@ named_desc="BIND DNS server" named_homedir="/var/named" named_shell="/bin/false" make_dirs="/var/named 0770 root named" - build_options="systemd" -if [ "$build_option_systemd" ]; then - systemd_services="named.service true" -fi +replaces="runit-void<20141013_2" pre_configure() { # disable bin tests for now. @@ -44,6 +41,7 @@ post_install() { if [ "$build_option_systemd" ]; then vinstall ${FILESDIR}/named.service 644 usr/lib/systemd/system fi + vsv named vinstall ${FILESDIR}/named.logrotate 600 etc/logrotate.d named vinstall ${FILESDIR}/named.conf 640 etc/named @@ -58,7 +56,6 @@ bind-libs_package() { vmove "usr/lib/*.so.*" } } - bind-utils_package() { short_desc+=" - DNS utils" pkg_install() { @@ -68,7 +65,6 @@ bind-utils_package() { done } } - bind-devel_package() { depends="bind-libs>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/bluez/files/bluetoothd/run b/srcpkgs/bluez/files/bluetoothd/run new file mode 100755 index 00000000000..81dee8b10e8 --- /dev/null +++ b/srcpkgs/bluez/files/bluetoothd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/libexec/bluetooth/bluetoothd -n >/dev/null diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index 1810ae337aa..c5e34c7be9a 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,7 +1,7 @@ # Template file for 'bluez' pkgname=bluez version=5.24 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-udevdir=/usr/lib/udev --enable-pie --enable-threads --enable-library" @@ -9,6 +9,7 @@ hostmakedepends="automake libtool pkg-config flex" makedepends="libglib-devel libudev-devel dbus-devel cups-devel libical-devel readline-devel>=6.3" conf_files="/etc/bluetooth/main.conf" +replaces="runit-void<20141013_2" short_desc="Bluetooth tools and daemons" maintainer="Juan RP " homepage="http://www.bluez.org/" @@ -32,6 +33,7 @@ pre_configure() { } post_install() { vinstall ${wrksrc}/src/main.conf 644 etc/bluetooth + vsv bluetoothd } libbluetooth_package() { @@ -40,7 +42,6 @@ libbluetooth_package() { vmove "usr/lib/libbluetooth.so.*" } } - libbluetooth-devel_package() { depends="libbluetooth>=${version}_${revision}" short_desc="Development files to use the BlueZ Linux Bluetooth library" @@ -50,7 +51,6 @@ libbluetooth-devel_package() { vmove "usr/lib/*.so" } } - bluez-cups_package() { short_desc="CUPS printer backend for Bluetooth printers" pkg_install() { diff --git a/srcpkgs/bumblebee/files/bumblebeed/run b/srcpkgs/bumblebee/files/bumblebeed/run new file mode 100755 index 00000000000..a8ee73c4373 --- /dev/null +++ b/srcpkgs/bumblebee/files/bumblebeed/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec bumblebeed --use-syslog diff --git a/srcpkgs/bumblebee/template b/srcpkgs/bumblebee/template index 52f79f1fc7c..1a6ba2434cd 100644 --- a/srcpkgs/bumblebee/template +++ b/srcpkgs/bumblebee/template @@ -1,7 +1,7 @@ # Template file for 'bumblebee' pkgname=bumblebee version=3.2.1 -revision=4 +revision=5 build_style=gnu-configure configure_args=" CONF_DRIVER_MODULE_NVIDIA=nvidia @@ -26,13 +26,11 @@ distfiles="http://www.bumblebee-project.org/${pkgname}-${version}.tar.gz" checksum=1018703b07e2f607a4641249d69478ce076ae5a1e9dd6cff5694d394fa7ee30e only_for_archs="i686 x86_64" - build_options="systemd" -if [ "$build_option_systemd" ]; then - systemd_services="bumblebeed.service true" -fi +replaces="runit-void<20141013_2" post_install() { + vsv bumblebeed # Install systemd service if [ "$build_option_systemd" ]; then vinstall scripts/systemd/bumblebeed.service 644 usr/lib/systemd/system diff --git a/srcpkgs/cntlm/files/cntlm/run b/srcpkgs/cntlm/files/cntlm/run new file mode 100755 index 00000000000..b1e45897f54 --- /dev/null +++ b/srcpkgs/cntlm/files/cntlm/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec cntlm -f 2>&1 diff --git a/srcpkgs/cntlm/template b/srcpkgs/cntlm/template index 35e8d337af2..6f80dc7b95d 100644 --- a/srcpkgs/cntlm/template +++ b/srcpkgs/cntlm/template @@ -1,9 +1,9 @@ # Template file for 'cntlm' pkgname=cntlm version=0.92.3 -revision=2 +revision=3 build_style=gnu-configure -hostmakedepends="which" +replaces="runit-void<20141013_2" conf_files="/etc/cntlm.conf" short_desc="NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy" maintainer="Ypnose " @@ -13,10 +13,13 @@ distfiles="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname%2 checksum=9c3ad10924d43f7248df9ecd33cbc033afbd7ea8d9545de0d68a2782fed76298 do_build() { - sed -i 's|/sbin|/bin|' Makefile make CC=$CC ${makejobs} } - -post_install() { - vinstall ${FILESDIR}/cntlm.service 644 usr/lib/systemd/system +do_install() { + vbin cntlm + vman doc/cntlm.1 + vsv cntlm + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/cntlm.service 644 usr/lib/systemd/system + fi } diff --git a/srcpkgs/connman/files/connmand/run b/srcpkgs/connman/files/connmand/run new file mode 100755 index 00000000000..accfc763830 --- /dev/null +++ b/srcpkgs/connman/files/connmand/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec connmand -n diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template index fa134eada3b..cf53ecaa5d4 100644 --- a/srcpkgs/connman/template +++ b/srcpkgs/connman/template @@ -19,10 +19,12 @@ distfiles="${KERNEL_SITE}/network/$pkgname/$pkgname-$version.tar.xz" checksum=7184e4b6d954449ee00a30e188924b3e37a20ad2fd9a0b76a2bdd82c863dcf8a build_options="systemd" +replaces="runit-void<20141013_2" post_install() { # Install the client connmanctl. vbin client/connmanctl + vsv connmand } connman-devel_package() { diff --git a/srcpkgs/cronie/files/cronie/run b/srcpkgs/cronie/files/cronie/run new file mode 100755 index 00000000000..28f1e7257a4 --- /dev/null +++ b/srcpkgs/cronie/files/cronie/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec crond -n 2>&1 diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template index de8092d30fa..b7ba2e13442 100644 --- a/srcpkgs/cronie/template +++ b/srcpkgs/cronie/template @@ -1,11 +1,11 @@ # Template file for 'cronie' pkgname=cronie version=1.4.12 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-inotify --without-selinux --with-pam --disable-anacron --localstatedir=/var --enable-pie --enable-relro" -makedepends="pam-devel run-parts" +makedepends="pam-devel" depends="run-parts" make_dirs=" /etc/cron.d 0755 root root @@ -18,7 +18,6 @@ make_dirs=" conf_files="/etc/crontab /etc/pam.d/crond /etc/cron.deny" replaces="cron-daemon>=0" provides="cron-daemon-0_1" -systemd_services="cronie.service on" short_desc="Runs specified programs at scheduled times" maintainer="Juan RP " homepage="https://fedorahosted.org/cronie/" @@ -27,12 +26,13 @@ distfiles="https://fedorahosted.org/releases/c/r/cronie/cronie-$version.tar.gz" checksum=0f5c9bf32f352599451c4ca0d6bc076d19e73ecfa5a90b34ecfe47c918c8bafd build_options="systemd" +replaces="runit-void<20141013_2" post_install() { if [ "$build_option_systemd" ]; then vinstall ${FILESDIR}/cronie.service 644 usr/lib/systemd/system fi - + vsv cronie vinstall ${FILESDIR}/crontab 644 etc vinstall ${FILESDIR}/crond.pam 644 etc/pam.d crond diff --git a/srcpkgs/cups/files/cupsd/run b/srcpkgs/cups/files/cupsd/run new file mode 100755 index 00000000000..568bee19986 --- /dev/null +++ b/srcpkgs/cups/files/cupsd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec cupsd -f diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index 8127458b747..19224901a65 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -1,7 +1,7 @@ # Template file for 'cups' pkgname=cups version=1.7.5 -revision=2 +revision=3 patch_args="-Np1" short_desc="Common Unix Printing System" maintainer="Juan RP " @@ -29,7 +29,7 @@ make_dirs=" /var/log/cups 0750 root root /var/spool/cups 0755 root lp /etc/cups/ssl 0700 root lp" - +replaces="runit-void<20141013_2" # Package build options build_options="systemd" @@ -93,6 +93,8 @@ do_install() { # comment out all conversion rules which use any of the removed filters perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' \ ${DESTDIR}/usr/share/cups/mime/mime.convs + + vsv cupsd } libcups_package() { @@ -105,7 +107,6 @@ libcups_package() { vmove usr/share/man/man5/client.conf.5 } } - cups-devel_package() { depends="zlib-devel libcups>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/dbus/files/dbus/run b/srcpkgs/dbus/files/dbus/run new file mode 100755 index 00000000000..2ed764dd625 --- /dev/null +++ b/srcpkgs/dbus/files/dbus/run @@ -0,0 +1,4 @@ +#!/bin/sh +[ ! -d /run/dbus ] && install -m755 -g 22 -o 22 -d /run/dbus +dbus-uuidgen --ensure +exec dbus-daemon --system --nofork --nopidfile diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template index c747eeaf7fa..9713d02d311 100644 --- a/srcpkgs/dbus/template +++ b/srcpkgs/dbus/template @@ -2,7 +2,7 @@ # pkgname=dbus version=1.8.8 -revision=1 +revision=2 short_desc="Message bus system" maintainer="Juan RP " license="GPL-2" @@ -14,6 +14,7 @@ create_wrksrc=yes hostmakedepends="pkg-config intltool gperf xmlto" makedepends="expat-devel libX11-devel libcap-devel" conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf" +replaces="runit-void<20141013_2" # Create dbus:22 system account. system_accounts="dbus:22" @@ -46,7 +47,6 @@ _dbus_bootstrap() { make ${makejobs} make install } - _systemd_bootstrap() { # Build a temporary systemd; we are only interested in libsystemd-login. if [ ! -d ${wrksrc}/systemd-bootstrap ]; then @@ -88,7 +88,6 @@ _systemd_bootstrap() { cp -a ${wrksrc}/systemd-install/usr/lib/pkgconfig/libsystemd* \ ${_systemddir}/lib/pkgconfig/ } - pre_configure() { if [ "$build_option_systemd" ]; then if [ ! -f ${wrksrc}/dbus_bootstrap_done ]; then @@ -101,7 +100,6 @@ pre_configure() { fi fi } - do_configure() { cd ${wrksrc}/dbus-${version} @@ -129,7 +127,6 @@ do_build() { cd ${wrksrc}/dbus-${version} make ${makejobs} } - do_install() { cd ${wrksrc}/dbus-${version} make DESTDIR=${DESTDIR} install @@ -140,6 +137,7 @@ do_install() { rm -rf ${_systemddir}/include/systemd rm -f ${_systemddir}/lib/libsystemd-* fi + vsv dbus } dbus-devel_package() { @@ -153,14 +151,12 @@ dbus-devel_package() { vmove usr/share/doc } } - dbus-libs_package() { short_desc+=" - shared libraries" pkg_install() { vmove "usr/lib/*.so.*" } } - dbus-x11_package() { replaces="dbus<1.4.16_2" short_desc+=" - X11 support" diff --git a/srcpkgs/dcron/files/dcron/log/run b/srcpkgs/dcron/files/dcron/log/run new file mode 100755 index 00000000000..481c04d6207 --- /dev/null +++ b/srcpkgs/dcron/files/dcron/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec logger -p cron.notice diff --git a/srcpkgs/dcron/files/dcron/run b/srcpkgs/dcron/files/dcron/run new file mode 100755 index 00000000000..33d1c5296a0 --- /dev/null +++ b/srcpkgs/dcron/files/dcron/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec crond -f 2>&1 diff --git a/srcpkgs/dcron/template b/srcpkgs/dcron/template index 43a4606008b..3051e3475a8 100644 --- a/srcpkgs/dcron/template +++ b/srcpkgs/dcron/template @@ -1,9 +1,9 @@ # Template file for 'dcron' pkgname=dcron version=4.5 -revision=24 +revision=25 conf_files="/var/spool/cron/root" -replaces="cron-daemon>=0" +replaces="cron-daemon>=0 runit-void<20141013_2" provides="cron-daemon-1_1" short_desc="Dillon's lightweight cron daemon" maintainer="Juan RP " @@ -45,4 +45,6 @@ do_install() { if [ "$build_option_systemd" ]; then vinstall ${FILESDIR}/dcron.service 644 usr/lib/systemd/system fi + + vsv dcron } diff --git a/srcpkgs/dhcpcd/files/dhcpcd-eth0/run b/srcpkgs/dhcpcd/files/dhcpcd-eth0/run new file mode 100755 index 00000000000..bd8e0f17be4 --- /dev/null +++ b/srcpkgs/dhcpcd/files/dhcpcd-eth0/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec dhcpcd -M -B eth0 diff --git a/srcpkgs/dhcpcd/files/dhcpcd/run b/srcpkgs/dhcpcd/files/dhcpcd/run new file mode 100755 index 00000000000..646eb7b043a --- /dev/null +++ b/srcpkgs/dhcpcd/files/dhcpcd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec dhcpcd -M -B diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index 7b35d6a623f..0cde945e5f9 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,7 +1,8 @@ # Template file for 'dhcpcd' pkgname=dhcpcd version=6.5.0 -revision=1 +revision=2 +replaces="runit-void<20141013_2" lib32disabled=yes build_options="systemd" build_style=configure @@ -22,4 +23,6 @@ post_install() { vinstall ${FILESDIR}/dhcpcd.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/dhcpcd@.service 644 usr/lib/systemd/system fi + vsv dhcpcd + vsv dhcpcd-eth0 } diff --git a/srcpkgs/distcc/files/distccd/supervise b/srcpkgs/distcc/files/distccd/supervise deleted file mode 120000 index 343b7d2df6e..00000000000 --- a/srcpkgs/distcc/files/distccd/supervise +++ /dev/null @@ -1 +0,0 @@ -/run/runit/supervise.distccd \ No newline at end of file diff --git a/srcpkgs/docker/files/docker/log/run b/srcpkgs/docker/files/docker/log/run new file mode 100755 index 00000000000..4c6ff2c7769 --- /dev/null +++ b/srcpkgs/docker/files/docker/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec logger -t docker diff --git a/srcpkgs/docker/files/docker/run b/srcpkgs/docker/files/docker/run new file mode 100755 index 00000000000..71105cadea0 --- /dev/null +++ b/srcpkgs/docker/files/docker/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec chpst -o 1048576 -p 1048576 docker -d 2>/dev/null diff --git a/srcpkgs/docker/template b/srcpkgs/docker/template index 82c4a421db1..0ba8667e7e1 100644 --- a/srcpkgs/docker/template +++ b/srcpkgs/docker/template @@ -1,7 +1,7 @@ # Template file for 'docker' pkgname=docker version=1.2.0 -revision=1 +revision=2 hostmakedepends="git go>=1.2" makedepends="libbtrfs-devel sqlite-devel device-mapper-devel" short_desc="Easily create lightweight, portable, self-sufficient containers from any application" @@ -13,6 +13,7 @@ system_groups="docker" # These are required at run-time. depends="iptables xz git" build_options="systemd" +replaces="runit-void<20141013_2" nostrip=yes nocross=yes @@ -33,4 +34,5 @@ do_install() { if [ "$build_option_systemd" ]; then vinstall contrib/init/systemd/docker.service 644 usr/lib/systemd/system fi + vsv docker } diff --git a/srcpkgs/dovecot/files/dovecot/run b/srcpkgs/dovecot/files/dovecot/run new file mode 100755 index 00000000000..c3485096af9 --- /dev/null +++ b/srcpkgs/dovecot/files/dovecot/run @@ -0,0 +1,3 @@ +#!/bin/sh +install -d -m 0755 -o root -g root /var/run/dovecot +exec dovecot -F diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index f7e7be94c32..8b67dbf7521 100644 --- a/srcpkgs/dovecot/template +++ b/srcpkgs/dovecot/template @@ -1,14 +1,14 @@ # Template file for 'dovecot' pkgname=dovecot version=2.2.13 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin --disable-static --with-nss --with-pam --with-mysql --with-pgsql --with-sqlite --with-ssl=openssl --with-ssldir=/etc/dovecot/ssl --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma --with-libcap --with-solr --with-docs - --with-systemdsystemunitdir=/usr/lib/systemd/system" + $(vopt_if systemd --with-systemdsystemunitdir=/usr/lib/systemd/system)" short_desc="IMAP and POP3 server written with security primarily in mind" maintainer="Juan RP " license="LGPL-2.1" @@ -46,7 +46,8 @@ fi # For SSL support. depends="virtual?openssl" -systemd_services="dovecot.service true" +replaces="runit-void<20141013_2" +build_options="systemd" system_accounts="dovecot dovenull" dovecot_homedir="/var/chroot" dovenull_homedir="/var/chroot" @@ -93,6 +94,8 @@ post_install() { # Remove development stuff. rm -rf ${DESTDIR}/usr/include rm -rf ${DESTDIR}/usr/share/aclocal + + vsv dovecot } dovecot-plugin-ldap_package() { @@ -105,7 +108,6 @@ dovecot-plugin-ldap_package() { vmove etc/dovecot/conf.d/auth-ldap.conf.ext } } - dovecot-plugin-lucene_package() { depends="dovecot>=${version}" short_desc+=" - Full Text Search plugin (Lucene)" @@ -114,7 +116,6 @@ dovecot-plugin-lucene_package() { vmove usr/lib/dovecot/modules/lib21_fts_lucene_plugin.so } } - dovecot-plugin-mysql_package() { depends="dovecot>=${version}" short_desc+=" - MySQL plugin" @@ -124,7 +125,6 @@ dovecot-plugin-mysql_package() { vmove usr/lib/dovecot/modules/libdriver_mysql.so } } - dovecot-plugin-pgsql_package() { depends="dovecot>=${version}" short_desc+=" - PostgreSQL plugin" @@ -134,7 +134,6 @@ dovecot-plugin-pgsql_package() { vmove usr/lib/dovecot/modules/libdriver_pgsql.so } } - dovecot-plugin-sqlite_package() { depends="dovecot>=${version}" short_desc+=" - SQLite plugin" diff --git a/srcpkgs/dropbear/files/dropbear/run b/srcpkgs/dropbear/files/dropbear/run new file mode 100755 index 00000000000..41777b924e9 --- /dev/null +++ b/srcpkgs/dropbear/files/dropbear/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec dropbear -F -R diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template index a2bf831efef..22e0b841b4e 100644 --- a/srcpkgs/dropbear/template +++ b/srcpkgs/dropbear/template @@ -1,24 +1,24 @@ # Template file for 'dropbear' pkgname=dropbear version=2014.65 -revision=1 +revision=2 +build_options="systemd" +replaces="runit-void<20141013_2" build_style="gnu-configure" configure_args="--sbindir=/usr/bin --enable-zlib" makedepends="zlib-devel" make_dirs="/etc/dropbear 0755 root root" -short_desc="Small SSH server and client." +short_desc="Small SSH server and client" maintainer="Ypnose " license="MIT" homepage="https://matt.ucc.asn.au/dropbear/dropbear.html" distfiles="https://matt.ucc.asn.au/${pkgname}/releases/${pkgname}-${version}.tar.bz2" checksum=e20057aa7db0f9ea4efdcbfc6fc6b73a648b47b6ab6a01659472142b06f5f56c -# Package build options -build_options="systemd" - post_install() { if [ "$build_option_systemd" ]; then vinstall ${FILESDIR}/dropbear.service 644 usr/lib/systemd/system/ fi + vsv dropbear vlicense LICENSE } diff --git a/srcpkgs/gdm/files/gdm/run b/srcpkgs/gdm/files/gdm/run new file mode 100755 index 00000000000..7c9aaaa1b9d --- /dev/null +++ b/srcpkgs/gdm/files/gdm/run @@ -0,0 +1,4 @@ +#!/bin/sh +sv check dbus >/dev/null || exit 1 +[ ! -d /run/gdm ] && mkdir -m0711 -p /run/gdm && chown root:gdm /run/gdm +exec gdm diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index ab444cee7d4..5133c97e546 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -1,18 +1,16 @@ # Template file for 'gdm' pkgname=gdm version=3.12.2 -revision=5 +revision=6 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static --with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers --with-screenshot-dir=/var/lib/gdm/greeter - --with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid - --with-systemdsystemunitdir=/usr/lib/systemd/system" -hostmakedepends="pkg-config itstool intltool which gnome-doc-utils" -makedepends=" + --with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid" +hostmakedepends="pkg-config itstool intltool gnome-doc-utils" +makedepends="glib-devel iso-codes pam-devel nss-devel accountsservice-devel gtk+3-devel>=3.10 upower-devel - libSM-devel libcanberra-devel xrdb dconf>=0.20 hicolor-icon-theme - xorg-server gnome-session>=3.12 gnome-settings-daemon>=3.12" + libSM-devel libcanberra-devel dconf" conf_files=" /etc/gdm/custom.conf /etc/pam.d/gdm @@ -21,12 +19,12 @@ conf_files=" /etc/pam.d/gdm-password /etc/pam.d/gdm-smartcard /etc/pam.d/gdm-welcome" +replaces="runit-void<20141013_2" # Create the 'gdm' system user/group. system_accounts="gdm" gdm_homedir="/var/lib/gdm" -systemd_services="gdm.service off" -depends="xrdb xorg-server hicolor-icon-theme - dconf>=0.20 gnome-session>=3.12 gnome-settings-daemon>=3.12" +depends="iso-codes xrdb xorg-server hicolor-icon-theme + dconf>=0.20 gnome-session>=3.12 gnome-settings-daemon>=3.12" short_desc="GNOME Display Manager" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -50,6 +48,7 @@ fi if [ "$build_option_systemd" ]; then configure_args+=" --with-systemd --enable-systemd-journal --with-initial-vt=1" + configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system" makedepends+=" systemd-devel" else configure_args+=" --without-systemd --disable-systemd-journal --with-initial-vt=7" @@ -61,8 +60,10 @@ post_install() { for f in ${FILESDIR}/*.pam; do vinstall ${f} 644 etc/pam.d ${f%.pam} done - vinstall ${FILESDIR}/gdm.tmpfiles.d 644 usr/lib/tmpfiles.d gdm.conf - + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/gdm.tmpfiles.d 644 usr/lib/tmpfiles.d gdm.conf + fi + vsv gdm chmod 1770 ${DESTDIR}/var/log/gdm } @@ -72,7 +73,6 @@ libgdm_package() { vmove "usr/lib/*.so.*" } } - gdm-devel_package() { depends="libgdm>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/irqbalance/files/irqbalance/run b/srcpkgs/irqbalance/files/irqbalance/run new file mode 100755 index 00000000000..b34ea7c292c --- /dev/null +++ b/srcpkgs/irqbalance/files/irqbalance/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec irqbalance -f diff --git a/srcpkgs/irqbalance/template b/srcpkgs/irqbalance/template index 574e9ebdb7a..bdb8c2572e6 100644 --- a/srcpkgs/irqbalance/template +++ b/srcpkgs/irqbalance/template @@ -1,11 +1,12 @@ # Template file for 'irqbalance' pkgname=irqbalance version=1.0.7 -revision=2 +revision=3 +build_options="systemd" +replaces="runit-void<20141013_2" build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libglib-devel libcap-ng-devel libnuma-devel" -systemd_services="irqbalance.service on" short_desc="Handholding your interrupts for power and performance" maintainer="Juan RP " license="GPL-2" @@ -13,11 +14,12 @@ homepage="https://code.google.com/p/irqbalance/" distfiles="https://github.com/Irqbalance/irqbalance/archive/v${version}.tar.gz" checksum=8c3916780d254b74fb1c7ec22876d63ac01f1b32776d9204a604b73c8f591d2a - pre_configure() { autoreconf -fi } - post_install() { - vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system + vsv ${pkgname} + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system + fi } diff --git a/srcpkgs/kde-workspace/files/kdm/run b/srcpkgs/kde-workspace/files/kdm/run new file mode 100755 index 00000000000..bc7f3db9792 --- /dev/null +++ b/srcpkgs/kde-workspace/files/kdm/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec kdm -nodaemon diff --git a/srcpkgs/kde-workspace/template b/srcpkgs/kde-workspace/template index e84fd74b1c2..8b88d99bcc5 100644 --- a/srcpkgs/kde-workspace/template +++ b/srcpkgs/kde-workspace/template @@ -3,7 +3,7 @@ _kdeversion=4.13.3 pkgname=kde-workspace version=4.11.11 -revision=1 +revision=2 short_desc="Provides the interface and basic tools for the KDE workspace" maintainer="Juan RP " license="GPL, LGPL, FDL" @@ -33,6 +33,7 @@ conf_files=" /etc/pam.d/kde-np.pam /etc/pam.d/kde.pam /etc/pam.d/kscreensaver.pam" +replaces="runit-void<20141013_2" system_accounts="kdm" kdm_homedir="/var/lib/kdm" make_dirs=" @@ -59,8 +60,10 @@ post_install() { for f in kde kde-np kscreensaver; do install -m644 ${FILESDIR}/${f}.pam ${DESTDIR}/etc/pam.d/${f} done - vinstall ${FILESDIR}/kdm.service 644 usr/lib/systemd/system - + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/kdm.service 644 usr/lib/systemd/system + fi + vsv kdm vmkdir usr/share/xsessions ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \ ${DESTDIR}/usr/share/xsessions @@ -78,7 +81,6 @@ kde-workspace-devel_package() { vmove usr/share/apps/cmake } } - kde-python_package() { short_desc+=" - Python 2 bindings" pycompile_module="PyKDE4" diff --git a/srcpkgs/lightdm/files/lightdm/run b/srcpkgs/lightdm/files/lightdm/run new file mode 100755 index 00000000000..67da73372f1 --- /dev/null +++ b/srcpkgs/lightdm/files/lightdm/run @@ -0,0 +1,6 @@ +#!/bin/sh +sv check dbus >/dev/null || exit 1 +[ ! -d /run/lightdm ] && mkdir -p /run/lightdm +chmod 0711 /run/lightdm +chown lightdm:lightdm /run/lightdm +exec lightdm diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index d95fa627c97..416a4c8b581 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -1,7 +1,7 @@ # Template file for 'lightdm' pkgname=lightdm version=1.10.1 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-greeter-session=lightdm-gtk-greeter --with-greeter-user=lightdm --disable-static --disable-tests" @@ -24,9 +24,9 @@ conf_files=" /etc/pam.d/lightdm /etc/pam.d/lightdm-greeter /etc/pam.d/lightdm-autologin" +replaces="runit-void<20141013_2" system_accounts="lightdm" lightdm_homedir="/var/lib/lightdm" -systemd_services="lightdm.service off" make_dirs=" /var/lib/lightdm 0755 lightdm lightdm /var/lib/lightdm-data 0755 lightdm lightdm" @@ -37,8 +37,11 @@ build_options_default="upower" post_install() { # Remove provided init file and use our own. rm -rf ${DESTDIR}/etc/init - vinstall ${FILESDIR}/lightdm.service 644 usr/lib/systemd/system - vinstall ${FILESDIR}/lightdm.tmpfiles 644 usr/lib/tmpfiles.d lightdm.conf + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/lightdm.service 644 usr/lib/systemd/system + vinstall ${FILESDIR}/lightdm.tmpfiles 644 usr/lib/tmpfiles.d lightdm.conf + fi + vsv lightdm vinstall ${FILESDIR}/lightdm.rules 644 usr/share/polkit-1/rules.d vinstall ${FILESDIR}/xsession 755 etc/lightdm Xsession # make pam_systemd optional @@ -55,14 +58,12 @@ liblightdm-gobject_package() { vmove usr/lib/girepository-1.0 } } - liblightdm-qt_package() { short_desc+=" - QT support library" pkg_install() { vmove "usr/lib/liblightdm-qt*.so.*" } } - lightdm-devel_package() { depends="libglib-devel liblightdm-gobject>=${version}_${revision} liblightdm-qt>=${version}_${revision}" diff --git a/srcpkgs/lighttpd/files/lighttpd/run b/srcpkgs/lighttpd/files/lighttpd/run new file mode 100755 index 00000000000..b1d0bb000f7 --- /dev/null +++ b/srcpkgs/lighttpd/files/lighttpd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template index 4b00de585ac..dec166b8f74 100644 --- a/srcpkgs/lighttpd/template +++ b/srcpkgs/lighttpd/template @@ -1,16 +1,14 @@ # Template file for 'lighttpd' pkgname=lighttpd version=1.4.35 -revision=4 +revision=5 makedepends="libmysqlclient-devel lua-devel libxml2-devel sqlite-devel gdbm-devel pcre-devel libressl-devel fcgi-devel" -hostmakedepends="automake pkg-config pcre-devel libtool which" +hostmakedepends="automake pkg-config pcre-devel libtool" conf_files="/etc/lighttpd/lighttpd.conf" system_accounts="lighttpd" lighttpd_homedir="/var/tmp/lighttpd" +replaces="runit-void<20141013_2" build_options="systemd" -if [ "$build_option_systemd" ]; then - systemd_services="lighttpd.service on" -fi make_dirs=" /srv/www 0755 root root /var/log/lighttpd 0750 lighttpd lighttpd" @@ -46,6 +44,7 @@ pre_configure() { autoreconf -fi } post_install() { + vsv lighttpd vinstall ${FILESDIR}/lighttpd.conf 644 etc/lighttpd # Install systemd services if [ "$build_option_systemd" ]; then diff --git a/srcpkgs/linux-tools/files/usbipd/run b/srcpkgs/linux-tools/files/usbipd/run new file mode 100755 index 00000000000..1be237e9d63 --- /dev/null +++ b/srcpkgs/linux-tools/files/usbipd/run @@ -0,0 +1,3 @@ +#!/bin/sh +modprobe -q usbip || exit 1 +exec usbipd diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index a969bb2a9b8..11f432f46d3 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -1,7 +1,7 @@ # Template file for 'linux-tools' pkgname=linux-tools version=3.16 -revision=2 +revision=3 wrksrc="linux-${version}" short_desc="Linux kernel tools meta-pkg" hostmakedepends="flex perl>=5.20 asciidoc xmlto python automake libtool" @@ -24,6 +24,7 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; the fi nocross=yes +build_options="systemd" do_build() { cd ${wrksrc}/tools/perf @@ -80,7 +81,6 @@ do_install() { vmkdir usr/lib/modules-load.d printf 'usbip-core\nusbip-host\n' > \ ${DESTDIR}/usr/lib/modules-load.d/usbip.conf - vinstall ${FILESDIR}/usbipd.service 644 usr/lib/systemd/system if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then # x86_energy_perf_policy @@ -158,14 +158,16 @@ x86_energy_perf_policy_package() { vmove usr/share/man/man8/x86_energy_perf_policy.8 } } - usbip_package() { short_desc="An USB device sharing system over IP network" - systemd_services="usbipd.service" + replaces="runit-void<20141013_2" pkg_install() { vmove "usr/bin/usbip*" vmove "usr/share/man/man8/usbip*" vmove usr/lib/modules-load.d/usbip.conf - vmove usr/lib/systemd/system/usbipd.service + vsv usbipd + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/usbipd.service 644 usr/lib/systemd/system + fi } } diff --git a/srcpkgs/lxdm/files/lxdm/run b/srcpkgs/lxdm/files/lxdm/run new file mode 100755 index 00000000000..f25827cf42a --- /dev/null +++ b/srcpkgs/lxdm/files/lxdm/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec lxdm diff --git a/srcpkgs/lxdm/template b/srcpkgs/lxdm/template index 8a565e31483..72de37a05df 100644 --- a/srcpkgs/lxdm/template +++ b/srcpkgs/lxdm/template @@ -1,7 +1,7 @@ # Template file for 'lxdm' pkgname=lxdm version=0.5.0 -revision=2 +revision=3 build_style=gnu-configure build_options="consolekit" build_options_default="consolekit" @@ -18,6 +18,7 @@ conf_files=" /etc/lxdm/Xsession /etc/lxdm/lxdm.conf /etc/pam.d/lxdm" +replaces="runit-void<20141013_2" system_groups="lxdm" short_desc="GUI login manager for LXDE" maintainer="Juan RP " @@ -27,6 +28,7 @@ distfiles="${SOURCEFORGE_SITE}/lxdm/lxdm-${version}.tar.xz" checksum=6e876fe8cc52341f3f55c54517da1c6dcf794aa11caffbf5a929ded442a949d4 post_install() { + vsv lxdm # Use our own pam file. rm -f ${DESTDIR}/etc/pam.d/lxdm vinstall ${FILESDIR}/lxdm.pam 644 etc/pam.d lxdm diff --git a/srcpkgs/mdadm/files/mdadm/run b/srcpkgs/mdadm/files/mdadm/run new file mode 100755 index 00000000000..b9684b26a83 --- /dev/null +++ b/srcpkgs/mdadm/files/mdadm/run @@ -0,0 +1,3 @@ +#!/bin/sh +# --syslog makes it run in every case, yet forwards to mail address if given. +exec mdadm --monitor --scan --syslog diff --git a/srcpkgs/mdadm/template b/srcpkgs/mdadm/template index cd6a09c82a1..24dc798d583 100644 --- a/srcpkgs/mdadm/template +++ b/srcpkgs/mdadm/template @@ -1,10 +1,11 @@ # Template file for 'mdadm' pkgname=mdadm version=3.3.2 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="libudev-devel" +replaces="runit-void<20141013_2" short_desc="A tool for managing/monitoring Linux md device arrays" maintainer="Christian Neukirchen " license="GPL-2" @@ -16,4 +17,5 @@ do_install() { make CC=$CC BINDIR=/usr/sbin STRIP= PREFIX=/usr \ SYSTEMD_DIR=/usr/lib/systemd/system DESTDIR=${DESTDIR} install install-systemd vsconf mdadm.conf-example mdadm.conf + vsv mdadm } diff --git a/srcpkgs/mpd/files/mpd/run b/srcpkgs/mpd/files/mpd/run new file mode 100755 index 00000000000..bde3c869b60 --- /dev/null +++ b/srcpkgs/mpd/files/mpd/run @@ -0,0 +1,3 @@ +#!/bin/sh +install -d -m 0755 -o mpd -g mpd /run/mpd +exec mpd --no-daemon diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index 0431f97b0b8..21b2310f234 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd version=0.19 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-opus --enable-mikmod --enable-soundcloud --enable-pipe-output --disable-twolame-encoder @@ -21,6 +21,7 @@ conf_files="/etc/mpd.conf" system_accounts="mpd" mpd_homedir="/var/lib/mpd" make_dirs="/var/lib/mpd/playlists 0755 mpd mpd" +replaces="runit-void<20141013_2" short_desc="Flexible, powerful, server-side application for playing music" maintainer="Juan RP " license="GPL-2" @@ -43,7 +44,6 @@ fi pre_configure() { sed -i '/^doc_DATA =/s,doc/mpdconf.example,,' Makefile.in } - post_install() { vconf doc/mpdconf.example mpd.conf vsconf doc/mpdconf.example @@ -55,6 +55,8 @@ post_install() { -e '/^#user/c user "mpd"' \ -i ${DESTDIR}/etc/mpd.conf + vsv mpd + if [ "$build_option_systemd" ]; then vinstall ${FILESDIR}/tmpfiles.d 644 usr/lib/tmpfiles.d mpd.conf install -Dm644 ${DESTDIR}/usr/lib/systemd/{system,user}/mpd.service diff --git a/srcpkgs/mysql/files/mysqld/log/run b/srcpkgs/mysql/files/mysqld/log/run new file mode 100755 index 00000000000..b36c4dafa40 --- /dev/null +++ b/srcpkgs/mysql/files/mysqld/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec logger -p daemon.notice diff --git a/srcpkgs/mysql/files/mysqld/run b/srcpkgs/mysql/files/mysqld/run new file mode 100755 index 00000000000..bc16a07883e --- /dev/null +++ b/srcpkgs/mysql/files/mysqld/run @@ -0,0 +1,4 @@ +#!/bin/sh +[ ! -d /run/mysqld ] && mkdir -p /run/mysqld +chown mysql:mysql /run/mysqld +exec chpst -u mysql:mysql mysqld --user=mysql 2>&1 diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template index ea7fe5a223d..9884739bae8 100644 --- a/srcpkgs/mysql/template +++ b/srcpkgs/mysql/template @@ -1,7 +1,7 @@ # Template file for 'mysql' pkgname=mysql version=5.6.20 -revision=1 +revision=2 build_style=cmake configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8 @@ -20,11 +20,11 @@ configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql lib32disabled=yes hostmakedepends="perl cmake bison ncurses-devel" makedepends="zlib-devel ncurses-devel libressl-devel readline-devel" -depends="shadow mysql-client" +depends="mysql-client" conf_files="/etc/mysql/my.cnf" -systemd_services="mysqld.service on" system_accounts="mysql" -mysqld_homedir="/var/lib/mysql" +mysql_homedir="/var/lib/mysql" +replaces="runit-void<20141013_2" short_desc="The world's most popular open source database" maintainer="Juan RP " homepage="https://www.mysql.com/products/community/" @@ -49,7 +49,6 @@ pre_configure() { rm CMakeCache.txt fi } - pre_build() { if [ "$CROSS_BUILD" ]; then cp bin.host/comp_err ${wrksrc}/extra @@ -59,7 +58,6 @@ pre_build() { export PATH=${PATH}:${wrksrc}/extra:${wrksrc}/scripts:${wrksrc}/sql:${wrksrc}/storage/perfschema fi } - post_install() { # Remove unneeded stuff. rm -rf ${DESTDIR}/usr/{sql-bench,mysql-test,data} @@ -69,9 +67,13 @@ post_install() { vinstall ${FILESDIR}/my.cnf 640 etc/mysql # systemd service. - vinstall ${FILESDIR}/mysqld.service 644 usr/lib/systemd/system - vinstall ${FILESDIR}/mysqld-post 755 usr/bin - vinstall ${FILESDIR}/mysqld.tmpfilesd 644 usr/lib/tmpfiles.d mysqld.conf + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/mysqld.service 644 usr/lib/systemd/system + vinstall ${FILESDIR}/mysqld-post 755 usr/bin + vinstall ${FILESDIR}/mysqld.tmpfilesd 644 usr/lib/tmpfiles.d mysqld.conf + fi + # runit service + vsv mysqld } libmysqlclient_package() { @@ -80,7 +82,6 @@ libmysqlclient_package() { vmove "usr/lib/libmysqlclient*.so.*" } } - libmysqlclient-devel_package() { depends="libmysqlclient>=${version}_${revision}" short_desc+=" - development files" @@ -92,7 +93,6 @@ libmysqlclient-devel_package() { vmove "usr/lib/*.so" } } - mysql-client_package() { depends="perl" short_desc+=" - database client binaries" diff --git a/srcpkgs/network-ups-tools/files/upsd/run b/srcpkgs/network-ups-tools/files/upsd/run new file mode 100755 index 00000000000..0d0dce04fc9 --- /dev/null +++ b/srcpkgs/network-ups-tools/files/upsd/run @@ -0,0 +1,4 @@ +#!/bin/sh +# Network UPS Tools - information server +# upsmon will run in the foreground and prints information on stdout +exec upsd -D diff --git a/srcpkgs/network-ups-tools/files/upsdrvctl/run b/srcpkgs/network-ups-tools/files/upsdrvctl/run new file mode 100755 index 00000000000..e7c42e0595d --- /dev/null +++ b/srcpkgs/network-ups-tools/files/upsdrvctl/run @@ -0,0 +1,3 @@ +#!/bin/sh +# Network UPS Tools - driver controller +exec upsdrvctl -D start diff --git a/srcpkgs/network-ups-tools/files/upsmon/run b/srcpkgs/network-ups-tools/files/upsmon/run new file mode 100755 index 00000000000..714030cae54 --- /dev/null +++ b/srcpkgs/network-ups-tools/files/upsmon/run @@ -0,0 +1,4 @@ +#!/bin/sh +# Network UPS Tools - monitor and shutdown controller +# upsmon will run in the foreground and prints information on stdout +exec upsmon -D diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template index 81a7ac8b85f..1d996ab41fb 100644 --- a/srcpkgs/network-ups-tools/template +++ b/srcpkgs/network-ups-tools/template @@ -1,7 +1,7 @@ # Template file for 'network-ups-tools' pkgname=network-ups-tools version=2.7.2 -revision=3 +revision=4 build_style=gnu-configure configure_args=" --sbindir=/usr/bin --sysconfdir=/etc/ups --without-doc --disable-static @@ -11,6 +11,7 @@ configure_args=" hostmakedepends="pkg-config" makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel" system_accounts="nut" +replaces="runit-void<20141013_2" conf_files=" /etc/ups/ups.conf /etc/ups/upsd.users @@ -44,6 +45,11 @@ post_install() { mv ${DESTDIR}/etc/ups/${f}.conf{.sample,} done mv ${DESTDIR}/etc/ups/upsd.users{.sample,} + + # runit services + vsv upsd + vsv upsmon + vsv upsdrvctl } libnetwork-ups-tools_package() { @@ -52,7 +58,6 @@ libnetwork-ups-tools_package() { vmove "usr/lib/*.so.*" } } - network-ups-tools-devel_package() { short_desc+=" - development files" depends="lib${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/nfs-utils/files/nfs-server/finish b/srcpkgs/nfs-utils/files/nfs-server/finish new file mode 100755 index 00000000000..696e7786247 --- /dev/null +++ b/srcpkgs/nfs-utils/files/nfs-server/finish @@ -0,0 +1,6 @@ +#!/bin/sh + +umount -l /proc/fs/nfsd +umount -l /var/lib/nfs/rpc_pipefs +/usr/sbin/rpc.nfsd -- 0 +/usr/sbin/exportfs -a -u diff --git a/srcpkgs/nfs-utils/files/nfs-server/run b/srcpkgs/nfs-utils/files/nfs-server/run new file mode 100755 index 00000000000..ae438d77e4b --- /dev/null +++ b/srcpkgs/nfs-utils/files/nfs-server/run @@ -0,0 +1,28 @@ +#!/bin/sh + +# Make sure the statd service is running. +sv check statd >/dev/null || exit 1 + +# Get the nfs service parameters from the LFS standard file +# this sets some envars. +if [ -e /etc/conf.d/nfs-server.conf ]; then + . /etc/conf.d/nfs-server.conf +fi + +modprobe sunrpc || exit 1 +modprobe nfs || exit 1 +modprobe nfsd || exit 1 +if ! mountpoint -q /var/lib/nfs/rpc_pipefs; then + mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs -o defaults || exit 1 +fi + +# Uncomment this and add the two daemons if you need kerberos support. +# sv check idmapd gssd >/dev/null || exit 1 + +if ! mountpoint -q /proc/fs/nfsd; then + mount -t nfsd nfsd /proc/fs/nfsd || exit 1 +fi +exportfs -ra > /dev/null || exit 1 +rpc.nfsd -- $PROCESSES || exit 1 + +exec rpc.mountd --foreground diff --git a/srcpkgs/nfs-utils/files/statd/run b/srcpkgs/nfs-utils/files/statd/run new file mode 100755 index 00000000000..f0283acf6f8 --- /dev/null +++ b/srcpkgs/nfs-utils/files/statd/run @@ -0,0 +1,6 @@ +#!/bin/sh + +# Make sure the portmap service is running. +sv check rpcbind >/dev/null || exit 1 + +exec rpc.statd -F -d diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template index 74e048fcdcc..37e804b340c 100644 --- a/srcpkgs/nfs-utils/template +++ b/srcpkgs/nfs-utils/template @@ -1,7 +1,7 @@ # Template file for 'nfs-utils' pkgname=nfs-utils version=1.3.1 -revision=1 +revision=2 short_desc="Network File System client utilities" maintainer="Juan RP " license="GPL-2" @@ -16,6 +16,7 @@ makedepends="libblkid-devel libmount-devel libtirpc-devel libblkid-devel sqlite-devel" depends="rpcbind" conf_files="/etc/idmapd.conf" +replaces="runit-void<20141013_2" make_dirs=" /var/lib/nfs/rpc_pipefs 0755 root root /var/lib/nfs/sm 0750 root root" @@ -35,15 +36,15 @@ do_configure() { do_build() { make ${makejobs} } - do_install() { make DESTDIR=${DESTDIR} install vmkdir usr/sbin mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/sbin # conffiles - vinstall ${FILESDIR}/exports 644 etc - vinstall ${FILESDIR}/idmapd.conf 644 etc + vconf ${FILESDIR}/exports + vconf ${FILESDIR}/idmapd.conf + vsv statd # systemd glue if [ "$build_option_systemd" ]; then vmkdir usr/lib/systemd/system @@ -56,7 +57,7 @@ do_install() { nfs-utils-server_package() { short_desc="Network File System utilities - Server utilities" depends="rpcbind" - replaces="nfs-utils<1.2.6_2" + replaces="runit-void<20141013_2" conf_files="/etc/exports" make_dirs=" /var/lib/nfs/v4recovery 0755 root root @@ -80,5 +81,7 @@ nfs-utils-server_package() { done vmove usr/lib/systemd/system/proc-fs-nfsd.mount fi + # runit services + vsv nfs-server } } diff --git a/srcpkgs/nginx/files/nginx/run b/srcpkgs/nginx/files/nginx/run new file mode 100755 index 00000000000..05e9182e4f7 --- /dev/null +++ b/srcpkgs/nginx/files/nginx/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec nginx -g 'daemon off;' diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index 61e895e5778..520e45817d0 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -1,7 +1,7 @@ # Template file for 'nginx' pkgname=nginx version=1.6.2 -revision=1 +revision=2 makedepends="pcre-devel>=8.30 libressl-devel" if [ "$CROSS_BUILD" ]; then # fake configure run on host @@ -31,9 +31,7 @@ distfiles="http://nginx.org/download/nginx-$version.tar.gz" checksum=b5608c2959d3e7ad09b20fc8f9e5bd4bc87b3bc8ba5936a513c04ed8f1391a18 build_options="systemd" -if [ "$build_option_systemd" ]; then - systemd_services="nginx.service on" -fi +replaces="runit-void<20141013_2" do_configure() { local cfgdir=/etc/nginx @@ -77,7 +75,6 @@ do_configure() { do_build() { make ${makejobs} CC="${CC}" LD="${LD}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } - do_install() { make DESTDIR=$DESTDIR install @@ -90,7 +87,9 @@ do_install() { vmkdir usr/share/nginx mv $DESTDIR/etc/nginx/html/ $DESTDIR/usr/share/nginx - vinstall LICENSE 644 usr/share/licenses/nginx + vlicense LICENSE + vsv nginx + if [ "$build_option_systemd" ]; then vinstall ${FILESDIR}/nginx.service 644 usr/lib/systemd/system fi diff --git a/srcpkgs/ngircd/files/ngircd/run b/srcpkgs/ngircd/files/ngircd/run new file mode 100755 index 00000000000..253a0cdd3e7 --- /dev/null +++ b/srcpkgs/ngircd/files/ngircd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec ngircd -n diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template index b0541448b94..f3c4b143792 100644 --- a/srcpkgs/ngircd/template +++ b/srcpkgs/ngircd/template @@ -1,8 +1,10 @@ # Template build file for 'ngircd' pkgname=ngircd version=21.1 -revision=3 +revision=4 build_style=gnu-configure +build_options="systemd" +replaces="runit-void<20141013_2" configure_args="--enable-ipv6 --with-openssl --without-ident" hostmakedepends="pkg-config" makedepends="zlib-devel libressl-devel" @@ -18,5 +20,8 @@ post_configure() { echo "#define HAVE_WORKING_GETADDRINFO 1" >>src/config.h } post_install() { - vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system + vsv ngircd + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system + fi } diff --git a/srcpkgs/ntp/files/ntpd/log/run b/srcpkgs/ntp/files/ntpd/log/run new file mode 100755 index 00000000000..b36c4dafa40 --- /dev/null +++ b/srcpkgs/ntp/files/ntpd/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec logger -p daemon.notice diff --git a/srcpkgs/ntp/files/ntpd/run b/srcpkgs/ntp/files/ntpd/run new file mode 100755 index 00000000000..772b123a726 --- /dev/null +++ b/srcpkgs/ntp/files/ntpd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec ntpd -g -u ntpd:ntpd -n diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index 9a62c401db6..49a0bc4acbf 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -1,7 +1,7 @@ # Template file for 'ntp' pkgname=ntp version=4.2.7p476 -revision=2 +revision=3 wrksrc="ntp-dev-${version}" build_style=gnu-configure configure_args="--with-crypto --enable-linuxcap --enable-ipv6 @@ -20,8 +20,7 @@ conf_files="/etc/ntp.conf" system_accounts="ntpd" ntpd_homedir="/var/db/ntpd" provides="ntp-daemon-0_1" -replaces="ntp-daemon>=0" - +replaces="runit-void<20141013_2 ntp-daemon>=0" build_options="systemd" post_install() { @@ -36,6 +35,7 @@ post_install() { echo "ntpd.service" > ${DESTDIR}/usr/lib/systemd/ntp-units.d/60-ntp.list fi vconf ${FILESDIR}/ntp.conf + vsv ntpd rm -r ${DESTDIR}/usr/share/doc } diff --git a/srcpkgs/opensmtpd/files/opensmtpd/log/run b/srcpkgs/opensmtpd/files/opensmtpd/log/run new file mode 100755 index 00000000000..afb131ea1b7 --- /dev/null +++ b/srcpkgs/opensmtpd/files/opensmtpd/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec logger -p mail.notice diff --git a/srcpkgs/opensmtpd/files/opensmtpd/run b/srcpkgs/opensmtpd/files/opensmtpd/run new file mode 100755 index 00000000000..ec33a948bbe --- /dev/null +++ b/srcpkgs/opensmtpd/files/opensmtpd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec smtpd -d 2>&1 diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template index 20a93ee47aa..85269cc6a42 100644 --- a/srcpkgs/opensmtpd/template +++ b/srcpkgs/opensmtpd/template @@ -1,7 +1,7 @@ # Template file for 'opensmtpd' pkgname=opensmtpd version=5.4.2p1 -revision=5 +revision=6 build_style=gnu-configure configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin --with-maildir=/var/spool/mail --with-privsep-path=/var/db @@ -13,10 +13,11 @@ makedepends="zlib-devel libressl-devel libevent-devel db-devel" depends="ca-certificates" conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases" system_accounts="smtpd smtpq" -systemd_services="smtpd.socket on" +smtpd_homedir="/var/spool/mail" smtpq_homedir="/var/spool/mail" +build_options="systemd" provides="smtp-forwarder-0_1 smtp-server-0_1" -replaces="smtp-forwarder>=0 smtp-server>=0" +replaces="runit-void<20141013_2 smtp-forwarder>=0 smtp-server>=0" short_desc="Free implementation of the server-side SMTP protocol" maintainer="Juan RP " license="BSD, ISC, MIT" @@ -34,13 +35,16 @@ pre_configure() { sed -e 's,^\(libevent_major_version\)=.*$,\1=2,' -i configure sed -ri 's,/etc/mail,/etc/smtpd,g' smtpd/smtpd.conf } - post_install() { - vinstall LICENSE 644 usr/share/licenses/${pkgname} - vinstall ${FILESDIR}/smtpd.service 644 usr/lib/systemd/system - vinstall ${FILESDIR}/smtpd.socket 644 usr/lib/systemd/system + vsv opensmtpd + vlicense LICENSE vinstall /dev/null 644 etc/smtpd aliases vmkdir usr/sbin ln -s /usr/bin/sendmail ${DESTDIR}/usr/sbin/sendmail + + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/smtpd.service 644 usr/lib/systemd/system + vinstall ${FILESDIR}/smtpd.socket 644 usr/lib/systemd/system + fi } diff --git a/srcpkgs/openssh/files/sshd/run b/srcpkgs/openssh/files/sshd/run new file mode 100755 index 00000000000..7dcbb6205e9 --- /dev/null +++ b/srcpkgs/openssh/files/sshd/run @@ -0,0 +1,3 @@ +#!/bin/sh +ssh-keygen -A # Will generate host keys if they don't already exist +exec /usr/sbin/sshd -D diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index 78771325e49..46b5c81df31 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -3,7 +3,7 @@ _desc="The OpenSSH implementation of SSH protocol" pkgname=openssh version=6.7p1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody @@ -58,6 +58,7 @@ post_install() { openssh-server_package() { conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd" make_dirs="/var/chroot/ssh 0755 root root" + replaces="runit-void<20141013_2" depends="openssh>=$version" short_desc="${_desc} - server" pkg_install() { @@ -74,5 +75,6 @@ openssh-server_package() { install -m644 ${FILESDIR}/*.{socket,service} \ ${PKGDESTDIR}/usr/lib/systemd/system fi + vsv sshd } } diff --git a/srcpkgs/pcsclite/files/pcscd/run b/srcpkgs/pcsclite/files/pcscd/run new file mode 100755 index 00000000000..99c662d6ebf --- /dev/null +++ b/srcpkgs/pcsclite/files/pcscd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec pcscd -f diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template index 1af6c00b6b9..501e70f2dd5 100644 --- a/srcpkgs/pcsclite/template +++ b/srcpkgs/pcsclite/template @@ -1,13 +1,13 @@ # Template file for 'pcsclite' pkgname=pcsclite version=1.8.11 -revision=6 +revision=7 build_style=gnu-configure maintainer="Carlo Dormeletti " homepage="https://alioth.debian.org/projects/pcsclite" license="Modified BSD" short_desc="Middleware to access a smart card using SCard API (PC/SC)" -configure_args="--enable-libudev " +configure_args="--enable-libudev" hostmakedepends="intltool pkg-config python" makedepends="libudev-devel libusb-devel python-devel" depends="python" @@ -15,6 +15,11 @@ distfiles="https://alioth.debian.org/frs/download.php/file/3991/${pkgname}-${ver checksum="945041c94c53959ae5a767616a4ec5099fe67f549bfd344e8bd0cfe7a3c71ac6" wrksrc="pcsc-lite-${version}" conf_files="/etc/reader.conf" +replaces="runit-void<20141013_2" + +post_install() { + vsv pcscd +} pcsclite-devel_package() { short_desc+=" - development files" @@ -26,7 +31,6 @@ pcsclite-devel_package() { vmove "usr/lib/*.so" } } - libpcsclite_package() { short_desc+=" - library files" pkg_install() { diff --git a/srcpkgs/polipo/files/polipo/run b/srcpkgs/polipo/files/polipo/run new file mode 100755 index 00000000000..2380d40ebf1 --- /dev/null +++ b/srcpkgs/polipo/files/polipo/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec chpst -u nobody polipo diff --git a/srcpkgs/polipo/template b/srcpkgs/polipo/template index 4453566008f..c4dc72e11a5 100644 --- a/srcpkgs/polipo/template +++ b/srcpkgs/polipo/template @@ -1,7 +1,9 @@ # Template file for 'polipo' pkgname=polipo version=1.1.1 -revision=2 +revision=3 +build_options="systemd" +replaces="runit-void<20141013_2" short_desc="A small and fast caching web proxy" maintainer="Juan RP " license="GPL-2" @@ -9,15 +11,9 @@ homepage="http://www.pps.jussieu.fr/~jch/software/polipo/" distfiles="http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/polipo-${version}.tar.gz" checksum=a259750793ab79c491d05fcee5a917faf7d9030fb5d15e05b3704e9c9e4ee015 -build_options="systemd" -if [ "$build_option_systemd" ]; then - systemd_services="polipo.service on" -fi - do_build() { make CFLAGS="$CFLAGS" ${makejobs} } - do_install() { make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man \ INFODIR=${DESTDIR}/usr/share/info \ @@ -31,4 +27,5 @@ do_install() { # systemd service vinstall ${FILESDIR}/polipo.service 644 usr/lib/systemd/system fi + vsv polipo } diff --git a/srcpkgs/postfix/files/postfix/run b/srcpkgs/postfix/files/postfix/run new file mode 100755 index 00000000000..02fd26c8fbc --- /dev/null +++ b/srcpkgs/postfix/files/postfix/run @@ -0,0 +1,12 @@ +#!/bin/sh + +daemon_directory=/usr/libexec/postfix \ +data_directory=/var/lib/postfix \ +command_directory=/usr/bin \ +config_directory=/etc/postfix \ +queue_directory=/var/spool/postfix \ +mail_owner=postfix \ +setgid_group=postdrop \ +/usr/libexec/postfix/postfix-script check || exit 1 + +exec /usr/libexec/postfix/master -d diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template index cceb2ed2118..5fdc62a130e 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -1,7 +1,7 @@ # Template file for 'postfix' pkgname=postfix version=2.11.1 -revision=4 +revision=5 short_desc="High-performance mail transport agent" maintainer="Juan RP " license="IBM Public License 1.0, BSD-alike" @@ -29,12 +29,12 @@ conf_files=" /etc/postfix/relocated /etc/postfix/transport /etc/postfix/virtual" -systemd_services="postfix.service true" +build_options="systemd" system_accounts="postfix" postfix_homedir="/var/spool/postfix" system_groups="postdrop" provides="smtp-server-0_1" -replaces="smtp-server>=0" +replaces="smtp-server>=0 runit-void<20141013_2" make_dirs=" /var/lib/postfix 0700 postfix root /var/spool/postfix/active 0700 postfix root @@ -81,13 +81,11 @@ do_build() { fi make ${makejobs} } - pre_install() { if [ "$CROSS_BUILD" ]; then sed -e 's,bin/postconf,/usr/bin/postconf,g' -i postfix-install fi } - do_install() { sh postfix-install -non-interactive install_root=${DESTDIR} vmkdir usr/sbin @@ -99,6 +97,9 @@ do_install() { cd $DESTDIR patch -p0 -i ${FILESDIR}/aliases.patch - # systemd. - vinstall ${FILESDIR}/postfix.service 644 usr/lib/systemd/system + # systemd + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/postfix.service 644 usr/lib/systemd/system + fi + vsv postfix } diff --git a/srcpkgs/postgresql/files/postgresql/log/supervise b/srcpkgs/postgresql/files/postgresql/log/supervise deleted file mode 120000 index e83e93328a9..00000000000 --- a/srcpkgs/postgresql/files/postgresql/log/supervise +++ /dev/null @@ -1 +0,0 @@ -/run/runit/supervise.postgresql-log \ No newline at end of file diff --git a/srcpkgs/postgresql/files/postgresql/supervise b/srcpkgs/postgresql/files/postgresql/supervise deleted file mode 120000 index ab35157e85b..00000000000 --- a/srcpkgs/postgresql/files/postgresql/supervise +++ /dev/null @@ -1 +0,0 @@ -/run/runit/supervise.postgresql \ No newline at end of file diff --git a/srcpkgs/radvd/files/radvd/run b/srcpkgs/radvd/files/radvd/run new file mode 100755 index 00000000000..6ab3d099cfc --- /dev/null +++ b/srcpkgs/radvd/files/radvd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec radvd --nodaemon --logmethod=syslog diff --git a/srcpkgs/radvd/template b/srcpkgs/radvd/template index cf55b699963..d690278d26a 100644 --- a/srcpkgs/radvd/template +++ b/srcpkgs/radvd/template @@ -1,11 +1,12 @@ # Template file for 'radvd' pkgname=radvd version=2.8 -revision=1 +revision=2 build_style=gnu-configure -hostmakedepends="pkg-config bison flex" +hostmakedepends="pkg-config flex" makedepends="check-devel libdaemon-devel" conf_files="/etc/radvd.conf" +replaces="runit-void<20141013_2" short_desc="IPv6 Router Advertisement Daemon" maintainer="Christian Neukirchen " license="custom" @@ -14,6 +15,7 @@ distfiles="http://www.litech.org/radvd/dist/${pkgname}-${version}.tar.xz" checksum=0a1041b2044dafa45882b9fc30badadb7abed76c1a20f6332fecaa53c8440df9 post_install() { - vinstall radvd.conf.example 644 etc radvd.conf + vsv radvd + vconf radvd.conf.example radvd.conf vlicense COPYRIGHT LICENSE } diff --git a/srcpkgs/redis/files/redis/supervise b/srcpkgs/redis/files/redis/supervise deleted file mode 120000 index 18a1e5ecd37..00000000000 --- a/srcpkgs/redis/files/redis/supervise +++ /dev/null @@ -1 +0,0 @@ -/run/runit/supervise.redis \ No newline at end of file diff --git a/srcpkgs/rpcbind/files/rpcbind/run b/srcpkgs/rpcbind/files/rpcbind/run new file mode 100755 index 00000000000..65fab4dec96 --- /dev/null +++ b/srcpkgs/rpcbind/files/rpcbind/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec rpcbind -f diff --git a/srcpkgs/rpcbind/template b/srcpkgs/rpcbind/template index 492e5010c2e..544f1f45408 100644 --- a/srcpkgs/rpcbind/template +++ b/srcpkgs/rpcbind/template @@ -1,12 +1,11 @@ # Template file for 'rpcbind' pkgname=rpcbind version=0.2.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-warmstarts --with-statedir=/run --with-rpcuser=rpc" hostmakedepends="pkg-config" makedepends="libtirpc-devel" -system_accounts="rpc" short_desc="Converts RPC program numbers into universal addresses" maintainer="Juan RP " homepage="http://rpcbind.sourceforge.net" @@ -15,11 +14,11 @@ distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" checksum=da169ff877a5a07581fad50a9a808ac6e96f0c277a3df49a7ef005778428496e build_options="systemd" -if [ "$build_option_systemd" ]; then - systemd_services="${pkgname}.service on" -fi +system_accounts="rpc" +replaces="runit-void<20141013_2" post_install() { + vsv rpcbind vinstall man/rpcbind.8 644 usr/share/man/man8 vinstall man/rpcinfo.8 644 usr/share/man/man8 if [ "$build_option_systemd" ]; then diff --git a/srcpkgs/rsyslog/files/rsyslogd/run b/srcpkgs/rsyslog/files/rsyslogd/run new file mode 100755 index 00000000000..30d94a83f17 --- /dev/null +++ b/srcpkgs/rsyslog/files/rsyslogd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec rsyslogd -n diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 10d07596bcf..da9da13a657 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -1,7 +1,7 @@ # Template file for 'rsyslog' pkgname=rsyslog version=8.4.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-gnutls --enable-mysql --enable-pgsql --enable-imdiag --enable-imfile --enable-mail --enable-gssapi-krb5 @@ -25,9 +25,8 @@ makedepends="json-c-devel gnutls-devel>=3.1.5 postgresql-libs-devel libmysqlclient-devel>=5.5.27 mit-krb5-devel libestr-devel>=0.1.9 libee-devel>=0.4.1 liblogging-devel>=1.0.3" conf_files="/etc/rsyslog.conf" -systemd_services="rsyslog.service on" provides="syslog-daemon-0_1" -replaces="syslog-daemon>=0" +replaces="runit-void<20141013_2 syslog-daemon>=0" make_dirs="/etc/rsyslog.d 0755 root root" if [ "$CROSS_BUILD" ]; then @@ -45,14 +44,15 @@ build_options="systemd" if [ "$build_option_systemd" ]; then makedepends+=" systemd-devel" + systemd_services="rsyslog.service on" fi post_configure() { echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >> tools/Makefile } - post_install() { - vinstall ${FILESDIR}/rsyslog.conf 644 etc + vsv rsyslogd + vconf ${FILESDIR}/rsyslog.conf } rsyslog-gssapi_package() { @@ -63,7 +63,6 @@ rsyslog-gssapi_package() { vmove "usr/lib/rsyslog/*gss*.so" } } - rsyslog-gnutls_package() { lib32disabled=yes depends="rsyslog" @@ -72,7 +71,6 @@ rsyslog-gnutls_package() { vmove "usr/lib/rsyslog/*gtls*" } } - rsyslog-mysql_package() { lib32disabled=yes depends="rsyslog" @@ -81,7 +79,6 @@ rsyslog-mysql_package() { vmove usr/lib/rsyslog/ommysql.so } } - rsyslog-postgresql_package() { lib32disabled=yes depends="rsyslog" diff --git a/srcpkgs/samba/files/nmbd/log/run b/srcpkgs/samba/files/nmbd/log/run new file mode 100755 index 00000000000..ea5ff8e2186 --- /dev/null +++ b/srcpkgs/samba/files/nmbd/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec logger -p nmbd.notice diff --git a/srcpkgs/samba/files/nmbd/run b/srcpkgs/samba/files/nmbd/run new file mode 100755 index 00000000000..dfd75fcf7d4 --- /dev/null +++ b/srcpkgs/samba/files/nmbd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec nmbd -F -S diff --git a/srcpkgs/samba/files/smbd/log/run b/srcpkgs/samba/files/smbd/log/run new file mode 100755 index 00000000000..f58842d4873 --- /dev/null +++ b/srcpkgs/samba/files/smbd/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec logger -p smbd.notice diff --git a/srcpkgs/samba/files/smbd/run b/srcpkgs/samba/files/smbd/run new file mode 100755 index 00000000000..a7b74537292 --- /dev/null +++ b/srcpkgs/samba/files/smbd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec smbd -F -S diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index 29fa3d210db..71d7895455c 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,7 +1,7 @@ # Template file for 'samba' pkgname=samba version=3.6.24 -revision=2 +revision=3 build_wrksrc=source3 build_style=gnu-configure configure_args="--with-fhs --with-pam --with-pam_smbpass --with-ldap @@ -20,6 +20,7 @@ distfiles="http://us1.samba.org/samba/ftp/stable/$pkgname-$version.tar.gz" checksum=11d0bd04b734731970259efc6692b8e749ff671a9b56d8cc5fa98c192ab234a7 lib32disabled=yes +replaces="runit-void<20141013_2" build_options="systemd" conf_files="/etc/pam.d/samba" hostmakedepends="pkg-config perl python-devel" @@ -41,7 +42,6 @@ fi pre_configure() { sed -e 's,XFS_QUOTA_,FS_QUOTA_,g' -i lib/sysquotas_xfs.c } - post_install() { cd ${wrksrc} # conf file @@ -82,6 +82,9 @@ post_install() { vinstall ${FILESDIR}/samba.tmpfiles 644 usr/lib/tmpfiles.d samba.conf fi + vsv nmbd + vsv smbd + # PAM support vinstall ${FILESDIR}/samba.pam 644 etc/pam.d samba diff --git a/srcpkgs/shorewall/files/shorewall/finish b/srcpkgs/shorewall/files/shorewall/finish new file mode 100755 index 00000000000..1f23ab2f4ea --- /dev/null +++ b/srcpkgs/shorewall/files/shorewall/finish @@ -0,0 +1,3 @@ +#!/bin/sh +set -e +exec shorewall stop diff --git a/srcpkgs/shorewall/files/shorewall/run b/srcpkgs/shorewall/files/shorewall/run new file mode 100755 index 00000000000..751bf5b76b8 --- /dev/null +++ b/srcpkgs/shorewall/files/shorewall/run @@ -0,0 +1,4 @@ +#!/bin/sh +set -e +shorewall start +exec chpst -b shorewall pause diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template index 9b2db3ce369..9a65bda7350 100644 --- a/srcpkgs/shorewall/template +++ b/srcpkgs/shorewall/template @@ -1,7 +1,7 @@ # Template file for 'shorewall' pkgname=shorewall version=4.6.3.2 -revision=1 +revision=2 _disturl="http://www.shorewall.net/pub/${pkgname}/4.6/${pkgname}-4.6.3" distfiles=" ${_disturl}/${pkgname}-${version}.tar.bz2 @@ -17,9 +17,9 @@ homepage="http://www.shorewall.net/" license="GPL" short_desc="An iptables-based firewall for Linux systems" +replaces="runit-void<20141013_2" noarch="yes" create_wrksrc="yes" -systemd_services="${pkgname}.service off" make_dirs="/var/lib/${pkgname} 0755 0 0" conf_files=" /etc/shorewall/accounting @@ -67,7 +67,6 @@ conf_files=" /etc/shorewall/tunnels /etc/shorewall/zones" - do_build(){ for product in ${pkgname}{-core,6,}-${version}; do cd ${wrksrc}/${product} @@ -80,6 +79,7 @@ do_install() { DESTDIR="${DESTDIR}" ./install.sh vmkdir usr/share/doc/${pkgname} cp -r Samples ${PKGDESTDIR}/usr/share/doc/${pkgname} + vsv shorewall } shorewall-core_package() { @@ -91,12 +91,10 @@ shorewall-core_package() { DESTDIR="${PKGDESTDIR}" ./install.sh } } - shorewall6_package() { noarch="yes" depends="shorewall" short_desc+=" - IPv6 support" - systemd_services="${pkgname}.service off" make_dirs="/var/lib/${pkgname} 0755 0 0" pkg_install() { cd ${wrksrc}/${pkgname}-${version} diff --git a/srcpkgs/slim/files/slim/run b/srcpkgs/slim/files/slim/run new file mode 100755 index 00000000000..765580b1763 --- /dev/null +++ b/srcpkgs/slim/files/slim/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec slim -nodaemon diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template index 27bc8ffda4b..6f275e27ca9 100644 --- a/srcpkgs/slim/template +++ b/srcpkgs/slim/template @@ -1,16 +1,18 @@ # Template file for 'slim' pkgname=slim version=1.3.6 -revision=5 +revision=6 lib32disabled=yes build_style=cmake build_options="consolekit" build_options_default="consolekit" -configure_args="-DUSE_PAM=yes -DFREETYPE_INCLUDE_DIR_freetype2=${XBPS_CROSS_BASE}/usr/include/freetype2" +configure_args="$(vopt_if consolekit -DUSE_CONSOLEKIT=1) -DUSE_PAM=yes + -DFREETYPE_INCLUDE_DIR_freetype2=${XBPS_CROSS_BASE}/usr/include/freetype2" hostmakedepends="cmake pkg-config" makedepends="libpng-devel>=1.6 freetype-devel libjpeg-turbo-devel libXrandr-devel libXmu-devel libXft-devel pam-devel $(vopt_if consolekit ConsoleKit-devel)" conf_files="/etc/slim.conf /etc/pam.d/slim" +replaces="runit-void<20141013_2" short_desc="Desktop-independent graphical login manager for X11" maintainer="Juan RP " license="GPL-2" @@ -18,13 +20,10 @@ homepage="http://slim.berlios.de/" distfiles="http://pkgs.fedoraproject.org/repo/pkgs/slim/slim-${version}.tar.gz/d40d256394f9ef34cef34d2aa9cb52e6/slim-${version}.tar.gz" checksum=21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df -if [ "$build_option_consolekit" ]; then - configure_args+=" -DUSE_CONSOLEKIT=1" -fi - pre_configure() { sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt } post_install() { + vsv slim vinstall ${FILESDIR}/slim.pam 644 etc/pam.d slim } diff --git a/srcpkgs/smartmontools/files/smartd/finish b/srcpkgs/smartmontools/files/smartd/finish new file mode 100755 index 00000000000..85e568f0600 --- /dev/null +++ b/srcpkgs/smartmontools/files/smartd/finish @@ -0,0 +1,3 @@ +#!/bin/sh +# no devices found, disable smartd +[ $1 = 17 ] && sv d $(dirname $0) diff --git a/srcpkgs/smartmontools/files/smartd/run b/srcpkgs/smartmontools/files/smartd/run new file mode 100755 index 00000000000..1dc3cc9966a --- /dev/null +++ b/srcpkgs/smartmontools/files/smartd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec smartd -n diff --git a/srcpkgs/smartmontools/template b/srcpkgs/smartmontools/template index 550a77b62ac..b21bfe9e77e 100644 --- a/srcpkgs/smartmontools/template +++ b/srcpkgs/smartmontools/template @@ -1,17 +1,21 @@ # Template file for 'smartmontools' pkgname=smartmontools version=6.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-drivedb --with-libcap-ng=yes --with-drivedbdir=/var/db/${pkgname}" makedepends="libcap-ng-devel" conf_files="/etc/smartd.conf" mutable_files="/var/db/smartmontools/drivedb.h" -systemd_services="smartd.service on" +replaces="runit-void<20141013_2" short_desc="S.M.A.R.T Monitoring Tools" maintainer="Juan RP " license="GPL-2" homepage="http://smartmontools.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=a777065d1a5965d71b3672e054b09b7696200ec73aaf45ab636f34016538fe19 + +post_install() { + vsv smartd +} diff --git a/srcpkgs/subversion/files/svnserve/run b/srcpkgs/subversion/files/svnserve/run new file mode 100755 index 00000000000..6ea98d06cb9 --- /dev/null +++ b/srcpkgs/subversion/files/svnserve/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec svnserve --foreground diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template index 3665a5c1811..d3f64d17fa7 100644 --- a/srcpkgs/subversion/template +++ b/srcpkgs/subversion/template @@ -1,7 +1,7 @@ # Template file for 'subversion' pkgname=subversion version=1.8.10 -revision=2 +revision=3 short_desc="Enterprise-class centralized version control for the masses" maintainer="Juan RP " license="Apache-2.0, BSD" @@ -13,23 +13,24 @@ hostmakedepends="pkg-config" makedepends="db-devel>=5.3 perl>=5.20 python-devel swig apr-util-devel libldap-devel serf-devel>=1.3.6 gdbm-devel expat-devel apr-devel libuuid-devel sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel - qt-devel kdelibs-devel apache-devel ca-certificates" + qt-devel kdelibs-devel apache-devel" depends="ca-certificates" +build_options="systemd" +replaces="runit-void<20141013_2" + do_configure() { ./configure ${configure_args} \ --with-apxs --disable-javahl --disable-static \ --with-kwallet --with-gnome-keyring --with-editor=vi \ --disable-mod-activation } - do_build() { make ${makejobs} LT_LDFLAGS="-L$Fdestdir/usr/lib" make ${makejobs} swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ swig-py swig-pl } - do_install() { export LD_LIBRARY_PATH=${DESTDIR}/usr/lib:$LD_LIBRARY_PATH @@ -38,8 +39,10 @@ do_install() { swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ install install-swig-py install-swig-pl - vinstall ${FILESDIR}/svnserve.service 644 usr/lib/systemd/system - vinstall ${FILESDIR}/svnserve.tmpfiles 644 usr/lib/tmpfiles.d svnserve.conf + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/svnserve.service 644 usr/lib/systemd/system + vinstall ${FILESDIR}/svnserve.tmpfiles 644 usr/lib/tmpfiles.d svnserve.conf + fi rm -rf ${DESTDIR}/usr/lib/perl5/core_perl vmkdir usr/share/subversion @@ -52,6 +55,8 @@ do_install() { for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do ln -sf subversion ${DESTDIR}/usr/share/bash-completion/completions/${i} done + + vsv svnserve } libsvn_package() { @@ -67,14 +72,12 @@ libsvn_package() { vmove "usr/lib/libsvn_client*.so.*" } } - subversion-apache_package() { short_desc+=" - apache httpd modules" pkg_install() { vmove usr/libexec } } - subversion-devel_package() { depends="libsvn>=${version}_${revision}" short_desc+=" - development files" @@ -83,7 +86,6 @@ subversion-devel_package() { vmove usr/lib/*.so } } - subversion-gnome-keyring-auth_package() { lib32disabled=yes short_desc+=" - gnome-keyring authentication support" @@ -91,7 +93,6 @@ subversion-gnome-keyring-auth_package() { vmove "usr/lib/libsvn_auth_gnome_keyring*" } } - subversion-kwallet-auth_package() { lib32disabled=yes short_desc+=" - KDE kwallet authentication support" @@ -99,7 +100,6 @@ subversion-kwallet-auth_package() { vmove "usr/lib/libsvn_auth_k*" } } - subversion-python_package() { lib32disabled=yes depends="python" @@ -110,7 +110,6 @@ subversion-python_package() { vmove "usr/lib/python*" } } - subversion-perl_package() { lib32disabled=yes depends="perl>=5.16" diff --git a/srcpkgs/thttpd/files/thttpd/run b/srcpkgs/thttpd/files/thttpd/run new file mode 100755 index 00000000000..95a629aabe2 --- /dev/null +++ b/srcpkgs/thttpd/files/thttpd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec thttpd -D diff --git a/srcpkgs/thttpd/template b/srcpkgs/thttpd/template index b0547b935f5..2de6e71b12e 100644 --- a/srcpkgs/thttpd/template +++ b/srcpkgs/thttpd/template @@ -1,7 +1,8 @@ # Template file for 'thttpd' pkgname=thttpd version=2.26 -revision=1 +revision=2 +replaces="runit-void<20141013_2" build_style=gnu-configure short_desc="Tiny/turbo/throttling HTTP server" maintainer="Juan RP " @@ -11,7 +12,7 @@ distfiles="http://www.acme.com/software/thttpd/thttpd-${version}.tar.gz" checksum=15b3f6c60f854061e333227e9ea9ff789d34a092c9365690a8c0d3ecfc85cbb7 pre_configure() { - sed -e "s,-o bin -g bin,,g" -i Makefile.in + sed "s,-o bin -g bin,,g" -i Makefile.in } pre_build() { export LD=$CC @@ -21,13 +22,14 @@ do_install() { vmkdir usr/share/man/man1 vmkdir usr/share/man/man8 - make WEBGROUP=root \ + make WEBGROUP=$(whoami) \ WEBDIR=${DESTDIR}/usr/share/thttpd \ BINDIR=${DESTDIR}/usr/bin \ MANDIR=${DESTDIR}/usr/share/man install + vsv thttpd + # Rename htpasswd to not conflict with apache. - mv ${DESTDIR}/usr/bin/htpasswd ${DESTDIR}/usr/bin/thttpd-htpasswd - mv ${DESTDIR}/usr/share/man/man1/htpasswd.1 \ - ${DESTDIR}/usr/share/man/man1/thttpd-htpasswd.1 + mv ${DESTDIR}/usr/bin/{htpasswd,thttpd-htpasswd} + mv ${DESTDIR}/usr/share/man/man1/{htpasswd,thttpd-htpasswd}.1 } diff --git a/srcpkgs/tinc/files/tincd/run b/srcpkgs/tinc/files/tincd/run new file mode 100755 index 00000000000..21f48699717 --- /dev/null +++ b/srcpkgs/tinc/files/tincd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec tincd -D diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template index 51a2c83be39..a419fbc0532 100644 --- a/srcpkgs/tinc/template +++ b/srcpkgs/tinc/template @@ -1,8 +1,10 @@ # Template file for 'tinc' pkgname=tinc version=1.0.24 -revision=2 +revision=3 build_style=gnu-configure +build_options="systemd" +replaces="runit-void<20141013_2" makedepends="zlib-devel lzo-devel libressl-devel" short_desc="VPN (Virtual Private Network) daemon" maintainer="Juan RP " @@ -12,5 +14,8 @@ distfiles="${homepage}/packages/${pkgname}-${version}.tar.gz" checksum=498e58f9f39e3922030a63cf62baf4b46a40fbda8d90b23ec0f084f4a9f9b687 post_install() { - vinstall ${FILESDIR}/tincd@.service 644 usr/lib/systemd/system + vsv tincd + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/tincd@.service 644 usr/lib/systemd/system + fi } diff --git a/srcpkgs/tlsdate/files/tlsdated/supervise b/srcpkgs/tlsdate/files/tlsdated/supervise deleted file mode 120000 index f6b9706be96..00000000000 --- a/srcpkgs/tlsdate/files/tlsdated/supervise +++ /dev/null @@ -1 +0,0 @@ -/run/runit/supervise.tlsdated \ No newline at end of file diff --git a/srcpkgs/transmission/files/transmission-daemon/run b/srcpkgs/transmission/files/transmission-daemon/run new file mode 100755 index 00000000000..07e3935f805 --- /dev/null +++ b/srcpkgs/transmission/files/transmission-daemon/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec chpst -u transmission:transmission transmission-daemon -f --log-error diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template index 3e38b9f0fce..9a28f0b6dd7 100644 --- a/srcpkgs/transmission/template +++ b/srcpkgs/transmission/template @@ -1,7 +1,7 @@ # Template file for 'transmission' pkgname=transmission version=2.84 -revision=4 +revision=5 build_style=gnu-configure configure_args="--enable-nls --enable-cli --enable-daemon --enable-utp" hostmakedepends="pkg-config intltool" @@ -17,6 +17,8 @@ checksum=a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb system_accounts="transmission" transmission_homedir="/var/lib/transmission" make_dirs="/var/lib/transmission 0755 transmission transmission" +subpackages="transmission-gtk" +replaces="runit-void<20141013_2" # Package build options build_options="systemd" @@ -28,6 +30,7 @@ fi if [ -z "$CROSS_BUILD" ]; then makedepends+=" qt-devel" + subpackages+=" transmission-qt" fi do_build() { @@ -40,7 +43,6 @@ do_build() { make CXXFLAGS="${CXXFLAGS} -std=c++11" LDFLAGS="${LDFLAGS}" ${makejobs} fi } - do_install() { # Install CLI tools, daemon and web client for dir in cli daemon utils web; do @@ -64,9 +66,9 @@ post_install() { if [ "$build_option_systemd" ]; then vinstall daemon/transmission-daemon.service 644 usr/lib/systemd/system fi + vsv transmission-daemon } -if [ -z "$CROSS_BUILD" ]; then transmission-qt_package() { depends="${sourcepkg}>=${version}_${revision} desktop-file-utils" short_desc+=" - Qt frontend" @@ -78,8 +80,6 @@ transmission-qt_package() { vinstall ${wrksrc}/qt/transmission-qt.desktop 644 usr/share/applications } } -fi - transmission-gtk_package() { depends="${sourcepkg}>=${version}_${revision} hicolor-icon-theme desktop-file-utils" short_desc+=" - GTK+ frontend" diff --git a/srcpkgs/unbound/files/unbound/run b/srcpkgs/unbound/files/unbound/run new file mode 100755 index 00000000000..b42a607438b --- /dev/null +++ b/srcpkgs/unbound/files/unbound/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec unbound -d diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template index 8988396764a..fcaf58a96ca 100644 --- a/srcpkgs/unbound/template +++ b/srcpkgs/unbound/template @@ -1,7 +1,7 @@ # Template file for 'unbound' pkgname=unbound version=1.4.22 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf --with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr @@ -9,6 +9,7 @@ configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf conf_files="/etc/unbound/unbound.conf" makedepends="libressl-devel expat-devel libevent-devel" system_accounts="unbound" +replaces="runit-void<20141013_2" short_desc="Validating, recursive, and caching DNS resolver" maintainer="Christian Neukirchen " license="BSD" @@ -18,7 +19,8 @@ checksum=1caf5081b2190ecdb23fc4d998b7999e28640c941f53baff7aee03c092a7d29f post_install() { vsconf doc/example.conf unbound.conf - vconf ${FILESDIR}/unbound.conf + vinstall ${FILESDIR}/unbound.conf 644 etc/unbound + vsv unbound } unbound-devel_package() { diff --git a/srcpkgs/util-linux/files/uuidd/run b/srcpkgs/util-linux/files/uuidd/run new file mode 100755 index 00000000000..768b34b1c3e --- /dev/null +++ b/srcpkgs/util-linux/files/uuidd/run @@ -0,0 +1,4 @@ +#!/bin/sh +[ ! -d /run/uuidd ] && mkdir -p /run/uuidd +chown uuidd:uuidd /run/uuidd +exec chpst -u uuidd:uuidd uuidd -F -P diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index 1f4d6e64db1..db0c2c721ac 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -1,7 +1,7 @@ # Template file for 'util-linux' pkgname=util-linux version=2.25.1 -revision=2 +revision=3 short_desc="Miscellaneous linux utilities" maintainer="Juan RP " homepage="http://userweb.kernel.org/~kzak/util-linux-ng" @@ -13,19 +13,19 @@ hostmakedepends="automake gettext-devel libtool pkg-config" makedepends="zlib-devel ncurses-devel pam-devel>=1.1.8_4 libcap-ng-devel" # Create uuidd system account for uuidd. system_accounts="uuidd" +uuid_homedir="/var/uuidd" conf_files=" /etc/pam.d/chfn /etc/pam.d/chsh /etc/pam.d/su /etc/pam.d/su-l /etc/pam.d/login" -replaces="eject>=0" +replaces="runit-void<20141013_2 eject>=0" provides="eject-${version}_1" pre_configure() { NOCONFIGURE=1 ./autogen.sh } - do_configure() { ./configure ${configure_args} \ --exec-prefix=/usr --libdir=/usr/lib \ @@ -55,7 +55,9 @@ do_install() { vinstall $FILESDIR/common.pam 644 etc/pam.d chsh # Provide sg(1) symlink. - ln -sfr ${DESTDIR}/usr/bin/newgrp ${DESTDIR}/usr/bin/sg + ln -sf newgrp ${DESTDIR}/usr/bin/sg + + vsv uuidd } libmount_package() { @@ -64,7 +66,6 @@ libmount_package() { vmove "usr/lib/libmount.so.*" } } - libmount-devel_package() { depends="libblkid-devel-${version}_${revision} libmount-${version}_${revision}" short_desc="mount(8) library development files" @@ -75,14 +76,12 @@ libmount-devel_package() { vmove usr/include/libmount } } - libblkid_package() { short_desc="Library to handle device identification" pkg_install() { vmove "usr/lib/libblkid.so.*" } } - libblkid-devel_package() { depends="zlib-devel libuuid-devel-${version}_${revision} libblkid-${version}_${revision}" short_desc="libblkid development files" @@ -94,14 +93,12 @@ libblkid-devel_package() { vmove usr/share/man/man3/libblkid.3 } } - libuuid_package() { short_desc="UUID library" pkg_install() { vmove "usr/lib/libuuid.so.*" } } - libuuid-devel_package() { depends="libuuid-${version}_${revision}" short_desc="UUID library development files" @@ -113,7 +110,6 @@ libuuid-devel_package() { vmove usr/share/man/man3/uuid* } } - libsmartcols-devel_package() { depends="libsmartcols>=${version}_${revision}" short_desc="Table or Tree library from util-linux - development files" @@ -124,7 +120,6 @@ libsmartcols-devel_package() { vmove usr/lib/pkgconfig/smartcols* } } - libsmartcols_package() { short_desc="Table or Tree library from util-linux" pkg_install() { diff --git a/srcpkgs/varnish/files/varnishd/run b/srcpkgs/varnish/files/varnishd/run new file mode 100755 index 00000000000..8080615090f --- /dev/null +++ b/srcpkgs/varnish/files/varnishd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nogroup -F diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template index f595cfe898c..58adf3e36b7 100644 --- a/srcpkgs/varnish/template +++ b/srcpkgs/varnish/template @@ -1,14 +1,15 @@ # Template file for 'varnish' pkgname=varnish version=3.0.5 -revision=1 +revision=2 lib32disabled=yes +replaces="runit-void<20141013_2" +build_options="systemd" build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config python" makedepends="pcre-devel readline-devel" conf_files="/etc/varnish/default.vcl" -systemd_services="varnish.service on" make_dirs="/var/varnish 750 nobody nogroup" short_desc="A fast caching HTTP reverse proxy" maintainer="Juan RP " @@ -18,10 +19,13 @@ distfiles="http://repo.varnish-cache.org/source/${pkgname}-${version}.tar.gz" checksum=302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7 post_install() { - # systemd reload helper - vinstall ${FILESDIR}/varnish-vcl-reload 755 usr/sbin # systemd service - vinstall ${FILESDIR}/varnish.service 644 usr/lib/systemd/system + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/varnish.service 644 usr/lib/systemd/system + # systemd reload helper + vinstall ${FILESDIR}/varnish-vcl-reload 755 usr/sbin + fi + vsv varnishd } libvarnishapi_package() { @@ -30,7 +34,6 @@ libvarnishapi_package() { vmove "usr/lib/*.so.*" } } - libvarnishapi-devel_package() { depends="libvarnishapi>=${version}_${revision}" short_desc+=" - API development files" diff --git a/srcpkgs/virtualbox-ose/files/vboxservice/run b/srcpkgs/virtualbox-ose/files/vboxservice/run new file mode 100755 index 00000000000..6332cc9f13a --- /dev/null +++ b/srcpkgs/virtualbox-ose/files/vboxservice/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec VBoxService -f diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index dbccad5e7df..9ba33940f03 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -2,7 +2,7 @@ pkgname=virtualbox-ose _vbox_distver=4.3.18 version=${_vbox_distver} -revision=3 +revision=4 wrksrc="VirtualBox-${version}" patch_args="-Np1" short_desc="General-purpose full virtualizer for x86 hardware" @@ -28,6 +28,7 @@ fi depends="virtualbox-ose-dkms-${version}_${revision} hicolor-icon-theme desktop-file-utils" system_groups="vboxusers" +build_options="systemd" pre_configure() { # Use our path for dri drivers. @@ -39,17 +40,14 @@ pre_configure() { sed -i 's/^check_gcc$/#check_gcc/' configure } - do_configure() { ./configure --disable-docs --disable-java --enable-vde \ --disable-python --disable-kmods --nofatal } - do_build() { source ./env.sh kmk ${makejobs} all } - do_install() { local f _osedir _guestdir @@ -135,10 +133,9 @@ virtualbox-ose-dkms_package() { usr/lib/udev/rules.d 60-virtualbox-ose-dkms.rules } } - virtualbox-ose-guest_package() { lib32disabled=yes - systemd_services="vboxservice.service on" + replaces="runit-void<20141013_2" depends="xserver-abi-video-18_1 virtualbox-ose-guest-dkms-${version}_${revision}" short_desc+=" - guest utilities" @@ -165,10 +162,12 @@ virtualbox-ose-guest_package() { install -Dm755 pam_vbox.so ${PKGDESTDIR}/usr/lib/security/pam_vbox.so vinstall ${FILESDIR}/virtualbox-guest.conf 644 usr/lib/modules-load.d - vinstall ${FILESDIR}/vboxservice.service 644 usr/lib/systemd/system + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/vboxservice.service 644 usr/lib/systemd/system + fi + vsv vboxservice } } - virtualbox-ose-guest-dkms_package() { short_desc+=" - guest addition module source for dkms" dkms_modules="virtualbox-ose-guest ${_vbox_distver}" diff --git a/srcpkgs/vnstat/files/vnstatd/run b/srcpkgs/vnstat/files/vnstatd/run new file mode 100755 index 00000000000..ea3a9ba02bd --- /dev/null +++ b/srcpkgs/vnstat/files/vnstatd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec vnstatd -n diff --git a/srcpkgs/vnstat/template b/srcpkgs/vnstat/template index e3558c197cd..c9480b876d5 100644 --- a/srcpkgs/vnstat/template +++ b/srcpkgs/vnstat/template @@ -1,7 +1,7 @@ # Template build file for "vnstat" pkgname=vnstat version=1.12 -revision=1 +revision=2 build_style=gnu-makefile short_desc="A terminal based network traffic monitor" maintainer="Jan S. " @@ -12,11 +12,14 @@ checksum=af1050d9c1b22d4b9742fe0d1818de9eb1037b8e7f9ba67b962e108d8527be69 conf_files="/etc/vnstat.conf" make_dirs="/var/lib/vnstat 0755 root root" +build_options="systemd" pre_install() { sed -e 's,install -s,install ,g' -i Makefile } - post_install() { - vinstall ${FILESDIR}/service 644 usr/lib/systemd/system vnstat.service + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/service 644 usr/lib/systemd/system vnstat.service + fi + vsv vnstatd } diff --git a/srcpkgs/wicd/files/wicd/run b/srcpkgs/wicd/files/wicd/run new file mode 100755 index 00000000000..813cd953813 --- /dev/null +++ b/srcpkgs/wicd/files/wicd/run @@ -0,0 +1,3 @@ +#!/bin/sh +sv check dbus >/dev/null || exit 1 +exec wicd --no-daemon diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template index d7b1ca195f6..5bb98770a95 100644 --- a/srcpkgs/wicd/template +++ b/srcpkgs/wicd/template @@ -1,7 +1,7 @@ # Template file for 'wicd' pkgname=wicd version=1.7.2.4 -revision=10 +revision=11 noarch=yes hostmakedepends="python python-setuptools python-Babel" depends="dbus-glib dhcpcd ethtool net-tools python-dbus python-gobject2 python-urwid @@ -19,6 +19,7 @@ distfiles="http://launchpad.net/wicd/1.7/${version}/+download/wicd-${version}.ta checksum=dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f1cf40d12fb7fe0e0c7cdc97 build_options="systemd" +replaces="runit-void<20141013_2" do_build() { if [ "${build_option_systemd}" ]; then @@ -34,7 +35,6 @@ do_build() { mkdir -p translations/ast/LC_MESSAGES msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo } - do_install() { python setup.py install --root=${DESTDIR} @@ -42,6 +42,7 @@ do_install() { vmkdir usr/lib/wicd vcopy "build/lib/wicd/*.py" usr/lib/wicd chmod 755 ${DESTDIR}/usr/lib/wicd/*.py + vsv wicd rm -rf ${DESTDIR}/lib rm -rf ${DESTDIR}/usr/share/doc @@ -51,8 +52,7 @@ do_install() { wicd-gtk_package() { noarch=yes - depends="${sourcepkg}>=${version} pygtk python-notify shared-mime-info - desktop-file-utils hicolor-icon-theme" + depends="wicd>=${version} pygtk python-notify shared-mime-info desktop-file-utils hicolor-icon-theme" short_desc+=" - GTK UI" pycompile_dirs="usr/share/wicd/gtk" pkg_install() { diff --git a/srcpkgs/xbmc-rpi/files/xbmc-standalone/supervise b/srcpkgs/xbmc-rpi/files/xbmc-standalone/supervise deleted file mode 120000 index 53054a9bd71..00000000000 --- a/srcpkgs/xbmc-rpi/files/xbmc-standalone/supervise +++ /dev/null @@ -1 +0,0 @@ -/run/runit/supervise.xbmc-standalone \ No newline at end of file diff --git a/srcpkgs/xen/files/xen/run b/srcpkgs/xen/files/xen/run new file mode 100755 index 00000000000..8e6c60b2a58 --- /dev/null +++ b/srcpkgs/xen/files/xen/run @@ -0,0 +1,5 @@ +#!/bin/sh +sv check xenstored >/dev/null || exit 1 +xenstore-write "/local/domain/0/domid" 0 || exit 1 +xenstore-write "/local/domain/0/name" "Domain-0" || exit 1 +exec chpst -b xen pause diff --git a/srcpkgs/xen/files/xenconsoled/run b/srcpkgs/xen/files/xenconsoled/run new file mode 100755 index 00000000000..c26b31bc1f4 --- /dev/null +++ b/srcpkgs/xen/files/xenconsoled/run @@ -0,0 +1,3 @@ +#!/bin/sh +sv check xenstored >/dev/null || exit 1 +exec xenconsoled -i --log=all diff --git a/srcpkgs/xen/files/xenstored/run b/srcpkgs/xen/files/xenstored/run new file mode 100755 index 00000000000..8f750a536aa --- /dev/null +++ b/srcpkgs/xen/files/xenstored/run @@ -0,0 +1,6 @@ +#!/bin/sh +[ ! -d /run/xen ] && mkdir -p /run/xen +mount -t xenfs xenfs /proc/xen || exit 1 +mount -t tmpfs xenstored /var/lib/xenstored || exit 1 +grep -q control_d /proc/xen/capabilities || exit 1 +exec xenstored --verbose --no-fork diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template index 604642f5fa4..124398b7a9f 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -2,7 +2,7 @@ pkgname=xen version=4.4.1 wrksrc=xen-${version} -revision=2 +revision=3 short_desc="The Xen hypervisor utilities" maintainer="Juan RP " homepage="http://xen.org" @@ -19,6 +19,7 @@ makedepends=" ncurses-devel liblzma-devel python-devel yajl-devel libuuid-devel libglib-devel dev86 acpica-utils pixman-devel gcc-multilib" depends="iproute2 bridge-utils xen-hypervisor" +replaces="runit-void<20141013_2" build_options="systemd" make_dirs=" @@ -107,6 +108,11 @@ do_install() { rm -f ${DESTDIR}/usr/share/doc/xen/html/man/xm.1.html rm -f ${DESTDIR}/usr/share/doc/xen/html/man/{xmdomain.cfg,xend-config.sxp}.5.html rm -f ${DESTDIR}/usr/share/examples/xen/xmexample* + + # runit services + vsv xen + vsv xenconsoled + vsv xenstored } xen-hypervisor_package() { diff --git a/srcpkgs/xinetd/files/xinetd/run b/srcpkgs/xinetd/files/xinetd/run new file mode 100755 index 00000000000..6ecb920ea84 --- /dev/null +++ b/srcpkgs/xinetd/files/xinetd/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec xinetd -dontfork diff --git a/srcpkgs/xinetd/template b/srcpkgs/xinetd/template index 9eef98c35c8..42ccd0ec4d9 100644 --- a/srcpkgs/xinetd/template +++ b/srcpkgs/xinetd/template @@ -1,7 +1,7 @@ # Template file for 'xinetd' pkgname=xinetd version=2.3.15 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-libwrap" short_desc="A secure replacement for inetd" @@ -12,12 +12,14 @@ distfiles="http://ponce.cc/slackware/sources/repo/xinetd-${version}.tar.gz" checksum=bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3 conf_files="/etc/xinetd.conf /etc/xinetd.d/servers /etc/xinetd.d/services" +replaces="runit-void<20141013_2" do_install() { make prefix=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man install - vinstall ${FILESDIR}/xinetd.conf 644 etc + vconf ${FILESDIR}/xinetd.conf vinstall ${FILESDIR}/servers 644 etc/xinetd.d vinstall ${FILESDIR}/services 644 etc/xinetd.d - vinstall COPYRIGHT 644 usr/share/licenses/$pkgname + vlicense COPYRIGHT + vsv xinetd }