From a876d9db835430036edeb90ed84e24fdbff2752d978e4d867dbc84b38f99f156 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 7 Oct 2011 13:21:45 +0000 Subject: [PATCH 1/5] Add bugzilla number OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=37 --- pam_mount.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pam_mount.changes b/pam_mount.changes index 4d04e6d..e3afbaf 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Oct 6 11:42:36 UTC 2011 - jengelh@medozas.de -- Update to new upstream release 2.12 +- Update to new upstream release 2.12 (bnc#722480) * mount.crypt: restore support for files >= 4 GB ------------------------------------------------------------------- From b4717392271e1b733cdbd5e40bd2be0a6ce6ef4073ab7aa2308d23d167b5a288 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 15 Dec 2011 12:21:11 +0000 Subject: [PATCH 2/5] pam_mount 2.13 OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=38 --- baselibs.conf | 1 + pam_mount-2.12.tar.xz | 3 -- pam_mount-2.12.tar.xz.asc | 17 --------- pam_mount-2.13.tar.xz | 3 ++ pam_mount-2.13.tar.xz.asc | 17 +++++++++ pam_mount.changes | 6 ++++ pam_mount.spec | 73 ++++++++++++++++++++++++++++++--------- 7 files changed, 83 insertions(+), 37 deletions(-) delete mode 100644 pam_mount-2.12.tar.xz delete mode 100644 pam_mount-2.12.tar.xz.asc create mode 100644 pam_mount-2.13.tar.xz create mode 100644 pam_mount-2.13.tar.xz.asc diff --git a/baselibs.conf b/baselibs.conf index dbe2348..078b941 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,3 @@ pam_mount supplements "packageand(pam_mount:pam-)" +libcryptmount0 diff --git a/pam_mount-2.12.tar.xz b/pam_mount-2.12.tar.xz deleted file mode 100644 index 4f974bd..0000000 --- a/pam_mount-2.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5454ade466fbfed5dc19330647f1f1f70a819d32d8d2355f5ff024cedfa00525 -size 284140 diff --git a/pam_mount-2.12.tar.xz.asc b/pam_mount-2.12.tar.xz.asc deleted file mode 100644 index 5cbb41d..0000000 --- a/pam_mount-2.12.tar.xz.asc +++ /dev/null @@ -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----- diff --git a/pam_mount-2.13.tar.xz b/pam_mount-2.13.tar.xz new file mode 100644 index 0000000..e596c5f --- /dev/null +++ b/pam_mount-2.13.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:077af9626a3ae2d68395392f6af1cb2d795329cd648ab8c6b60f814d7121ab2a +size 300648 diff --git a/pam_mount-2.13.tar.xz.asc b/pam_mount-2.13.tar.xz.asc new file mode 100644 index 0000000..6a36c3d --- /dev/null +++ b/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----- diff --git a/pam_mount.changes b/pam_mount.changes index e3afbaf..a20bd78 100644 --- a/pam_mount.changes +++ b/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 diff --git a/pam_mount.spec b/pam_mount.spec index 4dda732..24d9c54 100644 --- a/pam_mount.spec +++ b/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 -Release: 1 -# for fd0ssh and ofl: -Suggests: hxtools >= 20090116 -Recommends: cifs-mount -# for mount: -Requires: util-linux +Version: 2.13 +Release: 0 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 From fc051bad8bdfa80732dba0765958a965662b2cdf0235e3d6947fb7cb61eec922 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 15 Dec 2011 20:07:55 +0000 Subject: [PATCH 3/5] Requires/ldconfig for libcryptmount* OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=39 --- pam_mount.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pam_mount.spec b/pam_mount.spec index 24d9c54..27f39f4 100644 --- a/pam_mount.spec +++ b/pam_mount.spec @@ -18,6 +18,7 @@ Name: pam_mount +%define lname libcryptmount0 Summary: A PAM Module that can Mount Volumes for a User Session Version: 2.13 Release: 0 @@ -64,11 +65,11 @@ 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 +%package -n %lname Summary: Library to mount crypto images and handle key files Group: System/Libraries -%description -n libcryptmount0 +%description -n %lname 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 @@ -78,6 +79,7 @@ and transparent use of the OS's crypto layer. %package -n libcryptmount-devel Summary: Development files for libcryptmount Group: Development/Libraries/C and C++ +Requires: %lname = %version %description -n libcryptmount-devel libcryptmount takes care of the many steps involved in making a @@ -131,6 +133,10 @@ then done fi +%post -n %lname -p /sbin/ldconfig + +%postun -n %lname -p /sbin/ldconfig + %files %defattr(-, root, root) %docdir %_docdir/%name @@ -150,7 +156,7 @@ fi %policy %_sysconfdir/selinux/strict/src/policy/file_contexts/misc/%name.fc %endif -%files -n libcryptmount0 +%files -n %lname %defattr(-,root,root) %_libdir/libcryptmount.so.0* From e70091bb8d4317ce02b5c3f41d281bc1cf14c5f3bfe0f50a6e2a86f652b96632 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 15 Dec 2011 21:01:56 +0000 Subject: [PATCH 4/5] SPDX format; fdupes OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=40 --- pam_mount.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pam_mount.spec b/pam_mount.spec index 27f39f4..cc1b0ab 100644 --- a/pam_mount.spec +++ b/pam_mount.spec @@ -22,7 +22,7 @@ Name: pam_mount Summary: A PAM Module that can Mount Volumes for a User Session Version: 2.13 Release: 0 -License: LGPLv2.1+ +License: LGPL-2.1+ Group: System/Libraries URL: http://pam-mount.sf.net/ @@ -39,7 +39,7 @@ 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: fdupes 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 @@ -114,6 +114,7 @@ mkdir -p %buildroot%_sbindir/ mv %buildroot/sbin/mount.crypt %buildroot%_sbindir/ ln -s %_sbindir/mount.crypt %buildroot%_sbindir/umount.crypt install -m755 %SOURCE3 %buildroot/sbin/ +%fdupes %buildroot %post if [ -e etc/security/pam_mount.conf ] From 95b04770d7de80951c33b56143d832ee1a456e3d031fd01bbef99fdcf97a89fe Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 13 Feb 2012 15:28:01 +0000 Subject: [PATCH 5/5] Accepting request 104666 from home:babelworx:ldig:branches:Linux-PAM license update: LGPL-2.1+ and GPL-2.0+ See the COPYING file. There are GPL-2.0+ components aggregated OBS-URL: https://build.opensuse.org/request/show/104666 OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=41 --- pam_mount.changes | 6 ++++++ pam_mount.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pam_mount.changes b/pam_mount.changes index a20bd78..e4c0858 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 13 12:36:39 UTC 2012 - cfarrell@suse.com + +- license update: LGPL-2.1+ and GPL-2.0+ + See the COPYING file. There are GPL-2.0+ components aggregated + ------------------------------------------------------------------- Thu Dec 15 11:50:44 UTC 2011 - jengelh@medozas.de diff --git a/pam_mount.spec b/pam_mount.spec index cc1b0ab..5fee4b0 100644 --- a/pam_mount.spec +++ b/pam_mount.spec @@ -22,7 +22,7 @@ Name: pam_mount Summary: A PAM Module that can Mount Volumes for a User Session Version: 2.13 Release: 0 -License: LGPL-2.1+ +License: LGPL-2.1+ and GPL-2.0+ Group: System/Libraries URL: http://pam-mount.sf.net/