September 2022 - crux-commits

ports/contrib (3.7): lxc: fixed build with glibc 2.36
by crux＠crux.nu 24 Sep '22

24 Sep '22

commit aff0581d7d04f53213295408e2aa89166c9ecb17 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Sep 24 14:14:37 2022 +0200 lxc: fixed build with glibc 2.36 diff --git a/lxc/.signature b/lxc/.signature index d6bd02de2..03d8ecd70 100644 --- a/lxc/.signature +++ b/lxc/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33eTZyOE+gOloyzmgN2loJX7jRCISYECo1GNcwWuT6TmjVW7CpeduEbGDqmjzQcCUPIqdIBiBsaro1NFIdgjmwQ= -SHA256 (Pkgfile) = 986dc202bed69cddbc80cf07031626b005b70265987569b4cc1cd8047d2b0a1a +RWSagIOpLGJF3zn49iBgATR2o1O01tEi/hRJ+U5zOeqyVLie+rM6QrihqOguk4PGwi9ogrBNaTQ4iaKDxSSO5ds1TGjYTuysKQQ= +SHA256 (Pkgfile) = 0c7853ce2be894d164e2625e5916f3ff2ede90323ce2c19a4295fd7c65b40f2b SHA256 (.footprint) = c5c5ea11f58282ae02e7c37ce978aa60ca0c2450ce7e04f7f066b8b0b5a17a5c SHA256 (lxc-5.0.1.tar.gz) = d8195423bb1e206f8521d24b6cde4789f043960c7cf065990a9cf741dcfd4222 SHA256 (default.conf) = 6739fe54ffe7924a63fd47d8ff4b453e08b78bbd1b08e4426504b8f740e8b55f @@ -9,4 +9,5 @@ SHA256 (lxc-users-setup) = 995f72d2284334ab84790951cfbf91d9b7016f4a93a3c51d774de SHA256 (lxc-users) = 7b58fae4b1551c63d7839560875e4f8461aade852f33611a8a8319957f23b0eb SHA256 (lxc-cgroups) = 6cdc6b76c438dfbcacf7ccd20ae9190ca5d12bad9fba60c5d77052c0e3f9258b SHA256 (lxc-net) = 4e597a3ebb896ff852d54d4add562945bcf91e1005f3963ee7cbfc82606fcf2c +SHA256 (4179.patch) = f209df0491ebd2835ef03cfc785c4441b2d3a5065c036e97105375a654380b39 SHA256 (02-distrosysconfdir.patch) = 43aab13e0c9f1e2b640d5da4b112c0f965bf62e9afc9d0c20ed4a6ed4e6b61c6 diff --git a/lxc/4179.patch b/lxc/4179.patch new file mode 100644 index 000000000..e186c7fbb --- /dev/null +++ b/lxc/4179.patch @@ -0,0 +1,383 @@ +From c1115e1503bf955c97f4cf3b925a6a9f619764c3 Mon Sep 17 00:00:00 2001 +From: Christian Brauner <brauner(a)kernel.org> +Date: Tue, 9 Aug 2022 16:14:25 +0200 +Subject: [PATCH 1/3] build: detect where struct mount_attr is declared + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) <christian.brauner(a)ubuntu.com> +--- + meson.build | 30 ++++++++++++++++++++++++++++-- + src/lxc/conf.c | 6 +++--- + src/lxc/conf.h | 2 +- + src/lxc/mount_utils.c | 6 +++--- + src/lxc/syscall_wrappers.h | 12 ++++++++++-- + 5 files changed, 45 insertions(+), 11 deletions(-) + +diff --git a/meson.build b/meson.build +index a145faf069..f679aabbc8 100644 +--- a/meson.build ++++ b/meson.build +@@ -590,7 +590,6 @@ decl_headers = ''' + foreach decl: [ + '__aligned_u64', + 'struct clone_args', +- 'struct mount_attr', + 'struct open_how', + 'struct rtnl_link_stats64', + ] +@@ -610,7 +609,6 @@ foreach tuple: [ + ['struct seccomp_notif_sizes'], + ['struct clone_args'], + ['__aligned_u64'], +- ['struct mount_attr'], + ['struct open_how'], + ['struct rtnl_link_stats64'], + ] +@@ -630,6 +628,34 @@ foreach tuple: [ + endif + endforeach + ++## Types. ++decl_headers = ''' ++#include <sys/mount.h> ++''' ++ ++# We get -1 if the size cannot be determined ++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 ++ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), true) ++ found_types += 'struct mount_attr (sys/mount.h)' ++else ++ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) ++ missing_types += 'struct mount_attr (sys/mount.h)' ++endif ++ ++## Types. ++decl_headers = ''' ++#include <linux/mount.h> ++''' ++ ++# We get -1 if the size cannot be determined ++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 ++ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), true) ++ found_types += 'struct mount_attr (linux/mount.h)' ++else ++ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), false) ++ missing_types += 'struct mount_attr (linux/mount.h)' ++endif ++ + ## Headers. + foreach ident: [ + ['bpf', '''#include <sys/syscall.h> +diff --git a/src/lxc/conf.c b/src/lxc/conf.c +index ffbe74c2f6..4193cd07f5 100644 +--- a/src/lxc/conf.c ++++ b/src/lxc/conf.c +@@ -2885,7 +2885,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) + struct lxc_mount_options opts = {}; + int dfd_from; + const char *source_relative, *target_relative; +- struct lxc_mount_attr attr = {}; ++ struct mount_attr attr = {}; + + ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts); + if (ret < 0) +@@ -3005,7 +3005,7 @@ static int __lxc_idmapped_mounts_child(struct lxc_handler *handler, FILE *f) + + /* Set propagation mount options. */ + if (opts.attr.propagation) { +- attr = (struct lxc_mount_attr) { ++ attr = (struct mount_attr) { + .propagation = opts.attr.propagation, + }; + +@@ -4109,7 +4109,7 @@ int lxc_idmapped_mounts_parent(struct lxc_handler *handler) + + for (;;) { + __do_close int fd_from = -EBADF, fd_userns = -EBADF; +- struct lxc_mount_attr attr = {}; ++ struct mount_attr attr = {}; + struct lxc_mount_options opts = {}; + ssize_t ret; + +diff --git a/src/lxc/conf.h b/src/lxc/conf.h +index 7dc2f15b60..772479f9e1 100644 +--- a/src/lxc/conf.h ++++ b/src/lxc/conf.h +@@ -223,7 +223,7 @@ struct lxc_mount_options { + unsigned long mnt_flags; + unsigned long prop_flags; + char *data; +- struct lxc_mount_attr attr; ++ struct mount_attr attr; + char *raw_options; + }; + +diff --git a/src/lxc/mount_utils.c b/src/lxc/mount_utils.c +index bba75f933c..88dd73ee36 100644 +--- a/src/lxc/mount_utils.c ++++ b/src/lxc/mount_utils.c +@@ -31,7 +31,7 @@ lxc_log_define(mount_utils, lxc); + * setting in @attr_set, but must also specify MOUNT_ATTR__ATIME in the + * @attr_clr field. + */ +-static inline void set_atime(struct lxc_mount_attr *attr) ++static inline void set_atime(struct mount_attr *attr) + { + switch (attr->attr_set & MOUNT_ATTR__ATIME) { + case MOUNT_ATTR_RELATIME: +@@ -272,7 +272,7 @@ int create_detached_idmapped_mount(const char *path, int userns_fd, + { + __do_close int fd_tree_from = -EBADF; + unsigned int open_tree_flags = OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC; +- struct lxc_mount_attr attr = { ++ struct mount_attr attr = { + .attr_set = MOUNT_ATTR_IDMAP | attr_set, + .attr_clr = attr_clr, + .userns_fd = userns_fd, +@@ -335,7 +335,7 @@ int __fd_bind_mount(int dfd_from, const char *path_from, __u64 o_flags_from, + __u64 attr_clr, __u64 propagation, int userns_fd, + bool recursive) + { +- struct lxc_mount_attr attr = { ++ struct mount_attr attr = { + .attr_set = attr_set, + .attr_clr = attr_clr, + .propagation = propagation, +diff --git a/src/lxc/syscall_wrappers.h b/src/lxc/syscall_wrappers.h +index a5e98b565c..c8a7d0c7b7 100644 +--- a/src/lxc/syscall_wrappers.h ++++ b/src/lxc/syscall_wrappers.h +@@ -18,6 +18,12 @@ + #include "macro.h" + #include "syscall_numbers.h" + ++#if HAVE_STRUCT_MOUNT_ATTR ++#include <sys/mount.h> ++#elif HAVE_UAPI_STRUCT_MOUNT_ATTR ++#include <linux/mount.h> ++#endif ++ + #ifdef HAVE_LINUX_MEMFD_H + #include <linux/memfd.h> + #endif +@@ -210,16 +216,18 @@ extern int fsmount(int fs_fd, unsigned int flags, unsigned int attr_flags); + /* + * mount_setattr() + */ +-struct lxc_mount_attr { ++#if !HAVE_STRUCT_MOUNT_ATTR && !HAVE_UAPI_STRUCT_MOUNT_ATTR ++struct mount_attr { + __u64 attr_set; + __u64 attr_clr; + __u64 propagation; + __u64 userns_fd; + }; ++#endif + + #if !HAVE_MOUNT_SETATTR + static inline int mount_setattr(int dfd, const char *path, unsigned int flags, +- struct lxc_mount_attr *attr, size_t size) ++ struct mount_attr *attr, size_t size) + { + return syscall(__NR_mount_setattr, dfd, path, flags, attr, size); + } + +From ef1e0607b82e27350c2d677d649c6a0a9693fd40 Mon Sep 17 00:00:00 2001 +From: Christian Brauner <brauner(a)kernel.org> +Date: Tue, 9 Aug 2022 16:27:40 +0200 +Subject: [PATCH 2/3] build: detect sys/pidfd.h availability + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) <christian.brauner(a)ubuntu.com> +--- + meson.build | 1 + + src/lxc/process_utils.h | 6 ++++++ + 2 files changed, 7 insertions(+) + +diff --git a/meson.build b/meson.build +index f679aabbc8..e999542336 100644 +--- a/meson.build ++++ b/meson.build +@@ -735,6 +735,7 @@ foreach tuple: [ + ['sys/resource.h'], + ['sys/memfd.h'], + ['sys/personality.h'], ++ ['sys/pidfd.h'], + ['sys/signalfd.h'], + ['sys/timerfd.h'], + ['pty.h'], +diff --git a/src/lxc/process_utils.h b/src/lxc/process_utils.h +index 9c15b15741..ed84741d0e 100644 +--- a/src/lxc/process_utils.h ++++ b/src/lxc/process_utils.h +@@ -15,6 +15,10 @@ + #include <sys/syscall.h> + #include <unistd.h> + ++#if HAVE_SYS_PIDFD_H ++#include <sys/pidfd.h> ++#endif ++ + #include "compiler.h" + #include "syscall_numbers.h" + +@@ -136,9 +140,11 @@ + #endif + + /* waitid */ ++#if !HAVE_SYS_PIDFD_H + #ifndef P_PIDFD + #define P_PIDFD 3 + #endif ++#endif + + #ifndef CLONE_ARGS_SIZE_VER0 + #define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ + +From cbabe8abf11e7e7fb49c123bae31efdd9bc8f1e8 Mon Sep 17 00:00:00 2001 +From: Christian Brauner <brauner(a)kernel.org> +Date: Tue, 9 Aug 2022 17:19:40 +0200 +Subject: [PATCH 3/3] build: check for FS_CONFIG_* header symbol in sys/mount.h + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) <christian.brauner(a)ubuntu.com> +--- + meson.build | 59 +++++++++++++++++++++++++++++++++++++++++-- + src/lxc/mount_utils.h | 16 ++++++++++++ + 2 files changed, 73 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index e999542336..9f8a5de60c 100644 +--- a/meson.build ++++ b/meson.build +@@ -639,8 +639,7 @@ if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > + found_types += 'struct mount_attr (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) +- missing_types += 'struct mount_attr (sys/mount.h)' +-endif ++ missing_types += 'struct mount_attr (sys/mount.h)' endif + + ## Types. + decl_headers = ''' +@@ -656,6 +655,62 @@ else + missing_types += 'struct mount_attr (linux/mount.h)' + endif + ++if cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG') ++ srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), true) ++ found_types += 'FSCONFIG_SET_FLAG' ++else ++ srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), false) ++ missing_types += 'FSCONFIG_SET_FLAG' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_STRING') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_STRING' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_STRING' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_BINARY') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_BINARY' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_BINARY' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_PATH_EMPTY') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_PATH_EMPTY' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_PATH_EMPTY' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_PATH_FD') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_PATH_FD' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_PATH_FD' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_CMD_CREATE') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_CMD_CREATE' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_CMD_CREATE' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_CMD_RECONFIGURE') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_CMD_RECONFIGURE' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_CMD_RECONFIGURE' ++endif ++ + ## Headers. + foreach ident: [ + ['bpf', '''#include <sys/syscall.h> +diff --git a/src/lxc/mount_utils.h b/src/lxc/mount_utils.h +index ea392672d8..fd34739459 100644 +--- a/src/lxc/mount_utils.h ++++ b/src/lxc/mount_utils.h +@@ -82,37 +82,53 @@ struct lxc_rootfs; + #endif + + /* fsconfig() commands */ ++#if !HAVE_FSCONFIG_SET_FLAG + #ifndef FSCONFIG_SET_FLAG + #define FSCONFIG_SET_FLAG 0 /* Set parameter, supplying no value */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_STRING + #ifndef FSCONFIG_SET_STRING + #define FSCONFIG_SET_STRING 1 /* Set parameter, supplying a string value */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_BINARY + #ifndef FSCONFIG_SET_BINARY + #define FSCONFIG_SET_BINARY 2 /* Set parameter, supplying a binary blob value */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_PATH + #ifndef FSCONFIG_SET_PATH + #define FSCONFIG_SET_PATH 3 /* Set parameter, supplying an object by path */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_PATH_EMPTY + #ifndef FSCONFIG_SET_PATH_EMPTY + #define FSCONFIG_SET_PATH_EMPTY 4 /* Set parameter, supplying an object by (empty) path */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_FD + #ifndef FSCONFIG_SET_FD + #define FSCONFIG_SET_FD 5 /* Set parameter, supplying an object by fd */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_CMD_CREATE + #ifndef FSCONFIG_CMD_CREATE + #define FSCONFIG_CMD_CREATE 6 /* Invoke superblock creation */ + #endif ++#endif + ++#if !FSCONFIG_CMD_RECONFIGURE + #ifndef FSCONFIG_CMD_RECONFIGURE + #define FSCONFIG_CMD_RECONFIGURE 7 /* Invoke superblock reconfiguration */ + #endif ++#endif + + /* fsmount() flags */ + #ifndef FSMOUNT_CLOEXEC diff --git a/lxc/Pkgfile b/lxc/Pkgfile index 94e30a42b..a4c790931 100644 --- a/lxc/Pkgfile +++ b/lxc/Pkgfile @@ -7,13 +7,15 @@ name=lxc version=5.0.1 -release=1 +release=2 source=(https://linuxcontainers.org/downloads/$name/$name-$version.tar.gz default.conf lxc-usernet lxc-users-setup lxc-users lxc-cgroups lxc-net + 4179.patch 02-distrosysconfdir.patch) build() { patch -Np1 -d $name-$version -i $SRC/02-distrosysconfdir.patch + patch -Np1 -d $name-$version -i $SRC/4179.patch # fix pam_libdir sed "/pam_security/s/libdir/'\/', 'lib'/" -i $name-$version/meson.build

