February 2018 - crux-commits

ports/opt (3.4): dbus-python: updated to 1.2.6
by crux＠crux.nu 01 Feb '18

01 Feb '18

commit c6ad1e57ab776fcd69d50c541a843aae9f6433e2 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Jan 30 18:10:50 2018 +0100 dbus-python: updated to 1.2.6 diff --git a/dbus-python/.md5sum b/dbus-python/.md5sum index 53a56fc26..3f79107ee 100644 --- a/dbus-python/.md5sum +++ b/dbus-python/.md5sum @@ -1 +1 @@ -7372a588c83a7232b4e08159bfd48fe5 dbus-python-1.2.4.tar.gz +1ce1ddf2582060f8f971652ea54cc17e dbus-python-1.2.6.tar.gz diff --git a/dbus-python/.signature b/dbus-python/.signature index 3873ee6ee..f3f9b0c3b 100644 --- a/dbus-python/.signature +++ b/dbus-python/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/T0iuB93z/PCnG4ZyGbne64BXxi0HL8WOjD9l1jyQzVwUR0Ibjyz7hO4RL9tfjC2DhcfN8tkMSlQIUO7hRZHCQg= -SHA256 (Pkgfile) = 648fa126f2e85478befce6191c9d7d67a75855f1d1bf16c9518a918d98cd85b8 +RWSE3ohX2g5d/QQz4JZzBGLn5lHfelkJBfhOyzeceA0iz+skfUyd/FJ/swudq9Cpd+tg9cbtLA8GETsF8CF3j52AVhPnvb8HQQM= +SHA256 (Pkgfile) = 45b6165b15182938565cdf2d1431867709991a43d470e97fd594a610c9008085 SHA256 (.footprint) = 65117fb62e1d53d9af069e3bd5eb747769ba967e63ab5c1f22bb9fcb70d3e7dd -SHA256 (dbus-python-1.2.4.tar.gz) = e2f1d6871f74fba23652e51d10873e54f71adab0525833c19bad9e99b1b2f9cc +SHA256 (dbus-python-1.2.6.tar.gz) = 32f29c17172cdb9cb61c68b1f1a71dfe7351506fc830869029c47449bd04faeb diff --git a/dbus-python/Pkgfile b/dbus-python/Pkgfile index 37f4496b1..b25797b84 100644 --- a/dbus-python/Pkgfile +++ b/dbus-python/Pkgfile @@ -1,11 +1,10 @@ # Description: D-Bus Python bindings # URL: http://freedesktop.org/wiki/Software/DBusBindings -# Packager: Matt Housh, jaeger at crux dot nu # Maintainer: Fredrik Rinnestam, fredrik at crux dot nu # Depends on: dbus-glib name=dbus-python -version=1.2.4 +version=1.2.6 release=1 source=(http://dbus.freedesktop.org/releases/$name/$name-$version.tar.gz)

1 0

ports/opt (3.4): cups-filters: update to 1.20.0
by crux＠crux.nu 01 Feb '18

01 Feb '18

