From 5124d0dbe0ab59c606d0d5b5837f8dcc14ba28ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:00 +0200 Subject: gnu: sudo: Fix build on aarch64. * gnu/packages/admin.scm (sudo)[source]: Add patch. * gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- .../sudo-missing-sudo_pt_regs-aarch64.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch (limited to 'gnu/packages/patches') diff --git a/gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch b/gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch new file mode 100644 index 0000000000..9caf607940 --- /dev/null +++ b/gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch @@ -0,0 +1,26 @@ +From d549adf04bfde7936306203e2e8886ffd93d00ea Mon Sep 17 00:00:00 2001 +From: Pierre Bourdon +Date: Tue, 7 Jun 2022 17:14:39 +0200 +Subject: [PATCH] exec_ptrace: fix missing sudo_pt_regs on aarch64 + +AArch64 already had an existing "user_pt_regs" struct and didn't need a +struct alias before the renaming to "sudo_pt_regs". Make the code build +again by adding the now missing alias. + +Fixes: 2eb8ff17 +--- + src/exec_ptrace.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/exec_ptrace.h b/src/exec_ptrace.h +index 7f26283a8..4a5a86581 100644 +--- a/src/exec_ptrace.h ++++ b/src/exec_ptrace.h +@@ -76,6 +76,7 @@ + # define reg_arg4(x) (x).r10 + #elif defined(__aarch64__) + # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_AARCH64 ++# define sudo_pt_regs struct user_pt_regs + # define reg_syscall(x) (x).regs[8] /* w8 */ + # define reg_retval(x) (x).regs[0] /* x0 */ + # define reg_sp(x) (x).sp /* sp */ -- cgit v1.2.3 From 3783a7b8e47eec3ab60f5d4a6db47c4795e021f6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:02 +0200 Subject: gnu: nftables: Update to 1.0.4. * gnu/packages/linux.scm (nftables): Update to 1.0.4. [source]: Remove patch. * gnu/packages/patches/nftables-fix-makefile.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/linux.scm | 6 ++--- gnu/packages/patches/nftables-fix-makefile.patch | 34 ------------------------ 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/nftables-fix-makefile.patch (limited to 'gnu/packages/patches') diff --git a/gnu/local.mk b/gnu/local.mk index bed213b87c..26866bc807 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1527,7 +1527,6 @@ dist_patch_DATA = \ %D%/packages/patches/netsurf-system-utf8proc.patch \ %D%/packages/patches/netsurf-y2038-tests.patch \ %D%/packages/patches/netsurf-longer-test-timeout.patch \ - %D%/packages/patches/nftables-fix-makefile.patch \ %D%/packages/patches/nhc98-c-update.patch \ %D%/packages/patches/nix-dont-build-html-doc.diff \ %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ee31ee95a3..23a6088020 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7287,7 +7287,7 @@ used by nftables.") (define-public nftables (package (name "nftables") - (version "1.0.2") + (version "1.0.4") (source (origin (method url-fetch) @@ -7296,9 +7296,7 @@ used by nftables.") (string-append "https://www.nftables.org/projects/nftables" "/files/nftables-" version ".tar.bz2"))) (sha256 - (base32 "00jcjn1pl7qyqpg8pd4yhlkys7wbj4vkzgg73n27nmplzips6a0b")) - (patches - (search-patches "nftables-fix-makefile.patch")))) + (base32 "0ddsdj6zs78hndffl3iikpa1wzjxcpmr3xqcq4la71gnl7zb2zwj")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static" diff --git a/gnu/packages/patches/nftables-fix-makefile.patch b/gnu/packages/patches/nftables-fix-makefile.patch deleted file mode 100644 index 1660635874..0000000000 --- a/gnu/packages/patches/nftables-fix-makefile.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 18a08fb7f0443f8bde83393bd6f69e23a04246b3 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso -Date: Tue, 22 Feb 2022 00:56:36 +0100 -Subject: examples: compile with `make check' and add AM_CPPFLAGS - -Compile examples via `make check' like libnftnl does. Use AM_CPPFLAGS to -specify local headers via -I. - -Unfortunately, `make distcheck' did not catch this compile time error in -my system, since it was using the nftables/libnftables.h file of the -previous nftables release. - -Fixes: 5b364657a35f ("build: missing SUBIRS update") -Fixes: caf2a6ad2d22 ("examples: add libnftables example program") -Signed-off-by: Pablo Neira Ayuso ---- - examples/Makefile.am | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/examples/Makefile.am b/examples/Makefile.am -index c972170d..3b8b0b67 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -1,4 +1,6 @@ --noinst_PROGRAMS = nft-buffer \ -+check_PROGRAMS = nft-buffer \ - nft-json-file - -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ - LDADD = $(top_builddir)/src/libnftables.la --- -cgit v1.2.3 - -- cgit v1.2.3 From ce21522706ce9603eab0da9eb568ceda9c19cd1a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:00 +0200 Subject: gnu: sudo: Update to 1.9.11p1. * gnu/packages/admin.scm (sudo): Update to 1.9.11p1. [source]: Remove patch again. * gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/admin.scm | 5 ++--- .../sudo-missing-sudo_pt_regs-aarch64.patch | 26 ---------------------- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch (limited to 'gnu/packages/patches') diff --git a/gnu/local.mk b/gnu/local.mk index 26866bc807..453d3bb9a9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1805,7 +1805,6 @@ dist_patch_DATA = \ %D%/packages/patches/slim-reset.patch \ %D%/packages/patches/slim-login.patch \ %D%/packages/patches/slim-display.patch \ - %D%/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch \ %D%/packages/patches/syslinux-gcc10.patch \ %D%/packages/patches/syslinux-strip-gnu-property.patch \ %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9a3ddab227..6acfff8881 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1769,7 +1769,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.11") + (version "1.9.11p1") (source (origin (method url-fetch) (uri @@ -1779,8 +1779,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "1gjingc1h7d6p17m0nn87yiwh8gbdchg4w4kv8s4g89wv0q6wixm")) - (patches (search-patches "sudo-missing-sudo_pt_regs-aarch64.patch")) + "0jr52rmig9h367j0n6h3lp5xf54jsycnvdih42wg9bd9d4d6r2zb")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch b/gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch deleted file mode 100644 index 9caf607940..0000000000 --- a/gnu/packages/patches/sudo-missing-sudo_pt_regs-aarch64.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d549adf04bfde7936306203e2e8886ffd93d00ea Mon Sep 17 00:00:00 2001 -From: Pierre Bourdon -Date: Tue, 7 Jun 2022 17:14:39 +0200 -Subject: [PATCH] exec_ptrace: fix missing sudo_pt_regs on aarch64 - -AArch64 already had an existing "user_pt_regs" struct and didn't need a -struct alias before the renaming to "sudo_pt_regs". Make the code build -again by adding the now missing alias. - -Fixes: 2eb8ff17 ---- - src/exec_ptrace.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/exec_ptrace.h b/src/exec_ptrace.h -index 7f26283a8..4a5a86581 100644 ---- a/src/exec_ptrace.h -+++ b/src/exec_ptrace.h -@@ -76,6 +76,7 @@ - # define reg_arg4(x) (x).r10 - #elif defined(__aarch64__) - # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_AARCH64 -+# define sudo_pt_regs struct user_pt_regs - # define reg_syscall(x) (x).regs[8] /* w8 */ - # define reg_retval(x) (x).regs[0] /* x0 */ - # define reg_sp(x) (x).sp /* sp */ -- cgit v1.2.3 From 731f55aa8df4e5a7715681cfe168188b2e57feb6 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Wed, 8 Jun 2022 20:51:04 +0200 Subject: gnu: epiphany: Update to 42.2. * gnu/packages/gnome.scm (epiphany): Update to 42.2. [source]: Remove patches. * gnu/packages/patches/epiphany-update-libportal-usage.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 6 +-- .../patches/epiphany-update-libportal-usage.patch | 53 ---------------------- 3 files changed, 2 insertions(+), 58 deletions(-) delete mode 100644 gnu/packages/patches/epiphany-update-libportal-usage.patch (limited to 'gnu/packages/patches') diff --git a/gnu/local.mk b/gnu/local.mk index 453d3bb9a9..abd6a30d66 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1039,7 +1039,6 @@ dist_patch_DATA = \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/eog-update-libportal-usage.patch \ - %D%/packages/patches/epiphany-update-libportal-usage.patch \ %D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/eudev-rules-directory.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 90ee724290..5c23d8b42e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6703,7 +6703,7 @@ a secret password store, an adblocker, and a modern UI.") (define-public epiphany (package (name "epiphany") - (version "41.2") + (version "42.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/epiphany/" @@ -6711,9 +6711,7 @@ a secret password store, an adblocker, and a modern UI.") "epiphany-" version ".tar.xz")) (sha256 (base32 - "0k7b22zq3z1kllzqxgwsvwb1lp0j6rjb3k1hvhna3i573wc4mpji")) - (patches - (search-patches "epiphany-update-libportal-usage.patch")))) + "0b8rhns3b58f8dnp83mm1g933aqf88d8wrfyyp7jq3fihvw2rh4j")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/epiphany-update-libportal-usage.patch b/gnu/packages/patches/epiphany-update-libportal-usage.patch deleted file mode 100644 index 0d8ea045fb..0000000000 --- a/gnu/packages/patches/epiphany-update-libportal-usage.patch +++ /dev/null @@ -1,53 +0,0 @@ -Fix for epiphany with libportal-0.5. - -This patch was adapted from upstream -https://gitlab.gnome.org/GNOME/epiphany/-/commit/e4d259f614f75c26ad0d2094f4f569ffd1bc06d1 - -diff --git a/lib/ephy-flatpak-utils.c b/lib/ephy-flatpak-utils.c -index 6fc9a5dec17a63c0660cbc1d95103c8f77231d30..0fd90b3f178392930e812a8391fd81bf1371b8bf 100644 ---- a/lib/ephy-flatpak-utils.c -+++ b/lib/ephy-flatpak-utils.c -@@ -29,7 +29,7 @@ - #include - #include - #if USE_LIBPORTAL --#include -+#include - #endif - #include - #include -diff --git a/lib/meson.build b/lib/meson.build -index 264f9c5fb66268fc248f780b8d1c06c8291f856d..db0a0557f0ae634d7fb95e57aba0cd901ca4d6c1 100644 ---- a/lib/meson.build -+++ b/lib/meson.build -@@ -66,6 +66,7 @@ libephymisc_deps = [ - libxml_dep, - m_dep, - portal_dep, -+ portal_gtk_dep, - sqlite3_dep, - webkit2gtk_dep - ] -diff --git a/meson.build b/meson.build -index 0b9f862b22a23619289342ec39fa0a0274558c25..4285a975004e48366789a4e66f8b23f3af05a636 100644 ---- a/meson.build -+++ b/meson.build -@@ -95,7 +95,8 @@ libhandy_dep = dependency('libhandy-1', version: '>= 1.5.0') - libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0') - libxml_dep = dependency('libxml-2.0', version: '>= 2.6.12') - nettle_dep = dependency('nettle', version: nettle_requirement) --portal_dep = dependency('libportal', version: '>= 0.0.2', required: get_option('libportal')) -+portal_dep = dependency('libportal', version: '>= 0.5', required: get_option('libportal')) -+portal_gtk_dep = dependency('libportal-gtk3', version: '>= 0.5', required: get_option('libportal')) - sqlite3_dep = dependency('sqlite3', version: '>= 3.22') - - if get_option('soup2').enabled() -@@ -108,7 +109,7 @@ else - webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.1', version: webkitgtk_requirement) - endif - --conf.set10('USE_LIBPORTAL', portal_dep.found()) -+conf.set10('USE_LIBPORTAL', portal_dep.found() and portal_gtk_dep.found()) - - webkit_revision = webkit2gtk_dep.get_variable(pkgconfig : 'revision', default_value : '') - if webkit_revision == 'tarball' -- cgit v1.2.3 From cb475aea08fd438935ab1cc7bc28e018ee3e080e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 5 Jun 2022 02:00:01 +0200 Subject: gnu: alpine: Update to 2.26. * gnu/packages/mail.scm (alpine): Update to 2.26. [source]: Remove patch. * gnu/packages/patches/alpine-fix-privacy-policy-crash.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/mail.scm | 8 ++--- .../patches/alpine-fix-privacy-policy-crash.patch | 39 ---------------------- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 gnu/packages/patches/alpine-fix-privacy-policy-crash.patch (limited to 'gnu/packages/patches') diff --git a/gnu/local.mk b/gnu/local.mk index abd6a30d66..d49af0d898 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -848,7 +848,6 @@ dist_patch_DATA = \ %D%/packages/patches/akonadi-not-relocatable.patch \ %D%/packages/patches/akonadi-timestamps.patch \ %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \ - %D%/packages/patches/alpine-fix-privacy-policy-crash.patch \ %D%/packages/patches/anki-mpv-args.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c9fa62a1f3..1e2375c113 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3670,7 +3670,7 @@ operators and scripters.") (define-public alpine (package (name "alpine") - (version "2.25") + (version "2.26") (source (origin (method git-fetch) @@ -3683,14 +3683,12 @@ operators and scripters.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0z6dp3cpz1dmbxw41ravsx1bxychafp0ij8gvj96mzz7rm9pdnq3")) + (base32 "1padh9kgn9blzjf0016i2f15c615fk17m8vg8kx301jhmc2r973h")) (modules '((guix build utils))) (snippet '(begin ;; Remove pre-built binaries scattered across the source repository. - (for-each delete-file (find-files "." "\\.(dll|exe)")))) - (patches - (search-patches "alpine-fix-privacy-policy-crash.patch")))) + (for-each delete-file (find-files "." "\\.(dll|exe)")))))) (build-system gnu-build-system) (arguments `(#:make-flags diff --git a/gnu/packages/patches/alpine-fix-privacy-policy-crash.patch b/gnu/packages/patches/alpine-fix-privacy-policy-crash.patch deleted file mode 100644 index d514ac33a0..0000000000 --- a/gnu/packages/patches/alpine-fix-privacy-policy-crash.patch +++ /dev/null @@ -1,39 +0,0 @@ -X-Git-Url: https://repo.or.cz/alpine.git/blobdiff_plain/fb2217ac67706e4cbef69bea41041e2fb8b910e9..3ee981816abfb7d47ffc0ac522fff002b5749b72:/alpine/help.c - -diff --git a/alpine/help.c b/alpine/help.c -index 4f1bf46..e9c7b34 100644 ---- a/alpine/help.c -+++ b/alpine/help.c -@@ -36,6 +36,7 @@ static char rcsid[] = "$Id: help.c 1032 2008-04-11 00:30:04Z hubert@u.washington - #include "../pith/detoken.h" - #include "../pith/list.h" - #include "../pith/margin.h" -+#include "../pith/busy.h" - - - typedef struct _help_scroll { -@@ -135,10 +136,12 @@ helper_internal(HelpType text, char *frag, char *title, int flags) - is_external = 0; - - if(shown_text && *shown_text && !struncmp(*shown_text, "x-alpine-http:", 14)){ -- int status; -+ int status, we_cancel = 0; -+ -+ we_cancel = busy_cue(_("Retrieving help text"), NULL, 1); - HTTPSTREAM *stream = http_open(*shown_text + 14); - if(stream) help_text = http_get(stream, NULL); -- status = stream->status ? stream->status->code : -1; -+ status = stream && stream->status ? stream->status->code : -1; - if(stream) http_close(stream); - if(status != HTTP_OK){ - shown_text = NO_HELP; -@@ -165,7 +168,8 @@ helper_internal(HelpType text, char *frag, char *title, int flags) - *rv = NULL; - } - } -- -+ if(we_cancel) -+ cancel_busy_cue(-1); - } - - if(F_ON(F_BLANK_KEYMENU,ps_global)){ -- cgit v1.2.3