[meego-commits] 6372: Changes to Trunk:Testing/ecryptfs-utils

[Yan Li]

Hi,
I have made the following changes to ecryptfs-utils in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Yan Li

[This message was auto-generated]

---

Request #6372:

  submit:   home:yanli:branches:Trunk:Testing/ecryptfs-utils(r9)(cleanup) -> Trunk:Testing/ecryptfs-utils


Message:
    No longer use authconfig to add ecryptfs PAM module. Use the new PAM script install-pam-module.sh to do this. BuildRequires gettext-devel, Requires gettext-libs. Removed gratuitous dependency on a specific pam package version.

State:   new          2010-08-08T19:35:41 yanli
Comment: None



changes files:
--------------
--- ecryptfs-utils.changes
+++ ecryptfs-utils.changes
@@ -1 +1,7 @@
-* Thu Apr 15 2010 Yan Li <yan.i.li at intel.com> 83
+* Thu Jul 22 2010 Yan Li <yan.i.li at intel.com> - 83
+- No longer use authconfig to add ecryptfs PAM module. Use the new PAM
+  script install-pam-module.sh to do this.
+- BuildRequires gettext-devel, Requires gettext-libs
+- Removed gratuitous dependency on a specific pam package version
+
+* Thu Apr 15 2010 Yan Li <yan.i.li at intel.com> - 83
@@ -7 +13 @@
-* Wed Mar 31 2010 Yan Li <yan.i.li at intel.com> 83
+* Wed Mar 31 2010 Yan Li <yan.i.li at intel.com> - 83
@@ -12 +18 @@
-* Fri Mar  5 2010 Yan Li <yan.i.li at intel.com> 83
+* Fri Mar  5 2010 Yan Li <yan.i.li at intel.com> - 83
@@ -19 +25 @@
-* Wed Jan 13 2010 Yan Li <yan.i.li at intel.com> 82
+* Wed Jan 13 2010 Yan Li <yan.i.li at intel.com> - 82
@@ -22 +28 @@
-* Tue Nov 10 2009 Priya Vijayan <priya.vijayan at intel.com> 81
+* Tue Nov 10 2009 Priya Vijayan <priya.vijayan at intel.com> - 81

spec files:
-----------
--- ecryptfs-utils.spec
+++ ecryptfs-utils.spec
@@ -13,11 +13,16 @@
 Patch101: meegobug101-close-all-fds.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires: keyutils
+Requires: gettext-libs
+# MeeGo's pam later than 1.1.1-3.1 has a proper system-auth.pamd into
+# which we can add ecryptfs modules correctly without using
+# authconfig. We don't support old system-auth file shipped in old pam
+# packages.
+Requires: pam
 BuildRequires: libgcrypt-devel keyutils-libs-devel openssl-devel pam-devel
 BuildRequires: trousers-devel python python-devel nss-devel desktop-file-utils
-BuildRequires: intltool
+BuildRequires: intltool gettext-devel
 Conflicts: kernel < 2.6.19
-Requires: gettext
 
 %description
 eCryptfs is a stacked cryptographic filesystem that ships in Linux
@@ -70,7 +75,17 @@
 
 %find_lang %{name}
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+/usr/sbin/install-pam-module.sh "auth" "auth        optional      pam_ecryptfs.so unwrap"
+/usr/sbin/install-pam-module.sh "password" "password    optional      pam_ecryptfs.so"
+/usr/sbin/install-pam-module.sh "session" "session     optional      pam_ecryptfs.so unwrap"
+
+%preun
+if [ $1 -eq 0 ]; then
+    # This will cause all lines that contain "pam_ecryptfs" in PAM conf removed
+    /usr/sbin/install-pam-module.sh -u "auth" "pam_ecryptfs"
+fi
 
 %postun -p /sbin/ldconfig
 

other changes:
--------------