Source: slurm-wlm
Version: 23.11.3-2
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. slurm-wlm installs files into /lib; these should be moved into the
respective canonical locations in /usr/.
Please find a patch attached. It has been build-tested.
Note 1: this change includes moving the .so into a multiarch path which
is recommended on Debian nowadays.
Note 2: this should not be backported to bookworm. If you intend to
backport, please use dh_movetousr instead.
Note 3: this change also drops the libpam dev packages as they appear to
be unnecessary. Instead the .la/.a files are listed as not-installed.
If your package will change for the t64 transition or otherwise
rename/split/move its binaries (packages) during trixie, please
then upload to experimental and get in touch with the UsrMerge
driver, please see the wiki [1].
Michael
[1] https://wiki.debian.org/UsrMerge
diff --git a/debian/changelog b/debian/changelog
index f8262c05..9206ce5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+slurm-wlm (23.11.3-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop libpam dev packages.
+ PAM modules are shared libraries that are loaded by the PAM stack. They
+ do not have an public API which would warrant a -dev package.
+ * Install PAM modules into multiarch path in /usr. (Closes: #-1)
+
+ -- Michael Biebl <bi...@debian.org> Sat, 17 Feb 2024 12:49:38 +0100
+
slurm-wlm (23.11.3-2) unstable; urgency=medium
* Team upload
diff --git a/debian/control b/debian/control
index 62482dce..f6de02f6 100644
--- a/debian/control
+++ b/debian/control
@@ -654,21 +654,6 @@ Description: PAM module to authenticate using the Slurm
resource manager
restricted to user root and users who have been allocated resources on
that node.
-Package: libpam-slurm-dev
-Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${shlibs:Depends},
- ${misc:Depends}
-Description: Slurm PAM module development files
- The Slurm Workload Manager is an open-source cluster resource management and
- job scheduling system that strives to be simple, scalable, portable,
- fault-tolerant, and interconnect agnostic.
- Pluggable Authentication Module (PAM) for restricting access to compute
- nodes where Slurm performs resource management. Access to the node is
- restricted to user root and users who have been allocated resources on
- This package contains development files for the Slurm pam module
-
Package: libpam-slurm-adopt
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
@@ -685,23 +670,6 @@ Description: PAM module to authenticate users running a
Slurm job and track thei
step of the job so that processes spawned are tracked and Slurm can
perform a complete cleanup when the job is completed.
-Package: libpam-slurm-adopt-dev
-Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
- ${shlibs:Depends},
- ${misc:Depends}
-Description: Slurm adopt PAM module development files
- The Slurm Workload Manager is an open-source cluster resource management and
- job scheduling system that strives to be simple, scalable, portable,
- fault-tolerant, and interconnect agnostic.
- Pluggable Authentication Module (PAM) for restricting access to compute
- nodes where Slurm performs resource management to users who have a
- running job. The user's connection is "adopted" into the "external"
- step of the job so that processes spawned are tracked and Slurm can
- perform a complete cleanup when the job is completed.
- This package contains development files for the Slurm adopt pam module
-
Package: slurm-wlm-emulator
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends},
diff --git a/debian/libpam-slurm-adopt-dev.install
b/debian/libpam-slurm-adopt-dev.install
deleted file mode 100644
index 25bd6cc4..00000000
--- a/debian/libpam-slurm-adopt-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/security/pam_slurm_adopt.a
-lib/security/pam_slurm_adopt.la
diff --git a/debian/libpam-slurm-adopt.install
b/debian/libpam-slurm-adopt.install
index ee78e99c..c3f95b7b 100644
--- a/debian/libpam-slurm-adopt.install
+++ b/debian/libpam-slurm-adopt.install
@@ -1,2 +1,2 @@
-lib/security/pam_slurm_adopt.so
+usr/lib/*/security/pam_slurm_adopt.so
debian/pam-configs/slurm-adopt usr/share/pam-configs/
diff --git a/debian/libpam-slurm-dev.install b/debian/libpam-slurm-dev.install
deleted file mode 100644
index 524f2623..00000000
--- a/debian/libpam-slurm-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/security/pam_slurm.a
-lib/security/pam_slurm.la
diff --git a/debian/libpam-slurm.install b/debian/libpam-slurm.install
index 60be2be0..4b51d83c 100644
--- a/debian/libpam-slurm.install
+++ b/debian/libpam-slurm.install
@@ -1,2 +1,2 @@
-lib/security/pam_slurm.so
+usr/lib/*/security/pam_slurm.so
debian/pam-configs/slurm usr/share/pam-configs/
diff --git a/debian/not-installed b/debian/not-installed
index a43db53c..5d535cf6 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +1,4 @@
debian/tmp/usr/lib/*/slurm-wlm/src/sattach/sattach.wrapper.c
debian/tmp/usr/lib/*/slurm-wlm/src/srun/srun.wrapper.c
+debian/tmp/usr/lib/*/security/*.a
+debian/tmp/usr/lib/*/security/*.la
diff --git a/debian/rules b/debian/rules
index bdc741ac..a1035f55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ override_dh_auto_clean:
# hardening-no-fortify-functions
# Notice that -g in CFLAGS is still provided by dpkg-buildflags
override_dh_auto_configure:
- dh_auto_configure -- --sysconfdir=/etc/slurm --with-munge --enable-pam
--without-rpath --disable-debug --enable-multiple-slurmd
--with-pmix=/usr/lib/$(DEB_HOST_MULTIARCH)/pmix2 $(ENABLEDEPRECATED)
SUCMD=/bin/su SLEEP_CMD=/bin/sleep
+ dh_auto_configure -- --sysconfdir=/etc/slurm --with-munge --enable-pam
--without-rpath --disable-debug --enable-multiple-slurmd
--with-pmix=/usr/lib/$(DEB_HOST_MULTIARCH)/pmix2
--with-pam_dir=/usr/lib/$(DEB_HOST_MULTIARCH)/security $(ENABLEDEPRECATED)
SUCMD=/bin/su SLEEP_CMD=/bin/sleep
dh_auto_configure --builddirectory build-emulator --
-sysconfdir=/etc/slurm --with-munge --enable-pam --without-rpath
--disable-debug --enable-front-end --enable-multiple-slurmd
--with-pmix=/usr/lib/$(DEB_HOST_MULTIARCH)/pmix2 $(ENABLEDEPRECATED)
SUCMD=/bin/su SLEEP_CMD=/bin/sleep
override_dh_auto_build:
dh_auto_build
@@ -164,8 +164,7 @@ override_dh_strip:
dh_strip -plibslurm-dev --no-automatic-dbgsym
dh_strip -pslurmrestd --no-automatic-dbgsym
strip --verbose --strip-unneeded --remove-section=.comment \
- --remove-section=.note
debian/slurm-*-plugin*-dev/usr/lib/*/slurm-wlm/*.a \
- debian/libpam-slurm*-dev/lib/security/*.a
+ --remove-section=.note
debian/slurm-*-plugin*-dev/usr/lib/*/slurm-wlm/*.a
override_dh_auto_test:
