Update to 10.2.1:

This is a security fix release.  It fixes AST-2012-002 and AST-2012-003.

pkgsrc changes:

- adapt to having iLBC source code included
- fix building on Solaris
- adapt to new sound tarball

----- 10.2.0 -----

The Asterisk Development Team has announced the release of Asterisk 10.2.0.

The release of Asterisk 10.2.0 resolves several issues reported by the
community and would have not been possible without your participation.
Thank you!

The following is a sample of the issues resolved in this release:

* --- Prevent outbound SIP NOTIFY packets from displaying a port of 0 ---

* --- Include iLBC source code for distribution with Asterisk ---

* --- Fix callerid of originated calls ---

* --- Fix outbound DTMF for inband mode of chan_ooh323 ---

* --- Create and initialize udptl only when dialog requests image media ---

* --- Don't prematurely stop SIP session timer ---

For a full list of changes in this release, please see the ChangeLog:

http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-10.2.0

Thank you for your continued support of Asterisk!

----- 10.2.1 -----

The Asterisk Development Team has announced security releases for
Asterisk 1.4, 1.6.2, 1.8, and 10. The available security releases
are released as versions 1.4.44, 1.6.2.23, 1.8.10.1, and 10.2.1.

The release of Asterisk 1.8.10.1 and 10.2.1 resolve two issues.
First, they resolve the issue in app_milliwatt, wherein a buffer
can potentially be overrun on the stack, but no remote code execution
is possible.  Second, they resolve an issue in HTTP AMI where digest
authentication information can be used to overrun a buffer on the
stack, allowing for code injection and execution.

These issues and their resolution are described in the security
advisory.

For more information about the details of these vulnerabilities,
please read the security advisories AST-2012-002 and AST-2012-003,
which were released at the same time as this announcement.

For a full list of changes in the current releases, please see the ChangeLogs:

http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-10.2.1

The security advisories are available at:

 * http://downloads.asterisk.org/pub/security/AST-2012-002.pdf
 * http://downloads.asterisk.org/pub/security/AST-2012-003.pdf

Thank you for your continued support of Asterisk!

7 files changed, 117 insertions, 55 deletions

diff --git a/comms/asterisk10/Makefile b/comms/asterisk10/Makefile
index 9b3000e6dda..77958fd4695 100644
--- a/comms/asterisk10/Makefile
+++ b/comms/asterisk10/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2012/03/03 12:54:15 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2012/03/25 02:17:47 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-10.1.3
+DISTNAME=	asterisk-10.2.1
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
-PKGREVISION=	1
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -91,6 +90,15 @@ MAKE_FLAGS+=		LDOPTS=${LDFLAGS:M*:Q}
 MAKE_FLAGS+=		HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs
 MAKE_FLAGS+=		HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin
 
+.if !empty(MACHINE_PLATFORM:MSunOS-*-i386)
+BUILDLINK_TRANSFORM+=	rm:-march=i386
+.endif
+
+PLIST_VARS+=	kqueue
+.if exists(/usr/include/sys/event.h)
+PLIST.kqueue=	yes
+.endif
+
 .include "options.mk"
 
 # check sounds/Makefile for current version when upgrading package
@@ -186,7 +194,7 @@ post-patch:
 
 post-install:
 # check sounds directory for current versions when upgrading package
