From b0ca2c0e5bdc7b478e13069ad535d7b8cd3c41ed Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 15 Jun 2015 07:46:09 +0200 Subject: [PATCH] dnsmasq: update to 2.73. --- srcpkgs/dnsmasq/files/dnsmasq.service | 13 ------------- srcpkgs/dnsmasq/template | 13 ++++--------- 2 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 srcpkgs/dnsmasq/files/dnsmasq.service diff --git a/srcpkgs/dnsmasq/files/dnsmasq.service b/srcpkgs/dnsmasq/files/dnsmasq.service deleted file mode 100644 index b09cb24b99..0000000000 --- a/srcpkgs/dnsmasq/files/dnsmasq.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=A lightweight DHCP and caching DNS server - -[Service] -Type=dbus -BusName=uk.org.thekelleys.dnsmasq -ExecStartPre=/usr/sbin/dnsmasq --test -ExecStart=/usr/sbin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target -Alias=dbus-uk.org.thekelleys.dnsmasq diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template index 2f3ad8facd..3f1bc093a0 100644 --- a/srcpkgs/dnsmasq/template +++ b/srcpkgs/dnsmasq/template @@ -1,11 +1,11 @@ # Template file for 'dnsmasq' pkgname=dnsmasq -version=2.72 -revision=5 +version=2.73 +revision=1 +build_pie=yes hostmakedepends="pkg-config" makedepends="dbus-devel libcap-devel libidn-devel" conf_files="/etc/dnsmasq.conf" -build_options="systemd" system_accounts="dnsmasq" dnsmasq_homedir="/var/chroot" short_desc="Lightweight, easy to configure DNS forwarder and DHCP server" @@ -13,8 +13,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html" distfiles="http://www.thekelleys.org.uk/$pkgname/$pkgname-$version.tar.gz" -checksum=635f1b47417d17cf32e45cfcfd0213ac39fd09918479a25373ba9b2ce4adc05d -build_pie=yes +checksum=9f350f74ae2c7990b1c7c6c8591d274c37b674aa987f54dfee7ca856fae0d02d do_build() { echo '#define HAVE_DBUS' >> src/config.h @@ -26,8 +25,4 @@ do_install() { vsv dnsmasq vconf dnsmasq.conf.example dnsmasq.conf vinstall dbus/dnsmasq.conf 644 etc/dbus-1/system.d - - if [ "$build_option_systemd" ]; then - vinstall ${FILESDIR}/dnsmasq.service 644 usr/lib/systemd/system - fi }