July 2017 - crux-commits

ports/opt (3.3): whois: 5.2.16 -> 5.2.17
by crux＠crux.nu 28 Jul '17

28 Jul '17

commit d938f7b6107d179fa8e85bdeeaab3a1c63ffe5f3 Author: Thomas Penteker <tek(a)serverop.de> Date: Fri Jul 28 02:59:03 2017 +0200 whois: 5.2.16 -> 5.2.17 diff --git a/whois/.md5sum b/whois/.md5sum index 57d83d564..4830b83db 100644 --- a/whois/.md5sum +++ b/whois/.md5sum @@ -1 +1 @@ -1cc5d3820994806373b8b6ad9afda868 whois_5.2.16.tar.xz +6f7a9462b4490cf272e2a37cff7d79e4 whois_5.2.17.tar.xz diff --git a/whois/.signature b/whois/.signature index d8ff16367..10bcdfb12 100644 --- a/whois/.signature +++ b/whois/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ThpdQP8mhup560DtnBc989sSZZ/RH/IPbKR+I9QMYQ3ItyLon4W5/T08cmwSRDI3mP4mBzpwdEJo06goVEPQAc= -SHA256 (Pkgfile) = ed0db4fd6e4606af306b1ede6196f92cb75dd53415c6177e3f120d2cc947844f +RWSE3ohX2g5d/bHIsCusS84Y6QVb5i1bC1WHVO/BUPf42pj+uxiVwkwwf+X2GsOqLrhuAa7wQ8fA/oiPwul4ypU8RaOtpdIIDwQ= +SHA256 (Pkgfile) = bab4cb4c5b3853a13d5bb4e479760c8a9d8b4529f234a7cecdf43cc512352ff7 SHA256 (.footprint) = 088320b1f1f562656da70993b637917de5d36c71004a3136af89c7ca093cf871 -SHA256 (whois_5.2.16.tar.xz) = e9d208b61ccea96b611e522d30fb753dbefed0d44cfabe346e1928690453fc3a +SHA256 (whois_5.2.17.tar.xz) = 257585678f571e18964667b41dc6543fe9da6123ac95743660c9c3ae1eba9664 diff --git a/whois/Pkgfile b/whois/Pkgfile index ff49124f8..2309b26fe 100644 --- a/whois/Pkgfile +++ b/whois/Pkgfile @@ -4,7 +4,7 @@ # Packager: Olle Gustafsson, ogg at linux dot se name=whois -version=5.2.16 +version=5.2.17 release=1 source=(http://ftp.debian.org/debian/pool/main/w/$name/$name\_$version.tar.…

1 0

ports/opt (3.3): autoconf-archive: 2016.09.16 -> 2017.03.21
by crux＠crux.nu 27 Jul '17

27 Jul '17

commit 383768d52c67c9bb84499d7bce8d2dd42823783b Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Fri Jul 28 00:47:27 2017 +1000 autoconf-archive: 2016.09.16 -> 2017.03.21 diff --git a/autoconf-archive/.footprint b/autoconf-archive/.footprint index 6ec340f3e..84c52fa0f 100644 --- a/autoconf-archive/.footprint +++ b/autoconf-archive/.footprint @@ -7,6 +7,7 @@ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/ax_add_am_macro.m4 -rw-r--r-- root/root usr/share/aclocal/ax_add_am_macro_static.m4 -rw-r--r-- root/root usr/share/aclocal/ax_add_am_trilinos_makefile_export.m4 +-rw-r--r-- root/root usr/share/aclocal/ax_add_fortify_source.m4 -rw-r--r-- root/root usr/share/aclocal/ax_add_recursive_am_macro.m4 -rw-r--r-- root/root usr/share/aclocal/ax_add_recursive_am_macro_static.m4 -rw-r--r-- root/root usr/share/aclocal/ax_afs.m4 @@ -52,7 +53,6 @@ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/ax_c99_inline.m4 -rw-r--r-- root/root usr/share/aclocal/ax_c___attribute__.m4 -rw-r--r-- root/root usr/share/aclocal/ax_c_arithmetic_rshift.m4 --rw-r--r-- root/root usr/share/aclocal/ax_c_bigendian_cross.m4 -rw-r--r-- root/root usr/share/aclocal/ax_c_compile_value.m4 -rw-r--r-- root/root usr/share/aclocal/ax_c_declare_block.m4 -rw-r--r-- root/root usr/share/aclocal/ax_c_float_words_bigendian.m4 @@ -205,7 +205,7 @@ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/ax_cxx_compile_stdcxx_0x.m4 -rw-r--r-- root/root usr/share/aclocal/ax_cxx_compile_stdcxx_11.m4 -rw-r--r-- root/root usr/share/aclocal/ax_cxx_compile_stdcxx_14.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_compiler_vendor.m4 +-rw-r--r-- root/root usr/share/aclocal/ax_cxx_compile_stdcxx_17.m4 -rw-r--r-- root/root usr/share/aclocal/ax_cxx_complex_math_in_namespace_std.m4 -rw-r--r-- root/root usr/share/aclocal/ax_cxx_const_cast.m4 -rw-r--r-- root/root usr/share/aclocal/ax_cxx_cppflags_std_lang.m4 @@ -309,6 +309,7 @@ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/ax_ext.m4 -rw-r--r-- root/root usr/share/aclocal/ax_ext_check_header.m4 -rw-r--r-- root/root usr/share/aclocal/ax_ext_have_lib.m4 +-rw-r--r-- root/root usr/share/aclocal/ax_extend_srcdir.m4 -rw-r--r-- root/root usr/share/aclocal/ax_extra_dist.m4 -rw-r--r-- root/root usr/share/aclocal/ax_f77_cmain_fflags.m4 -rw-r--r-- root/root usr/share/aclocal/ax_f90_header.m4 @@ -338,11 +339,9 @@ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/ax_gcc_func_attribute.m4 -rw-r--r-- root/root usr/share/aclocal/ax_gcc_lib.m4 -rw-r--r-- root/root usr/share/aclocal/ax_gcc_libgcc_eh.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_libraries_dir.m4 -rw-r--r-- root/root usr/share/aclocal/ax_gcc_libsupcxx.m4 -rw-r--r-- root/root usr/share/aclocal/ax_gcc_malloc_call.m4 -rw-r--r-- root/root usr/share/aclocal/ax_gcc_var_attribute.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_version.m4 -rw-r--r-- root/root usr/share/aclocal/ax_gcc_warn_unused_result.m4 -rw-r--r-- root/root usr/share/aclocal/ax_gcc_x86_avx_xgetbv.m4 -rw-r--r-- root/root usr/share/aclocal/ax_gcc_x86_cpu_supports.m4 @@ -351,7 +350,6 @@ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/ax_gnu_autotest.m4 -rw-r--r-- root/root usr/share/aclocal/ax_have_adns.m4 -rw-r--r-- root/root usr/share/aclocal/ax_have_epoll.m4 --rw-r--r-- root/root usr/share/aclocal/ax_have_opengl.m4 -rw-r--r-- root/root usr/share/aclocal/ax_have_poll.m4 -rw-r--r-- root/root usr/share/aclocal/ax_have_qt.m4 -rw-r--r-- root/root usr/share/aclocal/ax_have_select.m4 @@ -439,6 +437,7 @@ drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/ax_prog_crontab.m4 -rw-r--r-- root/root usr/share/aclocal/ax_prog_cxx_for_build.m4 -rw-r--r-- root/root usr/share/aclocal/ax_prog_cxx_mpi.m4 +-rw-r--r-- root/root usr/share/aclocal/ax_prog_dotnetcore_version.m4 -rw-r--r-- root/root usr/share/aclocal/ax_prog_doxygen.m4 -rw-r--r-- root/root usr/share/aclocal/ax_prog_f77_mpi.m4 -rw-r--r-- root/root usr/share/aclocal/ax_prog_fasm.m4 @@ -572,5 +571,3 @@ drwxr-xr-x root/root usr/share/autoconf-archive/ -rw-r--r-- root/root usr/share/autoconf-archive/COPYING -rw-r--r-- root/root usr/share/autoconf-archive/COPYING.EXCEPTION -rw-r--r-- root/root usr/share/autoconf-archive/README -drwxr-xr-x root/root usr/share/info/ --rw-r--r-- root/root usr/share/info/autoconf-archive.info diff --git a/autoconf-archive/.md5sum b/autoconf-archive/.md5sum index dc7f8be29..b1ae252d8 100644 --- a/autoconf-archive/.md5sum +++ b/autoconf-archive/.md5sum @@ -1 +1 @@ -bf19d4cddce260b3c3e1d51d42509071 autoconf-archive-2016.09.16.tar.xz +39549f8b3f34d2c910c92e58912e1a64 autoconf-archive-2017.03.21.tar.xz diff --git a/autoconf-archive/.signature b/autoconf-archive/.signature index 5bd679cec..e2fb7da36 100644 --- a/autoconf-archive/.signature +++ b/autoconf-archive/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/elKyuGnHYI5SQXU+PKz0HI4lzqHfDHuzkrwztJxNn1BqJz0XgCANjLc9pIS/7wmj1ktEBGVIsKnW22o3kvvDg8= -SHA256 (Pkgfile) = e7999e8b0b1ff4747104028ce9399b5ad6bcc36158195d3ce1dbb444333e0904 -SHA256 (.footprint) = 39ad9bf85d142d761e785d46d9f5de54046cd7f5f5fb243fc63f364fafef7711 -SHA256 (autoconf-archive-2016.09.16.tar.xz) = e8f2efd235f842bad2f6938bf4a72240a5e5fcd248e8444335e63beb60fabd82 +RWSE3ohX2g5d/eLSzF8N5QY9owywBgdCtLQ+EpvNSpKHrmINEXzJgyVMvR3dbVoXnAj8aRpCMs6FlRjOV84FzkbuiIeXdCH9AAU= +SHA256 (Pkgfile) = f3ddfdb1a0aa06bde07e856770b7af7df9a290209f79cea485ca7330f5b1ac6f +SHA256 (.footprint) = 5de2fdd956740c0eef1049f204c532241d0ae5ccedfd457b3e422a74eb904874 +SHA256 (autoconf-archive-2017.03.21.tar.xz) = 386ad455f12bdeb3a7d19280441a5ab77355142349200ff11040a8d9d455d765 diff --git a/autoconf-archive/Pkgfile b/autoconf-archive/Pkgfile index 3b1d55661..8e2a24bbf 100644 --- a/autoconf-archive/Pkgfile +++ b/autoconf-archive/Pkgfile @@ -4,7 +4,7 @@ # Packager: Danny Rawlins, crux at romster dot me name=autoconf-archive -version=2016.09.16 +version=2017.03.21 release=1 source=(http://ftpmirror.gnu.org/$name/$name-$version.tar.xz) @@ -14,4 +14,6 @@ build() { ./configure --prefix=/usr make make DESTDIR=$PKG install + + rm -r $PKG/usr/share/info }

