From b951314c220cb477ce7d1afc07c2213962304f52 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 5 Oct 2018 23:01:16 +0100
Subject: [PATCH] Commit patch queue (exported by git-debrebase)

[git-debrebase make-patches: export and commit patches]
---
 ...shr_create-Detect-and-use-from-sys-m.patch | 55 +++++++++++++++++++
 debian/patches/fix-udev-rules.diff            | 21 +++++++
 debian/patches/series                         |  2 +
 3 files changed, 78 insertions(+)
 create mode 100644 debian/patches/0002-configure.ac-memshr_create-Detect-and-use-from-sys-m.patch
 create mode 100644 debian/patches/fix-udev-rules.diff
 create mode 100644 debian/patches/series

diff --git a/debian/patches/0002-configure.ac-memshr_create-Detect-and-use-from-sys-m.patch b/debian/patches/0002-configure.ac-memshr_create-Detect-and-use-from-sys-m.patch
new file mode 100644
index 000000000..b355ec5b0
--- /dev/null
+++ b/debian/patches/0002-configure.ac-memshr_create-Detect-and-use-from-sys-m.patch
@@ -0,0 +1,55 @@
+From: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Date: Fri, 5 Oct 2018 22:43:34 +0100
+Subject: configure.ac: memshr_create: Detect and use from <sys/mman.h>
+
+Recent glibc versions do have a wrapper for this function.  It is available via
+<sys/mman.h>.  So:
+  * Add <sys/mman.h> to the list of header checks.
+  * Add a conditional include of <sys/mman.h> to the configure test
+    for memshr_create, so that it will pass if the function is there.
+  * Add the same conditional include to missing.h, so that we
+    get it declared when we build.
+
+Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
+---
+ configure.ac        | 4 ++++
+ src/basic/missing.h | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index c0ad243..9ec3390 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -358,6 +358,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
+ # ------------------------------------------------------------------------------
+ 
+ AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
++AC_CHECK_HEADERS([sys/mman.h], [], [])
+ AC_CHECK_HEADERS([linux/memfd.h], [], [])
+ AC_CHECK_HEADERS([linux/vm_sockets.h], [], [], [#include <sys/socket.h>])
+ 
+@@ -399,6 +400,9 @@ AC_CHECK_DECLS([
+ #include <sched.h>
+ #include <string.h>
+ #include <linux/loop.h>
++#ifdef HAVE_SYS_MMAN_H
++#include <sys/mman.h>
++#endif
+ ]])
+ 
+ AC_CHECK_DECLS([getrandom],
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index c62c2db..e8508e7 100644
+--- a/src/basic/missing.h
++++ b/src/basic/missing.h
+@@ -55,6 +55,10 @@
+ #include <linux/btrfs.h>
+ #endif
+ 
++#ifdef HAVE_SYS_MMAN_H
++#include <sys/mman.h>
++#endif
++
+ #ifdef HAVE_LINUX_VM_SOCKETS_H
+ #include <linux/vm_sockets.h>
+ #else
diff --git a/debian/patches/fix-udev-rules.diff b/debian/patches/fix-udev-rules.diff
new file mode 100644
index 000000000..867267b2a
--- /dev/null
+++ b/debian/patches/fix-udev-rules.diff
@@ -0,0 +1,21 @@
+From: Andreas Messer <andi@bastelmap.de>
+Date: Fri, 5 Oct 2018 23:00:20 +0100
+Subject: fix-udev-rules
+
+---
+ src/login/73-seat-late.rules.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/login/73-seat-late.rules.in b/src/login/73-seat-late.rules.in
+index 901df75..a315459 100644
+--- a/src/login/73-seat-late.rules.in
++++ b/src/login/73-seat-late.rules.in
+@@ -12,6 +12,7 @@ ENV{ID_SEAT}=="", IMPORT{parent}="ID_SEAT"
+ 
+ ENV{ID_SEAT}!="", TAG+="$env{ID_SEAT}"
+ 
+-TAG=="uaccess", ENV{MAJOR}!="", RUN{builtin}+="uaccess"
++#This is not supported by eudev because eudev does not know about logind
++#TAG=="uaccess", ENV{MAJOR}!="", RUN{builtin}+="uaccess"
+ 
+ LABEL="seat_late_end"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..c0a4d092a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix-udev-rules.diff
+0002-configure.ac-memshr_create-Detect-and-use-from-sys-m.patch
-- 
2.30.2