Your message dated Thu, 25 Oct 2012 19:44:04 +0100 with message-id <1351190644.28873.13.camel@jacala.jungle.funky-badger.org> and subject line Re: Bug#691386: unblock: mc/3:4.8.3-10 has caused the Debian Bug report #691386, regarding unblock: mc/3:4.8.3-10 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 691386: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=691386 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: mc/3:4.8.3-10
- From: Dmitry Smirnov <onlyjob@member.fsf.org>
- Date: Thu, 25 Oct 2012 11:17:24 +1100
- Message-id: <[🔎] 201210251117.30991.onlyjob@member.fsf.org>
Package: release.debian.org Severity: minor User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package 'mc' unblock mc/3:4.8.3-10 This version fixes bug #689258 that Luca Falavigna <dktrkranz@debian.org> commented: "I'd love to have this fix in Wheezy (and eventually in squeeze-backports)" Diff is attached, alternatively the following commit represent all the changes since mc/3:4.8.3-9: http://anonscm.debian.org/gitweb/?p=collab-maint/mc.git;a=commitdiff;h=d755826edf3afad66cbdbea09c39b522f07f6a7c Thank you. Regards, Dmitry.diff --git a/debian/changelog b/debian/changelog index 4e38404..b595c85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -0,0 +1,7 @@ +mc (3:4.8.3-10) unstable; urgency=low + + * New backported patch to fix diff.gz inspection from symlink + (Closes: #689258). + + -- Dmitry Smirnov <onlyjob@member.fsf.org> Tue, 02 Oct 2012 19:09:51 +1000 + diff --git a/debian/patches/2910.patch b/debian/patches/2910.patch new file mode 100644 index 0000000..0d2c48d --- /dev/null +++ b/debian/patches/2910.patch @@ -0,0 +1,47 @@ +Last-Update: 2012-10-04 +Forwarded: not-needed,backported +Author: Dmitry Smirnov <onlyjob@member.fsf.org> +Bug-MC: https://www.midnight-commander.org/ticket/2910 +Bug-Debian: http://bugs.debian.org/689258 +Description: backported fix for q{"empty" diff.gz if entered from symlink} + +--- a/src/vfs/extfs/helpers/patchfs.in ++++ b/src/vfs/extfs/helpers/patchfs.in +@@ -380,25 +380,31 @@ + or error "Can't write to archive"; + } + ++my $fin = $ARGV[1]; ++ ++# resolve symlink ++while (-l $fin) { ++ $fin = readlink $fin; ++} + + if ($ARGV[0] eq 'list') { +- open I, myin($ARGV[1]).'|'; +- list ($ARGV[1]); ++ open I, myin($fin).'|'; ++ list ($fin); + exit 0; + } elsif ($ARGV[0] eq 'copyout') { +- open I, myin($ARGV[1])."|"; ++ open I, myin($fin)."|"; + copyout ($ARGV[2], $ARGV[3]); + exit 0; + } elsif ($ARGV[0] eq 'rm') { +- open I, myin($ARGV[1])."|"; +- rm ($ARGV[1], $ARGV[2]); ++ open I, myin($fin)."|"; ++ rm ($fin, $ARGV[2]); + exit 0; + } elsif ($ARGV[0] eq 'rmdir') { + exit 0; + } elsif ($ARGV[0] eq 'mkdir') { + exit 0; + } elsif ($ARGV[0] eq 'copyin') { +- copyin ($ARGV[1], $ARGV[2], $ARGV[3]); ++ copyin ($fin, $ARGV[2], $ARGV[3]); + exit 0; + } + exit 1; diff --git a/debian/patches/series b/debian/patches/series index b830a76..ec275f7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -34,0 +35 @@ fix_nospace.patch +2910.patchAttachment: signature.asc
Description: This is a digitally signed message part.
--- End Message ---
--- Begin Message ---
- To: Dmitry Smirnov <onlyjob@member.fsf.org>, 691386-done@bugs.debian.org
- Subject: Re: Bug#691386: unblock: mc/3:4.8.3-10
- From: "Adam D. Barratt" <adam@adam-barratt.org.uk>
- Date: Thu, 25 Oct 2012 19:44:04 +0100
- Message-id: <1351190644.28873.13.camel@jacala.jungle.funky-badger.org>
- In-reply-to: <[🔎] 201210251117.30991.onlyjob@member.fsf.org>
- References: <[🔎] 201210251117.30991.onlyjob@member.fsf.org>
On Thu, 2012-10-25 at 11:17 +1100, Dmitry Smirnov wrote: > This version fixes bug #689258 that Luca Falavigna <dktrkranz@debian.org> > commented: Unblocked. Regards, Adam
--- End Message ---