1 0

ports/opt (3.3): python3: 3.6.1 -> 3.6.2
by crux＠crux.nu 27 Jul '17

27 Jul '17

commit b411436ffd885354e2d62b7b8c73c288bef6550e Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Thu Jul 27 22:42:54 2017 +1000 python3: 3.6.1 -> 3.6.2 diff --git a/python3/.footprint b/python3/.footprint index f64cead5e..f23dab555 100644 --- a/python3/.footprint +++ b/python3/.footprint @@ -2756,9 +2756,9 @@ drwxr-xr-x root/root usr/lib/python3.6/lib-dynload/ -rwxr-xr-x root/root usr/lib/python3.6/lib-dynload/zlib.cpython-36m-x86_64-linux-gnu.so drwxr-xr-x root/root usr/lib/python3.6/lib2to3/ -rw-r--r-- root/root usr/lib/python3.6/lib2to3/Grammar.txt --rw-r--r-- root/root usr/lib/python3.6/lib2to3/Grammar3.6.1.final.0.pickle +-rw-r--r-- root/root usr/lib/python3.6/lib2to3/Grammar3.6.2.final.0.pickle -rw-r--r-- root/root usr/lib/python3.6/lib2to3/PatternGrammar.txt --rw-r--r-- root/root usr/lib/python3.6/lib2to3/PatternGrammar3.6.1.final.0.pickle +-rw-r--r-- root/root usr/lib/python3.6/lib2to3/PatternGrammar3.6.2.final.0.pickle -rw-r--r-- root/root usr/lib/python3.6/lib2to3/__init__.py -rw-r--r-- root/root usr/lib/python3.6/lib2to3/__main__.py drwxr-xr-x root/root usr/lib/python3.6/lib2to3/__pycache__/ @@ -3365,7 +3365,6 @@ drwxr-xr-x root/root usr/lib/python3.6/sqlite3/test/__pycache__/ -rw-r--r-- root/root usr/lib/python3.6/telnetlib.py -rw-r--r-- root/root usr/lib/python3.6/tempfile.py drwxr-xr-x root/root usr/lib/python3.6/test/ --rw-r--r-- root/root usr/lib/python3.6/test/185test.db -rw-r--r-- root/root usr/lib/python3.6/test/Sine-1000Hz-300ms.aif -rw-r--r-- root/root usr/lib/python3.6/test/__init__.py -rw-r--r-- root/root usr/lib/python3.6/test/__main__.py diff --git a/python3/.md5sum b/python3/.md5sum index 302442fa0..b67c232ac 100644 --- a/python3/.md5sum +++ b/python3/.md5sum @@ -1 +1 @@ -692b4fc3a2ba0d54d1495d4ead5b0b5c Python-3.6.1.tar.xz +2c68846471994897278364fc18730dd9 Python-3.6.2.tar.xz diff --git a/python3/.signature b/python3/.signature index db4a00139..bcf45a167 100644 --- a/python3/.signature +++ b/python3/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Un50+aLZLDhngP95dlAQFWMsQpX6469m6eB/lGKgvkvd3qRyD+GQX7Wstl3Ovwaj76svps/L8/SjLjNgHC11gw= -SHA256 (Pkgfile) = c12436e1299b79342b00c0cb6aace2f1e03dfb5a39cf7b5661a28a5d9e46063b -SHA256 (.footprint) = 0939b7a4ed1ab5d218dd0d5557d37bb1bec9cc8841bbe3b78b1ad7046ea60198 -SHA256 (Python-3.6.1.tar.xz) = a01810ddfcec216bcdb357a84bfaafdfaa0ca42bbdaa4cb7ff74f5a9961e4041 +RWSE3ohX2g5d/TLDnwKefIKN0Lyw9su23Nc89mqpVZ0tAf+SuA6CE990W/Az9SohSmckvqv/Pju1jjSC95YaLe0r1GSVZI/x9QQ= +SHA256 (Pkgfile) = 4709a7e4248dcc2379622e0ec85c79c2a1a0a4ba2501cad9b7c529dd4a16762f +SHA256 (.footprint) = f22eb941d50459fe5471192b4d55230049e7509256fef31e5276fee3ea7a09d5 +SHA256 (Python-3.6.2.tar.xz) = 9229773be41ed144370f47f0f626a1579931f5a390f1e8e3853174d52edd64a9 diff --git a/python3/Pkgfile b/python3/Pkgfile index 12fcb0515..a3459e5c5 100644 --- a/python3/Pkgfile +++ b/python3/Pkgfile @@ -4,8 +4,8 @@ # Depends on: bzip2 expat gdbm libffi mpdecimal sqlite3 xz zlib name=python3 -version=3.6.1 -release=2 +version=3.6.2 +release=1 source=(https://www.python.org/ftp/python/$version/Python-$version.tar.xz) build() {

1 0

ports/opt (3.3): postfix: update signature
by crux＠crux.nu 27 Jul '17

27 Jul '17

