diff options
author | Sam Clegg <sbc@chromium.org> | 2015-05-21 14:59:31 -0700 |
---|---|---|
committer | Sam Clegg <sbc@chromium.org> | 2015-05-21 22:00:46 +0000 |
commit | 1e5b5e38a869704de610342fefb4ef50a6ecb30f (patch) | |
tree | 9c585583188b099cc9b908276006e5319c00f91c /chrome/installer/linux | |
parent | 2839f1fbc57c85896d920b97b0c6135c993c9242 (diff) | |
download | chromium_src-1e5b5e38a869704de610342fefb4ef50a6ecb30f.zip chromium_src-1e5b5e38a869704de610342fefb4ef50a6ecb30f.tar.gz chromium_src-1e5b5e38a869704de610342fefb4ef50a6ecb30f.tar.bz2 |
Add libattr.so.1 to wheezy sysroot image
Also, fix TODO by removing libgcrypt11
Also, explicitly download and use the jessie release
key when verify Release file signature. The wheezy
release file is signed with this as well as the wheezy
key and the jessie key is not in the Trusty version of
the debian-archive-keyring package yet.
BUG=490807
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1149753004
Cr-Commit-Position: refs/heads/master@{#331003}
Diffstat (limited to 'chrome/installer/linux')
5 files changed, 89 insertions, 91 deletions
diff --git a/chrome/installer/linux/sysroot_scripts/packagelist.wheezy.amd64 b/chrome/installer/linux/sysroot_scripts/packagelist.wheezy.amd64 index 92cdde3..357950e 100644 --- a/chrome/installer/linux/sysroot_scripts/packagelist.wheezy.amd64 +++ b/chrome/installer/linux/sysroot_scripts/packagelist.wheezy.amd64 @@ -2,21 +2,22 @@ main/a/alsa-lib/libasound2_1.0.25-4_amd64.deb main/a/alsa-lib/libasound2-dev_1.0.25-4_amd64.deb main/a/atk1.0/libatk1.0-0_2.4.0-2_amd64.deb main/a/atk1.0/libatk1.0-dev_2.4.0-2_amd64.deb +main/a/attr/libattr1_2.4.46-8_amd64.deb main/a/avahi/libavahi-client3_0.6.31-2_amd64.deb main/a/avahi/libavahi-common3_0.6.31-2_amd64.deb main/c/cairo/libcairo2_1.12.2-3_amd64.deb main/c/cairo/libcairo2-dev_1.12.2-3_amd64.deb main/c/cairo/libcairo-gobject2_1.12.2-3_amd64.deb main/c/cairo/libcairo-script-interpreter2_1.12.2-3_amd64.deb -main/c/cups/libcups2_1.5.3-5+deb7u1_amd64.deb -main/c/cups/libcups2-dev_1.5.3-5+deb7u1_amd64.deb +main/c/cups/libcups2_1.5.3-5+deb7u4_amd64.deb +main/c/cups/libcups2-dev_1.5.3-5+deb7u4_amd64.deb main/d/dbus-glib/libdbus-glib-1-2_0.100.2-1_amd64.deb -main/d/dbus/libdbus-1-3_1.6.8-1+deb7u1_amd64.deb -main/d/dbus/libdbus-1-dev_1.6.8-1+deb7u1_amd64.deb +main/d/dbus/libdbus-1-3_1.6.8-1+deb7u5_amd64.deb +main/d/dbus/libdbus-1-dev_1.6.8-1+deb7u5_amd64.deb main/e/e2fsprogs/comerr-dev_2.1-1.42.5-1.1_amd64.deb main/e/e2fsprogs/libcomerr2_1.42.5-1.1_amd64.deb -main/e/eglibc/libc6_2.13-38+deb7u1_amd64.deb -main/e/eglibc/libc6-dev_2.13-38+deb7u1_amd64.deb +main/e/eglibc/libc6_2.13-38+deb7u6_amd64.deb +main/e/eglibc/libc6-dev_2.13-38+deb7u6_amd64.deb main/e/elfutils/libelf1_0.152-1+wheezy1_amd64.deb main/e/elfutils/libelf-dev_0.152-1+wheezy1_amd64.deb main/e/expat/libexpat1_2.1.0-1+deb7u1_amd64.deb @@ -38,31 +39,29 @@ main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1_amd64.deb main/g/gdk-pixbuf/libgdk-pixbuf2.0-dev_2.26.1-1_amd64.deb main/g/glib2.0/libglib2.0-0_2.33.12+really2.32.4-5_amd64.deb main/g/glib2.0/libglib2.0-dev_2.33.12+really2.32.4-5_amd64.deb -main/g/gnutls26/libgnutls26_2.12.20-8+deb7u1_amd64.deb -main/g/gnutls26/libgnutls-dev_2.12.20-8+deb7u1_amd64.deb -main/g/gnutls26/libgnutls-openssl27_2.12.20-8+deb7u1_amd64.deb -main/g/gnutls26/libgnutlsxx27_2.12.20-8+deb7u1_amd64.deb +main/g/gnutls26/libgnutls26_2.12.20-8+deb7u2_amd64.deb +main/g/gnutls26/libgnutls-dev_2.12.20-8+deb7u2_amd64.deb +main/g/gnutls26/libgnutls-openssl27_2.12.20-8+deb7u2_amd64.deb +main/g/gnutls26/libgnutlsxx27_2.12.20-8+deb7u2_amd64.deb main/g/gtk+2.0/libgtk2.0-0_2.24.10-2_amd64.deb main/g/gtk+2.0/libgtk2.0-dev_2.24.10-2_amd64.deb -main/k/keyutils/libkeyutils1_1.5.5-3_amd64.deb -main/k/krb5/krb5-multidev_1.10.1+dfsg-5+deb7u1_amd64.deb -main/k/krb5/libgssapi-krb5-2_1.10.1+dfsg-5+deb7u1_amd64.deb -main/k/krb5/libgssrpc4_1.10.1+dfsg-5+deb7u1_amd64.deb -main/k/krb5/libk5crypto3_1.10.1+dfsg-5+deb7u1_amd64.deb -main/k/krb5/libkadm5clnt-mit8_1.10.1+dfsg-5+deb7u1_amd64.deb -main/k/krb5/libkadm5srv-mit8_1.10.1+dfsg-5+deb7u1_amd64.deb -main/k/krb5/libkdb5-6_1.10.1+dfsg-5+deb7u1_amd64.deb -main/k/krb5/libkrb5-3_1.10.1+dfsg-5+deb7u1_amd64.deb -main/k/krb5/libkrb5-dev_1.10.1+dfsg-5+deb7u1_amd64.deb -main/k/krb5/libkrb5support0_1.10.1+dfsg-5+deb7u1_amd64.deb +main/k/keyutils/libkeyutils1_1.5.5-3+deb7u1_amd64.deb +main/k/krb5/krb5-multidev_1.10.1+dfsg-5+deb7u2_amd64.deb +main/k/krb5/libgssapi-krb5-2_1.10.1+dfsg-5+deb7u2_amd64.deb +main/k/krb5/libgssrpc4_1.10.1+dfsg-5+deb7u2_amd64.deb +main/k/krb5/libk5crypto3_1.10.1+dfsg-5+deb7u2_amd64.deb +main/k/krb5/libkadm5clnt-mit8_1.10.1+dfsg-5+deb7u2_amd64.deb +main/k/krb5/libkadm5srv-mit8_1.10.1+dfsg-5+deb7u2_amd64.deb +main/k/krb5/libkdb5-6_1.10.1+dfsg-5+deb7u2_amd64.deb +main/k/krb5/libkrb5-3_1.10.1+dfsg-5+deb7u2_amd64.deb +main/k/krb5/libkrb5-dev_1.10.1+dfsg-5+deb7u2_amd64.deb +main/k/krb5/libkrb5support0_1.10.1+dfsg-5+deb7u2_amd64.deb main/libc/libcap2/libcap2_2.22-1.2_amd64.deb main/libc/libcap2/libcap-dev_2.22-1.2_amd64.deb main/libd/libdrm/libdrm2_2.4.40-1~deb7u2_amd64.deb main/libe/libexif/libexif12_0.6.20-3_amd64.deb main/libe/libexif/libexif-dev_0.6.20-3_amd64.deb main/libf/libffi/libffi5_3.0.10-3_amd64.deb -main/libg/libgcrypt11/libgcrypt11_1.5.0-5+deb7u1_amd64.deb -main/libg/libgcrypt11/libgcrypt11-dev_1.5.0-5+deb7u1_amd64.deb main/libg/libgnome-keyring/libgnome-keyring0_3.4.1-1_amd64.deb main/libg/libgnome-keyring/libgnome-keyring-dev_3.4.1-1_amd64.deb main/libg/libgpg-error/libgpg-error0_1.10-3.1_amd64.deb @@ -72,7 +71,7 @@ main/libp/libp11/libp11-2_0.2.8-2_amd64.deb main/libp/libpng/libpng12-0_1.2.49-1_amd64.deb main/libp/libpng/libpng12-dev_1.2.49-1_amd64.deb main/libs/libselinux/libselinux1_2.1.9-5_amd64.deb -main/libt/libtasn1-3/libtasn1-3_2.13-2_amd64.deb +main/libt/libtasn1-3/libtasn1-3_2.13-2+deb7u1_amd64.deb main/libx/libx11/libx11-6_1.5.0-1+deb7u1_amd64.deb main/libx/libx11/libx11-dev_1.5.0-1+deb7u1_amd64.deb main/libx/libx11/libx11-xcb1_1.5.0-1+deb7u1_amd64.deb @@ -111,17 +110,17 @@ main/libx/libxt/libxt-dev_1.1.3-1+deb7u1_amd64.deb main/libx/libxtst/libxtst6_1.2.1-1+deb7u1_amd64.deb main/libx/libxtst/libxtst-dev_1.2.1-1+deb7u1_amd64.deb main/libx/libxxf86vm/libxxf86vm1_1.1.2-1+deb7u1_amd64.deb -main/l/linux/linux-libc-dev_3.2.57-3_amd64.deb +main/l/linux/linux-libc-dev_3.2.65-1_amd64.deb main/m/mesa/libgl1-mesa-dev_8.0.5-4+deb7u2_amd64.deb main/m/mesa/libgl1-mesa-glx_8.0.5-4+deb7u2_amd64.deb main/m/mesa/libglapi-mesa_8.0.5-4+deb7u2_amd64.deb main/m/mesa/mesa-common-dev_8.0.5-4+deb7u2_amd64.deb -main/n/nspr/libnspr4_4.9.2-1+deb7u1_amd64.deb -main/n/nspr/libnspr4-dev_4.9.2-1+deb7u1_amd64.deb -main/n/nss/libnss3_3.14.5-1_amd64.deb -main/n/nss/libnss3-dev_3.14.5-1_amd64.deb -main/o/openssl/libssl1.0.0_1.0.1e-2+deb7u7_amd64.deb -main/o/openssl/libssl-dev_1.0.1e-2+deb7u7_amd64.deb +main/n/nspr/libnspr4_4.9.2-1+deb7u2_amd64.deb +main/n/nspr/libnspr4-dev_4.9.2-1+deb7u2_amd64.deb +main/n/nss/libnss3_3.14.5-1+deb7u3_amd64.deb +main/n/nss/libnss3-dev_3.14.5-1+deb7u3_amd64.deb +main/o/openssl/libssl1.0.0_1.0.1e-2+deb7u13_amd64.deb +main/o/openssl/libssl-dev_1.0.1e-2+deb7u13_amd64.deb main/o/orbit2/liborbit2_2.14.19-0.1_amd64.deb main/p/p11-kit/libp11-kit0_0.12-3_amd64.deb main/p/pam/libpam0g_1.1.3-7.1_amd64.deb diff --git a/chrome/installer/linux/sysroot_scripts/packagelist.wheezy.arm b/chrome/installer/linux/sysroot_scripts/packagelist.wheezy.arm index bd9a55c..ecc35c4 100644 --- a/chrome/installer/linux/sysroot_scripts/packagelist.wheezy.arm +++ b/chrome/installer/linux/sysroot_scripts/packagelist.wheezy.arm @@ -2,21 +2,22 @@ main/a/alsa-lib/libasound2_1.0.25-4_armhf.deb main/a/alsa-lib/libasound2-dev_1.0.25-4_armhf.deb main/a/atk1.0/libatk1.0-0_2.4.0-2_armhf.deb main/a/atk1.0/libatk1.0-dev_2.4.0-2_armhf.deb +main/a/attr/libattr1_2.4.46-8_armhf.deb main/a/avahi/libavahi-client3_0.6.31-2_armhf.deb main/a/avahi/libavahi-common3_0.6.31-2_armhf.deb main/c/cairo/libcairo2_1.12.2-3_armhf.deb main/c/cairo/libcairo2-dev_1.12.2-3_armhf.deb main/c/cairo/libcairo-gobject2_1.12.2-3_armhf.deb main/c/cairo/libcairo-script-interpreter2_1.12.2-3_armhf.deb -main/c/cups/libcups2_1.5.3-5+deb7u2_armhf.deb -main/c/cups/libcups2-dev_1.5.3-5+deb7u2_armhf.deb +main/c/cups/libcups2_1.5.3-5+deb7u4_armhf.deb +main/c/cups/libcups2-dev_1.5.3-5+deb7u4_armhf.deb main/d/dbus-glib/libdbus-glib-1-2_0.100.2-1_armhf.deb -main/d/dbus/libdbus-1-3_1.6.8-1+deb7u3_armhf.deb -main/d/dbus/libdbus-1-dev_1.6.8-1+deb7u3_armhf.deb +main/d/dbus/libdbus-1-3_1.6.8-1+deb7u5_armhf.deb +main/d/dbus/libdbus-1-dev_1.6.8-1+deb7u5_armhf.deb main/e/e2fsprogs/comerr-dev_2.1-1.42.5-1.1_armhf.deb main/e/e2fsprogs/libcomerr2_1.42.5-1.1_armhf.deb -main/e/eglibc/libc6_2.13-38+deb7u2_armhf.deb -main/e/eglibc/libc6-dev_2.13-38+deb7u2_armhf.deb +main/e/eglibc/libc6_2.13-38+deb7u6_armhf.deb +main/e/eglibc/libc6-dev_2.13-38+deb7u6_armhf.deb main/e/elfutils/libelf1_0.152-1+wheezy1_armhf.deb main/e/elfutils/libelf-dev_0.152-1+wheezy1_armhf.deb main/e/expat/libexpat1_2.1.0-1+deb7u1_armhf.deb @@ -43,25 +44,23 @@ main/g/gnutls26/libgnutls-openssl27_2.12.20-8+deb7u2_armhf.deb main/g/gnutls26/libgnutlsxx27_2.12.20-8+deb7u2_armhf.deb main/g/gtk+2.0/libgtk2.0-0_2.24.10-2_armhf.deb main/g/gtk+2.0/libgtk2.0-dev_2.24.10-2_armhf.deb -main/k/keyutils/libkeyutils1_1.5.5-3_armhf.deb -main/k/krb5/krb5-multidev_1.10.1+dfsg-5+deb7u1_armhf.deb -main/k/krb5/libgssapi-krb5-2_1.10.1+dfsg-5+deb7u1_armhf.deb -main/k/krb5/libgssrpc4_1.10.1+dfsg-5+deb7u1_armhf.deb -main/k/krb5/libk5crypto3_1.10.1+dfsg-5+deb7u1_armhf.deb -main/k/krb5/libkadm5clnt-mit8_1.10.1+dfsg-5+deb7u1_armhf.deb -main/k/krb5/libkadm5srv-mit8_1.10.1+dfsg-5+deb7u1_armhf.deb -main/k/krb5/libkdb5-6_1.10.1+dfsg-5+deb7u1_armhf.deb -main/k/krb5/libkrb5-3_1.10.1+dfsg-5+deb7u1_armhf.deb -main/k/krb5/libkrb5-dev_1.10.1+dfsg-5+deb7u1_armhf.deb -main/k/krb5/libkrb5support0_1.10.1+dfsg-5+deb7u1_armhf.deb +main/k/keyutils/libkeyutils1_1.5.5-3+deb7u1_armhf.deb +main/k/krb5/krb5-multidev_1.10.1+dfsg-5+deb7u2_armhf.deb +main/k/krb5/libgssapi-krb5-2_1.10.1+dfsg-5+deb7u2_armhf.deb +main/k/krb5/libgssrpc4_1.10.1+dfsg-5+deb7u2_armhf.deb +main/k/krb5/libk5crypto3_1.10.1+dfsg-5+deb7u2_armhf.deb +main/k/krb5/libkadm5clnt-mit8_1.10.1+dfsg-5+deb7u2_armhf.deb +main/k/krb5/libkadm5srv-mit8_1.10.1+dfsg-5+deb7u2_armhf.deb +main/k/krb5/libkdb5-6_1.10.1+dfsg-5+deb7u2_armhf.deb +main/k/krb5/libkrb5-3_1.10.1+dfsg-5+deb7u2_armhf.deb +main/k/krb5/libkrb5-dev_1.10.1+dfsg-5+deb7u2_armhf.deb +main/k/krb5/libkrb5support0_1.10.1+dfsg-5+deb7u2_armhf.deb main/libc/libcap2/libcap2_2.22-1.2_armhf.deb main/libc/libcap2/libcap-dev_2.22-1.2_armhf.deb main/libd/libdrm/libdrm2_2.4.40-1~deb7u2_armhf.deb main/libe/libexif/libexif12_0.6.20-3_armhf.deb main/libe/libexif/libexif-dev_0.6.20-3_armhf.deb main/libf/libffi/libffi5_3.0.10-3+b1_armhf.deb -main/libg/libgcrypt11/libgcrypt11_1.5.0-5+deb7u1_armhf.deb -main/libg/libgcrypt11/libgcrypt11-dev_1.5.0-5+deb7u1_armhf.deb main/libg/libgnome-keyring/libgnome-keyring0_3.4.1-1_armhf.deb main/libg/libgnome-keyring/libgnome-keyring-dev_3.4.1-1_armhf.deb main/libg/libgpg-error/libgpg-error0_1.10-3.1_armhf.deb @@ -71,7 +70,7 @@ main/libp/libp11/libp11-2_0.2.8-2_armhf.deb main/libp/libpng/libpng12-0_1.2.49-1_armhf.deb main/libp/libpng/libpng12-dev_1.2.49-1_armhf.deb main/libs/libselinux/libselinux1_2.1.9-5_armhf.deb -main/libt/libtasn1-3/libtasn1-3_2.13-2_armhf.deb +main/libt/libtasn1-3/libtasn1-3_2.13-2+deb7u1_armhf.deb main/libx/libx11/libx11-6_1.5.0-1+deb7u1_armhf.deb main/libx/libx11/libx11-dev_1.5.0-1+deb7u1_armhf.deb main/libx/libx11/libx11-xcb1_1.5.0-1+deb7u1_armhf.deb @@ -110,17 +109,17 @@ main/libx/libxt/libxt-dev_1.1.3-1+deb7u1_armhf.deb main/libx/libxtst/libxtst6_1.2.1-1+deb7u1_armhf.deb main/libx/libxtst/libxtst-dev_1.2.1-1+deb7u1_armhf.deb main/libx/libxxf86vm/libxxf86vm1_1.1.2-1+deb7u1_armhf.deb -main/l/linux/linux-libc-dev_3.2.57-3_armhf.deb +main/l/linux/linux-libc-dev_3.2.65-1_armhf.deb main/m/mesa/libgl1-mesa-dev_8.0.5-4+deb7u2_armhf.deb main/m/mesa/libgl1-mesa-glx_8.0.5-4+deb7u2_armhf.deb main/m/mesa/libglapi-mesa_8.0.5-4+deb7u2_armhf.deb main/m/mesa/mesa-common-dev_8.0.5-4+deb7u2_armhf.deb main/n/nspr/libnspr4_4.9.2-1+deb7u2_armhf.deb main/n/nspr/libnspr4-dev_4.9.2-1+deb7u2_armhf.deb -main/n/nss/libnss3_3.14.5-1_armhf.deb -main/n/nss/libnss3-dev_3.14.5-1_armhf.deb -main/o/openssl/libssl1.0.0_1.0.1e-2+deb7u11_armhf.deb -main/o/openssl/libssl-dev_1.0.1e-2+deb7u11_armhf.deb +main/n/nss/libnss3_3.14.5-1+deb7u3_armhf.deb +main/n/nss/libnss3-dev_3.14.5-1+deb7u3_armhf.deb +main/o/openssl/libssl1.0.0_1.0.1e-2+deb7u13_armhf.deb +main/o/openssl/libssl-dev_1.0.1e-2+deb7u13_armhf.deb main/o/orbit2/liborbit2_2.14.19-0.1_armhf.deb main/p/p11-kit/libp11-kit0_0.12-3_armhf.deb main/p/pam/libpam0g_1.1.3-7.1_armhf.deb diff --git a/chrome/installer/linux/sysroot_scripts/packagelist.wheezy.i386 b/chrome/installer/linux/sysroot_scripts/packagelist.wheezy.i386 index b851cf1..a3ef9c3 100644 --- a/chrome/installer/linux/sysroot_scripts/packagelist.wheezy.i386 +++ b/chrome/installer/linux/sysroot_scripts/packagelist.wheezy.i386 @@ -2,21 +2,22 @@ main/a/alsa-lib/libasound2_1.0.25-4_i386.deb main/a/alsa-lib/libasound2-dev_1.0.25-4_i386.deb main/a/atk1.0/libatk1.0-0_2.4.0-2_i386.deb main/a/atk1.0/libatk1.0-dev_2.4.0-2_i386.deb +main/a/attr/libattr1_2.4.46-8_i386.deb main/a/avahi/libavahi-client3_0.6.31-2_i386.deb main/a/avahi/libavahi-common3_0.6.31-2_i386.deb main/c/cairo/libcairo2_1.12.2-3_i386.deb main/c/cairo/libcairo2-dev_1.12.2-3_i386.deb main/c/cairo/libcairo-gobject2_1.12.2-3_i386.deb main/c/cairo/libcairo-script-interpreter2_1.12.2-3_i386.deb -main/c/cups/libcups2_1.5.3-5+deb7u1_i386.deb -main/c/cups/libcups2-dev_1.5.3-5+deb7u1_i386.deb +main/c/cups/libcups2_1.5.3-5+deb7u4_i386.deb +main/c/cups/libcups2-dev_1.5.3-5+deb7u4_i386.deb main/d/dbus-glib/libdbus-glib-1-2_0.100.2-1_i386.deb -main/d/dbus/libdbus-1-3_1.6.8-1+deb7u1_i386.deb -main/d/dbus/libdbus-1-dev_1.6.8-1+deb7u1_i386.deb +main/d/dbus/libdbus-1-3_1.6.8-1+deb7u5_i386.deb +main/d/dbus/libdbus-1-dev_1.6.8-1+deb7u5_i386.deb main/e/e2fsprogs/comerr-dev_2.1-1.42.5-1.1_i386.deb main/e/e2fsprogs/libcomerr2_1.42.5-1.1_i386.deb -main/e/eglibc/libc6_2.13-38+deb7u1_i386.deb -main/e/eglibc/libc6-dev_2.13-38+deb7u1_i386.deb +main/e/eglibc/libc6_2.13-38+deb7u6_i386.deb +main/e/eglibc/libc6-dev_2.13-38+deb7u6_i386.deb main/e/elfutils/libelf1_0.152-1+wheezy1_i386.deb main/e/elfutils/libelf-dev_0.152-1+wheezy1_i386.deb main/e/expat/libexpat1_2.1.0-1+deb7u1_i386.deb @@ -38,31 +39,29 @@ main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1_i386.deb main/g/gdk-pixbuf/libgdk-pixbuf2.0-dev_2.26.1-1_i386.deb main/g/glib2.0/libglib2.0-0_2.33.12+really2.32.4-5_i386.deb main/g/glib2.0/libglib2.0-dev_2.33.12+really2.32.4-5_i386.deb -main/g/gnutls26/libgnutls26_2.12.20-8+deb7u1_i386.deb -main/g/gnutls26/libgnutls-dev_2.12.20-8+deb7u1_i386.deb -main/g/gnutls26/libgnutls-openssl27_2.12.20-8+deb7u1_i386.deb -main/g/gnutls26/libgnutlsxx27_2.12.20-8+deb7u1_i386.deb +main/g/gnutls26/libgnutls26_2.12.20-8+deb7u2_i386.deb +main/g/gnutls26/libgnutls-dev_2.12.20-8+deb7u2_i386.deb +main/g/gnutls26/libgnutls-openssl27_2.12.20-8+deb7u2_i386.deb +main/g/gnutls26/libgnutlsxx27_2.12.20-8+deb7u2_i386.deb main/g/gtk+2.0/libgtk2.0-0_2.24.10-2_i386.deb main/g/gtk+2.0/libgtk2.0-dev_2.24.10-2_i386.deb -main/k/keyutils/libkeyutils1_1.5.5-3_i386.deb -main/k/krb5/krb5-multidev_1.10.1+dfsg-5+deb7u1_i386.deb -main/k/krb5/libgssapi-krb5-2_1.10.1+dfsg-5+deb7u1_i386.deb -main/k/krb5/libgssrpc4_1.10.1+dfsg-5+deb7u1_i386.deb -main/k/krb5/libk5crypto3_1.10.1+dfsg-5+deb7u1_i386.deb -main/k/krb5/libkadm5clnt-mit8_1.10.1+dfsg-5+deb7u1_i386.deb -main/k/krb5/libkadm5srv-mit8_1.10.1+dfsg-5+deb7u1_i386.deb -main/k/krb5/libkdb5-6_1.10.1+dfsg-5+deb7u1_i386.deb -main/k/krb5/libkrb5-3_1.10.1+dfsg-5+deb7u1_i386.deb -main/k/krb5/libkrb5-dev_1.10.1+dfsg-5+deb7u1_i386.deb -main/k/krb5/libkrb5support0_1.10.1+dfsg-5+deb7u1_i386.deb +main/k/keyutils/libkeyutils1_1.5.5-3+deb7u1_i386.deb +main/k/krb5/krb5-multidev_1.10.1+dfsg-5+deb7u2_i386.deb +main/k/krb5/libgssapi-krb5-2_1.10.1+dfsg-5+deb7u2_i386.deb +main/k/krb5/libgssrpc4_1.10.1+dfsg-5+deb7u2_i386.deb +main/k/krb5/libk5crypto3_1.10.1+dfsg-5+deb7u2_i386.deb +main/k/krb5/libkadm5clnt-mit8_1.10.1+dfsg-5+deb7u2_i386.deb +main/k/krb5/libkadm5srv-mit8_1.10.1+dfsg-5+deb7u2_i386.deb +main/k/krb5/libkdb5-6_1.10.1+dfsg-5+deb7u2_i386.deb +main/k/krb5/libkrb5-3_1.10.1+dfsg-5+deb7u2_i386.deb +main/k/krb5/libkrb5-dev_1.10.1+dfsg-5+deb7u2_i386.deb +main/k/krb5/libkrb5support0_1.10.1+dfsg-5+deb7u2_i386.deb main/libc/libcap2/libcap2_2.22-1.2_i386.deb main/libc/libcap2/libcap-dev_2.22-1.2_i386.deb main/libd/libdrm/libdrm2_2.4.40-1~deb7u2_i386.deb main/libe/libexif/libexif12_0.6.20-3_i386.deb main/libe/libexif/libexif-dev_0.6.20-3_i386.deb main/libf/libffi/libffi5_3.0.10-3_i386.deb -main/libg/libgcrypt11/libgcrypt11_1.5.0-5+deb7u1_i386.deb -main/libg/libgcrypt11/libgcrypt11-dev_1.5.0-5+deb7u1_i386.deb main/libg/libgnome-keyring/libgnome-keyring0_3.4.1-1_i386.deb main/libg/libgnome-keyring/libgnome-keyring-dev_3.4.1-1_i386.deb main/libg/libgpg-error/libgpg-error0_1.10-3.1_i386.deb @@ -72,7 +71,7 @@ main/libp/libp11/libp11-2_0.2.8-2_i386.deb main/libp/libpng/libpng12-0_1.2.49-1_i386.deb main/libp/libpng/libpng12-dev_1.2.49-1_i386.deb main/libs/libselinux/libselinux1_2.1.9-5_i386.deb -main/libt/libtasn1-3/libtasn1-3_2.13-2_i386.deb +main/libt/libtasn1-3/libtasn1-3_2.13-2+deb7u1_i386.deb main/libx/libx11/libx11-6_1.5.0-1+deb7u1_i386.deb main/libx/libx11/libx11-dev_1.5.0-1+deb7u1_i386.deb main/libx/libx11/libx11-xcb1_1.5.0-1+deb7u1_i386.deb @@ -111,17 +110,17 @@ main/libx/libxt/libxt-dev_1.1.3-1+deb7u1_i386.deb main/libx/libxtst/libxtst6_1.2.1-1+deb7u1_i386.deb main/libx/libxtst/libxtst-dev_1.2.1-1+deb7u1_i386.deb main/libx/libxxf86vm/libxxf86vm1_1.1.2-1+deb7u1_i386.deb -main/l/linux/linux-libc-dev_3.2.57-3_i386.deb +main/l/linux/linux-libc-dev_3.2.65-1_i386.deb main/m/mesa/libgl1-mesa-dev_8.0.5-4+deb7u2_i386.deb main/m/mesa/libgl1-mesa-glx_8.0.5-4+deb7u2_i386.deb main/m/mesa/libglapi-mesa_8.0.5-4+deb7u2_i386.deb main/m/mesa/mesa-common-dev_8.0.5-4+deb7u2_i386.deb -main/n/nspr/libnspr4_4.9.2-1+deb7u1_i386.deb -main/n/nspr/libnspr4-dev_4.9.2-1+deb7u1_i386.deb -main/n/nss/libnss3_3.14.5-1_i386.deb -main/n/nss/libnss3-dev_3.14.5-1_i386.deb -main/o/openssl/libssl1.0.0_1.0.1e-2+deb7u7_i386.deb -main/o/openssl/libssl-dev_1.0.1e-2+deb7u7_i386.deb +main/n/nspr/libnspr4_4.9.2-1+deb7u2_i386.deb +main/n/nspr/libnspr4-dev_4.9.2-1+deb7u2_i386.deb +main/n/nss/libnss3_3.14.5-1+deb7u3_i386.deb +main/n/nss/libnss3-dev_3.14.5-1+deb7u3_i386.deb +main/o/openssl/libssl1.0.0_1.0.1e-2+deb7u13_i386.deb +main/o/openssl/libssl-dev_1.0.1e-2+deb7u13_i386.deb main/o/orbit2/liborbit2_2.14.19-0.1_i386.deb main/p/p11-kit/libp11-kit0_0.12-3_i386.deb main/p/pam/libpam0g_1.1.3-7.1_i386.deb diff --git a/chrome/installer/linux/sysroot_scripts/sysroot-creator-wheezy.sh b/chrome/installer/linux/sysroot_scripts/sysroot-creator-wheezy.sh index 80d277c..9c14165 100755 --- a/chrome/installer/linux/sysroot_scripts/sysroot-creator-wheezy.sh +++ b/chrome/installer/linux/sysroot_scripts/sysroot-creator-wheezy.sh @@ -13,7 +13,6 @@ KEYRING_FILE=/usr/share/keyrings/debian-archive-keyring.gpg # Sysroot packages: these are the packages needed to build chrome. # NOTE: When DEBIAN_PACKAGES is modified, the packagelist files must be updated # by running this script in GeneratePackageList mode. -# TODO(thestig) Remove libgcrypt11* the next time a package gets added. DEBIAN_PACKAGES="\ comerr-dev \ gcc-4.6 \ @@ -22,6 +21,7 @@ DEBIAN_PACKAGES="\ libasound2-dev \ libatk1.0-0 \ libatk1.0-dev \ + libattr1 \ libavahi-client3 \ libavahi-common3 \ libc6 \ @@ -54,8 +54,6 @@ DEBIAN_PACKAGES="\ libgconf-2-4 \ libgconf2-4 \ libgconf2-dev \ - libgcrypt11 \ - libgcrypt11-dev \ libgdk-pixbuf2.0-0 \ libgdk-pixbuf2.0-dev \ libgl1-mesa-dev \ diff --git a/chrome/installer/linux/sysroot_scripts/sysroot-creator.sh b/chrome/installer/linux/sysroot_scripts/sysroot-creator.sh index 7fcf32c..6f5048a 100644 --- a/chrome/installer/linux/sysroot_scripts/sysroot-creator.sh +++ b/chrome/installer/linux/sysroot_scripts/sysroot-creator.sh @@ -473,13 +473,16 @@ VerifyPackageListing() { local output_file=$2 local release_file="${BUILD_DIR}/${RELEASE_FILE}" local release_file_gpg="${BUILD_DIR}/${RELEASE_FILE_GPG}" + local tmp_keyring_file="${BUILD_DIR}/keyring.gpg" CheckForDebianGPGKeyring DownloadOrCopy ${RELEASE_LIST} ${release_file} DownloadOrCopy ${RELEASE_LIST_GPG} ${release_file_gpg} echo "Verifying: ${release_file} with ${release_file_gpg}" - gpgv --keyring $KEYRING_FILE ${release_file_gpg} ${release_file} + cp "${KEYRING_FILE}" "${tmp_keyring_file}" + gpg --primary-keyring "${tmp_keyring_file}" --recv-keys 2B90D010 + gpgv --keyring "${tmp_keyring_file}" "${release_file_gpg}" "${release_file}" echo "Verifying: ${output_file}" local checksums=$(grep ${file_path} ${release_file} | cut -d " " -f 2) |