From 87d60349d55788cbe876f3c87c0e8491ecf53eef Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Fri, 13 Sep 2013 13:35:11 -0400 Subject: contrib is merged upstream :D --- net-dns/dnsmasq/Manifest | 5 - net-dns/dnsmasq/dnsmasq-2.63.ebuild | 129 --------------------- .../dnsmasq/files/dnsmasq-2.47-fbsd-config.patch | 16 --- net-dns/dnsmasq/files/dnsmasq-init-r2 | 25 ---- net-dns/dnsmasq/files/dnsmasq.confd-r1 | 4 - 5 files changed, 179 deletions(-) delete mode 100644 net-dns/dnsmasq/Manifest delete mode 100644 net-dns/dnsmasq/dnsmasq-2.63.ebuild delete mode 100644 net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch delete mode 100644 net-dns/dnsmasq/files/dnsmasq-init-r2 delete mode 100644 net-dns/dnsmasq/files/dnsmasq.confd-r1 diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest deleted file mode 100644 index a6d8427..0000000 --- a/net-dns/dnsmasq/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX dnsmasq-2.47-fbsd-config.patch 505 SHA256 4e05e46b59254e718550cda505986b9b572a0716636fb6a5405a54df25cfa84a SHA512 9d2476c60b87f4515473e5b790ca3c6dd96105ecbda55fa385ce88290acbe8a16b6c48f9a6cbcc535662765aa4f07d182c0f5ebb4ffff1c98bb0cf6a8f4dd528 WHIRLPOOL e314020c11bc902f1dc29464785098ef0d10ebf14d8092fc1b8b673cea3d64e5212f82b85597ffe2d2bc150fbf51f27f560744a7ea12f2359c698e5ca80898cb -AUX dnsmasq-init-r2 655 SHA256 6c8cf3c414a3eb3f57cc96a19ae24f228cd3a82c3fc7ae3504dd888848d777e8 SHA512 89f114a11a92ed31a5a59fe83844ef48b5f62c73444d9c657c84eccc7455d77899c6105f1daf1e97e97af03c2ab6c9909278606f928ff2fcb185c00bd8cedb25 WHIRLPOOL 3ac0e1fca4bcbe41d4460d47111cf8ca2f79849d24f93de18549cc82aa3303b05ff37ea31451dd72c7650a3ac5e36226f01f29dd6a2d1240e46da267d55ffd80 -AUX dnsmasq.confd-r1 170 SHA256 51c0672a70d5d6793d295d82db666d372fb081e8627318f67c88e48d08d254b5 SHA512 9a401bfc408bf1638645c61b8ca734bea0a09ef79fb36648ec7ef21666257234254bbe6c73c82cc23aa1779ddcdda0e6baa2c041866f16dfb9c4e0ba9133eab8 WHIRLPOOL 86f364adcb5576bfb2cc84d13dd087bef987cae70eee1ae7816f0febc58ec637a97fea357c506456781eab116e257d06b1e45f7e2bbd81849251c15067a347ab -DIST dnsmasq-2.63.tar.xz 378148 SHA256 f5eb1c2dfd47a2c75b0d40a60f85dce2e84c6af6d1cd5318fbe8cd69845ed2d8 SHA512 be057e19062b2eed46fd4677f1419048d4546e0de93a9b0b889417c240a5f7930329d659de41105670c23ca612ce53285875ed64ac56a0cf94ff01d522194cb1 WHIRLPOOL 7e1279efa347c8d69d56c240477f6acc1664b90f05de6a7053f8264d74200afad16389e33ea710e371c0c19c0d7ea9bfdec8d0089ca0fba341bf5e265d4ea783 -EBUILD dnsmasq-2.63.ebuild 2861 SHA256 8e8dbe6009cca25f19479b40ed6a0a5660893eb708538de845eb5a6a2a650fd1 SHA512 ea884df04668d7b39d1fa8465e63beedeb9551b8582ab2867af7b549ad5c495e0b1e742997058afe2b22cb9fd372eb69f810e9e91e19f43fceb4933b361f7fb4 WHIRLPOOL 65b328c0f5cca638d3e6bf79e04572c3629704f8818cd9ad9e71f25402b9cf9378a28a3729be6fa41d7a901f5552d2f452f6ad456f8c31a17d27751e98c2e08d diff --git a/net-dns/dnsmasq/dnsmasq-2.63.ebuild b/net-dns/dnsmasq/dnsmasq-2.63.ebuild deleted file mode 100644 index 7152fce..0000000 --- a/net-dns/dnsmasq/dnsmasq-2.63.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# 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.63.ebuild,v 1.7 2012/10/07 14:20:05 armin76 Exp $ - -EAPI=4 - -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="conntrack dbus +dhcp idn ipv6 lua nls script 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? ( net-libs/libnetfilter_conntrack ) - nls? ( - sys-devel/gettext - net-dns/libidn - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - app-arch/xz-utils" - -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}" \ - LDFLAGS="${LDFLAGS}" \ - COPTS="${COPTS}" \ - all$(use nls && echo "-i18n") - - cd ${S}/contrib/wrt - emake \ - PREFIX=/usr \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - COPTS="${COPTS}" \ - all$(use nls) -} - -src_install() { - emake \ - PREFIX=/usr \ - MANDIR=/usr/share/man \ - DESTDIR="${D}" \ - install$(use nls && echo "-i18n") - - exeinto /usr/sbin - doexe ${S}/contrib/wrt/dhcp_release - - 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 - - systemd_dounit "${FILESDIR}"/dnsmasq.service -} diff --git a/net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch b/net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch deleted file mode 100644 index 38a3679..0000000 --- a/net-dns/dnsmasq/files/dnsmasq-2.47-fbsd-config.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur dnsmasq-2.47.orig/src/config.h dnsmasq-2.47/src/config.h ---- dnsmasq-2.47.orig/src/config.h 2009-02-05 07:14:24.000000000 -0500 -+++ dnsmasq-2.47/src/config.h 2009-03-30 00:04:52.000000000 -0400 -@@ -50,11 +50,7 @@ - #endif - - #ifndef CONFFILE --# if defined(__FreeBSD__) --# define CONFFILE "/usr/local/etc/dnsmasq.conf" --# else --# define CONFFILE "/etc/dnsmasq.conf" --# endif -+# define CONFFILE "/etc/dnsmasq.conf" - #endif - - #define DEFLEASE 3600 /* default lease time, 1 hour */ diff --git a/net-dns/dnsmasq/files/dnsmasq-init-r2 b/net-dns/dnsmasq/files/dnsmasq-init-r2 deleted file mode 100644 index 08e747d..0000000 --- a/net-dns/dnsmasq/files/dnsmasq-init-r2 +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/files/dnsmasq-init-r2,v 1.1 2012/03/07 21:59:19 chutzpah Exp $ - -extra_started_commands="reload" - -pidfile="/var/run/dnsmasq.pid" -command="/usr/sbin/dnsmasq" -command_args="-x ${pidfile} ${DNSMASQ_OPTS}" -start_stop_daemon_args="--retry TERM/3/TERM/5" - -depend() { - provide dns - need localmount net - after bootmisc - use logger -} - -reload() { - ebegin "Reloading ${SVCNAME}" - start-stop-daemon --stop --oknodo --signal HUP \ - --exec ${command} --pidfile ${pidfile} - eend $? -} diff --git a/net-dns/dnsmasq/files/dnsmasq.confd-r1 b/net-dns/dnsmasq/files/dnsmasq.confd-r1 deleted file mode 100644 index 0e94463..0000000 --- a/net-dns/dnsmasq/files/dnsmasq.confd-r1 +++ /dev/null @@ -1,4 +0,0 @@ -# /etc/conf.d/dnsmasq: config file for /etc/init.d/dnsmasq - -# See the dnsmasq(8) man page for possible options to put here. -DNSMASQ_OPTS="--user=dnsmasq --group=dnsmasq" -- cgit v1.2.3