commit 2af2ab089e9e18a402cefbf550e25ff5ae24dc57 Author: Thomas Penteker <tek(a)serverop.de> Date: Thu Jul 27 15:37:05 2017 +0200 postfix: update signature diff --git a/postfix/.signature b/postfix/.signature index ec03283bb..cbd0082ea 100644 --- a/postfix/.signature +++ b/postfix/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/f9lV6J8tSdWZYvqh9S03+Dh07jpllFCw7A+hXM/KBn9BwjFlz+a8EweRxa2HgGHADbBUH7DPT4jMFOGwrM89A4= -SHA256 (Pkgfile) = b9bad3aa807514998412ba2bf1b349a812ddcbfc7d1299e328d2d6bce5f08689 +RWSE3ohX2g5d/QewHu6EE2mHQ10ShACoaVlXYh/4D6AxibgntfIDIcsj2GTBr518bpGVvdX74ntOf+wXIC3sxkmVqv+z2P8N+Ag= +SHA256 (Pkgfile) = 51640b1005b04285f25b5af0ab27c89e7d78f4236adf83619b187d39f3b95ffd SHA256 (.footprint) = 761cd79e2a909b54492fb9a2576af2460fef10ecfa6f77da0fce6d6851fd734f SHA256 (postfix-2.11.10.tar.gz) = 4d9dca8a6f08adcb70fc02a00bde0f8057f062bc16dfa32acd6bbec2b0ffb9dd SHA256 (aliases) = b6de629cce43ed5dc06086c5742ebe85ccc7b59d085f0fec71d97e0e73a50271

1 0

ports/opt (3.3): chromium: 59.0.3071.109 -> 60.0.3112.78
by crux＠crux.nu 27 Jul '17

27 Jul '17

