Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pam_chroot for openSUSE:Factory checked in at 2021-12-01 20:47:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pam_chroot (Old) and /work/SRC/openSUSE:Factory/.pam_chroot.new.31177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pam_chroot" Wed Dec 1 20:47:27 2021 rev:19 rq:934974 version:0.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/pam_chroot/pam_chroot.changes 2011-09-23 12:21:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pam_chroot.new.31177/pam_chroot.changes 2021-12-02 02:19:32.401803648 +0100 @@ -1,0 +2,7 @@ +Mon Oct 4 13:35:30 UTC 2021 - Josef M��llers <josef.moellers@suse.com> + +- Use the %_pam_moduledir macro in pam_chroot.spec in order to + have the package follow UsrMerge. + [bsc#1190948, pam_chroot.spec] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_chroot.spec ++++++ --- /var/tmp/diff_new_pack.hEc6BA/_old 2021-12-02 02:19:32.841802113 +0100 +++ /var/tmp/diff_new_pack.hEc6BA/_new 2021-12-02 02:19:32.845802099 +0100 @@ -1,7 +1,7 @@ # -# spec file for package pam_chroot (Version 0.9.2) +# spec file for package pam_chroot # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,23 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# norootforbuild +%define _buildshell /bin/bash Name: pam_chroot -Url: http://sourceforge.net/projects/pam-chroot/ +URL: http://sourceforge.net/projects/pam-chroot/ BuildRequires: pam-devel -License: GPL-2.0+ -Group: System/Libraries Requires: pam Provides: pam-modules:/etc/security/chroot.conf -AutoReqProv: on Version: 0.9.2 -Release: 42 +Release: 0 Summary: Linux-PAM Module that Allows a User to Be Chrooted +License: GPL-2.0-or-later +Group: System/Libraries Source0: pam_chroot-0.9.2.tar.bz2 Source1: baselibs.conf Source50: dlopen.sh @@ -63,31 +62,17 @@ make CFLAGS="$RPM_OPT_FLAGS $EXTRA_CFLAGS -fPIC -DHAVE_SHADOW -DLINUX_PAM" %install -mkdir -p $RPM_BUILD_ROOT/%{_lib}/security -make DESTDIR=$RPM_BUILD_ROOT install -rm -rf $RPM_BUILD_ROOT/usr/{include,lib} -rm -rf $RPM_BUILD_ROOT/%{_lib}/security/*.la -# -# On 64bit archs, we need to move same libraries ourself: -# -if [ %_lib = lib64 ]; then - mv $RPM_BUILD_ROOT/lib/security/* $RPM_BUILD_ROOT/%{_lib}/security/ -fi -# Check for module problems. Specifically, check that every module we just -# installed can actually be loaded by a minimal PAM-aware application. -for module in $RPM_BUILD_ROOT/%{_lib}/security/pam*.so ; do - if ! sh $RPM_SOURCE_DIR/dlopen.sh -lpam -ldl ${module} ; then - exit 1 - fi -done +mkdir -p %{buildroot}%{_pam_moduledir} +make DESTDIR=%{buildroot} install +[[ X"%{_pam_moduledir}" =~ X/lib.*/security/* ]] || mv %{buildroot}/lib/security/* %{buildroot}%{_pam_moduledir} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,755) %doc CREDITS LICENSE README TROUBLESHOOTING %attr(644,root,root) %config(noreplace) /etc/security/chroot.conf -%attr(755,root,root) /%{_lib}/security/pam_*.so +%attr(755,root,root) /%{_pam_moduledir}/pam_*.so %changelog