Merge pull request #1939 from beefcurtains/remove-systemd

Remove systemd support
This commit is contained in:
beefcurtains 2015-07-02 12:56:31 +00:00
commit 742f0f03fb
56 changed files with 35 additions and 565 deletions

View File

@ -1,10 +0,0 @@
[Unit]
Description=ACPI Event Daemon
Requires=acpid.socket
[Service]
ExecStart=/usr/sbin/acpid -f
[Install]
WantedBy=multi-user.target
Also=acpid.socket

View File

@ -1,8 +0,0 @@
[Unit]
Description=ACPID Listen Socket
[Socket]
ListenStream=/run/acpid.socket
[Install]
WantedBy=sockets.target

View File

@ -1,9 +1,8 @@
# Template file for 'acpid'
pkgname=acpid
version=2.0.23
revision=14
revision=15
build_pie=yes
build_options="systemd"
build_style=gnu-configure
configure_args="--sbindir=/usr/bin"
conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
@ -15,10 +14,6 @@ distfiles="${SOURCEFORGE_SITE}/acpid2/acpid-$version.tar.xz"
checksum=4396aaec13510c3a1faa941a15a4b5335b6ae4fbec8438b9249b88c3b66187ee
post_install() {
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/acpid.service 644 usr/lib/systemd/system
vinstall ${FILESDIR}/acpid.socket 644 usr/lib/systemd/system
fi
vinstall ${FILESDIR}/handler.sh 755 etc/acpi
vinstall ${FILESDIR}/anything 644 etc/acpi/events
vsv acpid

View File

@ -1,10 +0,0 @@
[Unit]
Description=Cherokee web server
After=syslog.target network.target
[Service]
Type=forking
ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf
[Install]
WantedBy=multi-user.target

View File

@ -1,7 +1,7 @@
# Template file for 'cherokee'
pkgname=cherokee
version=1.2.104
revision=5
revision=6
wrksrc="webserver-${version}"
build_style=gnu-configure
configure_args="--sbindir=/usr/bin
@ -26,8 +26,6 @@ make_dirs="
/var/log/cherokee 0755 httpd httpd
/var/lib/cherokee/graphs/images 0755 httpd httpd"
build_options="systemd"
pre_configure() {
if [ "$CROSS_BUILD" ]; then
_args="--host=${XBPS_CROSS_TRIPLET}"
@ -43,10 +41,6 @@ post_install() {
# Install PAM configuration file
vinstall pam.d_cherokee 644 etc/pam.d ${pkgname}
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
fi
}
cherokee-devel_package() {

View File

@ -1,10 +0,0 @@
[Unit]
Description=Cyrus SASL authentication daemon
[Service]
Type=forking
ExecStart=/usr/sbin/saslauthd -a pam -m /run/saslauthd
PidFile=/run/saslauthd/saslauthd.pid
[Install]
WantedBy=multi-user.target

View File

@ -1 +0,0 @@
d /run/saslauthd 0750 root root

View File

@ -1,9 +1,8 @@
# Template file for 'cyrus-sasl'
pkgname=cyrus-sasl
version=2.1.26
revision=5
revision=6
patch_args="-Np1"
build_options="systemd"
hostmakedepends="automake libtool groff pkg-config"
makedepends="libsasl-devel libressl-devel db-devel libldap-devel
mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
@ -67,12 +66,6 @@ do_install() {
rm -rf ${DESTDIR}/usr/share/man/man3
rm ${DESTDIR}/usr/lib/pkgconfig/libsasl2.pc
# systemd
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/saslauthd.service 644 usr/lib/systemd/system
vinstall ${FILESDIR}/saslauthd.tmpfiles.d 644 usr/lib/tmpfiles.d saslauthd.conf
fi
vlicense COPYING LICENSE
}

View File

@ -2,7 +2,7 @@
#
pkgname=dbus
version=1.8.18
revision=1
revision=2
short_desc="Message bus system"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
@ -19,106 +19,18 @@ conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
# Create dbus:22 system account.
system_accounts="dbus:22"
# Package build options
build_options="systemd"
if [ "$build_option_systemd" ]; then
_systemd_version=208
distfiles+=" http://www.freedesktop.org/software/systemd/systemd-${_systemd_version}.tar.xz"
checksum+=" aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390"
if [ "$CROSS_BUILD" ]; then
_systemddir="$XBPS_CROSS_BASE"
_confargs="--host=$XBPS_CROSS_TRIPLET --with-sysroot=$XBPS_CROSS_BASE"
hostmakedepends+=" libtool automake gettext-devel libgcrypt-devel"
else
_systemddir="/usr"
fi
fi
_dbus_bootstrap() {
# Build a temporary dbus; we are only interested in libdbus.
mkdir ${wrksrc}/dbus-bootstrap
cd ${wrksrc}/dbus-bootstrap
../dbus-${version}/configure ${_confargs} \
--prefix=${wrksrc}/tmpbuild/usr \
--disable-systemd --without-x \
--enable-abstract-sockets ac_cv_have_abstract_sockets=yes
make ${makejobs}
make install
}
_systemd_bootstrap() {
# Build a temporary systemd; we are only interested in libsystemd-login.
if [ ! -d ${wrksrc}/systemd-bootstrap ]; then
if [ "$CROSS_BUILD" ]; then
cd ${wrksrc}/systemd-${_systemd_version}
autoreconf -fi
fi
mkdir ${wrksrc}/systemd-bootstrap
fi
cd ${wrksrc}/systemd-bootstrap
unset PKG_CONFIG_SYSROOT_DIR PKG_CONFIG_PATH
env PKG_CONFIG_LIBDIR=${wrksrc}/tmpbuild/usr/lib/pkgconfig \
../systemd-${_systemd_version}/configure ${_confargs} \
--prefix=/usr --disable-nls \
--disable-introspection --disable-kmod --disable-blkid \
--disable-ima --disable-chkconfig --disable-selinux \
--disable-xz --disable-tcpwrap --disable-pam \
--disable-acl --disable-xattr --disable-gcrypt \
--disable-audit --disable-libcryptsetup --disable-qrencode \
--disable-microhttpd --disable-binfmt --disable-vconsole \
--disable-readahead --disable-bootchart --disable-quotacheck \
--disable-randomseed --disable-hostnamed \
--disable-timedated --disable-localed --disable-coredump \
--disable-myhostname --disable-gudev --disable-keymap \
--disable-manpages --without-python --with-sysvinit-path= \
--with-sysvrcnd-path= --disable-tests
make ${makejobs}
make DESTDIR=${wrksrc}/systemd-install install
# Copy libsystemd-*, headers and pkg-config files.
cp -a ${wrksrc}/systemd-install/usr/lib/libsystemd* \
${_systemddir}/lib/
rm -f ${_systemddir}/lib/*.la
cp -a ${wrksrc}/systemd-install/usr/include/* \
${_systemddir}/include/
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
_dbus_bootstrap
touch -f ${wrksrc}/dbus_bootstrap_done
fi
if [ ! -f ${wrksrc}/systemd_bootstrap_done ]; then
_systemd_bootstrap
touch -f ${wrksrc}/systemd_bootstrap_done
fi
fi
}
do_configure() {
cd ${wrksrc}/dbus-${version}
if [ "$build_option_systemd" ]; then
if [ "$CROSS_BUILD" ]; then
autoreconf -fi
export PKG_CONFIG_LIBDIR="${_systemddir}/lib/pkgconfig"
fi
fi
./configure ${configure_args} \
--disable-selinux \
--enable-inotify --with-dbus-user=dbus \
--disable-doxygen-docs --enable-xml-docs --disable-static \
--disable-tests --enable-epoll --disable-asserts \
--disable-systemd \
--with-system-socket=/run/dbus/system_bus_socket \
--with-system-pid-file=/run/dbus/pid \
--with-console-auth-dir=/run/console/ \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
--enable-abstract-sockets \
ac_cv_have_abstract_sockets=yes
}
@ -131,12 +43,6 @@ do_install() {
cd ${wrksrc}/dbus-${version}
make DESTDIR=${DESTDIR} install
# Remove systemd temp files from masterdir.
if [ "$build_option_systemd" ]; then
rm -f ${_systemddir}/lib/pkgconfig/libsystemd-*
rm -rf ${_systemddir}/include/systemd
rm -f ${_systemddir}/lib/libsystemd-*
fi
vsv dbus
}

View File

@ -1,10 +0,0 @@
[Unit]
Description=Periodic Command Scheduler
[Service]
Type=forking
ExecStart=/usr/sbin/crond
Restart=always
[Install]
WantedBy=multi-user.target

View File

@ -1,7 +1,7 @@
# Template file for 'dcron'
pkgname=dcron
version=4.5
revision=28
revision=29
build_pie=yes
conf_files="/var/spool/cron/root"
replaces="cron-daemon>=0"
@ -13,7 +13,6 @@ license="GPL-2"
distfiles="http://www.jimpryor.net/linux/releases/dcron-${version}.tar.gz"
checksum=9e50edb6f5bd8153b16bad05087d985e5153ce45cc01ae77e7f842213fb4a824
build_options="systemd"
make_dirs="
/etc/cron.d 0755 root root
/etc/cron.hourly 0755 root root
@ -39,9 +38,5 @@ do_install() {
# crontab must be setuid for all users to work!
chmod 4755 ${DESTDIR}/usr/bin/crontab
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/dcron.service 644 usr/lib/systemd/system
fi
vsv dcron
}

View File

@ -1,11 +0,0 @@
[Unit]
Description=A distributed C/C++ compiler
Documentation=man:distccd(1)
After=network.target
[Service]
User=nobody
ExecStart=/usr/bin/distccd --no-detach --daemon --allow 127.0.0.1
[Install]
WantedBy=multi-user.target

View File

@ -1,8 +1,7 @@
# Template file for 'distcc'
pkgname=distcc
version=3.2rc1
revision=12
build_options="systemd"
revision=13
build_style=gnu-configure
configure_args="--disable-Werror --with-gtk"
hostmakedepends="pkg-config"
@ -24,10 +23,6 @@ post_install() {
rm -f ${DESTDIR}/etc/distcc/commands.allow.sh
rm -rf ${DESTDIR}/usr/share/doc/distcc/example
# systemd service
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/distccd.service 644 usr/lib/systemd/system
fi
vsv distccd
# gcc wrappers

View File

@ -1,7 +1,7 @@
# Template file for 'glibc'
pkgname=glibc
version=2.21
revision=8
revision=9
bootstrap=yes
short_desc="The GNU C library"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
@ -52,7 +52,6 @@ if [ "$CHROOT_READY" ]; then
hostmakedepends="bison perl"
fi
makedepends="kernel-libc-headers"
build_options="systemd"
lib32files="/usr/lib/gconv/gconv-modules"
lib32symlinks="ld-linux.so.2"
# There's no point in building this for musl.
@ -187,10 +186,6 @@ nscd_package() {
short_desc+=" - Name Service Cache Daemon"
pkg_install() {
vmove usr/bin/nscd
if [ "$build_option_systemd" ]; then
vinstall ${wrksrc}/nscd/nscd.service 644 usr/lib/systemd/system
vinstall ${wrksrc}/nscd/nscd.tmpfiles 644 usr/lib/tmpfiles.d nscd.conf
fi
vinstall ${wrksrc}/nscd/nscd.conf 644 etc
}
}

View File

@ -1,8 +1,7 @@
# Template file for 'glusterfs'
pkgname=glusterfs
version=3.5.2
revision=5
build_options="systemd"
revision=6
build_style=gnu-configure
configure_args="--disable-glupy --enable-crypt-xlator
--sbindir=/usr/bin --with-mountutildir=/usr/bin
@ -25,9 +24,6 @@ pre_configure() {
}
post_install() {
rm -rf ${DESTDIR}/var
if [ "$build_option_systemd" ]; then
vinstall ${wrksrc}/extras/systemd/glusterd.service 644 usr/lib/systemd/system
fi
vsv glusterfsd
}

View File

@ -1,11 +0,0 @@
[Unit]
Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
After=network.target
[Service]
Type=forking
PIDFile=/run/hostapd.pid
ExecStart=/usr/bin/hostapd /etc/hostapd/hostapd.conf -P /run/hostapd.pid -B
[Install]
WantedBy=multi-user.target

View File

@ -1,9 +1,8 @@
# Template file for 'hostapd'
pkgname=hostapd
version=2.4
revision=1
revision=2
build_wrksrc=${pkgname}
build_options="systemd"
hostmakedepends="pkg-config"
makedepends="libnl3-devel libressl-devel"
short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
@ -22,10 +21,6 @@ do_build() {
make ${makejobs}
}
do_install() {
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/hostapd.service 644 usr/lib/systemd/system
fi
vsv hostapd
vmkdir usr/bin

View File

@ -1,10 +0,0 @@
[Unit]
Description=FTPD Daemon
After=network.target
[Service]
ExecStart=/usr/sbin/ftpd -D
Type=forking
[Install]
WantedBy=multi-user.target

View File

@ -1,7 +1,7 @@
# Template file for 'inetutils'
pkgname=inetutils
version=1.9.4
revision=1
revision=2
build_style=gnu-configure
configure_args="--without-wrap --with-pam"
makedepends="pam-devel readline-devel"
@ -70,9 +70,6 @@ inetutils-ftp_package() {
vman man/ftp.1
vbin ftpd/ftpd
vman man/ftpd.8
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/ftpd.service 644 usr/lib/systemd/system
fi
# TODO: write etc/inet.d/ftp.conf or add an etc/inetd.conf line
}
}

View File

@ -1,10 +1,10 @@
# Template file for 'kmscon'
pkgname=kmscon
version=8
revision=4
revision=5
lib32disabled=yes
build_style=gnu-configure
configure_args="--disable-static"
configure_args="--disable-static --disable-multi-seat"
hostmakedepends="pkg-config docbook-xsl xkeyboard-config"
makedepends="MesaLib-devel pango-devel libtsm-devel libxkbcommon-devel
libpciaccess-devel libudev-devel dbus-devel fuse-devel"
@ -16,20 +16,8 @@ homepage="http://www.freedesktop.org/wiki/Software/kmscon"
distfiles="http://freedesktop.org/software/kmscon/releases/kmscon-8.tar.xz"
checksum=0ab01c1cdc4fbd692ce765e80478bc2d9663a7c55a5c75cc7ac421366ee6ae2b
# Package build options
build_options="systemd"
if [ "$build_option_systemd" ]; then
configure_args+=" --enable-multi-seat"
makedepends+=" systemd-devel"
else
configure_args+=" --disable-multi-seat"
fi
post_install() {
vinstall COPYING 644 usr/share/licenses/${pkgname}
vmkdir usr/lib/systemd/system
install -m644 docs/kmscon{,vt@}.service ${DESTDIR}/usr/lib/systemd/system
# Remove devel files.
rm -rf ${DESTDIR}/usr/include
rm -rf ${DESTDIR}/usr/lib/pkgconfig

View File

@ -1,7 +1,7 @@
# Template build file for 'libcanberra'.
pkgname=libcanberra
version=0.30
revision=7
revision=8
build_style=gnu-configure
configure_args="--enable-alsa --enable-null --disable-lynx
--enable-gstreamer --disable-oss --with-builtin=dso"
@ -17,11 +17,6 @@ license="LGPL-2.1"
distfiles="http://pkgs.fedoraproject.org/repo/pkgs/libcanberra/libcanberra-${version}.tar.xz/34cb7e4430afaf6f447c4ebdb9b42072/libcanberra-${version}.tar.xz"
checksum=c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72
build_options="systemd"
if [ "$build_option_systemd" ]; then
configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system"
fi
pre_configure() {
libtoolize -f
}

View File

@ -1,9 +0,0 @@
[Unit]
Description=USB/IP server
After=network.target
[Service]
ExecStart=/usr/bin/usbipd
[Install]
WantedBy=multi-user.target

View File

@ -1,7 +1,7 @@
# Template file for 'linux-tools'
pkgname=linux-tools
version=4.0
revision=3
revision=4
wrksrc="linux-${version}"
short_desc="Linux kernel tools meta-pkg"
hostmakedepends="flex perl asciidoc xmlto python automake libtool"
@ -24,7 +24,6 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; the
fi
nocross=yes
build_options="systemd"
do_build() {
cd ${wrksrc}/tools/perf
@ -165,9 +164,6 @@ usbip_package() {
vmove "usr/share/man/man8/usbip*"
vmove usr/lib/modules-load.d/usbip.conf
vsv usbipd
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/usbipd.service 644 usr/lib/systemd/system
fi
}
}
freefall_package() {

View File

@ -1,11 +0,0 @@
[Unit]
Description=%i LXC
After=network.target
[Service]
Type=forking
ExecStart=/usr/bin/lxc-start -d -n %i
ExecStop=/usr/bin/lxc-stop -n %i
[Install]
WantedBy=multi-user.target

View File

@ -3,7 +3,7 @@ _desc="Linux Containers"
pkgname=lxc
version=1.1.2
revision=1
revision=2
build_pie=yes
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --enable-doc --enable-seccomp --enable-cgmanager
@ -18,7 +18,6 @@ license="LGPL-2.1"
distfiles="http://linuxcontainers.org/downloads/lxc-${version}.tar.gz"
checksum=34ba517ffd7b38a14e5d12d56a4928b78602d56311d5f47c3ef90f4e714b9604
build_options="systemd"
conf_files="/etc/lxc/default.conf"
make_dirs="
/var/lib/lxc 0755 root root
@ -30,9 +29,6 @@ pre_configure() {
sed -e 's,docbook2x-man,docbook2man,g' -i configure
}
post_install() {
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/service 644 usr/lib/systemd/system lxc@.service
fi
vmkdir usr/share/bash-completion/completions
mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions/
# Install void lxc config/template.

View File

@ -1,8 +0,0 @@
#!/bin/sh
while true; do
response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
echo "$response" | grep -q "mysqld is alive" && break
echo "$response" | grep -q "Access denied for user" && break
sleep 1
done

View File

@ -1,16 +0,0 @@
[Unit]
Description=MariaDB database server
After=syslog.target
[Service]
User=mysql
Group=mysql
ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid
ExecStartPost=/usr/bin/mysqld-post
Restart=always
PrivateTmp=true
[Install]
WantedBy=multi-user.target

View File

@ -1 +0,0 @@
d /run/mysqld 0755 mysql mysql -

View File

@ -1,7 +1,7 @@
# Template file for 'mariadb'
pkgname=mariadb
version=10.0.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
@ -25,7 +25,6 @@ depends="mariadb-client"
provides="mysql-${version}_${revision}"
replaces="mysql>=0"
conf_files="/etc/mysql/my.cnf"
build_options="systemd"
system_accounts="mysql"
mysql_homedir="/var/lib/mysql"
short_desc="Fast SQL database server, drop-in replacement for MySQL"
@ -68,13 +67,6 @@ post_install() {
install -Dm644 ${DESTDIR}/usr/share/mysql/my-medium.cnf ${DESTDIR}/etc/mysql/my.cnf
vsv mysqld
# systemd service.
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/mysqld.service 644 usr/lib/systemd/system
vinstall ${FILESDIR}/mysqld-post 755 usr/bin
vinstall ${FILESDIR}/mysqld.tmpfiles 644 usr/lib/tmpfiles.d mysqld.conf
fi
}
libmariadbclient_package() {

View File

@ -1,9 +1,8 @@
# Template file for 'mdadm'
pkgname=mdadm
version=3.3.2
revision=7
revision=8
build_pie=yes
build_options="systemd"
hostmakedepends="pkg-config"
makedepends="libudev-devel"
short_desc="A tool for managing/monitoring Linux md device arrays"
@ -21,11 +20,6 @@ do_build() {
}
do_install() {
make BINDIR=/usr/bin STRIP= PREFIX=/usr DESTDIR=${DESTDIR} install
if [ "$build_option_systemd" ]; then
make BINDIR=/usr/bin STRIP= PREFIX=/usr \
SYSTEMD_DIR=/usr/lib/systemd/system DESTDIR=${DESTDIR} install-systemd
else
vsv mdadm
fi
vsv mdadm
vsconf mdadm.conf-example mdadm.conf
}

View File

@ -1,10 +0,0 @@
[Unit]
Description=MPD Scrobbler
Requires=mpd.service
After=mpd.service
[Service]
ExecStart=/usr/bin/mpdscribble --no-daemon
[Install]
WantedBy=default.target

View File

@ -2,7 +2,7 @@
pkgname=mpdscribble
version=0.22
revision=3
revision=4
short_desc="MPD audio scrobbler (e.g. last.fm)"
homepage="http://mpd.wikia.com/wiki/Client:Mpdscribble"
license="GPL-2"
@ -13,13 +13,9 @@ checksum=1cde2b5f8c70f0e3e6f059d01bf0b0f2eac2b29fbcd14b01a8a5103e603feb41
build_style=gnu-configure
conf_files="/etc/${pkgname}.conf"
make_dirs="/var/cache/mpdscribble/ 0755 root root"
build_options="systemd"
hostmakedepends="pkg-config"
makedepends="libmpdclient-devel glib-devel libcurl-devel"
post_install() {
vsv mpdscribble
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/mpdscribble.service 644 usr/lib/systemd/system
fi
}

View File

@ -1,10 +0,0 @@
[Unit]
Description=Network Block Device Server
After=network.target
[Service]
Type=forking
ExecStart=/usr/bin/nbd-server
[Install]
WantedBy=multi-user.target

View File

@ -1,12 +1,11 @@
# Template file for 'nbd'
pkgname=nbd
version=3.11
revision=1
revision=2
build_style=gnu-configure
configure_args="--enable-syslog --sbindir=/usr/bin"
hostmakedepends="pkg-config"
makedepends="libglib-devel"
build_options="systemd"
system_accounts="nbd"
nbd_homedir="/var/chroot"
conf_files="/etc/nbd-server/config"
@ -20,8 +19,5 @@ checksum=b681ff0ae05e16e679814d8c87661844c582c716f9440bcfbd673ebc1dba1cfc
post_install() {
vsv nbd
vinstall ${FILESDIR}/config 644 etc/nbd-server
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/nbd.service 644 usr/lib/systemd/system
fi
vdoc doc/README
}

View File

@ -1,11 +0,0 @@
[Unit]
Description=NFS block layout mapping daemon
After=var-lib-nfs-rpc_pipefs.mount nfsd.service
Requires=var-lib-nfs-rpc_pipefs.mount
[Service]
Type=forking
ExecStart=/usr/bin/blkmapd
[Install]
WantedBy=multi-user.target

View File

@ -1,15 +0,0 @@
[Unit]
Description=NFS server
After=rpcbind.service
Requires=rpcbind.service
[Service]
Type=oneshot
ExecStart=/usr/bin/rpc.nfsd
ExecStartPost=/usr/bin/exportfs -a
ExecStop=/usr/bin/rpc.nfsd 0
ExecStopPost=/usr/bin/exportfs -a -u
RemainAfterExit=yes
[Install]
WantedBy=multi-user.target

View File

@ -1,8 +0,0 @@
[Unit]
Description=NFS Daemon filesystem
DefaultDependencies=no
[Mount]
What=sunrpc
Where=/proc/fs/nfsd
Type=nfsd

View File

@ -1,12 +0,0 @@
[Unit]
Description=RPC GSS-API client-side daemon
After=rpcbind.service var-lib-nfs-rpc_pipefs.mount
Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount
Before=remote-fs-pre.target
[Service]
Type=forking
ExecStart=/usr/bin/rpc.gssd
[Install]
WantedBy=multi-user.target

View File

@ -1,12 +0,0 @@
[Unit]
Description=NFSv4 ID-name mapping daemon
After=var-lib-nfs-rpc_pipefs.mount nfsd.service
Requires=var-lib-nfs-rpc_pipefs.mount
Before=remote-fs-pre.target
[Service]
Type=forking
ExecStart=/usr/bin/rpc.idmapd
[Install]
WantedBy=multi-user.target

View File

@ -1,11 +0,0 @@
[Unit]
Description=NFSv2/3 Mount Daemon
After=rpcbind.service nfsd.service
Requires=rpcbind.service nfsd.service
[Service]
Type=forking
ExecStart=/usr/bin/rpc.mountd
[Install]
WantedBy=multi-user.target

View File

@ -1,12 +0,0 @@
[Unit]
Description=NFSv2/3 Network Status Monitor Daemon
After=rpcbind.service
Requires=rpcbind.service
Before=remote-fs-pre.target
[Service]
Type=forking
ExecStart=/usr/bin/rpc.statd
[Install]
WantedBy=multi-user.target

View File

@ -1,11 +0,0 @@
[Unit]
Description=RPC GSS-API server-side daemon
After=rpcbind.service
Requires=rpcbind.service
[Service]
Type=forking
ExecStart=/usr/bin/rpc.svcgssd
[Install]
WantedBy=multi-user.target

View File

@ -1,7 +0,0 @@
[Unit]
Description=RPC pipe filesystem
[Mount]
What=rpc_pipefs
Where=/var/lib/nfs/rpc_pipefs
Type=rpc_pipefs

View File

@ -1,7 +1,7 @@
# Template file for 'nfs-utils'
pkgname=nfs-utils
version=1.3.2
revision=3
revision=4
short_desc="Network File System utilities"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
@ -49,11 +49,6 @@ do_install() {
# runit services
vsv statd
vsv nfs-server
# systemd glue
if [ "$build_option_systemd" ]; then
vmkdir usr/lib/systemd/system
install -m644 ${FILESDIR}/*.{service,mount} ${DESTDIR}/usr/lib/systemd/system
fi
rm -rf ${DESTDIR}/var/lib/nfs
}

View File

@ -1,10 +0,0 @@
[Unit]
Description=Next Generation IRC Daemon
After=network.target
[Service]
ExecStart=/usr/sbin/ngircd -n
ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target

View File

@ -1,9 +1,8 @@
# Template build file for 'ngircd'
pkgname=ngircd
version=22.1
revision=2
revision=3
build_style=gnu-configure
build_options="systemd"
configure_args="--sbindir=/usr/bin --enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
makedepends="zlib-devel libressl-devel"
@ -20,7 +19,4 @@ post_configure() {
}
post_install() {
vsv ngircd
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system
fi
}

View File

@ -1,13 +0,0 @@
[Unit]
Description=The PHP FastCGI Process Manager
After=syslog.target network.target
[Service]
Type=notify
PIDFile=/run/php-fpm/php-fpm.pid
PrivateTmp=true
ExecStart=/usr/bin/php-fpm --nodaemonize --pid /run/php-fpm/php-fpm.pid
ExecReload=/bin/kill -USR2 $MAINPID
[Install]
WantedBy=multi-user.target

View File

@ -1 +0,0 @@
d /run/php-fpm 755 root root

View File

@ -1,7 +1,7 @@
# Template build file for 'php'
pkgname=php
version=5.6.9
revision=1
revision=2
short_desc="An HTML-embedded scripting language"
license="PHP"
homepage="http://www.php.net"
@ -12,13 +12,12 @@ makedepends="postgresql-libs-devel libldap-devel libvpx-devel sqlite-devel
libltdl-devel libpng-devel libjpeg-turbo-devel icu-devel
libcurl-devel libxslt-devel libressl-devel bzip2-devel zlib-devel db-devel
gmp-devel gdbm-devel freetype-devel apache-devel tidy-devel
readline-devel libmysqlclient-devel $(vopt_if systemd systemd-devel)"
readline-devel libmysqlclient-devel"
conf_files="/etc/php/php.ini"
distfiles="http://www.php.net/distributions/php-${version}.tar.gz"
checksum=49527ba66357fe65bcd463dfb8dcff1b8879419f88b3c334f50696a2aceacb87
# Package build options
build_options="systemd"
nocross=yes
lib32disabled=yes
@ -89,7 +88,6 @@ do_build() {
--with-xsl=shared \
--with-tidy=shared \
--with-zlib \
$(vopt_with systemd fpm-systemd) \
${configure_args} \
"
@ -209,10 +207,6 @@ php-fpm_package() {
vbin ${wrksrc}/build-fpm/sapi/fpm/php-fpm
vman ${wrksrc}/build-fpm/sapi/fpm/php-fpm.8
vinstall ${wrksrc}/build-fpm/sapi/fpm/php-fpm.conf 644 etc/php
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/php-fpm.tmpfiles 644 usr/lib/tmpfiles.d php-fpm.conf
vinstall ${FILESDIR}/php-fpm.service 644 usr/lib/systemd/system
fi
vsv php-fpm
}
}

View File

@ -1,11 +0,0 @@
[Unit]
Description=Polipo Proxy Server
After=network.target
[Service]
Type=forking
ExecStart=/usr/bin/polipo daemonise=true logFile="/var/log/polipo.log"
User=nobody
[Install]
WantedBy=multi-user.target

View File

@ -1,8 +1,7 @@
# Template file for 'polipo'
pkgname=polipo
version=1.1.1
revision=3
build_options="systemd"
revision=4
replaces="runit-void<20141013_2"
short_desc="A small and fast caching web proxy"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
@ -23,9 +22,5 @@ do_install() {
# install sample config files
vinstall config.sample 644 usr/share/examples/polipo
vinstall forbidden.sample 644 usr/share/examples/polipo
if [ "$build_option_systemd" ]; then
# systemd service
vinstall ${FILESDIR}/polipo.service 644 usr/lib/systemd/system
fi
vsv polipo
}

View File

@ -1,7 +1,7 @@
# Template file for 'profile-sync-daemon'
pkgname=profile-sync-daemon
version=5.73
revision=2
revision=3
noarch=yes
depends="rsync"
short_desc="Syncs browser profiles to tmpfs"
@ -10,11 +10,8 @@ license="MIT"
homepage="https://github.com/graysky2/profile-sync-daemon"
distfiles="http://repo-ck.com/source/$pkgname/$pkgname-$version.tar.xz"
checksum=229b30d4e5dead6ad47c9110b4716101a28e323061b97cfbe5037fd56fdda440
build_options="systemd"
do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} $(vopt_if systemd 'install-systemd-all' 'install-bin install-man')
if [ -z "$build_option_systemd" ]; then
vsv psd
fi
make PREFIX=/usr DESTDIR=${DESTDIR} install-bin install-man
vsv psd
}

View File

@ -1,21 +0,0 @@
[Unit]
Description=Qingy on %I
Documentation=info:qingy
After=systemd-user-sessions.service plymouth-quit-wait.service
[Service]
Environment=TERM=linux
ExecStart=/usr/bin/qingy %I -n
Type=idle
Restart=always
RestartSec=0
UtmpIdentifier=%I
TTYPath=/dev/%I
TTYReset=yes
TTYVHangup=yes
TTYVTDisallocate=yes
KillMode=process
IgnoreSIGPIPE=no
[Install]
WantedBy=getty.target

View File

@ -1,7 +1,7 @@
# Template file for 'qingy'
pkgname=qingy
version=1.0.0
revision=14
revision=15
lib32disabled=yes
build_style=gnu-configure
makedepends="ncurses-devel libressl-devel
@ -22,13 +22,10 @@ conf_files="
/etc/qingy/settings
/etc/qingy/welcomes"
build_options="pam systemd x11"
build_options="pam x11"
build_options_default="pam x11"
post_install() {
if [ "$build_option_systemd" ]; then
vinstall ${FILESDIR}/qingy@.service 644 usr/lib/systemd/system
fi
sed -i '/pam_console/d' ${DESTDIR}/etc/pam.d/qingy
sed -i 's#usr/X11R6/bin#usr/bin#' ${DESTDIR}/etc/qingy/settings
}

View File

@ -1,7 +1,7 @@
# Template file for 'rtkit'
pkgname=rtkit
version=0.11
revision=10
revision=11
build_style=gnu-configure
configure_args="--sbindir=/usr/bin"
short_desc="Realtime Policy and Watchdog Daemon"
@ -16,16 +16,7 @@ makedepends="dbus-devel libcap-devel"
system_accounts="rtkit"
rtkit_homedir="/proc"
build_options="systemd"
if [ "$build_option_systemd" ]; then
configure_args="--with-systemdsystemunitdir=/usr/lib/systemd/system"
fi
post_install() {
# DBus configuration
vinstall ${FILESDIR}/org.freedesktop.RealtimeKit1.xml 644 usr/share/dbus-1/interfaces
if [ "$build_option_systemd" ]; then
# ControlGroup is obsolete since systemd>=205.
sed -e '/^ControlGroup.*/d' -i ${DESTDIR}/usr/lib/systemd/system/rtkit-daemon.service
fi
}

View File

@ -1,10 +1,11 @@
# Template file for 'sysstat'
pkgname=sysstat
version=11.1.5
revision=1
revision=2
build_pie=yes
build_style=gnu-configure
configure_args="--enable-install-isag --enable-copy-only --disable-file-attr"
configure_args="--enable-install-isag --enable-copy-only --disable-file-attr
--with-systemdsystemunitdir= --enable-install-cron"
make_dirs="/var/log/sa 0755 root root"
conf_files="/etc/default/sysstat /etc/default/sysstat.ioconf"
hostmakedepends="pkg-config"
@ -16,14 +17,6 @@ homepage="http://pagesperso-orange.fr/sebastien.godard/"
distfiles="http://pagesperso-orange.fr/sebastien.godard/${pkgname}-${version}.tar.gz"
checksum=c6ac93ad11c051c477c998c7916d0cca42a0a789e6bbd0d68bf5b1bfc0066d40
build_options="systemd"
if [ "$build_option_systemd" ]; then
configure_args+=" --with-systemdsystemunitdir=/usr/lib/systemd/system"
else
configure_args+=" --with-systemdsystemunitdir= --enable-install-cron"
fi
post_extract() {
echo '#include <limits.h>' >>common.h
echo '#include <sys/sysmacros.h>' >>common.h
@ -34,5 +27,4 @@ pre_configure() {
export cron_owner=$(whoami)
vmkdir etc/cron.daily
vmkdir etc/cron.hourly
vmkdir usr/lib/systemd/system
}