commit a527c0f97c3f899dff7ee4ea8bd2d68226c6ac18 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 30 16:50:25 2018 +0100 cups-filters: update to 1.20.0 diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index 665d7870a..98713e119 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -1,2 +1,2 @@ 7540a6989be0042429f41770b1cdf215 cups-browsed -3571e4d6e06d3f943943615fe2dcf31b cups-filters-1.19.0.tar.xz +dcdb34a2da6c173c61c7ae30be8e992a cups-filters-1.20.0.tar.xz diff --git a/cups-filters/.signature b/cups-filters/.signature index f465b7e5f..cfcc69e7a 100644 --- a/cups-filters/.signature +++ b/cups-filters/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Uaof41lkd6C+F0/9jV+SuQPfykuizrQUypVQbzE/tlc8iWzutG1J4G5ayT9gJN4PC6jowXZfKCTjC9RRt21uQ4= -SHA256 (Pkgfile) = 88257db8e7bb8422a880a662245e4963c7853806c17a178d6dbef7bb7ed04a38 +RWSE3ohX2g5d/SMzsJF+CqBVxGUs+oeMcNgxfTsJLvLrrOZZo5H3tEth1j7rgbsCCZugvZggvqG6whqgp4iNFUhULlixeZEiywY= +SHA256 (Pkgfile) = f2014bf30547f5a58d975405a05e4989f38030fbab5223016dd37e2f8bd3086b SHA256 (.footprint) = 32c7827b0a711a571ef4e2b7eb7812ed42a3b8f8e590cdbe949fa60a5b3978d5 -SHA256 (cups-filters-1.19.0.tar.xz) = 629705414869b0b0f45bdadea5c4ea803d55605442e09cce22c91cfb308d6b56 +SHA256 (cups-filters-1.20.0.tar.xz) = d7f65710960d6fe7c94e54cafdb3f8e4d23b7972db556f22ee95b35059bcd63c SHA256 (cups-browsed) = 4c4900ee88d488078da20a5cabc949921382fa69bc28bb2a7f89fa5ae01afb5b diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index 70cc01d41..306b3a549 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ghostscript poppler qpdf mupdf name=cups-filters -version=1.19.0 +version=1.20.0 release=1 source=(https://www.openprinting.org/download/$name/$name-$version.tar.xz cups-browsed)

1 0

ports/opt (3.4): nvidia: updated to version 390.25
by crux＠crux.nu 01 Feb '18

01 Feb '18

commit 9eb0eb130397b0edd9609325008eb15f6b691aaf Author: Matt Housh <jaeger(a)crux.ninja> Date: Mon Jan 29 21:18:19 2018 -0600 nvidia: updated to version 390.25 diff --git a/nvidia/.footprint b/nvidia/.footprint index be83fe5f5..878717ef0 100644 --- a/nvidia/.footprint +++ b/nvidia/.footprint @@ -21,42 +21,42 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/nvidia-smi -rwxr-xr-x root/root usr/bin/nvidia-xconfig drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libGL.so.384.111 -lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.384.111 +-rwxr-xr-x root/root usr/lib/libGL.so.390.25 +lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.390.25 lrwxrwxrwx root/root usr/lib/libOpenCL.so -> libOpenCL.so.1.0.0 -rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0 --rwxr-xr-x root/root usr/lib/libcuda.so.384.111 -lrwxrwxrwx root/root usr/lib/libnvcuvid.so -> libnvcuvid.so.384.111 -lrwxrwxrwx root/root usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.384.111 --rwxr-xr-x root/root usr/lib/libnvcuvid.so.384.111 --rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.384.111 --rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.384.111 --rwxr-xr-x root/root usr/lib/libnvidia-encode.so.384.111 --rwxr-xr-x root/root usr/lib/libnvidia-fatbinaryloader.so.384.111 --rwxr-xr-x root/root usr/lib/libnvidia-fbc.so.384.111 --rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.384.111 --rwxr-xr-x root/root usr/lib/libnvidia-gtk2.so.384.111 --rwxr-xr-x root/root usr/lib/libnvidia-gtk3.so.384.111 --rwxr-xr-x root/root usr/lib/libnvidia-ifr.so.384.111 -lrwxrwxrwx root/root usr/lib/libnvidia-ml.so -> libnvidia-ml.so.384.111 -lrwxrwxrwx root/root usr/lib/libnvidia-ml.so.1 -> libnvidia-ml.so.384.111 --rwxr-xr-x root/root usr/lib/libnvidia-ml.so.384.111 --rwxr-xr-x root/root usr/lib/libnvidia-opencl.so.384.111 --rwxr-xr-x root/root usr/lib/libnvidia-tls.so.384.111 +-rwxr-xr-x root/root usr/lib/libcuda.so.390.25 +lrwxrwxrwx root/root usr/lib/libnvcuvid.so -> libnvcuvid.so.390.25 +lrwxrwxrwx root/root usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.390.25 +-rwxr-xr-x root/root usr/lib/libnvcuvid.so.390.25 +-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.390.25 +-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.390.25 +-rwxr-xr-x root/root usr/lib/libnvidia-encode.so.390.25 +-rwxr-xr-x root/root usr/lib/libnvidia-fatbinaryloader.so.390.25 +-rwxr-xr-x root/root usr/lib/libnvidia-fbc.so.390.25 +-rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.390.25 +-rwxr-xr-x root/root usr/lib/libnvidia-gtk2.so.390.25 +-rwxr-xr-x root/root usr/lib/libnvidia-gtk3.so.390.25 +-rwxr-xr-x root/root usr/lib/libnvidia-ifr.so.390.25 +lrwxrwxrwx root/root usr/lib/libnvidia-ml.so -> libnvidia-ml.so.390.25 +lrwxrwxrwx root/root usr/lib/libnvidia-ml.so.1 -> libnvidia-ml.so.390.25 +-rwxr-xr-x root/root usr/lib/libnvidia-ml.so.390.25 +-rwxr-xr-x root/root usr/lib/libnvidia-opencl.so.390.25 +-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.390.25 drwxr-xr-x root/root usr/lib/tls/ --rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.384.111 +-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.390.25 drwxr-xr-x root/root usr/lib/vdpau/ -lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.384.111 -lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.384.111 --rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.384.111 +lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.390.25 +lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.390.25 +-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.390.25 drwxr-xr-x root/root usr/lib/xorg/ drwxr-xr-x root/root usr/lib/xorg/modules/ drwxr-xr-x root/root usr/lib/xorg/modules/drivers/ -rwxr-xr-x root/root usr/lib/xorg/modules/drivers/nvidia_drv.so drwxr-xr-x root/root usr/lib/xorg/modules/extensions/ --rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.384.111 -lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.384.111 --rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.384.111 +-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.390.25 +lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.390.25 +-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.390.25 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/applications/ -rw-r--r-- root/root usr/share/applications/nvidia-settings.desktop @@ -67,6 +67,6 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/nvidia-smi.1.gz -rw-r--r-- root/root usr/share/man/man1/nvidia-xconfig.1.gz drwxr-xr-x root/root usr/share/nvidia/ --rw-r--r-- root/root usr/share/nvidia/nvidia-application-profiles-384.111-key-documentation +-rw-r--r-- root/root usr/share/nvidia/nvidia-application-profiles-390.25-key-documentation drwxr-xr-x root/root usr/share/pixmaps/ -rw-r--r-- root/root usr/share/pixmaps/nvidia-settings.png diff --git a/nvidia/.md5sum b/nvidia/.md5sum index 9131d982a..d093b2d91 100644 --- a/nvidia/.md5sum +++ b/nvidia/.md5sum @@ -1,2 +1,2 @@ 4511024cc556d0c6e7c467b6789524e2 90-nvidia-uvm.rules -0adbe05230ca59ab817c83089f00a7b0 NVIDIA-Linux-x86_64-384.111-no-compat32.run +e41e28d1f380c64ec2eacae344fb5017 NVIDIA-Linux-x86_64-390.25-no-compat32.run diff --git a/nvidia/.signature b/nvidia/.signature index 009748388..82d7995c7 100644 --- a/nvidia/.signature +++ b/nvidia/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dHj4Pn8GGhMbInU8Ggm7D6TXqov+Z/uo+1zgKX6yuPWZN+jJCnLFDYXC09pLhp15P/8cfyIFUqSfyda2WoiPAc= -SHA256 (Pkgfile) = 9b46f548375863a22da435f4e5ea4acf62dec4b9fb2f02aa3b67ea5cc507f56b -SHA256 (.footprint) = 15b9008286b8159a23667155884f4650627330a982975bb571bde9f0ba549b4f -SHA256 (NVIDIA-Linux-x86_64-384.111-no-compat32.run) = 56b8c993c697aa37fe9ab1b6764304b82c86d5c745cd98dd8492be27f596ead7 +RWSE3ohX2g5d/bQ644znZMAW37z+sh9OVhZHaDPBH6PeAvrbwoJQz03D1mgjjLiwgujl+2aOCo/JMTVAwQ0uj7zT3DNREIgGFQM= +SHA256 (Pkgfile) = 48380d3c919857bf6848957fae3544fa4dceb4cdb1e888c134b96df97b0804ee +SHA256 (.footprint) = fad5776ff4b7592b6f4e15fb906c6ae1c59bf5e85805c560b5cc64b75bf17fef +SHA256 (NVIDIA-Linux-x86_64-390.25-no-compat32.run) = 02263bc81b66e68fc8224447b249f4f0ca4ae201c467e236d917be2fe187f3d6 SHA256 (90-nvidia-uvm.rules) = c35c61cebf5bf9a112ac06539bdc670a388afa4b50a7f8223a114fbeafedb140 diff --git a/nvidia/Pkgfile b/nvidia/Pkgfile index 6955447e3..fe5ac9ebd 100644 --- a/nvidia/Pkgfile +++ b/nvidia/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gtk gl-select name=nvidia -version=384.111 +version=390.25 release=1 source=(http://us.download.nvidia.com/XFree86/Linux-x86_64/$version/NVIDIA-… \ 90-nvidia-uvm.rules)

1 0

ports/opt (3.4): chromium: 63.0.3239.132 -> 64.0.3282.119
by crux＠crux.nu 01 Feb '18

01 Feb '18

commit d19a561dfaa98a6516e5297fbd5d7f43dd553e2a Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Tue Jan 30 13:08:22 2018 +1100 chromium: 63.0.3239.132 -> 64.0.3282.119 diff --git a/chromium/.footprint b/chromium/.footprint index 46709aa55..bc7b71256 100644 --- a/chromium/.footprint +++ b/chromium/.footprint @@ -124,6 +124,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/coverage/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/coverage/coverage_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/coverage_test_runner/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/coverage_test_runner/coverage_test_runner_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/cpu_profiler_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/data_grid/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/data_grid/data_grid_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/data_grid_test_runner/ @@ -185,10 +187,10 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/extensions_test_runner drwxr-xr-x root/root usr/lib/chromium/resources/inspector/formatter/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/formatter/formatter_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/formatter_worker.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/gonzales/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/gonzales/gonzales_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/har_importer/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/har_importer/har_importer_module.js +drwxr-xr-x root/root usr/lib/chromium/resources/inspector/heap_profiler_test_runner/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/heap_snapshot_model/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_worker.js @@ -222,16 +224,10 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/product_registry_impl/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/product_registry_impl/product_registry_impl_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/profiler/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/profiler/profiler_module.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/profiler_test_runner/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/profiler_test_runner/profiler_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/quick_open/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/quick_open/quick_open_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/resources/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/resources/resources_module.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sass/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/sass/sass_module.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sass_test_runner/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/sass_test_runner/sass_test_runner_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/screencast/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/screencast/screencast_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sdk_test_runner/ diff --git a/chromium/.md5sum b/chromium/.md5sum index 6caac7b30..914491960 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,6 +1,11 @@ -c339707e894fbc721b612bd061d1a36d chromium-63.0.3239.132.tar.xz -e2edf460318c9227ec4726440d8731ca chromium-clang-r1.patch -5f413e9d719b2f0f7ab12e951eb3a7f9 chromium-exclude_unwind_tables.patch -60b6e9c55e584db6872c1349a6630572 chromium-webrtc-r0.patch +d144ace1ee63acdf7dd149b013c83088 chromium-64.0.3282.119-constexpr-1.patch +5b72bcaba2ad920c524cd92a7a6125fe chromium-64.0.3282.119.tar.xz +27dbd1479d469346d1ffe27c7e7c0011 chromium-clang-r2.patch +21f73763be6c44ce3df0f1cbbfbff440 chromium-cups-r0.patch +3e30a8e6629c931a640d65d4ab02b939 chromium-exclude_unwind_tables.patch +cb40c4153943f9eb5e38e90ba2f8b382 chromium-memcpy-r0.patch +e42a8b91ea55b4765b9b2b9e2437a9d0 chromium-omnibox-unescape-fragment.patch +254061cb349cff714230b7cca83b0a4c chromium-skia-harmony.patch +40ff364c3a581e5f7ec4a84d785ab6a4 chromium-use-fromUTF8-for-UnicodeString-construction.patch 64968626706b07721983ac59fb3babbf chromium.sh 3354997dd0bfde3443499133a6e16a85 last-commit-position.patch diff --git a/chromium/.signature b/chromium/.signature index b921b3e4f..a4949b46b 100644 --- a/chromium/.signature +++ b/chromium/.signature @@ -1,10 +1,15 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/emoLECWTZB8g1DZVyOgH+j/ine99NMNUc/4lofRnWNOZNrwEYDZYwtLdQv0JZ5Nfq5UjpNOisa6KsDY4QUcyA8= -SHA256 (Pkgfile) = c68d2bbdd6f6d37e1012880c289ed2a88c0c5c34b6230b8c39bb3ea1a87f2e3e -SHA256 (.footprint) = 7886836592cc13787d9f1ea173d9e22c7e0e12e1ebe65632311279c86ced91b0 -SHA256 (chromium-63.0.3239.132.tar.xz) = 84c46c2c42faaa102abe0647ee1213615a2522627124924c2741ddc2161b3d8d +RWSE3ohX2g5d/eMT5dMXGD/Cjir9qaOlX5vQrQjKugSDAZj9lj9orWVCuFEq4PqVk+EpjkiBaPE/Jaf/7fON+UzzsKTplp3ZRgs= +SHA256 (Pkgfile) = 1344a0a071676087345b642c05f74dfbd35ec97280bd74939a8c06b0b15c9538 +SHA256 (.footprint) = e1e6cdeeb1dc4e10e1b0f3e743f69fae1c35e4db1f455cd9e65e5bf0387d9d7e +SHA256 (chromium-64.0.3282.119.tar.xz) = 342ea80a925d85f5155b2b423a0d3cbcf2ee5729bf107c601d7d902315d03127 SHA256 (last-commit-position.patch) = d3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e SHA256 (chromium.sh) = 7b182d0ae1e9ef841f8cd0b403a304babd548bf60b5e3808b2144bebdbb7c154 -SHA256 (chromium-exclude_unwind_tables.patch) = e53dc6f259acd39df13874f8a0f440528fae764b859dd71447991a5b1fac7c9c -SHA256 (chromium-clang-r1.patch) = ab5368a3e3a67fa63b33fefc6788ad5b4a79089ef4db1011a14c3bee9fdf70c6 -SHA256 (chromium-webrtc-r0.patch) = bcb2f4588cf5dcf75cde855c7431e94fdcc34bdd68b876a90f65ab9938594562 +SHA256 (chromium-64.0.3282.119-constexpr-1.patch) = 9982464badc03879c5f73ed18a719661f00aad51da078bae032293e656bfaf6d +SHA256 (chromium-exclude_unwind_tables.patch) = 9478f1ec1a3c53425306cf41c2d0555c215a4f106955d9d6adfff38044530ce8 +SHA256 (chromium-use-fromUTF8-for-UnicodeString-construction.patch) = c82c830bac7ab328a76d85fb141e150a17d02d97138a6daa4720a8a8c371a402 +SHA256 (chromium-omnibox-unescape-fragment.patch) = 814eb2cecb10cb697e24036b08aac41e88d0e38971741f9e946200764e2401ae +SHA256 (chromium-skia-harmony.patch) = feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3 +SHA256 (chromium-memcpy-r0.patch) = 455f0029987d9f0532bd9a5250669af5146a9c2b65b776d4a6e2499e8aca7bb4 +SHA256 (chromium-clang-r2.patch) = 4495e8b29dae242c79ffe4beefc5171eb3c7aacb7e9aebfd2d4d69b9d8c958d3 +SHA256 (chromium-cups-r0.patch) = 34cfc58664c67901f498dcff5e0d27edfb821bf1472c224981880903a0a3d243 diff --git a/chromium/Pkgfile b/chromium/Pkgfile index dc2c1fe0b..f10187d5b 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -4,13 +4,18 @@ # Depends on: dbus-glib gperf gtk gtk3 libevent libexif libgcrypt ninja nodejs nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt yasm name=chromium -version=63.0.3239.132 +version=64.0.3282.119 release=1 source=(https://commondatastorage.googleapis.com/$name-browser-official/$na… last-commit-position.patch $name.sh + chromium-64.0.3282.119-constexpr-1.patch chromium-exclude_unwind_tables.patch - chromium-clang-r1.patch - chromium-webrtc-r0.patch) + chromium-use-fromUTF8-for-UnicodeString-construction.patch + chromium-omnibox-unescape-fragment.patch + chromium-skia-harmony.patch + chromium-memcpy-r0.patch + chromium-clang-r2.patch + chromium-cups-r0.patch) build() { cd $name-$version @@ -26,12 +31,35 @@ build() { # we don't use git sources patch -p1 -i $SRC/last-commit-position.patch - # https://chromium-review.googlesource.com/c/chromium/src/+/71257 + # Corrects error call to non-constexpr function + patch -p1 -i $SRC/chromium-64.0.3282.119-constexpr-1.patch + + wget https://chromium.googlesource.com/chromium/src.git/+/$version?format=TEXT -O ../chromium-$version.txt + # https://crbug.com/710701 + local _chrome_build_hash=$(base64 -d ../chromium-$version.txt | + grep -Po '^parent \K[0-9a-f]{40}$') + if [[ -z $_chrome_build_hash ]]; then + error "Unable to find Chrome build hash." + return 1 + fi + echo "LASTCHANGE=$_chrome_build_hash-" >build/util/LASTCHANGE + + # https://chromium-review.googlesource.com/c/chromium/src/+/712575 patch -p1 -i $SRC/chromium-exclude_unwind_tables.patch + # https://crbug.com/772655 + patch -p1 -i $SRC/chromium-use-fromUTF8-for-UnicodeString-construction.patch + + # https://crbug.com/789163 + patch -p1 -i $SRC/chromium-omnibox-unescape-fragment.patch + + # https://crbug.com/skia/6663#c10 + patch -p4 -i $SRC/chromium-skia-harmony.patch + # Fixes from Gentoo - patch -p1 -i $SRC/chromium-clang-r1.patch - patch -p1 -i $SRC/chromium-webrtc-r0.patch + patch -p1 -i $SRC/chromium-memcpy-r0.patch + patch -p1 -i $SRC/chromium-clang-r2.patch + patch -p1 -i $SRC/chromium-cups-r0.patch mkdir -p third_party/node/linux/node-linux-x64/bin ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ diff --git a/chromium/chromium-64.0.3282.119-constexpr-1.patch b/chromium/chromium-64.0.3282.119-constexpr-1.patch new file mode 100644 index 000000000..ae40fd18c --- /dev/null +++ b/chromium/chromium-64.0.3282.119-constexpr-1.patch @@ -0,0 +1,98 @@ +Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> +Date: 2018-01-28 +Initial Package Version: 64.0.3282.119 +Upstream Status: Committed +Origin: Upstream +Description: Corrects error call to non-constexpr function + + +From 030017a4855c7b6e7f2ff8d9566c146f31eb301b Mon Sep 17 00:00:00 2001 +From: Kai Ninomiya <kainino(a)chromium.org> +Date: Wed, 06 Dec 2017 14:06:53 -0800 +Subject: [PATCH] Mark StaticType related functions as constexpr + +Fixes compilation on some versions of GCC and probably Clang. + +Follow-up to http://crrev.com/c/786317 + +Bug: angleproject:1432 +Change-Id: I3fc3ad0f65492f9543eb27fcdce6ca29a9ad06e5 +Reviewed-on: https://chromium-review.googlesource.com/812220 +Reviewed-by: Jamie Madill <jmadill(a)chromium.org> +Commit-Queue: Kai Ninomiya <kainino(a)chromium.org> +--- + +diff --git a/third_party/angle/src/compiler/translator/StaticType.h b/third_party/angle/src/compiler/translator/StaticType.h +index e26e5ff..30b391a 100644 +--- a/third_party/angle/src/compiler/translator/StaticType.h ++++ b/third_party/angle/src/compiler/translator/StaticType.h +@@ -160,7 +160,7 @@ + TPrecision precision, + TQualifier qualifier, + unsigned char secondarySize> +-const TType *GetForVecMatHelper(unsigned char primarySize) ++constexpr const TType *GetForVecMatHelper(unsigned char primarySize) + { + static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt || + basicType == EbtBool, +@@ -186,7 +186,7 @@ + template <TBasicType basicType, + TPrecision precision = EbpUndefined, + TQualifier qualifier = EvqGlobal> +-const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1) ++constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1) + { + static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt || + basicType == EbtBool, +@@ -208,7 +208,7 @@ + } + + template <TBasicType basicType, TPrecision precision = EbpUndefined> +-const TType *GetForVec(TQualifier qualifier, unsigned char size) ++constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size) + { + switch (qualifier) + { +diff --git a/third_party/angle/src/compiler/translator/SymbolTable.cpp b/third_party/angle/src/compiler/translator/SymbolTable.cpp +index adf1e4e..90d4c15 100644 +--- a/third_party/angle/src/compiler/translator/SymbolTable.cpp ++++ b/third_party/angle/src/compiler/translator/SymbolTable.cpp +@@ -236,7 +236,7 @@ + pop(); + } + +-bool IsGenType(const TType *type) ++constexpr bool IsGenType(const TType *type) + { + if (type) + { +@@ -248,7 +248,7 @@ + return false; + } + +-bool IsVecType(const TType *type) ++constexpr bool IsVecType(const TType *type) + { + if (type) + { +diff --git a/third_party/angle/src/compiler/translator/Types.h b/third_party/angle/src/compiler/translator/Types.h +index 04f46f1..a54d447 100644 +--- a/third_party/angle/src/compiler/translator/Types.h ++++ b/third_party/angle/src/compiler/translator/Types.h +@@ -142,13 +142,13 @@ + { + } + +- TBasicType getBasicType() const { return type; } ++ constexpr TBasicType getBasicType() const { return type; } + void setBasicType(TBasicType t); + + TPrecision getPrecision() const { return precision; } + void setPrecision(TPrecision p) { precision = p; } + +- TQualifier getQualifier() const { return qualifier; } ++ constexpr TQualifier getQualifier() const { return qualifier; } + void setQualifier(TQualifier q) { qualifier = q; } + + bool isInvariant() const { return invariant; } + diff --git a/chromium/chromium-clang-r1.patch b/chromium/chromium-clang-r2.patch similarity index 73% rename from chromium/chromium-clang-r1.patch rename to chromium/chromium-clang-r2.patch index 0fef16756..aaee16717 100644 --- a/chromium/chromium-clang-r1.patch +++ b/chromium/chromium-clang-r2.patch @@ -1,6 +1,6 @@ ---- a/build/config/compiler/BUILD.gn.orig 2017-10-04 08:50:15.014675936 +0000 -+++ b/build/config/compiler/BUILD.gn 2017-10-04 08:50:32.831024327 +0000 -@@ -429,18 +429,6 @@ +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -422,18 +422,6 @@ cflags += [ "-fcolor-diagnostics" ] } @@ -12,7 +12,7 @@ - "-Xclang", - "-mllvm", - "-Xclang", -- "-instcombine-lower-dbg-declare=1", +- "-instcombine-lower-dbg-declare=0", - ] - } - diff --git a/chromium/chromium-cups-r0.patch b/chromium/chromium-cups-r0.patch new file mode 100644 index 000000000..88ea78a81 --- /dev/null +++ b/chromium/chromium-cups-r0.patch @@ -0,0 +1,45 @@ +From 3cf91d8d674a496d533aa106723a632b68ab26ba Mon Sep 17 00:00:00 2001 +From: Tom Anderson <thomasanderson(a)chromium.org> +Date: Tue, 12 Dec 2017 23:31:56 +0000 +Subject: [PATCH] Fix use_cups=false build + +BUG=793801 +R=thestig(a)chromium.org + +Change-Id: I60ee6ec48d2686d0b42ca25311a9b76009ce9768 +Reviewed-on: https://chromium-review.googlesource.com/823245 +Reviewed-by: Lei Zhang <thestig(a)chromium.org> +Commit-Queue: Thomas Anderson <thomasanderson(a)chromium.org> +Cr-Commit-Position: refs/heads/master@{#523602} +--- + chrome/service/cloud_print/print_system.cc | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/chrome/service/cloud_print/print_system.cc b/chrome/service/cloud_print/print_system.cc +index ac94c804f9..4ceba96919 100644 +--- a/chrome/service/cloud_print/print_system.cc ++++ b/chrome/service/cloud_print/print_system.cc +@@ -5,6 +5,7 @@ + #include "chrome/service/cloud_print/print_system.h" + + #include "base/guid.h" ++#include "build/build_config.h" + + namespace cloud_print { + +@@ -35,5 +36,11 @@ std::string PrintSystem::GenerateProxyId() { + return base::GenerateGUID(); + } + +-} // namespace cloud_print ++#if defined(OS_LINUX) && !defined(USE_CUPS) ++scoped_refptr<PrintSystem> PrintSystem::CreateInstance( ++ const base::DictionaryValue*) { ++ return nullptr; ++} ++#endif + ++} // namespace cloud_print +-- +2.15.1 + diff --git a/chromium/chromium-exclude_unwind_tables.patch b/chromium/chromium-exclude_unwind_tables.patch index 67232595d..1961f15e4 100644 --- a/chromium/chromium-exclude_unwind_tables.patch +++ b/chromium/chromium-exclude_unwind_tables.patch @@ -1,21 +1,8 @@ -From 1fc37227522ccd314f82ec893ed15c6129296604 Mon Sep 17 00:00:00 2001 -From: Paul Jensen <pauljensen(a)chromium.org> -Date: Wed, 11 Oct 2017 08:37:34 -0400 -Subject: [PATCH] Move exclude_unwind_tables back into declare_args - -There is desire to adjust this flag manually. - -BUG=762629 -R=thakis(a)chromium.org - -Change-Id: I3bd134c19270cd1f729b3ea078674e734493d4ab ---- - diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni index ad40fd9..50e19a4 100644 --- a/build/config/compiler/compiler.gni +++ b/build/config/compiler/compiler.gni -@@ -68,18 +68,18 @@ +@@ -68,19 +68,19 @@ # Whether or not we should use position independent code. use_pic = true @@ -25,8 +12,9 @@ index ad40fd9..50e19a4 100644 + # server. For unofficial (e.g. development) builds and non-Chrome branded + # (e.g. Cronet which doesn't use Crashpad, crbug.com/479283) builds it's + # useful to be able to unwind at runtime. -+ exclude_unwind_tables = (is_chrome_branded && is_official_build) || -+ (is_chromecast && !is_cast_desktop_build && !is_debug) ++ exclude_unwind_tables = ++ (is_chrome_branded && is_official_build) || ++ (is_chromecast && !is_cast_desktop_build && !is_debug && !is_fuchsia) } assert(!is_cfi || use_thin_lto, "CFI requires ThinLTO") @@ -36,8 +24,9 @@ index ad40fd9..50e19a4 100644 -# For unofficial (e.g. development) builds and non-Chrome branded (e.g. Cronet -# which doesn't use Crashpad, crbug.com/479283) builds it's useful to be able -# to unwind at runtime. --exclude_unwind_tables = (is_chrome_branded && is_official_build) || -- (is_chromecast && !is_cast_desktop_build && !is_debug) +-exclude_unwind_tables = +- (is_chrome_branded && is_official_build) || +- (is_chromecast && !is_cast_desktop_build && !is_debug && !is_fuchsia) - # If true, optimize for size. Does not affect windows builds. # Linux & Mac favor speed over size. diff --git a/chromium/chromium-memcpy-r0.patch b/chromium/chromium-memcpy-r0.patch new file mode 100644 index 000000000..dd2fd57d2 --- /dev/null +++ b/chromium/chromium-memcpy-r0.patch @@ -0,0 +1,35 @@ +From 4942f56ceb6d60d6f54ebca8e6eba8ba01c278e8 Mon Sep 17 00:00:00 2001 +From: Tomas Popela <tomas.popela(a)gmail.com> +Date: Thu, 7 Dec 2017 22:33:34 +0000 +Subject: [PATCH] memcpy used without including string.h + +Compiling Chromium with Clang 4.0.1 and using libstdc++ will fail on using +memcpy without including string.h. + +Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel +Change-Id: Idced1d5de3baf6b520d4a2d61774120642ead1a8 +Reviewed-on: https://chromium-review.googlesource.com/813737 +Reviewed-by: Thomas Anderson <thomasanderson(a)chromium.org> +Reviewed-by: vmpstr <vmpstr(a)chromium.org> +Commit-Queue: Thomas Anderson <thomasanderson(a)chromium.org> +Cr-Commit-Position: refs/heads/master@{#522579} +--- + cc/paint/raw_memory_transfer_cache_entry.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/cc/paint/raw_memory_transfer_cache_entry.cc b/cc/paint/raw_memory_transfer_cache_entry.cc +index 9e4660c685ee..95ad50b1a338 100644 +--- a/cc/paint/raw_memory_transfer_cache_entry.cc ++++ b/cc/paint/raw_memory_transfer_cache_entry.cc +@@ -4,6 +4,8 @@ + + #include "cc/paint/raw_memory_transfer_cache_entry.h" + ++#include <string.h> ++ + namespace cc { + + ClientRawMemoryTransferCacheEntry::ClientRawMemoryTransferCacheEntry( +-- +2.15.1 + diff --git a/chromium/chromium-omnibox-unescape-fragment.patch b/chromium/chromium-omnibox-unescape-fragment.patch new file mode 100644 index 000000000..59ab04003 --- /dev/null +++ b/chromium/chromium-omnibox-unescape-fragment.patch @@ -0,0 +1,437 @@ +commit 03f9a90d8a783f9d1a94935ac298338a1e694380 +Author: Eric Lawrence <elawrence(a)chromium.org> +Date: Sat Dec 16 04:48:11 2017 +0000 + + Reland of 'Unescape fragment for display in Omnibox' + + The original landing broke EGTests for iOS Simulator and Device which + were not run by the CQ. This change includes updated EGTests. + + TBR=pkasting(a)chromium.org + + Bug: 789163, 643458 + Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs + Change-Id: Ie30afcb7bcba5affc7266d72a10b7f8dc0074314 + Reviewed-on: https://chromium-review.googlesource.com/830093 + Reviewed-by: Eric Lawrence <elawrence(a)chromium.org> + Reviewed-by: Peter Kasting <pkasting(a)chromium.org> + Reviewed-by: Eugene But <eugenebut(a)chromium.org> + Commit-Queue: Eric Lawrence <elawrence(a)chromium.org> + Cr-Commit-Position: refs/heads/master@{#524591} + +diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc +index 6e5dff47f7ec..24f1056d49d5 100644 +--- a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc ++++ b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc +@@ -462,3 +462,13 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, TextElideStatus) { + EXPECT_EQ(omnibox_view_views->GetRenderText()->elide_behavior(), + gfx::NO_ELIDE); + } ++ ++IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, FragmentUnescapedForDisplay) { ++ OmniboxView* view = nullptr; ++ ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &view)); ++ ui_test_utils::NavigateToURL(browser(), ++ GURL("https://www.google.com/#%E2%98%83")); ++ ++ EXPECT_EQ(view->GetText(), ++ base::UTF8ToUTF16("https://www.google.com/#\u2603")); ++} +diff --git a/components/url_formatter/elide_url_unittest.cc b/components/url_formatter/elide_url_unittest.cc +index 5e0384af72a2..d403ce065f45 100644 +--- a/components/url_formatter/elide_url_unittest.cc ++++ b/components/url_formatter/elide_url_unittest.cc +@@ -347,15 +347,16 @@ TEST(TextEliderTest, TestElisionSpecialCases) { + kEllipsisStr + "berkeley.edu:4430/" + kEllipsisStr + "/arbitfilename"}, + + // Unescaping. +- {"http://www/%E4%BD%A0%E5%A5%BD?q=%E4%BD%A0%E5%A5%BD#\xe4\xbd\xa0", +- "www/\xe4\xbd\xa0\xe5\xa5\xbd?q=\xe4\xbd\xa0\xe5\xa5\xbd#" + ++ {"http://www/%E4%BD%A0%E5%A5%BD?" ++ "q=%E4%BD%A0%E5%A5%BD#\xe4\xbd\xa0\xe4\xbd\xa0\xe4\xbd\xa0", ++ "www/\xe4\xbd\xa0\xe5\xa5\xbd?q=\xe4\xbd\xa0\xe5\xa5\xbd#\xe4\xbd\xa0" + + kEllipsisStr}, + + // Invalid unescaping for path. The ref will always be valid UTF-8. We + // don't bother to do too many edge cases, since these are handled by the + // escaper unittest. + {"http://www/%E4%A0%E5%A5%BD?q=%E4%BD%A0%E5%A5%BD#\xe4\xbd\xa0", +- "www/%E4%A0%E5%A5%BD?q=\xe4\xbd\xa0\xe5\xa5\xbd#" + kEllipsisStr}, ++ "www/%E4%A0%E5%A5%BD?q=\xe4\xbd\xa0\xe5\xa5\xbd#\xe4\xbd\xa0"}, + }; + + RunElisionTest(testcases); +diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc +index d5c0d314a5de..c422e3d98a72 100644 +--- a/components/url_formatter/url_formatter.cc ++++ b/components/url_formatter/url_formatter.cc +@@ -586,11 +586,10 @@ base::string16 FormatUrlWithAdjustments( + NonHostComponentTransform(unescape_rules), + &url_string, &new_parsed->query, adjustments); + +- // Ref. This is valid, unescaped UTF-8, so we can just convert. + if (parsed.ref.is_valid()) + url_string.push_back('#'); + AppendFormattedComponent(spec, parsed.ref, +- NonHostComponentTransform(net::UnescapeRule::NONE), ++ NonHostComponentTransform(unescape_rules), + &url_string, &new_parsed->ref, adjustments); + } + +diff --git a/components/url_formatter/url_formatter_unittest.cc b/components/url_formatter/url_formatter_unittest.cc +index 6fd3ece50f7d..5aaf31105a43 100644 +--- a/components/url_formatter/url_formatter_unittest.cc ++++ b/components/url_formatter/url_formatter_unittest.cc +@@ -828,7 +828,7 @@ TEST(UrlFormatterTest, FormatUrl) { + + {"With a port number and a reference", + "http://www.google.com:8080/#\xE3\x82\xB0", default_format_type, +- net::UnescapeRule::NORMAL, L"http://www.google.com:8080/#%E3%82%B0", 7}, ++ net::UnescapeRule::NORMAL, L"http://www.google.com:8080/#\x30B0", 7}, + + // -------- IDN tests -------- + {"Japanese IDN with ja", "http://xn--l8jvb1ey91xtjb.jp", +@@ -1119,7 +1119,7 @@ TEST(UrlFormatterTest, FormatUrlParsed) { + kFormatUrlOmitNothing, net::UnescapeRule::NORMAL, &parsed, + nullptr, nullptr); + EXPECT_EQ(WideToUTF16(L"http://\x30B0:\x30FC@\x30B0\x30FC\x30B0\x30EB.jp:8080" +- L"/\x30B0/?q=\x30B0#%E3%82%B0"), ++ L"/\x30B0/?q=\x30B0#\x30B0"), + formatted); + EXPECT_EQ(WideToUTF16(L"\x30B0"), + formatted.substr(parsed.username.begin, parsed.username.len)); +@@ -1133,7 +1133,7 @@ TEST(UrlFormatterTest, FormatUrlParsed) { + formatted.substr(parsed.path.begin, parsed.path.len)); + EXPECT_EQ(WideToUTF16(L"q=\x30B0"), + formatted.substr(parsed.query.begin, parsed.query.len)); +- EXPECT_EQ(WideToUTF16(L"%E3%82%B0"), ++ EXPECT_EQ(WideToUTF16(L"\x30B0"), + formatted.substr(parsed.ref.begin, parsed.ref.len)); + + // Omit_username_password + unescape case. +@@ -1143,7 +1143,7 @@ TEST(UrlFormatterTest, FormatUrlParsed) { + kFormatUrlOmitUsernamePassword, net::UnescapeRule::NORMAL, + &parsed, nullptr, nullptr); + EXPECT_EQ(WideToUTF16(L"http://\x30B0\x30FC\x30B0\x30EB.jp:8080" +- L"/\x30B0/?q=\x30B0#%E3%82%B0"), ++ L"/\x30B0/?q=\x30B0#\x30B0"), + formatted); + EXPECT_FALSE(parsed.username.is_valid()); + EXPECT_FALSE(parsed.password.is_valid()); +@@ -1155,7 +1155,7 @@ TEST(UrlFormatterTest, FormatUrlParsed) { + formatted.substr(parsed.path.begin, parsed.path.len)); + EXPECT_EQ(WideToUTF16(L"q=\x30B0"), + formatted.substr(parsed.query.begin, parsed.query.len)); +- EXPECT_EQ(WideToUTF16(L"%E3%82%B0"), ++ EXPECT_EQ(WideToUTF16(L"\x30B0"), + formatted.substr(parsed.ref.begin, parsed.ref.len)); + + // View-source case. +@@ -1389,9 +1389,12 @@ TEST(UrlFormatterTest, FormatUrlWithOffsets) { + kFormatUrlOmitNothing, net::UnescapeRule::SPACES, unescape_offsets); + + const size_t ref_offsets[] = { +- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, +- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, +- 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49}; ++ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ++ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, ++ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, ++ 30, 31, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, ++ 32, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 33}; ++ + // Unescape to "http://www.google.com/foo.html#\x30B0\x30B0z". + CheckAdjustedOffsets("http://www.google.com/foo.html#%E3%82%B0%E3%82%B0z", + kFormatUrlOmitNothing, net::UnescapeRule::NORMAL, +diff --git a/ios/chrome/browser/web/push_and_replace_state_navigation_egtest.mm b/ios/chrome/browser/web/push_and_replace_state_navigation_egtest.mm +index b67f2a08d0a0..431ad368f07d 100644 +--- a/ios/chrome/browser/web/push_and_replace_state_navigation_egtest.mm ++++ b/ios/chrome/browser/web/push_and_replace_state_navigation_egtest.mm +@@ -59,40 +59,42 @@ const char* kReplaceStateRootPathSpaceURL = "http://ios/rep lace"; + // Push 3 URLs. Verify that the URL changed and the status was updated. + [ChromeEarlGrey tapWebViewElementWithID:@"pushStateHashWithObject"]; + [self assertStatusText:@"pushStateHashWithObject" +- withURL:pushStateHashWithObjectURL ++ withOmniboxText:pushStateHashWithObjectURL.GetContent() + pageLoaded:NO]; + + [ChromeEarlGrey tapWebViewElementWithID:@"pushStateRootPath"]; + [self assertStatusText:@"pushStateRootPath" +- withURL:pushStateRootPathURL ++ withOmniboxText:pushStateRootPathURL.GetContent() + pageLoaded:NO]; + + [ChromeEarlGrey tapWebViewElementWithID:@"pushStatePathSpace"]; + [self assertStatusText:@"pushStatePathSpace" +- withURL:pushStatePathSpaceURL ++ withOmniboxText:pushStatePathSpaceURL.GetContent() + pageLoaded:NO]; + + // Go back and check that the page doesn't load and the status text is updated + // by the popstate event. + [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()]; + [self assertStatusText:@"pushStateRootPath" +- withURL:pushStateRootPathURL ++ withOmniboxText:pushStateRootPathURL.GetContent() + pageLoaded:NO]; + + [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()]; + [self assertStatusText:@"pushStateHashWithObject" +- withURL:pushStateHashWithObjectURL ++ withOmniboxText:pushStateHashWithObjectURL.GetContent() + pageLoaded:NO]; + + [ChromeEarlGrey tapWebViewElementWithID:@"goBack"]; + const GURL historyTestURL = web::test::HttpServer::MakeUrl(kHistoryTestUrl); +- [self assertStatusText:NULL withURL:historyTestURL pageLoaded:NO]; ++ [self assertStatusText:nil ++ withOmniboxText:historyTestURL.GetContent() ++ pageLoaded:NO]; + + // Go forward 2 pages and check that the page doesn't load and the status text + // is updated by the popstate event. + [ChromeEarlGrey tapWebViewElementWithID:@"goForward2"]; + [self assertStatusText:@"pushStateRootPath" +- withURL:pushStateRootPathURL ++ withOmniboxText:pushStateRootPathURL.GetContent() + pageLoaded:NO]; + } + +@@ -108,7 +110,7 @@ const char* kReplaceStateRootPathSpaceURL = "http://ios/rep lace"; + web::test::HttpServer::MakeUrl(kReplaceStateHashWithObjectURL); + [ChromeEarlGrey tapWebViewElementWithID:@"replaceStateHashWithObject"]; + [self assertStatusText:@"replaceStateHashWithObject" +- withURL:replaceStateHashWithObjectURL ++ withOmniboxText:replaceStateHashWithObjectURL.GetContent() + pageLoaded:NO]; + + [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()]; +@@ -119,7 +121,7 @@ const char* kReplaceStateRootPathSpaceURL = "http://ios/rep lace"; + [[EarlGrey selectElementWithMatcher:ForwardButton()] + performAction:grey_tap()]; + [self assertStatusText:@"replaceStateHashWithObject" +- withURL:replaceStateHashWithObjectURL ++ withOmniboxText:replaceStateHashWithObjectURL.GetContent() + pageLoaded:YES]; + + // Push URL then replace it. Do this twice. +@@ -127,44 +129,44 @@ const char* kReplaceStateRootPathSpaceURL = "http://ios/rep lace"; + web::test::HttpServer::MakeUrl(kPushStateHashStringURL); + [ChromeEarlGrey tapWebViewElementWithID:@"pushStateHashString"]; + [self assertStatusText:@"pushStateHashString" +- withURL:pushStateHashStringURL ++ withOmniboxText:pushStateHashStringURL.GetContent() + pageLoaded:NO]; + + const GURL replaceStateHashStringURL = + web::test::HttpServer::MakeUrl(kReplaceStateHashStringURL); + [ChromeEarlGrey tapWebViewElementWithID:@"replaceStateHashString"]; + [self assertStatusText:@"replaceStateHashString" +- withURL:replaceStateHashStringURL ++ withOmniboxText:replaceStateHashStringURL.GetContent() + pageLoaded:NO]; + + const GURL pushStatePathURL = + web::test::HttpServer::MakeUrl(kPushStatePathURL); + [ChromeEarlGrey tapWebViewElementWithID:@"pushStatePath"]; + [self assertStatusText:@"pushStatePath" +- withURL:pushStatePathURL ++ withOmniboxText:pushStatePathURL.GetContent() + pageLoaded:NO]; + + const GURL replaceStateRootPathSpaceURL = + web::test::HttpServer::MakeUrl(kReplaceStateRootPathSpaceURL); + [ChromeEarlGrey tapWebViewElementWithID:@"replaceStateRootPathSpace"]; + [self assertStatusText:@"replaceStateRootPathSpace" +- withURL:replaceStateRootPathSpaceURL ++ withOmniboxText:replaceStateRootPathSpaceURL.GetContent() + pageLoaded:NO]; + + // Go back and check URLs. + [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()]; + [self assertStatusText:@"replaceStateHashString" +- withURL:replaceStateHashStringURL ++ withOmniboxText:replaceStateHashStringURL.GetContent() + pageLoaded:NO]; + [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()]; + [self assertStatusText:@"replaceStateHashWithObject" +- withURL:replaceStateHashWithObjectURL ++ withOmniboxText:replaceStateHashWithObjectURL.GetContent() + pageLoaded:NO]; + + // Go forward and check URL. + [ChromeEarlGrey tapWebViewElementWithID:@"goForward2"]; + [self assertStatusText:@"replaceStateRootPathSpace" +- withURL:replaceStateRootPathSpaceURL ++ withOmniboxText:replaceStateRootPathSpaceURL.GetContent() + pageLoaded:NO]; + } + +@@ -180,11 +182,11 @@ const char* kReplaceStateRootPathSpaceURL = "http://ios/rep lace"; + web::test::HttpServer::MakeUrl(kPushStateHashStringURL); + [ChromeEarlGrey tapWebViewElementWithID:@"pushStateHashString"]; + [self assertStatusText:@"pushStateHashString" +- withURL:pushStateHashStringURL ++ withOmniboxText:pushStateHashStringURL.GetContent() + pageLoaded:NO]; + [ChromeEarlGrey tapWebViewElementWithID:@"pushStateHashString"]; + [self assertStatusText:@"pushStateHashString" +- withURL:pushStateHashStringURL ++ withOmniboxText:pushStateHashStringURL.GetContent() + pageLoaded:NO]; + + // Load a non-pushed URL. +@@ -194,7 +196,7 @@ const char* kReplaceStateRootPathSpaceURL = "http://ios/rep lace"; + [ChromeEarlGrey loadURL:historyTestURL]; + [ChromeEarlGrey tapWebViewElementWithID:@"pushStateHashString"]; + [self assertStatusText:@"pushStateHashString" +- withURL:pushStateHashStringURL ++ withOmniboxText:pushStateHashStringURL.GetContent() + pageLoaded:NO]; + + // At this point the history looks like this: +@@ -202,38 +204,54 @@ const char* kReplaceStateRootPathSpaceURL = "http://ios/rep lace"; + + // Go back (to second history.html) and verify page did not load. + [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()]; +- [self assertStatusText:nil withURL:historyTestURL pageLoaded:NO]; ++ [self assertStatusText:nil ++ withOmniboxText:historyTestURL.GetContent() ++ pageLoaded:NO]; + + // Go back twice (to second #string) and verify page did load. + [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()]; + [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()]; +- [self assertStatusText:nil withURL:pushStateHashStringURL pageLoaded:YES]; ++ [self assertStatusText:nil ++ withOmniboxText:pushStateHashStringURL.GetContent() ++ pageLoaded:YES]; + + // Go back once (to first #string) and verify page did not load. + [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()]; + [self assertStatusText:@"pushStateHashString" +- withURL:pushStateHashStringURL ++ withOmniboxText:pushStateHashStringURL.GetContent() + pageLoaded:NO]; + + // Go forward 4 entries at once (to third #string) and verify page did load. + [ChromeEarlGrey tapWebViewElementWithID:@"goForward4"]; + +- [self assertStatusText:nil withURL:pushStateHashStringURL pageLoaded:YES]; ++ [self assertStatusText:nil ++ withOmniboxText:pushStateHashStringURL.GetContent() ++ pageLoaded:YES]; + + // Go back 4 entries at once (to first #string) and verify page did load. + [ChromeEarlGrey tapWebViewElementWithID:@"goBack4"]; + +- [self assertStatusText:NULL withURL:pushStateHashStringURL pageLoaded:YES]; ++ [self assertStatusText:nil ++ withOmniboxText:pushStateHashStringURL.GetContent() ++ pageLoaded:YES]; + } + + // Tests calling pushState with unicode characters. + - (void)testHtml5HistoryPushUnicodeCharacters { +- const GURL pushStateUnicodeURLEncoded = web::test::HttpServer::MakeUrl( +- "http://ios/testing/data/http_server_files/" +- "history.html#unicode%E1%84%91"); +- const GURL pushStateUnicode2URLEncoded = web::test::HttpServer::MakeUrl( +- "http://ios/testing/data/http_server_files/" +- "history.html#unicode2%E2%88%A2"); ++ // The GURL object %-escapes Unicode characters in the URL's fragment, ++ // but the omnibox decodes them back to Unicode for display. ++ std::string pushStateUnicode = ++ web::test::HttpServer::MakeUrl( ++ "http://ios/testing/data/http_server_files/" ++ "history.html#unicode") ++ .GetContent() + ++ "\xe1\x84\x91"; ++ std::string pushStateUnicode2 = ++ web::test::HttpServer::MakeUrl( ++ "http://ios/testing/data/http_server_files/" ++ "history.html#unicode2") ++ .GetContent() + ++ "\xe2\x88\xa2"; + const char pushStateUnicodeLabel[] = "Action: pushStateUnicodeᄑ"; + NSString* pushStateUnicodeStatus = @"pushStateUnicodeᄑ"; + const char pushStateUnicode2Label[] = "Action: pushStateUnicode2∢"; +@@ -242,21 +260,16 @@ const char* kReplaceStateRootPathSpaceURL = "http://ios/rep lace"; + web::test::SetUpFileBasedHttpServer(); + [ChromeEarlGrey loadURL:web::test::HttpServer::MakeUrl(kHistoryTestUrl)]; + +- // TODO(crbug.com/643458): The fact that the URL shows %-escaped is due to +- // NSURL escaping to make UIWebView/JS happy. See if it's possible to +- // represent differently such that it displays unescaped. + // Do 2 push states with unicode characters. + [ChromeEarlGrey tapWebViewElementWithID:@"pushStateUnicode"]; + [[EarlGrey +- selectElementWithMatcher:chrome_test_util::OmniboxText( +- pushStateUnicodeURLEncoded.GetContent())] ++ selectElementWithMatcher:chrome_test_util::OmniboxText(pushStateUnicode)] + assertWithMatcher:grey_notNil()]; + [ChromeEarlGrey waitForWebViewContainingText:pushStateUnicodeLabel]; + + [ChromeEarlGrey tapWebViewElementWithID:@"pushStateUnicode2"]; + [[EarlGrey +- selectElementWithMatcher:chrome_test_util::OmniboxText( +- pushStateUnicode2URLEncoded.GetContent())] ++ selectElementWithMatcher:chrome_test_util::OmniboxText(pushStateUnicode2)] + assertWithMatcher:grey_notNil()]; + [ChromeEarlGrey waitForWebViewContainingText:pushStateUnicode2Label]; + +@@ -266,18 +279,18 @@ const char* kReplaceStateRootPathSpaceURL = "http://ios/rep lace"; + [ChromeEarlGrey tapWebViewElementWithID:@"pushStatePath"]; + + [self assertStatusText:@"pushStatePath" +- withURL:pushStatePathURL ++ withOmniboxText:pushStatePathURL.GetContent() + pageLoaded:NO]; + + // Go back and check the unicode in the URL and status. + [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()]; + [self assertStatusText:pushStateUnicode2Status +- withURL:pushStateUnicode2URLEncoded ++ withOmniboxText:pushStateUnicode2 + pageLoaded:NO]; + + [[EarlGrey selectElementWithMatcher:BackButton()] performAction:grey_tap()]; + [self assertStatusText:pushStateUnicodeStatus +- withURL:pushStateUnicodeURLEncoded ++ withOmniboxText:pushStateUnicode + pageLoaded:NO]; + } + +@@ -321,10 +334,11 @@ const char* kReplaceStateRootPathSpaceURL = "http://ios/rep lace"; + + #pragma mark - Utility methods + +-// Assert that status text |status| is displayed in the webview, that "onloaded" +-// text is displayed if pageLoaded is YES, and that the URL is as expected. ++// Assert that status text |status|, if non-nil, is displayed in the webview, ++// that the omnibox text is as expected, and that "onload" text is displayed if ++// pageLoaded is YES. + - (void)assertStatusText:(NSString*)status +- withURL:(const GURL&)urlToVerify ++ withOmniboxText:(const std::string&)omniboxText + pageLoaded:(BOOL)pageLoaded { + if (pageLoaded) { + [ChromeEarlGrey waitForWebViewContainingText:"onload"]; +@@ -332,14 +346,14 @@ const char* kReplaceStateRootPathSpaceURL = "http://ios/rep lace"; + [ChromeEarlGrey waitForWebViewNotContainingText:"onload"]; + } + +- if (status != NULL) { ++ if (status != nil) { + NSString* statusLabel = [NSString stringWithFormat:@"Action: %@", status]; + [ChromeEarlGrey + waitForWebViewContainingText:base::SysNSStringToUTF8(statusLabel)]; + } + +- [[EarlGrey selectElementWithMatcher:chrome_test_util::OmniboxText( +- urlToVerify.GetContent())] ++ [[EarlGrey ++ selectElementWithMatcher:chrome_test_util::OmniboxText(omniboxText)] + assertWithMatcher:grey_notNil()]; + } + diff --git a/chromium/chromium-skia-harmony.patch b/chromium/chromium-skia-harmony.patch new file mode 100644 index 000000000..6343f7f80 --- /dev/null +++ b/chromium/chromium-skia-harmony.patch @@ -0,0 +1,77 @@ +--- qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2017-10-10 17:42:06.956950985 +0200 ++++ qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp 2017-10-10 17:46:05.824187787 +0200 +@@ -99,8 +99,6 @@ + FreeTypeLibrary() + : fGetVarDesignCoordinates(nullptr) + , fLibrary(nullptr) +- , fIsLCDSupported(false) +- , fLCDExtra(0) + { + if (FT_New_Library(&gFTMemory, &fLibrary)) { + return; +@@ -147,12 +145,7 @@ + } + #endif + +- // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs. +- // The default has changed over time, so this doesn't mean the same thing to all users. +- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) { +- fIsLCDSupported = true; +- fLCDExtra = 2; //Using a filter adds one full pixel to each side. +- } ++ FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT); + } + ~FreeTypeLibrary() { + if (fLibrary) { +@@ -161,8 +153,6 @@ + } + + FT_Library library() { return fLibrary; } +- bool isLCDSupported() { return fIsLCDSupported; } +- int lcdExtra() { return fLCDExtra; } + + // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1. + // Prior to this there was no way to get the coordinates out of the FT_Face. +@@ -173,8 +163,6 @@ + + private: + FT_Library fLibrary; +- bool fIsLCDSupported; +- int fLCDExtra; + + // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0. + // The following platforms provide FreeType of at least 2.4.0. +@@ -704,17 +692,6 @@ + rec->fTextSize = SkIntToScalar(1 << 14); + } + +- if (isLCD(*rec)) { +- // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr. +- SkAutoMutexAcquire ama(gFTMutex); +- ref_ft_library(); +- if (!gFTLibrary->isLCDSupported()) { +- // If the runtime Freetype library doesn't support LCD, disable it here. +- rec->fMaskFormat = SkMask::kA8_Format; +- } +- unref_ft_library(); +- } +- + SkPaint::Hinting h = rec->getHinting(); + if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) { + // collapse full->normal hinting if we're not doing LCD +@@ -1115,11 +1092,11 @@ + void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) { + if (isLCD(fRec)) { + if (fLCDIsVert) { +- glyph->fHeight += gFTLibrary->lcdExtra(); +- glyph->fTop -= gFTLibrary->lcdExtra() >> 1; ++ glyph->fHeight += 2; ++ glyph->fTop -= 1; + } else { +- glyph->fWidth += gFTLibrary->lcdExtra(); +- glyph->fLeft -= gFTLibrary->lcdExtra() >> 1; ++ glyph->fWidth += 2; ++ glyph->fLeft -= 1; + } + } + } diff --git a/chromium/chromium-use-fromUTF8-for-UnicodeString-construction.patch b/chromium/chromium-use-fromUTF8-for-UnicodeString-construction.patch new file mode 100644 index 000000000..0e0765a27 --- /dev/null +++ b/chromium/chromium-use-fromUTF8-for-UnicodeString-construction.patch @@ -0,0 +1,68 @@ +From e58fa0ba66272c5f28828b15d06c7e42a9882b3b Mon Sep 17 00:00:00 2001 +From: Jungshik Shin <jshin(a)chromium.org> +Date: Sat, 16 Dec 2017 04:19:27 +0000 +Subject: [PATCH] Use fromUTF8() for UnicodeString construction from UTF-8 + +Chrome's copy of ICU is built with U_CHARSET_IS_UTF8=1 so that |char *| +buffer is treated as UTF-8 when constructing UnicodeString() regardless +of the default encoding of the current locale on Linux or non-Unicode code +page on Windows. + +However, some Linux distros do not set U_CHARSET_IS_UTF=1 when building +ICU and Chromium build with system_icu crashes when Chromium is run in +non-UTF-8 locale (e.g. 'C'). + +To make Chromium work in a non-UTF-8 locale (which is pretty rare these +days), use 'icu::UnicodeString::fromUTF8(StringPiece)' instead of +'icu::UnicodeString(const char*)'. + +Bug: 772655 +Test: components_unittests --gtest_filter=*IDN* +Test: Chromium built with system_icu does not crash in C locale. +Change-Id: I0daa284ec06b8e83814fc70eb8e9e5c96444ebfa +Reviewed-on: https://chromium-review.googlesource.com/831247 +Reviewed-by: Peter Kasting <pkasting(a)chromium.org> +Commit-Queue: Jungshik Shin <jshin(a)chromium.org> +Cr-Commit-Position: refs/heads/master@{#524586} +--- + components/url_formatter/idn_spoof_checker.cc | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/components/url_formatter/idn_spoof_checker.cc b/components/url_formatter/idn_spoof_checker.cc +index a88c5e8f8331..aee748d8a4d5 100644 +--- a/components/url_formatter/idn_spoof_checker.cc ++++ b/components/url_formatter/idn_spoof_checker.cc +@@ -110,8 +110,8 @@ IDNSpoofChecker::IDNSpoofChecker() { + + // These Cyrillic letters look like Latin. A domain label entirely made of + // these letters is blocked as a simplified whole-script-spoofable. +- cyrillic_letters_latin_alike_ = +- icu::UnicodeSet(icu::UnicodeString("[асԁеһіјӏорԛѕԝхуъЬҽпгѵѡ]"), status); ++ cyrillic_letters_latin_alike_ = icu::UnicodeSet( ++ icu::UnicodeString::fromUTF8("[асԁеһіјӏорԛѕԝхуъЬҽпгѵѡ]"), status); + cyrillic_letters_latin_alike_.freeze(); + + cyrillic_letters_ = +@@ -141,8 +141,8 @@ IDNSpoofChecker::IDNSpoofChecker() { + UParseError parse_error; + diacritic_remover_.reset(icu::Transliterator::createFromRules( + UNICODE_STRING_SIMPLE("DropAcc"), +- icu::UnicodeString("::NFD; ::[:Nonspacing Mark:] Remove; ::NFC;" +- " ł > l; ø > o; đ > d;"), ++ icu::UnicodeString::fromUTF8("::NFD; ::[:Nonspacing Mark:] Remove; ::NFC;" ++ " ł > l; ø > o; đ > d;"), + UTRANS_FORWARD, parse_error, status)); + + // Supplement the Unicode confusable list by the following mapping. +@@ -158,7 +158,7 @@ IDNSpoofChecker::IDNSpoofChecker() { + // - U+0D1F (ട) => s + extra_confusable_mapper_.reset(icu::Transliterator::createFromRules( + UNICODE_STRING_SIMPLE("ExtraConf"), +- icu::UnicodeString( ++ icu::UnicodeString::fromUTF8( + "ӏ > l; [кĸκ] > k; п > n; [ƅь] > b; в > b; м > m; н > h; " + "т > t; [шщ] > w; ട > s;"), + UTRANS_FORWARD, parse_error, status)); +-- +2.15.1 + diff --git a/chromium/chromium-webrtc-r0.patch b/chromium/chromium-webrtc-r0.patch deleted file mode 100644 index e14b185ac..000000000 --- a/chromium/chromium-webrtc-r0.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa <raphael.kubo.da.costa(a)intel.com> -Date: Fri, 13 Oct 2017 15:49:32 +0200 -Subject: [PATCH] IWYU: Include math.h for round(3). - -math.h was being implicitly included, which can break the build with -alternative libc implementations. - -Bug: None -Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952 -Reviewed-on: https://webrtc-review.googlesource.com/9384 -Reviewed-by: Tommi <tommi(a)webrtc.org> -Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa(a)intel.com> -Cr-Commit-Position: refs/heads/master@{#20292} ---- - p2p/base/port.cc | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/p2p/base/port.cc b/p2p/base/port.cc -index a1b478d11..81aa0aadb 100644 ---- a/third_party/webrtc/p2p/base/port.cc -+++ b/third_party/webrtc/p2p/base/port.cc -@@ -10,6 +10,8 @@ - - #include "p2p/base/port.h" - -+#include <math.h> -+ - #include <algorithm> - #include <vector> - --- -2.15.0.rc2 -

1 0

ports/opt (3.4): nano: update to 2.9.3
by crux＠crux.nu 01 Feb '18

01 Feb '18

commit aa7183c9286fcf0847e8df1301e9ea235fc305e8 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Jan 29 18:49:59 2018 +0100 nano: update to 2.9.3 diff --git a/nano/.md5sum b/nano/.md5sum index 7a07acfe2..f093d4582 100644 --- a/nano/.md5sum +++ b/nano/.md5sum @@ -1 +1 @@ -545b7b75c1a9c99f77bf3d938653617b nano-2.9.2.tar.xz +6dd37f010d6a985bf0e5f8ed091ff919 nano-2.9.3.tar.xz diff --git a/nano/.signature b/nano/.signature index 08ba4ddf6..1b5d0c8f8 100644 --- a/nano/.signature +++ b/nano/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XVLVvrXauLlJ9HDKsqcX01BoX9zEEBiZdqEEocZ28mC40da3q0Ct8FUzw+Rquyohu+q+SSpML9S2F4vcBNm4w4= -SHA256 (Pkgfile) = 6923255091e1bdf76d05b4bddd559f1149bff1514d3e178cc521b9d0e1f7de35 +RWSE3ohX2g5d/d1KMo+koG4GGDHrLt1HvuRNDgj94mZpvImyvmhzPCYS2+igvIfOKi5VThuldR6AvQEk4AeoGyy7wclC/UYHHgI= +SHA256 (Pkgfile) = a774bea7e101c7b6ad5d22ccd1abee1f65e86d19726f38073e5180ee69e66431 SHA256 (.footprint) = 6e65065e8bbaadfad31d89a3ec1820c7408848209b67edc34c5d1643df89ac1e -SHA256 (nano-2.9.2.tar.xz) = 4eccb7451b5729ce8abae8f9a5679f32e41ae58df73ea86b850ec45b10a83d55 +SHA256 (nano-2.9.3.tar.xz) = 7783bcfd4b2d5dc0bf64d4bd07b1a19e7ba3c91da881a4249772a36b972d4012 diff --git a/nano/Pkgfile b/nano/Pkgfile index b56b16f15..26e89f95e 100644 --- a/nano/Pkgfile +++ b/nano/Pkgfile @@ -5,7 +5,7 @@ # Depends on: file ncurses name=nano -version=2.9.2 +version=2.9.3 release=1 source=(http://www.nano-editor.org/dist/v${version%.*}/$name-$version.tar.x…

1 0

ports/opt (3.4): ncdu: updated to 1.13
by crux＠crux.nu 01 Feb '18

01 Feb '18

commit dda1e52cbbb874b833ebbc5dbeaecd6fdb51e591 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Mon Jan 29 18:12:33 2018 +0100 ncdu: updated to 1.13 diff --git a/ncdu/.md5sum b/ncdu/.md5sum index a5db39715..c8c78bcfd 100644 --- a/ncdu/.md5sum +++ b/ncdu/.md5sum @@ -1 +1 @@ -7365ac46c420bc511621216b1747984f ncdu-1.12.tar.gz +67239592ac41f42290f52ab89ff198be ncdu-1.13.tar.gz diff --git a/ncdu/.signature b/ncdu/.signature index 584b81b5d..fc0869b47 100644 --- a/ncdu/.signature +++ b/ncdu/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UUOwXvg6X0WOHd4nIH/FvwcSrv37+6+/+A4ddB/ZL+4Dvirdd3hCpA/ULF6JSllRM2zBzS3driOR93SbeNQags= -SHA256 (Pkgfile) = 97cf028e5f024cdbc8ebaa6ff3dd3cbc3eef28c1e34573a65b5b5118a7077d8e +RWSE3ohX2g5d/TVmNnNv84PgsogTBIpgDjsXfjR1KR30pK8eiYfeolN3w1oxHE8u8ejrqhUwF+Zcz9Mf0rBkVDRzXGOXxDA+ZgM= +SHA256 (Pkgfile) = 59d79833432fb31a1157a0af3de8873b89d5c2d2aff32b1ef76f84bb1243304b SHA256 (.footprint) = 28b3a45f7809ec9fe4cc3c0f4b48d291960afd02f9615e0d97c4cbdd1567ecec -SHA256 (ncdu-1.12.tar.gz) = 820e4e4747a2a2ec7a2e9f06d2f5a353516362c22496a10a9834f871b877499a +SHA256 (ncdu-1.13.tar.gz) = f4d9285c38292c2de05e444d0ba271cbfe1a705eee37c2b23ea7c448ab37255a diff --git a/ncdu/Pkgfile b/ncdu/Pkgfile index b624904df..c20853145 100644 --- a/ncdu/Pkgfile +++ b/ncdu/Pkgfile @@ -4,7 +4,7 @@ # Depends on: ncurses name=ncdu -version=1.12 +version=1.13 release=1 source=(http://dev.yorhel.nl/download/$name-$version.tar.gz)

1 0

ports/opt (3.4): xfsprogs: project has a new URL
by crux＠crux.nu 01 Feb '18

01 Feb '18

commit 87958fb9976ab36b33b6f5e3b0ab3692322c3e3b Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Sun Jan 28 17:54:37 2018 +0100 xfsprogs: project has a new URL diff --git a/xfsprogs/.signature b/xfsprogs/.signature index c92840ff8..a3448ba8a 100644 --- a/xfsprogs/.signature +++ b/xfsprogs/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/V07OhqnXhzfNftllaQmuX7mT5zu3kIrTFv9lPSyAWBlyXeIy9FQmdPyeF0zK3QNGPZVsXqDtIQveYlFVLJFMAU= -SHA256 (Pkgfile) = 2d55b6840491ebfbd7bb942394299fc24742c62c83f360fdc4f17e07b40ae008 +RWSE3ohX2g5d/bHKbCcaohyTH+zUVI/r4vzYJMNiAF1PDKrPBIvKJ5Xm80Lq7VN3PJC3+uohMLQJbQ3UILkSwDL+p583osK+aQM= +SHA256 (Pkgfile) = 4958e8312908f5524a979eb93ff55399f5e18f1f83691e8f6d05c9fd83e60a24 SHA256 (.footprint) = 2a99d711e3ce2299b6c710812c6bf734d0cb498fb5173f960ed52270ed74e027 SHA256 (xfsprogs-4.14.0.tar.xz) = b1b710b268bc95d6f45eca06e1262c29eb38865a19cd4404e48ba446e043b7ec diff --git a/xfsprogs/Pkgfile b/xfsprogs/Pkgfile index 310debb52..3a29fc49e 100644 --- a/xfsprogs/Pkgfile +++ b/xfsprogs/Pkgfile @@ -1,5 +1,5 @@ # Description: Filesystem utilities for XFS -# URL: http://oss.sgi.com/projects/xfs/ +# URL: http://www.xfs.org # Maintainer: CRUX System Team, core-ports at crux dot nu # Depends on: util-linux

1 0

ports/opt (3.4): unison: update to 2.51.2
by crux＠crux.nu 01 Feb '18

01 Feb '18

commit 31d38a0da6cd75d6f5fa7b45db9801748b734ac8 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Jan 28 13:15:19 2018 +0100 unison: update to 2.51.2 diff --git a/unison/.md5sum b/unison/.md5sum index 267987a22..6ec29b3b5 100644 --- a/unison/.md5sum +++ b/unison/.md5sum @@ -1 +1 @@ -2c2c7ab43f3dc3d6b56a04d9d5795024 unison-2.51.0.tar.gz +6976d4c472ba98806c0f65ee78247ce8 unison-2.51.2.tar.gz diff --git a/unison/.signature b/unison/.signature index 49fac75e4..acd99ccfe 100644 --- a/unison/.signature +++ b/unison/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Vbj6jJmqPlG6Xnjw5XjXp8v2VDaBsPLyUktkTHkEmxu6lGjfaNXd1C7yRNnKtLnoTdYAylGN/d8998OHmXC0AY= -SHA256 (Pkgfile) = 271d68631b735109ec8ab8c7f56fa93a9ccfeb8e06669c5fbb2c4c7024838ae1 +RWSE3ohX2g5d/UgjFjx8LkwTgQ3uItTe+nhlt/w25MHAtbBNyKw6YQSXXFfezbFSKXMM2LfC1LXE4qG27ydVw68sA5ZBiDvFYQc= +SHA256 (Pkgfile) = 9f95867b516c7bdf5de8bc684eaf767244461761011fbce16978bc820f3342de SHA256 (.footprint) = 7dc9b1f53387cdee4c9da64f2da929d161ddc94f40576a6c07fd536ed0d04564 -SHA256 (unison-2.51.0.tar.gz) = 11a42b732c07bbee3806bf34b0df4c400a49e60226a9b4ff871c05dcf00aef2e +SHA256 (unison-2.51.2.tar.gz) = ce4fc949d3348414d8b07183eb9766b8dfffe84aead37b8d550b0025aa6bc327 diff --git a/unison/Pkgfile b/unison/Pkgfile index 3356b1a82..cb43c982b 100644 --- a/unison/Pkgfile +++ b/unison/Pkgfile @@ -5,7 +5,7 @@ # Depends on: ocaml name=unison -version=2.51.0 +version=2.51.2 release=1 source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$name-$…

1 0

ports/opt (3.4): dovecot: add patch to fix CVE-2017-15132
by crux＠crux.nu 01 Feb '18

01 Feb '18

commit 16fe609d4731753d73df3a3ef8bc50106b122a72 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Jan 28 13:14:45 2018 +0100 dovecot: add patch to fix CVE-2017-15132 diff --git a/dovecot/.md5sum b/dovecot/.md5sum index f59088a2d..2e2132e60 100644 --- a/dovecot/.md5sum +++ b/dovecot/.md5sum @@ -1,3 +1,4 @@ +f043e0bb2773cd38f74ada8c164524a6 CVE-2017-15132.patch ec342928dd97131f82dba41546741b5f dovecot a8802617ddf68972f5f97bd8677e5856 dovecot-2.3.0.tar.gz 1cc42484b5515bddf47edcf26b288b6b dovecot-config.patch diff --git a/dovecot/.signature b/dovecot/.signature index 6988ebb3f..ccfd224cd 100644 --- a/dovecot/.signature +++ b/dovecot/.signature @@ -1,7 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UHxeCrvPjhN5tTv7dKHPGA/w2A+pWGljrr3s6U7l7tTp/3JjzClS+UFrRG0vFfh/svIA2/VxOGZeiYrPHrDxwY= -SHA256 (Pkgfile) = 8f2d01c19f853782b6a9602829df8d6d4afa45c6171e3d2240c344080e80dfb4 +RWSE3ohX2g5d/SihfglHd/nyxWOIuJQMl+JGBQBCDkigF+pqp87P7EyBt9dC8e7bvYN/L5VAH5T1yYeOkiDQPNnRAogyCZk8qww= +SHA256 (Pkgfile) = 0bedafa60b3e7d7db93c113f28760308b77cdda87756884c0bf391f2b02c6a05 SHA256 (.footprint) = d464c6eb14ad58ab166c901d6c1a6f66a010f3e934f3b1645a9cd20d24663b4b SHA256 (dovecot-2.3.0.tar.gz) = de60cb470d025e4dd0f8e8fbbb4b9316dfd4930eb949d307330669ffbeaf8581 +SHA256 (CVE-2017-15132.patch) = ddbfdb187e1e763aa10364e57ed82bd37d264d66ed01559a7dbdeccb9f41e91f SHA256 (dovecot-config.patch) = a6f09e637f1ac15368d2d18736dc353e4a188959c5940dedd5306b689156e91c SHA256 (dovecot) = ead06d36290cca8be6be350f2c05edf53a4e9ce8aec5d5d663b1162ae96c17c7 diff --git a/dovecot/CVE-2017-15132.patch b/dovecot/CVE-2017-15132.patch new file mode 100644 index 000000000..6b147abef --- /dev/null +++ b/dovecot/CVE-2017-15132.patch @@ -0,0 +1,28 @@ +From 1a29ed2f96da1be22fa5a4d96c7583aa81b8b060 Mon Sep 17 00:00:00 2001 +From: Timo Sirainen <timo.sirainen(a)dovecot.fi> +Date: Mon, 18 Dec 2017 16:50:51 +0200 +Subject: [PATCH] lib-auth: Fix memory leak in auth_client_request_abort() + +This caused memory leaks when authentication was aborted. For example +with IMAP: + +a AUTHENTICATE PLAIN +* + +Broken by 9137c55411aa39d41c1e705ddc34d5bd26c65021 +--- + src/lib-auth/auth-client-request.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib-auth/auth-client-request.c b/src/lib-auth/auth-client-request.c +index 480fb42b30..046f7c307d 100644 +--- a/src/lib-auth/auth-client-request.c ++++ b/src/lib-auth/auth-client-request.c +@@ -186,6 +186,7 @@ void auth_client_request_abort(struct auth_client_request **_request) + + auth_client_send_cancel(request->conn->client, request->id); + call_callback(request, AUTH_REQUEST_STATUS_ABORT, NULL, NULL); ++ pool_unref(&request->pool); + } + + unsigned int auth_client_request_get_id(struct auth_client_request *request) diff --git a/dovecot/Pkgfile b/dovecot/Pkgfile index 67dfea341..32789e7e8 100644 --- a/dovecot/Pkgfile +++ b/dovecot/Pkgfile @@ -5,13 +5,15 @@ name=dovecot version=2.3.0 -release=1 -source=(https://dovecot.org/releases/2.3/$name-$version.tar.gz \ +release=2 +source=(https://dovecot.org/releases/2.3/$name-$version.tar.gz + CVE-2017-15132.patch dovecot-config.patch dovecot) build () { cd $name-ce-$version + patch -p1 -i $SRC/CVE-2017-15132.patch patch -p1 -i $SRC/$name-config.patch ./configure --prefix=/usr \

1 0

ports/opt (3.4): mutt: update to 1.9.3
by crux＠crux.nu 01 Feb '18

01 Feb '18

commit 6b091187ab3123263ed5a023a05308b3017faa12 Author: Juergen Daubert <jue(a)jue.li> Date: Sun Jan 28 13:14:03 2018 +0100 mutt: update to 1.9.3 diff --git a/mutt/.md5sum b/mutt/.md5sum index 873e54f64..79f5825c9 100644 --- a/mutt/.md5sum +++ b/mutt/.md5sum @@ -1 +1 @@ -8351fc50ab1bc3c0674e2f537a75e81b mutt-1.9.2.tar.gz +2cfaabbf0c0ef74cff9af2a0a30de30d mutt-1.9.3.tar.gz diff --git a/mutt/.signature b/mutt/.signature index e0bd5b669..c9f72dcb8 100644 --- a/mutt/.signature +++ b/mutt/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XAYUeDx2SJoCx/jdbpBorRqHeCWpKS5TkUlbAsAzXAgJXXmTla2ldwnauyAy4i/W6skhP26D3+59hTuEJNLKQc= -SHA256 (Pkgfile) = 6f4dd41d60182c8f5aaab4d11e1d7987ac5169cb7c1c147982a99621bc9b9406 +RWSE3ohX2g5d/W5mNOfF9IU86hAcJlGlAiVY2cZ36ysSh7iKeQteMCMolcHE11HxOUBL/hB+FjGiu50SkxX8Mxh25Ms4oKmKdAo= +SHA256 (Pkgfile) = 977d0d6ef18f5c0fb48ffd66bba4cafa001b011fe81d490451042abab77f7bef SHA256 (.footprint) = f996ec86bfe2de4f1387c530e3137b4f278f57bfd5606e461322a6bb449d9358 -SHA256 (mutt-1.9.2.tar.gz) = a2e152a352bbf02d222d54074199d9c53821c19f700c4cb85f78fa85faed7896 +SHA256 (mutt-1.9.3.tar.gz) = 431a85d6933ddf75cae51c9966c17d33e32fb0588cb3bbec9d32e01b267b76e1 diff --git a/mutt/Pkgfile b/mutt/Pkgfile index 3051fe384..3e4e06c11 100644 --- a/mutt/Pkgfile +++ b/mutt/Pkgfile @@ -4,16 +4,13 @@ # Depends on: gdbm openssl zlib name=mutt -version=1.9.2 +version=1.9.3 release=1 source=(https://bitbucket.org/mutt/mutt/downloads/$name-$version.tar.gz) build () { cd $name-$version - sed -re '/^makedoc-all/s/manual\.(html|txt)//g' \ - -re '/^makedoc-all/s/stamp-doc-chunked//g' -i doc/Makefile.in - ./configure --prefix=/usr \ --with-docdir=/usr/share/mutt \ --with-mailpath=/var/spool/mail \ @@ -31,7 +28,5 @@ build () { find $PKG/usr/share/mutt/* ! -name manual.txt -delete rm $PKG/usr/etc/{Muttrc,mime.types}.dist - rm $PKG/usr/bin/{flea,muttbug} - rm $PKG/usr/share/man/man1/{flea.1,muttbug.1} rm $PKG/usr/share/man/man5/{mmdf.5,mbox.5} }

1 0