commit e6bc029de99194ba151343c97699d9621fdcf850 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Thu Jul 27 21:55:18 2017 +1000 chromium: 59.0.3071.109 -> 60.0.3112.78 diff --git a/chromium/.footprint b/chromium/.footprint index fde892e1e..0c5b46d45 100644 --- a/chromium/.footprint +++ b/chromium/.footprint @@ -26,10 +26,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/accelerometer-left.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/accelerometer-right.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/accelerometer-top.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo_2x.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo_bw.png --rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo_bw_2x.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/audits_logo.svg -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpoint.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditional.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointConditional_2x.png @@ -53,6 +50,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/mediumIcons_2x.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigationControls.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/navigationControls_2x.png +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/nodeIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/popoverArrows.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileGroupIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/profileIcon.png @@ -178,16 +176,18 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layers/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/layers/layers_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/network/network_module.js -drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network_group_lookup/ --rw-r--r-- root/root usr/lib/chromium/resources/inspector/network_group_lookup/network_group_lookup_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/object_ui/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/object_ui/object_ui_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/perf_ui/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/perf_ui/perf_ui_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/product_registry/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/product_registry/product_registry_module.js +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/protocol/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/protocol/protocol_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/ @@ -196,6 +196,8 @@ 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/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/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/sdk/sdk_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/security/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/security/security_module.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/settings/ diff --git a/chromium/.md5sum b/chromium/.md5sum index 1765030fd..121e798a7 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,6 +1,8 @@ -7ad48853453a431b689c1ff97378840a 0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch -de9345fb5cd756ed43c4ea7b9223e5ee 0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch -81885367434a85aecdb7b5a8d666590d chromium-59.0.3071.109.tar.xz +c8b274991cdd5064aed600add48a0bf6 0001-Clip-FreeType-glyph-bitmap-to-mask.patch +e5f1c85bec4a50df09da6d4b17249826 chromium-60.0.3112.78.tar.xz +034bc28a6988f3d6d1e7f291ec95365c chromium-blink-gcc7.patch +3d379c46c547a21d6f20fc1c1761bff1 chromium-gn-bootstrap-r8.patch +c2f283eee77d4123a0952d9ee277ec3c chromium-v8-gcc7.patch b527005e021b14869a669e42c46b661d chromium.desktop 64968626706b07721983ac59fb3babbf chromium.sh 3354997dd0bfde3443499133a6e16a85 last-commit-position.patch diff --git a/chromium/.signature b/chromium/.signature index e59e60f97..c33bcc9a4 100644 --- a/chromium/.signature +++ b/chromium/.signature @@ -1,10 +1,12 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/esFuYuwpVHLuIsNopga1umJ/mXnCBPIpcwi+/lUU1pH7ep70vfbEtZNzYsaeRHECOqWAaCh11k2R2Z/bY2R9wA= -SHA256 (Pkgfile) = 42813130cc9658975bd901675e5673747688d7dd06685743f4e2bd11c25609c8 -SHA256 (.footprint) = ecc99206edaf6df789ab643b4e401d05dd4c35a733789bb6a7b21ff6c40664b9 -SHA256 (chromium-59.0.3071.109.tar.xz) = 83faeb3537428d83728258b28e907caaee6e6572bcd7d9b9a5f6009e7ea758d9 +RWSE3ohX2g5d/XLaCVmbCMsspxPKBcx0491RclWXvUzRDeDgDIhVMOlvG9QywXC8RZ6nwAVoRIbmwtLLrCW5rFBjhkH0BWFQfQE= +SHA256 (Pkgfile) = a2d1d95c4dead5dd2cddd4331807481f82233b5d810433fe2b4c42937d494d79 +SHA256 (.footprint) = 1212ab960b6ace8249ad85297b0c158b11ab0822da7f8098c82b3f6e5e8a4909 +SHA256 (chromium-60.0.3112.78.tar.xz) = a82db2aa1b9348b619c01894db565eba686780de0e6fa9e83a8f406d06ce03ea SHA256 (last-commit-position.patch) = d3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e SHA256 (chromium.sh) = 7b182d0ae1e9ef841f8cd0b403a304babd548bf60b5e3808b2144bebdbb7c154 SHA256 (chromium.desktop) = caf015652ac7ce9403a5cb6c7bec3dc597222b20c5842059ee15674e2c9209cc -SHA256 (0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch) = 9c081c84a4f85dbef82a9edf34cf0b1e8377c563874fd9c1b4efddf1476748f9 -SHA256 (0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch) = 42eb6ada30d5d507f2bda2d2caece37e397e7086bc0d430db776fad143562fb6 +SHA256 (0001-Clip-FreeType-glyph-bitmap-to-mask.patch) = e60aa0ff01f8bee67e45fde7bbe932901194984673ec4b10ea82bba1bace0cd7 +SHA256 (chromium-blink-gcc7.patch) = f94310a7ba9b8b777adfb4442bcc0a8f0a3d549b2cf4a156066f8e2e28e2f323 +SHA256 (chromium-v8-gcc7.patch) = 46dacc4fa52652b7d99b8996d6a97e5e3bac586f879aefb9fb95020d2c4e5aec +SHA256 (chromium-gn-bootstrap-r8.patch) = 06345804c00d9618dad98a2dc04f31ef19912cdf6e9d6e577ef7ffb1fa57003f diff --git a/chromium/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch b/chromium/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch deleted file mode 100644 index 8a1bf2b20..000000000 --- a/chromium/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 27bab2297187099229a1e4304d8feb866c8da55a Mon Sep 17 00:00:00 2001 -From: "dongseong.hwang" <dongseong.hwang(a)intel.com> -Date: Tue, 18 Apr 2017 16:44:55 -0700 -Subject: [PATCH] ClientNativePixmapFactoryDmabuf uses ioctl, instead of - drmIoctl. - -DMA_BUF_SYNC ioctl is not drmIoctl, because it uses dma-buf fd, instead of drm -device fd. - -In addition, remove LOCAL_ prefix to fix build failure >= kernel 4.6 - -Actually, ChromeOS doesn't need this local DMA_BUF_SYNC definition as all -verion of kernel for cros has dma-buf.h header. -https://chromium-review.googlesource.com/c/459544/ -However, there is not any way to distinguish real ChromeOS build and -current_os="chromeos" build, so remain the local definition to ChromeOS as -well. - -BUG=584248 -R=reveman(a)chromium.org - -Review-Url: https://codereview.chromium.org/2805503003 -Cr-Commit-Position: refs/heads/master@{#465425} ---- - ui/gfx/linux/client_native_pixmap_dmabuf.cc | 49 +++++++++++++---------------- - 1 file changed, 21 insertions(+), 28 deletions(-) - -diff --git a/ui/gfx/linux/client_native_pixmap_dmabuf.cc b/ui/gfx/linux/client_native_pixmap_dmabuf.cc -index d656c338f0a6..1bb441dc25ce 100644 ---- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc -+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc -@@ -7,36 +7,35 @@ - #include <fcntl.h> - #include <linux/version.h> - #include <stddef.h> -+#include <sys/ioctl.h> - #include <sys/mman.h> - #include <xf86drm.h> - - #include "base/debug/crash_logging.h" - #include "base/memory/ptr_util.h" -+#include "base/posix/eintr_wrapper.h" - #include "base/process/memory.h" - #include "base/process/process_metrics.h" - #include "base/strings/stringprintf.h" - #include "base/trace_event/trace_event.h" - --#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+#include <linux/dma-buf.h> -+#else - #include <linux/types.h> - --struct local_dma_buf_sync { -+struct dma_buf_sync { - __u64 flags; - }; - --#define LOCAL_DMA_BUF_SYNC_READ (1 << 0) --#define LOCAL_DMA_BUF_SYNC_WRITE (2 << 0) --#define LOCAL_DMA_BUF_SYNC_RW \ -- (LOCAL_DMA_BUF_SYNC_READ | LOCAL_DMA_BUF_SYNC_WRITE) --#define LOCAL_DMA_BUF_SYNC_START (0 << 2) --#define LOCAL_DMA_BUF_SYNC_END (1 << 2) -+#define DMA_BUF_SYNC_READ (1 << 0) -+#define DMA_BUF_SYNC_WRITE (2 << 0) -+#define DMA_BUF_SYNC_RW (DMA_BUF_SYNC_READ | DMA_BUF_SYNC_WRITE) -+#define DMA_BUF_SYNC_START (0 << 2) -+#define DMA_BUF_SYNC_END (1 << 2) - --#define LOCAL_DMA_BUF_BASE 'b' --#define LOCAL_DMA_BUF_IOCTL_SYNC \ -- _IOW(LOCAL_DMA_BUF_BASE, 0, struct local_dma_buf_sync) -- --#else --#include <linux/dma-buf.h> -+#define DMA_BUF_BASE 'b' -+#define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) - #endif - - namespace gfx { -@@ -44,25 +43,19 @@ namespace gfx { - namespace { - - void PrimeSyncStart(int dmabuf_fd) { -- struct local_dma_buf_sync sync_start = {0}; -+ struct dma_buf_sync sync_start = {0}; - -- sync_start.flags = LOCAL_DMA_BUF_SYNC_START | LOCAL_DMA_BUF_SYNC_RW; --#if DCHECK_IS_ON() -- int rv = --#endif -- drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_start); -- DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_START"; -+ sync_start.flags = DMA_BUF_SYNC_START | DMA_BUF_SYNC_RW; -+ int rv = HANDLE_EINTR(ioctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_start)); -+ PLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_START"; - } - - void PrimeSyncEnd(int dmabuf_fd) { -- struct local_dma_buf_sync sync_end = {0}; -+ struct dma_buf_sync sync_end = {0}; - -- sync_end.flags = LOCAL_DMA_BUF_SYNC_END | LOCAL_DMA_BUF_SYNC_RW; --#if DCHECK_IS_ON() -- int rv = --#endif -- drmIoctl(dmabuf_fd, LOCAL_DMA_BUF_IOCTL_SYNC, &sync_end); -- DPLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_END"; -+ sync_end.flags = DMA_BUF_SYNC_END | DMA_BUF_SYNC_RW; -+ int rv = HANDLE_EINTR(ioctl(dmabuf_fd, DMA_BUF_IOCTL_SYNC, &sync_end)); -+ PLOG_IF(ERROR, rv) << "Failed DMA_BUF_SYNC_END"; - } - - } // namespace --- -2.13.0 - diff --git a/chromium/0001-Clip-FreeType-glyph-bitmap-to-mask.patch b/chromium/0001-Clip-FreeType-glyph-bitmap-to-mask.patch new file mode 100644 index 000000000..5a395b53d --- /dev/null +++ b/chromium/0001-Clip-FreeType-glyph-bitmap-to-mask.patch @@ -0,0 +1,170 @@ +From 6cdb5f2ad7684302a8a66217462d2aef4c5f4632 Mon Sep 17 00:00:00 2001 +From: Ben Wagner <bungeman(a)behemoth.cnc.corp.google.com> +Date: Thu, 15 Jun 2017 10:43:17 -0400 +Subject: [PATCH] Clip FreeType glyph bitmap to mask. + +Skia has for some time assumed that when using FT_Render_Glyph with one +of the LCD render modes that one extra pixel would be applied to each +side of the resulting bitmap. FreieType has changed to make this more +conservative when possible, so the pre-allocated SkMask and the generated +FT_Bitmap may no longer agree on the size and origin. + +This change ensures the SkMask and FT_Bitmap are the same size and their +origins align. This is not an ideal long term fix, but is both simple and +localized for easy and quick back-porting, should that become necessary. + +BUG=skia:6663 + +Change-Id: I49ec8f45376be8d867e8aef54eab79537731c310 +Reviewed-on: https://skia-review.googlesource.com/20327 +Reviewed-by: Herb Derby <herb(a)google.com> +Commit-Queue: Ben Wagner <bungeman(a)google.com> +--- + src/ports/SkFontHost_FreeType_common.cpp | 100 +++++++++++++++++++++++++------ + 1 file changed, 83 insertions(+), 17 deletions(-) + +diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp +index 9df7268bb4..a216fdb29c 100644 +--- a/src/ports/SkFontHost_FreeType_common.cpp ++++ b/src/ports/SkFontHost_FreeType_common.cpp +@@ -395,8 +395,6 @@ void SkScalerContext_FreeType_Base::generateGlyphImage( + switch ( face->glyph->format ) { + case FT_GLYPH_FORMAT_OUTLINE: { + FT_Outline* outline = &face->glyph->outline; +- FT_BBox bbox; +- FT_Bitmap target; + + int dx = 0, dy = 0; + if (fRec.fFlags & SkScalerContext::kSubpixelPositioning_Flag) { +@@ -405,36 +403,97 @@ void SkScalerContext_FreeType_Base::generateGlyphImage( + // negate dy since freetype-y-goes-up and skia-y-goes-down + dy = -dy; + } +- FT_Outline_Get_CBox(outline, &bbox); +- /* +- what we really want to do for subpixel is +- offset(dx, dy) +- compute_bounds +- offset(bbox & !63) +- but that is two calls to offset, so we do the following, which +- achieves the same thing with only one offset call. +- */ +- FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63), +- dy - ((bbox.yMin + dy) & ~63)); ++ ++ memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight); + + if (SkMask::kLCD16_Format == glyph.fMaskFormat) { ++ FT_Outline_Translate(outline, dx, dy); + FT_Error err = FT_Render_Glyph(face->glyph, doVert ? FT_RENDER_MODE_LCD_V : + FT_RENDER_MODE_LCD); + if (err) { + SK_TRACEFTR(err, "Could not render glyph."); +- sk_bzero(glyph.fImage, glyph.computeImageSize()); + return; + } ++ + SkMask mask; + glyph.toMask(&mask); ++#ifdef SK_SHOW_TEXT_BLIT_COVERAGE ++ memset(mask.fImage, 0x80, mask.fBounds.height() * mask.fRowBytes); ++#endif ++ FT_GlyphSlotRec& ftGlyph = *face->glyph; ++ ++ if (!SkIRect::Intersects(mask.fBounds, ++ SkIRect::MakeXYWH( ftGlyph.bitmap_left, ++ -ftGlyph.bitmap_top, ++ ftGlyph.bitmap.width, ++ ftGlyph.bitmap.rows))) ++ { ++ return; ++ } ++ ++ // If the FT_Bitmap extent is larger, discard bits of the bitmap outside the mask. ++ // If the SkMask extent is larger, shrink mask to fit bitmap (clearing discarded). ++ unsigned char* origBuffer = ftGlyph.bitmap.buffer; ++ // First align the top left (origin). ++ if (-ftGlyph.bitmap_top < mask.fBounds.fTop) { ++ int32_t topDiff = mask.fBounds.fTop - (-ftGlyph.bitmap_top); ++ ftGlyph.bitmap.buffer += ftGlyph.bitmap.pitch * topDiff; ++ ftGlyph.bitmap.rows -= topDiff; ++ ftGlyph.bitmap_top = -mask.fBounds.fTop; ++ } ++ if (ftGlyph.bitmap_left < mask.fBounds.fLeft) { ++ int32_t leftDiff = mask.fBounds.fLeft - ftGlyph.bitmap_left; ++ ftGlyph.bitmap.buffer += leftDiff; ++ ftGlyph.bitmap.width -= leftDiff; ++ ftGlyph.bitmap_left = mask.fBounds.fLeft; ++ } ++ if (mask.fBounds.fTop < -ftGlyph.bitmap_top) { ++ mask.fImage += mask.fRowBytes * (-ftGlyph.bitmap_top - mask.fBounds.fTop); ++ mask.fBounds.fTop = -ftGlyph.bitmap_top; ++ } ++ if (mask.fBounds.fLeft < ftGlyph.bitmap_left) { ++ mask.fImage += sizeof(uint16_t) * (ftGlyph.bitmap_left - mask.fBounds.fLeft); ++ mask.fBounds.fLeft = ftGlyph.bitmap_left; ++ } ++ // Origins aligned, clean up the width and height. ++ int ftVertScale = (doVert ? 3 : 1); ++ int ftHoriScale = (doVert ? 1 : 3); ++ if (mask.fBounds.height() * ftVertScale < SkToInt(ftGlyph.bitmap.rows)) { ++ ftGlyph.bitmap.rows = mask.fBounds.height() * ftVertScale; ++ } ++ if (mask.fBounds.width() * ftHoriScale < SkToInt(ftGlyph.bitmap.width)) { ++ ftGlyph.bitmap.width = mask.fBounds.width() * ftHoriScale; ++ } ++ if (SkToInt(ftGlyph.bitmap.rows) < mask.fBounds.height() * ftVertScale) { ++ mask.fBounds.fBottom = mask.fBounds.fTop + ftGlyph.bitmap.rows / ftVertScale; ++ } ++ if (SkToInt(ftGlyph.bitmap.width) < mask.fBounds.width() * ftHoriScale) { ++ mask.fBounds.fRight = mask.fBounds.fLeft + ftGlyph.bitmap.width / ftHoriScale; ++ } + if (fPreBlend.isApplicable()) { +- copyFT2LCD16<true>(face->glyph->bitmap, mask, doBGR, ++ copyFT2LCD16<true>(ftGlyph.bitmap, mask, doBGR, + fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); + } else { +- copyFT2LCD16<false>(face->glyph->bitmap, mask, doBGR, ++ copyFT2LCD16<false>(ftGlyph.bitmap, mask, doBGR, + fPreBlend.fR, fPreBlend.fG, fPreBlend.fB); + } ++ // Restore the buffer pointer so FreeType can properly free it. ++ ftGlyph.bitmap.buffer = origBuffer; + } else { ++ FT_BBox bbox; ++ FT_Bitmap target; ++ FT_Outline_Get_CBox(outline, &bbox); ++ /* ++ what we really want to do for subpixel is ++ offset(dx, dy) ++ compute_bounds ++ offset(bbox & !63) ++ but that is two calls to offset, so we do the following, which ++ achieves the same thing with only one offset call. ++ */ ++ FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63), ++ dy - ((bbox.yMin + dy) & ~63)); ++ + target.width = glyph.fWidth; + target.rows = glyph.fHeight; + target.pitch = glyph.rowBytes(); +@@ -442,8 +501,15 @@ void SkScalerContext_FreeType_Base::generateGlyphImage( + target.pixel_mode = compute_pixel_mode( (SkMask::Format)fRec.fMaskFormat); + target.num_grays = 256; + +- memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight); + FT_Outline_Get_Bitmap(face->glyph->library, outline, &target); ++#ifdef SK_SHOW_TEXT_BLIT_COVERAGE ++ for (int y = 0; y < glyph.fHeight; ++y) { ++ for (int x = 0; x < glyph.fWidth; ++x) { ++ uint8_t& a = ((uint8_t*)glyph.fImage)[(glyph.rowBytes() * y) + x]; ++ a = SkTMax<uint8_t>(a, 0x20); ++ } ++ } ++#endif + } + } break; + +-- +2.13.2 + diff --git a/chromium/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch b/chromium/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch deleted file mode 100644 index 345770000..000000000 --- a/chromium/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 63901da067e069e298595618e01c4758c7896ff5 Mon Sep 17 00:00:00 2001 -From: thomasanderson <thomasanderson(a)google.com> -Date: Fri, 28 Apr 2017 11:56:12 -0700 -Subject: [PATCH] Fix kernel version condition for including dma-buf.h - -Kernel 4.11 merges the commit that added linux/dma-buf.h -https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ef96152e6a36e0510387cb174178b7982c1ae879 - -This CL increases the required kernel to include this file to 4.11. - -BUG=707604 -R=danakj(a)chromium.org - -Review-Url: https://codereview.chromium.org/2851803002 -Cr-Commit-Position: refs/heads/master@{#468078} ---- - ui/gfx/linux/client_native_pixmap_dmabuf.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ui/gfx/linux/client_native_pixmap_dmabuf.cc b/ui/gfx/linux/client_native_pixmap_dmabuf.cc -index 31ff4f4395b6..4927daf3a61d 100644 ---- a/ui/gfx/linux/client_native_pixmap_dmabuf.cc -+++ b/ui/gfx/linux/client_native_pixmap_dmabuf.cc -@@ -19,7 +19,7 @@ - #include "base/strings/stringprintf.h" - #include "base/trace_event/trace_event.h" - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) - #include <linux/dma-buf.h> - #else - #include <linux/types.h> --- -2.13.0 - diff --git a/chromium/Pkgfile b/chromium/Pkgfile index 7f531b4cb..fa94de289 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -5,12 +5,14 @@ # Depends on: dbus-glib gperf gtk gtk3 libevent libexif libgcrypt ninja nodejs nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt yasm name=chromium -version=59.0.3071.109 +version=60.0.3112.78 release=1 -source=(http://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz \ +source=(https://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz last-commit-position.patch $name.sh $name.desktop - 0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch - 0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch) + 0001-Clip-FreeType-glyph-bitmap-to-mask.patch + chromium-blink-gcc7.patch + chromium-v8-gcc7.patch + chromium-gn-bootstrap-r8.patch) build() { cd $name-$version @@ -21,23 +23,27 @@ build() { # we don't use git sources patch -p1 -i $SRC/last-commit-position.patch - # https://bugs.chromium.org/p/chromium/issues/detail?id=707604 - patch -p1 -i $SRC/0001-ClientNativePixmapFactoryDmabuf-uses-ioctl-instead-o.patch - patch -p1 -i $SRC/0001-Fix-kernel-version-condition-for-including-dma-buf.h.patch + # https://bugs.chromium.org/p/skia/issues/detail?id=6663 + patch -p1 -d third_party/skia -i $SRC/0001-Clip-FreeType-glyph-bitmap-to-mask.patch + + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853347 + patch -p1 -i $SRC/chromium-blink-gcc7.patch + + # https://bugs.chromium.org/p/chromium/issues/detail?id=614289 + patch -p1 -i $SRC/chromium-v8-gcc7.patch + + # Fixes from Gentoo + patch -p1 -i $SRC/chromium-gn-bootstrap-r8.patch mkdir -p third_party/node/linux/node-linux-x64/bin ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ - # Fix a build issue with GCC-6 - sed 's/^config("compiler") {/&\ncflags_cc = [ "-fno-delete-null-pointer-checks" ]/' \ - -i build/config/linux/BUILD.gn - _gn_args=( 'blink_gc_plugin=false' 'clang_use_chrome_plugins=false' 'enable_hangout_services_extension=true' 'enable_nacl=false' - 'enable_nacl_nonsfi=false' + 'enable_swiftshader=false' 'fatal_linker_warnings=false' 'ffmpeg_branding="Chrome"' 'is_clang=false' diff --git a/chromium/chromium-blink-gcc7.patch b/chromium/chromium-blink-gcc7.patch new file mode 100644 index 000000000..fb6118b30 --- /dev/null +++ b/chromium/chromium-blink-gcc7.patch @@ -0,0 +1,76 @@ +--- chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h.orig 2017-06-06 15:05:38.145247996 +0300 ++++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h 2017-06-06 15:06:13.866246667 +0300 +@@ -685,6 +685,31 @@ inline LinkedHashSet<T, U, V, W>& Linked + return *this; + } + ++inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) { ++ DCHECK(a.prev_); ++ DCHECK(a.next_); ++ DCHECK(b.prev_); ++ DCHECK(b.next_); ++ swap(a.prev_, b.prev_); ++ swap(a.next_, b.next_); ++ if (b.next_ == &a) { ++ DCHECK_EQ(b.prev_, &a); ++ b.next_ = &b; ++ b.prev_ = &b; ++ } else { ++ b.next_->prev_ = &b; ++ b.prev_->next_ = &b; ++ } ++ if (a.next_ == &b) { ++ DCHECK_EQ(a.prev_, &b); ++ a.next_ = &a; ++ a.prev_ = &a; ++ } else { ++ a.next_->prev_ = &a; ++ a.prev_->next_ = &a; ++ } ++} ++ + template <typename T, typename U, typename V, typename W> + inline void LinkedHashSet<T, U, V, W>::Swap(LinkedHashSet& other) { + impl_.Swap(other.impl_); +@@ -877,31 +902,6 @@ inline void LinkedHashSet<T, U, V, W>::e + erase(Find(value)); + } + +-inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) { +- DCHECK(a.prev_); +- DCHECK(a.next_); +- DCHECK(b.prev_); +- DCHECK(b.next_); +- swap(a.prev_, b.prev_); +- swap(a.next_, b.next_); +- if (b.next_ == &a) { +- DCHECK_EQ(b.prev_, &a); +- b.next_ = &b; +- b.prev_ = &b; +- } else { +- b.next_->prev_ = &b; +- b.prev_->next_ = &b; +- } +- if (a.next_ == &b) { +- DCHECK_EQ(a.prev_, &b); +- a.next_ = &a; +- a.prev_ = &a; +- } else { +- a.next_->prev_ = &a; +- a.prev_->next_ = &a; +- } +-} +- + inline void swap(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) { + DCHECK_NE(a.next_, &a); + DCHECK_NE(b.next_, &b); +--- chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.orig 2017-06-06 16:16:43.657661313 +0300 ++++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h 2017-06-06 16:16:50.911198032 +0300 +@@ -5,6 +5,7 @@ + #include "platform/PlatformExport.h" + #include "platform/wtf/ThreadSpecific.h" + ++#include <functional> + #include <memory> + + namespace gpu { diff --git a/chromium/chromium-gn-bootstrap-r8.patch b/chromium/chromium-gn-bootstrap-r8.patch new file mode 100644 index 000000000..d9f389aaf --- /dev/null +++ b/chromium/chromium-gn-bootstrap-r8.patch @@ -0,0 +1,13 @@ +Index: tools/gn/bootstrap/bootstrap.py +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/sys_info.cc', + 'base/task_runner.cc', + 'base/task_scheduler/delayed_task_manager.cc', ++ 'base/task_scheduler/environment_config.cc', + 'base/task_scheduler/post_task.cc', + 'base/task_scheduler/priority_queue.cc', + 'base/task_scheduler/scheduler_lock_impl.cc', diff --git a/chromium/chromium-v8-gcc7.patch b/chromium/chromium-v8-gcc7.patch new file mode 100644 index 000000000..a63b9a495 --- /dev/null +++ b/chromium/chromium-v8-gcc7.patch @@ -0,0 +1,73 @@ +diff -upr chromium-59.0.3071.86.orig/v8/src/objects/hash-table.h chromium-59.0.3071.86/v8/src/objects/hash-table.h +--- chromium-59.0.3071.86.orig/v8/src/objects/hash-table.h 2017-06-05 22:04:29.000000000 +0300 ++++ chromium-59.0.3071.86/v8/src/objects/hash-table.h 2017-06-06 14:35:41.558245559 +0300 +@@ -135,22 +135,10 @@ class HashTable : public HashTableBase { + public: + typedef Shape ShapeT; + +- // Wrapper methods +- inline uint32_t Hash(Key key) { +- if (Shape::UsesSeed) { +- return Shape::SeededHash(key, GetHeap()->HashSeed()); +- } else { +- return Shape::Hash(key); +- } +- } +- +- inline uint32_t HashForObject(Key key, Object* object) { +- if (Shape::UsesSeed) { +- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); +- } else { +- return Shape::HashForObject(key, object); +- } +- } ++ // Wrapper methods. Defined in src/objects-inl.h ++ // to break a cycle with src/heap/heap.h. ++ inline uint32_t Hash(Key key); ++ inline uint32_t HashForObject(Key key, Object* object); + + // Returns a new HashTable object. + MUST_USE_RESULT static Handle<Derived> New( +diff -upr chromium-59.0.3071.86.orig/v8/src/objects-body-descriptors.h chromium-59.0.3071.86/v8/src/objects-body-descriptors.h +--- chromium-59.0.3071.86.orig/v8/src/objects-body-descriptors.h 2017-06-05 22:04:29.000000000 +0300 ++++ chromium-59.0.3071.86/v8/src/objects-body-descriptors.h 2017-06-06 14:35:41.554912132 +0300 +@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public + + template <typename StaticVisitor> + static inline void IterateBody(HeapObject* obj, int object_size) { +- IterateBody(obj); ++ IterateBody<StaticVisitor>(obj); + } + }; + +diff -upr chromium-59.0.3071.86.orig/v8/src/objects-inl.h chromium-59.0.3071.86/v8/src/objects-inl.h +--- chromium-59.0.3071.86.orig/v8/src/objects-inl.h 2017-06-05 22:04:29.000000000 +0300 ++++ chromium-59.0.3071.86/v8/src/objects-inl.h 2017-06-06 14:35:41.558245559 +0300 +@@ -46,6 +46,27 @@ + namespace v8 { + namespace internal { + ++template <typename Derived, typename Shape, typename Key> ++uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) { ++ if (Shape::UsesSeed) { ++ return Shape::SeededHash(key, GetHeap()->HashSeed()); ++ } else { ++ return Shape::Hash(key); ++ } ++} ++ ++ ++template <typename Derived, typename Shape, typename Key> ++uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key, ++ Object* object) { ++ if (Shape::UsesSeed) { ++ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); ++ } else { ++ return Shape::HashForObject(key, object); ++ } ++} ++ ++ + PropertyDetails::PropertyDetails(Smi* smi) { + value_ = smi->value(); + }

