Date: Sat, 22 Feb 2014 03:06:14 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1508 - in trunk: security/ca_root_nss security/nss www/firefox-nightly www/firefox-nightly/files Message-ID: <201402220306.s1M36Eb0068283@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Feb 22 03:06:14 2014
New Revision: 1508
Log:
update
Deleted:
trunk/www/firefox-nightly/files/patch-bug974272
Modified:
trunk/security/ca_root_nss/Makefile
trunk/security/ca_root_nss/distinfo
trunk/security/nss/Makefile
trunk/security/nss/distinfo
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
Modified: trunk/security/ca_root_nss/Makefile
==============================================================================
--- trunk/security/ca_root_nss/Makefile Sat Feb 22 03:06:04 2014 (r1507)
+++ trunk/security/ca_root_nss/Makefile Sat Feb 22 03:06:14 2014 (r1508)
@@ -24,7 +24,7 @@
# !!! Please DO NOT submit patches for new version until it has !!!
# !!! been committed there first. !!!
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-VERSION_NSS= 3.15.4
+VERSION_NSS= 3.15.5
#NSS_SUFFIX= .with.ckbi.1.93
CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt
BUNDLE_PROCESSOR= MAca-bundle.pl
Modified: trunk/security/ca_root_nss/distinfo
==============================================================================
--- trunk/security/ca_root_nss/distinfo Sat Feb 22 03:06:04 2014 (r1507)
+++ trunk/security/ca_root_nss/distinfo Sat Feb 22 03:06:14 2014 (r1508)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.15.4.tar.gz) = 14d69a0735c5af6b3cc12591f7ebf272203e889f09104182148091d0af682d7c
-SIZE (nss-3.15.4.tar.gz) = 6366271
+SHA256 (nss-3.15.5.tar.gz) = 1442c85624b7de74c7745132a65aa0de47d280c4f01f293d111bc0b6d8271f43
+SIZE (nss-3.15.5.tar.gz) = 6367893
Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile Sat Feb 22 03:06:04 2014 (r1507)
+++ trunk/security/nss/Makefile Sat Feb 22 03:06:14 2014 (r1508)
@@ -2,7 +2,7 @@
# $FreeBSD: head/security/nss/Makefile 336446 2013-12-14 13:42:06Z flo $
PORTNAME= nss
-PORTVERSION= 3.15.4
+PORTVERSION= 3.15.5
#DISTVERSIONSUFFIX= .with.ckbi.1.93
CATEGORIES= security
MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src
Modified: trunk/security/nss/distinfo
==============================================================================
--- trunk/security/nss/distinfo Sat Feb 22 03:06:04 2014 (r1507)
+++ trunk/security/nss/distinfo Sat Feb 22 03:06:14 2014 (r1508)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.15.4.tar.gz) = 14d69a0735c5af6b3cc12591f7ebf272203e889f09104182148091d0af682d7c
-SIZE (nss-3.15.4.tar.gz) = 6366271
+SHA256 (nss-3.15.5.tar.gz) = 1442c85624b7de74c7745132a65aa0de47d280c4f01f293d111bc0b6d8271f43
+SIZE (nss-3.15.5.tar.gz) = 6367893
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Sat Feb 22 03:06:04 2014 (r1507)
+++ trunk/www/firefox-nightly/Makefile.hgrev Sat Feb 22 03:06:14 2014 (r1508)
@@ -1 +1 @@
-HGREV= 169459:571a1bf8c8ab
+HGREV= 169970:f42032325f18
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Sat Feb 22 03:06:04 2014 (r1507)
+++ trunk/www/firefox-nightly/distinfo Sat Feb 22 03:06:14 2014 (r1508)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/571a1bf8c8ab.tar.bz2) = 50e72978c197629875b7711a7367eda8d7240acbaa931e30513879a87dbcee67
-SIZE (firefox-nightly/571a1bf8c8ab.tar.bz2) = 136492464
+SHA256 (firefox-nightly/f42032325f18.tar.bz2) = 4cc48c5c8c5e535a93c45df95798f180298f65b739288c44eb45306aedd6af86
+SIZE (firefox-nightly/f42032325f18.tar.bz2) = 136475872
Deleted: trunk/www/firefox-nightly/files/patch-bug974272
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug974272 Sat Feb 22 03:06:14 2014 (r1507)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,78 +0,0 @@
-diff --git gfx/skia/moz.build gfx/skia/moz.build
-index c1a400f..a558b1c 100644
---- gfx/skia/moz.build
-+++ gfx/skia/moz.build
-@@ -707,7 +707,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
- 'trunk/src/ports/SkTLS_pthread.cpp',
- 'trunk/src/utils/android/ashmem.cpp',
- 'trunk/src/utils/SkThreadUtils_pthread.cpp',
-- 'trunk/src/utils/SkThreadUtils_pthread_other.cpp',
- ]
- DEFINES['SK_FONTHOST_CAIRO_STANDALONE'] = 0
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-@@ -721,7 +720,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
- 'trunk/src/utils/mac/SkCreateCGImageRef.cpp',
- 'trunk/src/utils/mac/SkStream_mac.cpp',
- 'trunk/src/utils/SkThreadUtils_pthread.cpp',
-- 'trunk/src/utils/SkThreadUtils_pthread_mach.cpp',
- ]
- if CONFIG['MOZ_WIDGET_GTK']:
- SOURCES += [
-@@ -733,7 +731,6 @@ if CONFIG['MOZ_WIDGET_GTK']:
- 'trunk/src/ports/SkTime_Unix.cpp',
- 'trunk/src/ports/SkTLS_pthread.cpp',
- 'trunk/src/utils/SkThreadUtils_pthread.cpp',
-- 'trunk/src/utils/SkThreadUtils_pthread_linux.cpp',
- ]
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
- SOURCES += [
-@@ -834,6 +831,19 @@ DEFINES['SK_B32_SHIFT'] = 0
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk', 'cocoa'):
- DEFINES['SK_USE_POSIX_THREADS'] = 1
-
-+ if CONFIG['OS_TARGET'] in ('Linux', 'FreeBSD'):
-+ SOURCES += [
-+ 'trunk/src/utils/SkThreadUtils_pthread_linux.cpp',
-+ ]
-+ elif CONFIG['OS_TARGET'] == 'Darwin':
-+ SOURCES += [
-+ 'trunk/src/utils/SkThreadUtils_pthread_mach.cpp',
-+ ]
-+ else:
-+ SOURCES += [
-+ 'trunk/src/utils/SkThreadUtils_pthread_other.cpp',
-+ ]
-+
- if CONFIG['INTEL_ARCHITECTURE'] and CONFIG['HAVE_TOOLCHAIN_SUPPORT_MSSSE3']:
- DEFINES['SK_BUILD_SSSE3'] = 1
-
-diff --git gfx/skia/trunk/src/utils/SkThreadUtils_pthread_linux.cpp gfx/skia/trunk/src/utils/SkThreadUtils_pthread_linux.cpp
-index 4a03cb8..1b3d0dc 100644
---- gfx/skia/trunk/src/utils/SkThreadUtils_pthread_linux.cpp
-+++ gfx/skia/trunk/src/utils/SkThreadUtils_pthread_linux.cpp
-@@ -13,6 +13,25 @@
- #include "SkThreadUtils_pthread.h"
-
- #include <pthread.h>
-+#ifdef __FreeBSD__
-+#include <pthread_np.h>
-+#endif
-+
-+#if defined(__FreeBSD__)
-+#define cpu_set_t cpuset_t
-+#endif
-+
-+#ifndef CPU_COUNT
-+static int CPU_COUNT(cpu_set_t *set) {
-+ int count = 0;
-+ for (int i = 0; i < CPU_SETSIZE; i++) {
-+ if (CPU_ISSET(i, set)) {
-+ count++;
-+ }
-+ }
-+ return count;
-+}
-+#endif /* !CPU_COUNT */
-
- static int nth_set_cpu(unsigned int n, cpu_set_t* cpuSet) {
- n %= CPU_COUNT(cpuSet);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402220306.s1M36Eb0068283>