Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3352)

Unified Diff: chrome/installer/linux/rpm/build.sh

Issue 2721373002: Uprev NSS requirement on Linux to 3.26 (Closed)
Patch Set: Update deps Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/linux/debian/build.sh ('k') | crypto/nss_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/linux/rpm/build.sh
diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh
index 8f7e6ead17674fd26b41b00edc272e7220a3cd2d..4d2609aa249949704930b54bd33b448eba366170 100755
--- a/chrome/installer/linux/rpm/build.sh
+++ b/chrome/installer/linux/rpm/build.sh
@@ -131,7 +131,9 @@ do_package() {
# lsb implies many dependencies.
#
# nss (bundled) is optional in LSB 4.0. Also specify a more recent version
- # for security and stability updates.
+ # for security and stability updates. While we depend on libnss3.so and not
+ # libssl3.so, force the dependency on libssl3 to ensure the NSS version is
+ # 3.28 or later, since libssl3 should always be packaged with libnss3.
#
# libstdc++.so.6 is for C++11 support.
#
@@ -153,7 +155,8 @@ do_package() {
# TODO(thestig): Use the liberation-fonts package once its available on all
# supported distros.
DEPENDS="lsb >= 4.0, \
- libnss3.so(NSS_3.19.1)${PKG_ARCH}, \
+ libnss3.so(NSS_3.22)${PKG_ARCH}, \
+ libssl3.so(NSS_3.28)${PKG_ARCH}, \
libstdc++.so.6(GLIBCXX_3.4.18)${PKG_ARCH}, \
wget, \
xdg-utils, \
« no previous file with comments | « chrome/installer/linux/debian/build.sh ('k') | crypto/nss_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698