svn commit: r318465 - in head/net/iaxmodem: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Sat May 18 23:09:58 2013
New Revision: 318465
URL: http://svnweb.freebsd.org/changeset/ports/318465

Log:
  Implement upstream fix where multiple net/iaxmodem instances are spawned.
  
  Multiple instances of iaxmodem are being spawned due to a badly placed
  closedir call. The fix has been submitted (and accepted) upstream, however
  there has been no new release since the fix was submitted.
  
  PR:		ports/176178
  Submitted by:	John Bayly <freebsd.ports at tipstrade.net>
  Approved by:	maintainer timeout (93 days)

Modified:
  head/net/iaxmodem/Makefile
  head/net/iaxmodem/files/patch-iaxmodem.c

Modified: head/net/iaxmodem/Makefile
==============================================================================
--- head/net/iaxmodem/Makefile	Sat May 18 22:54:31 2013	(r318464)
+++ head/net/iaxmodem/Makefile	Sat May 18 23:09:58 2013	(r318465)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	iaxmodem
-# Date created:				15 Jun 2006
-# Whom:					Filippo Natali <filippo.natali at gmail.com>
-#
+# Created by: Filippo Natali <filippo.natali at gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	iaxmodem
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net comms
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 

Modified: head/net/iaxmodem/files/patch-iaxmodem.c
==============================================================================
--- head/net/iaxmodem/files/patch-iaxmodem.c	Sat May 18 22:54:31 2013	(r318464)
+++ head/net/iaxmodem/files/patch-iaxmodem.c	Sat May 18 23:09:58 2013	(r318465)
@@ -49,3 +49,20 @@
  #include <tiffio.h>
  
  #ifndef O_LARGEFILE
+@@ -1645,8 +1666,6 @@
+ 	}
+       }
+ 
+-    closedir(cfdir);
+-
+     if (pid == 0) {
+       /* Start the modem */
+       iaxmodem(config, 0);
+@@ -1654,6 +1673,8 @@
+       return 1;
+     }
+ 
++    closedir(cfdir);
++
+     return 0;
+ }