[patch] dnsmasq-2.69_rc1.ebuild.patch

file_504154.txt (text/plain), 2.75 KB, created by Alex Xu (Hello71) on 2014-03-25 22:00:27 UTC

--- /usr/portage/net-dns/dnsmasq/dnsmasq-2.68.ebuild	2013-12-10 14:55:03.000000000 -0500
+++ dnsmasq-2.69_rc1.ebuild	2014-03-25 17:24:13.362403680 -0400
@@ -6,20 +6,31 @@
 
 inherit eutils toolchain-funcs flag-o-matic user systemd
 
+MY_P=${P/_/}
+
 DESCRIPTION="Small forwarding DNS server"
 HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/"
-SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://thekelleys.org.uk/dnsmasq.git"
+else
+	case "${PV}" in
+		*_pre*) URI_CAT="test-releases/";;
+		*_rc*) URI_CAT="release-candidates/";;
+	esac
+	SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${URI_CAT}${MY_P}.tar.xz"
+fi
 
 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"
+IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn ipv6 lua nls script selinux static 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 )
+CDEPEND="dbus? ( sys-apps/dbus )
 		idn? ( net-dns/libidn )
 		lua? ( dev-lang/lua )
 		conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) )
@@ -29,14 +40,29 @@
 		)
 		selinux? ( sec-policy/selinux-dnsmasq )"
 
-DEPEND="${RDEPEND}
-		virtual/pkgconfig
-		app-arch/xz-utils"
+DEPEND="${CDEPEND}
+		app-arch/xz-utils
+		dnssec? (
+			dev-libs/nettle[gmp]
+			static? (
+				dev-libs/nettle[static-libs(+)]
+			)
+		)
+		virtual/pkgconfig"
+
+RDEPEND="${CDEPEND}
+		dnssec? (
+			!static? (
+				dev-libs/nettle[gmp]
+			)
+		)"
 
 REQUIRED_USE="dhcp-tools? ( dhcp )
 			  lua? ( script )
 			  s390? ( !conntrack )"
 
+S="${WORKDIR}/${MY_P}"
+
 use_have() {
 	local NO_ONLY=""
 	if [ $1 == '-n' ]; then
@@ -61,6 +87,7 @@
 
 src_prepare() {
 	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
+	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
 }
 
 src_configure() {
@@ -74,6 +101,13 @@
 	COPTS+="$(use_have -n script)"
 	COPTS+="$(use_have -n tftp)"
 	COPTS+="$(use ipv6 && use dhcp || echo " -DNO_DHCP6")"
+	COPTS+="$(use_have dnssec)"
+	COPTS+="$(use_have static dnssec_static)"
+
+	if use static; then
+		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
+		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored."
+	fi
 }
 
 src_compile() {
@@ -119,6 +153,9 @@
 	insinto /etc
 	newins dnsmasq.conf.example dnsmasq.conf
 
+	insinto /usr/share/dnsmasq
+	doins trust-anchors.conf
+
 	if use dbus; then
 		insinto /etc/dbus-1/system.d
 		doins dbus/dnsmasq.conf