summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--.gitmodules3
-rw-r--r--debian/changelog21
-rw-r--r--debian/control9
-rw-r--r--debian/elogind.init2
-rw-r--r--debian/elogind.install7
-rw-r--r--debian/extra/pam.d/elogind-user6
-rw-r--r--debian/patches/Disable_Dbus_activation_by_default.diff.patch11
-rw-r--r--debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff46
-rw-r--r--debian/patches/series2
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/watch1
12 files changed, 45 insertions, 69 deletions
diff --git a/.gitignore b/.gitignore
index 0c45e459f..41372a1e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,10 +40,6 @@ __pycache__/
/test-libelogind*
# Local Helper Scripts and Tools - Not for distribution
-pwx/patches/*
-!pwx/patches/.keep_dir
-pwx/patches_port/*
-!pwx/patches_port/.keep_dir
*.orig
*.rej
*.remote
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index d9427f25e..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "pwx"]
- path = pwx
- url = https://github.com/Yamakuzure/pwx-elogind-migration-tools.git
diff --git a/debian/changelog b/debian/changelog
index cbd0dfb14..7841db074 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,22 @@
-elogind (239.1-1~rc1) unstable; urgency=medium
+elogind (239.1.9-1+debian1~rc1) unstable; urgency=medium
+ * Update to upstream 239.2 prerelease.
+
+ -- Mark Hindley <mark@hindley.org.uk> Mon, 12 Nov 2018 09:34:37 +0000
+
+elogind (239.1-1+debian1~rc2) unstable; urgency=medium
+
+ * Update fix for SIGABRT to upstream #92.
+ * Disable Dbus activation by default.
+ * Use shutdown rather than poweroff as the latter is missing on runit systems.
+ * Remove upstream pwx git submodule. Thanks to Ian Jackson.
+ * libelogind-dev conflicts libsystemd-dev.
+
+ -- Mark Hindley <mark@hindley.org.uk> Fri, 09 Nov 2018 13:01:28 +0000
+
+elogind (239.1-1+debian1~rc1) unstable; urgency=medium
+
+ * Initial upload to Debian (closes: #905388).
* New upstream release v239.1.
* Rework packaging for meson buildsystem.
* Change libpam-elogind Breaks dependencies to Conflicts.
@@ -17,7 +34,7 @@ elogind (239.1-1~rc1) unstable; urgency=medium
https://github.com/elogind/elogind/issues/92).
* New version of /etc/pam.d/elogind-user based on Debian systemd.
- -- Mark Hindley <mark@hindley.org.uk> Wed, 07 Nov 2018 00:00:29 +0000
+ -- Mark Hindley <mark@hindley.org.uk> Wed, 07 Nov 2018 16:31:31 +0000
elogind (234.4-2~exp1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 9d5a27d60..9b7716758 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/elogind.init b/debian/elogind.init
index e08335f91..2a1d36a7f 100644
--- a/debian/elogind.init
+++ b/debian/elogind.init
@@ -13,7 +13,7 @@ set -e
# /etc/init.d/elogind: start and stop the elogind session management daemon
-ELOGIND=/usr/sbin/elogind
+ELOGIND=/lib/elogind/elogind
test -x $ELOGIND || exit 0
diff --git a/debian/elogind.install b/debian/elogind.install
index 7ca5a2012..001fe659b 100644
--- a/debian/elogind.install
+++ b/debian/elogind.install
@@ -1,12 +1,7 @@
bin/
usr/bin
etc/elogind/logind.conf
-lib/elogind/elogind /usr/sbin/
-lib/elogind/libelogind-shared*.so
-lib/elogind/elogind-cgroups-agent
-lib/elogind/elogind-uaccess-command
-lib/elogind/system-sleep/.keep_dir
-lib/elogind/system-shutdown/.keep_dir
+lib/elogind/
lib/udev/rules.d/70-uaccess.rules
lib/udev/rules.d/71-seat.rules
lib/udev/rules.d/73-seat-late.rules
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/patches/Disable_Dbus_activation_by_default.diff.patch b/debian/patches/Disable_Dbus_activation_by_default.diff.patch
new file mode 100644
index 000000000..48d67330e
--- /dev/null
+++ b/debian/patches/Disable_Dbus_activation_by_default.diff.patch
@@ -0,0 +1,11 @@
+--- a/src/login/org.freedesktop.login1.service.in
++++ b/src/login/org.freedesktop.login1.service.in
+@@ -7,5 +7,7 @@
+
+ [D-BUS Service]
+ Name=org.freedesktop.login1
+-Exec=@rootlibexecdir@/elogind --daemon
++# By default, Dbus activation of elogind is disabled. The daemon is started via an init script.
++# Exec=@rootlibexecdir@/elogind --daemon
++Exec=/bin/true
+ User=root
diff --git a/debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff b/debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff
deleted file mode 100644
index 5f1868272..000000000
--- a/debian/patches/Fix_glibc_program_invocation_name_pointer_overlap.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Avoid SIGABRT if program_invocation_short_name is a pointer within progam_invocation_short_name
-Bug: https://github.com/elogind/elogind/issues/92
-
---- a/src/shared/musl_missing.c
-+++ b/src/shared/musl_missing.c
-@@ -34,9 +34,14 @@
-
- static void elogind_free_program_name(void) {
-
-- if (program_invocation_name && (program_invocation_name != program_arg_name) && strlen(program_invocation_name))
-+ if (program_invocation_name &&
-+ (program_invocation_name != program_arg_name) &&
-+ strlen(program_invocation_name))
- program_invocation_name = mfree(program_invocation_name);
-- if (program_invocation_short_name && (program_invocation_short_name != program_arg_name) && strlen(program_invocation_short_name))
-+ if (program_invocation_short_name &&
-+ (program_invocation_short_name != program_arg_name) &&
-+ (program_invocation_short_name + strlen(program_invocation_short_name) != program_invocation_name + strlen(program_invocation_name))
-+ && strlen(program_invocation_short_name))
- program_invocation_short_name = mfree(program_invocation_short_name);
- }
-
---- a/src/basic/process-util.c
-+++ b/src/basic/process-util.c
-@@ -10,6 +10,7 @@
- #include <stdio.h>
- #include <stdio_ext.h>
- #include <stdlib.h>
-+#include <libgen.h>
- #include <string.h>
- #include <sys/mman.h>
- #include <sys/mount.h>
-@@ -306,8 +307,12 @@
-
- k = strlen(program_invocation_name);
- strncpy(program_invocation_name, name, k);
-- if (l > k)
-+ if (l > k) {
- truncated = true;
-+ program_invocation_short_name = NULL;
-+ }
-+ else
-+ program_invocation_short_name = program_invocation_name + strlen(dirname(program_invocation_name)) -1;
- }
-
- /* Third step, completely replace the argv[] array the kernel maintains for us. This requires privileges, but
diff --git a/debian/patches/series b/debian/patches/series
index 33125a623..f98eee609 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
+Disable_Dbus_activation_by_default.diff.patch
manpage-branding.diff
-Fix_glibc_program_invocation_name_pointer_overlap.diff
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
diff --git a/debian/watch b/debian/watch
index fda9f7dad..158e3faed 100644
--- a/debian/watch
+++ b/debian/watch
@@ -7,4 +7,5 @@ version=3
# URLs use only the version as the name, it is recommended to use a
# filenamemangle to adjust the name of the downloaded file:
opts="filenamemangle=s/(?:.*)?v?(\d[\d\.]*)\.tar\.gz/elogind-$1.tar.gz/" \
+ "dversionmangle=s/\+nosubmodule//" \
https://github.com/elogind/elogind/tags (?:.*/)?v?(\d[\d\.]*)\.tar\.gz