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

Side by Side Diff: chrome/installer/linux/debian/build.sh

Issue 2721373002: Uprev NSS requirement on Linux to 3.26 (Closed)
Patch Set: Update runtime checks Created 3 years, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | crypto/nss_util.cc » ('j') | crypto/nss_util.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # 2 #
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # TODO(mmoss) This currently only works with official builds, since non-official 7 # TODO(mmoss) This currently only works with official builds, since non-official
8 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging. 8 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging.
9 9
10 set -e 10 set -e
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 # ca-certificates: Make sure users have SSL certificates. 307 # ca-certificates: Make sure users have SSL certificates.
308 # fonts-liberation: Make sure users have compatible fonts for viewing PDFs. 308 # fonts-liberation: Make sure users have compatible fonts for viewing PDFs.
309 # libappindicator1: Make systray icons work in Unity. 309 # libappindicator1: Make systray icons work in Unity.
310 # libnss3: Pull a more recent version of NSS than required by runtime linking, 310 # libnss3: Pull a more recent version of NSS than required by runtime linking,
311 # for security and stability updates in NSS. 311 # for security and stability updates in NSS.
312 # libstdc++6: For C++11 support. 312 # libstdc++6: For C++11 support.
313 # lsb-base: Implies many other dependencies. 313 # lsb-base: Implies many other dependencies.
314 # xdg-utils: For OS integration. 314 # xdg-utils: For OS integration.
315 # wget: For uploading crash reports with Breakpad. 315 # wget: For uploading crash reports with Breakpad.
316 ADDITION_DEPS="ca-certificates, fonts-liberation, libappindicator1, \ 316 ADDITION_DEPS="ca-certificates, fonts-liberation, libappindicator1, \
317 libnss3 (>= 3.17.2), libstdc++6 (>=4.8.0), lsb-base (>=4.1), \ 317 libnss3 (>= 3.26), libstdc++6 (>=4.8.0), lsb-base (>=4.1), \
318 xdg-utils (>= 1.0.2), wget" 318 xdg-utils (>= 1.0.2), wget"
319 319
320 # Fix-up libnspr dependency due to renaming in Ubuntu (the old package still 320 # Fix-up libnspr dependency due to renaming in Ubuntu (the old package still
321 # exists, but it was moved to "universe" repository, which isn't installed by 321 # exists, but it was moved to "universe" repository, which isn't installed by
322 # default). 322 # default).
323 DPKG_SHLIB_DEPS=$(sed \ 323 DPKG_SHLIB_DEPS=$(sed \
324 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \ 324 's/\(libnspr4-0d ([^)]*)\), /\1 | libnspr4 (>= 4.9.5-0ubuntu0), /g' \
325 <<< $DPKG_SHLIB_DEPS) 325 <<< $DPKG_SHLIB_DEPS)
326 326
327 COMMON_DEPS="${DPKG_SHLIB_DEPS}, ${ADDITION_DEPS}" 327 COMMON_DEPS="${DPKG_SHLIB_DEPS}, ${ADDITION_DEPS}"
(...skipping 21 matching lines...) Expand all
349 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have 349 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have
350 # set it to an empty string) 350 # set it to an empty string)
351 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}" 351 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}"
352 # Allowed configs include optional HTTPS support and explicit multiarch 352 # Allowed configs include optional HTTPS support and explicit multiarch
353 # platforms. 353 # platforms.
354 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]" 354 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]"
355 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}" 355 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}"
356 stage_install_debian 356 stage_install_debian
357 357
358 do_package 358 do_package
OLDNEW
« no previous file with comments | « no previous file | crypto/nss_util.cc » ('j') | crypto/nss_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698