From 7ddd80ab6b4c6486e45de8b1487aa14c1f3d599e Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Jan 27 2010 14:19:45 +0000 Subject: - better fix for (#486139) --- diff --git a/ecryptfs-utils-74-build.patch b/ecryptfs-utils-74-build.patch deleted file mode 100644 index 29dac61..0000000 --- a/ecryptfs-utils-74-build.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up ecryptfs-utils-74/src/libecryptfs/Makefile.am.486139 ecryptfs-utils-74/src/libecryptfs/Makefile.am ---- ecryptfs-utils-74/src/libecryptfs/Makefile.am.486139 2009-04-20 11:03:03.000000000 +0200 -+++ ecryptfs-utils-74/src/libecryptfs/Makefile.am 2009-04-23 17:03:16.178703120 +0200 -@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil - - lib_LTLIBRARIES = libecryptfs.la - -+noinst_LIBRARIES = libecryptfs.a -+ - pkgconfig_DATA = libecryptfs.pc - - libecryptfs_la_SOURCES = \ -@@ -20,10 +22,13 @@ libecryptfs_la_SOURCES = \ - ecryptfs-stat.c \ - $(top_srcdir)/src/key_mod/ecryptfs_key_mod_passphrase.c - -+libecryptfs_a_SOURCES = $(libecryptfs_la_SOURCES) -+ - libecryptfs_la_LDFLAGS = \ - -version-info @LIBECRYPTFS_LT_CURRENT@:@LIBECRYPTFS_LT_REVISION@:@LIBECRYPTFS_LT_AGE@ \ - -no-undefined - libecryptfs_la_CFLAGS = $(AM_CFLAGS) $(CRYPTO_CFLAGS) $(KEYUTILS_CFLAGS) -+libecryptfs_a_CFLAGS = $(libecryptfs_la_CFLAGS) - libecryptfs_la_LIBADD = $(CRYPTO_LIBS) $(KEYUTILS_LIBS) - - splint: -diff -up ecryptfs-utils-74/src/utils/Makefile.am.486139 ecryptfs-utils-74/src/utils/Makefile.am ---- ecryptfs-utils-74/src/utils/Makefile.am.486139 2009-04-20 11:03:03.000000000 +0200 -+++ ecryptfs-utils-74/src/utils/Makefile.am 2009-04-23 17:12:38.297756365 +0200 -@@ -35,12 +35,12 @@ mount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(K - mount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) - umount_ecryptfs_SOURCES = umount.ecryptfs.c - umount_ecryptfs_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) --umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la -+umount_ecryptfs_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.a $(KEYUTILS_LIBS) $(CRYPTO_LIBS) - ecryptfs_manager_SOURCES = manager.c io.c io.h gen_key.c - ecryptfs_manager_CFLAGS = $(AM_CFLAGS) $(KEYUTILS_CFLAGS) $(LIBGCRYPT_CFLAGS) - ecryptfs_manager_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la $(KEYUTILS_LIBS) $(LIBGCRYPT_LIBS) - ecryptfs_wrap_passphrase_SOURCES = ecryptfs_wrap_passphrase.c --ecryptfs_wrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la -+ecryptfs_wrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la - ecryptfs_unwrap_passphrase_SOURCES = ecryptfs_unwrap_passphrase.c - ecryptfs_unwrap_passphrase_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la - ecryptfs_insert_wrapped_passphrase_into_keyring_SOURCES = ecryptfs_insert_wrapped_passphrase_into_keyring.c diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec index 3f21ba3..e3255c6 100644 --- a/ecryptfs-utils.spec +++ b/ecryptfs-utils.spec @@ -1,9 +1,11 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%global _libdir /%{_lib} +%global _sbindir /sbin Name: ecryptfs-utils Version: 82 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The eCryptfs mount helper and support libraries Group: System Environment/Base License: GPLv2+ @@ -11,15 +13,12 @@ URL: https://launchpad.net/ecryptfs Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/%{name}_%{version}.orig.tar.gz Source1: ecryptfs-mount-private.png -# fix wrong Makefile for umount.ecryptfs -Patch2: ecryptfs-utils-74-build.patch - # allow building with -Werror # required for ecryptfs-utils <= 81 -Patch4: ecryptfs-utils-75-werror.patch +Patch1: ecryptfs-utils-75-werror.patch -# rhbz#500829 -Patch6: ecryptfs-utils-75-nocryptdisks.patch +# rhbz#500829, do not use ubuntu/debian only service +Patch2: ecryptfs-utils-75-nocryptdisks.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Requires: keyutils, cryptsetup-luks, e2fsprogs @@ -56,13 +55,12 @@ the interface supplied by the ecryptfs-utils library. %prep %setup -q -%patch2 -p1 -b .build -%patch4 -p1 -b .werror -%patch6 -p1 -b .nocryptdisks +%patch1 -p1 -b .werror +%patch2 -p1 -b .nocryptdisks %build export CFLAGS="$RPM_OPT_FLAGS -ggdb -O2 -Werror" -%configure --disable-rpath --enable-tspi --enable-nss --enable-static +%configure --disable-rpath --enable-tspi --enable-nss make clean #disable rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -73,8 +71,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT%{_libdir}/ -name '*.a' | xargs rm -f -find $RPM_BUILD_ROOT%{_libdir}/ -name '*.la' | xargs rm -f +find $RPM_BUILD_ROOT/ -name '*.la' | xargs rm -f rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name} #install files Makefile forgot install install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/ecryptfs-mount-private.png @@ -107,10 +104,10 @@ rm -rf $RPM_BUILD_ROOT %doc README COPYING AUTHORS NEWS THANKS %doc doc/ecryptfs-faq.html doc/ecryptfs-pam-doc.txt %doc doc/ecryptfs-pkcs11-helper-doc.txt -/sbin/mount.ecryptfs -/sbin/umount.ecryptfs -%attr(4750,root,ecryptfs) /sbin/mount.ecryptfs_private -/sbin/umount.ecryptfs_private +%{_sbindir}/mount.ecryptfs +%{_sbindir}/umount.ecryptfs +%attr(4750,root,ecryptfs) %{_sbindir}/mount.ecryptfs_private +%{_sbindir}/umount.ecryptfs_private %{_bindir}/ecryptfs-manager %{_bindir}/ecryptfs-insert-wrapped-passphrase-into-keyring %{_bindir}/ecryptfs-rewrap-passphrase @@ -126,9 +123,8 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/ecryptfs-stat %{_bindir}/ecryptfsd %{_libdir}/ecryptfs -%{_libdir}/libecryptfs.so.0 -%{_libdir}/libecryptfs.so.0.0.0 -/%{_lib}/security/pam_ecryptfs.so +%{_libdir}/libecryptfs.so.* +%{_libdir}/security/pam_ecryptfs.so %dir %{_datadir}/%{name} %{_datadir}/%{name}/ecryptfs-mount-private.txt %{_datadir}/%{name}/ecryptfs-mount-private.desktop @@ -173,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/ecryptfs-utils/_libecryptfs.so %changelog +* Wed Jan 27 2010 Michal Hlavinka - 82-2 +- better fix for (#486139) + * Wed Nov 11 2009 Michal Hlavinka - 82-1 - updated to 82