From a66203620a5e6974e0c1c6b9b16acfa95d27163cc01f390849c21c9245a1f1d0 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Tue, 1 Jun 2010 11:42:54 +0000 Subject: [PATCH 1/4] - use full paths in wrapper scripts (bnc#607200) OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=13 --- mount.crypt | 8 ++++---- mount.encfs13 | 8 ++++---- pam_mount.changes | 5 +++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/mount.crypt b/mount.crypt index f59e971..00ca6dd 100644 --- a/mount.crypt +++ b/mount.crypt @@ -3,17 +3,17 @@ CMD="${0##*/}" if [[ "$CMD" =~ "umount" ]]; then - if [ ! -x ../usr/sbin/umount.crypt ]; then + if [ ! -x /usr/sbin/umount.crypt ]; then logger -t "mount.crypt" -p user.err -i "/usr/sbin/umount.crypt: File not found." exit 1 fi - ../usr/sbin/umount.crypt $@ + /usr/sbin/umount.crypt "$@" elif [[ "$CMD" =~ "mount" ]]; then - if [ ! -x ../usr/sbin/mount.crypt ]; then + if [ ! -x /usr/sbin/mount.crypt ]; then logger -t "mount.crypt" -p user.err -i "/usr/sbin/mount.crypt: File not found." exit 1 fi - ../usr/sbin/mount.crypt $@ + /usr/sbin/mount.crypt "$@" else logger -t "mount.crypt" -p user.err -i "Unknown command: $0" exit 1 diff --git a/mount.encfs13 b/mount.encfs13 index 740e44b..d18a340 100644 --- a/mount.encfs13 +++ b/mount.encfs13 @@ -3,17 +3,17 @@ CMD="${0##*/}" if [[ "$CMD" =~ "umount" ]]; then - if [ ! -x ../usr/sbin/umount.encfs13 ]; then + if [ ! -x /usr/sbin/umount.encfs13 ]; then logger -t "mount.encfs13" -p user.err -i "/usr/sbin/umount.encfs13: File not found." exit 1 fi - ../usr/sbin/umount.encfs13 $@ + /usr/sbin/umount.encfs13 "$@" elif [[ "$CMD" =~ "mount" ]]; then - if [ ! -x ../usr/sbin/mount.encfs13 ]; then + if [ ! -x /usr/sbin/mount.encfs13 ]; then logger -t "mount.encfs13" -p user.err -i "/usr/sbin/mount.encfs13: File not found." exit 1 fi - ../usr/sbin/mount.encfs13 $@ + /usr/sbin/mount.encfs13 "$@" else logger -t "mount.encfs13" -p user.err -i "Unknown command: $0" exit 1 diff --git a/pam_mount.changes b/pam_mount.changes index 5156e01..7f40710 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 1 13:42:01 CEST 2010 - mc@suse.de + +- use full paths in wrapper scripts (bnc#607200) + ------------------------------------------------------------------- Wed Apr 7 23:43:17 UTC 2010 - jengelh@medozas.de From 8bb872dac54290d6f736bd8a483024086a20ea49693a736a636c0746bd1dc614 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 2 Jun 2010 00:04:04 +0000 Subject: [PATCH 2/4] Accepting request 40947 from Linux-PAM checked in (request 40947) OBS-URL: https://build.opensuse.org/request/show/40947 OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=14 --- mount.crypt | 8 ++++---- mount.encfs13 | 8 ++++---- pam_mount.changes | 5 ----- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/mount.crypt b/mount.crypt index 00ca6dd..f59e971 100644 --- a/mount.crypt +++ b/mount.crypt @@ -3,17 +3,17 @@ CMD="${0##*/}" if [[ "$CMD" =~ "umount" ]]; then - if [ ! -x /usr/sbin/umount.crypt ]; then + if [ ! -x ../usr/sbin/umount.crypt ]; then logger -t "mount.crypt" -p user.err -i "/usr/sbin/umount.crypt: File not found." exit 1 fi - /usr/sbin/umount.crypt "$@" + ../usr/sbin/umount.crypt $@ elif [[ "$CMD" =~ "mount" ]]; then - if [ ! -x /usr/sbin/mount.crypt ]; then + if [ ! -x ../usr/sbin/mount.crypt ]; then logger -t "mount.crypt" -p user.err -i "/usr/sbin/mount.crypt: File not found." exit 1 fi - /usr/sbin/mount.crypt "$@" + ../usr/sbin/mount.crypt $@ else logger -t "mount.crypt" -p user.err -i "Unknown command: $0" exit 1 diff --git a/mount.encfs13 b/mount.encfs13 index d18a340..740e44b 100644 --- a/mount.encfs13 +++ b/mount.encfs13 @@ -3,17 +3,17 @@ CMD="${0##*/}" if [[ "$CMD" =~ "umount" ]]; then - if [ ! -x /usr/sbin/umount.encfs13 ]; then + if [ ! -x ../usr/sbin/umount.encfs13 ]; then logger -t "mount.encfs13" -p user.err -i "/usr/sbin/umount.encfs13: File not found." exit 1 fi - /usr/sbin/umount.encfs13 "$@" + ../usr/sbin/umount.encfs13 $@ elif [[ "$CMD" =~ "mount" ]]; then - if [ ! -x /usr/sbin/mount.encfs13 ]; then + if [ ! -x ../usr/sbin/mount.encfs13 ]; then logger -t "mount.encfs13" -p user.err -i "/usr/sbin/mount.encfs13: File not found." exit 1 fi - /usr/sbin/mount.encfs13 "$@" + ../usr/sbin/mount.encfs13 $@ else logger -t "mount.encfs13" -p user.err -i "Unknown command: $0" exit 1 diff --git a/pam_mount.changes b/pam_mount.changes index 7f40710..5156e01 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Jun 1 13:42:01 CEST 2010 - mc@suse.de - -- use full paths in wrapper scripts (bnc#607200) - ------------------------------------------------------------------- Wed Apr 7 23:43:17 UTC 2010 - jengelh@medozas.de From bee2d52d1d020ca50dc591282c97926bcc800cc349aa8d993f9b1af0074aa0f0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 27 Aug 2010 15:19:13 +0000 Subject: [PATCH 3/4] Update to 2.5 OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=15 --- mount.crypt | 8 ++++---- mount.encfs13 | 8 ++++---- pam_mount-0.47-enable-logout-kill.dif | 14 +++++++++----- pam_mount-1.34.tar.bz2 | 3 --- pam_mount-2.5.tar.xz | 3 +++ pam_mount-2.5.tar.xz.asc | 7 +++++++ pam_mount.changes | 19 +++++++++++++++++++ pam_mount.spec | 11 +++++------ 8 files changed, 51 insertions(+), 22 deletions(-) delete mode 100644 pam_mount-1.34.tar.bz2 create mode 100644 pam_mount-2.5.tar.xz create mode 100644 pam_mount-2.5.tar.xz.asc diff --git a/mount.crypt b/mount.crypt index f59e971..00ca6dd 100644 --- a/mount.crypt +++ b/mount.crypt @@ -3,17 +3,17 @@ CMD="${0##*/}" if [[ "$CMD" =~ "umount" ]]; then - if [ ! -x ../usr/sbin/umount.crypt ]; then + if [ ! -x /usr/sbin/umount.crypt ]; then logger -t "mount.crypt" -p user.err -i "/usr/sbin/umount.crypt: File not found." exit 1 fi - ../usr/sbin/umount.crypt $@ + /usr/sbin/umount.crypt "$@" elif [[ "$CMD" =~ "mount" ]]; then - if [ ! -x ../usr/sbin/mount.crypt ]; then + if [ ! -x /usr/sbin/mount.crypt ]; then logger -t "mount.crypt" -p user.err -i "/usr/sbin/mount.crypt: File not found." exit 1 fi - ../usr/sbin/mount.crypt $@ + /usr/sbin/mount.crypt "$@" else logger -t "mount.crypt" -p user.err -i "Unknown command: $0" exit 1 diff --git a/mount.encfs13 b/mount.encfs13 index 740e44b..d18a340 100644 --- a/mount.encfs13 +++ b/mount.encfs13 @@ -3,17 +3,17 @@ CMD="${0##*/}" if [[ "$CMD" =~ "umount" ]]; then - if [ ! -x ../usr/sbin/umount.encfs13 ]; then + if [ ! -x /usr/sbin/umount.encfs13 ]; then logger -t "mount.encfs13" -p user.err -i "/usr/sbin/umount.encfs13: File not found." exit 1 fi - ../usr/sbin/umount.encfs13 $@ + /usr/sbin/umount.encfs13 "$@" elif [[ "$CMD" =~ "mount" ]]; then - if [ ! -x ../usr/sbin/mount.encfs13 ]; then + if [ ! -x /usr/sbin/mount.encfs13 ]; then logger -t "mount.encfs13" -p user.err -i "/usr/sbin/mount.encfs13: File not found." exit 1 fi - ../usr/sbin/mount.encfs13 $@ + /usr/sbin/mount.encfs13 "$@" else logger -t "mount.encfs13" -p user.err -i "Unknown command: $0" exit 1 diff --git a/pam_mount-0.47-enable-logout-kill.dif b/pam_mount-0.47-enable-logout-kill.dif index 976399e..5ed7fc7 100644 --- a/pam_mount-0.47-enable-logout-kill.dif +++ b/pam_mount-0.47-enable-logout-kill.dif @@ -1,10 +1,14 @@ -Index: pam_mount-1.32/config/pam_mount.conf.xml +--- + config/pam_mount.conf.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: pam_mount-2.5/config/pam_mount.conf.xml =================================================================== ---- pam_mount-1.32.orig/config/pam_mount.conf.xml -+++ pam_mount-1.32/config/pam_mount.conf.xml -@@ -33,7 +33,7 @@ +--- pam_mount-2.5.orig/config/pam_mount.conf.xml ++++ pam_mount-2.5/config/pam_mount.conf.xml +@@ -32,7 +32,7 @@ + --> - /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin - + diff --git a/pam_mount-1.34.tar.bz2 b/pam_mount-1.34.tar.bz2 deleted file mode 100644 index b21e440..0000000 --- a/pam_mount-1.34.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d01c12084f1ee1736966b274b66516df77ad5ea4747dfbef26bb938bdfbf1e4d -size 329753 diff --git a/pam_mount-2.5.tar.xz b/pam_mount-2.5.tar.xz new file mode 100644 index 0000000..a7d6f6e --- /dev/null +++ b/pam_mount-2.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fa248a98ffa49dc6d8ceae1b45088571b6845d7831cae95fc75ccbcca3afb26 +size 288644 diff --git a/pam_mount-2.5.tar.xz.asc b/pam_mount-2.5.tar.xz.asc new file mode 100644 index 0000000..0203aea --- /dev/null +++ b/pam_mount-2.5.tar.xz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEABECAAYFAkxhGaUACgkQ92gFgoRMQ2DJsACcCLvpRlZPYYIRAzRJQBA4nEsd +7pgAn0WQBFNcLNovRR7Pn+H8WvGD5uGy +=BW1E +-----END PGP SIGNATURE----- diff --git a/pam_mount.changes b/pam_mount.changes index 5156e01..e4c7cee 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Aug 27 15:12:24 UTC 2010 - jengelh@medozas.de + +- remove unnecessary Requires(pre) +- do not needlessy run autoreconf +- update to version 2.5 +* new mount.crypt program that now uses libcryptsetup rather than + the cryptsetup binary +* HXformat2 is now used. This invalidates old constructs like + %(before=\"-o\"...) which need to be replaced by new syntax + (see /usr/share/doc/packages/pam_mount/changelog.txt) +* fusermount now called with secondary groups initialized +* add support for keyfile passthru using -ofsk_cipher=none + +------------------------------------------------------------------- +Tue Jun 1 13:42:01 CEST 2010 - mc@suse.de + +- use full paths in wrapper scripts (bnc#607200) + ------------------------------------------------------------------- Wed Apr 7 23:43:17 UTC 2010 - jengelh@medozas.de diff --git a/pam_mount.spec b/pam_mount.spec index 92e8dbb..6498579 100644 --- a/pam_mount.spec +++ b/pam_mount.spec @@ -23,17 +23,19 @@ 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.4 +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: 1.34 +Version: 2.5 Release: 1 -Recommends: cryptsetup Recommends: cifs-mount Requires: util-linux License: LGPLv2.1+ Prefix: /usr Group: System/Libraries -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.xz +BuildRequires: xz Source1: convert_pam_mount_conf.pl Source2: convert_keyhash.pl Source3: mount.crypt @@ -42,7 +44,6 @@ Source5: baselibs.conf Patch1: pam_mount-0.47-enable-logout-kill.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://pam-mount.sourceforge.net/ -Requires(pre): coreutils, perl-XML-Writer, perl-XML-Parser Requires(post): coreutils, perl-XML-Writer, perl-XML-Parser %description @@ -63,8 +64,6 @@ dm-crypt and LUKS. %patch1 -p1 %build -%{suse_update_config -f} -autoreconf --verbose --force --install %configure --with-slibdir=/%{_lib} %{?_with_selinux:--with-selinux} %{__make} %{?_smp_mflags} From 9306112b3254442d68fa874c19d5d8979183b966c0952ac41f0527c3bc6d8f9c Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 6 Sep 2010 16:42:33 +0000 Subject: [PATCH 4/4] Accepting request 46900 from Linux-PAM checked in (request 46900) OBS-URL: https://build.opensuse.org/request/show/46900 OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam_mount?expand=0&rev=16 --- pam_mount-2.5.tar.xz.asc | 7 ------- pam_mount.spec | 8 ++++---- 2 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 pam_mount-2.5.tar.xz.asc diff --git a/pam_mount-2.5.tar.xz.asc b/pam_mount-2.5.tar.xz.asc deleted file mode 100644 index 0203aea..0000000 --- a/pam_mount-2.5.tar.xz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEABECAAYFAkxhGaUACgkQ92gFgoRMQ2DJsACcCLvpRlZPYYIRAzRJQBA4nEsd -7pgAn0WQBFNcLNovRR7Pn+H8WvGD5uGy -=BW1E ------END PGP SIGNATURE----- diff --git a/pam_mount.spec b/pam_mount.spec index 6498579..301a477 100644 --- a/pam_mount.spec +++ b/pam_mount.spec @@ -1,5 +1,5 @@ # -# spec file for package pam_mount (Version 1.34) +# spec file for package pam_mount (Version 2.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,8 +23,8 @@ 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.4 -BuildRequires: libcryptsetup-devel >= 1.1.2 -Requires: device-mapper >= 1.02.48 +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.5 @@ -35,7 +35,7 @@ License: LGPLv2.1+ Prefix: /usr Group: System/Libraries Source: %{name}-%{version}.tar.xz -BuildRequires: xz +BuildRequires: xz Source1: convert_pam_mount_conf.pl Source2: convert_keyhash.pl Source3: mount.crypt