Update to 43.0.3

* Fix alsa option build, fix PR pkg/50427

Changelog:
    Fix: Fix network issue when using Nvidia's Network Access Manager (1233237)
    Fix: On some Windows configurations, improve the decoding of some videos on YouTube (1233970)

3 files changed, 40 insertions, 36 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index fc3dd9d2b15..67555517978 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.237 2015/12/27 18:25:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.238 2015/12/31 08:45:42 ryoon Exp $
 
 FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	43.0
-MOZ_BRANCH_MINOR=	.2
+MOZ_BRANCH_MINOR=	.3
 
 DISTNAME=	firefox-${FIREFOX_VER}.source
 PKGNAME=	firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index b9dcf64bbe8..4f99d392656 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.227 2015/12/27 18:25:33 ryoon Exp $
+$NetBSD: distinfo,v 1.228 2015/12/31 08:45:42 ryoon Exp $
 
-SHA1 (firefox-43.0.2.source.tar.xz) = 1ba1da32a1472a88f644bdb1373c40a97e721170
-RMD160 (firefox-43.0.2.source.tar.xz) = ac088a775eb5840e12f836964979ee5c91096eac
-SHA512 (firefox-43.0.2.source.tar.xz) = 17380bd4f10601b015e7812cc11ea23b4880fe9909ebed03d59b6476f5d05a2a6d0baafb6cccc66d79b141abf8eea15f7c36ed6b59e4dc7279a3512ae0776ee9
-Size (firefox-43.0.2.source.tar.xz) = 175425028 bytes
+SHA1 (firefox-43.0.3.source.tar.xz) = 88bd73e51df9d884288709879e4cea6205b5d1da
+RMD160 (firefox-43.0.3.source.tar.xz) = baf9998e137732e45a7812f7da230c1230482846
+SHA512 (firefox-43.0.3.source.tar.xz) = 3751519bcf5205a0bcc329b5cfdeaf86728e4fcf3279e446a963916f829a75ab2d44e05706fa01a9491b2cc4015d8e62343608c4379e7a12603e16e005b7ae89
+Size (firefox-43.0.3.source.tar.xz) = 175427272 bytes
 SHA1 (patch-aa) = c1cdfa90f0334bfb0493502ea19e85092a60bc88
 SHA1 (patch-ao) = ca7e6723a10b9f6e3306cd12557e1856727edee9
 SHA1 (patch-as) = 05f31f318155e0f927e13754c0fec5f4d50a39dc
@@ -78,7 +78,7 @@ SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1
 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 8a15ff542c9d3fce448d9ec63706f7dfb411d926
 SHA1 (patch-media_libcubeb_AUTHORS) = 3db32086f98c2bbe16e9394bb5121d7a95cdb4af
 SHA1 (patch-media_libcubeb_src_cubeb.c) = effe8771e42adddb478ecb302352ef003bdd01db
-SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 81e695c5cb20be3e864157c19ed07f9713490be5
+SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 3f0c6295115a0cbcaaa924ccbdeda99570d455db
 SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 54e2a210411c7083bc395033fbf519d581bc4a62
 SHA1 (patch-media_libcubeb_src_moz.build) = 23a194c97402590b05af6a6423882528c7cf02ef
 SHA1 (patch-media_libpng_pngpriv.h) = c9cefd1b5dd85fbd0c875c3f9bc108975398fe3a
diff --git a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
index 3d2e6e7dba1..62ff9859f56 100644
--- a/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
+++ b/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.12 2015/12/31 08:45:42 ryoon Exp $
 
---- media/libcubeb/src/cubeb_alsa.c.orig	2015-06-18 20:55:30.000000000 +0000
+--- media/libcubeb/src/cubeb_alsa.c.orig	2015-12-23 22:11:01.000000000 +0000
 +++ media/libcubeb/src/cubeb_alsa.c
 @@ -7,12 +7,18 @@
  #undef NDEBUG
@@ -170,7 +170,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
  
      if (stm->params.format == CUBEB_SAMPLE_FLOAT32NE) {
        float * b = (float *) p;
-@@ -328,14 +385,62 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -328,14 +385,66 @@ alsa_refill_stream(cubeb_stream * stm)
          b[i] *= stm->volume;
        }
      }