1 0

ports/contrib (3.3): libgeoip: initial import
by crux＠crux.nu 27 Jul '17

27 Jul '17

commit 751e3399e9f8ff26d073265765e68668036b084b Author: Thomas Penteker <tek(a)serverop.de> Date: Thu Jul 27 12:52:39 2017 +0200 libgeoip: initial import diff --git a/libgeoip/.footprint b/libgeoip/.footprint new file mode 100644 index 00000000..7803a9a5 --- /dev/null +++ b/libgeoip/.footprint @@ -0,0 +1,20 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/geoiplookup +-rwxr-xr-x root/root usr/bin/geoiplookup6 +drwxr-xr-x root/root usr/include/ +-rw-r--r-- root/root usr/include/GeoIP.h +-rw-r--r-- root/root usr/include/GeoIPCity.h +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libGeoIP.a +-rwxr-xr-x root/root usr/lib/libGeoIP.la +lrwxrwxrwx root/root usr/lib/libGeoIP.so -> libGeoIP.so.1.6.11 +lrwxrwxrwx root/root usr/lib/libGeoIP.so.1 -> libGeoIP.so.1.6.11 +-rwxr-xr-x root/root usr/lib/libGeoIP.so.1.6.11 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/geoip.pc +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/geoiplookup.1.gz +-rw-r--r-- root/root usr/share/man/man1/geoiplookup6.1.gz diff --git a/libgeoip/.md5sum b/libgeoip/.md5sum new file mode 100644 index 00000000..ddd71ab0 --- /dev/null +++ b/libgeoip/.md5sum @@ -0,0 +1 @@ +1330a0d2c212b0783fcbdfe694bbc23e v1.6.11.tar.gz diff --git a/libgeoip/.signature b/libgeoip/.signature new file mode 100644 index 00000000..ea379474 --- /dev/null +++ b/libgeoip/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF3wQXnEOrRTda4EwTK5dIJZmbwTyfhOOTEttshrpHlFyK8l+nihLqJ/rTXP+ZNFOJ2ttQnz79HB22+Y9yRYzfew4= +SHA256 (Pkgfile) = bba0f703650a49b911c280714b4c8b166e6b68d512a9e6815a71772568151cae +SHA256 (.footprint) = 55889f24f10f8cc55420b291966b4d18d2ab8f8a16903f73a523b8c48ae67fa7 +SHA256 (v1.6.11.tar.gz) = 8859cb7c9cb63e77f4aedb40a4622024359b956b251aba46b255acbe190c34e0 diff --git a/libgeoip/Pkgfile b/libgeoip/Pkgfile new file mode 100644 index 00000000..06acaa20 --- /dev/null +++ b/libgeoip/Pkgfile @@ -0,0 +1,18 @@ +# Description: GeoIP Legacy C Library +# URL: https://github.com/maxmind/geoip-api-c +# Maintainer: Thomas Penteker, tek at serverop dot de + +name=libgeoip +version=1.6.11 +release=1 +source=(https://github.com/maxmind/geoip-api-c/archive/v${version}.tar.gz) + +build() { + cd geoip-api-c-$version + + autoreconf -i + ./configure --prefix=/usr + + make + make DESTDIR=$PKG install +}

