summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
-rw-r--r--debian/control9
-rw-r--r--debian/extra/pam.d/elogind-user6
-rwxr-xr-xdebian/rules2
4 files changed, 14 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index 7fdeda931..859c51a5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-elogind (239.1-1+nosubmodule~rc1) unstable; urgency=medium
+elogind (239.1-1+debian1~rc2) unstable; urgency=medium
+ * Use shutdown rather than poweroff as the latter is missing on runit systems.
* Remove upstream pwx git submodule. Thanks to Ian Jackson.
- -- Mark Hindley <mark@hindley.org.uk> Fri, 09 Nov 2018 10:50:43 +0000
+ --
elogind (239.1-1+debian1~rc1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 7821a102f..4fc3e66a2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@ Source: elogind
Section: admin
Priority: optional
Maintainer: Andreas Messer <andi@bastelmap.de>
+Uploaders: Mark Hindley <mark@hindley.org.uk>
Standards-Version: 4.2.1
-Vcs-Git: https://git.devuan.org/amesser/elogind.git
-Vcs-Browser: https://git.devuan.org/amesser/elogind.git
+Vcs-Git: https://git.devuan.org/LeePen/elogind.git
+Vcs-Browser: https://git.devuan.org/LeePen/elogind
Homepage: https://github.com/elogind/elogind
Build-Depends: debhelper (>= 11),
dpkg-dev (>= 1.16.0),
@@ -63,6 +64,7 @@ Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
libelogind0 (= ${binary:Version})
+Conflicts: libsystemd-dev
Description: user, seat and session management library (development files)
This package contains the files needed for developing applications that
use libelogind
@@ -78,9 +80,6 @@ Depends: ${shlibs:Depends},
elogind (= ${binary:Version}),
libpam-runtime
Conflicts: libpam-ck-connector
-Breaks: libpam-systemd
-Provides: libpam-systemd
-Replaces: libpam-systemd
Description: elogind PAM module
Plugable Authentication Module to register a session with elogind
diff --git a/debian/extra/pam.d/elogind-user b/debian/extra/pam.d/elogind-user
index 6a5d13d80..6e986e712 100644
--- a/debian/extra/pam.d/elogind-user
+++ b/debian/extra/pam.d/elogind-user
@@ -1,11 +1,15 @@
# This file is part of elogind.
#
-# Used by elogind --user instances.
+# Interface to logind instances
+
@include common-account
+
# SELinux is disabled at the moment
# session required pam_selinux.so close
# session required pam_selinux.so nottys open
session required pam_loginuid.so
session required pam_limits.so
+
@include common-session-noninteractive
+
session optional pam_elogind.so
diff --git a/debian/rules b/debian/rules
index b1023c94f..a45cf0fc5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@
# pam libs must go to /lib/*/security, same for udev rules
# - disable killing users processes by default. This is weird an unexpected
# behavior
+# - /sbin/poweroff is missing on runit systems, so use /sbin/shutdown instead
# - SELinux build is broken on 239 (fix available for 240)
# - tests disabled beacuase some of the tests seem to require elogind running.
# Need to sort out which tests could be run
@@ -16,6 +17,7 @@ CONFFLAGS = \
-Ddocdir=/usr/share/doc/elogind \
-Dudevrulesdir=/lib/udev/rules.d \
-Ddefault-kill-user-processes=false \
+ -Dpoweroff-path=/sbin/shutdown \
-Dselinux=false \
-Dtests=false