Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (dff47abc81caec4e00312c06e949236113ff7fcc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (dff47abc81caec4e00312c06e949236113ff7fcc)
  • Date: Thu, 20 Apr 2017 02:35:19 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

crypto/nss/DETAILS | 8 +++
crypto/nss/HISTORY | 4 +
crypto/nss/PREPARE | 2
crypto/nss/PRE_BUILD | 5 --
http/firefox/DEPENDS | 2
http/firefox/DETAILS | 6 +-
http/firefox/HISTORY | 18 ++++++++
http/firefox/patches/2002_system_graphite2.patch | 18 +-------
http/firefox/patches/ambiguous-ipc.patch | 29 +++++++++++++
http/firefox/patches/sandbox-allow-getrlimit.patch | 46
---------------------
10 files changed, 70 insertions(+), 68 deletions(-)

New commits:
commit dff47abc81caec4e00312c06e949236113ff7fcc
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: version 53.0, SECURITY_PATCH++

commit 8a47a88217ccf4978d99d115d7b1120d969038c5
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

crypto/nss: added 3.29 and 3.30 branches

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 0188917..133878d 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -58,6 +58,14 @@ case $NSS_BRANCH in
3.28)
VERSION=3.28.3

SOURCE_HASH=sha512:77602600c8d1e1b432a3c6be804ad80b2f8c2d521baf8bbe123eee6ded24d2344b4941b883e42145cd1d4d9f93062a63c18747215fb7e226e2a2489a9edaa678
+ ;;
+ 3.29)
+ VERSION=3.29.5
+
SOURCE_HASH=sha512:ce18bc7e793d2b3698db412b2e5fcabbfd9862eca3def120d5e44bc67276526bff6b33ffa84b8128f8af6d35101000e6f7bb24194f63a55461b3c245fac11faa
+ ;;
+ 3.30)
+ VERSION=3.30.1
+
SOURCE_HASH=sha512:591c518bc7e8105675678863e1995725982527e138b45e12ad0efd927f5d3eaa2aaa704d335ff46d572c2f7ad8a8f9a38e671c1d5a9f46fe495077ba0522bc51
esac
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 9e82a13..daf5981 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,7 @@
+2017-04-19 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS, PREPARE: added 3.29 and 3.30 branches
+ * PRE_BUILD: adjusted
+
2017-03-07 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 3.28.3 for 3.28 branch

diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 9076f1d..5647ae7 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,5 +1,5 @@
config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?" \
- DEFAULT 3.14 3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22 3.23
3.24 3.25 3.27 3.28 &&
+ DEFAULT 3.14 3.15 3.16 3.17 3.18 3.19 3.20 3.21 3.22 3.23
3.24 3.25 3.27 3.28 3.29 3.30 &&