1 0

ports/opt (3.7): Merge remote-tracking branch 'origin/3.6' into 3.7
by crux＠crux.nu 23 Sep '22

23 Sep '22

commit 8a9efc0a0a3fc2ec4f8fdaa3bd9e1098598c59a1 Merge: 579a2e03b 5e64b3eff Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Sep 23 21:10:41 2022 +0200 Merge remote-tracking branch 'origin/3.6' into 3.7

1 0

ports/opt (3.7): i3: update to 4.21
by crux＠crux.nu 23 Sep '22

23 Sep '22

commit 5e64b3eff78be8049703f2d22f189000d554b233 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Sep 23 17:39:55 2022 +0200 i3: update to 4.21 diff --git a/i3/.signature b/i3/.signature index ff9fc6d2c..cfc30026f 100644 --- a/i3/.signature +++ b/i3/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/RKqr/zP0ymp+d+RZDqoOGBxGvHfv5/cTLHiG/uZlE0bqIFybHshSV5beNKv3X1vYrFAneJH8bEIB7QOWEaobAw= -SHA256 (Pkgfile) = 417af00e27d10abc42308da656cfddb084039ec4a180fdcee50020a7b4eae338 +RWSE3ohX2g5d/dTpDolyGaJFHBDQeB0fPfYi+s4VvPn1Ktx2qV0FYGTeFKi3eUJ9cNVr75+P0SpYFjgY+9jdBP7t3sbmuc790Qs= +SHA256 (Pkgfile) = 5256a542cbb4218c05090bfae8d8e998877a0b5ff23caa5c4c7abde637543223 SHA256 (.footprint) = ffddeda3d45fadfa85e007ad5f4413605d3f52ef3d4489eb7445b4fc8528afbe -SHA256 (i3-4.20.1.tar.xz) = 23e1ecaf208c1d162a0c8c66c4590b301a424ee5c011227eabb96e36fd6bfce6 +SHA256 (i3-4.21.tar.xz) = 8dc5205e0f3443d58661e30783521fd9c6d426d1e7f3667ab12f2ac1b2d32078 diff --git a/i3/Pkgfile b/i3/Pkgfile index 3e706a2f4..5ff021383 100644 --- a/i3/Pkgfile +++ b/i3/Pkgfile @@ -4,7 +4,7 @@ # Depends on: pango xorg-xcb-util-cursor xorg-xcb-util-keysyms xorg-xcb-util-wm xorg-xcb-util-xrm libxkbcommon yajl libev startup-notification name=i3 -version=4.20.1 +version=4.21 release=1 source=(http://i3wm.org/downloads/$name-$version.tar.xz)

