Merging debian version 2.40.1-6.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

16 files changed, 101 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index 8d14052..a37b3e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+util-linux (2.40.1-6) experimental; urgency=medium
+
+  * Convert lintian overrides for ftp-master very old lintian
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Fri, 31 May 2024 09:20:49 +0200
+
+util-linux (2.40.1-5) experimental; urgency=medium
+
+  * Target experimental.
+  * Add new binary packages for lastlog2, pam_lastlog2 and liblastlog2.so
+    (Addresses Bug: #1068017)
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Thu, 30 May 2024 19:39:43 +0200
+
 util-linux (2.40.1-4~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index e1e09bb..04fbe4b 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends:
  libpam0g-dev <!stage1>,
  libreadline-dev,
  libselinux1-dev [linux-any],
+ libsqlite3-dev,
  libsystemd-dev [linux-any] <!stage1>,
  libtool,
  libudev-dev [linux-any] <!stage1>,
@@ -468,3 +469,40 @@ Multi-Arch: foreign
 Description: interactive login tools
  Tools commonly found on systems where humans login interactively,
  or are needed with non-standard system configurations.
+
+Package: liblastlog2-2
+Architecture: any
+Priority: optional
+Section: libs
+Multi-Arch: same
+Description: lastlog2 database shared library
+ Y2038 safe lastlog database implementation, library files.
+
+Package: liblastlog2-dev
+Architecture: any
+Priority: optional
+Section: libdevel
+Description: liblastlog2 development files
+ Y2038 safe lastlog database implementation, development files.
+
+Package: libpam-lastlog2
+Architecture: any
+Priority: optional
+Section: admin
+Depends:
+ libpam-runtime
+Recommends:
+ wtmpdb
+Multi-Arch: same
+Description: lastlog2 database PAM module
+ Y2038 safe lastlog database implementation, PAM module.
+
+Package: lastlog2
+Architecture: any
+Priority: optional
+Recommends:
+ libpam-lastlog2
+Multi-Arch: foreign
+Description: Read lastlog2 database
+ This package provides the lastlog2 program, to read the
+ lastlog2 database.
diff --git a/debian/fdisk-udeb.lintian-overrides b/debian/fdisk-udeb.lintian-overrides
index 03a6c73..3a83352 100644
--- a/debian/fdisk-udeb.lintian-overrides
+++ b/debian/fdisk-udeb.lintian-overrides
@@ -1,4 +1,7 @@
 # ncurses/libtinfo doesn't provide an udeb
 fdisk-udeb udeb: embedded-library ncurses [usr/sbin/fdisk]
 fdisk-udeb udeb: embedded-library ncurses [usr/sbin/sfdisk]
+# for ftp-master old lintian
+fdisk-udeb udeb: embedded-library usr/sbin/fdisk: ncurses
+fdisk-udeb udeb: embedded-library usr/sbin/sfdisk: ncurses
 fdisk-udeb udeb: missing-depends-on-sensible-utils sensible-pager [usr/sbin/fdisk]
diff --git a/debian/lastlog2.install b/debian/lastlog2.install
new file mode 100644
index 0000000..5ace316
--- /dev/null
+++ b/debian/lastlog2.install
@@ -0,0 +1,6 @@
+usr/bin/lastlog2
+# begin-remove-after: released:trixie
+usr/lib/systemd/system/lastlog2-import.service
+# end-remove-after
+usr/lib/tmpfiles.d/lastlog2-tmpfiles.conf
+usr/share/bash-completion/completions/lastlog2
diff --git a/debian/lastlog2.manpages b/debian/lastlog2.manpages
new file mode 100644
index 0000000..6ae71fd
--- /dev/null
+++ b/debian/lastlog2.manpages
@@ -0,0 +1 @@
+usr/share/man/man8/lastlog2.8
diff --git a/debian/liblastlog2-2.install b/debian/liblastlog2-2.install
new file mode 100644
index 0000000..6694dba
--- /dev/null
+++ b/debian/liblastlog2-2.install
@@ -0,0 +1 @@
+usr/lib/*/liblastlog2*.so.*
diff --git a/debian/liblastlog2-dev.install b/debian/liblastlog2-dev.install
new file mode 100644
index 0000000..8658fd2
--- /dev/null
+++ b/debian/liblastlog2-dev.install
@@ -0,0 +1,3 @@
+usr/include/liblastlog2
+usr/lib/*/liblastlog2.so
+usr/lib/*/pkgconfig/lastlog2.pc
diff --git a/debian/liblastlog2-dev.manpages b/debian/liblastlog2-dev.manpages
new file mode 100644
index 0000000..45ce4e5
--- /dev/null
+++ b/debian/liblastlog2-dev.manpages
@@ -0,0 +1,2 @@
+usr/share/man/man3/lastlog2.3
+usr/share/man/man3/ll2_import_lastlog.3
diff --git a/debian/libpam-lastlog2.install b/debian/libpam-lastlog2.install
new file mode 100644
index 0000000..8be2ca9
--- /dev/null
+++ b/debian/libpam-lastlog2.install
@@ -0,0 +1,2 @@
+debian/pam-configs/lastlog2 /usr/share/pam-configs/
+usr/lib/*/security/pam_lastlog2.so
diff --git a/debian/libpam-lastlog2.manpages b/debian/libpam-lastlog2.manpages
new file mode 100644
index 0000000..61686be
--- /dev/null
+++ b/debian/libpam-lastlog2.manpages
@@ -0,0 +1 @@
+usr/share/man/man8/pam_lastlog2.8
diff --git a/debian/libpam-lastlog2.postinst b/debian/libpam-lastlog2.postinst
new file mode 100755
index 0000000..2db8674
--- /dev/null
+++ b/debian/libpam-lastlog2.postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+pam-auth-update --package
+
+#DEBHELPER#
diff --git a/debian/libpam-lastlog2.prerm b/debian/libpam-lastlog2.prerm
new file mode 100755
index 0000000..218f2ee
--- /dev/null
+++ b/debian/libpam-lastlog2.prerm
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = remove ] && [ "${DPKG_MAINTSCRIPT_PACKAGE_REFCOUNT:-1}" = 1 ]; then
+    pam-auth-update --package --remove wtmpdb
+fi
+
+#DEBHELPER#
diff --git a/debian/pam-configs/lastlog2 b/debian/pam-configs/lastlog2
new file mode 100644
index 0000000..d0db45a
--- /dev/null
+++ b/debian/pam-configs/lastlog2
@@ -0,0 +1,7 @@
+Name: Maintain lastlog2 database
+Default: yes
+Priority: 0
+Session-Type: Additional
+Session-Interactive-Only: yes
+Session:
+	optional			pam_lastlog2.so
diff --git a/debian/rules b/debian/rules
index 91dc99a..83b90e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,9 +53,6 @@ CONFOPTS += --disable-hwclock-gplv3
 # Reduce setgid programs (cf. CVE-2024-28085)
 CONFOPTS += --disable-use-tty-group
 
-CONFOPTS += --disable-liblastlog2
-CONFOPTS += --disable-pam-liblastlog2
-
 # Get the list of binary package, except lib* and *-udeb, from
 # debian/control instead of hardcoding the list when installing
 # bash-completions below.
diff --git a/debian/shlibs.local b/debian/shlibs.local
index 4ba1838..7e1e0ba 100644
--- a/debian/shlibs.local
+++ b/debian/shlibs.local
@@ -1,5 +1,6 @@
 deb: libblkid 1 libblkid1 (= ${binary:Version})
 deb: libfdisk 1 libfdisk1 (= ${binary:Version})
+deb: liblastlog2 2 liblastlog2-2 (= ${binary:Version})
 deb: libmount 1 libmount1 (= ${binary:Version})
 deb: libsmartcols 1 libsmartcols1 (= ${binary:Version})
 deb: libuuid 1 libuuid1 (= ${binary:Version})
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index eb04cd7..a9b7d1b 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -3,14 +3,18 @@ debhelper-but-no-misc-depends bsdextrautils
 debhelper-but-no-misc-depends bsdutils
 debhelper-but-no-misc-depends eject
 debhelper-but-no-misc-depends fdisk
-debhelper-but-no-misc-depends libblkid-dev
+debhelper-but-no-misc-depends lastlog2
 debhelper-but-no-misc-depends libblkid1
-debhelper-but-no-misc-depends libfdisk-dev
+debhelper-but-no-misc-depends libblkid-dev
 debhelper-but-no-misc-depends libfdisk1
-debhelper-but-no-misc-depends libmount-dev
+debhelper-but-no-misc-depends libfdisk-dev
+debhelper-but-no-misc-depends liblastlog2-2
+debhelper-but-no-misc-depends liblastlog2-dev
 debhelper-but-no-misc-depends libmount1
-debhelper-but-no-misc-depends libsmartcols-dev
+debhelper-but-no-misc-depends libmount-dev
+debhelper-but-no-misc-depends libpam-lastlog2
 debhelper-but-no-misc-depends libsmartcols1
+debhelper-but-no-misc-depends libsmartcols-dev
 debhelper-but-no-misc-depends libuuid1
 debhelper-but-no-misc-depends mount
 debhelper-but-no-misc-depends rfkill