1 0

ports/opt (3.3): jdk: update to 1.8.0_144
by crux＠crux.nu 27 Jul '17

27 Jul '17

commit d90e37c0b2ad209cc2747988cbc79b1928a71ed5 Author: Juergen Daubert <jue(a)jue.li> Date: Thu Jul 27 10:23:34 2017 +0200 jdk: update to 1.8.0_144 diff --git a/jdk/.md5sum b/jdk/.md5sum index ad7839d49..5a93804f6 100644 --- a/jdk/.md5sum +++ b/jdk/.md5sum @@ -1 +1 @@ -8cf4c4e00744bfafc023d770cb65328c jdk-8u141-linux-x64.tar.gz +2d59a3add1f213cd249a67684d4aeb83 jdk-8u144-linux-x64.tar.gz diff --git a/jdk/.signature b/jdk/.signature index 3c1ec11c9..f0ad3b5db 100644 --- a/jdk/.signature +++ b/jdk/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UWuSOV1duSxUHfXPXsABA/rLGgXvbFRnwWUbi2Kf2Bgn2f9AS2Y+tE7gsVzZHnTkQSZwl5v2EdnQn9Ywzp0YA0= -SHA256 (Pkgfile) = 389403ee93798f98869ace75c9ede7d78639a46507d9ebdb2370e90de7047ee3 +RWSE3ohX2g5d/YGuhF0b0jWfUaNEFFs1YXcdR+b01NyIPNbF2WkFUMerbP/vRcCO/AF+vi73VWOrUhBshNDj9UxwrPLmR1ovswM= +SHA256 (Pkgfile) = 09e88b7b714625c255c6970500651f8280e846ef1f06478d5a3afc8d06b3abc8 SHA256 (.footprint) = 3b87f31edfc7170b2a3eb33b8b9ab0f42bd63ee877bb7ee405506757970b4a66 -SHA256 (jdk-8u141-linux-x64.tar.gz) = 041d5218fbea6cd7e81c8c15e51d0d32911573af2ed69e066787a8dc8a39ba4f +SHA256 (jdk-8u144-linux-x64.tar.gz) = e8a341ce566f32c3d06f6d0f0eeea9a0f434f538d22af949ae58bc86f2eeaae4 diff --git a/jdk/Pkgfile b/jdk/Pkgfile index 7a852dec4..d904155c3 100644 --- a/jdk/Pkgfile +++ b/jdk/Pkgfile @@ -4,7 +4,7 @@ # Packager: Simone Rota, sip at crux dot nu name=jdk -version=1.8.0_141 +version=1.8.0_144 release=1 source=(file:///$name-8u${version##*_}-linux-x64.tar.gz)

