Update thunderbird and thunderbird-gtk1 to 2.0.0.23.

Security fixes in this version:

MFSA 2009-43 Heap overflow in certificate regexp parsing
MFSA 2009-42 Compromise of SSL-protected communication

For more info, see http://www.mozilla.com/en-US/thunderbird/2.0.0.23/releasenotes/

10 files changed, 61 insertions, 108 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 6352cc19697..31597d6bacc 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2009/08/26 20:22:52 sno Exp $
+# $NetBSD: Makefile,v 1.39 2009/10/03 13:18:23 ghen Exp $
 
 MOZILLA=		thunderbird
 COMMENT=		Mozilla mail client
-PKGREVISION=		1
 
 MOZILLA_USE_GTK2=	# yes
 MOZILLA_USE_XFT=	YES
diff --git a/mail/thunderbird/Makefile-thunderbird.common b/mail/thunderbird/Makefile-thunderbird.common
index 1708f106f5a..182b16fbc58 100644
--- a/mail/thunderbird/Makefile-thunderbird.common
+++ b/mail/thunderbird/Makefile-thunderbird.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.48 2009/09/24 13:14:53 wiz Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.49 2009/10/03 13:18:23 ghen Exp $
 # used by mail/thunderbird/Makefile
 # used by mail/thunderbird-gtk1/Makefile
 
 MOZILLA_BIN=		thunderbird-bin
-MOZ_VER=		2.0.0.22
+MOZ_VER=		2.0.0.23
 EXTRACT_SUFX=		.tar.bz2
 DISTNAME=		thunderbird-${MOZ_VER}-source
 CATEGORIES=		mail
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index e4796bfd375..9c881541a53 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2009/06/14 20:45:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.29 2009/10/03 13:18:23 ghen Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -83,11 +83,14 @@ lib/${MOZILLA}/libmozz.${SO_SUFFIX}
 lib/${MOZILLA}/libnspr4.${SO_SUFFIX}
 lib/${MOZILLA}/libnss3.${SO_SUFFIX}
 lib/${MOZILLA}/libnssckbi.${SO_SUFFIX}
+lib/${MOZILLA}/libnssdbm3.${SO_SUFFIX}
+lib/${MOZILLA}/libnssutil3.${SO_SUFFIX}
 lib/${MOZILLA}/libplc4.${SO_SUFFIX}
 lib/${MOZILLA}/libplds4.${SO_SUFFIX}
 lib/${MOZILLA}/libprldap50.${SO_SUFFIX}
 lib/${MOZILLA}/libsmime3.${SO_SUFFIX}
 lib/${MOZILLA}/libsoftokn3.${SO_SUFFIX}
+lib/${MOZILLA}/libsqlite3.${SO_SUFFIX}
 lib/${MOZILLA}/libssl3.${SO_SUFFIX}
 lib/${MOZILLA}/libxpcom.${SO_SUFFIX}
 lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
@@ -1941,80 +1944,39 @@ include/${MOZILLA}/nkcache/nsICacheSession.h
 include/${MOZILLA}/nkcache/nsICacheVisitor.h
 include/${MOZILLA}/nsBuildID.h
 include/${MOZILLA}/nsStaticComponents.h
-include/${MOZILLA}/nspr/md/_aix.h
 include/${MOZILLA}/nspr/md/_aix32.cfg
 include/${MOZILLA}/nspr/md/_aix64.cfg
 include/${MOZILLA}/nspr/md/_beos.cfg
-include/${MOZILLA}/nspr/md/_beos.h
 include/${MOZILLA}/nspr/md/_bsdi.cfg
-include/${MOZILLA}/nspr/md/_bsdi.h
 include/${MOZILLA}/nspr/md/_darwin.cfg
-include/${MOZILLA}/nspr/md/_darwin.h
 include/${MOZILLA}/nspr/md/_dgux.cfg
-include/${MOZILLA}/nspr/md/_dgux.h
 include/${MOZILLA}/nspr/md/_freebsd.cfg
-include/${MOZILLA}/nspr/md/_freebsd.h
-include/${MOZILLA}/nspr/md/_hpux.h
 include/${MOZILLA}/nspr/md/_hpux32.cfg
 include/${MOZILLA}/nspr/md/_hpux64.cfg
-include/${MOZILLA}/nspr/md/_irix.h
 include/${MOZILLA}/nspr/md/_irix32.cfg
 include/${MOZILLA}/nspr/md/_irix64.cfg
 include/${MOZILLA}/nspr/md/_linux.cfg
