--- pmount-0.9.16.orig/debian/README.Debian
+++ pmount-0.9.16/debian/README.Debian
@@ -0,0 +1,15 @@
+pmount for Debian
+-----------------
+
+To restrict the ability to mount arbitrary devices to selected
+"Desktop" users, the Debian package for pmount restricts the execution
+of pmount and pumount to members of the group "plugdev".
+
+So, for every user who should be able to execute pmount, please
+execute the following command (as root):
+
+   adduser <user> plugdev
+
+(with replacing "<user>" by the respective user login).
+
+ -- Martin Pitt <mpitt@debian.org>
--- pmount-0.9.16.orig/debian/changelog
+++ pmount-0.9.16/debian/changelog
@@ -0,0 +1,407 @@
+pmount (0.9.16-4ubuntu0.1) hardy-security; urgency=low
+
+  * SECURITY UPDATE: 02-fix-CVE-2010-2192.dpatch to fix a security hole,
+    referenced as CVE-2010-2192. Patch thanks to Vincent Fourmond (Debian).
+    - LP: #574809
+
+ -- Jamie Strandboge <jamie@ubuntu.com>  Fri, 13 Aug 2010 13:55:17 -0500
+
+pmount (0.9.16-4) unstable; urgency=low
+
+  * Revert 04-dont-resolve-fstab-symlinks, as it has very nast
+    side effects (Closes: #435645)
+  * Now check twice if the device is in fstab: once before prepending
+    /dev, once afterwards, so that #418888 stays closed !
+
+ -- Vincent Fourmond <fourmond@debian.org>  Thu, 16 Aug 2007 15:25:17 +0200
+
+pmount (0.9.16-3) unstable; urgency=low
+
+  * Don't check if pmount's argument is a fstab mountpoint if we
+    do know it is a device (should Closes: #418203)
+
+ -- Vincent Fourmond <fourmond@debian.org>  Tue, 17 Jul 2007 21:00:11 +0200
+
+pmount (0.9.16-2) unstable; urgency=low
+
+  * Disable symlink lookup for /etc/fstab entries, as it doesn't
+    make much sense as mount itself doesn't do it. (Closes: #418888)
+
+ -- Vincent Fourmond <fourmond@debian.org>  Fri, 06 Jul 2007 19:49:23 +0200
+
+pmount (0.9.16-1) unstable; urgency=low
+
+  * New 'upstream release':
+    - support for fmask/dmask (Closes: #344278, #431065), based on a
+      patch by Suren A. Chilingaryan <csa@dside.dyndns.org>
+    - better support for mounting by label/uuid (Closes: #328980)
+    - now using nls=charset for NTFS (Closes: #398388)
+    - pmount without arguments now lists the mounted removable
+      devices, based on a patch by Dan Keder <keder@fi.muni.cz> 
+      (Closes: #426879)
+    - pmount now can mount NTFS fs via ntfsmount or ntfs-3g 
+      (Closes: #375211)
+
+ -- Vincent Fourmond <fourmond@debian.org>  Wed, 04 Jul 2007 00:22:39 +0200
+
+pmount (0.9.15-1) unstable; urgency=low
+
+  * New 'upstream' release:
+    - Fixes problems with recent kernels (Closes: #411380, #411772)
+    - better behavior with LUKS devices (Closes: #408673)
+
+ -- Vincent Fourmond <fourmond@debian.org>  Wed, 27 Jun 2007 23:36:09 +0200
+
+pmount (0.9.14-1) unstable; urgency=low
+
+  * New 'upstream' release:
+    - Fixes the case when /media is a symlink, thanks to
+      Tim Phipps <tim@phipps-hutton.freeserve.co.uk> (Closes: 383929)
+    - -p is now a shortcut for --passphrase (Closes: #386230)
+    - document why pmount gives more error messages than
+      mount -t auto (Closes: #388507)
+  * Update FSF's address in debian/copyright
+
+ -- Vincent Fourmond <fourmond@debian.org>  Sat, 16 Jun 2007 14:54:28 +0200
+
+pmount (0.9.13-4) unstable; urgency=low
+
+  * Now using dpatch
+  * Fix potential kernel panics with custom ext2/3 filsystems
+    (closes: #427402)
+  * Fixed typo in the help text (closes: #385153)
+
+ -- Vincent Fourmond <fourmond@debian.org>  Wed, 13 Jun 2007 23:27:36 +0200
+
+pmount (0.9.13-3) unstable; urgency=low
+
+  * New maintainer (closes: #422005)
+  * Added debian/watch with new alioth project files
+  * Bumped Standards-Version to 3.7.2, no changes
+
+ -- Vincent Fourmond <fourmond@debian.org>  Tue, 12 Jun 2007 20:33:20 +0200
+
+pmount (0.9.13-2) unstable; urgency=low
+
+  * Orphan package (see #422005)
+
+ -- Martin Pitt <mpitt@debian.org>  Sun, 20 May 2007 15:44:07 +0200
+
+pmount (0.9.13-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    - pmount-hal: Minor change to build with dbus 0.91.
+    - pmount: If pmount is installed setgid, use pmount's group for gid mount
+      option, otherwise use the user's group, as usual (patch from Wilhelm Meier
+      <wilhelm.meier@fh-kl.de>).
+    - pmount: Consider devices on pcmcia bus as hotpluggable (and thus
+      pmountable). (https://launchpad.net/bugs/50226)
+    - Fix automake file to ship README.devel.
+    - Fix default path of /etc/pmount.allow (regression from 0.9.12).
+      Closes: #383242
+    - Update translations from Rosetta.
+    - Remove ALL_LINGUAGS from configure.ac, move them to po/LINGUAS.
+
+ -- Martin Pitt <mpitt@debian.org>  Tue, 15 Aug 2006 23:57:18 +0200
+
+pmount (0.9.12-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    - Fix pmount.allow parsing regular expression (it failed in some ISO
+      locales). (https://launchpad.net/bugs/49655)
+    - pmount-hal: Honour iocharset mount option from hal policy. 
+      Closes: #320696, https://launchpad.net/bugs/55422
+    - pmount-hal: Replace slashes with underscores in label. Closes: #364337,
+      https://launchpad.net/bugs/46536
+    - pmount: Mount UDF with default umask 000, so that the UDF permissions are not
+      altered. Closes: #348080
+    - Check for HAL libraries at configure time and conditionally build
+      pmount-hal. Closes: #375230
+    - Add configure options for external programs and paths, so that policy.h
+      does not need to be altered for installation customizations any more.
+      Closes: #375229
+    - Update translations from Rosetta.
+
+ -- Martin Pitt <mpitt@debian.org>  Tue,  8 Aug 2006 12:21:07 +0200
+
+pmount (0.9.11-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    - pmount: Refuse to mount devices to a mount point that is already in
+      /etc/fstab.
+    - pmount-hal: Do not try mount non-fstab devices to fstab mountpoints.
+      (https://launchpad.net/bugs/28920)
+    - Update translations from Launchpad Rosetta.
+
+ -- Martin Pitt <mpitt@debian.org>  Thu, 11 May 2006 22:25:40 +0200
+
+pmount (0.9.10-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    - Fix processing of hal's mount options. (patch was already applied in
+      previous version).
+    - pmount-hal: Directly call mount for devices in /etc/fstab. This allows
+      non-plugdev users to mount CD-ROMs and the like with GUIs like Gnome
+      (which call pmount-hal).  (https://launchpad.net/bugs/33232)
+    - Document PMOUNT_DEBUG environment variable in pmount-hal manpage.
+  * Remove debian/patches/02-pmount-hal-fix-mountoptions.patch, fixed
+    upstream.
+
+ -- Martin Pitt <mpitt@debian.org>  Thu, 11 May 2006 14:50:40 +0200
+
+pmount (0.9.9-2) unstable; urgency=medium
+
+  * Urgency medium since this only fixes two obvious bugs.
+  * Add debian/patches/02-pmount-hal-fix-mountoptions.patch:
+    - Fix processing of hal's mount options.
+    - Patch taken from bzr head.
+    - Closes: #330462
+  * Remove debian/pmount.dirs so that /media is not owned by pmount any more
+    (base-files creates it nowadays). Create /media in the postinst instead if
+    it does not exist. Closes: #355405
+
+ -- Martin Pitt <mpitt@debian.org>  Mon, 13 Mar 2006 19:15:35 +0100
+
+pmount (0.9.9-1) unstable; urgency=low
+
+  * New upstream release, only fixes two major bugs in pmount-hal:
+    - Fix crash for label-less volumes with hal 0.5.7.
+    - Assign a proper mount point to devices with empty labels (with hal
+      0.5.7, they became /media/-1).
+
+ -- Martin Pitt <mpitt@debian.org>  Fri,  3 Mar 2006 17:38:07 +0100
+
+pmount (0.9.8-1) unstable; urgency=low
+
+  * New upstream release:
+    - Support reiser4 file systems.
+    - Support mounting of MMC cards.
+    - pmount-hal now works correctly with hal 0.5.7.
+    - Many updated translations from Launchpad Rosetta, thanks to all the
+      translators!
+  * debian/rules: Generate a .POT file during build.
+
+ -- Martin Pitt <mpitt@debian.org>  Tue, 28 Feb 2006 19:48:44 +0100
+
+pmount (0.9.7-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Martin Pitt <mpitt@debian.org>  Mon,  9 Jan 2006 19:37:36 +0100
+
+pmount (0.9.7-1) experimental; urgency=low
+
+  * New upstream release:
+    - Mount vfat with shortname=mixed option for better WinXP compatibility.
+    - Fix configure check for libsysfs2.
+    - Support --version argument. Ubuntu bug #20336
+    - Automatically prepend /dev to device argument if it is missing. 
+      Closes: #342280
+
+ -- Martin Pitt <mpitt@debian.org>  Fri, 16 Dec 2005 13:51:57 +0100
+
+pmount (0.9.6-1) experimental; urgency=low
+
+  * New upstream bugfix release.
+    - Now respects hal's exec/noexec policy. Closes: #330462
+    - Clean up default options in pmount manpage. Closes: #330589
+  * debian/patches/01-man-plugdev.patch.patch: Adopted to new file layout.
+  * debian/rules: Adapt to autotoolized source package.
+  * debian/control: Add intltool build dependency.
+
+ -- Martin Pitt <mpitt@debian.org>  Tue, 18 Oct 2005 11:35:56 +0200
+
+pmount (0.9.5-1) experimental; urgency=low
+
+  * New upstream bugfix release:
+    - Fix race condition with several parallel pmount instances which could
+      cause double mounts to the same mount point. Also, pmount-hal now
+      handles this case gracefully and reattempts pmount call with a fresh
+      label. (Ubuntu #14415)
+    - pmount-hal: Use storage.policy.mount_filesystem as a fallback if
+      volume.policy.mount_filesystem does not exist. (Ubuntu #14848)
+    - Fix read-only encrypted devices; thanks to Sören Köpping for the patch.
+      Closes: #326186
+    - Translation updates from Rosetta.
+
+ -- Martin Pitt <mpitt@debian.org>  Thu, 15 Sep 2005 17:47:07 +0200
+
+pmount (0.9.4-1) experimental; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Martin Pitt <mpitt@debian.org>  Fri, 29 Jul 2005 13:17:04 +0200
+
+pmount (0.9.2-1) experimental; urgency=low
+
+  * New upstream release:
+    - pmount-hal: Ported to new dbus 0.3x/hal 0.5.x APIs.
+    - Supports mounting LUKS encrypted devices with LUKS capable cryptsetup
+      package (which is not in Debian yet, though).
+    - pmount-hal: Now read volume.policy.mount_filesystem instead of
+      volume.fstype. Closes: #306332
+    - pmount-hal: Now read umask setting from hal. Closes: #310228, #296914
+    - Now mount VFAT with shortnames=winnt. Closes: #310618
+    - Fix typos in manpage. Closes: #310802
+    - Release an encrypted device again if mounting fails. Closes: #315530
+    - Proper error message if mapped device for an encrypted volume already
+      exists. Closes: #315527
+    - iso9660 file system is now marked as capable of 'iocharset'. 
+      Closes: #312822
+  * Droped debian/patches/02-async_by_default.patch: This is upstream now.
+
+ -- Martin Pitt <mpitt@debian.org>  Sun,  3 Jul 2005 13:25:06 +0200
+
+pmount (0.8-2) unstable; urgency=high
+
+  * Urgency high since this fixes an RC bug, the fix should reach Sarge.
+  * Added debian/patches/02-async_by_default.patch:
+    - Mount devices 'async' by default instead of 'sync'. This will avoid
+      physical damage of flash chips due to exaggerated updating of inode/FAT
+      structures and greatly speed up the write throughput. On the bad side
+      this makes it much less safe to remove devices without proper umounting.
+    - Replace option "--async" with option "--sync".
+    - Document change in the manpages.
+    - Closes: #309591
+  * debian/control: Correct package priority to optional, to match the katie
+    overrides.
+
+ -- Martin Pitt <mpitt@debian.org>  Wed, 18 May 2005 15:41:13 +0200
+
+pmount (0.8-1) unstable; urgency=low
+
+  * New upstream release:
+    - Unbreak locking. (closes: #302174)
+    - More symmetry between pmount and pumount: pumount now works with label
+      name, pmount with a complete mount path (only in /media).
+      (closes: #299468)
+    - Now supports --umask option. (part of #296914)
+  * debian/pmount.postinst: Remove .created_by_pmount stamps from
+    /var/lock/pmount to clean up broken locking from versions < 0.8.
+    (see #302174)
+  * Compile with Sarge's dbus-1 version, since version 0.23.4 is not yet
+    available on all platforms. (closes: #303291)
+
+ -- Martin Pitt <mpitt@debian.org>  Mon, 11 Apr 2005 10:24:57 +0200
+
+pmount (0.7.2-1) unstable; urgency=low
+
+  * New upstream release:
+    - Pulled updated and new translations from Rosetta.
+
+ -- Martin Pitt <mpitt@debian.org>  Mon,  4 Apr 2005 18:02:35 +0200
+
+pmount (0.7.1-1) unstable; urgency=low
+
+  * New upstream bugfix release: pmount-hal now reuses an existing
+    /media/<label> directory if it only contains a ".created-by-pmount" stamp
+    file, which makes it work with unmounts using umount instead of pumount
+    (which happens at reboot/shutdown).
+
+ -- Martin Pitt <mpitt@debian.org>  Mon,  7 Feb 2005 11:40:59 +0100
+
+pmount (0.7-1) unstable; urgency=low
+
+  * New upstream release
+  * Added build dependency libhal-dev, the new pmount-hal (which is now
+    written in C) needs it.
+
+ -- Martin Pitt <mpitt@debian.org>  Thu,  3 Feb 2005 15:53:00 +0100
+
+pmount (0.6-1) unstable; urgency=low
+
+  * New upstream release
+    - now mounts vfat file systems with the "quiet" option (closes: #291645)
+    - pmount-hal now uses the file system provided by hal (if present) instead
+      of always autodetecting it; this saves some time and also avoids
+      confusing kernel log error messages (closes: #287815)
+    - now supports pmount/pumounting by mount point
+    - new translations
+  * Explain the "plugdev" group in README.Debian and in the manpages (patched
+    by 01-man-plugdev.patch.patch). (closes: #288957)
+  * postinst: Check for existence of group 'plugdev' before calling 'adduser'
+    to avoid confusing warnings.
+
+ -- Martin Pitt <mpitt@debian.org>  Thu, 27 Jan 2005 09:36:04 +0100
+
+pmount (0.5.1-1) unstable; urgency=low
+
+  * New upstream release
+    - do not allow empty media labels; this allowed to mount a
+      device directly under /media if /media was empty (closes: #288644)
+
+ -- Martin Pitt <mpitt@debian.org>  Wed,  5 Jan 2005 12:44:46 +0100
+
+pmount (0.5-1) unstable; urgency=low
+
+  * New upstream release, see upstream changelog for details
+    - does not remove directories it did not create (closes: #286936)
+    - default mountpoint is now given device name instead of symlink-resolved
+      one to support nicer names from symlinks (closes: #286695)
+
+ -- Martin Pitt <mpitt@debian.org>  Sun,  2 Jan 2005 17:56:19 +0100
+
+pmount (0.4.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Martin Pitt <mpitt@debian.org>  Thu, 16 Dec 2004 19:13:34 +0100
+
+pmount (0.4.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Martin Pitt <mpitt@debian.org>  Tue, 23 Nov 2004 16:12:41 +0100
+
+pmount (0.4.2-2) unstable; urgency=low
+
+  * pmount.postinst:
+    - simplified, the "plugdev" group approach is now used in both Debian and
+      Ubuntu
+    - protected adduser call with || true; this seems to fail on some weird
+      systems if the group already exists (closes: #282145)
+
+ -- Martin Pitt <mpitt@debian.org>  Sat, 20 Nov 2004 16:49:33 +0100
+
+pmount (0.4.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Martin Pitt <mpitt@debian.org>  Thu, 18 Nov 2004 16:25:30 +0100
+
+pmount (0.4.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Martin Pitt <mpitt@debian.org>  Tue, 16 Nov 2004 00:25:46 +0100
+
+pmount (0.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed pmount.manpages, manapage installation is now done by upstream
+    Makefile.
+  * debian/rules: use PREFIX=/usr
+  * debian/pmount.postinst: Restrict execution of pmount and pumount to
+    members of group 'plugdev'.
+  * debian/control: pmount now suggests hal and describes pmount-hal
+
+ -- Martin Pitt <mpitt@debian.org>  Mon, 15 Nov 2004 18:52:25 +0100
+
+pmount (0.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Martin Pitt <mpitt@debian.org>  Mon,  8 Nov 2004 22:29:15 +0100
+
+pmount (0.2.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Martin Pitt <mpitt@debian.org>  Wed, 20 Oct 2004 12:40:26 +0200
+
+pmount (0.2.1-1) unstable; urgency=low
+
+  * Initial Release (closes: #276253)
+
+ -- Martin Pitt <mpitt@debian.org>  Thu, 26 Aug 2004 16:04:04 +0200
+
--- pmount-0.9.16.orig/debian/control
+++ pmount-0.9.16/debian/control
@@ -0,0 +1,26 @@
+Source: pmount
+Section: utils
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Vincent Fourmond <fourmond@debian.org>
+Build-Depends: cdbs, debhelper (>= 4.1.0), libsysfs-dev, 
+ libhal-dev (>= 0.5.2), libhal-storage-dev (>= 0.5.2), intltool, dpatch
+Standards-Version: 3.7.2
+
+Package: pmount
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: hal, cryptsetup (>= 1.0)
+Description: mount removable devices as normal user
+ pmount is a wrapper around the standard mount program which permits normal
+ users to mount removable devices without a matching /etc/fstab entry. This
+ provides a robust basis for automounting frameworks like GNOME's Utopia
+ project and confines the amount of code that runs as root to a minimum.
+ .
+ This package also contains a wrapper "pmount-hal" which reads some
+ information like device labels and mount options from hal and passes
+ them to pmount. Install the package "hal" if you want to use this
+ feature.
+ .
+ If a LUKS capable cryptsetup package is installed, pmount is able to
+ transparently mount encrypted volumes.
--- pmount-0.9.16.orig/debian/patches/05-dont-hang-on-stale-network-mounts.dpatch
+++ pmount-0.9.16/debian/patches/05-dont-hang-on-stale-network-mounts.dpatch
@@ -0,0 +1,63 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-dont-hang-on-stale-network-mounts.dpatch by Vincent Fourmond <fourmond@debian.org>
+##
+## DP: Do not look in fstab for a mountpoint if we know it is a
+## DP: device file.
+
+@DPATCH@
+diff -urNad pmount-0.9.16~/src/pmount.c pmount-0.9.16/src/pmount.c
+--- pmount-0.9.16~/src/pmount.c	2007-07-03 01:37:24.000000000 +0200
++++ pmount-0.9.16/src/pmount.c	2007-07-17 20:59:20.000000000 +0200
+@@ -669,8 +669,11 @@
+         return E_ARGS;
+     }
+ 
+-    /* if we got a mount point, convert it to a device */
+-    if( fstab_has_mntpt( "/etc/fstab", devarg, mntptdev, sizeof(mntptdev) ) ) {
++    /* Lookup in /etc/fstab if devarg is a mount point, unless we already
++       have a block device -- this way, pmount shouldn't choke on stale
++       network mounts. */
++    if( (! is_block(devarg)) && 
++	fstab_has_mntpt( "/etc/fstab", devarg, mntptdev, sizeof(mntptdev) ) ) {
+         debug( "resolved mount point %s to device %s\n", devarg, mntptdev );
+         devarg = mntptdev;
+     }
+diff -urNad pmount-0.9.16~/src/utils.c pmount-0.9.16/src/utils.c
+--- pmount-0.9.16~/src/utils.c	2007-06-13 00:18:35.000000000 +0200
++++ pmount-0.9.16/src/utils.c	2007-07-17 20:59:20.000000000 +0200
+@@ -179,6 +179,18 @@
+ }
+ 
+ int
++is_block( const char* path )
++{
++    struct stat st;
++
++    if( stat( path, &st ) )
++        return 0;
++
++    return S_ISBLK( st.st_mode );
++}
++
++
++int
+ remove_pmount_mntpt( const char *path ) 
+ {
+     char stampfile[PATH_MAX];
+diff -urNad pmount-0.9.16~/src/utils.h pmount-0.9.16/src/utils.h
+--- pmount-0.9.16~/src/utils.h	2007-06-13 00:18:35.000000000 +0200
++++ pmount-0.9.16/src/utils.h	2007-07-17 20:59:20.000000000 +0200
+@@ -47,6 +47,13 @@
+ int is_dir( const char* path );
+ 
+ /**
++ * Return whether given path is a block device.
++ @ return 1 = block device, 0 = no block device
++ */
++int is_block( const char* path );
++
++
++/**
+  * Remove a mountpoint created by pmount (i. e. only if the directory contains
+  * a stamp file).
+  * @return 0 on success, -1 on error
--- pmount-0.9.16.orig/debian/patches/02-fix-kernel-panic.dpatch
+++ pmount-0.9.16/debian/patches/02-fix-kernel-panic.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-fix-kernel-panic.dpatch by  <fourmond@debian.org>
+##
+## DP: Fix a possibility of a kernel panic using custom ext2/3
+## DP: and potentially jfs filesystems
+
+@DPATCH@
+diff -urNad pmount-0.9.13~/src/fs.c pmount-0.9.13/src/fs.c
+--- pmount-0.9.13~/src/fs.c	2006-08-07 01:21:17.000000000 +0200
++++ pmount-0.9.13/src/fs.c	2007-06-13 23:23:04.000000000 +0200
+@@ -25,12 +25,12 @@
+     { "ntfs", "nosuid,nodev,user", 1, "077", 1 },
+     { "hfsplus", "nosuid,nodev,user", 1, NULL, 0 },
+     { "hfs", "nosuid,nodev,user", 1, NULL, 0 },
+-    { "ext3", "nodev,noauto,nosuid,user", 0, NULL, 0 },
+-    { "ext2", "nodev,noauto,nosuid,user", 0, NULL, 0 },
++    { "ext3", "nodev,noauto,nosuid,user,errors=continue", 0, NULL, 0 },
++    { "ext2", "nodev,noauto,nosuid,user,errors=continue", 0, NULL, 0 },
+     { "reiserfs", "nodev,noauto,nosuid,user", 0, NULL, 0 },
+     { "reiser4", "nodev,noauto,nosuid,user", 0, NULL, 0 },
+     { "xfs", "nodev,noauto,nosuid,user", 0, NULL, 0 },
+-    { "jfs", "nodev,noauto,nosuid,user", 0, NULL, 1 },
++    { "jfs", "nodev,noauto,nosuid,user,errors=continue", 0, NULL, 1 },
+     { NULL, NULL, 0, NULL, 0}
+ };
+ 
--- pmount-0.9.16.orig/debian/patches/02-fix-CVE-2010-2192.dpatch
+++ pmount-0.9.16/debian/patches/02-fix-CVE-2010-2192.dpatch
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-fix-CVE-2010-2192.dpatch by  <fourmond@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pmount~/src/policy.c pmount/src/policy.c
+--- pmount~/src/policy.c	2010-06-15 21:41:08.000000000 +0200
++++ pmount/src/policy.c	2010-06-15 21:42:22.546025474 +0200
+@@ -559,9 +559,13 @@
+ void make_lockdir_name( const char* device, char* name, size_t name_size )
+ {
+     char* devname;
++    /* Strip an initial whitespace in device, will look better */
++    if(*device == '/')
++      device++;
+ 
+     devname = strreplace( device, '/', '_' );
+-    snprintf( name, name_size, "%s%s", LOCKDIR, devname );
++    /* Make the lockdir a subdirectory of LOCKDIR ! */
++    snprintf( name, name_size, "%s/%s", LOCKDIR, devname );
+     free( devname );
+ }
--- pmount-0.9.16.orig/debian/patches/04-dont-resolve-fstab-symlinks.dpatch
+++ pmount-0.9.16/debian/patches/04-dont-resolve-fstab-symlinks.dpatch
@@ -0,0 +1,98 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04-dont-resolve-fstab-symlinks.dpatch by  <fourmond@debian.org>
+##
+## DP: Disable symlink resolution for fstab entries, as anyway mount
+## DP: doesn't do it, and that makes it fail systematically.
+
+@DPATCH@
+diff -urNad pmount-0.9.16~/man/pmount.1 pmount-0.9.16/man/pmount.1
+--- pmount-0.9.16~/man/pmount.1	2007-07-04 00:16:09.000000000 +0200
++++ pmount-0.9.16/man/pmount.1	2007-07-06 19:45:23.000000000 +0200
+@@ -110,8 +110,9 @@
+ is a block device in /dev/
+ .IP \(bu 
+ .I device
+-is not in /etc/fstab (if it is, pmount executes \fB mount \fI device\fR as the
+-calling user to handle this transparently)
++is not in /etc/fstab (if it is, pmount executes \fB mount \fI
++device\fR as the calling user to handle this transparently). See below
++for more details.
+ .IP \(bu
+ .I device
+ is not already mounted according to /etc/mtab and /proc/mounts
+@@ -120,8 +121,8 @@
+ and the directory is empty 
+ .IP \(bu
+ .I device
+-is removable (USB, FireWire, or MMC device, or \fB/sys/block/\fIdrive\fB/removable\fR
+-is 1) or whitelisted in
++is removable (USB, FireWire, or MMC device, or
++\fB/sys/block/\fIdrive\fB/removable\fR is 1) or whitelisted in
+ .B /etc/pmount.allow\fR.
+ .IP \(bu
+ .I device
+@@ -279,6 +280,47 @@
+ (1). These file types are currently not supported in automatic
+ detection, the kernel NTFS driver will be used instead. 
+ 
++.SH MORE ABOUT FSTAB
++
++Until 
++.B pmount
++version 0.9.16-1, a device was deemed to be handled by
++.I /etc/fstab
++if the real path (after symlink resolution) of the device given on the
++command-line was matching the real path of one entry in 
++.IR /etc/fstab .
++This meant that, if 
++.I /dev/cdrom
++was a symlink to say,
++.I /dev/hda
++and that only 
++.I /dev/cdrom 
++was referenced in 
++.IR /etc/fstab ,
++
++
++.BI pmount \ /dev/hda
++
++would necessary fail as 
++.B pmount
++would delegate to 
++.B mount
++who would not find 
++.I /dev/hda
++in
++.IR /etc/fstab .
++
++Starting from version 0.9.16-2, this behavior has been fixed. This
++means that if you really want that
++.B pmount
++does not mount devices that are in 
++.IR /etc/fstab ,
++you need to make sure that 
++.I /etc/fstab 
++refers only real device nodes and not symlinks. See 
++.I http://bugs.debian.org/418888
++for a real-life example...
++
+ .SH KNOWN ISSUES
+ 
+ Though we believe 
+diff -urNad pmount-0.9.16~/src/policy.c pmount-0.9.16/src/policy.c
+--- pmount-0.9.16~/src/policy.c	2007-07-04 00:12:12.000000000 +0200
++++ pmount-0.9.16/src/policy.c	2007-07-06 19:45:23.000000000 +0200
+@@ -318,7 +318,12 @@
+     while( ( entry = getmntent( f ) ) != NULL ) {
+         snprintf( fstab_device, sizeof( fstab_device ), "%s", entry->mnt_fsname );
+ 
+-        if( realpath( fstab_device, pathbuf ) )
++	/* 
++	   We deactivate the symlink lookup for fstab files: it does
++	   more harm than necessary. After all, the admin should know what
++	   they are doing when they are writing symlinks in /etc/fstab.
++	*/
++        if( 0 && realpath( fstab_device, pathbuf ) )
+             realdev = pathbuf;
+         else
+             realdev = fstab_device;
--- pmount-0.9.16.orig/debian/patches/03-fix-typo.dpatch
+++ pmount-0.9.16/debian/patches/03-fix-typo.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03-fix-typo.dpatch by  <fourmond@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad pmount-0.9.13~/src/pmount.c pmount-0.9.13/src/pmount.c
+--- pmount-0.9.13~/src/pmount.c	2006-08-15 22:47:45.000000000 +0200
++++ pmount-0.9.13/src/pmount.c	2007-06-13 23:25:05.000000000 +0200
+@@ -51,7 +51,7 @@
+     printf( _("Usage:\n\n%s [options] <device> [<label>]\n\n"
+     "  Mount <device> to a directory below %s if policy requirements\n"
+     "  are met (see pmount(1) for details). If <label> is given, the mount point\n"
+-    "  will be %s/<label>, otherwise it will be %s<device>.\n"
++    "  will be %s<label>, otherwise it will be %s<device>.\n"
+     "  If the mount point does not exist, it will be created.\n\n"),
+         exename, MEDIADIR, MEDIADIR, MEDIADIR );
+ 
--- pmount-0.9.16.orig/debian/patches/06-fix-fstab.dpatch
+++ pmount-0.9.16/debian/patches/06-fix-fstab.dpatch
@@ -0,0 +1,69 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06-fix-fstab.dpatch by  <fourmond@debian.org>
+##
+## DP: Now check twice for the presence of a given device in fstab:
+## DP: once before prepending /dev, once afterwards.
+
+@DPATCH@
+diff -urNad pmount-0.9.16~/src/pmount.c pmount-0.9.16/src/pmount.c
+--- pmount-0.9.16~/src/pmount.c	2007-08-16 15:12:38.000000000 +0200
++++ pmount-0.9.16/src/pmount.c	2007-08-16 15:14:31.000000000 +0200
+@@ -710,6 +710,16 @@
+                 return E_DEVICE;
+             }
+             debug( "trying to prepend '" DEVDIR "' to device argument, now %s\n", device );
++	    /* We need to lookup again in fstab: */
++	    fstab_device = fstab_has_device( "/etc/fstab", device, NULL, NULL );
++	    if( mode == MOUNT && fstab_device ) {
++	      if( arg2 )
++		fprintf( stderr, _("Warning: device %s is already handled by /etc/fstab,"
++				   " supplied label is ignored\n"), fstab_device );
++	      
++	      do_mount_fstab( fstab_device );
++	      return E_EXECMOUNT;
++	    }
+         }
+     }
+ 
+diff -urNad pmount-0.9.16~/src/policy.c pmount-0.9.16/src/policy.c
+--- pmount-0.9.16~/src/policy.c	2007-07-04 00:12:12.000000000 +0200
++++ pmount-0.9.16/src/policy.c	2007-08-16 15:12:38.000000000 +0200
+@@ -310,6 +310,8 @@
+     char* realdev;
+     char* uidopt;
+ 
++    debug("Checking for device '%s' in '%s'\n", device, fname);
++
+     if( !( f = fopen( fname, "r" ) ) ) {
+         perror( _("Error: could not open fstab-type file") );
+         exit( 100 );
+diff -urNad pmount-0.9.16~/src/pumount.c pmount-0.9.16/src/pumount.c
+--- pmount-0.9.16~/src/pumount.c	2007-07-03 02:12:41.000000000 +0200
++++ pmount-0.9.16/src/pumount.c	2007-08-16 15:22:00.000000000 +0200
+@@ -248,8 +248,24 @@
+     /* we cannot really check the real path when unmounting lazily since the
+      * device node might not exist any more */
+     if( !is_real_path && !do_lazy ) {
+-        perror( _("Error: could not determine real path of the device") );
+-        return E_DEVICE;
++        /* try to prepend '/dev' */
++        if( strncmp( device, DEVDIR, sizeof( DEVDIR )-1 ) ) { 
++            char d[PATH_MAX];
++            snprintf( d, sizeof( d ), "%s%s", DEVDIR, device );
++            if ( !realpath( d, device ) ) {
++                perror( _("Error: could not determine real path of the device") );
++                return E_DEVICE;
++            }
++            debug( "trying to prepend '" DEVDIR 
++		   "' to device argument, now '%s'\n", device );
++	    /* We need to lookup again in fstab: */
++	    fstab_device = fstab_has_device( "/etc/fstab", device, 
++					     fstab_mntpt, NULL );
++	    if( fstab_device ) {
++	      do_umount_fstab( fstab_device, do_lazy, fstab_mntpt );
++	      return E_EXECUMOUNT;
++	    }
++	}
+     }
+ 
+     /* does the device start with DEVDIR? */
--- pmount-0.9.16.orig/debian/patches/01-man-plugdev.dpatch
+++ pmount-0.9.16/debian/patches/01-man-plugdev.dpatch
@@ -0,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-man-plugdev.dpatch by  <fourmond@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad pmount-0.9.13~/man/pmount.1 pmount-0.9.13/man/pmount.1
+--- pmount-0.9.13~/man/pmount.1	2006-02-28 19:59:14.000000000 +0100
++++ pmount-0.9.13/man/pmount.1	2007-06-13 23:14:49.000000000 +0200
+@@ -78,6 +78,17 @@
+ process does not exist any more are removed. This prevents forgotten indefinite
+ locks from crashed programs.
+ 
++.B Important note for Debian:
++The permission to execute pmount is restricted to members of the system
++group
++.B plugdev\fR. Please add all "desktop" users who shall be able to use
++pmount to this group by executing
++
++.IP
++.B adduser \fIuser \fBplugdev
++.PP
++(as root).
++
+ .SH POLICY
+ 
+ The mount will succeed if all of the following conditions are met:
+diff -urNad pmount-0.9.13~/man/pumount.1 pmount-0.9.13/man/pumount.1
+--- pmount-0.9.13~/man/pumount.1	2005-12-16 11:46:30.000000000 +0100
++++ pmount-0.9.13/man/pumount.1	2007-06-13 23:14:49.000000000 +0200
+@@ -29,6 +29,16 @@
+ .I device
+ from a directory below /media if policy is met (see below). 
+ 
++.B Important note for Debian:
++The permission to execute pumount is restricted to members of the system
++group
++.B plugdev\fR. Please add all "desktop" users who shall be able to use
++pmount to this group by executing
++
++.IP
++.B adduser \fIuser \fBplugdev
++.PP
++(as root).
+ .SH OPTIONS
+ 
+ .TP
--- pmount-0.9.16.orig/debian/patches/00list
+++ pmount-0.9.16/debian/patches/00list
@@ -0,0 +1,7 @@
+01-man-plugdev
+02-fix-CVE-2010-2192
+#02-fix-kernel-panic
+03-fix-typo
+# 04-dont-resolve-fstab-symlinks
+05-dont-hang-on-stale-network-mounts
+06-fix-fstab
--- pmount-0.9.16.orig/debian/rules
+++ pmount-0.9.16/debian/rules
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+
+# Manually set the lock directory:
+DEB_CONFIGURE_EXTRA_FLAGS = --with-lock-dir=/var/lib/pmount-locks
+
+common-post-build-arch::
+	# Generate a POT file
+	cd po; intltool-update -p --verbose
--- pmount-0.9.16.orig/debian/copyright
+++ pmount-0.9.16/debian/copyright
@@ -0,0 +1,25 @@
+This package was debianized by Martin Pitt <mpitt@debian.org> on
+Fri, 13 Aug 2004 22:41:29 +0100.
+
+It was downloaded from http://www.piware.de/projects/
+
+Upstream Author: Martin Pitt <martin.pitt@canonical.com>
+
+Copyright: (C) 2004 Canonical Ltd.
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software Foundation, 
+   Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- pmount-0.9.16.orig/debian/watch
+++ pmount-0.9.16/debian/watch
@@ -0,0 +1,8 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+http://alioth.debian.org/frs/?group_id=31157 .*pmount-([\d.-]*)\.t.*
--- pmount-0.9.16.orig/debian/pmount.postinst
+++ pmount-0.9.16/debian/pmount.postinst
@@ -0,0 +1,37 @@
+#! /bin/sh
+set -e
+
+case "$1" in
+    configure)
+	[ -e /media ] || mkdir /media
+
+	# confine pmount/pumount execution to $GROUP members
+	for prog in /usr/bin/pmount /usr/bin/pumount; do
+	    if ! dpkg-statoverride --list $prog > /dev/null; then
+                if ! getent group plugdev > /dev/null; then
+                    addgroup --quiet --system plugdev || true
+                fi
+                chown root:plugdev $prog
+                chmod 4754 $prog
+	    fi
+	done
+
+        # Clean up pmount stamps in lock directories (bug from < 0.8 packages,
+        # see #302174)
+        if [ -d /var/lock/pmount ]; then
+            find /var/lock/pmount/ -name .created_by_pmount -exec rm -f '{}' \;
+        fi
+	;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+	;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+	;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- pmount-0.9.16.orig/debian/NEWS
+++ pmount-0.9.16/debian/NEWS
@@ -0,0 +1,25 @@
+pmount (0.9.16-4) unstable; urgency=low
+
+  The symlink lookup for /etc/fstab is enabled again - my mistake !!
+
+ -- Vincent Fourmond <fourmond@debian.org>  Thu, 16 Aug 2007 15:29:54 +0200
+
+pmount (0.9.16-2) unstable; urgency=low
+
+  The symlink lookup for /etc/fstab has been disabled. If you were
+  relying on the presence of a /etc/fstab entry to prevent your users
+  from mounting a device, please make sure that the entry in
+  /etc/fstab does not reference a symlink (see pmount (1) for more
+  details).
+
+ -- Vincent Fourmond <fourmond@debian.org>  Fri, 06 Jul 2007 19:53:34 +0200
+
+pmount (0.9.16-1) unstable; urgency=low
+
+  Starting from release 0.9.16-1, pmount supports globs in the
+  /etc/pmount.allow configuration file. This means in particular that
+  you should check if there wasn't any devices with *, [] or ? inside
+  that shouldn't be interpreted as globs. It is however quite unlikely.
+  
+
+ -- Vincent Fourmond <fourmond@debian.org>  Wed, 04 Jul 2007 00:27:39 +0200
--- pmount-0.9.16.orig/debian/compat
+++ pmount-0.9.16/debian/compat
@@ -0,0 +1 @@
+4