Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Aug 2015 15:03:31 +0000 (UTC)
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r394223 - in head/net/mpd5: . files
Message-ID:  <201508141503.t7EF3V74092570@repo.freebsd.org>

Next in thread | Raw E-Mail | Index | Archive | Help
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);



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?201508141503.t7EF3V74092570>