1 0

ports/opt (3.7): rust: fixed release number
by crux＠crux.nu 23 Sep '22

23 Sep '22

commit 579a2e03b1e1fed4fd86675450bfe0704bd4de6e Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Sep 23 21:10:24 2022 +0200 rust: fixed release number diff --git a/rust/.signature b/rust/.signature index 643e76275..6e832ae50 100644 --- a/rust/.signature +++ b/rust/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/afAMl7W1ezQIbuV+P22xud4NM5lSE5+ZXKimmiz+FmFVVbKPkJ0sCDkVgF37wOFma6fXcFD9RMjyhUx3xb2KwQ= -SHA256 (Pkgfile) = e9909ba48d1b995765694ff93d037b4253744fe6ee4dc7a79e32a9924615970c +RWSE3ohX2g5d/ePkcsLxVMQTvEtuF/4TZQ7SRfCPMm07IdpNmfZJGAoJP+ZpqhdAIs7Zqgk3BSOfJOEzJc9wVyoPLnnV7uXwAA4= +SHA256 (Pkgfile) = a756f7fb01aaf2d1d2213a3b4f42b086ef74d1505edc8db99b22807665d5e04b SHA256 (.footprint) = 76b27a8f6a2e8e8eedffb8a8c724b04e41b36895749280bfdd89a625468094e2 SHA256 (rustc-1.64.0-src.tar.xz) = e8170d318fac9d2fc17d5c3e648e7068f56e8db8d233d864aeffbef7c6542eac SHA256 (rust-std-1.63.0-x86_64-unknown-linux-gnu.tar.xz) = 993c2c17bf76ac626bfb5b17bddce65fbdfc14f70d183f33773de0cd12df46d2 @@ -9,4 +9,3 @@ SHA256 (cargo-1.63.0-x86_64-unknown-linux-gnu.tar.xz) = f370d12e4c11f0c835becb73 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 633bfb7b6..75aa69fac 100644 --- a/rust/Pkgfile +++ b/rust/Pkgfile @@ -9,7 +9,7 @@ version=1.64.0 _date=2022-08-11 _rustc=1.63.0 _cargo=$_rustc -release=2 +release=1 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,8 +17,7 @@ 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 - remove-include-linux-fs.h.patch) + 0002-compiler-Change-LLVM-targets.patch) unpack_source() { for file in ${source[@]}; do @@ -70,8 +69,6 @@ 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 deleted file mode 100644 index bbf0d0e7c..000000000 --- a/rust/remove-include-linux-fs.h.patch +++ /dev/null @@ -1,59 +0,0 @@ -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.6): i3: update to 4.21
by crux＠crux.nu 23 Sep '22

