From 5680bab74e2a3f953244e46b504ba7ae1075f8394785ce30d0c8f52a5849f7e2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Aug 2013 10:25:21 +0000 Subject: [PATCH] pam_mount-2.14 OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=48 --- pam_mount-2.13.tar.xz | 3 -- pam_mount-2.13.tar.xz.asc | 17 ----------- pam_mount-2.14.tar.xz | 3 ++ pam_mount-2.14.tar.xz.asc | 17 +++++++++++ pam_mount-38a15cc3-ehd_logctl-debug.diff | 39 ------------------------ pam_mount.changes | 10 ++++++ pam_mount.spec | 11 +++---- 7 files changed, 34 insertions(+), 66 deletions(-) delete mode 100644 pam_mount-2.13.tar.xz delete mode 100644 pam_mount-2.13.tar.xz.asc create mode 100644 pam_mount-2.14.tar.xz create mode 100644 pam_mount-2.14.tar.xz.asc delete mode 100644 pam_mount-38a15cc3-ehd_logctl-debug.diff diff --git a/pam_mount-2.13.tar.xz b/pam_mount-2.13.tar.xz deleted file mode 100644 index e596c5f..0000000 --- a/pam_mount-2.13.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 6a36c3d..0000000 --- a/pam_mount-2.13.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------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-2.14.tar.xz b/pam_mount-2.14.tar.xz new file mode 100644 index 0000000..bbfe39f --- /dev/null +++ b/pam_mount-2.14.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f66cbb34568875772d854d3f2a8948f97f3f1c7f30e3ea2474e1d4b227adcf9 +size 312776 diff --git a/pam_mount-2.14.tar.xz.asc b/pam_mount-2.14.tar.xz.asc new file mode 100644 index 0000000..cb5ac6d --- /dev/null +++ b/pam_mount-2.14.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQIcBAABAgAGBQJSHH28AAoJEN//LNsZ/DONNbAP/A0C4Hl5vdK5jhQXufV3FWtl +TMntHVjWZv+Wsxlth00r/Z9vOpmlbT63a3dpAMfUXQJ2tetJvOk+OzcvM21Sevzx +tFsCrPMjqvlc9B2XTorqDkbqkDWycKOVR5SwnbgtlssLvbHABE+9Bvir3odgEUFo ++/O0DvGIwn1M8vhzzc//xvRH0qib+FPEB+s7+hoOsdn4wk64VQnIMVaNzv5sGYiu +WlbawbGhtDxztHncOZMM/CN1NthqmPmCDw7ELQtp4datTRU1q3dekStXaTF/djOD +VoFgz2sILIo1/1ItJV6aTnb5NJ30Um0xQKUswF5468ERfZqXgiCX4g+zUprW47yD +gv9DKDa5TnnDpCQKCtD2KLVBVUOR6RPD667AK7NZMTeQQtTggGY75mDQKAudUtOH +k4d94yF1EnAGLSCb+ik3d/efQm3f65W+iC1XvgxqDUB2yKYmYspfvaOxxd/vYg9n +ApRpRzeQyIa2J1Do7gR7NIlKg/3+3CGRhsgvZ0u+o1q+VuJxWR0xI/N5EOaa8HSh +8yGxiAjSce6nOUo/cyZIiZHKekImczY8XTo608SqYKO5U1dK8ff3gbQkMfgDrMRd +gJiGRz14TViqmg1pNpEg2SNRpyCo0ptUcb7vGuWUX0FcelzBDBJLO6pp6fXwZ1M3 +33H9YfKMNPgcZHD6EuH4 +=SObK +-----END PGP SIGNATURE----- diff --git a/pam_mount-38a15cc3-ehd_logctl-debug.diff b/pam_mount-38a15cc3-ehd_logctl-debug.diff deleted file mode 100644 index e95884b..0000000 --- a/pam_mount-38a15cc3-ehd_logctl-debug.diff +++ /dev/null @@ -1,39 +0,0 @@ -From 38a15cc36c7fe6714dd3010fde6ad808b3792ac0 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Mon, 26 Dec 2011 23:33:47 +0100 -Subject: [PATCH] log: fix "feature 1 already set to zero" -Upstream: yes - ---- - doc/changelog.txt | 2 ++ - src/rdconf1.c | 1 + - 2 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/doc/changelog.txt b/doc/changelog.txt -index 9759f4f..ef009c9 100644 ---- a/doc/changelog.txt -+++ b/doc/changelog.txt -@@ -3,6 +3,8 @@ For details, see the history as recorded in the git repository. - - HEAD - ==== -+Fixes: -+- fix "feature 1 already set to zero" - - - v2.13 (2011-12-15) -diff --git a/src/rdconf1.c b/src/rdconf1.c -index e8ccd2d..827d36a 100644 ---- a/src/rdconf1.c -+++ b/src/rdconf1.c -@@ -340,6 +340,7 @@ void initconfig(struct config *config) - char options_require[] = "nosuid,nodev"; - - memset(config, 0, sizeof(*config)); -+ ehd_logctl(EHD_LOGFT_DEBUG, EHD_LOG_SET); - config->debug = true; - config->mkmntpoint = true; - --- -1.7.4.1 - diff --git a/pam_mount.changes b/pam_mount.changes index f45dbb6..0382622 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 27 10:23:17 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 2.14 +* add an "allow_discard" option for volumes to enable trim support + on the block device without enabling it for the filesystem. +* config: regexes can now be used for the and + configuration options +- Remove pam_mount-38a15cc3-ehd_logctl-debug.diff (applied upstream) + ------------------------------------------------------------------- Sun Feb 3 14:16:32 UTC 2013 - wstephenson@suse.com diff --git a/pam_mount.spec b/pam_mount.spec index 50b2b13..08067f0 100644 --- a/pam_mount.spec +++ b/pam_mount.spec @@ -21,7 +21,7 @@ Name: pam_mount Summary: A PAM Module that can Mount Volumes for a User Session License: LGPL-2.1+ and GPL-2.0+ Group: System/Libraries -Version: 2.13 +Version: 2.14 Release: 0 Url: http://pam-mount.sf.net/ @@ -33,7 +33,6 @@ Source3: mount.crypt Source5: baselibs.conf Source6: %{name}.keyring Patch1: pam_mount-0.47-enable-logout-kill.dif -Patch2: pam_mount-38a15cc3-ehd_logctl-debug.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes @@ -52,6 +51,7 @@ BuildRequires: xz BuildRequires: pkgconfig(libHX) >= 3.12.1 BuildRequires: pkgconfig(libcrypto) >= 0.9.7 BuildRequires: pkgconfig(libcryptsetup) >= 1.1.2 +BuildRequires: pkgconfig(libpcre) >= 7 BuildRequires: pkgconfig(libxml-2.0) >= 2.6 BuildRequires: pkgconfig(mount) >= 2.20 @@ -101,12 +101,9 @@ setup. It supports pam_mount style plain EHD2/OpenSSL images and LUKS and transparent use of the OS's crypto layer. %prep -%if 0%{?gpg_verify:1} -%gpg_verify %{S:9} -%endif +%{?gpg_verify: %gpg_verify %{S:9}} %setup -q %patch -P 1 -p1 -%patch -P 2 -p1 %build %configure --disable-static --with-slibdir=/%_lib \ @@ -120,7 +117,7 @@ make install DESTDIR="%buildroot"; 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/ +cp doc/bugs.txt doc/news.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/ #