August 2022 - crux-commits

ports/contrib (3.7): Merge remote-tracking branch 'origin/3.6' into 3.7
by crux＠crux.nu 29 Aug '22

29 Aug '22

commit f07c5005023bb5e1bd41065508250674ce97cd24 Merge: 4b5cd54b8 b677faa5c Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Aug 29 21:56:42 2022 +0200 Merge remote-tracking branch 'origin/3.6' into 3.7

1 0

ports/contrib (3.7): fmt: 9.0.0 -> 9.1.0
by crux＠crux.nu 29 Aug '22

29 Aug '22

commit b677faa5c8ba703869fc6042286ad1a79e0590a3 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Aug 29 21:17:34 2022 +0200 fmt: 9.0.0 -> 9.1.0 diff --git a/fmt/.footprint b/fmt/.footprint index 4dc554033..70016cafe 100644 --- a/fmt/.footprint +++ b/fmt/.footprint @@ -22,7 +22,7 @@ drwxr-xr-x root/root usr/lib/cmake/fmt/ -rw-r--r-- root/root usr/lib/cmake/fmt/fmt-targets-release.cmake -rw-r--r-- root/root usr/lib/cmake/fmt/fmt-targets.cmake lrwxrwxrwx root/root usr/lib/libfmt.so -> libfmt.so.9 -lrwxrwxrwx root/root usr/lib/libfmt.so.9 -> libfmt.so.9.0.0 --rwxr-xr-x root/root usr/lib/libfmt.so.9.0.0 +lrwxrwxrwx root/root usr/lib/libfmt.so.9 -> libfmt.so.9.1.0 +-rwxr-xr-x root/root usr/lib/libfmt.so.9.1.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/fmt.pc diff --git a/fmt/.signature b/fmt/.signature index d6a91ac5e..536e44d99 100644 --- a/fmt/.signature +++ b/fmt/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39G6QmpUZ9SfowktpVERK+iqe1d6Sf2jj9WyilI6efpH3eAJG2twzwqn12iq1xZQXUlWZjtVqPsYkL+xbbMdRQI= -SHA256 (Pkgfile) = 0dbf826755d5f95149296346b58917da995e6b447c776c4dcff722d47dd324d5 -SHA256 (.footprint) = 33e51eebd855a7faed5243917066d010d8073d140104044ecb9c3dcd6d130823 -SHA256 (fmt-9.0.0.tar.gz) = 9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5 +RWSagIOpLGJF3zs79uKRyt5LBPuBClhvPPMo1UY4uRzILxOoeJ6l4/FvGDLDGCmpGYmydVHJx3FsZeQXVYBFzQ/MI1gbgeRswAw= +SHA256 (Pkgfile) = 0986016b521db0e2a237cc5119ae90472f56dd3ac68f23dbb12dcdf0d8a8313f +SHA256 (.footprint) = 81ef7c3e05605d64e0ae7a14206d8d4a6ff8a3f4585d3864936b65b4330eaa71 +SHA256 (fmt-9.1.0.tar.gz) = 5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2 diff --git a/fmt/Pkgfile b/fmt/Pkgfile index 0fda85dca..4b34fb01f 100644 --- a/fmt/Pkgfile +++ b/fmt/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cmake name=fmt -version=9.0.0 +version=9.1.0 release=1 source=(https://github.com/fmtlib/$name/archive/$version/$name-$version.tar…

1 0

ports/contrib (3.7): fzf: 0.32.1 -> 0.33.0
by crux＠crux.nu 29 Aug '22

29 Aug '22

commit cebe61827699e3c864de47e999d0cde5dd6d2653 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Aug 29 21:13:49 2022 +0200 fzf: 0.32.1 -> 0.33.0 diff --git a/fzf/.signature b/fzf/.signature index 5113a5e3e..107f45fd3 100644 --- a/fzf/.signature +++ b/fzf/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30Iqw3jeZquXHuGrh7/FGuxzOAnMC4cv4mq+9SXIrROtvVjeYTeKNqqrI6GNBaxMpf4VxrMsSblbFi5hbTfWGAs= -SHA256 (Pkgfile) = 562cd7dcadb8e6fc69ff590e639bd05eab72675367dfa23016bdb96a8b8a6f06 +RWSagIOpLGJF3zBpVsU5pgUWz5bA4FNHJDErqwhv9dvF3G9Y7gcb9Fv/AyAOh9lpB9xzuzaxrSjxwcRyVXk6B9NZIlw4Anpo3w4= +SHA256 (Pkgfile) = bb3cf19ea58603b1cfba584fd4a07d554fccea108e1a815f22abf49de59479e8 SHA256 (.footprint) = 5d7cb1a988f2706d89669ef1113301b38cbaabf008f44f1440bd21815df50311 -SHA256 (fzf-0.32.1.tar.gz) = c7afef61553b3b3e4e02819c5d560fa4acf33ecb39829aeba392c2e05457ca6a +SHA256 (fzf-0.33.0.tar.gz) = 136ddddfdb229631b08ea7e67be965bcf9c95f5fe1360b80b11f81aa64ba19ad diff --git a/fzf/Pkgfile b/fzf/Pkgfile index 6bb037b53..5a53bea92 100644 --- a/fzf/Pkgfile +++ b/fzf/Pkgfile @@ -4,7 +4,7 @@ # Depends on: go name=fzf -version=0.32.1 +version=0.33.0 release=1 source=(https://github.com/junegunn/fzf/archive/$version/$name-$version.tar…

1 0

ports/contrib (3.7): pandoc-bin: 2.19.1 -> 2.19.2
by crux＠crux.nu 29 Aug '22

29 Aug '22

commit 1bb9a70d2556ad307b6d073b3ee7a51683bfcf9d Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Aug 29 21:02:53 2022 +0200 pandoc-bin: 2.19.1 -> 2.19.2 diff --git a/pandoc-bin/.signature b/pandoc-bin/.signature index 054d3d174..c5fe26e17 100644 --- a/pandoc-bin/.signature +++ b/pandoc-bin/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zLsoiM7dduDepDyT1TjNAEVkYoFqAY4tDcN3Us2INwHpDpa5mtGZ0aZ6RLB+UjNpSNhXkxtRDfH3yLGiwr+wgs= -SHA256 (Pkgfile) = bbe175c86d23266a4abb13967994a63d763905c8e7c8d01ef57fcb9d3ca030b0 +RWSagIOpLGJF3wN1Z8qWZdAsjxpSpQM1jQ5SiSHRRXvJ1iiRZ3vDonTE6fKmmY8MlVfys0qyTiN/mvirJS1hg+IO4VJ7sDHwBws= +SHA256 (Pkgfile) = e097c6cee5a56e1f69da95ecd1a66b450471308de1196475f772b175fbef3684 SHA256 (.footprint) = a7a0a4b72813683513d4d9c47b958c94644e82b29d76cf9bb874fce10ee07de3 -SHA256 (pandoc-2.19.1-linux-amd64.tar.gz) = e5dd4f533c616b246a979de1d3c16c87b460b28ff371e3993157301a18b2063f -SHA256 (pandoc-2.19.1.tar.gz) = 14214d277dc85411296ab800088e8bcb0cb6d77a5c019a0fabdeb5fe849bc13c +SHA256 (pandoc-2.19.2-linux-amd64.tar.gz) = 9d55c7afb6a244e8a615451ed9cb02e6a6f187ad4d169c6d5a123fa74adb4830 +SHA256 (pandoc-2.19.2.tar.gz) = 5cebed5bfa8daa8c3f7ba0c29b0c84b36fd279bdcd25891d3ae9843fa2c98592 diff --git a/pandoc-bin/Pkgfile b/pandoc-bin/Pkgfile index ec4c7d7d5..614fb7a62 100644 --- a/pandoc-bin/Pkgfile +++ b/pandoc-bin/Pkgfile @@ -5,7 +5,7 @@ # Optional: texlive name=pandoc-bin -version=2.19.1 +version=2.19.2 release=1 source=(https://github.com/jgm/pandoc/releases/download/$version/pandoc-$ve… https://github.com/jgm/pandoc/archive/$version/pandoc-$version.tar.gz)

1 0

ports/contrib (3.7): p5-exporter-tiny: 1.002002 -> 1.004000
by crux＠crux.nu 29 Aug '22

29 Aug '22

commit b93724f8a90827d602f9aa3a943379b857e065a6 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Aug 29 21:02:01 2022 +0200 p5-exporter-tiny: 1.002002 -> 1.004000 diff --git a/p5-exporter-tiny/.signature b/p5-exporter-tiny/.signature index 00327df2d..0e53214e2 100644 --- a/p5-exporter-tiny/.signature +++ b/p5-exporter-tiny/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38sKfjbyyBEijyeqTQqb48tvC7+RPn8Tuym8kvhEG7mTYloYVobDDqwGtcc+rBy1ZeG2qS0PLu6G/SjktvN8gwU= -SHA256 (Pkgfile) = 7b034d932836ab36dac9089d86440e187ef59e3fde4baa3162b80b4bc4b2c83a +RWSagIOpLGJF35ngcReVvvNs+9wpd+9h0w99/ONcN5nFl2vMpsYq9zCGBoXxcVFbunGuNlSjU1US1q197Hw7Db9l7UjZ/ZR1IQs= +SHA256 (Pkgfile) = e7020022fa57714866ff0499c57fcad9110c84f7948050e559cba8ca16467956 SHA256 (.footprint) = b29d123bf89801d1ffb1836b2772fd23bd615a947fc333b898fa95289184cc06 -SHA256 (Exporter-Tiny-1.002002.tar.gz) = 00f0b95716b18157132c6c118ded8ba31392563d19e490433e9a65382e707101 +SHA256 (Exporter-Tiny-1.004000.tar.gz) = 7f7b3b4fbe923355317243cd434d2319ffbad81c98cf8c8e189a6943b42bfeca diff --git a/p5-exporter-tiny/Pkgfile b/p5-exporter-tiny/Pkgfile index 728eb4dbe..bcf52259b 100644 --- a/p5-exporter-tiny/Pkgfile +++ b/p5-exporter-tiny/Pkgfile @@ -4,7 +4,7 @@ # Depends on: name=p5-exporter-tiny -version=1.002002 +version=1.004000 release=1 source=(https://cpan.metacpan.org/authors/id/T/TO/TOBYINK/Exporter-Tiny-$ve…

1 0

ports/contrib (3.7): protontricks: 1.9.0 -> 1.9.1
by crux＠crux.nu 29 Aug '22

29 Aug '22

commit 1de4d164eafe202db9936a8f2cda3d75e38f0192 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Aug 29 21:01:19 2022 +0200 protontricks: 1.9.0 -> 1.9.1 diff --git a/protontricks/.footprint b/protontricks/.footprint index f1cdd8f0a..201c6b42b 100644 --- a/protontricks/.footprint +++ b/protontricks/.footprint @@ -6,13 +6,13 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.9/ drwxr-xr-x root/root usr/lib/python3.9/site-packages/ -drwxr-xr-x root/root usr/lib/python3.9/site-packages/protontricks-1.9.0-py3.9.egg-info/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/protontricks-1.9.0-py3.9.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.9/site-packages/protontricks-1.9.0-py3.9.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/protontricks-1.9.0-py3.9.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/protontricks-1.9.0-py3.9.egg-info/entry_points.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/protontricks-1.9.0-py3.9.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/protontricks-1.9.0-py3.9.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python3.9/site-packages/protontricks-1.9.1-py3.9.egg-info/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/protontricks-1.9.1-py3.9.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.9/site-packages/protontricks-1.9.1-py3.9.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/protontricks-1.9.1-py3.9.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/protontricks-1.9.1-py3.9.egg-info/entry_points.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/protontricks-1.9.1-py3.9.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/protontricks-1.9.1-py3.9.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python3.9/site-packages/protontricks/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/protontricks/__init__.py drwxr-xr-x root/root usr/lib/python3.9/site-packages/protontricks/__pycache__/ diff --git a/protontricks/.signature b/protontricks/.signature index 9084de978..37ef41d98 100644 --- a/protontricks/.signature +++ b/protontricks/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38gUHWLyxPXkNhkDgohTg8rITPV+AHLt1mVfBa98NJ+/i1n1kPQafYA14cyLdIdSceWxp4TQ/LuXOh3oeEsGDgA= -SHA256 (Pkgfile) = 588c78a6a20ecd98fcff9fcec7f59cda35c25ccd789466fe19eae1c981cb1df3 -SHA256 (.footprint) = 4dc5f5beaee16003334e77c472ad5e6d4a89cb12f98bfd0daee74e7cfd0bce33 -SHA256 (protontricks-1.9.0.tar.gz) = e1d76743e5cc0ccdd2a8facf02e3a7330041dac31c853b1162f0425ec692572e +RWSagIOpLGJF3xx/Qa9PS1aoTlm/WFeK9bdtRQqWMbDrhGIdRX+Jf1a4mtvsE04ZwfV/+ZAoVounllcDgF6rLVRQ3g+t/3opIAU= +SHA256 (Pkgfile) = 228aeba8e4d9689805717ac10172adbe6fc5669f059fae14bcb9f159a17a2043 +SHA256 (.footprint) = 9dc144cfc394b2719dda18999d91820945deee7c6b71081d552f675b747ac997 +SHA256 (protontricks-1.9.1.tar.gz) = 0e73b37497bc33ae20c410ec048a0b3c46a06a6e6f934398f3fdf7d409b51bd5 diff --git a/protontricks/Pkgfile b/protontricks/Pkgfile index 88afcb084..55ec0102b 100644 --- a/protontricks/Pkgfile +++ b/protontricks/Pkgfile @@ -5,7 +5,7 @@ # Optional: zenity name=protontricks -version=1.9.0 +version=1.9.1 release=1 source=(https://files.pythonhosted.org/packages/source/${name:0:1}/$name/$n…

1 0

ports/contrib (3.7): texlab: 4.2.1 -> 4.2.2
by crux＠crux.nu 29 Aug '22

29 Aug '22

commit 8f864604b5300d0a1ad220ab1e40cd59b0660d2d Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Aug 29 21:00:21 2022 +0200 texlab: 4.2.1 -> 4.2.2 diff --git a/texlab/.signature b/texlab/.signature index ad2c44ee9..48200f3df 100644 --- a/texlab/.signature +++ b/texlab/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36gSh5WdcU2TUpZWm4QTuxMgcvCGb6SaxbtNCclobUp/HpqjB48NLpdxKSCcJM+n8PtSj6CT/hSZ/KPiWUlNwws= -SHA256 (Pkgfile) = 796d2d2f2ce6073de764276ab098165d4c1fce2c3e10ee9e1d091d7e57f4e19c +RWSagIOpLGJF3zV8xNDXeE/5mA0pL6kBIR5wWsi947RGXdScmfgP8uBgVNQA0AnwXd4GZQ2Wnjko18K+yf+3EKRyB9bRqtf4igs= +SHA256 (Pkgfile) = 347100040aa8d0920b192bf33a79ed4f92b30d2a5460665064112d59ac4056ae SHA256 (.footprint) = e269bf06cd399613cb5e2df75070c5210b53277a4c1478d41543e6c58a533387 -SHA256 (texlab-4.2.1.tar.gz) = 5333487e31c6b21fc9a4b351de844fc11626452b98d6413d9f5bc620aa5a0966 +SHA256 (texlab-4.2.2.tar.gz) = db5426766c7d9f23fb269fa27c725af459728a3d3a1b0642dc823fb7b26a8f93 diff --git a/texlab/Pkgfile b/texlab/Pkgfile index aa76466e5..d4634a777 100644 --- a/texlab/Pkgfile +++ b/texlab/Pkgfile @@ -4,7 +4,7 @@ # Depends on: rust name=texlab -version=4.2.1 +version=4.2.2 release=1 source=(https://github.com/latex-lsp/texlab/archive/v$version/$name-$versio…

1 0

ports/opt (3.7): rust: fixed build with glibc 2.36
by crux＠crux.nu 29 Aug '22

29 Aug '22

commit a77aec10ea3917a06a64007f3a5832c82209a045 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Aug 29 21:39:57 2022 +0200 rust: fixed build with glibc 2.36 diff --git a/rust/.signature b/rust/.signature index e92828bee..1db93cdee 100644 --- a/rust/.signature +++ b/rust/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SjYTIUpASwTp7N8dRuPhuyXhvyuQs3mMfOnyL+wBqQKAj8XGOOfZ81Gq45Ey6nHLjqxRs73Xih9TKk5zXoghgQ= -SHA256 (Pkgfile) = 9089bbeea5d3b308dd775cf96a97ddb9af196229eced2bb1307577da5e728929 +RWSE3ohX2g5d/fit3IJTJMmnd3pUIDms4XB+8bunFIGNbsm5avI4iKy+N135ciMJBfo3DDvTDj8bYYk6Q1aLZ4LDV6mJgnWO8QI= +SHA256 (Pkgfile) = 88ae65e99b8c1cef868978811efc6f4f1fb8e4a226b6f84874588f21dd08d1f1 SHA256 (.footprint) = 61127f3edf08faf27f567db548c7cfc2fb6a4c3ae3da2e26c2e641272697efe3 SHA256 (rustc-1.63.0-src.tar.xz) = 8f44af6dc44cc4146634a4dd5e4cc5470b3052a2337019b870c0e025e8987e0c SHA256 (rust-std-1.62.0-x86_64-unknown-linux-gnu.tar.xz) = addfae87b6b1b521d98a50fdc5120990888a51bb397100062e9c558267c67c77 @@ -9,3 +9,4 @@ SHA256 (cargo-1.62.0-x86_64-unknown-linux-gnu.tar.xz) = 815c63119a9cf0282ff240c6 SHA256 (0001-bootstrap-Change-libexec-dir.patch) = 60c6dfc100d292284af2187cfefc1d0d928139ca557d27bc6bef88edefccff70 SHA256 (0001-cargo-Change-libexec-dir.patch) = c901a9bb036c29ca092f7dbc8b447efdd9aa1044a902a88f9d024cb22681dc19 SHA256 (0002-compiler-Change-LLVM-targets.patch) = 8dcb566da29a92ecf3eb6afe094d9c7766d08230d90fd666bfd022c018ae676a +SHA256 (remove-include-linux-fs.h.patch) = 34ed866e313e4580130a50118a4410d36fa0159123982521b6ef049439fc32ad diff --git a/rust/Pkgfile b/rust/Pkgfile index 6ce70f67e..b026265df 100644 --- a/rust/Pkgfile +++ b/rust/Pkgfile @@ -9,7 +9,7 @@ version=1.63.0 _date=2022-06-30 _rustc=1.62.0 _cargo=$_rustc -release=1 +release=2 source=(https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz https://static.rust-lang.org/dist/$_date/rust-std-$_rustc-x86_64-unknown-li… @@ -17,7 +17,8 @@ source=(https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux… 0001-bootstrap-Change-libexec-dir.patch 0001-cargo-Change-libexec-dir.patch - 0002-compiler-Change-LLVM-targets.patch) + 0002-compiler-Change-LLVM-targets.patch + remove-include-linux-fs.h.patch) unpack_source() { for file in ${source[@]}; do @@ -69,6 +70,8 @@ build() { # Use our *-pc-linux-gnu targets, making LTO with clang simpler patch -p1 -i $SRC/0002-compiler-Change-LLVM-targets.patch + patch -p1 -d src/llvm-project -i $SRC/remove-include-linux-fs.h.patch + cat <<- EOF > $SRC/config.toml changelog-seen = 2 diff --git a/rust/remove-include-linux-fs.h.patch b/rust/remove-include-linux-fs.h.patch new file mode 100644 index 000000000..bbf0d0e7c --- /dev/null +++ b/rust/remove-include-linux-fs.h.patch @@ -0,0 +1,59 @@ +From 9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 Mon Sep 17 00:00:00 2001 +From: Fangrui Song <i(a)maskray.me> +Date: Mon, 11 Jul 2022 12:53:34 -0700 +Subject: [PATCH] [sanitizer] Remove #include <linux/fs.h> to resolve + fsconfig_command/mount_attr conflict with glibc 2.36 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It is generally not a good idea to mix usage of glibc headers and Linux UAPI +headers (https://sourceware.org/glibc/wiki/Synchronizing_Headers) In glibc +since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mount.h +defines `fsconfig_command` which conflicts with linux/mount.h: + + .../usr/include/linux/mount.h:95:6: error: redeclaration of ‘enum fsconfig_command’ + +Remove #include <linux/fs.h> which pulls in linux/mount.h. Expand its 4 macros manually. +Android sys/mount.h doesn't define BLKBSZGET and it still needs linux/fs.h. +In the long term we should move Linux specific definitions to sanitizer_platform_limits_linux.cpp +but this commit is easy to cherry pick into older compiler-rt releases. + +Fix https://github.com/llvm/llvm-project/issues/56421 + +Reviewed By: #sanitizers, vitalybuka, zatrazz + +Differential Revision: https://reviews.llvm.org/D129471 +--- + .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +index 4bd425435d56..3a94b260686f 100644 +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -73,7 +73,9 @@ + #include <sys/vt.h> + #include <linux/cdrom.h> + #include <linux/fd.h> ++#if SANITIZER_ANDROID + #include <linux/fs.h> ++#endif + #include <linux/hdreg.h> + #include <linux/input.h> + #include <linux/ioctl.h> +@@ -876,10 +878,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; + unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; + #endif +- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; +- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; +- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; +- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; ++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); ++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); ++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); ++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); + unsigned IOCTL_GIO_CMAP = GIO_CMAP; + unsigned IOCTL_GIO_FONT = GIO_FONT; + unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;

1 0

ports/opt (3.7): compiler-rt: fixed build with glibc 2.36
by crux＠crux.nu 29 Aug '22

29 Aug '22

commit d4535a8e85bacc910cee3697f561516d94f2fda6 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Aug 29 21:39:30 2022 +0200 compiler-rt: fixed build with glibc 2.36 diff --git a/compiler-rt/.signature b/compiler-rt/.signature index 700e235bd..af52b55e0 100644 --- a/compiler-rt/.signature +++ b/compiler-rt/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Wn10Bd5ZbEbYPIVv+vUm7WMbjtlhjDo7XMygjEn6IhwX6H1p9+UGSabVrkF7dNcUMUiDSfianS0BJ5X5+DaKQY= -SHA256 (Pkgfile) = ae6a0715e255e31ce2e541aa30107fea1a2bd862e17c4aeef921ccb2980a5925 +RWSE3ohX2g5d/RBIqbMellbvf3kEMZy71sCGGoRqiGTymm2tIPu5IH8fxKTiVrj940mq1ooAvZ5qeQ9dJAzZA4aVQbtDqJeHHg0= +SHA256 (Pkgfile) = 9b9e3fbb888330e82d12306dc0b518cc696873c8550d2b98e673e2bc79764b1b SHA256 (.footprint) = 2421128b93df5d76f55064359aa22646c579fab8d426d41ac5722e00335624b3 SHA256 (compiler-rt-14.0.6.src.tar.xz) = 88df303840ca8fbff944e15e61c141226fe79f5d2b8e89fb024264d77841a02e SHA256 (llvm-14.0.6.src.tar.xz) = 050922ecaaca5781fdf6631ea92bc715183f202f9d2f15147226f023414f619a +SHA256 (remove-include-linux-fs.h.patch) = 34ed866e313e4580130a50118a4410d36fa0159123982521b6ef049439fc32ad diff --git a/compiler-rt/Pkgfile b/compiler-rt/Pkgfile index 40b8dab27..19c6af8d8 100644 --- a/compiler-rt/Pkgfile +++ b/compiler-rt/Pkgfile @@ -5,13 +5,15 @@ name=compiler-rt version=14.0.6 -release=1 +release=2 source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$ver… - https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llv…) - + https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llv… + remove-include-linux-fs.h.patch) build() { mv llvm-$version.src llvm + patch -Np2 -d $name-$version.src -i $SRC/remove-include-linux-fs.h.patch + cmake -S $name-$version.src -B build -G Ninja \ -D CMAKE_INSTALL_PREFIX=/usr \ -D COMPILER_RT_INSTALL_PATH=/usr/lib/clang/$version \ diff --git a/compiler-rt/remove-include-linux-fs.h.patch b/compiler-rt/remove-include-linux-fs.h.patch new file mode 100644 index 000000000..bbf0d0e7c --- /dev/null +++ b/compiler-rt/remove-include-linux-fs.h.patch @@ -0,0 +1,59 @@ +From 9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 Mon Sep 17 00:00:00 2001 +From: Fangrui Song <i(a)maskray.me> +Date: Mon, 11 Jul 2022 12:53:34 -0700 +Subject: [PATCH] [sanitizer] Remove #include <linux/fs.h> to resolve + fsconfig_command/mount_attr conflict with glibc 2.36 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It is generally not a good idea to mix usage of glibc headers and Linux UAPI +headers (https://sourceware.org/glibc/wiki/Synchronizing_Headers) In glibc +since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mount.h +defines `fsconfig_command` which conflicts with linux/mount.h: + + .../usr/include/linux/mount.h:95:6: error: redeclaration of ‘enum fsconfig_command’ + +Remove #include <linux/fs.h> which pulls in linux/mount.h. Expand its 4 macros manually. +Android sys/mount.h doesn't define BLKBSZGET and it still needs linux/fs.h. +In the long term we should move Linux specific definitions to sanitizer_platform_limits_linux.cpp +but this commit is easy to cherry pick into older compiler-rt releases. + +Fix https://github.com/llvm/llvm-project/issues/56421 + +Reviewed By: #sanitizers, vitalybuka, zatrazz + +Differential Revision: https://reviews.llvm.org/D129471 +--- + .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +index 4bd425435d56..3a94b260686f 100644 +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -73,7 +73,9 @@ + #include <sys/vt.h> + #include <linux/cdrom.h> + #include <linux/fd.h> ++#if SANITIZER_ANDROID + #include <linux/fs.h> ++#endif + #include <linux/hdreg.h> + #include <linux/input.h> + #include <linux/ioctl.h> +@@ -876,10 +878,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; + unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; + #endif +- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; +- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; +- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; +- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; ++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); ++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); ++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); ++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); + unsigned IOCTL_GIO_CMAP = GIO_CMAP; + unsigned IOCTL_GIO_FONT = GIO_FONT; + unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;

1 0

ports/contrib (3.6): fmt: 9.0.0 -> 9.1.0
by crux＠crux.nu 29 Aug '22

29 Aug '22

commit b677faa5c8ba703869fc6042286ad1a79e0590a3 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Aug 29 21:17:34 2022 +0200 fmt: 9.0.0 -> 9.1.0 diff --git a/fmt/.footprint b/fmt/.footprint index 4dc554033..70016cafe 100644 --- a/fmt/.footprint +++ b/fmt/.footprint @@ -22,7 +22,7 @@ drwxr-xr-x root/root usr/lib/cmake/fmt/ -rw-r--r-- root/root usr/lib/cmake/fmt/fmt-targets-release.cmake -rw-r--r-- root/root usr/lib/cmake/fmt/fmt-targets.cmake lrwxrwxrwx root/root usr/lib/libfmt.so -> libfmt.so.9 -lrwxrwxrwx root/root usr/lib/libfmt.so.9 -> libfmt.so.9.0.0 --rwxr-xr-x root/root usr/lib/libfmt.so.9.0.0 +lrwxrwxrwx root/root usr/lib/libfmt.so.9 -> libfmt.so.9.1.0 +-rwxr-xr-x root/root usr/lib/libfmt.so.9.1.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/fmt.pc diff --git a/fmt/.signature b/fmt/.signature index d6a91ac5e..536e44d99 100644 --- a/fmt/.signature +++ b/fmt/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39G6QmpUZ9SfowktpVERK+iqe1d6Sf2jj9WyilI6efpH3eAJG2twzwqn12iq1xZQXUlWZjtVqPsYkL+xbbMdRQI= -SHA256 (Pkgfile) = 0dbf826755d5f95149296346b58917da995e6b447c776c4dcff722d47dd324d5 -SHA256 (.footprint) = 33e51eebd855a7faed5243917066d010d8073d140104044ecb9c3dcd6d130823 -SHA256 (fmt-9.0.0.tar.gz) = 9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5 +RWSagIOpLGJF3zs79uKRyt5LBPuBClhvPPMo1UY4uRzILxOoeJ6l4/FvGDLDGCmpGYmydVHJx3FsZeQXVYBFzQ/MI1gbgeRswAw= +SHA256 (Pkgfile) = 0986016b521db0e2a237cc5119ae90472f56dd3ac68f23dbb12dcdf0d8a8313f +SHA256 (.footprint) = 81ef7c3e05605d64e0ae7a14206d8d4a6ff8a3f4585d3864936b65b4330eaa71 +SHA256 (fmt-9.1.0.tar.gz) = 5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2 diff --git a/fmt/Pkgfile b/fmt/Pkgfile index 0fda85dca..4b34fb01f 100644 --- a/fmt/Pkgfile +++ b/fmt/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cmake name=fmt -version=9.0.0 +version=9.1.0 release=1 source=(https://github.com/fmtlib/$name/archive/$version/$name-$version.tar…

1 0