From be6d5783ba542d8f0a0e9125839e8ac2dfb2326d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 May 2022 02:00:00 +0200 Subject: gnu: tor: Update to 0.4.7.7. * gnu/packages/tor.scm (tor): Update to 0.4.7.7. [source]: Remove patch. * gnu/packages/patches/tor-sandbox-i686.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/tor-sandbox-i686.patch | 36 ----------------------------- gnu/packages/tor.scm | 5 ++-- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 gnu/packages/patches/tor-sandbox-i686.patch diff --git a/gnu/local.mk b/gnu/local.mk index c100b97cc1..bc9f976a39 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1860,7 +1860,6 @@ dist_patch_DATA = \ %D%/packages/patches/tlf-support-hamlib-4.2+.patch \ gnu/packages/patches/tootle-glib-object-naming.patch \ gnu/packages/patches/tootle-reason-phrase.patch \ - %D%/packages/patches/tor-sandbox-i686.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/transfig-gcc10-fno-common.patch \ %D%/packages/patches/transmission-honor-localedir.patch \ diff --git a/gnu/packages/patches/tor-sandbox-i686.patch b/gnu/packages/patches/tor-sandbox-i686.patch deleted file mode 100644 index 34b0a053b1..0000000000 --- a/gnu/packages/patches/tor-sandbox-i686.patch +++ /dev/null @@ -1,36 +0,0 @@ -This patch fixes sandboxing on i686 by allowing 'statx'. Without this, -'src/test/test_include.sh' would fail. - -Patch adapted from: - - https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/480 - -From 001d880d1082f5d124e10554e2718e407c7e88c6 Mon Sep 17 00:00:00 2001 -From: Simon South -Date: Fri, 5 Nov 2021 10:10:10 -0400 -Subject: [PATCH] sandbox: Allow "statx" syscall on i386 for glibc 2.33 - -glibc versions 2.33 and newer use the modern "statx" system call in their -implementations of stat() and opendir() for Linux on i386. Prevent failures in -the sandbox unit tests by modifying the sandbox to allow this system call -without restriction on i386 when it is available, and update the test suite to -skip the "sandbox/stat_filename" test in this case as it is certain to fail. ---- - src/lib/sandbox/sandbox.c | 3 +++ - src/test/test_sandbox.c | 7 ++++--- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c -index fb02a345ab..a15f99ad76 100644 ---- a/src/lib/sandbox/sandbox.c -+++ b/src/lib/sandbox/sandbox.c -@@ -252,6 +252,9 @@ static int filter_nopar_gen[] = { - SCMP_SYS(sigreturn), - #endif - SCMP_SYS(stat), -+#if defined(__i386__) && defined(__NR_statx) -+ SCMP_SYS(statx), -+#endif - SCMP_SYS(uname), - SCMP_SYS(wait4), - SCMP_SYS(write), diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index cc11255a24..ca694cc90c 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -57,15 +57,14 @@ (define-public tor (package (name "tor") - (version "0.4.6.10") + (version "0.4.7.7") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "077374vqk9mxi63viksq5zwn05i4xa2bqcihwwxz6n750h7ddk4l")) - (patches (search-patches "tor-sandbox-i686.patch")))) + "0i2v3a2h7d0bjn64pi1c6h2x15lb53plf71xwkbkb51bnmc124ry")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit v1.2.3 pan title='2020-04-09 03:45:22 +0000'>2020-04-09installer: Include empty variant in keyboard layout selection....Previously for Azerbaijani, no Latin layout but only the Cyrillic variant could be selected. * gnu/installer/newt/keymap.scm (add-empty-variant): New procedure. (run-keymap-page): Use it to insert an empty variant. Florian Pelz 2020-04-09installer: Allow Alt+Shift toggle from non-Latin keyboard layouts....Fixes <https://bugs.gnu.org/40493>. * gnu/installer/newt/keymap.scm (%non-latin-layouts): New variable. (%non-latin-variants): New variable. (%latin-layout+variants): New variable. (toggleable-latin-layout): New procedure to compute combined layouts. (run-keymap-page): Use it. (keyboard-layout->configuration): Apply it in config.scm. (run-layout-page): Mention Alt+Shift. * gnu/installer/keymap.scm (kmscon-update-keymap): Pass on XKB options. * gnu/installer/record.scm (<installer>): Adjust code comments. * gnu/installer.scm (apply-keymap): Pass on XKB options. (installer-steps): Adjust code comments. * gnu/packages/patches/kmscon-runtime-keymap-switch.patch: Apply XKB options. Florian Pelz 2020-04-08installer: Turn help menu into parameters menu....* gnu/local.mk (INSTALLER_MODULES): Rename help.scm into parameters.scm. * po/guix/POTFILES.in: Ditto. * gnu/installer/record.scm (<installer>): Rename help-menu into parameter-menu and help-page into parameters-page. * gnu/installer/newt/parameters.scm: Renamed from help.scm. Update information messages. * gnu/installer/newt.scm: Update accordingly. * gnu/installer/newt/keymap.scm: Ditto. Mathieu Othacehe 2020-04-06installer: Add a help page....* gnu/installer/newt/help.scm: New file. * gnu/local.mk (INSTALLER_MODULES): Add it. * po/guix/POTFILES.in: Add it. * gnu/installer/record.scm (<installer>): Add 'help-menu' and 'help-page' fields, (installer-help-menu, installer-help-page): new exported procedures. * gnu/installer/newt.scm (init): Set the help line, (help-menu, help-page): new procedures used ... (newt-installer): ... here. * gnu/installer/newt/keymap.scm (run-layout-page): Add a context argument to differenciate the help context from the main one, (run-keymap-page): add a context argument and pass it to run-layout-page. * gnu/installer.scm (compute-keymap-step): Add a context argument and pass it to 'installer-keymap-page', (installer-steps): set the help menu and pass the appropriate context to compute-keymap-step calls, (guile-newt): update to revision 2. Mathieu Othacehe 2019-04-17installer: Sort keyboard layouts according to language and translations....Previously, we would always (1) put English first, and (2) sort the other layouts based on their English description. This fixes both issues. * gnu/installer/newt/keymap.scm (sort-layouts)[layout<?]: New procedure. [preferred]: New variable. Partition according to both the 'name' and 'synopsis' fields. Sort both the main layouts and the other layouts according to 'layout<?'. Ludovic Courtès 2019-04-17installer: Translate keyboard layout names....* gnu/installer.scm (installer-program)[installer-builder]: Call 'bindtextdomain' for "xkeyboard-config". * gnu/installer/newt/keymap.scm (run-keymap-page): Add calls to 'gettext'. Ludovic Courtès 2019-03-25installer: Set the system's 'keyboard-layout' field....* gnu/installer/newt/keymap.scm (keyboard-layout->configuration): New procedure. * gnu/installer.scm (compute-keymap-step): Return RESULT. (installer-steps) <'keymap>: Add 'configuration-formatter' field. (installer-program): Use (gnu installer newt keymap). * gnu/installer/parted.scm (bootloader-configuration): Set 'keyboard-layout'. Ludovic Courtès 2019-02-18gnu: Fix some typos in the installer....* gnu/installer/connman.scm (connman-connect-with-auth): Fix typo in documentation. * gnu/installer/newt/keymap.scm (sort-variants): Likewise. * gnu/installer/newt/page.scm (run-listbox-selection-page): Likewise. * gnu/installer/parted.scm (mkpart): Likewise. * gnu/installer/newt/utils.scm (destroy-form-and-pop): Likewise. * gnu/installer/newt/wifi.scm (run-unknown-error-page): Fix typo. (wifi-listbox-heigth): Rename to… (wifi-listbox-height): …this, and adjust caller. * gnu/installer/timezone.scm (locate-childrens): Rename to… (locate-children): …this. Adjust all callers. Tobias Geerinckx-Rice 2019-01-17installer: keymap: Put English layout and international variant ahead....* gnu/installer/newt/keymap.scm (sort-layouts): New procedure, (sort-variants): new procedure, (run-keymap-page): use the two procedures above to sort layouts and variants. Mathieu Othacehe 2019-01-17installer: keymap: Fix keymap selection of layouts with not variant....* gnu/installer/newt/keymap.scm (run-keymap-page): Test if the layout has no variant at 'variant step, instead of raising a condition at 'layout step. Mathieu Othacehe 2019-01-17installer: Turn "Cancel" buttons into "Exit" buttons....This change and previous ones were, Suggested-by: Thorsten Wilms <t_w_@freenet.de> here: https://lists.gnu.org/archive/html/guix-devel/2018-11/msg00330.html gnu/installer/newt/ethernet.scm: Turn cancel into exit. gnu/installer/newt/final.scm: Ditto. gnu/installer/newt/keymap.scm: Ditto. gnu/installer/newt/locale.scm: Ditto. gnu/installer/newt/network.scm: Ditto. gnu/installer/newt/page.scm: Ditto. gnu/installer/newt/partition.scm: Ditto. gnu/installer/newt/services.scm: Ditto. gnu/installer/newt/timezone.scm: Ditto. gnu/installer/newt/user.scm: Ditto. gnu/installer/newt/wifi.scm: Ditto. Mathieu Othacehe 2019-01-17installer: Fix compute calls....* gnu/installer/newt/keymap.scm (run-keymap-page): Add missing argument to compute procedure. * gnu/installer/newt/network.scm (run-network-page): Ditto. Mathieu Othacehe 2019-01-17installer: Do not ask for keyboard model....Suppose that the keyboard model is "pc105". * gnu/installer.scm (apply-keymap): Remove model ... * gnu/installer/newt/keymap.scm (run-keymap-page): passed here. (run-model-page): remove procedure * gnu/installer/record.scm (installer): Edit keymap-page prototype in comment. * gnu/installer/keymap.scm (default-keyboard-model): New exported parameter. Mathieu Othacehe 2019-01-17installer: Remove "selection" from all titles....* gnu/installer/newt/hostname.scm (run-hostname-page): Remove selection from page title, (run-variant-page): ditto. * gnu/installer/newt/keymap.scm (run-layout-page): Ditto. * gnu/installer/newt/locale.scm (run-layout-page): Ditto, (run-territory-page): ditto, (run-codeset-page): ditto, (run-modifier-page): ditto * gnu/installer/newt/network.scm (run-territory-page): Ditto. * gnu/installer/newt/timezone.scm (run-timezone-page): Ditto. * gnu/installer/newt/wifi.scm (run-wifi-page): Ditto. Mathieu Othacehe 2019-01-17gnu: Add graphical installer support....* configure.ac: Require that guile-newt is available. * gnu/installer.scm: New file. * gnu/installer/aux-files/logo.txt: New file. * gnu/installer/build-installer.scm: New file. * gnu/installer/connman.scm: New file. * gnu/installer/keymap.scm: New file. * gnu/installer/locale.scm: New file. * gnu/installer/newt.scm: New file. * gnu/installer/newt/ethernet.scm: New file. * gnu/installer/newt/hostname.scm: New file. * gnu/installer/newt/keymap.scm: New file. * gnu/installer/newt/locale.scm: New file. * gnu/installer/newt/menu.scm: New file. * gnu/installer/newt/network.scm: New file. * gnu/installer/newt/page.scm: New file. * gnu/installer/newt/timezone.scm: New file. * gnu/installer/newt/user.scm: New file. * gnu/installer/newt/utils.scm: New file. * gnu/installer/newt/welcome.scm: New file. * gnu/installer/newt/wifi.scm: New file. * gnu/installer/steps.scm: New file. * gnu/installer/timezone.scm: New file. * gnu/installer/utils.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add previous files. * gnu/system.scm: Export %root-account. * gnu/system/install.scm (%installation-services): Use kmscon instead of linux VT for all tty. (installation-os)[users]: Add the graphical installer as shell of the root account. [packages]: Add font related packages. * po/guix/POTFILES.in: Add installer files. Mathieu Othacehe