1 0

ports/opt (3.3): jre: update to 1.8.0_144
by crux＠crux.nu 27 Jul '17

27 Jul '17

commit b556ec5a25dcc70c8da4626f5f2c9964109f1ab3 Author: Juergen Daubert <jue(a)jue.li> Date: Thu Jul 27 10:23:23 2017 +0200 jre: update to 1.8.0_144 diff --git a/jre/.md5sum b/jre/.md5sum index 6b22777ac..b335dbf7d 100644 --- a/jre/.md5sum +++ b/jre/.md5sum @@ -1 +1 @@ -dfa2de5305b7b7519cf8a581c8d82fb9 jre-8u141-linux-x64.tar.gz +e3808f24d0f588b0c313fa18b50683c6 jre-8u144-linux-x64.tar.gz diff --git a/jre/.signature b/jre/.signature index 8b81ff062..e2905a2b2 100644 --- a/jre/.signature +++ b/jre/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/c076X9NFM3w1ZIa9w1u5wUtnWAfN5vK7u9/QrvPUPguCJwBy3MGFWCbf963qjkzcyenYJ8rxWYZ3ej3IoGuugk= -SHA256 (Pkgfile) = 474b2ddf26ec9ddc8474ac2671141fdcd4633069535c05493cb1e7d112ef7767 +RWSE3ohX2g5d/TxyEZiErTJKV4Z70mC5Wk1NR9EQjkWpiHp9ey8FsyHevpAJI1N6XMXFStg5pDDEHJ6UgUD6HkhE/s4tiQfGpw0= +SHA256 (Pkgfile) = 06b909029eef01713f1eebb878580bdff146d6fffcaa97a2629b264660ba69f3 SHA256 (.footprint) = dc7cde6d890ec3915e294d5023a9c6f5ea54c013bc29339d96644a94d2fd42fb -SHA256 (jre-8u141-linux-x64.tar.gz) = f268b4d20577be86e1d98451a27b59fd0e99aacd7e9ad7eb35abc3ffa2370c4d +SHA256 (jre-8u144-linux-x64.tar.gz) = 4e6e11aad54ae3c716a5607ee88d81f3f1e8b5b23ee474b0272dba351ee9f28a diff --git a/jre/Pkgfile b/jre/Pkgfile index 4e142b5ce..089a03344 100644 --- a/jre/Pkgfile +++ b/jre/Pkgfile @@ -4,7 +4,7 @@ # Packager: Simone Rota, sip at crux dot nu name=jre -version=1.8.0_141 +version=1.8.0_144 release=1 source=(file:///$name-8u${version#*_}-linux-x64.tar.gz)

