master 1319d108da: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 1319d108dae70a8349110acd0f88d22436a9a70c
Merge: 5d257a99b7 6d3608be88
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    6d3608be88 Seccomp: improve support for newer versions of glibc (Bug#...
    e58ecd01d5 EUDC: Fix a quoting bug in the BBDB backend
---
 lib-src/seccomp-filter.c | 2 ++
 lisp/net/eudcb-bbdb.el   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib-src/seccomp-filter.c b/lib-src/seccomp-filter.c
index 552a986239..d368cbb46c 100644
--- a/lib-src/seccomp-filter.c
+++ b/lib-src/seccomp-filter.c
@@ -228,6 +228,7 @@ main (int argc, char **argv)
      capabilities, and operating on them shouldn't cause security
      issues.  */
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (read));
+  RULE (SCMP_ACT_ALLOW, SCMP_SYS (pread64));
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (write));
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (close));
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (lseek));
@@ -239,6 +240,7 @@ main (int argc, char **argv)
      should be further restricted using mount namespaces.  */
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (access));
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (faccessat));
+  RULE (SCMP_ACT_ALLOW, SCMP_SYS (faccessat2));
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (stat));
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (stat64));
   RULE (SCMP_ACT_ALLOW, SCMP_SYS (lstat));
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index 60a3adbc34..e71dc238d0 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -233,7 +233,7 @@ RETURN-ATTRS is a list of attributes to return, defaulting 
to
       (setq bbdb-attrs (append bbdb-attrs (list (car query-attrs))))
       (if (car query-attrs)
          ;; BEWARE: `bbdb-search' is a macro!
-         (setq records (eval `(bbdb-search records ,@bbdb-attrs) t)))
+         (setq records (eval `(bbdb-search (quote ,records) ,@bbdb-attrs) t)))
       (setq query-attrs (cdr query-attrs)))
     (mapc (lambda (record)
             (setq filtered (eudc-filter-duplicate-attributes record))