fixed compile fail with kernel >= 2.6.35 (bug #337324) and update ebuild to use latest debian patchset (bug #288275).

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

6 files changed, 679 insertions, 3 deletions

diff --git a/net-dns/ez-ipupdate/ChangeLog b/net-dns/ez-ipupdate/ChangeLog
index 4655cd32c0dd..215d865d62b4 100644
--- a/net-dns/ez-ipupdate/ChangeLog
+++ b/net-dns/ez-ipupdate/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-dns/ez-ipupdate
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ez-ipupdate/ChangeLog,v 1.31 2010/09/29 23:12:34 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ez-ipupdate/ChangeLog,v 1.32 2011/01/23 20:19:26 sbriesen Exp $
+
+*ez-ipupdate-3.0.11.13.3_beta8 (23 Jan 2011)
+
+  23 Jan 2011; Stefan Briesenick <sbriesen@gentoo.org>
+  +ez-ipupdate-3.0.11.13.3_beta8.ebuild,
+  files/ez-ipupdate-3.0.11_beta8-linux.diff,
+  +files/ez-ipupdate-3.0.11.13.3_beta8-3322.diff,
+  +files/ez-ipupdate-3.0.11.13.3_beta8-dnsexit.diff,
+  +files/ez-ipupdate-3.0.11.13.3_beta8-linux.diff:
+  fixed compile fail with kernel >= 2.6.35 (bug #337324) and update ebuild to
+  use latest debian patchset (bug #288275).
 
   29 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   ez-ipupdate-3.0.11_beta8-r6.ebuild:
diff --git a/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8.ebuild b/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8.ebuild
new file mode 100644
index 000000000000..a1a17171ebd0
--- /dev/null
+++ b/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8.ebuild,v 1.1 2011/01/23 20:19:26 sbriesen Exp $
+
+EAPI="2"
+
+inherit eutils versionator
+
+MY_BETA="$(get_version_component_range 6)"
+MY_PATCH="$(get_version_component_range 4-5)"
+MY_PV="$(get_version_component_range 1-3)${MY_BETA/beta/b}"
+
+DESCRIPTION="Dynamic DNS client for lots of dynamic dns services"
+HOMEPAGE="http://ez-ipupdate.com/"
+SRC_URI="mirror://debian/pool/main/e/ez-ipupdate/${PN}_${MY_PV}.orig.tar.gz
+	mirror://debian/pool/main/e/ez-ipupdate/${PN}_${MY_PV}-${MY_PATCH}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	# apply debian patches
+	epatch "${WORKDIR}/${PN}_${MY_PV}-${MY_PATCH}.diff"
+
+	# repair/apply additional debian patches
+	sed -i -e "s|^\(---\s*\)\.\./|\1|g" debian/patches/*.diff
+	EPATCH_SOURCE="${S}/debian/patches" EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch
+
+	# adding members.3322.org support
+	epatch "${FILESDIR}/${P}-3322.diff"
+
+	# adding www.dnsexit.com support
+	epatch "${FILESDIR}/${P}-dnsexit.diff"
+
+	# make ez-ipupdate work with iproute2/dhcpcd under linux (bug #318905)
+	epatch "${FILESDIR}/${P}-linux.diff"
+
+	# repair format mask issues
+	sed -i -e "s|\(\s*\)\(strlen(putbuf)\)|\1(int)\2|g" ez-ipupdate.c
+
+	# comment out obsolete options
+	sed -i -e "s:^\(run-as-user.*\):#\1:g" \
+		-e "s:^\(cache-file.*\):#\1:g" ex*conf
+
+	# make 'missing' executable (bug #103480)
+	chmod +x missing
+}
+
+src_configure() {
+	econf --bindir=/usr/sbin || die "econf failed"
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newinitd "${FILESDIR}/ez-ipupdate.initd" ez-ipupdate
+	keepdir /etc/ez-ipupdate /var/cache/ez-ipupdate
+
+	# install docs
+	dodoc README
+	newdoc debian/README.Debian README.debian
+	newdoc debian/changelog ChangeLog.debian
+	newdoc CHANGELOG ChangeLog
+	doman debian/ez-ipupdate.8
+
+	# install example configs
+	docinto examples
+	dodoc ex*conf
+}
+
+pkg_preinst() {
+	enewgroup ez-ipupd
+	enewuser ez-ipupd -1 -1 /var/cache/ez-ipupdate ez-ipupd
+}
+
+pkg_postinst() {
+	chmod 750 /etc/ez-ipupdate /var/cache/ez-ipupdate
+	chown ez-ipupd:ez-ipupd /etc/ez-ipupdate /var/cache/ez-ipupdate
+
+	elog
+	elog "Please create one or more config files in"
+	elog "/etc/ez-ipupdate/. A bunch of samples can"
+	elog "be found in the doc directory."
+	elog
+	elog "All config files must have a '.conf' extension."
+	elog
+	elog "Please do not use the 'run-as-user', 'run-as-euser',"
+	elog "'cache-file' and 'pidfile' options, since these are"
+	elog "handled internally by the init-script!"
+	elog
+	elog "If you want to use ez-ipupdate in daemon mode,"
+	elog "please add 'daemon' to the config file(s) and"
+	elog "add the ez-ipupdate init-script to the default"
+	elog "runlevel."
+	elog
+	elog "Without the 'daemon' option, you can run the"
+	elog "init-script with the 'update' parameter inside"
+	elog "your PPP ip-up script."
+	elog
+
+	if [ -f /etc/ez-ipupdate.conf ]; then
+		elog "!!! IMPORTANT UPDATE NOTICE !!!"
+		elog
+		elog "The ez-ipupdate init-script can now handle more"
+		elog "than one config file. New config file location is"
+		elog "/etc/ez-ipupdate/*.conf"
+		elog
+		if [ ! -f /etc/ez-ipupdate/default.conf ]; then
+			mv -f /etc/ez-ipupdate.conf /etc/ez-ipupdate/default.conf
+			elog "Your old configuration has been moved to"
+			elog "/etc/ez-ipupdate/default.conf"
+			elog
+		fi
+	fi
+}
diff --git a/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-3322.diff b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-3322.diff
new file mode 100644
index 000000000000..d6bf0152a098
--- /dev/null
+++ b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-3322.diff
@@ -0,0 +1,65 @@
+diff -Naur ez-ipupdate-3.0.11b8.orig/example-3322.conf ez-ipupdate-3.0.11b8/example-3322.conf
+--- ez-ipupdate-3.0.11b8.orig/example-3322.conf	1970-01-01 01:00:00.000000000 +0100
++++ ez-ipupdate-3.0.11b8/example-3322.conf	2011-01-23 19:30:43.785652588 +0100
+@@ -0,0 +1,19 @@
++#!/usr/local/bin/ez-ipupdate -c
++#
++# example config file for ez-ipupdate
++#
++# this file is actually executable!
++#
++
++service-type=qdns
++#service-type=qdns-static
++user=myuserid:mypassword
++host=mydomain.whatever.com
++interface=eth1
++max-interval=2073600
++
++# uncomment this once you have everything working how you want and you are
++# ready to have ez-ipupdate running in the background all the time. to stop it
++# you can use "killall -QUIT ez-ipupdate" under linux.
++#daemon
++
+diff -Naur ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c ez-ipupdate-3.0.11b8/ez-ipupdate.c
+--- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c	2011-01-23 19:29:17.698793394 +0100
++++ ez-ipupdate-3.0.11b8/ez-ipupdate.c	2011-01-23 19:29:17.799792055 +0100
+@@ -103,6 +103,11 @@
+ #define HEIPV6TB_DEFAULT_PORT "80"
+ #define HEIPV6TB_REQUEST "/index.cgi"
+ 
++#define QDNS_DEFAULT_SERVER "members.3322.org"
++#define QDNS_DEFAULT_PORT "80"
++#define QDNS_REQUEST "/dyndns/update"
++#define QDNS_STAT_REQUEST "/dyndns/update"
++
+ #define DEFAULT_TIMEOUT 120
+ #define DEFAULT_UPDATE_PERIOD 120
+ #define DEFAULT_RESOLV_PERIOD 30
+@@ -514,6 +519,26 @@
+     HEIPV6TB_DEFAULT_PORT,
+     HEIPV6TB_REQUEST
+   },
++  { "qdns",
++    { "qdns", 0, 0, },
++    DYNDNS_init,
++    DYNDNS_update_entry,
++    DYNDNS_check_info,
++    DYNDNS_fields_used,
++    QDNS_DEFAULT_SERVER,
++    QDNS_DEFAULT_PORT,
++    QDNS_REQUEST
++  },
++  { "qdns-static",
++    { "qdns-static", "qdns-stat", "statdns", },
++    DYNDNS_init,
++    DYNDNS_update_entry,
++    DYNDNS_check_info,
++    DYNDNS_STAT_fields_used,
++    QDNS_DEFAULT_SERVER,
++    QDNS_DEFAULT_PORT,
++    QDNS_STAT_REQUEST
++  },
+ };
+ 
+ static struct service_t *service = NULL;
diff --git a/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-dnsexit.diff b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-dnsexit.diff
new file mode 100644
index 000000000000..fd80485f0f4f
--- /dev/null
+++ b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-dnsexit.diff
@@ -0,0 +1,262 @@
+diff -Naur ez-ipupdate-3.0.11b8.orig/example-dnsexit.conf ez-ipupdate-3.0.11b8/example-dnsexit.conf
+--- ez-ipupdate-3.0.11b8.orig/example-dnsexit.conf	1970-01-01 01:00:00.000000000 +0100
++++ ez-ipupdate-3.0.11b8/example-dnsexit.conf	2011-01-23 19:32:53.181937517 +0100
+@@ -0,0 +1,19 @@
++#!/usr/sbin/ez-ipupdate -c
++#
++# example config file for ez-ipupdate
++#
++# this file is actually executable!
++#
++
++service-type=dnsexit
++user=loginname:password
++host=www.yourdomain.com
++interface=eth1
++
++run-as-user=ez-ipupd
++cache-file=/var/cache/ez-ipupdate/default-cache
++
++# uncomment this once you have everything working how you want and you are
++# ready to have ez-ipupdate running in the background all the time. to stop it
++# you can use "killall -QUIT ez-ipupdate" under linux.
++#daemon
+diff -Naur ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c ez-ipupdate-3.0.11b8/ez-ipupdate.c
+--- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c	2011-01-23 19:32:53.074938936 +0100
++++ ez-ipupdate-3.0.11b8/ez-ipupdate.c	2011-01-23 19:32:53.182937505 +0100
+@@ -103,6 +103,10 @@
+ #define HEIPV6TB_DEFAULT_PORT "80"
+ #define HEIPV6TB_REQUEST "/index.cgi"
+ 
++#define DNSEXIT_DEFAULT_SERVER "www.dnsexit.com"
++#define DNSEXIT_DEFAULT_PORT "80"
++#define DNSEXIT_REQUEST "/RemoteUpdate.sv"
++
+ #define DEFAULT_TIMEOUT 120
+ #define DEFAULT_UPDATE_PERIOD 120
+ #define DEFAULT_RESOLV_PERIOD 30
+@@ -341,6 +345,11 @@
+ int HEIPV6TB_check_info(void);
+ static char *HEIPV6TB_fields_used[] = { "server", "user", NULL };
+ 
++int DNSEXIT_update_entry(void);
++int DNSEXIT_check_info(void);
++static char *DNSEXIT_fields_used[] = { "server", "user", "address", "wildcard", "mx", "host", NULL };
++
++
+ struct service_t services[] = {
+   { "NULL",
+     { "null", "NULL", 0, },
+@@ -514,6 +523,16 @@
+     HEIPV6TB_DEFAULT_PORT,
+     HEIPV6TB_REQUEST
+   },
++  { "dnsexit",
++	{ "dnsexit", 0, 0, },
++	NULL,
++	DNSEXIT_update_entry,
++	DNSEXIT_check_info,
++	DNSEXIT_fields_used,
++	DNSEXIT_DEFAULT_SERVER,
++	DNSEXIT_DEFAULT_PORT,
++	DNSEXIT_REQUEST
++  },	  
+ };
+ 
+ static struct service_t *service = NULL;
+@@ -4241,6 +4260,195 @@
+       }
+       return(UPDATERES_ERROR);
+       break;
++  }
++
++  return(UPDATERES_OK);
++}
++
++int DNSEXIT_check_info(void)
++{
++  char buf[BUFSIZ+1];
++
++  if((host == NULL) || (*host == '\0'))
++  {
++    if(options & OPT_DAEMON)
++    {
++      return(-1);
++    }
++    if(host) { free(host); }
++    printf("host: ");
++    *buf = '\0';
++    fgets(buf, BUFSIZ, stdin);
++    host = strdup(buf);
++    chomp(host);
++  }
++
++  if(interface == NULL && address == NULL)
++  {
++    if(options & OPT_DAEMON)
++    {
++      fprintf(stderr, "you must provide either an interface or an address\n");
++      return(-1);
++    }
++    if(interface) { free(interface); }
++    printf("interface: ");
++    *buf = '\0';
++    fgets(buf, BUFSIZ, stdin);
++    chomp(buf);
++    option_handler(CMD_interface, buf);
++  }
++
++  warn_fields(service->fields_used);
++
++  return 0;
++}
++
++int DNSEXIT_update_entry(void)
++{
++  char buf[BUFFER_SIZE+1];
++  char *bp = buf;
++  int bytes;
++  int btot;
++  int ret;
++
++  buf[BUFFER_SIZE] = '\0';
++
++  if(do_connect((int*)&client_sockfd, server, port) != 0)
++  {
++    if(!(options & OPT_QUIET))
++    {
++      show_message("error connecting to %s:%s\n", server, port);
++    }
++    return(UPDATERES_ERROR);
++  }
++
++  snprintf(buf, BUFFER_SIZE, "GET %s?action=edit&", request);
++  output(buf);
++  if(address != NULL && *address != '\0')
++  {
++    snprintf(buf, BUFFER_SIZE, "%s=%s&", "myip", address);
++    output(buf);
++  }
++  snprintf(buf, BUFFER_SIZE, "%s=%s&", "wildcard", wildcard ? "ON" : "OFF");
++  output(buf);
++  snprintf(buf, BUFFER_SIZE, "%s=%s&", "mx", mx);
++  output(buf);
++  snprintf(buf, BUFFER_SIZE, "%s=%s&", "backmx", *mx == '\0' ? "NO" : "YES");
++  output(buf);
++  snprintf(buf, BUFFER_SIZE, "%s=%s&", "host", host);
++  output(buf);
++  snprintf(buf, BUFFER_SIZE, "%s=%s&", "login", user_name);
++  output(buf);
++  snprintf(buf, BUFFER_SIZE, "%s=%s&", "password", password);
++  output(buf);
++  snprintf(buf, BUFFER_SIZE, " HTTP/1.0\015\012");
++  output(buf);
++  snprintf(buf, BUFFER_SIZE, "Authorization: Basic %s\015\012", auth);
++  output(buf);
++  snprintf(buf, BUFFER_SIZE, "User-Agent: %s-%s %s [%s] (%s)\015\012",
++      "ez-update", VERSION, OS, (options & OPT_DAEMON) ? "daemon" : "", "by Angus Mackay");
++  output(buf);
++  snprintf(buf, BUFFER_SIZE, "Host: %s\015\012", server);
++  output(buf);
++  snprintf(buf, BUFFER_SIZE, "\015\012");
++  output(buf);
++
++  bp = buf;
++  bytes = 0;
++  btot = 0;
++  while((bytes=read_input(bp, BUFFER_SIZE-btot)) > 0)
++  {
++    bp += bytes;
++    btot += bytes;
++    dprintf((stderr, "btot: %d\n", btot));
++  }
++  close(client_sockfd);
++  buf[btot] = '\0';
++
++  dprintf((stderr, "server output: %s\n", buf));
++
++  if(sscanf(buf, " HTTP/1.%*c %3d", &ret) != 1)
++  {
++    ret = -1;
++  }
++
++  switch(ret)
++  {
++    case -1:
++      if(!(options & OPT_QUIET))
++      {
++        show_message("strange server response, are you connecting to the right server?\n");
++      }
++      return(UPDATERES_ERROR);
++      break;
++
++    case 200:
++
++      if(strstr(buf, "0=Success") != NULL)
++      {
++        if(!(options & OPT_QUIET))
++        {
++          printf("Request successful\n");
++        }
++      }
++      else if(strstr(buf, "1=IP is the same as the IP on the system") != NULL)
++      {
++        if(!(options & OPT_QUIET))
++        {
++          printf("Request successful but the IP is the same as previous update\n");
++        }
++      }
++      else if(strstr(buf, "2=Invalid passwords") != NULL)
++      {
++        if(!(options & OPT_QUIET))
++        {
++          printf("Invalid Password\n");
++        }
++      }
++      else if(strstr(buf, "3=User not found") != NULL)
++      {
++        if(!(options & OPT_QUIET))
++        {
++          printf("Username not found\n");
++        }
++      }
++      else if(strstr(buf, "4=Update too often") != NULL)
++      {
++        if(!(options & OPT_QUIET))
++        {
++          printf("Updatting too often\n");
++        }
++      }
++      else
++      {
++        show_message("Errors return from server\n");
++        if(!(options & OPT_QUIET))
++        {
++          fprintf(stderr, "server output: %s\n", buf);
++        }
++        return(UPDATERES_ERROR);
++      }
++      break;
++
++    case 401:
++      if(!(options & OPT_QUIET))
++      {
++        show_message("authentication failure\n");
++      }
++      return(UPDATERES_SHUTDOWN);
++      break;
++
++    default:
++      if(!(options & OPT_QUIET))
++      {
++        // reuse the auth buffer
++        *auth = '\0';
++        sscanf(buf, " HTTP/1.%*c %*3d %255[^\r\n]", auth);
++        show_message("unknown return code: %d\n", ret);
++        show_message("server response: %s\n", auth);
++      }
++      return(UPDATERES_ERROR);
++      break;
+   }
+ 
+   return(UPDATERES_OK);
diff --git a/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-linux.diff b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-linux.diff
new file mode 100644
index 000000000000..8a282bb58c34
--- /dev/null
+++ b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11.13.3_beta8-linux.diff
@@ -0,0 +1,213 @@
+diff -Naur ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c ez-ipupdate-3.0.11b8/ez-ipupdate.c
+--- ez-ipupdate-3.0.11b8.orig/ez-ipupdate.c	2011-01-23 19:35:10.885111914 +0100
++++ ez-ipupdate-3.0.11b8/ez-ipupdate.c	2011-01-23 19:35:10.979110667 +0100
+@@ -172,6 +172,17 @@
+ #  ifdef HAVE_SYS_SOCKIO_H
+ #    include <sys/sockio.h>
+ #  endif
++#  ifdef __linux__
++/*#  include <linux/if.h> */
++#    include <linux/netlink.h>
++#    include <linux/rtnetlink.h>
++/* Under Linux, we reopen socket in get_if_addr() every time */
++#    define socketopen(sock)
++#    define socketclose(sock)
++#  else
++#    define socketopen(sock) sock = socket(AF_INET, SOCK_STREAM, 0)
++#    define socketclose(sock) close(sock)
++#  endif
+ #endif
+ 
+ #include <dprintf.h>
+@@ -1605,6 +1616,114 @@
+ int get_if_addr(int sock, char *name, struct sockaddr_in *sin)
+ {
+ #ifdef IF_LOOKUP
++#ifdef __linux__
++	struct {
++		struct nlmsghdr nlmsg_info;
++		struct ifaddrmsg ifaddrmsg_info;
++		char buffer[2048];
++	} req;
++	struct nlmsghdr *curr;
++	int len;
++	char buf[8192];
++
++	/* open a socket and bind it.
++	   Under non-linux, the socket can be kept open, but it seems under
++	   linux we cannot use the same socket for several requests reliable
++	   [although sometimes it works...] */
++	static struct sockaddr_nl local;
++	sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
++	if(sock < 0) {
++		perror("socket");
++		return -1;
++	}
++	local.nl_family = AF_NETLINK;
++	local.nl_pad = 0;
++	local.nl_pid = getpid();
++	local.nl_groups = 0;
++	if(bind(sock, (struct sockaddr*) &local, sizeof(local)) < 0) {
++		perror("bind");
++		close(sock);
++		return -1;
++	}
++
++	memset(&req, 0, sizeof(req));
++	req.nlmsg_info.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg));
++	req.nlmsg_info.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
++	req.nlmsg_info.nlmsg_type = RTM_GETADDR;
++	req.nlmsg_info.nlmsg_pid = getpid();
++	req.ifaddrmsg_info.ifa_family = AF_INET;
++	if(send(sock, &req, req.nlmsg_info.nlmsg_len, 0) < 0) {
++		perror("sendmsg(sock)");
++		close(sock);
++		return -1;
++	}
++
++	len = recv(sock, buf, sizeof(buf), 0);
++	close(sock);
++	if(len < 0) {
++		perror("recv");
++		return -1;
++	} else if(len == 0) {
++		dprintf((stderr, "No interfaces found"));
++		return -1;
++	}
++
++	/* Initialize sin except for address */
++	bzero(sin, sizeof(struct sockaddr_in));
++	sin->sin_family = AF_INET;
++
++	/* We take the last non-private IP with matching name */
++	int found = 0;
++	curr = (struct nlmsghdr *) buf;
++	for(; NLMSG_OK(curr, len); curr = NLMSG_NEXT(curr, len)) {
++		struct ifaddrmsg *curraddr = (struct ifaddrmsg *) NLMSG_DATA(curr);
++		struct rtattr *datalist = (struct rtattr *) IFA_RTA(curraddr);
++		int datalen = IFA_PAYLOAD(curr);
++		int mystat = 0;
++		struct in_addr sin_addr;
++		in_addr_t addr;
++		for(; RTA_OK(datalist, datalen); datalist = RTA_NEXT(datalist, datalen)) {
++			switch(datalist->rta_type) {
++			case IFA_LABEL:
++				if(strcmp((char *)RTA_DATA(datalist), name) != 0)
++					mystat = -1;
++				break;
++			case IFA_LOCAL:
++				addr = ((struct in_addr *)RTA_DATA(datalist))->s_addr;
++				/* addr: 192.168.0.0/16 || 172.16.0.0/12 || 10.0.0.0/8 */
++				if(((addr & 0xFFFF) == 0xA8C0)
++				||	((addr & 0xF0FF) == 0x10AC)
++				||	((addr & 0xFF) == 0x0A)) {
++					mystat = -1;
++				}
++				else {
++				/* We must not store yet sin->sin_addr, since name might not match */
++					sin_addr = *((struct in_addr *)RTA_DATA(datalist));
++					mystat = 1;
++				}
++				break;
++			default:
++				break;
++			}
++			if(mystat < 0)
++				break;
++		}
++		if(mystat > 0) {
++			sin->sin_addr = sin_addr;
++			found = 1;
++			/* If you want to take the first non-private IP with matching name
++			   uncomment the next break command:
++			break; */
++		}
++	}
++	if(found) {
++		dprintf((stderr, "%s: %s\n", name, inet_ntoa(sin->sin_addr)));
++		return 0;
++	}
++	dprintf((stderr, "%s: %s\n", name, "has no non-private address"));
++	return -1;
++#else
++/* ifndef __linux__ */
+   struct ifreq ifr;
+ 
+   memset(&ifr, 0, sizeof(ifr));
+@@ -1638,7 +1757,10 @@
+     return -1;
+   }
+   return -1;
++#endif
++/* endif __linux__ */
+ #else
++/* ifndef IF_LOOKUP */
+   return -1;
+ #endif
+ }
+@@ -4490,7 +4612,7 @@
+ #ifdef IF_LOOKUP
+   if(options & OPT_DAEMON)
+   {
+-    sock = socket(AF_INET, SOCK_STREAM, 0);
++    socketopen(sock);
+   }
+ #endif
+ 
+@@ -4745,12 +4867,12 @@
+           struct sockaddr_in sin;
+           int sock;
+ 
+-          sock = socket(AF_INET, SOCK_STREAM, 0);
++          socketopen(sock);
+           if(get_if_addr(sock, interface, &sin) != 0)
+           {
+             exit(1);
+           }
+-          close(sock);
++          socketclose(sock);
+           snprintf(ipbuf, sizeof(ipbuf), "%s", inet_ntoa(sin.sin_addr));
+ #else
+           fprintf(stderr, "interface lookup not enabled at compile time\n");
+@@ -4791,7 +4913,7 @@
+         struct sockaddr_in sin;
+         int sock;
+ 
+-        sock = socket(AF_INET, SOCK_STREAM, 0);
++        socketopen(sock);
+         if(get_if_addr(sock, interface, &sin) == 0)
+         {
+           if(address) { free(address); }
+@@ -4802,7 +4924,7 @@
+           show_message("could not resolve ip address for %s.\n", interface);
+           exit(1);
+         }
+-        close(sock);
++        socketclose(sock);
+       }
+ 
+       for(i=0; i<ntrys; i++)
+@@ -4846,12 +4968,12 @@
+           struct sockaddr_in sin;
+           int sock;
+ 
+-          sock = socket(AF_INET, SOCK_STREAM, 0);
++          socketopen(sock);
+           if(get_if_addr(sock, interface, &sin) != 0)
+           {
+             exit(1);
+           }
+-          close(sock);
++          socketclose(sock);
+           snprintf(ipbuf, sizeof(ipbuf), "%s", inet_ntoa(sin.sin_addr));
+ #else
+           fprintf(stderr, "interface lookup not enabled at compile time\n");
+@@ -4878,7 +5000,7 @@
+   }
+ 
+ #ifdef IF_LOOKUP
+-  if(sock > 0) { close(sock); }
++  if(sock > 0) { socketclose(sock); }
+ #endif
+ 
+   if(address) { free(address); }
diff --git a/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11_beta8-linux.diff b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11_beta8-linux.diff
index 22d45190682a..727538cd6f97 100644
--- a/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11_beta8-linux.diff
+++ b/net-dns/ez-ipupdate/files/ez-ipupdate-3.0.11_beta8-linux.diff
@@ -5,7 +5,7 @@
  #    include <sys/sockio.h>
  #  endif
 +#  ifdef __linux__
-+#    include <linux/if.h>
++/*#    include <linux/if.h> */
 +#    include <linux/netlink.h>
 +#    include <linux/rtnetlink.h>
 +/* Under Linux, we reopen socket in get_if_addr() every time */