From c801875fa461b840d410b6e5e24fb80d5f41131c Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Sat, 18 May 2013 23:09:58 +0000 Subject: [PATCH] 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 Approved by: maintainer timeout (93 days) --- net/iaxmodem/Makefile | 8 ++------ net/iaxmodem/files/patch-iaxmodem.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/net/iaxmodem/Makefile b/net/iaxmodem/Makefile index bf65608c268d..ce9fc349beda 100644 --- a/net/iaxmodem/Makefile +++ b/net/iaxmodem/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: iaxmodem -# Date created: 15 Jun 2006 -# Whom: Filippo Natali -# +# Created by: Filippo Natali # $FreeBSD$ -# PORTNAME= iaxmodem PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net comms MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/net/iaxmodem/files/patch-iaxmodem.c b/net/iaxmodem/files/patch-iaxmodem.c index 98ad623f93a8..5e3485bd021a 100644 --- a/net/iaxmodem/files/patch-iaxmodem.c +++ b/net/iaxmodem/files/patch-iaxmodem.c @@ -49,3 +49,20 @@ #include #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; + }