-include/${MOZILLA}/nspr/md/_linux.h
-include/${MOZILLA}/nspr/md/_macos.h
 include/${MOZILLA}/nspr/md/_ncr.cfg
-include/${MOZILLA}/nspr/md/_ncr.h
 include/${MOZILLA}/nspr/md/_nec.cfg
-include/${MOZILLA}/nspr/md/_nec.h
 include/${MOZILLA}/nspr/md/_netbsd.cfg
-include/${MOZILLA}/nspr/md/_netbsd.h
 include/${MOZILLA}/nspr/md/_nextstep.cfg
-include/${MOZILLA}/nspr/md/_nextstep.h
-include/${MOZILLA}/nspr/md/_nspr_pthread.h
 include/${MOZILLA}/nspr/md/_nto.cfg
-include/${MOZILLA}/nspr/md/_nto.h
 include/${MOZILLA}/nspr/md/_openbsd.cfg
-include/${MOZILLA}/nspr/md/_openbsd.h
 include/${MOZILLA}/nspr/md/_openvms.cfg
-include/${MOZILLA}/nspr/md/_openvms.h
 include/${MOZILLA}/nspr/md/_os2.cfg
-include/${MOZILLA}/nspr/md/_os2.h
-include/${MOZILLA}/nspr/md/_os2_errors.h
 include/${MOZILLA}/nspr/md/_osf1.cfg
-include/${MOZILLA}/nspr/md/_osf1.h
-include/${MOZILLA}/nspr/md/_pcos.h
-include/${MOZILLA}/nspr/md/_pth.h
 include/${MOZILLA}/nspr/md/_qnx.cfg
-include/${MOZILLA}/nspr/md/_qnx.h
 include/${MOZILLA}/nspr/md/_reliantunix.cfg
-include/${MOZILLA}/nspr/md/_reliantunix.h
-include/${MOZILLA}/nspr/md/_rhapsody.cfg
-include/${MOZILLA}/nspr/md/_rhapsody.h
 include/${MOZILLA}/nspr/md/_riscos.cfg
-include/${MOZILLA}/nspr/md/_riscos.h
 include/${MOZILLA}/nspr/md/_scoos.cfg
-include/${MOZILLA}/nspr/md/_scoos.h
 include/${MOZILLA}/nspr/md/_solaris.cfg
-include/${MOZILLA}/nspr/md/_solaris.h
 include/${MOZILLA}/nspr/md/_sony.cfg
-include/${MOZILLA}/nspr/md/_sony.h
 include/${MOZILLA}/nspr/md/_sunos4.cfg
-include/${MOZILLA}/nspr/md/_sunos4.h
-include/${MOZILLA}/nspr/md/_unix_errors.h
-include/${MOZILLA}/nspr/md/_unixos.h
 include/${MOZILLA}/nspr/md/_unixware.cfg
-include/${MOZILLA}/nspr/md/_unixware.h
 include/${MOZILLA}/nspr/md/_unixware7.cfg
 include/${MOZILLA}/nspr/md/_win16.cfg
-include/${MOZILLA}/nspr/md/_win16.h
-include/${MOZILLA}/nspr/md/_win32_errors.h
 include/${MOZILLA}/nspr/md/_win95.cfg
-include/${MOZILLA}/nspr/md/_win95.h
 include/${MOZILLA}/nspr/md/_winnt.cfg
-include/${MOZILLA}/nspr/md/_winnt.h
-include/${MOZILLA}/nspr/md/prosdep.h
-include/${MOZILLA}/nspr/md/sunos4.h
 include/${MOZILLA}/nspr/nspr.h
 include/${MOZILLA}/nspr/obsolete/pralarm.h
 include/${MOZILLA}/nspr/obsolete/probslet.h
@@ -2800,6 +2762,7 @@ include/${MOZILLA}/nss/nssilock.h
 include/${MOZILLA}/nss/nsslocks.h
 include/${MOZILLA}/nss/nssrwlk.h
 include/${MOZILLA}/nss/nssrwlkt.h
+include/${MOZILLA}/nss/nssutil.h
 include/${MOZILLA}/nss/ocsp.h
 include/${MOZILLA}/nss/ocspt.h
 include/${MOZILLA}/nss/p12.h
