net-dns/dnsmasq: Clean out old versions

Package-Manager: portage-2.3.0_rc1

5 files changed, 0 insertions, 230 deletions

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 38a3679bd240..000000000000
--- 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-2.66-dhcp-option-zero.patch b/net-dns/dnsmasq/files/dnsmasq-2.66-dhcp-option-zero.patch
deleted file mode 100644
index 6c52a533f1a1..000000000000
--- a/net-dns/dnsmasq/files/dnsmasq-2.66-dhcp-option-zero.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-commit bd08ae67f9a0cae2ce15be885254cad9449d4551
-Author: Simon Kelley <simon@thekelleys.org.uk>
-Date:   Fri Apr 19 10:22:06 2013 +0100
-
-    Allow option number zero in encapsulated DHCP options.
-
-diff --git a/src/dhcp-common.c b/src/dhcp-common.c
-index f4fd088..8de4268 100644
---- a/src/dhcp-common.c
-+++ b/src/dhcp-common.c
-@@ -512,7 +512,7 @@ void display_opts6(void)
- }
- #endif
- 
--u16 lookup_dhcp_opt(int prot, char *name)
-+int lookup_dhcp_opt(int prot, char *name)
- {
-   const struct opttab_t *t;
-   int i;
-@@ -528,10 +528,10 @@ u16 lookup_dhcp_opt(int prot, char *name)
-     if (strcasecmp(t[i].name, name) == 0)
-       return t[i].val;
-   
--  return 0;
-+  return -1;
- }
- 
--u16 lookup_dhcp_len(int prot, u16 val)
-+int lookup_dhcp_len(int prot, int val)
- {
-   const struct opttab_t *t;
-   int i;
-diff --git a/src/dnsmasq.h b/src/dnsmasq.h
-index 69ae7a7..41e2798 100644
---- a/src/dnsmasq.h
-+++ b/src/dnsmasq.h
-@@ -1216,8 +1216,8 @@ void log_tags(struct dhcp_netid *netid, u32 xid);
- int match_bytes(struct dhcp_opt *o, unsigned char *p, int len);
- void dhcp_update_configs(struct dhcp_config *configs);
- void display_opts(void);
--u16 lookup_dhcp_opt(int prot, char *name);
--u16 lookup_dhcp_len(int prot, u16 val);
-+int lookup_dhcp_opt(int prot, char *name);
-+int lookup_dhcp_len(int prot, int val);
- char *option_string(int prot, unsigned int opt, unsigned char *val, 
- 		    int opt_len, char *buf, int buf_len);
- #ifdef HAVE_LINUX_NETWORK
-diff --git a/src/option.c b/src/option.c
-index b2596ec..2a61017 100644
---- a/src/option.c
-+++ b/src/option.c
-@@ -750,6 +750,7 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
-   struct dhcp_netid *np = NULL;
-   u16 opt_len = 0;
-   int is6 = 0;
-+  int option_ok = 0;
- 
-   new->len = 0;
-   new->flags = flags;
-@@ -769,16 +770,19 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
- 	{
- 	  new->opt = atoi(arg);
- 	  opt_len = 0;
-+	  option_ok = 1;
- 	  break;
- 	}
-       
-       if (strstr(arg, "option:") == arg)
- 	{
--	  new->opt = lookup_dhcp_opt(AF_INET, arg+7);
--	  opt_len = lookup_dhcp_len(AF_INET, new->opt);
--	  /* option:<optname> must follow tag and vendor string. */
--	  if ((opt_len & OT_INTERNAL) && flags != DHOPT_MATCH)
--	    new->opt = 0;
-+	  if ((new->opt = lookup_dhcp_opt(AF_INET, arg+7)) != -1)
-+	    {
-+	      opt_len = lookup_dhcp_len(AF_INET, new->opt);
-+	      /* option:<optname> must follow tag and vendor string. */
-+	      if (!(opt_len & OT_INTERNAL) || flags == DHOPT_MATCH)
-+		option_ok = 1;
-+	    }
- 	  break;
- 	}
- #ifdef HAVE_DHCP6
-@@ -792,13 +796,16 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
- 	    {
- 	      new->opt = atoi(arg+8);
- 	      opt_len = 0;
-+	      option_ok = 1;
- 	    }
- 	  else
- 	    {
--	      new->opt = lookup_dhcp_opt(AF_INET6, arg+8);
--	      opt_len = lookup_dhcp_len(AF_INET6, new->opt);
--	      if ((opt_len & OT_INTERNAL) && flags != DHOPT_MATCH)
--		new->opt = 0;
-+	      if ((new->opt = lookup_dhcp_opt(AF_INET6, arg+8)) != -1)
-+		{
-+		  opt_len = lookup_dhcp_len(AF_INET6, new->opt);
-+		  if (!(opt_len & OT_INTERNAL) || flags == DHOPT_MATCH)
-+		    option_ok = 1;
-+		}
- 	    }
- 	  /* option6:<opt>|<optname> must follow tag and vendor string. */
- 	  is6 = 1;
-@@ -821,7 +828,7 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
- 	  new->flags |= DHOPT_RFC3925;
- 	  if (flags == DHOPT_MATCH)
- 	    {
--	      new->opt = 1; /* avoid error below */
-+	      option_ok = 1;
- 	      break;
- 	    }
- 	}
-@@ -848,16 +855,16 @@ static int parse_dhcp_opt(char *errstr, char *arg, int flags)
-       
-       if (opt_len == 0 &&
- 	  !(new->flags & DHOPT_RFC3925))
--	opt_len = lookup_dhcp_len(AF_INET6 ,new->opt);
-+	opt_len = lookup_dhcp_len(AF_INET6, new->opt);
-     }
-   else
- #endif
-     if (opt_len == 0 &&
- 	!(new->flags & (DHOPT_VENDOR | DHOPT_ENCAPSULATE | DHOPT_RFC3925)))
--      opt_len = lookup_dhcp_len(AF_INET ,new->opt);
-+      opt_len = lookup_dhcp_len(AF_INET, new->opt);
-   
-   /* option may be missing with rfc3925 match */
--  if (new->opt == 0)
-+  if (!option_ok)
-     ret_err(_("bad dhcp-option"));
-   
-   if (comma)
diff --git a/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch b/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch
deleted file mode 100644
index 57708b6f716e..000000000000
--- a/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 04b0ac05377936d121a36873bb63d492cde292c9
-Author: Simon Kelley <simon@thekelleys.org.uk>
-Date:   Mon Apr 6 17:19:13 2015 +0100
-
-    Fix crash caused by looking up servers.bind when many servers defined.
-
-diff --git a/src/cache.c b/src/cache.c
-index d7bea57..178d654 100644
---- a/src/cache.c
-+++ b/src/cache.c
-@@ -1367,7 +1367,7 @@ int cache_make_stat(struct txt_record *t)
- 		}
- 	    port = prettyprint_addr(&serv->addr, daemon->addrbuff);
- 	    lenp = p++; /* length */
--	    bytes_avail = (p - buff) + bufflen;
-+	    bytes_avail = bufflen - (p - buff );
- 	    bytes_needed = snprintf(p, bytes_avail, "%s#%d %u %u", daemon->addrbuff, port, queries, failed_queries);
- 	    if (bytes_needed >= bytes_avail)
- 	      {
-@@ -1381,7 +1381,7 @@ int cache_make_stat(struct txt_record *t)
- 		lenp = p - 1;
- 		buff = new;
- 		bufflen = newlen;
--		bytes_avail = (p - buff) + bufflen;
-+		bytes_avail =  bufflen - (p - buff );
- 		bytes_needed = snprintf(p, bytes_avail, "%s#%d %u %u", daemon->addrbuff, port, queries, failed_queries);
- 	      }
- 	    *lenp = bytes_needed;
diff --git a/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch b/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch
deleted file mode 100644
index c6106db510de..000000000000
--- a/net-dns/dnsmasq/files/dnsmasq-2.72-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit ad4a8ff7d9097008d7623df8543df435bfddeac8
-Author: Simon Kelley <simon@thekelleys.org.uk>
-Date:   Thu Apr 9 21:48:00 2015 +0100
-
-    Fix crash on receipt of certain malformed DNS requests.
-
-diff --git a/src/rfc1035.c b/src/rfc1035.c
-index 7a07b0c..a995ab5 100644
---- a/src/rfc1035.c
-+++ b/src/rfc1035.c
-@@ -1198,7 +1198,10 @@ unsigned int extract_request(struct dns_header *header, size_t qlen, char *name,
- size_t setup_reply(struct dns_header *header, size_t qlen,
- 		struct all_addr *addrp, unsigned int flags, unsigned long ttl)
- {
--  unsigned char *p = skip_questions(header, qlen);
-+  unsigned char *p;
-+
-+  if (!(p = skip_questions(header, qlen)))
-+    return 0;
-   
-   /* clear authoritative and truncated flags, set QR flag */
-   header->hb3 = (header->hb3 & ~(HB3_AA | HB3_TC)) | HB3_QR;
-@@ -1214,7 +1217,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen,
-     SET_RCODE(header, NOERROR); /* empty domain */
-   else if (flags == F_NXDOMAIN)
-     SET_RCODE(header, NXDOMAIN);
--  else if (p && flags == F_IPV4)
-+  else if (flags == F_IPV4)
-     { /* we know the address */
-       SET_RCODE(header, NOERROR);
-       header->ancount = htons(1);
-@@ -1222,7 +1225,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen,
-       add_resource_record(header, NULL, NULL, sizeof(struct dns_header), &p, ttl, NULL, T_A, C_IN, "4", addrp);
-     }
- #ifdef HAVE_IPV6
--  else if (p && flags == F_IPV6)
-+  else if (flags == F_IPV6)
-     {
-       SET_RCODE(header, NOERROR);
-       header->ancount = htons(1);
diff --git a/net-dns/dnsmasq/files/dnsmasq.service b/net-dns/dnsmasq/files/dnsmasq.service
deleted file mode 100644
index 8e313bcfd996..000000000000
--- a/net-dns/dnsmasq/files/dnsmasq.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=A lightweight DHCP and caching DNS server
-After=network.target
-
-[Service]
-Type=simple
-ExecStartPre=/usr/sbin/dnsmasq --test
-ExecStart=/usr/sbin/dnsmasq -k --user=dnsmasq --group=dnsmasq
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target