From 84e4b7b363b04bd85a30bb006b0a99c8930757c3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 11 Oct 2011 04:33:52 +0200 Subject: [PATCH] dnsmasq: switch to systemd, drop openrc support. --- srcpkgs/dnsmasq/files/dnsmasq.confd | 4 ---- srcpkgs/dnsmasq/files/dnsmasq.rc | 12 ------------ srcpkgs/dnsmasq/template | 6 +++--- 3 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 srcpkgs/dnsmasq/files/dnsmasq.confd delete mode 100644 srcpkgs/dnsmasq/files/dnsmasq.rc diff --git a/srcpkgs/dnsmasq/files/dnsmasq.confd b/srcpkgs/dnsmasq/files/dnsmasq.confd deleted file mode 100644 index 47826dd5082..00000000000 --- a/srcpkgs/dnsmasq/files/dnsmasq.confd +++ /dev/null @@ -1,4 +0,0 @@ -# /etc/conf.d/dnsmasq: config file for /etc/init.d/dnsmasq - -# See the dnsmasq(8) man page for possible options to put here. -DNSMASQ_OPTS="" diff --git a/srcpkgs/dnsmasq/files/dnsmasq.rc b/srcpkgs/dnsmasq/files/dnsmasq.rc deleted file mode 100644 index 354fcd76b61..00000000000 --- a/srcpkgs/dnsmasq/files/dnsmasq.rc +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/runscript - -pidfile=/var/run/dnsmasq.pid -command=/usr/sbin/dnsmasq -command_args="${DNSMASQ_OPTS:---user=dnsmasq --pid-file=${pidfile}}" - -depend() -{ - provide dns - need localmount net - after bootmisc -} diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template index 37fa636c7a6..599b9bdcfa6 100644 --- a/srcpkgs/dnsmasq/template +++ b/srcpkgs/dnsmasq/template @@ -1,6 +1,7 @@ # Template file for 'dnsmasq' pkgname=dnsmasq version=2.58 +revision=1 homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html" distfiles="http://www.thekelleys.org.uk/$pkgname/$pkgname-$version.tar.gz" build_style=custom-install @@ -19,12 +20,13 @@ long_desc=" system_accounts="dnsmasq" conf_files="/etc/dnsmasq.conf /etc/conf.d/dnsmasq" -openrc_services="dnsmasq default false" +systemd_services="dnsmasq.service" Add_dependency run glibc Add_dependency run dbus-libs Add_dependency run libcap Add_dependency run libidn +Add_dependency run dbus Add_dependency build gettext Add_dependency build dbus-devel @@ -42,8 +44,6 @@ do_install() make PREFIX=/usr DESTDIR=${DESTDIR} install vinstall dnsmasq.conf.example 644 etc dnsmasq.conf - vinstall ${FILESDIR}/dnsmasq.rc 755 etc/init.d dnsmasq - vinstall ${FILESDIR}/dnsmasq.confd 644 etc/conf.d dnsmasq vinstall ${FILESDIR}/dnsmasq.service 644 lib/systemd/system vinstall dbus/dnsmasq.conf 644 etc/dbus-1/system.d }