Accepting request 903000 from filesystems:snapper

Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/903000 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/snapper?expand=0&rev=131
2021-07-02 11:26:45 +00:00 · 2021-07-02 11:26:45 +00:00 · 399d92bb46
commit 399d92bb46
parent 0ba6ad7eff fd702f7307
16 changed files with 35 additions and 21 deletions
--- a/debian.tar.gz
+++ b/debian.tar.gz
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9aecd87314a8bbd35baf4605721c369137547277e9e1cdc2593553836fc0ab3d
-size 3424
+oid sha256:531fc8b06c319c8c9331aff726b068965a6ffc2a6db30878c3f8c1796521f5f1
+size 3442
--- a/snapper-0.9.0.tar.bz2
+++ b/snapper-0.9.0.tar.bz2
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4b49e7709742239c352565101f94c80a18563869bdafbde26e94a5d8b8c3bfa
-size 639544
+oid sha256:b6741cdc87fce0144ef3334a3e7a38afde1c0810f1736982b6005b678ff03a8b
+size 638839
--- a/snapper-Debian_10.0.dsc
+++ b/snapper-Debian_10.0.dsc
@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-422828cb89d5e8c43c22c845fcea3ff2 639544 snapper-0.9.0.tar.bz2
+2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2
--- a/snapper-Debian_9.0.dsc
+++ b/snapper-Debian_9.0.dsc
@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-422828cb89d5e8c43c22c845fcea3ff2 639544 snapper-0.9.0.tar.bz2
+2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2
--- a/snapper-Debian_Unstable.dsc
+++ b/snapper-Debian_Unstable.dsc
@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-422828cb89d5e8c43c22c845fcea3ff2 639544 snapper-0.9.0.tar.bz2
+2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2
--- a/snapper-xUbuntu_17.04.dsc
+++ b/snapper-xUbuntu_17.04.dsc
@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-422828cb89d5e8c43c22c845fcea3ff2 639544 snapper-0.9.0.tar.bz2
+2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2
--- a/snapper-xUbuntu_17.10.dsc
+++ b/snapper-xUbuntu_17.10.dsc
@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-422828cb89d5e8c43c22c845fcea3ff2 639544 snapper-0.9.0.tar.bz2
+2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2
--- a/snapper-xUbuntu_18.04.dsc
+++ b/snapper-xUbuntu_18.04.dsc
@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-422828cb89d5e8c43c22c845fcea3ff2 639544 snapper-0.9.0.tar.bz2
+2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2
--- a/snapper-xUbuntu_18.10.dsc
+++ b/snapper-xUbuntu_18.10.dsc
@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-422828cb89d5e8c43c22c845fcea3ff2 639544 snapper-0.9.0.tar.bz2
+2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2
--- a/snapper-xUbuntu_19.04.dsc
+++ b/snapper-xUbuntu_19.04.dsc
@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-422828cb89d5e8c43c22c845fcea3ff2 639544 snapper-0.9.0.tar.bz2
+2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2
--- a/snapper-xUbuntu_19.10.dsc
+++ b/snapper-xUbuntu_19.10.dsc
@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-422828cb89d5e8c43c22c845fcea3ff2 639544 snapper-0.9.0.tar.bz2
+2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2
--- a/snapper-xUbuntu_20.04.dsc
+++ b/snapper-xUbuntu_20.04.dsc
@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-422828cb89d5e8c43c22c845fcea3ff2 639544 snapper-0.9.0.tar.bz2
+2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2
--- a/snapper-xUbuntu_20.10.dsc
+++ b/snapper-xUbuntu_20.10.dsc
@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-422828cb89d5e8c43c22c845fcea3ff2 639544 snapper-0.9.0.tar.bz2
+2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2
--- a/snapper-xUbuntu_21.04.dsc
+++ b/snapper-xUbuntu_21.04.dsc
@ -11,4 +11,4 @@ Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost
 #  423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz
 #
 Files:
-422828cb89d5e8c43c22c845fcea3ff2 639544 snapper-0.9.0.tar.bz2
+2eef45af33426414604d8f03467c0e6c 638839 snapper-0.9.0.tar.bz2
--- a/snapper.changes
+++ b/snapper.changes
@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 16 11:50:49 CEST 2021 - aschnell@suse.com
+
+- added configure option for location of PAM module
+  (gh#openSUSE/snapper#659)
+
 -------------------------------------------------------------------
 Mon May 17 08:39:58 CEST 2021 - aschnell@suse.com

--- a/snapper.spec
+++ b/snapper.spec
@ -16,12 +16,19 @@
 #


-#Compat macro for new _fillupdir macro introduced in Nov 2017
+# Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
  %define _fillupdir /var/adm/fillup-templates
 %endif

-# optionally build with test coverage reporting
+# Location for PAM module
+%if 0%{?usrmerged}
+%define pam_security_dir %{_libdir}/security
+%else
+%define pam_security_dir /%{_lib}/security
+%endif
+
+# Optionally build with test coverage reporting
 %bcond_with coverage

 Name:           snapper
@ -117,10 +124,11 @@ export CXXFLAGS="%{optflags} -DNDEBUG"

 autoreconf -fvi
 %configure \
-	--docdir="%{_defaultdocdir}/snapper"				\
+	--docdir="%{_defaultdocdir}/snapper"					\
 %if %{with coverage}
 	--enable-coverage \
 %endif
+	--with-pam-security="%{pam_security_dir}"				\
 %if 0%{?suse_version} <= 1310
 	--disable-rollback							\
 %endif
@ -132,7 +140,7 @@ make %{?_smp_mflags}

 %install
 %make_install
-rm -f "%{buildroot}/%{_libdir}"/*.la "%{buildroot}/%{_lib}/security/pam_snapper.la"
+rm -f "%{buildroot}/%{_libdir}"/*.la "%{buildroot}/%{pam_security_dir}/pam_snapper.la"
 rm -f %{buildroot}/etc/cron.hourly/suse.de-snapper
 rm -f %{buildroot}/etc/cron.daily/suse.de-snapper

@ -301,7 +309,7 @@ A PAM module for calling snapper during user login and logout.

 %files -n pam_snapper
 %defattr(-,root,root)
-/%{_lib}/security/pam_snapper.so
+/%{pam_security_dir}/pam_snapper.so
 %dir /usr/lib/pam_snapper
 /usr/lib/pam_snapper/*.sh
 %doc %{_mandir}/*/pam_snapper.8*