[Pkg-mc-commits] r37 - in trunk/debian: . patches

[winnie at alioth.debian.org]

Author: winnie
Date: 2008-02-15 09:06:38 +0000 (Fri, 15 Feb 2008)
New Revision: 37

Removed:
   trunk/debian/patches/11_extfs_missing.patch
Modified:
   trunk/debian/changelog
Log:
Fix uzip errors


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-14 07:29:39 UTC (rev 36)
+++ trunk/debian/changelog	2008-02-15 09:06:38 UTC (rev 37)
@@ -1,8 +1,9 @@
 mc (1:4.6.2~pre1-2) UNRELEASED; urgency=low
 
   * Add a Suggests on file. (Closes: #435135)
+  * Fix uzip errror by removing ancient patch. Thanks to pabs.  
 
- -- Patrick Winnertz <winnie at debian.org>  Thu, 14 Feb 2008 08:23:59 +0100
+ -- Patrick Winnertz <winnie at debian.org>  Fri, 15 Feb 2008 10:00:53 +0100
 
 mc (1:4.6.2~pre1-1) unstable; urgency=low
 

Deleted: trunk/debian/patches/11_extfs_missing.patch
===================================================================
--- trunk/debian/patches/11_extfs_missing.patch	2008-02-14 07:29:39 UTC (rev 36)
+++ trunk/debian/patches/11_extfs_missing.patch	2008-02-15 09:06:38 UTC (rev 37)
@@ -1,69 +0,0 @@
-diff -Nurwd mc-4.6.2~pre1/vfs/extfs/uzip.in mc-4.6.2~pre1.patched/vfs/extfs/uzip.in
---- mc-4.6.2~pre1/vfs/extfs/uzip.in	2006-05-06 10:31:53.000000000 +0200
-+++ mc-4.6.2~pre1.patched/vfs/extfs/uzip.in	2008-01-24 23:55:20.000000000 +0100
-@@ -42,6 +42,14 @@
- # (size) (method) (zippedsize) (zipratio) (mm)(dd)(yy)(HH)(MM) (cksum) (fname)
- my $regex_nonzipinfo_line = qr"^\s*(\d+)\s+(\S+)\s+(\d+)\s+(-?\d+\%)\s+(\d?\d)-(\d?\d)-(\d\d)\s+(\d?\d):(\d\d)\s+([0-9a-f]+)\s\s(.*)$";
- 
-+# -rw-r--r--  2.2 unx     2891 tx     1435 defN 20000330.211927 ./edit.html
-+# (perm) (?) (?) (size) (?) (zippedsize) (method) (yyyy)(mm)(dd)(HH)(MM) (fname)
-+my $regex_zipinfo_line = qr"^(\S{7,10})\s+(\d+\.\d+)\s+(\S+)\s+(\d+)\s+(\S\S)\s+(\d+)\s+(\S{4})\s+(\d{4})(\d\d)(\d\d)\.(\d\d)(\d\d)(\d\d)\s(.*)$";
-+
-+#     2891  Defl:N     1435  50%  03-30-00 21:19  50cbaaf8  ./edit.html
-+# (size) (method) (zippedsize) (zipratio) (mm)(dd)(yy)(HH)(MM) (cksum) (fname)
-+my $regex_nonzipinfo_line = qr"^\s*(\d+)\s+(\S+)\s+(\d+)\s+(-?\d+\%)\s+(\d?\d)-(\d?\d)-(\d\d)\s+(\d?\d):(\d\d)\s+([0-9a-f]+)\s\s(.*)$";
-+
- #
- # Main code
- #
-@@ -102,6 +110,50 @@
-     return $fname;
- }
- 
-+# Strip all "." and ".." path components from a pathname.
-+sub zipfs_canonicalize_pathname($) {
-+  my ($fname) = @_;
-+  $fname =~ s,/+,/,g;
-+  $fname =~ s,(^|/)(?:\.?\./)+,$1,;
-+  return $fname;
-+}
-+
-+# The Midnight Commander never calls this script with archive pathnames
-+# starting with either "./" or "../". Some ZIP files contain such names,
-+# so we need to build a translation table for them.
-+my $zipfs_realpathname_table = undef;
-+sub zipfs_realpathname($) {
-+    my ($fname) = @_;
-+
-+    if (!defined($zipfs_realpathname_table)) {
-+        $zipfs_realpathname_table = {};
-+	if (!open(ZIP, "$cmd_list $qarchive |")) {
-+	    return $fname;
-+	}
-+	foreach my $line (<ZIP>) {
-+	    $line =~ s/\r*\n*$//;
-+	    if ($op_has_zipinfo) {
-+		if ($line =~ $regex_zipinfo_line) {
-+		    my ($fname) = ($14);
-+		    $zipfs_realpathname_table->{zipfs_canonicalize_pathname($fname)} = $fname;
-+		}
-+	    } else {
-+		if ($line =~ $regex_nonzipinfo_line) {
-+		    my ($fname) = ($11);
-+		    $zipfs_realpathname_table->{zipfs_canonicalize_pathname($fname)} = $fname;
-+		}
-+	    }
-+	}
-+	if (!close(ZIP)) {
-+	    return $fname;
-+	}
-+    }
-+    if (exists($zipfs_realpathname_table->{$fname})) {
-+	return $zipfs_realpathname_table->{$fname};
-+    }
-+    return $fname;
-+}
-+
- if ($cmd eq 'list')    { &mczipfs_list(@ARGV); }
- if ($cmd eq 'rm')      { &mczipfs_rm(@ARGV); }
- if ($cmd eq 'rmdir')   { &mczipfs_rmdir(@ARGV); }