23 Sep '22

commit 5e64b3eff78be8049703f2d22f189000d554b233 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Sep 23 17:39:55 2022 +0200 i3: update to 4.21 diff --git a/i3/.signature b/i3/.signature index ff9fc6d2c..cfc30026f 100644 --- a/i3/.signature +++ b/i3/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/RKqr/zP0ymp+d+RZDqoOGBxGvHfv5/cTLHiG/uZlE0bqIFybHshSV5beNKv3X1vYrFAneJH8bEIB7QOWEaobAw= -SHA256 (Pkgfile) = 417af00e27d10abc42308da656cfddb084039ec4a180fdcee50020a7b4eae338 +RWSE3ohX2g5d/dTpDolyGaJFHBDQeB0fPfYi+s4VvPn1Ktx2qV0FYGTeFKi3eUJ9cNVr75+P0SpYFjgY+9jdBP7t3sbmuc790Qs= +SHA256 (Pkgfile) = 5256a542cbb4218c05090bfae8d8e998877a0b5ff23caa5c4c7abde637543223 SHA256 (.footprint) = ffddeda3d45fadfa85e007ad5f4413605d3f52ef3d4489eb7445b4fc8528afbe -SHA256 (i3-4.20.1.tar.xz) = 23e1ecaf208c1d162a0c8c66c4590b301a424ee5c011227eabb96e36fd6bfce6 +SHA256 (i3-4.21.tar.xz) = 8dc5205e0f3443d58661e30783521fd9c6d426d1e7f3667ab12f2ac1b2d32078 diff --git a/i3/Pkgfile b/i3/Pkgfile index 3e706a2f4..5ff021383 100644 --- a/i3/Pkgfile +++ b/i3/Pkgfile @@ -4,7 +4,7 @@ # Depends on: pango xorg-xcb-util-cursor xorg-xcb-util-keysyms xorg-xcb-util-wm xorg-xcb-util-xrm libxkbcommon yajl libev startup-notification name=i3 -version=4.20.1 +version=4.21 release=1 source=(http://i3wm.org/downloads/$name-$version.tar.xz)

1 0

ports/xorg (3.7): Merge remote-tracking branch 'origin/3.6' into 3.7
by crux＠crux.nu 23 Sep '22

23 Sep '22

commit af2feb9a17509e278d20bbe9487168febe4bd188 Merge: ff33a3e9 0fd08959 Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Sep 23 16:26:52 2022 +0200 Merge remote-tracking branch 'origin/3.6' into 3.7

1 0

ports/xorg (3.7): [notify] mesa: 22.1.7 -> 22.2.0; new dependency: glslang
by crux＠crux.nu 23 Sep '22

23 Sep '22

commit 0fd08959f0f9aa56acee1125f01c13b46dec6a75 Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Sep 23 07:56:33 2022 +0200 [notify] mesa: 22.1.7 -> 22.2.0; new dependency: glslang diff --git a/mesa/.footprint b/mesa/.footprint index fc7e26d1..7e508c8b 100644 --- a/mesa/.footprint +++ b/mesa/.footprint @@ -1,4 +1,6 @@ drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-r-xr-xr-x root/root usr/bin/mesa-overlay-control.py drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/EGL/ -rw-r--r-- root/root usr/include/EGL/eglextchromium.h @@ -33,6 +35,9 @@ lrwxrwxrwx root/root usr/lib/libGLX_mesa.so.0 -> libGLX_mesa.so.0.0.0 lrwxrwxrwx root/root usr/lib/libOSMesa.so -> libOSMesa.so.8 lrwxrwxrwx root/root usr/lib/libOSMesa.so.8 -> libOSMesa.so.8.0.0 -rwxr-xr-x root/root usr/lib/libOSMesa.so.8.0.0 +-rwxr-xr-x root/root usr/lib/libVkLayer_INTEL_nullhw.so +-rwxr-xr-x root/root usr/lib/libVkLayer_MESA_device_select.so +-rwxr-xr-x root/root usr/lib/libVkLayer_MESA_overlay.so lrwxrwxrwx root/root usr/lib/libXvMCnouveau.so -> libXvMCnouveau.so.1.0.0 lrwxrwxrwx root/root usr/lib/libXvMCnouveau.so.1 -> libXvMCnouveau.so.1.0.0 lrwxrwxrwx root/root usr/lib/libXvMCnouveau.so.1.0 -> libXvMCnouveau.so.1.0.0 @@ -65,6 +70,11 @@ drwxr-xr-x root/root usr/share/glvnd/ drwxr-xr-x root/root usr/share/glvnd/egl_vendor.d/ -rw-r--r-- root/root usr/share/glvnd/egl_vendor.d/50_mesa.json drwxr-xr-x root/root usr/share/vulkan/ +drwxr-xr-x root/root usr/share/vulkan/explicit_layer.d/ +-rw-r--r-- root/root usr/share/vulkan/explicit_layer.d/VkLayer_INTEL_nullhw.json +-rw-r--r-- root/root usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json drwxr-xr-x root/root usr/share/vulkan/icd.d/ -rw-r--r-- root/root usr/share/vulkan/icd.d/intel_icd.x86_64.json -rw-r--r-- root/root usr/share/vulkan/icd.d/radeon_icd.x86_64.json +drwxr-xr-x root/root usr/share/vulkan/implicit_layer.d/ +-rw-r--r-- root/root usr/share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json diff --git a/mesa/.signature b/mesa/.signature index 1d2c24da..a19a2afa 100644 --- a/mesa/.signature +++ b/mesa/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndMhnoM12uE+JnEVfFzTyGGR2FvEYa1Kzav3/8G1df0ZygegAlr38ZPZhQP+q8o4PmMKSvGOK2MWLMgSIVNIMGg0= -SHA256 (Pkgfile) = 6899501f86ebee12676952ffcae095d624bf0741867c6a12dbaeff2f1288d421 -SHA256 (.footprint) = 3730189691884ab819d74ba20afa35a994a4bea01e5192373a83700a03dddbce -SHA256 (mesa-22.1.7.tar.xz) = da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89 +RWTSGWF5Q7TndIxxJxpt5fpuFeWzLVcqM9vwEAYPIf/EvWXy/ulMHxxPNPrfM4eDA+fmHXX4mvTHNTkSxZV6+trmKADzjikk0gI= +SHA256 (Pkgfile) = 987c98befa40f696405e88f8806a2be052087ee4d91cc5b7db89e95d6a915f15 +SHA256 (.footprint) = 27e6de8b3a4a9468777e5938c1404da5b2a33c57d063115816b66d5bbb99d2fb +SHA256 (mesa-22.2.0.tar.xz) = b1f9c8fd08f2cae3adf83355bef4d2398e8025f44947332880f2d0066bdafa8c diff --git a/mesa/Pkgfile b/mesa/Pkgfile index 9ab8e9a3..18a6a97f 100644 --- a/mesa/Pkgfile +++ b/mesa/Pkgfile @@ -1,16 +1,15 @@ # Description: Mesa 3D Graphics Library # URL: https://www.mesa3d.org/ # Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu -# Depends on: elfutils libdrm libglvnd llvm python3-mako xorg-libxdamage xorg-libxrandr xorg-libxshmfence xorg-libxvmc xorg-libxxf86vm +# Depends on: elfutils glslang libdrm libglvnd llvm python3-mako xorg-libxdamage xorg-libxrandr xorg-libxshmfence xorg-libxvmc xorg-libxxf86vm # Optional: libva libvdpau wayland-protocols name=mesa -version=22.1.7 +version=22.2.0 release=1 source=(https://archive.mesa3d.org/$name-$version.tar.xz) build() { - prt-get isinst glslang && PKGMK_MESA+=' -D vulkan-layers=device-select,intel-nullhw,overlay' prt-get isinst vulkan-loader && PKGMK_MESA_GALLIUM+='zink,' prt-get isinst libvdpau && PKGMK_MESA+=' -D gallium-vdpau=enabled' || PKGMK_MESA+=' -D gallium-vdpau=disabled' prt-get isinst wayland-protocols && PKGMK_MESA_PLATFORMS+='wayland' @@ -41,6 +40,7 @@ build() { -D platforms=${PKGMK_MESA_PLATFORMS#,} \ -D shared-glapi=enabled \ -D vulkan-drivers=amd,intel \ + -D vulkan-layers=device-select,intel-nullhw,overlay \ -D glvnd=true meson compile -C build -j ${JOBS:-1}

1 0

ports/opt (3.7): Merge remote-tracking branch 'origin/3.6' into 3.7
by crux＠crux.nu 23 Sep '22

23 Sep '22

commit 0417474567716589242410b8445d6720e89346c8 Merge: 8ade779d8 8fe49a91c Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Sep 23 16:26:22 2022 +0200 Merge remote-tracking branch 'origin/3.6' into 3.7

1 0

ports/opt (3.7): rust: 1.63.0 -> 1.64.0
by crux＠crux.nu 23 Sep '22

23 Sep '22

commit 8fe49a91c77c35e3ac306a8e856d83d8413bc2a1 Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Sep 23 07:54:51 2022 +0200 rust: 1.63.0 -> 1.64.0 diff --git a/rust/.footprint b/rust/.footprint index 987695dd9..f3d412e4b 100644 --- a/rust/.footprint +++ b/rust/.footprint @@ -7,6 +7,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/cargo-clippy -rwxr-xr-x root/root usr/bin/cargo-fmt -rwxr-xr-x root/root usr/bin/clippy-driver +-rwxr-xr-x root/root usr/bin/rust-analyzer -rwxr-xr-x root/root usr/bin/rust-demangler -rwxr-xr-x root/root usr/bin/rust-gdb -rwxr-xr-x root/root usr/bin/rust-gdbgui @@ -33,6 +34,7 @@ drwxr-xr-x root/root usr/lib/rustlib/i686-unknown-linux-gnu/lib/ -rw-r--r-- root/root usr/lib/rustlib/manifest-clippy-preview -rw-r--r-- root/root usr/lib/rustlib/manifest-rust-analysis-i686-unknown-linux-gnu -rw-r--r-- root/root usr/lib/rustlib/manifest-rust-analysis-x86_64-unknown-linux-gnu +-rw-r--r-- root/root usr/lib/rustlib/manifest-rust-analyzer-preview -rw-r--r-- root/root usr/lib/rustlib/manifest-rust-demangler-preview -rw-r--r-- root/root usr/lib/rustlib/manifest-rust-src -rw-r--r-- root/root usr/lib/rustlib/manifest-rust-std-i686-unknown-linux-gnu @@ -441,6 +443,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/mem/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/mem/manually_drop.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/mem/maybe_uninit.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/mem/mod.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/mem/transmutability.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/mem/valid_align.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/num/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/num/bignum.rs @@ -547,6 +550,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/str/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/str/validations.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/sync/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/sync/atomic.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/sync/exclusive.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/sync/mod.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/core/src/task/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/core/src/task/mod.rs @@ -721,8 +725,13 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/examples/nbody.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/examples/spectral_norm.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/comparisons.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/core_simd_docs.md +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/elements.rs +drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/elements/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/elements/float.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/elements/int.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/elements/uint.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/eq.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/fmt.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/intrinsics.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/iter.rs @@ -733,15 +742,13 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/masks/bitmask.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/masks/full_masks.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/masks/to_bitmask.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/math.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ops.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ops/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ops/assign.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ops/deref.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ops/unary.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/reduction.rs --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/round.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/ord.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/select.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/swizzle.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/portable-simd/crates/core_simd/src/to_bytes.rs @@ -802,15 +809,18 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/proc_macro/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/Cargo.toml drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/proc_macro/src/ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/arena.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/buffer.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/client.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/closure.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/fxhash.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/handle.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/rpc.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/scoped_cell.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/selfless_reify.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/server.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/bridge/symbol.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/diagnostic.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/lib.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/proc_macro/src/quote.rs @@ -891,6 +901,8 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/fs/ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/io/ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/bufreader.rs +drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/bufreader/ +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/bufreader/buffer.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/bufwriter.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/linewriter.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/io/buffered/linewritershim.rs @@ -1180,6 +1192,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/itron/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/itron/time.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/itron/time/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/itron/time/tests.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/itron/wait_flag.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/mod.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/sgx/abi/ @@ -1263,7 +1276,9 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/kernel_co -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/kernel_copy/tests.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/l4re.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/ --rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/futex.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/fuchsia_mutex.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/futex_condvar.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/futex_mutex.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/futex_rwlock.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/mod.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys/unix/locks/pthread_condvar.rs @@ -1421,6 +1436,7 @@ drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/futex.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/generic.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/mod.rs +-rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/thread_parker/wait_flag.rs -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8.rs drwxr-xr-x root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8/ -rw-r--r-- root/root usr/lib/rustlib/src/rust/library/std/src/sys_common/wtf8/tests.rs @@ -1868,6 +1884,8 @@ drwxr-xr-x root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/ -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.lsan.a -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.msan.a -rw-r--r-- root/root usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.tsan.a +drwxr-xr-x root/root usr/libexec/ +-rwxr-xr-x root/root usr/libexec/rust-analyzer-proc-macro-srv drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ diff --git a/rust/.signature b/rust/.signature index e92828bee..5b868bc77 100644 --- a/rust/.signature +++ b/rust/.signature @@ -1,11 +1,11 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SjYTIUpASwTp7N8dRuPhuyXhvyuQs3mMfOnyL+wBqQKAj8XGOOfZ81Gq45Ey6nHLjqxRs73Xih9TKk5zXoghgQ= -SHA256 (Pkgfile) = 9089bbeea5d3b308dd775cf96a97ddb9af196229eced2bb1307577da5e728929 -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 -SHA256 (rustc-1.62.0-x86_64-unknown-linux-gnu.tar.xz) = e7f71f4ef09334ddc9ec8cbf2f958d654e36f580c95f8fec6d5c816ce256dbd6 -SHA256 (cargo-1.62.0-x86_64-unknown-linux-gnu.tar.xz) = 815c63119a9cf0282ff240c6444b6f867238763ee3dea182f10837ae7dbbb1d4 +RWSE3ohX2g5d/ZvyLwlth3nKSF/v9Y/NOSUGVx79QhXH8e5nBc+C129FwBvwq12xMdrB6Rf7z16ODQADqXLsedA8EYs2Y4iyIg0= +SHA256 (Pkgfile) = 8c3a9fda9ec44b2ed53d53e67d1f7b68b8f22199ce1e31325616a9426d01e9c9 +SHA256 (.footprint) = 76b27a8f6a2e8e8eedffb8a8c724b04e41b36895749280bfdd89a625468094e2 +SHA256 (rustc-1.64.0-src.tar.xz) = e8170d318fac9d2fc17d5c3e648e7068f56e8db8d233d864aeffbef7c6542eac +SHA256 (rust-std-1.63.0-x86_64-unknown-linux-gnu.tar.xz) = 993c2c17bf76ac626bfb5b17bddce65fbdfc14f70d183f33773de0cd12df46d2 +SHA256 (rustc-1.63.0-x86_64-unknown-linux-gnu.tar.xz) = bdab9d9afa5c329c40f9ba568364815237fab8426477c12bfabad35ffc484ab5 +SHA256 (cargo-1.63.0-x86_64-unknown-linux-gnu.tar.xz) = f370d12e4c11f0c835becb738bcf00d363f29b76f8b424b4dcb005abcf15fc9a SHA256 (0001-bootstrap-Change-libexec-dir.patch) = 60c6dfc100d292284af2187cfefc1d0d928139ca557d27bc6bef88edefccff70 SHA256 (0001-cargo-Change-libexec-dir.patch) = c901a9bb036c29ca092f7dbc8b447efdd9aa1044a902a88f9d024cb22681dc19 SHA256 (0002-compiler-Change-LLVM-targets.patch) = 8dcb566da29a92ecf3eb6afe094d9c7766d08230d90fd666bfd022c018ae676a diff --git a/rust/Pkgfile b/rust/Pkgfile index 6ce70f67e..661286a53 100644 --- a/rust/Pkgfile +++ b/rust/Pkgfile @@ -5,9 +5,9 @@ # Optional: ccache libgit2 lld polly sccache name=rust -version=1.63.0 -_date=2022-06-30 -_rustc=1.62.0 +version=1.64.0 +_date=2022-08-11 +_rustc=1.63.0 _cargo=$_rustc release=1 @@ -66,6 +66,8 @@ build() { patch -p1 -i $SRC/0001-bootstrap-Change-libexec-dir.patch patch -p1 -d src/tools/cargo -i $SRC/0001-cargo-Change-libexec-dir.patch + sed -e 's/libexec/lib/g' -i src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs + # Use our *-pc-linux-gnu targets, making LTO with clang simpler patch -p1 -i $SRC/0002-compiler-Change-LLVM-targets.patch @@ -99,7 +101,7 @@ cat <<- EOF > $SRC/config.toml [build] target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] - tools = ["cargo", "clippy", "rustfmt", "analysis", "src", "rust-demangler"] + tools = ["cargo", "clippy", "rustfmt", "analysis", "src", "rust-demangler", "rust-analyzer"] docs = false extended = true sanitizers = true @@ -113,6 +115,16 @@ cat <<- EOF > $SRC/config.toml [target.x86_64-unknown-linux-gnu] llvm-config = "/usr/bin/llvm-config" llvm-filecheck = "/usr/bin/FileCheck" + cc = "/usr/bin/gcc" + cxx = "/usr/bin/g++" + ar = "/usr/bin/gcc-ar" + ranlib = "/usr/bin/gcc-ranlib" + + [target.i686-unknown-linux-gnu] + cc = "/usr/bin/gcc" + cxx = "/usr/bin/g++" + ar = "/usr/bin/gcc-ar" + ranlib = "/usr/bin/gcc-ranlib" EOF if [ -e '/usr/bin/rustc' ]; then