@@ -206,7 +206,11 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
 +          return ERROR;
 +        }
 +        continue;
++#if __linux__
 +      case -EBADFD:
++#else
++      case -EBADF:
++#endif
 +        fprintf(stderr, "%s: snc_pcm_writei returned -%s, giving up\n",
 +                __func__, "EBADFD");
 +        free(p);
@@ -241,7 +245,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
    }
    if (got != avail) {
      long buffer_fill = stm->buffer_size - (avail - got);
-@@ -343,7 +448,7 @@ alsa_refill_stream(cubeb_stream * stm)
+@@ -343,7 +452,7 @@ alsa_refill_stream(cubeb_stream * stm)
  
      /* Fill the remaining buffer with silence to guarantee one full period
         has been written. */
@@ -250,7 +254,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
  
      set_timeout(&stm->drain_timeout, buffer_time * 1000);
  
-@@ -454,26 +559,26 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -454,26 +563,26 @@ get_slave_pcm_node(snd_config_t * lconf,
  
    slave_def = NULL;
  
@@ -282,7 +286,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
      if (r < 0) {
        break;
      }
-@@ -482,7 +587,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -482,7 +591,7 @@ get_slave_pcm_node(snd_config_t * lconf,
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -291,7 +295,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
      if (r < 0) {
        break;
      }
-@@ -491,7 +596,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -491,7 +600,7 @@ get_slave_pcm_node(snd_config_t * lconf,
    } while (0);
  
    if (slave_def) {
@@ -300,7 +304,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
    }
  
    return NULL;
-@@ -514,22 +619,22 @@ init_local_config_with_workaround(char c
+@@ -514,22 +623,22 @@ init_local_config_with_workaround(char c
  
    lconf = NULL;
  
@@ -327,7 +331,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
      if (r < 0) {
        break;
      }
-@@ -538,7 +643,7 @@ init_local_config_with_workaround(char c
+@@ -538,7 +647,7 @@ init_local_config_with_workaround(char c
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -336,7 +340,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
      if (r < 0) {
        break;
      }
-@@ -549,12 +654,12 @@ init_local_config_with_workaround(char c
+@@ -549,12 +658,12 @@ init_local_config_with_workaround(char c
      }
  
      /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
@@ -351,7 +355,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
      if (r < 0) {
        break;
      }
-@@ -565,18 +670,18 @@ init_local_config_with_workaround(char c
+@@ -565,18 +674,18 @@ init_local_config_with_workaround(char c
  
      /* Don't clobber an explicit existing handle_underrun value, set it only
         if it doesn't already exist. */
@@ -373,7 +377,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
      if (r < 0) {
        break;
      }
-@@ -584,7 +689,7 @@ init_local_config_with_workaround(char c
+@@ -584,7 +693,7 @@ init_local_config_with_workaround(char c
      return lconf;
    } while (0);
  
@@ -382,7 +386,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
  
    return NULL;
  }
-@@ -596,9 +701,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
+@@ -596,9 +705,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, s
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
    if (local_config) {
@@ -394,7 +398,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
-@@ -611,7 +716,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+@@ -611,7 +720,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
    int r;
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -403,7 +407,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
    return r;
-@@ -668,12 +773,65 @@ alsa_init(cubeb ** context, char const *
+@@ -668,12 +777,65 @@ alsa_init(cubeb ** context, char const *
    pthread_attr_t attr;
    snd_pcm_t * dummy;
  
@@ -470,7 +474,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
      cubeb_alsa_error_handler_set = 1;
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
-@@ -681,6 +839,8 @@ alsa_init(cubeb ** context, char const *
+@@ -681,6 +843,8 @@ alsa_init(cubeb ** context, char const *
    ctx = calloc(1, sizeof(*ctx));
    assert(ctx);
  
@@ -479,7 +483,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
    ctx->ops = &alsa_ops;
  
    r = pthread_mutex_init(&ctx->mutex, NULL);
-@@ -730,7 +890,7 @@ alsa_init(cubeb ** context, char const *
+@@ -730,7 +894,7 @@ alsa_init(cubeb ** context, char const *
         config fails with EINVAL, the PA PCM is too old for this workaround. */
      if (r == -EINVAL) {
        pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -488,7 +492,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
        pthread_mutex_unlock(&cubeb_alsa_mutex);
        ctx->local_config = NULL;
      } else if (r >= 0) {
-@@ -769,9 +929,13 @@ alsa_destroy(cubeb * ctx)
+@@ -769,9 +933,13 @@ alsa_destroy(cubeb * ctx)
    pthread_mutex_destroy(&ctx->mutex);
    free(ctx->fds);
  
@@ -503,7 +507,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
      pthread_mutex_unlock(&cubeb_alsa_mutex);
    }
  
-@@ -839,7 +1003,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+@@ -839,7 +1007,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
      return CUBEB_ERROR;
    }
  
@@ -512,7 +516,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
    assert(r == 0);
  
    /* Ugly hack: the PA ALSA plugin allows buffer configurations that can't
-@@ -849,23 +1013,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
+@@ -849,23 +1017,23 @@ alsa_stream_init(cubeb * ctx, cubeb_stre
      latency = latency < 500 ? 500 : latency;
    }
  
@@ -542,7 +546,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
    assert((nfds_t) r == stm->nfds);
  
    r = pthread_cond_init(&stm->cond, NULL);
-@@ -896,7 +1060,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+@@ -896,7 +1064,7 @@ alsa_stream_destroy(cubeb_stream * stm)
    pthread_mutex_lock(&stm->mutex);
    if (stm->pcm) {
      if (stm->state == DRAINING) {
@@ -551,7 +555,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
      }
      alsa_locked_pcm_close(stm->pcm);
      stm->pcm = NULL;
-@@ -906,7 +1070,10 @@ alsa_stream_destroy(cubeb_stream * stm)
+@@ -906,7 +1074,10 @@ alsa_stream_destroy(cubeb_stream * stm)
    pthread_mutex_destroy(&stm->mutex);
  
    r = pthread_cond_destroy(&stm->cond);
@@ -563,7 +567,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
  
    alsa_unregister_stream(stm);
  
-@@ -938,12 +1105,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
+@@ -938,12 +1109,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
      return CUBEB_ERROR;
    }
  
@@ -578,7 +582,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
    if (r < 0) {
      return CUBEB_ERROR;
    }
-@@ -963,34 +1130,34 @@ alsa_get_preferred_sample_rate(cubeb * c
+@@ -963,34 +1134,34 @@ alsa_get_preferred_sample_rate(cubeb * c
  
    /* get a pcm, disabling resampling, so we get a rate the
     * hardware/dmix/pulse/etc. supports. */
@@ -621,7 +625,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
  
    return CUBEB_OK;
  }
-@@ -1014,7 +1181,7 @@ alsa_stream_start(cubeb_stream * stm)
+@@ -1014,7 +1185,7 @@ alsa_stream_start(cubeb_stream * stm)
    ctx = stm->context;
  
    pthread_mutex_lock(&stm->mutex);
@@ -630,7 +634,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
    gettimeofday(&stm->last_activity, NULL);
    pthread_mutex_unlock(&stm->mutex);
  
-@@ -1048,7 +1215,7 @@ alsa_stream_stop(cubeb_stream * stm)
+@@ -1048,7 +1219,7 @@ alsa_stream_stop(cubeb_stream * stm)
    pthread_mutex_unlock(&ctx->mutex);
  
    pthread_mutex_lock(&stm->mutex);
@@ -639,7 +643,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
    pthread_mutex_unlock(&stm->mutex);
  
    return CUBEB_OK;
-@@ -1064,14 +1231,17 @@ alsa_stream_get_position(cubeb_stream * 
+@@ -1064,14 +1235,17 @@ alsa_stream_get_position(cubeb_stream * 
    pthread_mutex_lock(&stm->mutex);
  
    delay = -1;
@@ -660,7 +664,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.11 2015/07/03 10:25:40 ryoon
  
    *position = 0;
    if (stm->write_position >= (snd_pcm_uframes_t) delay) {
-@@ -1090,7 +1260,7 @@ alsa_stream_get_latency(cubeb_stream * s
+@@ -1090,7 +1264,7 @@ alsa_stream_get_latency(cubeb_stream * s
    snd_pcm_sframes_t delay;
    /* This function returns the delay in frames until a frame written using
       snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */