pam_mount 2.13

OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=38

baselibs.conf

@@ -1,2 +1,3 @@
 pam_mount
   supplements "packageand(pam_mount:pam-<targettype>)"
+libcryptmount0

pam_mount-2.12.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5454ade466fbfed5dc19330647f1f1f70a819d32d8d2355f5ff024cedfa00525
-size 284140

pam_mount-2.12.tar.xz.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAABAgAGBQJOjZfWAAoJEN//LNsZ/DONQ9EQAKDlm/fO1InodgoReEMLWyhl
-fTo3yo3oxLRhh3Ct7YPaD1Y4P0c/29aZ+FiCgaZcb8P9cg5SJtRcnV280XXspK/m
-5FLdTmqMfErn79KoDybv8eQDA4c8ux+8G5y60v7mQIssGay9sE/ECb3fId6evCrS
-eZGH5Hz3jo7Sv8a4kk2X5xWALdMeCu/LqszmL6gC9cxBMmUfzWkdNoykoF1mtlok
-U8PnqqH8DMsy2BiPQzdTlhk8xBXApQR8Gk3NWzJgEFbGdbzVZbvYoBb/OU/i2Ili
-55ayakUzlMe4aCptkR81Jdx2O14rL5EWGq+O+nbyPB0kCGYNE5Pq0+tFgUnDiHC+
-3Q1GLvZjWYRBKrTnorTKnzKyAka/kYItjiJYr7MN/D6ShksaFsBgYrFvDXrzLP1n
-DsvxZP/ZrDoxzdQokQm04Lb2U67IuejVuFHL5sbLjtUS3FA+nI7HbtHorVMR0m26
-UMAYp0ARDGYHWf+H3MzDR5/4uzk4hIrCmNfno7WnY/FRP5MSXmyS2fPcIB8iHcdE
-47RNd+I5bE6356ErV7ntijBkoa+KsUjqj95QrT4ViFl8y7/dcgYUUlvEuanwZEgZ
-s51ZSJVGArdGKV2IGrAzU9SEfXPWK2KQvOKuWrf79Q2XV+UKMZNQetlcTAnm4d6T
-0wK5Rx3S6fyrwWVXU/Qc
-=GILs
------END PGP SIGNATURE-----

pam_mount-2.13.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:077af9626a3ae2d68395392f6af1cb2d795329cd648ab8c6b60f814d7121ab2a
+size 300648

pam_mount-2.13.tar.xz.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAABAgAGBQJO6eWjAAoJEN//LNsZ/DONiTYP/20/8Wbjh8/BYA+0TEBZBZ9u
+3l23YmyUUau2wtNEISuLVyLkFELE2gT5V5Ke2ka1JMJlT9FnDAG0431oRnVA/Tc6
+VhLGCXPYT+NCoRwx8ygwvVR6Qh2QR2/vlwlXuXjQjAAURNBmWQCKS/w0t0nW3zqR
+UwoaseCknwRo7LOjiY7IFQK3oVhCWyFNBEHvyPU3aJnRFaEKuslY7FYaXusv88k7
+nwkC9Re4QfvESesXodxcW0G6q4n9I5poNEFGDG/MU00/yubenPS6mz7Gveu4M+Wr
+ARu1tUP9aKLHWBE8rRp7E8xEEkByD9MUXGCeL5Cs5ubkxUwq2i2tJZ1LpQpfI3Nm
++urlrY6Z7At21VhGddImW1n6DmBzkrSB0EuQ1juiCbEIo0e8ccz7C90evx7pmYs+
+WuBDGvunsSajJnkX6dOYPHvAz2OPCBsHby7Qmj5pkKZgDX4P4DeHwH+d6zkagTGb
+I4imPs/d3kC98091p45iJrqi5cE4X71QU32gfuYr932g3pqmmGMJX0sgIH6cHTQ3
+rMaE72kaF88WXpA8sIn5EO/DrFYkpQxvkprJd34g6wLGwEh/E1ZL8GbMPV3RCDC8
+ri565A8c0hGIlrWJBQS5TFIz2TKh1tOtumBvnoyVoSBMa4nHaxnGQY8K361nXdtt
+NBVtUwuEylOpMvRieBh9
+=SNMw
+-----END PGP SIGNATURE-----