1 0

ports/opt (3.7): polly: 14.0.6 -> 15.0.1
by crux＠crux.nu 23 Sep '22

23 Sep '22

commit cac7b325217e56f4d6f5adedb180296134ccd73d Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Sep 23 07:54:38 2022 +0200 polly: 14.0.6 -> 15.0.1 diff --git a/polly/.signature b/polly/.signature index a6ebb52a3..2c42cedd8 100644 --- a/polly/.signature +++ b/polly/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Wal0Z6OI7OVqf9UazxVENqyJVRaZUao1ERd+8omcDVCJILxbhwlLuhyzIqyoqRNQ8y+YRoCpGKZDnPXiweitQs= -SHA256 (Pkgfile) = 445a3f7740bf31052846f4c9a2a6d9ce17025c97ca42bd203685e48e0b7d7e84 +RWSE3ohX2g5d/RqF7+fverS+esk43k9zyQVGMEsTuo2FWIKGN4srX4ptilHtYPYmSBqqVWxj/PYQFwrKYgpZ0PmDP8rKfZJbewU= +SHA256 (Pkgfile) = bfa3e448c195f3c06ee3885c34d85e84e87409fea2e92bc9a71a5660d771244d SHA256 (.footprint) = 5e777cbd03859d68cb7f6f4e1443d0008ccf2fcc33a04c0758e27f6b623980eb -SHA256 (polly-14.0.6.src.tar.xz) = d4e6f58e54c0418d7b8debef0c09b77bdff6f435012be94c3edf270b89314fdd +SHA256 (polly-15.0.1.src.tar.xz) = 62d55d9da7ba1f4cbdf2f7b1557746c66af7d7c2aa4a15e0b2b7298b7dff0943 +SHA256 (cmake-15.0.1.src.tar.xz) = a660d1b7d4d2ef9759de6ad360d5fa9eed3625a6548068a97df2dd706edf2dd0 diff --git a/polly/Pkgfile b/polly/Pkgfile index c5036195f..d59b913a0 100644 --- a/polly/Pkgfile +++ b/polly/Pkgfile @@ -4,11 +4,14 @@ # Depends on: llvm name=polly -version=14.0.6 +version=15.0.1 release=1 -source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/polly-$version.src.tar.xz) +source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/polly-$version.src.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/cma…) build() { + cp -r $SRC/cmake-$version.src/Modules/* $name-$version.src/cmake/. + cmake -S $name-$version.src -B build -G Ninja \ -D CMAKE_INSTALL_PREFIX=/usr \ -D LLVM_LIBDIR_SUFFIX= \

1 0