diff --git a/pam_mount-0.35-fix-configure.dif b/pam_mount-0.35-fix-configure.dif index 6c99942..bb3dd04 100644 --- a/pam_mount-0.35-fix-configure.dif +++ b/pam_mount-0.35-fix-configure.dif @@ -2,28 +2,17 @@ Index: pam_mount-0.35/configure.ac =================================================================== --- pam_mount-0.35.orig/configure.ac +++ pam_mount-0.35/configure.ac -@@ -45,15 +45,17 @@ AC_ARG_WITH([selinux], AS_HELP_STRING([- - AM_CONDITIONAL(SELINUX, $with_selinux) +@@ -46,8 +46,11 @@ AM_CONDITIONAL(SELINUX, $with_selinux) m4_sinclude(m4lib/gcc4_visibility.m4) --# RH 8.0's OpenSSL does not have? + # RH 8.0's OpenSSL does not have? -AC_CHECK_LIB(crypto, EVP_DecryptInit_ex, [pmt_LIBS="$pmt_LIBS -lcrypto"]) -AC_CHECK_LIB(ssl, SSL_load_error_strings, [pmt_LIBS="$pmt_LIBS -lssl"]) ++AC_CHECK_LIB(crypto, EVP_DecryptInit_ex) ++AC_CHECK_LIB(ssl, SSL_load_error_strings) ++pmt_LIBS="$LIBS"; ++LIBS=""; ++AC_SUBST(pmt_LIBS) regular_CFLAGS="-D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1 \ -- -D_FILE_OFFSET_BITS=64 \ -- -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \ -- -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \ -- -Winline -Wformat=2 -pipe" -+ -D_FILE_OFFSET_BITS=64 \ -+ -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \ -+ -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \ -+ -Winline -Wformat=2 -pipe" -+ -+# RH 8.0's OpenSSL does not have? -+AC_CHECK_LIB(crypto, EVP_DecryptInit_ex, [LIBS="$LIBS -lcrypto"; regular_CFLAGS="$regular_CFLAGS -DHAVE_LIBCRYPTO=1"]) -+AC_CHECK_LIB(ssl, SSL_load_error_strings, [LIBS="$LIBS -lssl"; regular_CFLAGS="$regular_CFLAGS -DHAVE_LIBSSL=1"]) -+ - AC_SUBST(regular_CFLAGS) - - AC_CHECK_MEMBERS([struct loop_info64.lo_file_name], [], [], + -D_FILE_OFFSET_BITS=64 \ diff --git a/pam_mount.changes b/pam_mount.changes index ff7a1e6..c41551a 100644 --- a/pam_mount.changes +++ b/pam_mount.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 22 16:44:52 CEST 2008 - mc@suse.de + +- use upstream fix for bnc#381292 + ------------------------------------------------------------------- Fri Apr 18 14:35:59 CEST 2008 - mc@suse.de diff --git a/pam_mount.spec b/pam_mount.spec index 2d2e288..26ea88c 100644 --- a/pam_mount.spec +++ b/pam_mount.spec @@ -16,7 +16,7 @@ BuildRequires: libHX10-devel libxml2-devel openssl-devel pam-devel perl-XML-Wri BuildRequires: linux-kernel-headers Summary: A PAM Module that can Mount Volumes for a User Session Version: 0.35 -Release: 4 +Release: 5 # psmisc: /bin/fuser Recommends: cifs-mount psmisc Recommends: cryptsetup @@ -121,6 +121,8 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man8/umount.crypt.8.gz %changelog +* Tue Apr 22 2008 mc@suse.de +- use upstream fix for bnc#381292 * Fri Apr 18 2008 mc@suse.de - fix configure (bnc#381292) * Thu Apr 10 2008 ro@suse.de