| 1 |
chutzpah 12/08/28 17:11:42 |
| 2 |
|
| 3 |
Modified: ChangeLog dnsmasq-2.61.ebuild |
| 4 |
Added: dnsmasq-2.63.ebuild |
| 5 |
Removed: dnsmasq-2.57-r1.ebuild dnsmasq-2.60.ebuild |
| 6 |
dnsmasq-2.59.ebuild |
| 7 |
Log: |
| 8 |
Version bump (bug #431836). Add installation of a systemd unit (bug # 371871). Make sure LDFLAGS are respected (bug #414223). Clean up some older versions. |
| 9 |
|
| 10 |
(Portage version: 2.1.11.10/cvs/Linux x86_64) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.216 net-dns/dnsmasq/ChangeLog |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.216&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.216&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?r1=1.215&r2=1.216 |
| 18 |
|
| 19 |
Index: ChangeLog |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v |
| 22 |
retrieving revision 1.215 |
| 23 |
retrieving revision 1.216 |
| 24 |
diff -u -r1.215 -r1.216 |
| 25 |
--- ChangeLog 14 Jun 2012 02:08:14 -0000 1.215 |
| 26 |
+++ ChangeLog 28 Aug 2012 17:11:42 -0000 1.216 |
| 27 |
@@ -1,6 +1,16 @@ |
| 28 |
# ChangeLog for net-dns/dnsmasq |
| 29 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.215 2012/06/14 02:08:14 zmedico Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.216 2012/08/28 17:11:42 chutzpah Exp $ |
| 32 |
+ |
| 33 |
+*dnsmasq-2.63 (28 Aug 2012) |
| 34 |
+ |
| 35 |
+ 28 Aug 2012; Patrick McLean <chutzpah@g.o> -dnsmasq-2.57-r1.ebuild, |
| 36 |
+ -dnsmasq-2.59.ebuild, -dnsmasq-2.60.ebuild, dnsmasq-2.61.ebuild, |
| 37 |
+ +dnsmasq-2.63.ebuild, +files/dnsmasq.service, |
| 38 |
+ -files/dnsmasq-fbsd-config.patch, -files/dnsmasq-init-r1: |
| 39 |
+ Version bump (bug #431836). Add installation of a systemd unit (bug # |
| 40 |
+ 371871). Make sure LDFLAGS are respected (bug #414223). Clean up some older |
| 41 |
+ versions. |
| 42 |
|
| 43 |
14 Jun 2012; Zac Medico <zmedico@g.o> dnsmasq-2.57-r1.ebuild, |
| 44 |
dnsmasq-2.59.ebuild, dnsmasq-2.60.ebuild, dnsmasq-2.61.ebuild: |
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.4 net-dns/dnsmasq/dnsmasq-2.61.ebuild |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.61.ebuild?rev=1.4&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.61.ebuild?rev=1.4&content-type=text/plain |
| 52 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.61.ebuild?r1=1.3&r2=1.4 |
| 53 |
|
| 54 |
Index: dnsmasq-2.61.ebuild |
| 55 |
=================================================================== |
| 56 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.61.ebuild,v |
| 57 |
retrieving revision 1.3 |
| 58 |
retrieving revision 1.4 |
| 59 |
diff -u -r1.3 -r1.4 |
| 60 |
--- dnsmasq-2.61.ebuild 14 Jun 2012 02:08:14 -0000 1.3 |
| 61 |
+++ dnsmasq-2.61.ebuild 28 Aug 2012 17:11:42 -0000 1.4 |
| 62 |
@@ -1,6 +1,6 @@ |
| 63 |
# Copyright 1999-2012 Gentoo Foundation |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.61.ebuild,v 1.3 2012/06/14 02:08:14 zmedico Exp $ |
| 66 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.61.ebuild,v 1.4 2012/08/28 17:11:42 chutzpah Exp $ |
| 67 |
|
| 68 |
EAPI=4 |
| 69 |
|
| 70 |
@@ -79,6 +79,7 @@ |
| 71 |
PREFIX=/usr \ |
| 72 |
CC="$(tc-getCC)" \ |
| 73 |
CFLAGS="${CFLAGS}" \ |
| 74 |
+ LDFLAGS="${LDFLAGS}" \ |
| 75 |
COPTS="${COPTS}" \ |
| 76 |
all$(use nls && echo "-i18n") |
| 77 |
} |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.1 net-dns/dnsmasq/dnsmasq-2.63.ebuild |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.63.ebuild?rev=1.1&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.63.ebuild?rev=1.1&content-type=text/plain |
| 85 |
|
| 86 |
Index: dnsmasq-2.63.ebuild |
| 87 |
=================================================================== |
| 88 |
# Copyright 1999-2012 Gentoo Foundation |
| 89 |
# Distributed under the terms of the GNU General Public License v2 |
| 90 |
# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.63.ebuild,v 1.1 2012/08/28 17:11:42 chutzpah Exp $ |
| 91 |
|
| 92 |
EAPI=4 |
| 93 |
|
| 94 |
inherit eutils toolchain-funcs flag-o-matic user systemd |
| 95 |
|
| 96 |
MY_P="${P/_/}" |
| 97 |
MY_PV="${PV/_/}" |
| 98 |
DESCRIPTION="Small forwarding DNS server" |
| 99 |
HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/" |
| 100 |
SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${MY_P}.tar.xz" |
| 101 |
|
| 102 |
LICENSE="|| ( GPL-2 GPL-3 )" |
| 103 |
SLOT="0" |
| 104 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
| 105 |
IUSE="conntrack dbus +dhcp idn ipv6 lua nls script tftp" |
| 106 |
|
| 107 |
RDEPEND="dbus? ( sys-apps/dbus ) |
| 108 |
idn? ( net-dns/libidn ) |
| 109 |
lua? ( dev-lang/lua ) |
| 110 |
conntrack? ( net-libs/libnetfilter_conntrack ) |
| 111 |
nls? ( |
| 112 |
sys-devel/gettext |
| 113 |
net-dns/libidn |
| 114 |
)" |
| 115 |
|
| 116 |
DEPEND="${RDEPEND} |
| 117 |
virtual/pkgconfig |
| 118 |
app-arch/xz-utils" |
| 119 |
|
| 120 |
S="${WORKDIR}/${PN}-${MY_PV}" |
| 121 |
|
| 122 |
REQUIRED_USE="lua? ( script )" |
| 123 |
|
| 124 |
use_have() { |
| 125 |
local NO_ONLY="" |
| 126 |
if [ $1 == '-n' ]; then |
| 127 |
NO_ONLY=1 |
| 128 |
shift |
| 129 |
fi |
| 130 |
|
| 131 |
local UWORD=${2:-$1} |
| 132 |
UWORD=${UWORD^^*} |
| 133 |
|
| 134 |
if ! use ${1}; then |
| 135 |
echo " -DNO_${UWORD}" |
| 136 |
elif [ -z "${NO_ONLY}" ]; then |
| 137 |
echo " -DHAVE_${UWORD}" |
| 138 |
fi |
| 139 |
} |
| 140 |
|
| 141 |
pkg_setup() { |
| 142 |
enewgroup dnsmasq |
| 143 |
enewuser dnsmasq -1 -1 /dev/null dnsmasq |
| 144 |
} |
| 145 |
|
| 146 |
src_prepare() { |
| 147 |
# dnsmasq on FreeBSD wants the config file in a silly location, this fixes |
| 148 |
epatch "${FILESDIR}/${PN}-2.47-fbsd-config.patch" |
| 149 |
sed -i -r 's:lua5.[0-9]+:lua:' Makefile |
| 150 |
} |
| 151 |
|
| 152 |
src_configure() { |
| 153 |
COPTS="$(use_have conntrack)" |
| 154 |
COPTS+="$(use_have dbus)" |
| 155 |
COPTS+="$(use_have -n dhcp)" |
| 156 |
COPTS+="$(use_have idn)" |
| 157 |
COPTS+="$(use_have -n ipv6)" |
| 158 |
COPTS+="$(use_have lua luascript)" |
| 159 |
COPTS+="$(use_have -n script)" |
| 160 |
COPTS+="$(use_have -n tftp)" |
| 161 |
COPTS+="$(use ipv6 && use dhcp || echo " -DNO_DHCP6")" |
| 162 |
} |
| 163 |
|
| 164 |
src_compile() { |
| 165 |
emake \ |
| 166 |
PREFIX=/usr \ |
| 167 |
CC="$(tc-getCC)" \ |
| 168 |
CFLAGS="${CFLAGS}" \ |
| 169 |
LDFLAGS="${LDFLAGS}" \ |
| 170 |
COPTS="${COPTS}" \ |
| 171 |
all$(use nls && echo "-i18n") |
| 172 |
} |
| 173 |
|
| 174 |
src_install() { |
| 175 |
emake \ |
| 176 |
PREFIX=/usr \ |
| 177 |
MANDIR=/usr/share/man \ |
| 178 |
DESTDIR="${D}" \ |
| 179 |
install$(use nls && echo "-i18n") |
| 180 |
|
| 181 |
dodoc CHANGELOG CHANGELOG.archive FAQ |
| 182 |
dodoc -r logo |
| 183 |
|
| 184 |
dodoc CHANGELOG FAQ |
| 185 |
dohtml *.html |
| 186 |
|
| 187 |
newinitd "${FILESDIR}"/dnsmasq-init-r2 dnsmasq |
| 188 |
newconfd "${FILESDIR}"/dnsmasq.confd-r1 dnsmasq |
| 189 |
|
| 190 |
insinto /etc |
| 191 |
newins dnsmasq.conf.example dnsmasq.conf |
| 192 |
|
| 193 |
if use dbus ; then |
| 194 |
insinto /etc/dbus-1/system.d |
| 195 |
doins dbus/dnsmasq.conf |
| 196 |
fi |
| 197 |
|
| 198 |
systemd_dounit "${FILESDIR}"/dnsmasq.service |
| 199 |
} |
Archives