Hello community, here is the log from the commit of package pam_mount for openSUSE:Factory checked in at 2014-12-05 21:04:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pam_mount (Old) and /work/SRC/openSUSE:Factory/.pam_mount.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam_mount" Changes: -------- --- /work/SRC/openSUSE:Factory/pam_mount/pam_mount.changes 2014-09-28 19:53:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pam_mount.new/pam_mount.changes 2014-12-05 21:03:57.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Dec 1 13:43:06 UTC 2014 - [email protected] + +- Update to new upstream release 2.15 +* Use new helper= option in util-linux, allowing umount.crypt to be + called on umount. +* Fix a crash in ehd_log due to lack of va_start call + +------------------------------------------------------------------- Old: ---- pam_mount-2.14.tar.xz pam_mount-2.14.tar.xz.asc New: ---- pam_mount-2.15.tar.asc pam_mount-2.15.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_mount.spec ++++++ --- /var/tmp/diff_new_pack.YCXGm4/_old 2014-12-05 21:03:59.000000000 +0100 +++ /var/tmp/diff_new_pack.YCXGm4/_new 2014-12-05 21:03:59.000000000 +0100 @@ -21,12 +21,12 @@ 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.14 +Version: 2.15 Release: 0 Url: http://pam-mount.sf.net/ -Source: %name-%version.tar.xz -Source9: %name-%version.tar.xz.asc +Source: http://downloads.sf.net/pam-mount/%name-%version.tar.xz +Source9: http://downloads.sf.net/pam-mount/%name-%version.tar.asc Source1: convert_pam_mount_conf.pl Source2: convert_keyhash.pl Source3: mount.crypt @@ -57,10 +57,10 @@ Requires(post): perl-XML-Parser # -EBUSY bugs fixed (libdevmapper): Requires: device-mapper >= 1.02.48 -# for mount(8) and mount.cifs: Requires: fd0ssh Requires: ofl -Requires: util-linux +# for mount(8) and mount.cifs: +Requires: util-linux >= 2.20 Recommends: cifs-mount %description @@ -102,8 +102,8 @@ %patch -P 1 -p1 %build -%configure --disable-static --with-slibdir=/%_lib \ - --includedir=%_includedir/libcryptmount-%version \ +%configure --disable-static --with-slibdir="/%_lib" \ + --includedir="%_includedir/libcryptmount" \ %{?_with_selinux:--with-selinux} make %{?_smp_mflags} @@ -149,7 +149,6 @@ %files %defattr(-, root, root) -%docdir %_docdir/%name %_docdir/%name /%_lib/security/pam_mount*.so /sbin/mount.crypt* @@ -172,7 +171,7 @@ %files -n libcryptmount-devel %defattr(-,root,root) -%_includedir/libcryptmount-%version +%_includedir/libcryptmount/ %_libdir/pkgconfig/*.pc %_libdir/libcryptmount.so ++++++ pam_mount-0.47-enable-logout-kill.dif ++++++ --- /var/tmp/diff_new_pack.YCXGm4/_old 2014-12-05 21:03:59.000000000 +0100 +++ /var/tmp/diff_new_pack.YCXGm4/_new 2014-12-05 21:03:59.000000000 +0100 @@ -2,16 +2,16 @@ config/pam_mount.conf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: pam_mount-2.8/config/pam_mount.conf.xml +Index: pam_mount-2.15/config/pam_mount.conf.xml =================================================================== ---- pam_mount-2.8.orig/config/pam_mount.conf.xml -+++ pam_mount-2.8/config/pam_mount.conf.xml +--- pam_mount-2.15.orig/config/pam_mount.conf.xml ++++ pam_mount-2.15/config/pam_mount.conf.xml @@ -33,7 +33,7 @@ <mntoptions require="nosuid,nodev" /> <!-- requires ofl from hxtools to be present --> --<logout wait="0" hup="0" term="0" kill="0" /> -+<logout wait="2000" hup="0" term="1" kill="1" /> +-<logout wait="0" hup="no" term="no" kill="no" /> ++<logout wait="2000" hup="no" term="yes" kill="yes" /> <!-- pam_mount parameters: Volume-related --> ++++++ pam_mount-2.14.tar.xz -> pam_mount-2.15.tar.xz ++++++ ++++ 4103 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-2.14/build-aux/ar-lib new/pam_mount-2.15/build-aux/ar-lib --- old/pam_mount-2.14/build-aux/ar-lib 2013-08-27 12:21:03.000000000 +0200 +++ new/pam_mount-2.15/build-aux/ar-lib 2014-12-01 14:35:44.000000000 +0100 @@ -4,7 +4,7 @@ me=ar-lib scriptversion=2012-03-01.08; # UTC -# Copyright (C) 2010-2012 Free Software Foundation, Inc. +# Copyright (C) 2010-2013 Free Software Foundation, Inc. # Written by Peter Rosin <[email protected]>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-2.14/build-aux/compile new/pam_mount-2.15/build-aux/compile --- old/pam_mount-2.14/build-aux/compile 2013-08-27 12:21:03.000000000 +0200 +++ new/pam_mount-2.15/build-aux/compile 2014-12-01 14:35:44.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -112,6 +112,11 @@ lib=$dir/$lib.lib break fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi done IFS=$save_IFS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-2.14/build-aux/missing new/pam_mount-2.15/build-aux/missing --- old/pam_mount-2.14/build-aux/missing 2013-08-27 12:21:03.000000000 +0200 +++ new/pam_mount-2.15/build-aux/missing 2014-12-01 14:35:44.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.18; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,61 +29,33 @@ exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, 'missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file 'aclocal.m4' - autoconf touch file 'configure' - autoheader touch file 'config.h.in' - autom4te touch the output file, or create a stub one - automake touch all 'Makefile.in' files - bison create 'y.tab.[ch]', if possible, from existing .[ch] - flex create 'lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create 'lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create 'y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. @@ -98,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "$0: unknown '$1' option" echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running '$TOOL --version' or '$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acinclude.m4' or '${configure_ac}'. You might want - to install the Automake and Perl packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified '${configure_ac}'. You might want to install the - Autoconf and GNU m4 packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acconfig.h' or '${configure_ac}'. You might want - to install the Autoconf and GNU m4 packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. - You might want to install the Automake and Perl packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: '$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get '$1' as part of Autoconf from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: '$1' $msg. You should only need it if - you modified a '.y' file. You may need the Bison package - in order for those modifications to take effect. You can get - Bison from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.l' file. You may need the Flex package - in order for those modifications to take effect. You can get - Flex from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - Help2man package in order for those modifications to take - effect. You can get Help2man from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.texi' or '.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy 'make' (AIX, - DU, IRIX). You might want to install the Texinfo package or - the GNU make package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: '$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the 'README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing '$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-2.14/config/pam_mount.conf.xml new/pam_mount-2.15/config/pam_mount.conf.xml --- old/pam_mount-2.14/config/pam_mount.conf.xml 2013-08-27 12:16:34.000000000 +0200 +++ new/pam_mount-2.15/config/pam_mount.conf.xml 2014-12-01 14:35:30.000000000 +0100 @@ -33,7 +33,7 @@ <mntoptions require="nosuid,nodev" /> <!-- requires ofl from hxtools to be present --> -<logout wait="0" hup="0" term="0" kill="0" /> +<logout wait="0" hup="no" term="no" kill="no" /> <!-- pam_mount parameters: Volume-related --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-2.14/configure.ac new/pam_mount-2.15/configure.ac --- old/pam_mount-2.14/configure.ac 2013-08-27 12:16:34.000000000 +0200 +++ new/pam_mount-2.15/configure.ac 2014-12-01 14:35:30.000000000 +0100 @@ -7,8 +7,8 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -AC_INIT([pam_mount], [2.14]) -PACKAGE_RELDATE="2013-08-27" +AC_INIT([pam_mount], [2.15]) +PACKAGE_RELDATE="2014-11-28" AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-2.14/doc/install.txt new/pam_mount-2.15/doc/install.txt --- old/pam_mount-2.14/doc/install.txt 2013-08-27 12:16:34.000000000 +0200 +++ new/pam_mount-2.15/doc/install.txt 2014-12-01 14:35:30.000000000 +0100 @@ -21,6 +21,10 @@ * openssl 0.9.8 or up * libcryptsetup 1.1.2 or up -- block-level encryption +Required packages for runtime: + + * util-linux 2.20 or up + Suggested packages for runtime: * hxtools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-2.14/doc/news.txt new/pam_mount-2.15/doc/news.txt --- old/pam_mount-2.14/doc/news.txt 2013-08-27 12:16:34.000000000 +0200 +++ new/pam_mount-2.15/doc/news.txt 2014-12-01 14:35:30.000000000 +0100 @@ -5,6 +5,16 @@ ==== +v2.15 (2014-12-01) +================== +Changes: +* util-linux >= 2.20 is required at runtime + (just mentioning it again; it was already needed for building) +* use the helper= option to get umount.crypt invoked on calling umount +* remove unsupported -p0 mount option +* fix a crash in ehd_log + + v2.14 (2013-08-27) ================== Enhancements: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-2.14/doc/pam_mount.conf.5.in new/pam_mount-2.15/doc/pam_mount.conf.5.in --- old/pam_mount-2.14/doc/pam_mount.conf.5.in 2013-08-27 12:16:34.000000000 +0200 +++ new/pam_mount-2.15/doc/pam_mount.conf.5.in 2014-12-01 14:35:30.000000000 +0100 @@ -240,7 +240,7 @@ searched. Since login programs have differing default PATHs, pam_mount has its own path definition (see above). .TP -\fB<lclmount>\fP\fImount \-p0 \-t %(FSTYPE) ...\fP\fB</lclmount>\fP +\fB<lclmount>\fP\fImount \-t %(FSTYPE) ...\fP\fB</lclmount>\fP The regular mount program. .TP \fB<umount>\fP\fIumount %(MNTPT)\fP\fB</umount>\fP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-2.14/doc/pam_mount.txt new/pam_mount-2.15/doc/pam_mount.txt --- old/pam_mount-2.14/doc/pam_mount.txt 2013-08-27 12:16:34.000000000 +0200 +++ new/pam_mount-2.15/doc/pam_mount.txt 2014-12-01 14:35:30.000000000 +0100 @@ -1,4 +1,4 @@ -pam_mount(8) pam_mount 2.14 pam_mount(8) +pam_mount(8) pam_mount 2.15 pam_mount(8) @@ -187,4 +187,4 @@ -pam_mount 2.14 2013-08-27 pam_mount(8) +pam_mount 2.15 2014-11-28 pam_mount(8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-2.14/m4/libtool.m4 new/pam_mount-2.15/m4/libtool.m4 --- old/pam_mount-2.14/m4/libtool.m4 2013-08-27 12:18:59.000000000 +0200 +++ new/pam_mount-2.15/m4/libtool.m4 2014-12-01 14:35:42.000000000 +0100 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1326,7 +1326,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1348,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-2.14/src/log.c new/pam_mount-2.15/src/log.c --- old/pam_mount-2.14/src/log.c 2013-08-27 12:16:34.000000000 +0200 +++ new/pam_mount-2.15/src/log.c 2014-12-01 14:35:30.000000000 +0100 @@ -48,8 +48,8 @@ assert(format != NULL); + va_start(args, format); if (!ehd_log_ft[EHD_LOGFT_NOSYSLOG]) { - va_start(args, format); va_copy(arg2, args); vsyslog(LOG_AUTH | LOG_ERR, format, arg2); va_end(arg2); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-2.14/src/mtcrypt.c new/pam_mount-2.15/src/mtcrypt.c --- old/pam_mount-2.14/src/mtcrypt.c 2013-08-27 12:16:34.000000000 +0200 +++ new/pam_mount-2.15/src/mtcrypt.c 2014-12-01 14:35:30.000000000 +0100 @@ -72,6 +72,7 @@ hxmc_t *object; unsigned int no_update, ro_fallback; bool is_cont, blkdev; + char *type; }; static unsigned int mtcr_debug; @@ -538,6 +539,13 @@ mount_args[argk++] = "-t"; mount_args[argk++] = opt->fstype; } + if (opt->extra_opts == NULL) { + opt->extra_opts = "helper=crypt"; + } else if (*opt->extra_opts != '\0') { + HXmc_strcat(&opt->extra_opts, ","); + HXmc_strcat(&opt->extra_opts, "helper=crypt"); + } + if (opt->extra_opts != NULL) { mount_args[argk++] = "-o"; mount_args[argk++] = opt->extra_opts; @@ -591,6 +599,8 @@ .help = "Do not update /etc/mtab"}, {.sh = 'r', .type = HXTYPE_NONE, .ptr = &opt->ro_fallback, .help = "(Option ignored)"}, + {.sh = 't', .type = HXTYPE_STRING, .ptr = &opt->type, + .help = "(Option ignored)"}, {.sh = 'v', .type = HXTYPE_NONE, .ptr = &mtcr_debug, .help = "Be verbose - enable debugging"}, HXOPT_AUTOHELP, @@ -707,7 +717,7 @@ */ static int mtcr_umount(struct umount_options *opt) { - const char *umount_args[3]; + const char *umount_args[4]; int final_ret, ret, argk = 0; struct ehd_mount_info mount_info; char *mountpoint = NULL; @@ -740,6 +750,7 @@ pmt_cmtab_remove(mountpoint); umount_args[argk++] = "umount"; + umount_args[argk++] = "-i"; umount_args[argk++] = mountpoint; umount_args[argk] = NULL; @@ -797,16 +808,8 @@ int main(int argc, const char **argv) { - struct stat sb; int ret; - if (stat("/etc/mtab", &sb) == 0 && (sb.st_mode & S_IWUGO) == 0) - fprintf(stderr, "NOTE: mount.crypt does not support utab " - "(systems with no mtab or read-only mtab) yet. This " - "means that you will temporarily need to call " - "umount.crypt(8) rather than umount(8) to get crypto " - "volumes unmounted.\n"); - ret = HX_init(); if (ret <= 0) { fprintf(stderr, "HX_init: %s\n", strerror(errno)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_mount-2.14/src/rdconf1.c new/pam_mount-2.15/src/rdconf1.c --- old/pam_mount-2.14/src/rdconf1.c 2013-08-27 12:16:34.000000000 +0200 +++ new/pam_mount-2.15/src/rdconf1.c 2014-12-01 14:35:30.000000000 +0100 @@ -1428,11 +1428,11 @@ */ {CMD_NFSMOUNT, "nfs", {"mount", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(COMBOPATH)", "%(MNTPT)", NULL}}, {CMD_NFSMOUNT, "nfs4"}, - {CMD_LCLMOUNT, NULL, {"mount", "-p0", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", NULL}}, + {CMD_LCLMOUNT, NULL, {"mount", "%(if %(OPTIONS),-o%(OPTIONS))", "-t%(FSTYPE)", "%(VOLUME)", "%(MNTPT)", NULL}}, {CMD_CRYPTMOUNT, "crypt", {"mount", "-t", "crypt", "%(if %(CIPHER),-ocipher=%(CIPHER))", "%(if %(FSKEYCIPHER),-ofsk_cipher=%(FSKEYCIPHER))", "%(if %(FSKEYHASH),-ofsk_hash=%(FSKEYHASH))", "%(if %(FSKEYPATH),-okeyfile=%(FSKEYPATH))", "%(if %(OPTIONS),-o%(OPTIONS))", "%(VOLUME)", "%(MNTPT)", NULL}}, {CMD_CRYPTMOUNT, "crypt_LUKS"}, {CMD_CRYPTMOUNT, "crypto_LUKS"}, - {CMD_CRYPTUMOUNT, "crypt", {"umount.crypt", "%(MNTPT)", NULL}}, + {CMD_CRYPTUMOUNT, "crypt", {"umount", "%(MNTPT)", NULL}}, {CMD_UMOUNT, NULL, {"umount", "%(MNTPT)", NULL}}, {CMD_FSCK, NULL, {"fsck", "-p", "%(FSCKTARGET)", NULL}}, {CMD_PMVARRUN, NULL, {"pmvarrun", "-u", "%(USER)", "-o", "%(OPERATION)", NULL}}, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