-	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.21.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
+	${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.22.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${TAR} xzf ${WRKSRC}/sounds/asterisk-moh-opsound-wav-2.03.tar.gz -C ${DESTDIR}${ASTDATADIR}/moh
 	${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
 	${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
diff --git a/comms/asterisk10/PLIST b/comms/asterisk10/PLIST
index da38b036696..773003e1d1f 100644
--- a/comms/asterisk10/PLIST
+++ b/comms/asterisk10/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/01/28 20:39:10 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/03/25 02:17:47 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -338,7 +338,7 @@ lib/asterisk/modules/res_security_log.so
 lib/asterisk/modules/res_smdi.so
 lib/asterisk/modules/res_speech.so
 lib/asterisk/modules/res_stun_monitor.so
-lib/asterisk/modules/res_timing_kqueue.so
+${PLIST.kqueue}lib/asterisk/modules/res_timing_kqueue.so
 lib/asterisk/modules/res_timing_pthread.so
 lib/pkgconfig/asterisk.pc
 libdata/asterisk/documentation/appdocsxml.dtd
@@ -360,13 +360,13 @@ libdata/asterisk/phoneprov/000000000000.cfg
 libdata/asterisk/phoneprov/polycom.xml
 libdata/asterisk/phoneprov/polycom_line.xml
 libdata/asterisk/phoneprov/snom-mac.xml
-libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.21
+libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.22
 libdata/asterisk/sounds/en/1-for-am-2-for-pm.gsm
 libdata/asterisk/sounds/en/1-yes-2-no.gsm
-libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.21
+libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.22
 libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.11
-libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.21
-libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.21
+libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.22
+libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.22
 libdata/asterisk/sounds/en/T-changed-to.gsm
 libdata/asterisk/sounds/en/T-is-not-available.gsm
 libdata/asterisk/sounds/en/T-to-disable-ancmnt.gsm
@@ -607,8 +607,53 @@ libdata/asterisk/sounds/en/conf-userswilljoin.gsm
 libdata/asterisk/sounds/en/conf-userwilljoin.gsm
 libdata/asterisk/sounds/en/conf-waitforleader.gsm
 libdata/asterisk/sounds/en/conf-youareinconfnum.gsm
+libdata/asterisk/sounds/en/confbridge-begin-glorious-a.gsm
+libdata/asterisk/sounds/en/confbridge-begin-glorious-b.gsm
+libdata/asterisk/sounds/en/confbridge-begin-glorious-c.gsm
+libdata/asterisk/sounds/en/confbridge-begin-leader.gsm
+libdata/asterisk/sounds/en/confbridge-conf-begin.gsm
+libdata/asterisk/sounds/en/confbridge-conf-end.gsm
+libdata/asterisk/sounds/en/confbridge-dec-list-vol-in.gsm
+libdata/asterisk/sounds/en/confbridge-dec-list-vol-out.gsm
+libdata/asterisk/sounds/en/confbridge-dec-talk-vol-in.gsm
+libdata/asterisk/sounds/en/confbridge-dec-talk-vol-out.gsm
+libdata/asterisk/sounds/en/confbridge-has-joined.gsm
+libdata/asterisk/sounds/en/confbridge-has-left.gsm
+libdata/asterisk/sounds/en/confbridge-inc-list-vol-in.gsm
+libdata/asterisk/sounds/en/confbridge-inc-list-vol-out.gsm
+libdata/asterisk/sounds/en/confbridge-inc-talk-vol-in.gsm
+libdata/asterisk/sounds/en/confbridge-inc-talk-vol-out.gsm
+libdata/asterisk/sounds/en/confbridge-invalid.gsm
 libdata/asterisk/sounds/en/confbridge-join.gsm
+libdata/asterisk/sounds/en/confbridge-leave-in.gsm
+libdata/asterisk/sounds/en/confbridge-leave-out.gsm
 libdata/asterisk/sounds/en/confbridge-leave.gsm
+libdata/asterisk/sounds/en/confbridge-lock-extended.gsm
+libdata/asterisk/sounds/en/confbridge-lock-in.gsm
+libdata/asterisk/sounds/en/confbridge-lock-no-join.gsm
+libdata/asterisk/sounds/en/confbridge-lock-out.gsm
+libdata/asterisk/sounds/en/confbridge-locked.gsm
+libdata/asterisk/sounds/en/confbridge-menu-exit-in.gsm
+libdata/asterisk/sounds/en/confbridge-menu-exit-out.gsm
+libdata/asterisk/sounds/en/confbridge-mute-extended.gsm
+libdata/asterisk/sounds/en/confbridge-mute-in.gsm
+libdata/asterisk/sounds/en/confbridge-mute-out.gsm
+libdata/asterisk/sounds/en/confbridge-muted.gsm
+libdata/asterisk/sounds/en/confbridge-only-one.gsm
+libdata/asterisk/sounds/en/confbridge-only-participant.gsm
+libdata/asterisk/sounds/en/confbridge-participants.gsm
+libdata/asterisk/sounds/en/confbridge-pin-bad.gsm
+libdata/asterisk/sounds/en/confbridge-pin.gsm
+libdata/asterisk/sounds/en/confbridge-remove-last-in.gsm
+libdata/asterisk/sounds/en/confbridge-remove-last-out.gsm
+libdata/asterisk/sounds/en/confbridge-removed.gsm
+libdata/asterisk/sounds/en/confbridge-rest-list-vol-in.gsm
+libdata/asterisk/sounds/en/confbridge-rest-list-vol-out.gsm
+libdata/asterisk/sounds/en/confbridge-rest-talk-vol-in.gsm
+libdata/asterisk/sounds/en/confbridge-rest-talk-vol-out.gsm
+libdata/asterisk/sounds/en/confbridge-there-are.gsm
+libdata/asterisk/sounds/en/confbridge-unlocked.gsm
+libdata/asterisk/sounds/en/confbridge-unmuted.gsm
 libdata/asterisk/sounds/en/conference-call.gsm
 libdata/asterisk/sounds/en/conference-reservations.gsm
 libdata/asterisk/sounds/en/conference.gsm
diff --git a/comms/asterisk10/distinfo b/comms/asterisk10/distinfo
index 5cbd149c73a..563c309b9fb 100644
--- a/comms/asterisk10/distinfo
+++ b/comms/asterisk10/distinfo
@@ -1,28 +1,22 @@
-$NetBSD: distinfo,v 1.6 2012/02/27 00:18:09 jnemeth Exp $
+$NetBSD: distinfo,v 1.7 2012/03/25 02:17:47 jnemeth Exp $
 
-SHA1 (asterisk-10.1.3/asterisk-10.1.3.tar.gz) = a61574d06e6dc1a6115f9624e0d0438a85aa05e4
-RMD160 (asterisk-10.1.3/asterisk-10.1.3.tar.gz) = 813aacebe3b2dde1f7f49b52987f505c4d542bfd
-Size (asterisk-10.1.3/asterisk-10.1.3.tar.gz) = 24738519 bytes
-SHA1 (asterisk-10.1.3/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-10.1.3/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-10.1.3/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
-SHA1 (asterisk-10.1.3/extract-cfile.txt) = b22874814c83a53bcd1a8d96b5911304f304971e
-RMD160 (asterisk-10.1.3/extract-cfile.txt) = e7205fe7e95793f3ca6e384edeef1ad5713485e0
-Size (asterisk-10.1.3/extract-cfile.txt) = 643 bytes
-SHA1 (asterisk-10.1.3/rfc3951.txt) = 1a6c769be750fb02456d60db2470909254496017
-RMD160 (asterisk-10.1.3/rfc3951.txt) = 15f7ec61653ec9953172f8f2150e7d8f6f620926
-Size (asterisk-10.1.3/rfc3951.txt) = 373442 bytes
+SHA1 (asterisk-10.2.1/asterisk-10.2.1.tar.gz) = 1353019ade550eccd7989dc87fa4313f42919fc7
+RMD160 (asterisk-10.2.1/asterisk-10.2.1.tar.gz) = ad4bf33d0d544e3a1ac28d1547c771fc6c80b31f
+Size (asterisk-10.2.1/asterisk-10.2.1.tar.gz) = 25121295 bytes
+SHA1 (asterisk-10.2.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
+RMD160 (asterisk-10.2.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
+Size (asterisk-10.2.1/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
 SHA1 (patch-Makefile) = 900252eff84bda22d2cbe09e0f22505531284cbb
 SHA1 (patch-apps_app__dial.c) = 2109ed50406dedc90a300981a3a7500b1397ff3a
 SHA1 (patch-apps_app__followme.c) = a0a507986ec9722337d46fdaaac0a79d23a634e4
 SHA1 (patch-apps_app__queue.c) = e035995563eb5533d5261568fdb43e8adcf2fe35
 SHA1 (patch-apps_app__sms.c) = 8013727b495dc0ac038eb28b84e9d3839d0bc23d
 SHA1 (patch-build__tools_mkpkgconfig) = 2bd3c0e24bc6d721cc234feb19b64a57106fcbe4
-SHA1 (patch-channels_chan__oss.c) = 78095d744a44b2e173de036f45a3b3d652cba311
+SHA1 (patch-channels_chan__oss.c) = 3a69c29f4106bfabe05f63118d73538e85478e88
 SHA1 (patch-codecs_lpc10_Makefile) = 0c9955e87eb453d70517951114d335d91b3ee73a
-SHA1 (patch-configure) = e1c6507a9ba2758c565043596d0314eabce2ef7d
+SHA1 (patch-configure) = e6be6277bc8896715a7b984e72d37616e2b29b77
 SHA1 (patch-configure.ac) = 27ac6fd657c490689ec06cddf7cd10e9cc8a7927
-SHA1 (patch-contrib_scripts_autosupport) = 3426d7c2c8fc6342ffecde57ce9530c233a51409
+SHA1 (patch-contrib_scripts_autosupport) = c6c1d917dd0544c4f54ae760f68cbcd1f35030f4
 SHA1 (patch-contrib_scripts_vmail.cgi) = 650b9bbf3e322d1ad351932cfe6f747baa8f35e4
 SHA1 (patch-include_asterisk_autoconfig.h.in) = 7d6e3443ce3f0741c72a5f2178895598e79e83c9
 SHA1 (patch-include_asterisk_endian.h) = 41c1a9a9e02fe394bc9261f5559e931b1378ea28
diff --git a/comms/asterisk10/options.mk b/comms/asterisk10/options.mk
index 36f0d3f76f2..7192e7c75f3 100644
--- a/comms/asterisk10/options.mk
+++ b/comms/asterisk10/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2012/01/17 07:07:33 jnemeth Exp $
+# $NetBSD: options.mk,v 1.3 2012/03/25 02:17:47 jnemeth Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -44,11 +44,6 @@ CONFIGURE_ARGS+=	--without-unixodbc
 .endif
 
 .if !empty(PKG_OPTIONS:Milbc)
-DISTFILES+=		rfc3951.txt
-SITES.rfc3951.txt=	http://www.ietf.org/rfc/
-DISTFILES+=		extract-cfile.txt
-SITES.extract-cfile.txt=	http://www.ilbcfreeware.org/documentation/
-USE_TOOLS+=		awk tr
 PLIST.ilbc=		yes
 .endif
 
@@ -83,13 +78,6 @@ post-configure:
 	${ECHO} "MENUSELECT_AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi" >> ${WRKSRC}/pkgsrc.makeopts
 	cd ${WRKSRC} && make menuselect.makeopts
 
-post-extract:
-.if !empty(PKG_OPTIONS:Milbc)
-	cp ${DISTDIR}/${DIST_SUBDIR}/rfc3951.txt ${WRKSRC}/codecs/ilbc
-	cp ${DISTDIR}/${DIST_SUBDIR}/extract-cfile.txt ${WRKSRC}/codecs/ilbc
-	cd ${WRKSRC}/codecs/ilbc && ${TR} -d '\r' < extract-cfile.txt | ${AWK} -f - rfc3951.txt
-.endif
-
 .if !empty(PKG_OPTIONS:Mwebvmail)
 DEPENDS+=		p5-DBI-[0-9]*:../../databases/p5-DBI
 SUBST_CLASSES+=		webvmail
diff --git a/comms/asterisk10/patches/patch-channels_chan__oss.c b/comms/asterisk10/patches/patch-channels_chan__oss.c
index ecaa640bb02..e9008a61004 100644
--- a/comms/asterisk10/patches/patch-channels_chan__oss.c
+++ b/comms/asterisk10/patches/patch-channels_chan__oss.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-channels_chan__oss.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-channels_chan__oss.c,v 1.2 2012/03/25 02:17:47 jnemeth Exp $
 
 --- channels/chan_oss.c.orig	2011-09-09 16:27:01.000000000 +0000
 +++ channels/chan_oss.c
@@ -11,3 +11,21 @@ $NetBSD: patch-channels_chan__oss.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  #include <sys/soundcard.h>
  #else
  #include <soundcard.h>
+@@ -250,7 +250,7 @@ struct chan_oss_pvt {
+ 	char *name;
+ 	int total_blocks;			/*!< total blocks in the output device */
+ 	int sounddev;
+-	enum { M_UNSET, M_FULL, M_READ, M_WRITE } duplex;
++	enum { M_UNSET, M_FULL, M_READ_foo, M_WRITE } duplex;
+ 	int autoanswer;             /*!< Boolean: whether to answer the immediately upon calling */
+ 	int autohangup;             /*!< Boolean: whether to hangup the call when the remote end hangs up */
+ 	int hookstate;              /*!< Boolean: 1 if offhook; 0 if onhook */
+@@ -517,7 +517,7 @@ static int setformat(struct chan_oss_pvt
+ 		break;
+ 
+ 	case O_RDONLY:
+-		o->duplex = M_READ;
++		o->duplex = M_READ_foo;
+ 		break;
+ 	}
+ 
diff --git a/comms/asterisk10/patches/patch-configure b/comms/asterisk10/patches/patch-configure
index 5e5ece1fec6..e41c9a413b8 100644
--- a/comms/asterisk10/patches/patch-configure
+++ b/comms/asterisk10/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-configure,v 1.2 2012/03/25 02:17:47 jnemeth Exp $
 
---- configure.orig	2011-10-06 22:58:40.000000000 +0000
+--- configure.orig	2012-01-14 16:41:55.000000000 +0000
 +++ configure
-@@ -24271,6 +24271,148 @@ fi
+@@ -16480,6 +16480,148 @@ fi
  
  
  
@@ -151,18 +151,18 @@ $NetBSD: patch-configure,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
  # The cast to long int works around a bug in the HP C Compiler
  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-@@ -28575,6 +28717,8 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+@@ -17486,6 +17628,8 @@ $as_echo_n "checking if \"struct ifaddrs
+ 
+ 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <ifaddrs.h>
++ #include <sys/types.h>
++ #include <sys/socket.h>
+  #include <ifaddrs.h>
  int
  main ()
-@@ -55532,10 +55676,9 @@ cat >>confdefs.h <<\_ACEOF
- #define HAVE_SBIN_LAUNCHD 1
- _ACEOF
+@@ -28858,10 +29002,9 @@ if test "x$ac_cv_file__sbin_launchd" = x
+ 
+ $as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h
  
 -fi
 -
diff --git a/comms/asterisk10/patches/patch-contrib_scripts_autosupport b/comms/asterisk10/patches/patch-contrib_scripts_autosupport
index 2a3c3bc1f2d..7a4c17d7aeb 100644
--- a/comms/asterisk10/patches/patch-contrib_scripts_autosupport
+++ b/comms/asterisk10/patches/patch-contrib_scripts_autosupport
@@ -1,8 +1,8 @@
-$NetBSD: patch-contrib_scripts_autosupport,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
+$NetBSD: patch-contrib_scripts_autosupport,v 1.2 2012/03/25 02:17:47 jnemeth Exp $
 
---- contrib/scripts/autosupport.orig	2011-01-04 21:00:36.000000000 +0000
+--- contrib/scripts/autosupport.orig	2012-01-04 20:01:27.000000000 +0000
 +++ contrib/scripts/autosupport
-@@ -32,7 +32,7 @@ files="n";
+@@ -33,7 +33,7 @@ NONINTERACTIVE=0
  # If a prefix is specified on command-line, add it.
  if (set -u; : $1) 2> /dev/null
  then
@@ -11,3 +11,12 @@ $NetBSD: patch-contrib_scripts_autosupport,v 1.1.1.1 2012/01/15 18:36:21 jnemeth
      echo
      echo "Digium autosupport script"
      echo "Copyright (C) 2005-2010, Digium, Inc."
+@@ -53,7 +53,7 @@ then
+     echo "    XXXXXXXX_${TARBALL_OUTPUT_FILE}"
+     echo
+     exit
+-  elif [ $1 == "-n" ] || [ $1 == "--non-interactive" ]; then
++  elif [ $1 = "-n" ] || [ $1 = "--non-interactive" ]; then
+     FILE_PREFIX=
+     NONINTERACTIVE=1
+   else