diff options
| author | rakuco <rakuco@FreeBSD.org> | 2013-05-19 07:09:58 +0800 |
|---|---|---|
| committer | rakuco <rakuco@FreeBSD.org> | 2013-05-19 07:09:58 +0800 |
| commit | abe17737c9db13fec763d8149577e8af7a882df2 (patch) | |
| tree | c953f17b112b90ba7219356ed154f70c764d9e1b | |
| parent | 1e9a9eddf9c9e98e89b6fc1751906efbd206fb90 (diff) | |
| download | freebsd-ports-gnome-abe17737c9db13fec763d8149577e8af7a882df2.tar.gz freebsd-ports-gnome-abe17737c9db13fec763d8149577e8af7a882df2.tar.zst freebsd-ports-gnome-abe17737c9db13fec763d8149577e8af7a882df2.zip | |
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@tipstrade.net>
Approved by: maintainer timeout (93 days)
| -rw-r--r-- | net/iaxmodem/Makefile | 8 | ||||
| -rw-r--r-- | 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 <filippo.natali@gmail.com> -# +# Created by: Filippo Natali <filippo.natali@gmail.com> # $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 <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; + } |