@@ -2845,7 +2808,7 @@ include/${MOZILLA}/nss/ssl.h
 include/${MOZILLA}/nss/sslerr.h
 include/${MOZILLA}/nss/sslproto.h
 include/${MOZILLA}/nss/sslt.h
-include/${MOZILLA}/nss/watcomfx.h
+include/${MOZILLA}/nss/utilrename.h
 @comment end INCLUDE-PUBLIC
 share/applications/${MOZILLA}.desktop
 share/pixmaps/${MOZILLA}.xpm
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index d3233b4d152..9f0c6e5bfd8 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.56 2009/09/22 07:57:33 tnn Exp $
+$NetBSD: distinfo,v 1.57 2009/10/03 13:18:23 ghen Exp $
 
-SHA1 (thunderbird-2.0.0.22-source.tar.bz2) = a9da470ff090dfd049cae6b0c3b1a4e95c3f2022
-RMD160 (thunderbird-2.0.0.22-source.tar.bz2) = 6f9693c0b7f5af0c60d245c96492f11a4c286efd
-Size (thunderbird-2.0.0.22-source.tar.bz2) = 40489725 bytes
+SHA1 (thunderbird-2.0.0.23-source.tar.bz2) = a237bfb92ec9c4b2bed7ea744e95d01ec43e07f1
+RMD160 (thunderbird-2.0.0.23-source.tar.bz2) = a1ef4af80121cdd8000c796e0c5fb575bea30348
+Size (thunderbird-2.0.0.23-source.tar.bz2) = 38860245 bytes
 SHA1 (patch-aa) = ff3586c00ff8d3fa6a1bda639116778169ad4466
 SHA1 (patch-ab) = de3452875e0fd0dc207c9f5e4bdffab72a43155e
 SHA1 (patch-ac) = 24da4ecce48d22a3752276cae132845b4b474c2a
@@ -23,12 +23,12 @@ SHA1 (patch-ar) = ce81dd6b747ba882434cb23343c5e89aac70ea81
 SHA1 (patch-as) = 56effdf9aa488fa2b3c8abcb4b7273841a4b59c1
 SHA1 (patch-aw) = 0df1163297eb1ea48ae8b98d146f715462c0a2e7
 SHA1 (patch-ax) = 320b29cb9b6addc21c82480c400746deed8522cb
-SHA1 (patch-ba) = f0f3e17b4e2d383d5c45462fa2e3e69b22495932
+SHA1 (patch-ba) = 72b65dc1ecbff188d010e25cf304f9b623f45f26
 SHA1 (patch-bb) = 3f53a7358e881528cf8bec6933af7cbfcffb08ed
 SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991
 SHA1 (patch-bo) = 7ed3756e2eb4ff9967d126452506429c2346ae84
 SHA1 (patch-bq) = 8818e9cbcc2c0a48c1488a5b8e92dd1350e76bb1
-SHA1 (patch-br) = ff781a96f356185947451deaddf6f9ad2acacd9d
+SHA1 (patch-br) = 8ed1b865b0133acb6070ff0b65a6082873126c52
 SHA1 (patch-bs) = 79cb84a5ed67780e124e7c595ee4ae6ffc7617a6
 SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
 SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
@@ -45,13 +45,12 @@ SHA1 (patch-df) = f639028cc604ea13c0a230d0fbedfa26dfc9e9f3
 SHA1 (patch-dg) = 17912d183f754ab6661d2be8092e6a07d142632b
 SHA1 (patch-dh) = 7592a6238acd5ef6e802d32103c897acb576825a
 SHA1 (patch-dj) = 70360dffb20dd1029866d2e81899d003c9e17473
-SHA1 (patch-dk) = 183fa0d6a9040f53d9988fcc8868bdf83229803b
+SHA1 (patch-dk) = a1f5c2ef52c7066302acc110d87a6d57b02092d2
 SHA1 (patch-dl) = cba07cba5717a75c89f007aba36295dccc1c25ab
 SHA1 (patch-do) = bdb018e157dcb5ef706b69184d8b739cfd32d8c3
 SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e
 SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc
 SHA1 (patch-dw) = 6ef560d688b3b67450b9582c95d9239ab4749f61
 SHA1 (patch-dx) = ab7606171564b6879effc3b37d9eadc6565cb74b
-SHA1 (patch-dy) = cdff1e8f593ea2453afc048b931c8305c6b944e4
-SHA1 (patch-dz) = 957e91753db2aa7f556dd97d994e30418f8e26b0
 SHA1 (patch-ea) = eaa1cb5d2d87aa6f6fbe9aeb4b3b557f183cbc0a
