commit pam_mount for openSUSE:Factory
Hello community, here is the log from the commit of package pam_mount for openSUSE:Factory checked in at Fri Apr 15 10:43:17 CEST 2011. -------- --- pam_mount/pam_mount.changes 2011-02-14 16:38:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/pam_mount/pam_mount.changes 2011-04-07 17:20:12.000000000 +0200 @@ -1,0 +2,9 @@ +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 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 29d23c4-fix-log-message.diff pam_mount-2.8.tar.xz New: ---- pam_mount-2.9.tar.xz pam_mount-2.9.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_mount.spec ++++++ --- /var/tmp/diff_new_pack.MXJhYO/_old 2011-04-15 10:42:17.000000000 +0200 +++ /var/tmp/diff_new_pack.MXJhYO/_new 2011-04-15 10:42:17.000000000 +0200 @@ -22,22 +22,22 @@ 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: 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 Source2: convert_keyhash.pl @@ -45,7 +45,6 @@ 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/ Requires(post): coreutils, perl-XML-Writer, perl-XML-Parser @@ -66,71 +65,67 @@ %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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de