diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-01 23:23:37 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-01 23:23:37 +0000 |
| commit | ec27c0de4e9c1054f2d7faed2dae910ef5b88f17 (patch) | |
| tree | de709d2f1141ca53a4429017bbd6151813882b79 /chrome/installer | |
| parent | 5b6838b421fe7e4d4bcd027035f049164901591d (diff) | |
| download | chromium_src-ec27c0de4e9c1054f2d7faed2dae910ef5b88f17.zip chromium_src-ec27c0de4e9c1054f2d7faed2dae910ef5b88f17.tar.gz chromium_src-ec27c0de4e9c1054f2d7faed2dae910ef5b88f17.tar.bz2 | |
Revert 209515 "Reland http://crrev.com/209278"
> Reland http://crrev.com/209278
>
> Update dependency to NSS >= 3.14.3 and NSPR >= 4.9.2
>
> Technically NSS 3.14.3 depends on NSPR 4.9.5, but Debian stable still
> ships 4.9.2 on stable, so this is the lower bound.
>
> 3.14.3 contains a number of important security fixes, and support for
> older systems is no longer desirable.
>
> BUG=245370
> TBR=thestig@chromium.org, wtc@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/18332012
TBR=rsleevi@chromium.org
Review URL: https://codereview.chromium.org/18414004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rwxr-xr-x | chrome/installer/linux/debian/build.sh | 2 | ||||
| -rw-r--r-- | chrome/installer/linux/debian/expected_deps | 4 | ||||
| -rwxr-xr-x | chrome/installer/linux/rpm/build.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh index 48df8e9..d9d98a1 100755 --- a/chrome/installer/linux/debian/build.sh +++ b/chrome/installer/linux/debian/build.sh @@ -295,7 +295,7 @@ ADDITION_DEPS="ca-certificates, libcurl3, \ # exists, but it was moved to "universe" repository, which isn't installed by # default). DPKG_SHLIB_DEPS=$(sed \ - 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \ + 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.8.7-0ubuntu1), /g' \ <<< $DPKG_SHLIB_DEPS) # Fix-up libudev dependency because Ubuntu 13.04 has libudev1 instead of diff --git a/chrome/installer/linux/debian/expected_deps b/chrome/installer/linux/debian/expected_deps index 2668316..0e16912 100644 --- a/chrome/installer/linux/debian/expected_deps +++ b/chrome/installer/linux/debian/expected_deps @@ -14,8 +14,8 @@ libgcrypt11 (>= 1.4.5) libgdk-pixbuf2.0-0 (>= 2.22.0) libglib2.0-0 (>= 2.18.0) libgtk2.0-0 (>= 2.24.0) -libnspr4 (>= 4.9.2) -libnss3 (>= 3.14.3) +libnspr4 (>= 1.8.0.10) +libnss3 (>= 3.12.6) libpango1.0-0 (>= 1.22.0) libstdc++6 (>= 4.6) libudev0 (>= 147) diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh index 7134e59..544a46a 100755 --- a/chrome/installer/linux/rpm/build.sh +++ b/chrome/installer/linux/rpm/build.sh @@ -124,7 +124,7 @@ do_package() { # https://bugzilla.novell.com/show_bug.cgi?id=556248 DEPENDS="lsb >= 4.0, \ libcurl.so.4${EMPTY_VERSION}${PKG_ARCH}, \ - libnss3.so(NSS_3.14.3)${PKG_ARCH}, \ + libnss3.so(NSS_3.12.3)${PKG_ARCH}, \ wget, \ xdg-utils, \ zlib, \ |