1 0

ports/opt (3.3): john: switch source to http
by crux＠crux.nu 27 Jul '17

27 Jul '17

commit 382a61970d0e0bc2b9d5049314e9ac5cdd83c3fa Author: Thomas Penteker <tek(a)serverop.de> Date: Thu Jul 27 09:58:36 2017 +0200 john: switch source to http diff --git a/john/.signature b/john/.signature index 60b125bd4..74d60451c 100644 --- a/john/.signature +++ b/john/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/X7IBjQTuPcKnPnF3fbImbWlS3ygz3akspopevD6aoUtv0oDR7+oR1N41GAdJNuBmnsfMSX4zZ3hSWTGcJP2aA0= -SHA256 (Pkgfile) = b18543936363c00a54c77576deae3dcae62b224df84988003ccc6dcad6a978e8 -SHA256 (.footprint) = d1a92e410390b405463562d7928acd54122eb9b1a76033e2ec18d3e27dda471c +RWSE3ohX2g5d/dIyRx0Uvk3/YLUTk0F2mj+ac102LVfn8Qb8AKSFzjE4czNU+5W5I9uuchKyWwIbUA/06d86Olc6BpB7h0FjDgw= +SHA256 (Pkgfile) = 3092f93d33f55e937e304a36781d7774db77ca136ae9b2f02c4e95814db8e920 +SHA256 (.footprint) = de95804b001eda8fc6a8f1f8a35f7c3451303bfb34de55941fefbf56e8b71412 SHA256 (john-1.8.0-jumbo-1.tar.xz) = bac93d025995a051f055adbd7ce2f1975676cac6c74a6c7a3ee4cfdd9c160923 SHA256 (gcc5.patch) = c84d53f4e2b5c15c9ab83aea05d72a7e1492e4f0cb547e0047aa91458851aee5 diff --git a/john/Pkgfile b/john/Pkgfile index d3361c553..626c99e5c 100644 --- a/john/Pkgfile +++ b/john/Pkgfile @@ -6,7 +6,7 @@ name=john version=1.8.0-jumbo-1 release=2 -source=(https://www.openwall.com/$name/j/$name-$version.tar.xz +source=(http://www.openwall.com/$name/j/$name-$version.tar.xz gcc5.patch) build() {

1 0

ports/contrib (3.3): redis: adjust user and group permissions
by crux＠crux.nu 26 Jul '17

26 Jul '17

commit 18f82cd62c5e42f3022cdfd879165cb74d04adc9 Author: Thomas Penteker <tek(a)serverop.de> Date: Thu Jul 27 00:33:53 2017 +0200 redis: adjust user and group permissions diff --git a/redis/.footprint b/redis/.footprint index 5493b485..f9ade3a3 100644 --- a/redis/.footprint +++ b/redis/.footprint @@ -1,7 +1,7 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/redis --rw-r--r-- root/root etc/redis.conf +-rw-r--r-- redis/root etc/redis.conf drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/redis-benchmark @@ -12,4 +12,6 @@ lrwxrwxrwx root/root usr/bin/redis-sentinel -> redis-server -rwxr-xr-x root/root usr/bin/redis-server drwxr-xr-x root/root var/ drwxr-xr-x root/root var/lib/ -drwxr-xr-x root/root var/lib/redis/ +drwxr-xr-x redis/root var/lib/redis/ +drwxr-xr-x root/root var/log/ +-rw-r----- redis/redis var/log/redis.log (EMPTY) diff --git a/redis/.md5sum b/redis/.md5sum index b8821906..301e8061 100644 --- a/redis/.md5sum +++ b/redis/.md5sum @@ -1,3 +1,3 @@ f220ea7468eb87986435d69e9ce080c6 redis-4.0.0.tar.gz -6b7e6b1fe58ec65b1deb15654fb878d3 redis.conf +004bd25639664a5e732a7ec8698fc1f4 redis.conf 28cb4b04d228f88687f3ea85ab0a3c04 redis.rc diff --git a/redis/.signature b/redis/.signature index 89a2bb89..8a32b096 100644 --- a/redis/.signature +++ b/redis/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34o+h5vQMJ6dlQDJjS7MwkJl/n96SiWIBzRpx3/1o4DV2QVVMkkBJgyIWEKzx8HMJREJwZVrF/EG2k6tF/62yA0= -SHA256 (Pkgfile) = c341baae4d2fce9407a2dcb42bfdb2ca3d0a92af58c2f0daf88e4b59998f78d3 -SHA256 (.footprint) = 4387ee19c2f532aa7fe636611e08ecbabbfbfc7f4208ae848786c61493bc81e9 +RWSagIOpLGJF3/2yAT8nYU7LkSrx8hFHITDRnNl+Njn0wQ/1S9z4c62WpqUVqFlk4RfN7AXDI5VAsGS+uKfIFicbjCFWXrbGoAc= +SHA256 (Pkgfile) = b8735557bbf00d491dcc4d4e677645638331f13b39788eb1a3f9443cfe0cf9de +SHA256 (.footprint) = c21eb747e36a5bc027c6f1560b36c4528d5673135a7d228b13009d9a99de969f SHA256 (redis-4.0.0.tar.gz) = d539ae309295721d5c3ed7298939645b6f86ab5d25fdf2a0352ab575c159df2d -SHA256 (redis.conf) = a6562d620f24f680089a27632ae49f4c69ccb3e0232bd65c7da1ec0ecd8f30f9 +SHA256 (redis.conf) = c392fe6bb36ba7970561d97e2214e4a916193c32e12a82d1b8cb2dc12dac377f SHA256 (redis.rc) = 364257ea85d9e71196bdc1621da26b07684366c7030fbdea60b72a603e854a4f diff --git a/redis/Pkgfile b/redis/Pkgfile index 56b702f9..7a43071d 100644 --- a/redis/Pkgfile +++ b/redis/Pkgfile @@ -6,18 +6,19 @@ name=redis version=4.0.0 release=1 -source=( - http://download.redis.io/releases/$name-$version.tar.gz - redis.conf - redis.rc -) +source=(http://download.redis.io/releases/$name-$version.tar.gz redis.conf \ +redis.rc) build() { cd $name-$version/src make make PREFIX=$PKG/usr/ install + install -D -m 755 $SRC/redis.rc $PKG/etc/rc.d/redis - install -D -m 644 $SRC/redis.conf $PKG/etc/redis.conf - install -d -m 755 $PKG/var/lib/redis + install -D -m 644 -o redis $SRC/redis.conf $PKG/etc/redis.conf + install -d -m 755 -o redis $PKG/var/lib/redis + + install -d -m 755 $PKG/var/log + install -m 640 -o redis -g redis /dev/null $PKG/var/log/redis.log } diff --git a/redis/pre-install b/redis/pre-install index a5ef3cb1..aa13d0ca 100755 --- a/redis/pre-install +++ b/redis/pre-install @@ -1,4 +1,5 @@ #!/bin/bash -getent passwd redis || useradd -m -d /var/lib/redis -s /bin/false redis +getent group redis >/dev/null || groupadd -r redis +getent passwd redis || useradd -m -g redis -d /var/lib/redis -s /bin/false redis passwd -l redis diff --git a/redis/redis.conf b/redis/redis.conf index aae4f1c9..ebfc4a1e 100644 --- a/redis/redis.conf +++ b/redis/redis.conf @@ -160,7 +160,7 @@ loglevel notice # Specify the log file name. Also the empty string can be used to force # Redis to log on the standard output. Note that if you use standard # output for logging but daemonize, logs will be sent to /dev/null -logfile "" +logfile "/var/log/redis.log" # To enable logging to the system logger, just set 'syslog-enabled' to yes, # and optionally update the other syslog parameters to suit your needs.

1 0