diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
commit | 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 (patch) | |
tree | fbfdff322b28d9a3c37e6e31c94caf1d8e48dac1 /extra/dnsmasq | |
parent | d53c44f055929b18d7d1b25f8367ee5836c435fc (diff) |
Fri Dec 27 23:54:04 UTC 2013
Diffstat (limited to 'extra/dnsmasq')
-rw-r--r-- | extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch | 49 | ||||
-rw-r--r-- | extra/dnsmasq/PKGBUILD | 12 |
2 files changed, 4 insertions, 57 deletions
diff --git a/extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch b/extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch deleted file mode 100644 index 866b3e8d9..000000000 --- a/extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7b174c250df2bc97b503fd03b9e473998676b1a6 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon@thekelleys.org.uk> -Date: Mon, 28 Oct 2013 13:14:03 +0000 -Subject: [PATCH] Fix check for local domains in CNAME case. Fixes - d56a604a9600c08d4a863527d549713c07f0186d - ---- - src/cache.c | 2 +- - src/rfc1035.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/cache.c b/src/cache.c -index d99aba6..6c5f601 100644 ---- a/src/cache.c -+++ b/src/cache.c -@@ -330,7 +330,7 @@ static int cache_scan_free(char *name, struct all_addr *addr, time_t now, unsign - ((flags & crecp->flags & F_TYPE) || ((crecp->flags | flags) & F_CNAME)) && - hostname_isequal(cache_get_name(crecp), name)) - { -- if (crecp->flags & (F_HOSTS | F_DHCP)) -+ if (crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)) - return 0; - *up = crecp->hash_next; - cache_unlink(crecp); -diff --git a/src/rfc1035.c b/src/rfc1035.c -index fc6d09c..ff97576 100644 ---- a/src/rfc1035.c -+++ b/src/rfc1035.c -@@ -1221,7 +1221,7 @@ int check_for_local_domain(char *name, time_t now) - struct naptr *naptr; - - if ((crecp = cache_find_by_name(NULL, name, now, F_IPV4 | F_IPV6 | F_CNAME)) && -- (crecp->flags & (F_HOSTS | F_DHCP))) -+ (crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG))) - return 1; - - for (naptr = daemon->naptr; naptr; naptr = naptr->next) -@@ -1861,7 +1861,7 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, - if (qtype == T_CNAME || qtype == T_ANY) - { - if ((crecp = cache_find_by_name(NULL, name, now, F_CNAME)) && -- (qtype == T_CNAME || (crecp->flags & (F_HOSTS | F_DHCP)))) -+ (qtype == T_CNAME || (crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)))) - { - ans = 1; - if (!dryrun) --- -1.8.4.2 - diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index fc54009ac..8a5619890 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198525 2013-10-30 15:23:36Z dreisner $ +# $Id: PKGBUILD 201313 2013-12-08 20:12:10Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq -pkgver=2.67 -pkgrel=2 +pkgver=2.68 +pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" arch=('i686' 'x86_64') @@ -14,10 +14,8 @@ depends=('glibc' 'dbus-core') install=$pkgname.install backup=('etc/dnsmasq.conf') source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz" - '0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch' 'dnsmasq.service') -md5sums=('3560068c6cc644a01924fa089a70bb9c' - '38bcc0c2b8dbc480e58a3478cae34bf6' +md5sums=('fec885ba0a9df0f7d8f2e44db48f19ae' '7ac45726cabef4145db40d758cc7fedf') prepare() { @@ -26,8 +24,6 @@ prepare() { # link against dbus. this ugliness is needed to ensure that the # compile time opts report properly on startup. yuck. sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h - - patch -Np1 <"$srcdir/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch" } build() { |