From 0f50b0957fe950a2ab2e3918aa4b0f17a90ca0ae Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Dec 29 2008 19:56:53 +0000
Subject: update to version 67


---

diff --git a/ecryptfs-utils-67-nss3.patch b/ecryptfs-utils-67-nss3.patch
new file mode 100644
index 0000000..a4c6204
--- /dev/null
+++ b/ecryptfs-utils-67-nss3.patch
@@ -0,0 +1,32 @@
+diff -up ecryptfs-utils-67/src/libecryptfs/key_management.c.nss3 ecryptfs-utils-67/src/libecryptfs/key_management.c
+--- ecryptfs-utils-67/src/libecryptfs/key_management.c.nss3	2008-12-02 05:15:43.000000000 +0100
++++ ecryptfs-utils-67/src/libecryptfs/key_management.c	2008-12-29 17:57:33.841262892 +0100
+@@ -20,9 +20,9 @@
+ 
+ #include <errno.h>
+ #ifdef ENABLE_NSS
+-#include <nss/pk11func.h>
+-#include <nss/secmod.h>
+-#include <nss/secmodt.h>
++#include <nss3/pk11func.h>
++#include <nss3/secmod.h>
++#include <nss3/secmodt.h>
+ #else
+ #include <gcrypt.h>
+ #endif /* #ifdef ENABLE_NSS */
+diff -up ecryptfs-utils-67/src/libecryptfs/main.c.nss3 ecryptfs-utils-67/src/libecryptfs/main.c
+--- ecryptfs-utils-67/src/libecryptfs/main.c.nss3	2008-12-02 05:15:43.000000000 +0100
++++ ecryptfs-utils-67/src/libecryptfs/main.c	2008-12-29 17:57:47.143261227 +0100
+@@ -21,9 +21,9 @@
+ 
+ #include <errno.h>
+ #ifdef ENABLE_NSS
+-#include <nss/pk11func.h>
+-#include <nss/secmod.h>
+-#include <nss/secmodt.h>
++#include <nss3/pk11func.h>
++#include <nss3/secmod.h>
++#include <nss3/secmodt.h>
+ #else
+ #include <gcrypt.h>
+ #endif /* #ifdef ENABLE_NSS */
diff --git a/ecryptfs-utils.spec b/ecryptfs-utils.spec
index 9316e65..2dad344 100644
--- a/ecryptfs-utils.spec
+++ b/ecryptfs-utils.spec
@@ -1,15 +1,19 @@
+%{!?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)")}
+
 Name: ecryptfs-utils
-Version: 61
+Version: 67
 Release: 0%{?dist}
 Summary: The eCryptfs mount helper and support libraries
 Group: System Environment/Base
 License: GPLv2+
-URL: http://ecryptfs.sourceforge.net
-Source0: http://downloads.sourceforge.net/ecryptfs/ecryptfs-utils-%{version}.tar.bz2
+URL: https://launchpad.net/ecryptfs
+Source0: http://launchpad.net/ecryptfs/trunk/%{version}/+download/ecryptfs-utils-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
-BuildRequires: trousers-devel
+BuildRequires: trousers-devel python
 Conflicts: kernel < 2.6.19
+Patch0: ecryptfs-utils-67-nss3.patch
 
 %description
 eCryptfs is a stacked cryptographic filesystem that ships in Linux
@@ -27,12 +31,26 @@ Requires: keyutils-libs-devel %{name} = %{version}-%{release}
 %description devel
 Userspace development files for eCryptfs.
 
+%package python
+Summary: Python bindings for the eCryptfs utils
+Group: System Environment/Base
+Requires: ecryptfs-utils %{name} = %{version}-%{release}
+
+%description python
+The ecryptfs-utils-python package contains a module that permits 
+applications written in the Python programming language to use 
+the interface supplied by the ecryptfs-utils library.
+
 %prep
 
 %setup -q
+%patch0 -p1 -b .nss3
 
 %build
 %configure --disable-rpath --enable-tspi
+#disable rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
@@ -54,10 +72,9 @@ 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/mount.ecryptfs_private
-/sbin/umount.ecryptfs_private
+%attr(4755,root,root) /sbin/mount.ecryptfs
+%attr(4755,root,root) /sbin/mount.ecryptfs_private
+%attr(4755,root,root) /sbin/umount.ecryptfs_private
 %{_bindir}/ecryptfs-manager
 %{_bindir}/ecryptfs-insert-wrapped-passphrase-into-keyring
 %{_bindir}/ecryptfs-rewrap-passphrase
@@ -95,17 +112,26 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/mount.ecryptfs.8.gz
 %{_mandir}/man8/pam_ecryptfs.8.gz
 
-%attr(4755,root,root) /sbin/mount.ecryptfs
-%attr(4755,root,root) /sbin/mount.ecryptfs_private
-%attr(4755,root,root) /sbin/umount.ecryptfs_private
-
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libecryptfs.so
 %{_libdir}/pkgconfig/libecryptfs.pc
 %{_includedir}/ecryptfs.h
 
+%files python
+%defattr(-,root,root,-)
+%{python_sitelib}/ecryptfs-utils/libecryptfs.py
+%{python_sitelib}/ecryptfs-utils/libecryptfs.pyc
+%{python_sitelib}/ecryptfs-utils/libecryptfs.pyo
+%{python_sitearch}/ecryptfs-utils/_libecryptfs.so.0
+%{python_sitearch}/ecryptfs-utils/_libecryptfs.so.0.0.0
+%{python_sitearch}/ecryptfs-utils/_libecryptfs.la
+%{python_sitearch}/ecryptfs-utils/_libecryptfs.so
+
 %changelog
+* Mon Dec 29 2008 Michal Hlavinka <mhlavink@redhat.com> 67-0
+- updated to 67
+
 * Wed Oct 22 2008 Mike Halcrow <mhalcrow@us.ibm.com> 61-0
 - Add support for filename encryption enablement (future kernel feature)
 - Replace uint32_t with size_t for x86_64 compatibility (patch by Eric Sandeen)