Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package par2cmdline The previous upstream release introduced a regression causing failure to locate misnamed files in some cases, causing the program to wrongly report such files as unrepairable when they are not. The related bug report is #769820 (severity important). Upstream release 0.6.11 fixes this bug with a two line code change, and updates the relevant test. The remainder of the upstream diff is noise from their version bump and some indent stuff; there are no other code changes. Debdiff against 0.6.10-1 currently in testing is attached. No upload of 0.6.11-1 has been done yet. unblock par2cmdline/0.6.11-1
diff -Nru par2cmdline-0.6.10/commandline.cpp par2cmdline-0.6.11/commandline.cpp --- par2cmdline-0.6.10/commandline.cpp 2014-09-07 10:13:17.000000000 +0000 +++ par2cmdline-0.6.11/commandline.cpp 2014-11-14 20:27:21.000000000 +0000 @@ -693,6 +693,7 @@ string name; DiskFile::SplitFilename(argv[0], path, name); filenames = DiskFile::FindFiles(path, name, recursive); + string canonicalBasepath = DiskFile::GetCanonicalPathname(basepath); list<string>::iterator fn = filenames->begin(); while (fn != filenames->end()) @@ -708,11 +709,11 @@ { cout << "Ignoring non-existent source file: " << filename << endl; } - // skip files outside basepath - else if (filename.find(basepath) == string::npos) - { - cout << "Ignoring out of basepath source file: " << filename << endl; - } + // skip files outside basepath + else if (filename.find(canonicalBasepath) == string::npos) + { + cout << "Ignoring out of basepath source file: " << filename << endl; + } else { u64 filesize = DiskFile::GetFileSize(filename); diff -Nru par2cmdline-0.6.10/configure.ac par2cmdline-0.6.11/configure.ac --- par2cmdline-0.6.10/configure.ac 2014-09-07 10:13:17.000000000 +0000 +++ par2cmdline-0.6.11/configure.ac 2014-11-14 20:27:21.000000000 +0000 @@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.58a) -AC_INIT([par2cmdline], [0.6.9], [ike.devol...@gmail.com]) +AC_INIT([par2cmdline], [0.6.11], [ike.devol...@gmail.com]) AC_CONFIG_SRCDIR([par2cmdline.cpp]) AC_CANONICAL_HOST diff -Nru par2cmdline-0.6.10/debian/changelog par2cmdline-0.6.11/debian/changelog --- par2cmdline-0.6.10/debian/changelog 2014-09-10 10:23:59.000000000 +0000 +++ par2cmdline-0.6.11/debian/changelog 2014-11-17 19:23:11.000000000 +0000 @@ -1,3 +1,12 @@ +par2cmdline (0.6.11-1) unstable; urgency=medium + + * New upstream release: + + Fixes a regression causing failure to locate misnamed files + during repair. (Closes: #769820) + * Bump standards-version to 3.9.6 (no changes needed). + + -- JCF Ploemen (jcfp) <li...@jcf.pm> Mon, 17 Nov 2014 19:17:03 +0000 + par2cmdline (0.6.10-1) unstable; urgency=medium * New upstream release: diff -Nru par2cmdline-0.6.10/debian/control par2cmdline-0.6.11/debian/control --- par2cmdline-0.6.10/debian/control 2014-05-12 20:28:59.000000000 +0000 +++ par2cmdline-0.6.11/debian/control 2014-11-17 19:23:23.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: JCF Ploemen (jcfp) <li...@jcf.pm> Build-Depends: debhelper (>= 9), dh-autoreconf Build-Conflicts: autoconf2.13, automake1.4 -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: https://github.com/BlackIkeEagle/par2cmdline/ Vcs-Git: git://github.com/jcfp/debpkg-par2.git Vcs-Browser: https://github.com/jcfp/debpkg-par2/ diff -Nru par2cmdline-0.6.10/par2.1 par2cmdline-0.6.11/par2.1 --- par2cmdline-0.6.10/par2.1 2014-09-07 10:13:17.000000000 +0000 +++ par2cmdline-0.6.11/par2.1 2014-11-14 20:27:21.000000000 +0000 @@ -1,6 +1,6 @@ .\" Manpage for par2 .\" Contact ike.devol...@gmail.com for mistakes. -.TH par2 1 "may 2014" "0.6.9" "Parity archive utils" +.TH par2 1 "may 2014" "0.6.11" "Parity archive utils" .SH NAME par2 \- PAR 2.0 compatible file verification and repair tool. .SH SYNOPSIS diff -Nru par2cmdline-0.6.10/par2cmdline.vcproj par2cmdline-0.6.11/par2cmdline.vcproj --- par2cmdline-0.6.10/par2cmdline.vcproj 2014-09-07 10:13:17.000000000 +0000 +++ par2cmdline-0.6.11/par2cmdline.vcproj 2014-11-14 20:27:21.000000000 +0000 @@ -19,7 +19,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PACKAGE=\"par2cmdline\";VERSION=\"0.6.9\"" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;PACKAGE=\"par2cmdline\";VERSION=\"0.6.11\"" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -72,7 +72,7 @@ InlineFunctionExpansion="2" FavorSizeOrSpeed="1" OmitFramePointers="TRUE" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PACKAGE=\"par2cmdline\";VERSION=\"0.6.9\"" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PACKAGE=\"par2cmdline\";VERSION=\"0.6.11\"" StringPooling="TRUE" RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" diff -Nru par2cmdline-0.6.10/tests/test9 par2cmdline-0.6.11/tests/test9 --- par2cmdline-0.6.10/tests/test9 2014-09-07 10:13:17.000000000 +0000 +++ par2cmdline-0.6.11/tests/test9 2014-11-14 20:27:21.000000000 +0000 @@ -17,9 +17,26 @@ echo $banner echo $dashes -mv test-5.data rename -../../par2 r testdata.par2 rename > ../$testname.log || { echo "ERROR: Initial PAR 2.0 verification and rename failed" ; exit 1; } >&2 +mv test-1.data rename4 +mv test-2.data rename5 +mv test-3.data rename6 +mv test-4.data rename7 +mv test-5.data rename9 +mv test-6.data rename8 +mv test-7.data rename3 +mv test-8.data rename1 +mv test-9.data rename2 + +../../par2 r testdata.par2 rename* > ../$testname.log || { echo "ERROR: Initial PAR 2.0 verification and rename failed" ; exit 1; } >&2 +test -e test-1.data || { echo "ERROR: rename failed" ; exit 1; } >&2 +test -e test-2.data || { echo "ERROR: rename failed" ; exit 1; } >&2 +test -e test-3.data || { echo "ERROR: rename failed" ; exit 1; } >&2 +test -e test-4.data || { echo "ERROR: rename failed" ; exit 1; } >&2 test -e test-5.data || { echo "ERROR: rename failed" ; exit 1; } >&2 +test -e test-6.data || { echo "ERROR: rename failed" ; exit 1; } >&2 +test -e test-7.data || { echo "ERROR: rename failed" ; exit 1; } >&2 +test -e test-8.data || { echo "ERROR: rename failed" ; exit 1; } >&2 +test -e test-9.data || { echo "ERROR: rename failed" ; exit 1; } >&2 cd .. rm -rf run$testname