if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
NSS_BRANCH=3.20
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 0baf3b9..610947a 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -1,8 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [[ $NSS_BRANCH == "3.19" ]] || [[ $NSS_BRANCH == "3.20" ]] ||
- [[ $NSS_BRANCH == "3.18" ]] || [[ $NSS_BRANCH == "3.17" ]]; then
+if [[ $NSS_BRANCH =~ 3.1[7-9] ]] || [[ $NSS_BRANCH == "3.20" ]]; then
patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
elif [[ $NSS_BRANCH == "3.15" ]] || [[ $NSS_BRANCH == "3.16" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.15.1-standalone-2.patch
@@ -10,7 +9,7 @@ elif [[ $NSS_BRANCH == "3.14" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.14-config-1.patch
elif [[ $NSS_BRANCH =~ 3.2[1-7] ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.21-standalone-1.patch
-elif [[ $NSS_BRANCH == "3.28" ]]; then
+elif [[ $NSS_BRANCH =~ 3.2[8-9] ]] || [[ $NSS_BRANCH == "3.30" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.28.1-standalone-1.patch
else
patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 29a4585..e1f506d 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -26,7 +26,7 @@ depends -sub APNG libpng "--enable-system-png"
&&
depends librsvg2 "--enable-svg" &&

depends nspr "--with-system-nspr" &&
-depends -sub "3.28.x" nss "--with-system-nss" &&
+depends -sub "3.30.x" nss "--with-system-nss" &&

depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY ENABLE_DBSTAT_VTAB"
sqlite "--enable-system-sqlite" &&

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 17acec8..2d839cb 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,10 +1,10 @@
SPELL=firefox
- VERSION=52.0.2
+ VERSION=53.0
SOURCE=${SPELL}-${VERSION}.source.tar.xz
-
SOURCE_HASH=sha512:15668625d212acf874b560d0adf738faf3e0df532c549ab94e1d91944542e13bf16265f08fca1eded42820f9b7ad3f0ff70a8b5bc9adde0a79d11e022bb1158e
+
SOURCE_HASH=sha512:36ec810bab58e3d99478455a38427a5efbc74d6dd7d4bb93b700fd7429b9b89250efd0abe4609091483991802090c6373c8434dfc9ba64c79a778e51fd2a2886

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}

SOURCE_URL[1]=http://ftp.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
- SECURITY_PATCH=103
+ SECURITY_PATCH=104
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index b6e8905..41707ce 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,21 @@
+2017-04-19 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 53.0, SECURITY_PATCH++,
+ (CVE-2017-5433, CVE-2017-5435, CVE-2017-5436, CVE-2017-5461,
+ CVE-2017-5459, CVE-2017-5466, CVE-2017-5434, CVE-2017-5432,
+ CVE-2017-5460, CVE-2017-5438, CVE-2017-5439, CVE-2017-5440,
+ CVE-2017-5441, CVE-2017-5442, CVE-2017-5464, CVE-2017-5443,
+ CVE-2017-5444, CVE-2017-5446, CVE-2017-5447, CVE-2017-5465,
+ CVE-2017-5448, CVE-2017-5437, CVE-2017-5454, CVE-2017-5455,
+ CVE-2017-5456, CVE-2017-5469, CVE-2017-5445, CVE-2017-5449,
+ CVE-2017-5450, CVE-2017-5451, CVE-2017-5462, CVE-2017-5463,
+ CVE-2017-5467, CVE-2017-5452, CVE-2017-5453, CVE-2017-5458,
+ CVE-2017-5468, CVE-2017-5430, CVE-2017-5429)
+ * DEPENDS: needs 3.30.x branch of nss
+ * patches/2002_system_graphite2.patch: updated
+ * patches/sandbox-allow-getrlimit.patch: removed, applied by upstream
+ * patches/ambiguous-ipc.patch: added a slightly modified patch from
+ upstream to allow building without WebRTC
+
2017-03-29 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 52.0.2

diff --git a/http/firefox/patches/2002_system_graphite2.patch
b/http/firefox/patches/2002_system_graphite2.patch
index e76278f..1790bd0 100644
--- a/http/firefox/patches/2002_system_graphite2.patch
+++ b/http/firefox/patches/2002_system_graphite2.patch
@@ -155,14 +155,9 @@ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
diff --git a/old-configure.in b/old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
-@@ -5018,16 +5018,37 @@ if test "$USE_FC_FREETYPE"; then
- CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS"
- MOZ_CHECK_HEADERS([fontconfig/fcfreetype.h], ,
- [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)],
[#include <fontconfig/fontconfig.h>])
- CPPFLAGS="$_SAVE_CPPFLAGS"
- fi
- fi
-
+@@ -4860,6 +4860,27 @@
+ AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
+
dnl ========================================================
+dnl Check for graphite2
+dnl ========================================================
@@ -187,12 +182,7 @@ diff --git a/old-configure.in b/old-configure.in
+dnl ========================================================
dnl Check for pixman and cairo
dnl ========================================================
-
- MOZ_TREE_CAIRO=1
- MOZ_ARG_ENABLE_BOOL(system-cairo,
- [ --enable-system-cairo Use system cairo (located with pkgconfig)],
- MOZ_TREE_CAIRO=,
- MOZ_TREE_CAIRO=1 )
+
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
diff --git a/http/firefox/patches/ambiguous-ipc.patch
b/http/firefox/patches/ambiguous-ipc.patch
new file mode 100644
index 0000000..52353b6
--- /dev/null
+++ b/http/firefox/patches/ambiguous-ipc.patch
@@ -0,0 +1,29 @@
+--- a/dom/media/webrtc/MediaEngine.h
++++ b/dom/media/webrtc/MediaEngine.h
+@@ -226,7 +226,7 @@
+ ~AllocationHandle() {}
+ public:
+ AllocationHandle(const dom::MediaTrackConstraints& aConstraints,
+- const ipc::PrincipalInfo& aPrincipalInfo,
++ const mozilla::ipc::PrincipalInfo& aPrincipalInfo,
+ const MediaEnginePrefs& aPrefs,
+ const nsString& aDeviceId)
+
+@@ -236,7 +236,7 @@
+ mDeviceId(aDeviceId) {}
+ public:
+ NormalizedConstraints mConstraints;
+- ipc::PrincipalInfo mPrincipalInfo;
++ mozilla::ipc::PrincipalInfo mPrincipalInfo;
+ MediaEnginePrefs mPrefs;
+ nsString mDeviceId;
+ };
+@@ -327,7 +327,7 @@
+ virtual nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
+ const MediaEnginePrefs &aPrefs,
+ const nsString& aDeviceId,
+- const ipc::PrincipalInfo& aPrincipalInfo,
++ const mozilla::ipc::PrincipalInfo&
aPrincipalInfo,
+ AllocationHandle** aOutHandle,
+ const char** aOutBadConstraint)
+ {
diff --git a/http/firefox/patches/sandbox-allow-getrlimit.patch
b/http/firefox/patches/sandbox-allow-getrlimit.patch
deleted file mode 100644
index e0190f3..0000000
--- a/http/firefox/patches/sandbox-allow-getrlimit.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# HG changeset patch
-# User Jed Davis <jld AT mozilla.com>
-# Date 1480359928 25200
-# Node ID c021b68fc7dfbc9890e225db9d98e4763d7f08b6
-# Parent 7eab0a7c766e258f2849edf6b8666727354a2968
-Bug 1320085 - Allow the getrlimit-equivalent subset of prlimit64. r=tedd
-
-This applies only to content processes, where we already allow getrlimit
-(but not setrlimit). The rule added here does not allow using prlimit64
-to set any resource limits or interact with any other process.
-
-MozReview-Commit-ID: nMry3t6QPj
-
-diff --git a/security/sandbox/linux/SandboxFilter.cpp
b/security/sandbox/linux/SandboxFilter.cpp
---- a/security/sandbox/linux/SandboxFilter.cpp
-+++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -711,16 +711,28 @@ public:
- return Allow();
-
- CASES_FOR_getrlimit:
- case __NR_clock_getres:
- CASES_FOR_getresuid:
- CASES_FOR_getresgid:
- return Allow();
-
-+ case __NR_prlimit64: {
-+ // Allow only the getrlimit() use case. (glibc seems to use
-+ // only pid 0 to indicate the current process; pid == getpid()
-+ // is equivalent and could also be allowed if needed.)
-+ Arg<pid_t> pid(0);
-+ // This is really a const struct ::rlimit*, but Arg<> doesn't
-+ // work with pointers, only integer types.
-+ Arg<uintptr_t> new_limit(2);
-+ return If(AllOf(pid == 0, new_limit == 0), Allow())
-+ .Else(InvalidSyscall());
-+ }
-+
- case __NR_umask:
- case __NR_kill:
- case __NR_wait4:
- #ifdef __NR_waitpid
- case __NR_waitpid:
- #endif
- #ifdef __NR_arch_prctl
- case __NR_arch_prctl:
-



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (dff47abc81caec4e00312c06e949236113ff7fcc), Pavel Vinogradov, 04/19/2017

Archive powered by MHonArc 2.6.24.

Top of Page