* [gentoo-commits] gentoo-x86 commit in net-dns/dnsmasq: dnsmasq-2.57-r1.ebuild dnsmasq-2.59.ebuild ChangeLog dnsmasq-2.57.ebuild metadata.xml dnsmasq-2.60.ebuild dnsmasq-2.56.ebuild dnsmasq-2.55.ebuild dnsmasq-2.52.ebuild
@ 2012-03-07 21:59 Patrick McLean (chutzpah)
0 siblings, 0 replies; only message in thread
From: Patrick McLean (chutzpah) @ 2012-03-07 21:59 UTC (permalink / raw
To: gentoo-commits
chutzpah 12/03/07 21:59:19
Modified: dnsmasq-2.57-r1.ebuild dnsmasq-2.59.ebuild
ChangeLog dnsmasq-2.57.ebuild metadata.xml
Added: dnsmasq-2.60.ebuild
Removed: dnsmasq-2.56.ebuild dnsmasq-2.55.ebuild
dnsmasq-2.52.ebuild
Log:
Version bump, rework configuration a bit to use a helper function. Add lua and script USE flags, and enable dhcpv6 if both the dhcp and ipv6 USE flags are enabled. Drop some older versions. Update copyright headers.
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Revision Changes Path
1.3 net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild?r1=1.2&r2=1.3
Index: dnsmasq-2.57-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dnsmasq-2.57-r1.ebuild 22 May 2011 19:39:43 -0000 1.2
+++ dnsmasq-2.57-r1.ebuild 7 Mar 2012 21:59:18 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild,v 1.2 2011/05/22 19:39:43 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57-r1.ebuild,v 1.3 2012/03/07 21:59:18 chutzpah Exp $
EAPI=4
@@ -26,7 +26,7 @@
DEPEND="${RDEPEND}
dev-util/pkgconfig
- || ( app-arch/xz-utils app-arch/lzma-utils )"
+ || ( app-arch/xz-utils app-arch/lzma )"
S="${WORKDIR}/${PN}-${MY_PV}"
1.2 net-dns/dnsmasq/dnsmasq-2.59.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.59.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.59.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.59.ebuild?r1=1.1&r2=1.2
Index: dnsmasq-2.59.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.59.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq-2.59.ebuild 9 Nov 2011 01:32:08 -0000 1.1
+++ dnsmasq-2.59.ebuild 7 Mar 2012 21:59:18 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.59.ebuild,v 1.1 2011/11/09 01:32:08 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.59.ebuild,v 1.2 2012/03/07 21:59:18 chutzpah Exp $
EAPI=4
@@ -27,7 +27,7 @@
DEPEND="${RDEPEND}
dev-util/pkgconfig
- || ( app-arch/xz-utils app-arch/lzma-utils )"
+ || ( app-arch/xz-utils app-arch/lzma )"
S="${WORKDIR}/${PN}-${MY_PV}"
1.212 net-dns/dnsmasq/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.212&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.212&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?r1=1.211&r2=1.212
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- ChangeLog 4 Dec 2011 10:28:47 -0000 1.211
+++ ChangeLog 7 Mar 2012 21:59:18 -0000 1.212
@@ -1,6 +1,16 @@
# ChangeLog for net-dns/dnsmasq
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.211 2011/12/04 10:28:47 swegener Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.212 2012/03/07 21:59:18 chutzpah Exp $
+
+*dnsmasq-2.60 (07 Mar 2012)
+
+ 07 Mar 2012; Patrick McLean <chutzpah@gentoo.org> -dnsmasq-2.52.ebuild,
+ -dnsmasq-2.55.ebuild, -dnsmasq-2.56.ebuild, dnsmasq-2.57.ebuild,
+ dnsmasq-2.57-r1.ebuild, dnsmasq-2.59.ebuild, +dnsmasq-2.60.ebuild,
+ +files/dnsmasq-init-r2, -files/resolvconf.dnsmasq, metadata.xml:
+ Version bump, rework configuration a bit to use a helper function. Add lua
+ and script USE flags, and enable dhcpv6 if both the dhcp and ipv6 USE flags
+ are enabled. Drop some older versions. Update copyright headers.
04 Dec 2011; Sven Wegener <swegener@gentoo.org> files/dnsmasq-init,
files/dnsmasq-init-r1:
1.8 net-dns/dnsmasq/dnsmasq-2.57.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57.ebuild?r1=1.7&r2=1.8
Index: dnsmasq-2.57.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dnsmasq-2.57.ebuild 22 May 2011 23:57:47 -0000 1.7
+++ dnsmasq-2.57.ebuild 7 Mar 2012 21:59:18 -0000 1.8
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57.ebuild,v 1.7 2011/05/22 23:57:47 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.57.ebuild,v 1.8 2012/03/07 21:59:18 chutzpah Exp $
EAPI=2
@@ -26,7 +26,7 @@
DEPEND="${RDEPEND}
dev-util/pkgconfig
- || ( app-arch/xz-utils app-arch/lzma-utils )"
+ || ( app-arch/xz-utils app-arch/lzma )"
S="${WORKDIR}/${PN}-${MY_PV}"
1.11 net-dns/dnsmasq/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/metadata.xml?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/metadata.xml?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/metadata.xml?r1=1.10&r2=1.11
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/metadata.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- metadata.xml 9 Nov 2011 01:32:08 -0000 1.10
+++ metadata.xml 7 Mar 2012 21:59:18 -0000 1.11
@@ -6,9 +6,10 @@
<name>Patrick McLean</name>
</maintainer>
<use>
+ <flag name='conntrack'>Add support for Linux conntrack connection marking.</flag>
<flag name='dhcp'>Enable support for reading ISC DHCPd lease files</flag>
+ <flag name='script'>Enable support for calling scripts when leases change</flag>
<flag name='tftp'>Enables built in TFTP server for netbooting</flag>
- <flag name='conntrack'>Add support for Linux conntrack connection marking.</flag>
</use>
</pkgmetadata>
1.1 net-dns/dnsmasq/dnsmasq-2.60.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.60.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.60.ebuild?rev=1.1&content-type=text/plain
Index: dnsmasq-2.60.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.60.ebuild,v 1.1 2012/03/07 21:59:18 chutzpah Exp $
EAPI=4
inherit eutils toolchain-funcs flag-o-matic
MY_P="${P/_/}"
MY_PV="${PV/_/}"
DESCRIPTION="Small forwarding DNS server"
HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.lzma"
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="conntrack dbus +dhcp idn ipv6 lua nls script tftp"
RDEPEND="dbus? ( sys-apps/dbus )
idn? ( net-dns/libidn )
lua? ( dev-lang/lua )
conntrack? ( net-libs/libnetfilter_conntrack )
nls? (
sys-devel/gettext
net-dns/libidn
)"
DEPEND="${RDEPEND}
dev-util/pkgconfig
|| ( app-arch/xz-utils app-arch/lzma )"
S="${WORKDIR}/${PN}-${MY_PV}"
REQUIRED_USE="lua? ( script )"
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() {
# dnsmasq on FreeBSD wants the config file in a silly location, this fixes
epatch "${FILESDIR}/${PN}-2.47-fbsd-config.patch"
sed -i -r 's:lua5.[0-9]+:lua:' Makefile
}
src_configure() {
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}" \
COPTS="${COPTS}" \
all$(use nls && echo "-i18n")
}
src_install() {
emake \
PREFIX=/usr \
MANDIR=/usr/share/man \
DESTDIR="${D}" \
install$(use nls && echo "-i18n")
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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-07 21:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-07 21:59 [gentoo-commits] gentoo-x86 commit in net-dns/dnsmasq: dnsmasq-2.57-r1.ebuild dnsmasq-2.59.ebuild ChangeLog dnsmasq-2.57.ebuild metadata.xml dnsmasq-2.60.ebuild dnsmasq-2.56.ebuild dnsmasq-2.55.ebuild dnsmasq-2.52.ebuild 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