* [gentoo-commits] gentoo-x86 commit in net-dns/dnsmasq: dnsmasq-2.68.ebuild ChangeLog
@ 2013-12-10 19:46 Patrick McLean (chutzpah)
0 siblings, 0 replies; 2+ messages in thread
From: Patrick McLean (chutzpah) @ 2013-12-10 19:46 UTC (permalink / raw
To: gentoo-commits
chutzpah 13/12/10 19:46:59
Modified: ChangeLog
Added: dnsmasq-2.68.ebuild
Log:
Version bump.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
Revision Changes Path
1.247 net-dns/dnsmasq/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.247&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.247&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?r1=1.246&r2=1.247
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- ChangeLog 25 Oct 2013 18:23:51 -0000 1.246
+++ ChangeLog 10 Dec 2013 19:46:59 -0000 1.247
@@ -1,6 +1,11 @@
# ChangeLog for net-dns/dnsmasq
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.246 2013/10/25 18:23:51 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.247 2013/12/10 19:46:59 chutzpah Exp $
+
+*dnsmasq-2.68 (10 Dec 2013)
+
+ 10 Dec 2013; Patrick McLean <chutzpah@gentoo.org> +dnsmasq-2.68.ebuild:
+ Version bump.
*dnsmasq-2.67 (25 Oct 2013)
1.1 net-dns/dnsmasq/dnsmasq-2.68.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.68.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.68.ebuild?rev=1.1&content-type=text/plain
Index: dnsmasq-2.68.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.68.ebuild,v 1.1 2013/12/10 19:46:59 chutzpah Exp $
EAPI=5
inherit eutils toolchain-funcs flag-o-matic user systemd
DESCRIPTION="Small forwarding DNS server"
HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="auth-dns conntrack dbus +dhcp dhcp-tools idn ipv6 lua nls script selinux tftp"
DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
for dm_lingua in ${DM_LINGUAS}; do
IUSE+=" linguas_${dm_lingua}"
done
RDEPEND="dbus? ( sys-apps/dbus )
idn? ( net-dns/libidn )
lua? ( dev-lang/lua )
conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) )
nls? (
sys-devel/gettext
net-dns/libidn
)
selinux? ( sec-policy/selinux-dnsmasq )"
DEPEND="${RDEPEND}
virtual/pkgconfig
app-arch/xz-utils"
REQUIRED_USE="dhcp-tools? ( dhcp )
lua? ( script )
s390? ( !conntrack )"
use_have() {
local NO_ONLY=""
if [ $1 == '-n' ]; then
NO_ONLY=1
shift
fi
local UWORD=${2:-$1}
UWORD=${UWORD^^*}
if ! use ${1}; then
echo " -DNO_${UWORD}"
elif [ -z "${NO_ONLY}" ]; then
echo " -DHAVE_${UWORD}"
fi
}
pkg_setup() {
enewgroup dnsmasq
enewuser dnsmasq -1 -1 /dev/null dnsmasq
}
src_prepare() {
sed -i -r 's:lua5.[0-9]+:lua:' Makefile
}
src_configure() {
COPTS="$(use_have -n auth-dns auth)"
COPTS+="$(use_have conntrack)"
COPTS+="$(use_have dbus)"
COPTS+="$(use_have -n dhcp)"
COPTS+="$(use_have idn)"
COPTS+="$(use_have -n ipv6)"
COPTS+="$(use_have lua luascript)"
COPTS+="$(use_have -n script)"
COPTS+="$(use_have -n tftp)"
COPTS+="$(use ipv6 && use dhcp || echo " -DNO_DHCP6")"
}
src_compile() {
emake \
PREFIX=/usr \
CC="$(tc-getCC)" \
CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}" \
COPTS="${COPTS}" \
CONFFILE="/etc/${PN}.conf" \
all$(use nls && echo "-i18n")
use dhcp-tools && emake -C contrib/wrt \
PREFIX=/usr \
CC="$(tc-getCC)" \
CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}" \
all
}
src_install() {
emake \
PREFIX=/usr \
MANDIR=/usr/share/man \
DESTDIR="${D}" \
install$(use nls && echo "-i18n")
local lingua
for lingua in ${DM_LINGUAS}; do
use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
done
rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
dodoc CHANGELOG CHANGELOG.archive FAQ
dodoc -r logo
dodoc CHANGELOG FAQ
dohtml *.html
newinitd "${FILESDIR}"/dnsmasq-init-r2 dnsmasq
newconfd "${FILESDIR}"/dnsmasq.confd-r1 dnsmasq
insinto /etc
newins dnsmasq.conf.example dnsmasq.conf
if use dbus; then
insinto /etc/dbus-1/system.d
doins dbus/dnsmasq.conf
fi
if use dhcp-tools; then
dosbin contrib/wrt/{dhcp_release,dhcp_lease_time}
doman contrib/wrt/{dhcp_release,dhcp_lease_time}.1
fi
systemd_dounit "${FILESDIR}"/dnsmasq.service
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-dns/dnsmasq: dnsmasq-2.68.ebuild ChangeLog
@ 2013-12-10 19:55 Patrick McLean (chutzpah)
0 siblings, 0 replies; 2+ messages in thread
From: Patrick McLean (chutzpah) @ 2013-12-10 19:55 UTC (permalink / raw
To: gentoo-commits
chutzpah 13/12/10 19:55:04
Modified: dnsmasq-2.68.ebuild ChangeLog
Log:
Minor fixups to systemd unit (bug #480042). Don't try to remove nonexistant directories.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
Revision Changes Path
1.2 net-dns/dnsmasq/dnsmasq-2.68.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.68.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.68.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.68.ebuild?r1=1.1&r2=1.2
Index: dnsmasq-2.68.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.68.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq-2.68.ebuild 10 Dec 2013 19:46:59 -0000 1.1
+++ dnsmasq-2.68.ebuild 10 Dec 2013 19:55:03 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.68.ebuild,v 1.1 2013/12/10 19:46:59 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.68.ebuild,v 1.2 2013/12/10 19:55:03 chutzpah Exp $
EAPI=5
@@ -105,7 +105,7 @@
for lingua in ${DM_LINGUAS}; do
use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
done
- rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
+ [[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
dodoc CHANGELOG CHANGELOG.archive FAQ
dodoc -r logo
@@ -129,5 +129,5 @@
doman contrib/wrt/{dhcp_release,dhcp_lease_time}.1
fi
- systemd_dounit "${FILESDIR}"/dnsmasq.service
+ systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
}
1.248 net-dns/dnsmasq/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.248&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.248&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?r1=1.247&r2=1.248
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- ChangeLog 10 Dec 2013 19:46:59 -0000 1.247
+++ ChangeLog 10 Dec 2013 19:55:03 -0000 1.248
@@ -1,6 +1,11 @@
# ChangeLog for net-dns/dnsmasq
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.247 2013/12/10 19:46:59 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.248 2013/12/10 19:55:03 chutzpah Exp $
+
+ 10 Dec 2013; Patrick McLean <chutzpah@gentoo.org> +files/dnsmasq.service-r1,
+ dnsmasq-2.68.ebuild, files/dnsmasq.service:
+ Minor fixups to systemd unit (bug #480042). Don't try to remove nonexistant
+ directories.
*dnsmasq-2.68 (10 Dec 2013)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-10 19:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-10 19:55 [gentoo-commits] gentoo-x86 commit in net-dns/dnsmasq: dnsmasq-2.68.ebuild ChangeLog Patrick McLean (chutzpah)
-- strict thread matches above, loose matches on Subject: below --
2013-12-10 19:46 Patrick McLean (chutzpah)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox