From owner-svn-ports-all@freebsd.org  Fri Aug 14 15:03:31 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C280D9B968A;
 Fri, 14 Aug 2015 15:03:31 +0000 (UTC)
 (envelope-from garga@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B2DC6168E;
 Fri, 14 Aug 2015 15:03:31 +0000 (UTC)
 (envelope-from garga@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7EF3VwD092572;
 Fri, 14 Aug 2015 15:03:31 GMT (envelope-from garga@FreeBSD.org)
Received: (from garga@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7EF3V74092570;
 Fri, 14 Aug 2015 15:03:31 GMT (envelope-from garga@FreeBSD.org)
Message-Id: <201508141503.t7EF3V74092570@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: garga set sender to
 garga@FreeBSD.org using -f
From: Renato Botelho <garga@FreeBSD.org>
Date: Fri, 14 Aug 2015 15:03:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r394223 - in head/net/mpd5: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Aug 2015 15:03:31 -0000

Author: garga
Date: Fri Aug 14 15:03:30 2015
New Revision: 394223
URL: https://svnweb.freebsd.org/changeset/ports/394223

Log:
  - Backport mpd5 fix (rev. 1224):
  
  Do not print warning, when we a renaming interface to existing name
  https://forum.pfsense.org/index.php?topic=41061.msg476926
  
  - Bump PORTREVISION
  
  PR:		200722
  Approved by:	maintainer timeout (> 2 months)
  Sponsored by:	Netgate

Added:
  head/net/mpd5/files/patch-src_file.c   (contents, props changed)
Modified:
  head/net/mpd5/Makefile

Modified: head/net/mpd5/Makefile
==============================================================================
--- head/net/mpd5/Makefile	Fri Aug 14 14:51:58 2015	(r394222)
+++ head/net/mpd5/Makefile	Fri Aug 14 15:03:30 2015	(r394223)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpd
 DISTVERSION=	5.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION}
 PKGNAMESUFFIX=	5

Added: head/net/mpd5/files/patch-src_file.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/mpd5/files/patch-src_file.c	Fri Aug 14 15:03:30 2015	(r394223)
@@ -0,0 +1,17 @@
+--- src/iface.c	2015/05/13 12:31:43	1.223
++++ src/iface.c	2015/06/02 08:57:13	1.224
+@@ -3654,9 +3654,11 @@
+ 	b->name, iface->ifname, ifname));
+ 
+     if (ioctl(s, SIOCSIFNAME, (caddr_t)&ifr) < 0) {
+-	Perror("[%s] IFACE: ioctl(%s, SIOCSIFNAME)", b->name, iface->ifname);
+-	close(s);
+-	return(-1);
++	if (errno != EEXIST) {
++	    Perror("[%s] IFACE: ioctl(%s, SIOCSIFNAME)", b->name, iface->ifname);
++	    close(s);
++	    return(-1);
++	}
+     }
+ 
+     close(s);