Package: ecryptfs-utils Version: 66-2 Severity: normal Tags: patch I just merged Debian unstable's ecryptfs-utils-66-2 package into Ubuntu Jaunty.
This patch contains a few packaging changes that Ubuntu has been carrying, but I think Debian will benefit from, including: * auth-client-config has been replaced by functionality in libpam-runtime; changes required in: - debian/ecryptfs-utils.postinst - debian/rules - debian/control - debian/ecryptfs-utils.prerm - debian/ecryptfs-utils.dirs - debian/ecryptfs-utils.pam-auth-update * /usr/share files for a .desktop link for on-demand mounting, and a readme.txt explaining why an encrypted private directory has been unmounted. We're carrying these in debian/ right now, however, they have been committed upstream and should be available in the next (-67?) release, but for now, ecryptfs-setup-private will establish broken symlinks unless you drop these in debian/. Changes in: - debian/ecryptfs-mount-private.desktop - debian/ecryptfs-mount-private.txt - debian/rules - debian/ecryptfs-utils.install - debian/ecryptfs-utils.dirs Cheers, :-Dustin
diff -u ecryptfs-utils-66/debian/ecryptfs-utils.postinst ecryptfs-utils-66/debian/ecryptfs-utils.postinst
--- ecryptfs-utils-66/debian/ecryptfs-utils.postinst
+++ ecryptfs-utils-66/debian/ecryptfs-utils.postinst
@@ -1,3 +1,28 @@
+#!/bin/sh -e
+
+auth=0c1295085dca124e6ba5a3cea7993c22
+account=9f04221fe44762047894adeb96ffd069
+session=2e9a42f2a3b6573891ff9e6bf0c31c9e
+password=4cf59ec48caad2a06ea2e183d8bc007a
+
+force=
+if dpkg --compare-versions "$2" lt-nl 53-1ubuntu6; then
+ # If we're upgrading from an older ecryptfs-utils,
+ # and the pam configuration precisely matches that
+ # which was written by auth-client-config, we can
+ # safely force the pam-auth-update.
+ force=--force
+ for type in auth account session password
+ do
+ sum="$(md5sum /etc/pam.d/common-$type 2>/dev/null | awk '{ print $1 }')"
+ [ "$sum" = "$(eval echo \$$type)" ] || force=
+ done
+fi
+pam-auth-update --package $force
+
+#DEBHELPER#
+
+exit 0
#!/bin/sh
set -e
diff -u ecryptfs-utils-66/debian/rules ecryptfs-utils-66/debian/rules
--- ecryptfs-utils-66/debian/rules
+++ ecryptfs-utils-66/debian/rules
@@ -52,6 +54,9 @@
dh_installdirs
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+ install -m 644 -D $(CURDIR)/debian/ecryptfs-utils.pam-auth-update $(CURDIR)/debian/tmp/usr/share/pam-configs/ecryptfs-utils
+ install -m 644 -D $(CURDIR)/debian/ecryptfs-mount-private.desktop $(CURDIR)/debian/tmp/usr/share/ecryptfs-utils/ecryptfs-mount-private.desktop
+ install -m 644 -D $(CURDIR)/debian/ecryptfs-mount-private.txt $(CURDIR)/debian/tmp/usr/share/ecryptfs-utils/ecryptfs-mount-private.txt
install -D -m 0644 debian/config/ecryptfs-mount-private.desktop debian/ecryptfs-utils/usr/share/ecryptfs-utils/ecryptfs-mount-private.desktop
mv debian/tmp/usr/share/doc/ecryptfs-utils/ecryptfs-mount-private.txt debian/ecryptfs-utils/usr/share/ecryptfs-utils/ecryptfs-mount-private.txt
diff -u ecryptfs-utils-66/debian/ecryptfs-utils.install ecryptfs-utils-66/debian/ecryptfs-utils.install
--- ecryptfs-utils-66/debian/ecryptfs-utils.install
+++ ecryptfs-utils-66/debian/ecryptfs-utils.install
@@ -6,0 +7,3 @@
+/usr/share/pam-configs/ecryptfs-utils
+/usr/share/ecryptfs-utils/ecryptfs-mount-private.desktop
+/usr/share/ecryptfs-utils/ecryptfs-mount-private.txt
diff -u ecryptfs-utils-66/debian/control ecryptfs-utils-66/debian/control
--- ecryptfs-utils-66/debian/control
+++ ecryptfs-utils-66/debian/control
@@ -11,7 +12,7 @@
Package: ecryptfs-utils
Section: misc
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 1.0.1-2ubuntu1)
Recommends: keyutils
Suggests: opencryptoki
Description: ecryptfs cryptographic filesystem (utilities)
--- ecryptfs-utils-66.orig/debian/ecryptfs-utils.prerm
+++ ecryptfs-utils-66/debian/ecryptfs-utils.prerm
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+if [ "$1" = remove ]; then
+ pam-auth-update --package --remove ecryptfs-utils
+fi
+
+#DEBHELPER#
+
+exit 0
only in patch2:
unchanged:
--- ecryptfs-utils-66.orig/debian/ecryptfs-mount-private.txt
+++ ecryptfs-utils-66/debian/ecryptfs-mount-private.txt
@@ -0,0 +1,9 @@
+THIS DIRECTORY HAS BEEN UNMOUNTED TO PROTECT YOUR DATA.
+
+From the graphical desktop, click on:
+ "Access Your Private Data"
+
+or
+
+From the command line, run:
+ $ ecryptfs-mount-private
only in patch2:
unchanged:
--- ecryptfs-utils-66.orig/debian/ecryptfs-utils.dirs
+++ ecryptfs-utils-66/debian/ecryptfs-utils.dirs
@@ -0,0 +1,2 @@
+usr/share/pam-configs
+usr/share/ecryptfs-utils
only in patch2:
unchanged:
--- ecryptfs-utils-66.orig/debian/ecryptfs-utils.pam-auth-update
+++ ecryptfs-utils-66/debian/ecryptfs-utils.pam-auth-update
@@ -0,0 +1,12 @@
+Name: eCryptfs Key/Mount Management
+Default: yes
+Priority: 0
+Auth-Type: Additional
+Auth-Final:
+ optional pam_ecryptfs.so unwrap
+Session-Type: Additional
+Session-Final:
+ optional pam_ecryptfs.so unwrap
+Password-Type: Additional
+Password-Final:
+ optional pam_ecryptfs.so
only in patch2:
unchanged:
--- ecryptfs-utils-66.orig/debian/ecryptfs-mount-private.desktop
+++ ecryptfs-utils-66/debian/ecryptfs-mount-private.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Access Your Private Data
+GenericName=Access Your Private Data
+Exec=/usr/bin/ecryptfs-mount-private
+Terminal=true
+Type=Application
+Categories=System;
signature.asc
Description: This is a digitally signed message part
