From a6ec8e928b1cac6168718c7d24888220c0af065c2afb54ea5651a74a0cccab7c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 7 Apr 2011 23:09:23 +0000 Subject: [PATCH] Accepting request 66472 from home:jengelh:dev Ok OBS-URL: https://build.opensuse.org/request/show/66472 OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=25 --- 29d23c4-fix-log-message.diff | 26 ----------- pam_mount-2.8.tar.xz | 3 -- pam_mount-2.8.tar.xz.asc | 7 --- pam_mount-2.9.tar.xz | 3 ++ pam_mount-2.9.tar.xz.asc | 7 +++ pam_mount.changes | 9 ++++ pam_mount.spec | 86 +++++++++++++++++------------------- 7 files changed, 59 insertions(+), 82 deletions(-) delete mode 100644 29d23c4-fix-log-message.diff delete mode 100644 pam_mount-2.8.tar.xz delete mode 100644 pam_mount-2.8.tar.xz.asc create mode 100644 pam_mount-2.9.tar.xz create mode 100644 pam_mount-2.9.tar.xz.asc diff --git a/29d23c4-fix-log-message.diff b/29d23c4-fix-log-message.diff deleted file mode 100644 index f06c3dd..0000000 --- a/29d23c4-fix-log-message.diff +++ /dev/null @@ -1,26 +0,0 @@ -parent af3f78d48b3191f4c452a91c75c95123e4ae28e2 (v2.8-2-gaf3f78d) -commit 29d23c4f429e87d1449309e2e247cd2e47d72120 -Author: Jan Engelhardt -Date: Mon Jan 3 01:23:35 2011 +0100 - -pam_mount: fix printing of log message ---- - src/mount.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/src/mount.c b/src/mount.c -index 22de49d..68926ee 100644 ---- a/src/mount.c -+++ b/src/mount.c -@@ -293,7 +293,8 @@ static bool mkmountpoint(struct vol *volume, const char *d) - break; - } - w4rn("chown %s -> %ld:%ld\n", dtmp, -- pe->pw_uid, pe->pw_gid); -+ static_cast(long, pe->pw_uid), -+ static_cast(long, pe->pw_gid)); - } - HXmc_free(dtmp); - /* restore state: */ --- -# Created with git-export-patch diff --git a/pam_mount-2.8.tar.xz b/pam_mount-2.8.tar.xz deleted file mode 100644 index ef5cb76..0000000 --- a/pam_mount-2.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:720ee7d7969189e2bcf8b9c0ac51049e7f6219c95b79049bb9042c6ef21a457b -size 283280 diff --git a/pam_mount-2.8.tar.xz.asc b/pam_mount-2.8.tar.xz.asc deleted file mode 100644 index fe65ace..0000000 --- a/pam_mount-2.8.tar.xz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEABECAAYFAk0RYBYACgkQ92gFgoRMQ2DiIQCfU+9NDL4pcMJshPEi/Zba19t4 -VuMAn2hM7X/VZI7o0VjfXnYXvOWVtzF0 -=gldi ------END PGP SIGNATURE----- diff --git a/pam_mount-2.9.tar.xz b/pam_mount-2.9.tar.xz new file mode 100644 index 0000000..841636c --- /dev/null +++ b/pam_mount-2.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:935fb7122354a3992eb8ada96eef60c6e6c718781aded0b80f1cf0649b93a246 +size 284372 diff --git a/pam_mount-2.9.tar.xz.asc b/pam_mount-2.9.tar.xz.asc new file mode 100644 index 0000000..73a8f3a --- /dev/null +++ b/pam_mount-2.9.tar.xz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEABECAAYFAk2dAMEACgkQ92gFgoRMQ2DTjwCfYJTfkQ9Ho3smKSNPoOxoia3u +xPIAnAhoXXQFn7zrt0404EKoJaxdJHh1 +=UFs0 +-----END PGP SIGNATURE----- diff --git a/pam_mount.changes b/pam_mount.changes index 06d6f69..5805276 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Apr 7 00:15:50 UTC 2011 - jengelh@medozas.de + +- Update to new upstream release 2.9 +* Support for mount --bind/--move +* mount.crypt: warn about unwritable /etc/mtab +- %VERSION should have been %%VERSION in post +- Run spec-beautifier + ------------------------------------------------------------------- Mon Feb 14 15:37:32 UTC 2011 - coolo@novell.com diff --git a/pam_mount.spec b/pam_mount.spec index c0fee71..dd9cddf 100644 --- a/pam_mount.spec +++ b/pam_mount.spec @@ -19,25 +19,24 @@ Name: pam_mount -BuildRequires: perl-XML-Parser perl-XML-Writer -BuildRequires: libtool pam-devel >= 0.99 pkg-config >= 0.19 -BuildRequires: libxml2-devel >= 2.6 openssl-devel >= 0.9.7 -BuildRequires: libHX-devel >= 3.6 +BuildRequires: perl-XML-Parser, perl-XML-Writer +BuildRequires: libtool, pam-devel >= 0.99, pkg-config >= 0.19 +BuildRequires: libxml2-devel >= 2.6, openssl-devel >= 0.9.7 +BuildRequires: libHX-devel >= 3.10.1 BuildRequires: libcryptsetup-devel >= 1.1.2 Requires: device-mapper >= 1.02.48 BuildRequires: linux-kernel-headers >= 2.6 Summary: A PAM Module that can Mount Volumes for a User Session -Version: 2.8 -Release: 2 +Version: 2.9 +Release: 1 # for fd0ssh and ofl: Suggests: hxtools >= 20090116 Recommends: cifs-mount # for mount: Requires: util-linux License: LGPLv2.1+ -Prefix: /usr Group: System/Libraries -Source: %{name}-%{version}.tar.xz +Source: %name-%version.tar.xz Source9: %name-%version.tar.xz.asc BuildRequires: xz Source1: convert_pam_mount_conf.pl @@ -46,9 +45,8 @@ Source3: mount.crypt Source4: mount.encfs13 Source5: baselibs.conf Patch1: pam_mount-0.47-enable-logout-kill.dif -Patch2: 29d23c4-fix-log-message.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://pam-mount.sf.net/ +BuildRoot: %_tmppath/%name-%version-build +URL: http://pam-mount.sf.net/ Requires(post): coreutils, perl-XML-Writer, perl-XML-Parser %description @@ -67,71 +65,67 @@ dm-crypt and LUKS. %prep %setup -q %patch1 -p1 -%patch2 -p1 %build -%configure --with-slibdir=/%{_lib} %{?_with_selinux:--with-selinux} -%{__make} %{?_smp_mflags} +%configure --with-slibdir=/%_lib %{?_with_selinux:--with-selinux} +make %{?_smp_mflags} %install -make install DESTDIR=${RPM_BUILD_ROOT} +make install DESTDIR=%buildroot # Remove static and libtool version -rm -f ${RPM_BUILD_ROOT}/%{_lib}/security/pam_mount.{a,la} +rm -f %buildroot/%_lib/security/pam_mount.{a,la} #install the docs -mkdir -p ${RPM_BUILD_ROOT}/%_docdir/%{name}/examples -cp doc/bugs.txt doc/changelog.txt LICENSE* doc/faq.txt doc/todo.txt doc/options.txt doc/pam_mount.txt ${RPM_BUILD_ROOT}/%_docdir/%name/ -install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}/%_docdir/%{name}/examples/ -install -m 755 %{SOURCE2} ${RPM_BUILD_ROOT}/%_docdir/%{name}/examples/ +mkdir -p %buildroot/%_docdir/%name/examples +cp doc/bugs.txt doc/changelog.txt LICENSE* doc/faq.txt doc/todo.txt doc/options.txt doc/pam_mount.txt %buildroot/%_docdir/%name/ +install -m 755 %SOURCE1 %buildroot/%_docdir/%name/examples/ +install -m 755 %SOURCE2 %buildroot/%_docdir/%name/examples/ # -# move /sbin/mount.crypt to /usr/sbin/mount.crypt and put a wrapper script to /sbin/mount.crypt +# move /sbin/mount.crypt to %_sbindir/mount.crypt and put a wrapper script to /sbin/mount.crypt # The same for mount.encfs13 # -mkdir -p ${RPM_BUILD_ROOT}/usr/sbin/ -mv ${RPM_BUILD_ROOT}/sbin/mount.crypt ${RPM_BUILD_ROOT}/usr/sbin/ -mv ${RPM_BUILD_ROOT}/sbin/mount.encfs13 ${RPM_BUILD_ROOT}/usr/sbin/ -ln -s /usr/sbin/mount.crypt ${RPM_BUILD_ROOT}/usr/sbin/umount.crypt -ln -s /usr/sbin/mount.encfs13 ${RPM_BUILD_ROOT}/usr/sbin/umount.encfs13 -install -m755 %{SOURCE3} ${RPM_BUILD_ROOT}/sbin/ -install -m755 %{SOURCE4} ${RPM_BUILD_ROOT}/sbin/ +mkdir -p %buildroot%_sbindir/ +mv %buildroot/sbin/mount.crypt %buildroot%_sbindir/ +mv %buildroot/sbin/mount.encfs13 %buildroot%_sbindir/ +ln -s %_sbindir/mount.crypt %buildroot%_sbindir/umount.crypt +ln -s %_sbindir/mount.encfs13 %buildroot%_sbindir/umount.encfs13 +install -m755 %SOURCE3 %buildroot/sbin/ +install -m755 %SOURCE4 %buildroot/sbin/ %post if [ -e etc/security/pam_mount.conf ] then - cp etc/security/pam_mount.conf.xml %_docdir/%{name}/examples/ - %_docdir/%{name}/examples/convert_pam_mount_conf.pl \ + cp etc/security/pam_mount.conf.xml %_docdir/%name/examples/ + %_docdir/%name/examples/convert_pam_mount_conf.pl \ -i etc/security/pam_mount.conf -o etc/security/pam_mount.conf.xml fi -if [ $1 -gt 1 ] +if [ "$1" -gt 1 ] then - for v in `rpm -q --queryformat "%{VERSION} " %{name}`; do + for v in `rpm -q --queryformat "%%VERSION " %name`; do if echo "$v" | grep -E "^0\." - ; then - %_docdir/%{name}/examples/convert_keyhash.pl \ + %_docdir/%name/examples/convert_keyhash.pl \ -i etc/security/pam_mount.conf.xml break; fi done fi -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-, root, root) %docdir %_docdir/%name %_docdir/%name -/%{_lib}/security/pam_mount*.so +/%_lib/security/pam_mount*.so /sbin/mount.crypt* /sbin/umount.crypt* /sbin/mount.encfs13 -%{_sbindir}/mount.crypt -%{_sbindir}/umount.crypt -%{_sbindir}/mount.encfs13 -%{_sbindir}/umount.encfs13 -%{_sbindir}/pmvarrun -%{_sbindir}/pmt-ehd -%config(noreplace) %{_sysconfdir}/security/pam_mount.conf.xml -%doc %{_mandir}/man5/pam_mount.conf.5.gz -%doc %{_mandir}/man8/*.8.gz +%_sbindir/mount.crypt +%_sbindir/umount.crypt +%_sbindir/mount.encfs13 +%_sbindir/umount.encfs13 +%_sbindir/pmvarrun +%_sbindir/pmt-ehd +%config(noreplace) %_sysconfdir/security/pam_mount.conf.xml +%doc %_mandir/man5/pam_mount.conf.5.gz +%doc %_mandir/man8/*.8.gz %if 0%{?_with_selinux:1} %policy %_sysconfdir/selinux/strict/src/policy/macros/%{name}_macros.te %policy %_sysconfdir/selinux/strict/src/policy/file_contexts/misc/%name.fc