+SHA1 (patch-eb) = d489079ae84fe336498bc1d9cf11edc71b38a9a4
diff --git a/mail/thunderbird/patches/patch-ba b/mail/thunderbird/patches/patch-ba
index 631e3cdcf8c..e90ef6f3b59 100644
--- a/mail/thunderbird/patches/patch-ba
+++ b/mail/thunderbird/patches/patch-ba
@@ -1,11 +1,10 @@
-$NetBSD: patch-ba,v 1.5 2008/05/19 10:43:02 tnn Exp $
+$NetBSD: patch-ba,v 1.6 2009/10/03 13:18:23 ghen Exp $
 
-diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg
---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg	2004-04-28 09:33:44.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.cfg	2005-12-04 19:09:16.000000000 +0900
-@@ -48,7 +48,8 @@
- 
- #define PR_AF_INET6 24  /* same as AF_INET6 */
+--- nsprpub/pr/include/md/_netbsd.cfg.orig	2007-11-26 19:17:17.000000000 +0100
++++ nsprpub/pr/include/md/_netbsd.cfg
+@@ -52,7 +52,8 @@
+ #define HAVE_LONG_LONG
+ #endif
  
 -#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
 +#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
@@ -13,7 +12,7 @@ diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include
  
  #define IS_LITTLE_ENDIAN 1
  #undef  IS_BIG_ENDIAN
-@@ -94,7 +95,53 @@
+@@ -97,7 +98,53 @@
  #define PR_ALIGN_OF_DOUBLE  4
  #define PR_ALIGN_OF_POINTER 4
  
@@ -68,7 +67,7 @@ diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include
  
  #undef IS_LITTLE_ENDIAN
  #define  IS_BIG_ENDIAN 1
-@@ -187,6 +234,55 @@
+@@ -188,6 +235,55 @@
  #define PR_BYTES_PER_WORD_LOG2  3
  #define PR_BYTES_PER_DWORD_LOG2 3
  
diff --git a/mail/thunderbird/patches/patch-br b/mail/thunderbird/patches/patch-br
index 59d70d84739..53c19de492d 100644
--- a/mail/thunderbird/patches/patch-br
+++ b/mail/thunderbird/patches/patch-br
@@ -1,9 +1,9 @@
-$NetBSD: patch-br,v 1.7 2009/04/07 08:01:01 hasso Exp $
+$NetBSD: patch-br,v 1.8 2009/10/03 13:18:23 ghen Exp $
 
---- nsprpub/pr/src/misc/prnetdb.c.orig	2006-11-14 19:41:59 +0200
-+++ nsprpub/pr/src/misc/prnetdb.c	2009-04-04 18:10:55 +0300
-@@ -113,6 +113,11 @@ PRLock *_pr_dnsLock = NULL;
- #define _PR_HAVE_5_ARG_GETPROTO_R
+--- nsprpub/pr/src/misc/prnetdb.c.orig	2008-01-13 02:27:15.000000000 +0100
++++ nsprpub/pr/src/misc/prnetdb.c
+@@ -93,6 +93,11 @@ PRLock *_pr_dnsLock = NULL;
+ #define _PR_HAVE_GETPROTO_R_POINTER
  #endif
  
 +#if __DragonFly_version >= 200202
@@ -11,10 +11,10 @@ $NetBSD: patch-br,v 1.7 2009/04/07 08:01:01 hasso Exp $
 +#define _PR_HAVE_5_ARG_GETPROTO_R
 +#endif
 +
- #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
- #define _PR_HAVE_GETPROTO_R
- #define _PR_HAVE_5_ARG_GETPROTO_R
-@@ -329,7 +334,7 @@ _pr_QueryNetIfs(void)
+ #if defined(SOLARIS) || (defined(BSDI) && defined(_REENTRANT)) \
+ 	|| (defined(LINUX) && defined(_REENTRANT) \
+         && !(defined(__GLIBC__) && __GLIBC__ >= 2))
+@@ -331,7 +336,7 @@ _pr_QueryNetIfs(void)
  }
  
  #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
@@ -23,7 +23,7 @@ $NetBSD: patch-br,v 1.7 2009/04/07 08:01:01 hasso Exp $
  
  /*
   * Use the BSD getifaddrs function.
-@@ -2115,7 +2120,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
+@@ -2039,7 +2044,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
           */
          hints.ai_socktype = SOCK_STREAM;
  