pam_mount.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec 15 11:50:44 UTC 2011 - jengelh@medozas.de
+
+- Update to new upstream release 2.13
+* pam_mount: restore keyfile support for non-crypto mounts
+
 -------------------------------------------------------------------
 Thu Oct  6 11:42:36 UTC 2011 - jengelh@medozas.de
 

pam_mount.spec

@@ -18,34 +18,40 @@
 
 
 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.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.12
+Version:        2.13
-Release:        1
+Release:        0
-# for fd0ssh and ofl:
-Suggests:       hxtools >= 20090116
-Recommends:     cifs-mount
-# for mount:
-Requires:       util-linux
 License:        LGPLv2.1+
 Group:          System/Libraries
+URL:            http://pam-mount.sf.net/
+
 Source:         %name-%version.tar.xz
 Source9:        %name-%version.tar.xz.asc
-BuildRequires:  man xz
 Source1:        convert_pam_mount_conf.pl
 Source2:        convert_keyhash.pl
 Source3:        mount.crypt
 Source5:        baselibs.conf
 Patch1:         pam_mount-0.47-enable-logout-kill.dif
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-URL:            http://pam-mount.sf.net/
+BuildRequires:  perl-XML-Parser perl-XML-Writer
+BuildRequires:  libtool pam-devel >= 0.99
+# LOOP64 support:
+BuildRequires:  linux-glibc-devel >= 2.6
+BuildRequires:  man xz
+BuildRequires:  pkgconfig >= 0.19 pkgconfig(libHX) >= 3.12.1
+BuildRequires:  pkgconfig(libcrypto) >= 0.9.7
+BuildRequires:  pkgconfig(libcryptsetup) >= 1.1.2 pkgconfig(mount) >= 2.20
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.6
+
 Requires(post):	coreutils, perl-XML-Writer, perl-XML-Parser
+# -EBUSY bugs fixed (libdevmapper):
+Requires:       device-mapper >= 1.02.48
+# for mount(8) and mount.cifs:
+Requires:       util-linux
+Recommends:     cifs-mount
+# for fd0ssh and ofl:
+Suggests:       hxtools >= 20090116
 
 %description
 This module is aimed at environments with central file servers that a
@@ -58,19 +64,42 @@ volumes are set up properly because often they need more than just a
 mount call, such as encrypted volumes. This includes SMB/CIFS, FUSE,
 dm-crypt and LUKS.
 
+%package -n libcryptmount0
+Summary:        Library to mount crypto images and handle key files
+Group:          System/Libraries
+
+%description -n libcryptmount0
+libcryptmount takes care of the many steps involved in making a
+crypto image (file) available as a mountable block device, including
+supplemental key file decryption, loop device setup and crypto device
+setup. It supports pam_mount style plain EHD2/OpenSSL images and LUKS
+and transparent use of the OS's crypto layer.
+
+%package -n libcryptmount-devel
+Summary:        Development files for libcryptmount
+Group:          Development/Libraries/C and C++
+
+%description -n libcryptmount-devel
+libcryptmount takes care of the many steps involved in making a
+crypto image (file) available as a mountable block device, including
+supplemental key file decryption, loop device setup and crypto device
+setup. It supports pam_mount style plain EHD2/OpenSSL images and LUKS
+and transparent use of the OS's crypto layer.
+
 %prep
 %setup -q
 %patch -P 1 -p1
 
 %build
 %configure --disable-static --with-slibdir=/%_lib \
+	--includedir=%_includedir/libcryptmount-%version \
 	%{?_with_selinux:--with-selinux}
 make %{?_smp_mflags}
 
 %install
 %make_install
 # Remove static and libtool version
-rm -f %buildroot/%_lib/security/pam_mount.{a,la}
+rm -f "%buildroot/%_lib/security"/*.{a,la} "%buildroot/%_libdir"/*.la
 #install the docs
 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/
@@ -121,4 +150,14 @@ fi
 %policy %_sysconfdir/selinux/strict/src/policy/file_contexts/misc/%name.fc
 %endif
 
+%files -n libcryptmount0
+%defattr(-,root,root)
+%_libdir/libcryptmount.so.0*
+
+%files -n libcryptmount-devel
+%defattr(-,root,root)
+%_includedir/libcryptmount-%version
+%_libdir/pkgconfig/*.pc
+%_libdir/libcryptmount.so
+
 %changelog