From a55032e9310f20bbc21c7f565a32b83203cf8d33 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:15:32 +0000 Subject: [PATCH 01/28] acpid: remove systemd build option (#1736) --- srcpkgs/acpid/files/acpid.service | 10 ---------- srcpkgs/acpid/files/acpid.socket | 8 -------- srcpkgs/acpid/template | 7 +------ 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 srcpkgs/acpid/files/acpid.service delete mode 100644 srcpkgs/acpid/files/acpid.socket diff --git a/srcpkgs/acpid/files/acpid.service b/srcpkgs/acpid/files/acpid.service deleted file mode 100644 index 97a5022f93c..00000000000 --- a/srcpkgs/acpid/files/acpid.service +++ /dev/null @@ -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 diff --git a/srcpkgs/acpid/files/acpid.socket b/srcpkgs/acpid/files/acpid.socket deleted file mode 100644 index 1e5365bf1ec..00000000000 --- a/srcpkgs/acpid/files/acpid.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=ACPID Listen Socket - -[Socket] -ListenStream=/run/acpid.socket - -[Install] -WantedBy=sockets.target diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template index 73ad0eb4fad..1f9b127d26f 100644 --- a/srcpkgs/acpid/template +++ b/srcpkgs/acpid/template @@ -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 From 3eba053083ea9bc198475f25c4b776bfe28dbc7f Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:16:22 +0000 Subject: [PATCH 02/28] cherokee: remove systemd build option (#1736) --- srcpkgs/cherokee/files/cherokee.service | 10 ---------- srcpkgs/cherokee/template | 8 +------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 srcpkgs/cherokee/files/cherokee.service diff --git a/srcpkgs/cherokee/files/cherokee.service b/srcpkgs/cherokee/files/cherokee.service deleted file mode 100644 index 03a02793912..00000000000 --- a/srcpkgs/cherokee/files/cherokee.service +++ /dev/null @@ -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 diff --git a/srcpkgs/cherokee/template b/srcpkgs/cherokee/template index ff6ec261895..7eb05ee0fbb 100644 --- a/srcpkgs/cherokee/template +++ b/srcpkgs/cherokee/template @@ -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() { From a5c965dbe7b6439eb02ee64cb8a76505b6c984ae Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:29:24 +0000 Subject: [PATCH 03/28] cyrus-sasl: remove systemd build option (#1736) --- srcpkgs/cyrus-sasl/files/saslauthd.service | 10 ---------- srcpkgs/cyrus-sasl/files/saslauthd.tmpfiles.d | 1 - srcpkgs/cyrus-sasl/template | 9 +-------- 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 srcpkgs/cyrus-sasl/files/saslauthd.service delete mode 100644 srcpkgs/cyrus-sasl/files/saslauthd.tmpfiles.d diff --git a/srcpkgs/cyrus-sasl/files/saslauthd.service b/srcpkgs/cyrus-sasl/files/saslauthd.service deleted file mode 100644 index 9fea8aeadf4..00000000000 --- a/srcpkgs/cyrus-sasl/files/saslauthd.service +++ /dev/null @@ -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 diff --git a/srcpkgs/cyrus-sasl/files/saslauthd.tmpfiles.d b/srcpkgs/cyrus-sasl/files/saslauthd.tmpfiles.d deleted file mode 100644 index 27eb553243f..00000000000 --- a/srcpkgs/cyrus-sasl/files/saslauthd.tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /run/saslauthd 0750 root root diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template index 938afe8cbcf..1bad96a0f7a 100644 --- a/srcpkgs/cyrus-sasl/template +++ b/srcpkgs/cyrus-sasl/template @@ -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 } From c5a89cf7ed0ad01383544a5d9e666eef2f857c9f Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 09:17:22 +0000 Subject: [PATCH 04/28] dcron: remove systemd build option (#1736) --- srcpkgs/dcron/files/dcron.service | 10 ---------- srcpkgs/dcron/template | 7 +------ 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 srcpkgs/dcron/files/dcron.service diff --git a/srcpkgs/dcron/files/dcron.service b/srcpkgs/dcron/files/dcron.service deleted file mode 100644 index 798a702500f..00000000000 --- a/srcpkgs/dcron/files/dcron.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Periodic Command Scheduler - -[Service] -Type=forking -ExecStart=/usr/sbin/crond -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/dcron/template b/srcpkgs/dcron/template index 933b804bb28..dda35bed6e2 100644 --- a/srcpkgs/dcron/template +++ b/srcpkgs/dcron/template @@ -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 } From f249a1fa47675d77c0e32faae054842582011435 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 09:22:14 +0000 Subject: [PATCH 05/28] dbus: remove systemd build option (#1736) --- srcpkgs/dbus/template | 98 +------------------------------------------ 1 file changed, 2 insertions(+), 96 deletions(-) diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template index 944ff77c52d..5909e057d77 100644 --- a/srcpkgs/dbus/template +++ b/srcpkgs/dbus/template @@ -2,7 +2,7 @@ # pkgname=dbus version=1.8.18 -revision=1 +revision=2 short_desc="Message bus system" maintainer="Juan RP " 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 } From c1bf42e577327406c7690647b21e210000c0e87e Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 09:03:04 +0000 Subject: [PATCH 06/28] distcc: remove systemd build option (#1736) --- srcpkgs/distcc/files/distccd.service | 11 ----------- srcpkgs/distcc/template | 7 +------ 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 srcpkgs/distcc/files/distccd.service diff --git a/srcpkgs/distcc/files/distccd.service b/srcpkgs/distcc/files/distccd.service deleted file mode 100644 index 1beb6542fd8..00000000000 --- a/srcpkgs/distcc/files/distccd.service +++ /dev/null @@ -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 diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template index f0567b6249f..161195092bb 100644 --- a/srcpkgs/distcc/template +++ b/srcpkgs/distcc/template @@ -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 From 2866238eb39413dbb94052529624413560d45be4 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 07:59:54 +0000 Subject: [PATCH 07/28] glibc: remove systemd build option (#1736) --- srcpkgs/glibc/template | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 9325a02b808..2f424c3c23d 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -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 " @@ -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 } } From 95e0677792607a40f235e2c4d63bcbd3e598f73f Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 09:08:06 +0000 Subject: [PATCH 08/28] glusterfs: remove systemd build option (#1736) --- srcpkgs/glusterfs/template | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template index 9f134443ae7..12d18423af4 100644 --- a/srcpkgs/glusterfs/template +++ b/srcpkgs/glusterfs/template @@ -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 } From 0310617efabba07d4ccb0e953b19c95043ee5a3b Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:18:34 +0000 Subject: [PATCH 09/28] hostapd: remove systemd build option (#1736) --- srcpkgs/hostapd/files/hostapd.service | 11 ----------- srcpkgs/hostapd/template | 7 +------ 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 srcpkgs/hostapd/files/hostapd.service diff --git a/srcpkgs/hostapd/files/hostapd.service b/srcpkgs/hostapd/files/hostapd.service deleted file mode 100644 index f278bf79310..00000000000 --- a/srcpkgs/hostapd/files/hostapd.service +++ /dev/null @@ -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 diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template index a0ed883540f..ec5064c06a1 100644 --- a/srcpkgs/hostapd/template +++ b/srcpkgs/hostapd/template @@ -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 From 2fe521bec75da3750458985e6ae5515205339058 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:03:30 +0000 Subject: [PATCH 10/28] inetutils: remove leftover systemd support (#1736) --- srcpkgs/inetutils/files/ftpd.service | 10 ---------- srcpkgs/inetutils/template | 5 +---- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 srcpkgs/inetutils/files/ftpd.service diff --git a/srcpkgs/inetutils/files/ftpd.service b/srcpkgs/inetutils/files/ftpd.service deleted file mode 100644 index 5708bdfd15d..00000000000 --- a/srcpkgs/inetutils/files/ftpd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=FTPD Daemon -After=network.target - -[Service] -ExecStart=/usr/sbin/ftpd -D -Type=forking - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template index 4b212fcad89..f2c7185e135 100644 --- a/srcpkgs/inetutils/template +++ b/srcpkgs/inetutils/template @@ -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 } } From d2ac8ceaa6ba542aa5460710c189a3256ca44b83 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 09:06:17 +0000 Subject: [PATCH 11/28] kmscon: remove systemd build option (#1736) --- srcpkgs/kmscon/template | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template index 2793dc9655f..740e3529f1d 100644 --- a/srcpkgs/kmscon/template +++ b/srcpkgs/kmscon/template @@ -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 From 74f9937991bf314ec959bfaf08af11201f8f276d Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 09:02:46 +0000 Subject: [PATCH 12/28] libcanberra: remove systemd build option (#1736) --- srcpkgs/libcanberra/template | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template index cc0cc09abba..c285047ef51 100644 --- a/srcpkgs/libcanberra/template +++ b/srcpkgs/libcanberra/template @@ -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 } From 2d64d2c3cc83abaf9b07137b44e09f07b710b817 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:05:31 +0000 Subject: [PATCH 13/28] linux-tools: remove systemd build option (#1736) --- srcpkgs/linux-tools/files/usbipd.service | 9 --------- srcpkgs/linux-tools/template | 6 +----- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 srcpkgs/linux-tools/files/usbipd.service diff --git a/srcpkgs/linux-tools/files/usbipd.service b/srcpkgs/linux-tools/files/usbipd.service deleted file mode 100644 index 1807e94b18c..00000000000 --- a/srcpkgs/linux-tools/files/usbipd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=USB/IP server -After=network.target - -[Service] -ExecStart=/usr/bin/usbipd - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index 92b2ce19686..f9ba006e86e 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -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() { From a639d9f5a992e9a9f1d9bdcae3b1ab541d35de06 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:52:55 +0000 Subject: [PATCH 14/28] lxc: remove systemd build option (#1736) --- srcpkgs/lxc/files/service | 11 ----------- srcpkgs/lxc/template | 6 +----- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 srcpkgs/lxc/files/service diff --git a/srcpkgs/lxc/files/service b/srcpkgs/lxc/files/service deleted file mode 100644 index 4c0c34e3ea1..00000000000 --- a/srcpkgs/lxc/files/service +++ /dev/null @@ -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 diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template index eabd8f14dea..5f3bdbe1e99 100644 --- a/srcpkgs/lxc/template +++ b/srcpkgs/lxc/template @@ -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. From 6c6ee67566bbb5929a4e0e1e4aaf53e36df6d94c Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:24:28 +0000 Subject: [PATCH 15/28] mariadb: remove systemd build option (#1736) --- srcpkgs/mariadb/files/mysqld-post | 8 -------- srcpkgs/mariadb/files/mysqld.service | 16 ---------------- srcpkgs/mariadb/files/mysqld.tmpfiles | 1 - srcpkgs/mariadb/template | 10 +--------- 4 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 srcpkgs/mariadb/files/mysqld-post delete mode 100644 srcpkgs/mariadb/files/mysqld.service delete mode 100644 srcpkgs/mariadb/files/mysqld.tmpfiles diff --git a/srcpkgs/mariadb/files/mysqld-post b/srcpkgs/mariadb/files/mysqld-post deleted file mode 100644 index 240d5ff21de..00000000000 --- a/srcpkgs/mariadb/files/mysqld-post +++ /dev/null @@ -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 diff --git a/srcpkgs/mariadb/files/mysqld.service b/srcpkgs/mariadb/files/mysqld.service deleted file mode 100644 index dd65511d7b7..00000000000 --- a/srcpkgs/mariadb/files/mysqld.service +++ /dev/null @@ -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 diff --git a/srcpkgs/mariadb/files/mysqld.tmpfiles b/srcpkgs/mariadb/files/mysqld.tmpfiles deleted file mode 100644 index 6883dc79888..00000000000 --- a/srcpkgs/mariadb/files/mysqld.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/mysqld 0755 mysql mysql - diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 8820afe2d5f..4f50807c697 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -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() { From 8a223e5d8e6959cb9ed50977eaa350acd3102a44 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:08:47 +0000 Subject: [PATCH 16/28] mdadm: remove systemd build option (#1736) --- srcpkgs/mdadm/template | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/srcpkgs/mdadm/template b/srcpkgs/mdadm/template index a776e81b94b..34137d7502d 100644 --- a/srcpkgs/mdadm/template +++ b/srcpkgs/mdadm/template @@ -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 } From d8664a4459c2db8a866b03420adb05a81f733888 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:51:51 +0000 Subject: [PATCH 17/28] mpdscribble: remove systemd build option (#1736) --- srcpkgs/mpdscribble/files/mpdscribble.service | 10 ---------- srcpkgs/mpdscribble/template | 6 +----- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 srcpkgs/mpdscribble/files/mpdscribble.service diff --git a/srcpkgs/mpdscribble/files/mpdscribble.service b/srcpkgs/mpdscribble/files/mpdscribble.service deleted file mode 100644 index 4b65aaa0979..00000000000 --- a/srcpkgs/mpdscribble/files/mpdscribble.service +++ /dev/null @@ -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 diff --git a/srcpkgs/mpdscribble/template b/srcpkgs/mpdscribble/template index 449c69cd042..46031caae0e 100644 --- a/srcpkgs/mpdscribble/template +++ b/srcpkgs/mpdscribble/template @@ -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 } From 2b5f1a4f8b94ee7bc375d18754fa65fbe82ef266 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:51:08 +0000 Subject: [PATCH 18/28] nbd: remove systemd build option (#1736) --- srcpkgs/nbd/files/nbd.service | 10 ---------- srcpkgs/nbd/template | 6 +----- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 srcpkgs/nbd/files/nbd.service diff --git a/srcpkgs/nbd/files/nbd.service b/srcpkgs/nbd/files/nbd.service deleted file mode 100644 index 3d580514cf9..00000000000 --- a/srcpkgs/nbd/files/nbd.service +++ /dev/null @@ -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 diff --git a/srcpkgs/nbd/template b/srcpkgs/nbd/template index c4924e8be7b..d07d2952445 100644 --- a/srcpkgs/nbd/template +++ b/srcpkgs/nbd/template @@ -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 } From f056f95c31430b51b5301f0a8235a8f9b628c9cf Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:48:43 +0000 Subject: [PATCH 19/28] nfs-utils: remove leftover systemd support (#1736) --- srcpkgs/nfs-utils/files/blkmapd.service | 11 ----------- srcpkgs/nfs-utils/files/nfsd.service | 15 --------------- srcpkgs/nfs-utils/files/proc-fs-nfsd.mount | 8 -------- srcpkgs/nfs-utils/files/rpc-gssd.service | 12 ------------ srcpkgs/nfs-utils/files/rpc-idmapd.service | 12 ------------ srcpkgs/nfs-utils/files/rpc-mountd.service | 11 ----------- srcpkgs/nfs-utils/files/rpc-statd.service | 12 ------------ srcpkgs/nfs-utils/files/rpc-svcgssd.service | 11 ----------- .../nfs-utils/files/var-lib-nfs-rpc_pipefs.mount | 7 ------- srcpkgs/nfs-utils/template | 7 +------ 10 files changed, 1 insertion(+), 105 deletions(-) delete mode 100644 srcpkgs/nfs-utils/files/blkmapd.service delete mode 100644 srcpkgs/nfs-utils/files/nfsd.service delete mode 100644 srcpkgs/nfs-utils/files/proc-fs-nfsd.mount delete mode 100644 srcpkgs/nfs-utils/files/rpc-gssd.service delete mode 100644 srcpkgs/nfs-utils/files/rpc-idmapd.service delete mode 100644 srcpkgs/nfs-utils/files/rpc-mountd.service delete mode 100644 srcpkgs/nfs-utils/files/rpc-statd.service delete mode 100644 srcpkgs/nfs-utils/files/rpc-svcgssd.service delete mode 100644 srcpkgs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount diff --git a/srcpkgs/nfs-utils/files/blkmapd.service b/srcpkgs/nfs-utils/files/blkmapd.service deleted file mode 100644 index 81f7945bfa4..00000000000 --- a/srcpkgs/nfs-utils/files/blkmapd.service +++ /dev/null @@ -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 diff --git a/srcpkgs/nfs-utils/files/nfsd.service b/srcpkgs/nfs-utils/files/nfsd.service deleted file mode 100644 index adeb8fc3360..00000000000 --- a/srcpkgs/nfs-utils/files/nfsd.service +++ /dev/null @@ -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 diff --git a/srcpkgs/nfs-utils/files/proc-fs-nfsd.mount b/srcpkgs/nfs-utils/files/proc-fs-nfsd.mount deleted file mode 100644 index 5993bb12929..00000000000 --- a/srcpkgs/nfs-utils/files/proc-fs-nfsd.mount +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=NFS Daemon filesystem -DefaultDependencies=no - -[Mount] -What=sunrpc -Where=/proc/fs/nfsd -Type=nfsd diff --git a/srcpkgs/nfs-utils/files/rpc-gssd.service b/srcpkgs/nfs-utils/files/rpc-gssd.service deleted file mode 100644 index 83370c2c9b8..00000000000 --- a/srcpkgs/nfs-utils/files/rpc-gssd.service +++ /dev/null @@ -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 diff --git a/srcpkgs/nfs-utils/files/rpc-idmapd.service b/srcpkgs/nfs-utils/files/rpc-idmapd.service deleted file mode 100644 index 5198e460ac8..00000000000 --- a/srcpkgs/nfs-utils/files/rpc-idmapd.service +++ /dev/null @@ -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 diff --git a/srcpkgs/nfs-utils/files/rpc-mountd.service b/srcpkgs/nfs-utils/files/rpc-mountd.service deleted file mode 100644 index 7e4900000b5..00000000000 --- a/srcpkgs/nfs-utils/files/rpc-mountd.service +++ /dev/null @@ -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 diff --git a/srcpkgs/nfs-utils/files/rpc-statd.service b/srcpkgs/nfs-utils/files/rpc-statd.service deleted file mode 100644 index 050c2064f75..00000000000 --- a/srcpkgs/nfs-utils/files/rpc-statd.service +++ /dev/null @@ -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 diff --git a/srcpkgs/nfs-utils/files/rpc-svcgssd.service b/srcpkgs/nfs-utils/files/rpc-svcgssd.service deleted file mode 100644 index 97fca434d50..00000000000 --- a/srcpkgs/nfs-utils/files/rpc-svcgssd.service +++ /dev/null @@ -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 diff --git a/srcpkgs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount b/srcpkgs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount deleted file mode 100644 index 4bd440f24e0..00000000000 --- a/srcpkgs/nfs-utils/files/var-lib-nfs-rpc_pipefs.mount +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=RPC pipe filesystem - -[Mount] -What=rpc_pipefs -Where=/var/lib/nfs/rpc_pipefs -Type=rpc_pipefs diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template index e8159364dfc..23110ad7ce1 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.2 -revision=3 +revision=4 short_desc="Network File System utilities" maintainer="Juan RP " 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 } From d6976eab1b3a2416e9de763a557bddb45ce2eb94 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:43:49 +0000 Subject: [PATCH 20/28] ngircd: remove systemd build option (#1736) --- srcpkgs/ngircd/files/ngircd.service | 10 ---------- srcpkgs/ngircd/template | 6 +----- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 srcpkgs/ngircd/files/ngircd.service diff --git a/srcpkgs/ngircd/files/ngircd.service b/srcpkgs/ngircd/files/ngircd.service deleted file mode 100644 index b6483f39727..00000000000 --- a/srcpkgs/ngircd/files/ngircd.service +++ /dev/null @@ -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 diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template index 077720498bc..ca88e413d0a 100644 --- a/srcpkgs/ngircd/template +++ b/srcpkgs/ngircd/template @@ -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 } From 4daafb4c6c4ac8582f4306123e9c1e167b3356d5 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:12:11 +0000 Subject: [PATCH 21/28] php: remove systemd build option (#1736) --- srcpkgs/php/files/php-fpm.service | 13 ------------- srcpkgs/php/files/php-fpm.tmpfiles | 1 - srcpkgs/php/template | 10 ++-------- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/php/files/php-fpm.service delete mode 100644 srcpkgs/php/files/php-fpm.tmpfiles diff --git a/srcpkgs/php/files/php-fpm.service b/srcpkgs/php/files/php-fpm.service deleted file mode 100644 index 6e2faafd865..00000000000 --- a/srcpkgs/php/files/php-fpm.service +++ /dev/null @@ -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 diff --git a/srcpkgs/php/files/php-fpm.tmpfiles b/srcpkgs/php/files/php-fpm.tmpfiles deleted file mode 100644 index 801e74f1e62..00000000000 --- a/srcpkgs/php/files/php-fpm.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/php-fpm 755 root root diff --git a/srcpkgs/php/template b/srcpkgs/php/template index dca32f2eb2e..d1e2a0f8ad2 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -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 } } From 90f9d900cef32470be95b2fd7964d3c4e8922e98 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:42:44 +0000 Subject: [PATCH 22/28] polipo: remove systemd build option (#1736) --- srcpkgs/polipo/files/polipo.service | 11 ----------- srcpkgs/polipo/template | 7 +------ 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 srcpkgs/polipo/files/polipo.service diff --git a/srcpkgs/polipo/files/polipo.service b/srcpkgs/polipo/files/polipo.service deleted file mode 100644 index a4c0f6d948b..00000000000 --- a/srcpkgs/polipo/files/polipo.service +++ /dev/null @@ -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 diff --git a/srcpkgs/polipo/template b/srcpkgs/polipo/template index b785c5a42e5..a9b5a682711 100644 --- a/srcpkgs/polipo/template +++ b/srcpkgs/polipo/template @@ -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 " @@ -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 } From 375fcaa9a12ee4ec7d058d0c6c32c75f47119c84 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:40:52 +0000 Subject: [PATCH 23/28] profile-sync-daemon: remove systemd build option (#1736) --- srcpkgs/profile-sync-daemon/template | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/srcpkgs/profile-sync-daemon/template b/srcpkgs/profile-sync-daemon/template index 094b040608d..adbe2e39acd 100644 --- a/srcpkgs/profile-sync-daemon/template +++ b/srcpkgs/profile-sync-daemon/template @@ -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 } From b0bc748973c8a0e629b1a84dba201192a2b557d9 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:39:44 +0000 Subject: [PATCH 24/28] qingy: remove systemd build option (#1736) --- srcpkgs/qingy/files/qingy@.service | 21 --------------------- srcpkgs/qingy/template | 7 ++----- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 srcpkgs/qingy/files/qingy@.service diff --git a/srcpkgs/qingy/files/qingy@.service b/srcpkgs/qingy/files/qingy@.service deleted file mode 100644 index 5ecc4b64038..00000000000 --- a/srcpkgs/qingy/files/qingy@.service +++ /dev/null @@ -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 diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template index d83980dfdd3..53e4dcda835 100644 --- a/srcpkgs/qingy/template +++ b/srcpkgs/qingy/template @@ -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 } From 540515dae89713ad7f8efdedfe8e228e782288b0 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:37:26 +0000 Subject: [PATCH 25/28] rtkit: remove systemd build option (#1736) --- srcpkgs/rtkit/template | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/srcpkgs/rtkit/template b/srcpkgs/rtkit/template index e72d97642a9..a31dd68a258 100644 --- a/srcpkgs/rtkit/template +++ b/srcpkgs/rtkit/template @@ -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 } From ef85aedead1c85711551454318b85b479b4ed011 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 08:22:48 +0000 Subject: [PATCH 26/28] sysstat: remove systemd build option (#1736) --- srcpkgs/sysstat/template | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/srcpkgs/sysstat/template b/srcpkgs/sysstat/template index fdcbad69645..da5961902fc 100644 --- a/srcpkgs/sysstat/template +++ b/srcpkgs/sysstat/template @@ -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 ' >>common.h echo '#include ' >>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 } From 26bd5cca6359b58c97caf84c9d440d645b2addb3 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 10:22:28 +0000 Subject: [PATCH 27/28] odroid-u2-base: remove derelict systemd unit file --- srcpkgs/odroid-u2-base/files/odroid-led.service | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 srcpkgs/odroid-u2-base/files/odroid-led.service diff --git a/srcpkgs/odroid-u2-base/files/odroid-led.service b/srcpkgs/odroid-u2-base/files/odroid-led.service deleted file mode 100644 index 13d4aef5f90..00000000000 --- a/srcpkgs/odroid-u2-base/files/odroid-led.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Sets Odroids LED on boot - -[Service] -Type=oneshot -ExecStart=/usr/sbin/odroid-led - -[Install] -WantedBy=multi-user.target From 96802644dbe6d4636d950e5203bd4651bf7c9ae5 Mon Sep 17 00:00:00 2001 From: beefcurtains Date: Wed, 1 Jul 2015 10:23:53 +0000 Subject: [PATCH 28/28] redis: remove derelict systemd unit file --- srcpkgs/redis/files/redis.service | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 srcpkgs/redis/files/redis.service diff --git a/srcpkgs/redis/files/redis.service b/srcpkgs/redis/files/redis.service deleted file mode 100644 index 876a1baf55f..00000000000 --- a/srcpkgs/redis/files/redis.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Advanced key-value store -After=network.target - -[Service] -User=redis -PIDFile=/run/redis/redis.pid -ExecStart=/usr/bin/redis-server /etc/redis/redis.conf -Restart=always - -[Install] -WantedBy=multi-user.target