diff --git a/mail/thunderbird/patches/patch-dk b/mail/thunderbird/patches/patch-dk
index bed031c0e1a..5b2dcf172f7 100644
--- a/mail/thunderbird/patches/patch-dk
+++ b/mail/thunderbird/patches/patch-dk
@@ -1,14 +1,13 @@
-$NetBSD: patch-dk,v 1.1 2005/12/30 21:35:58 joerg Exp $
+$NetBSD: patch-dk,v 1.2 2009/10/03 13:18:23 ghen Exp $
 
-diff -ruN ../Orig/mozilla/security/coreconf/config.mk ./security/coreconf/config.mk
---- ../Orig/mozilla/security/coreconf/config.mk	2004-04-26 00:02:17.000000000 +0900
-+++ ./security/coreconf/config.mk	2005-12-04 19:44:47.000000000 +0900
-@@ -63,7 +63,7 @@
+--- security/coreconf/config.mk.orig	2009-02-13 18:14:05.000000000 +0100
++++ security/coreconf/config.mk
+@@ -63,7 +63,7 @@ endif
  #######################################################################
  
  TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
--              OpenVMS AIX
-+              OpenVMS AIX DragonFly
+-              OpenVMS AIX RISCOS WINNT WIN95 WINCE
++              OpenVMS AIX RISCOS WINNT WIN95 WINCE DragonFly
  
  ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
  include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
diff --git a/mail/thunderbird/patches/patch-dy b/mail/thunderbird/patches/patch-dy
deleted file mode 100644
index d1fd324dc9c..00000000000
--- a/mail/thunderbird/patches/patch-dy
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dy,v 1.1 2008/09/18 13:01:45 joerg Exp $
-
---- security/nss-fips/cmd/platlibs.mk.orig	2008-09-17 20:55:11 +0300
-+++ security/nss-fips/cmd/platlibs.mk	2008-09-17 20:55:31 +0300
-@@ -213,7 +213,7 @@ endif
- # If GNU ld is used, we must use the -rpath-link option to tell
- # the linker where to find libsoftokn3.so, an implicit dependency
- # of libnss3.so.
--ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_ARCH)))
-+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD, $(OS_ARCH)))
- EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
- endif
- 
diff --git a/mail/thunderbird/patches/patch-dz b/mail/thunderbird/patches/patch-dz
deleted file mode 100644
index 79ca6a3c886..00000000000
--- a/mail/thunderbird/patches/patch-dz
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dz,v 1.1 2008/09/18 13:01:45 joerg Exp $
-
---- security/nss-fips/lib/freebl/Makefile.orig	2008-09-17 20:50:24 +0300
-+++ security/nss-fips/lib/freebl/Makefile	2008-09-17 20:50:53 +0300
-@@ -192,7 +192,7 @@ endif
- # to bind the blapi function references in FREEBLVector vector
- # (ldvector.c) to the blapi functions defined in the freebl
- # shared libraries.
--ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_TARGET)))
-+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD, $(OS_TARGET)))
-     MKSHLIB += -Wl,-Bsymbolic
- endif
- 
diff --git a/mail/thunderbird/patches/patch-eb b/mail/thunderbird/patches/patch-eb
new file mode 100644
index 00000000000..bbb270c20d7
--- /dev/null
+++ b/mail/thunderbird/patches/patch-eb
@@ -0,0 +1,20 @@
+$NetBSD: patch-eb,v 1.1 2009/10/03 13:18:23 ghen Exp $
+
+--- security/nss/tests/libpkix/libpkix.sh.orig	2008-11-11 10:06:52.000000000 +0100
++++ security/nss/tests/libpkix/libpkix.sh
+@@ -85,12 +85,12 @@ libpkix_cleanup()
+ ParseArgs ()
+ {
+     while [ $# -gt 0 ]; do
+-        if [ $1 == "-checkmem" ]; then
++        if [ $1 = "-checkmem" ]; then
+             checkMemArg=$1
+             memText="   (Memory Checking Enabled)"
+-        elif [ $1 == "-quiet" ]; then
++        elif [ $1 = "-quiet" ]; then
+             quietArg=$1
+-        elif [ $1 == "-arenas" ]; then
++        elif [ $1 = "-arenas" ]; then
+             arenasArg=$1
+         fi
+         shift