Hello community, here is the log from the commit of package ark for openSUSE:Factory checked in at 2014-03-18 16:03:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ark (Old) and /work/SRC/openSUSE:Factory/.ark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ark" Changes: -------- --- /work/SRC/openSUSE:Factory/ark/ark.changes 2014-02-20 07:56:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ark.new/ark.changes 2014-03-18 16:03:23.000000000 +0100 @@ -1,0 +2,19 @@ +Thu Mar 13 20:21:05 UTC 2014 - [email protected] + +- Update to 4.12.90 + * KDE 4.13 Beta 2 release + * See http://www.kde.org/announcements/announce-4.13-beta2.php + +------------------------------------------------------------------- +Thu Mar 13 00:33:07 UTC 2014 - [email protected] + +- Minor spec cleanup + +------------------------------------------------------------------- +Fri Mar 7 10:13:03 UTC 2014 - [email protected] + +- Update to 4.12.80 + * KDE 4.13 Beta 1 release + * See http://www.kde.org/announcements/announce-4.13-beta1.php + +------------------------------------------------------------------- Old: ---- ark-4.12.2.tar.xz New: ---- ark-4.12.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ark.spec ++++++ --- /var/tmp/diff_new_pack.UJPy40/_old 2014-03-18 16:03:23.000000000 +0100 +++ /var/tmp/diff_new_pack.UJPy40/_new 2014-03-18 16:03:23.000000000 +0100 @@ -17,25 +17,25 @@ Name: ark -Version: 4.12.2 +Version: 4.12.90 Release: 0 Summary: KDE Archiver Tool License: GPL-2.0+ Group: Productivity/Other Url: http://www.kde.org Source0: ark-%{version}.tar.xz +BuildRequires: fdupes BuildRequires: libarchive-devel BuildRequires: libkde4-devel BuildRequires: libkonq-devel BuildRequires: libqjson-devel BuildRequires: libzip-devel -BuildRequires: oxygen-icon-theme-large BuildRequires: xz BuildRequires: xz-devel -Provides: kde4-ark = 4.3.0 -Obsoletes: kde4-ark < 4.3.0 +BuildRequires: zlib-devel +BuildRequires: pkgconfig(bzip2) BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires +%{kde4_runtime_requires} %description This is a KDE application to work with compressed archives. @@ -56,22 +56,17 @@ This is a KDE application to work with compressed archives. %prep -%setup -q -n ark-%{version} +%setup -q %build -%cmake_kde4 -d build -%make_jobs + %cmake_kde4 -d build + %{make_jobs} %install -cd build -%make_install -# infopanel still need utilities-file-archiver icon -for i in {16,22,32,48,64,128}; do - mkdir -p %{buildroot}%{_datadir}/icons/hicolor/"$i"x"$i"/apps - cp /usr/share/icons/oxygen/"$i"x"$i"/apps/utilities-file-archiver.png %{buildroot}%{_datadir}/icons/hicolor/"$i"x"$i"/apps/ -done -%suse_update_desktop_file ark System Archiving -%kde_post_install + %{kde4_makeinstall} -C build + %suse_update_desktop_file ark System Archiving + %fdupes -s %{buildroot}%{_kde4_datadir}/ + %{kde_post_install} %post -n libkerfuffle4 -p /sbin/ldconfig @@ -80,25 +75,25 @@ %files %defattr(-,root,root) %doc COPYING -%_kde4_iconsdir/hicolor/*/apps/* -%_kde4_bindir/ark -%_kde4_modulesdir/*.so -%_kde4_appsdir/ark/ -%_kde4_applicationsdir/ark.desktop -%_kde4_htmldir/en/ark/ -%_kde4_servicesdir/*.desktop -%_kde4_servicetypesdir/*.desktop -%{_mandir}/man1/ark.1.gz -%_kde4_configkcfgdir/*.kcfg -%_kde4_servicesdir/ServiceMenus/*.desktop +%{_kde4_iconsdir}/hicolor/*/apps/* +%{_kde4_bindir}/ark +%{_kde4_modulesdir}/*.so +%{_kde4_appsdir}/ark/ +%{_kde4_applicationsdir}/ark.desktop +%{_kde4_htmldir}/en/ark/ +%{_kde4_servicesdir}/*.desktop +%{_kde4_servicetypesdir}/*.desktop +%{_kde4_mandir}/man1/ark.1.gz +%{_kde4_configkcfgdir}/*.kcfg +%{_kde4_servicesdir}/ServiceMenus/*.desktop %files -n libkerfuffle4 %defattr(-,root,root) %doc COPYING -%_kde4_libdir/libkerfuffle.so.* +%{_kde4_libdir}/libkerfuffle.so.* %files devel %defattr(-,root,root) -%_kde4_libdir/libkerfuffle.so +%{_kde4_libdir}/libkerfuffle.so %changelog ++++++ ark-4.12.2.tar.xz -> ark-4.12.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.12.2/plugins/clirarplugin/cliplugin.cpp new/ark-4.12.90/plugins/clirarplugin/cliplugin.cpp --- old/ark-4.12.2/plugins/clirarplugin/cliplugin.cpp 2014-01-13 07:37:01.000000000 +0100 +++ new/ark-4.12.90/plugins/clirarplugin/cliplugin.cpp 2014-02-13 00:07:26.000000000 +0100 @@ -2,7 +2,7 @@ * ark -- archiver for the KDE project * * Copyright (C) 2009 Harald Hvaal <[email protected]> - * Copyright (C) 2010-2011 Raphael Kubo da Costa <[email protected]> + * Copyright (C) 2010-2011,2014 Raphael Kubo da Costa <[email protected]> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -38,6 +38,7 @@ , m_parseState(ParseStateColumnDescription1) , m_isPasswordProtected(false) , m_remainingIgnoredSubHeaderLines(0) + , m_remainingIgnoredDetailsLines(0) , m_isUnrarFree(false) , m_isUnrarVersion5(false) { @@ -263,6 +264,10 @@ break; case ParseStateEntryIgnoredDetails: + if (m_remainingIgnoredDetailsLines > 0) { + --m_remainingIgnoredDetailsLines; + return true; + } m_parseState = ParseStateEntryFileName; break; @@ -325,6 +330,17 @@ e[IsPasswordProtected] = m_isPasswordProtected; kDebug() << "Added entry: " << e; + // #314297: When RAR 3.x and RAR 4.x list a symlink, they output an + // extra line after the "Host OS/Solid/Old" one mentioning the + // target of the symlink in question. We are not interested in + // this line at the moment, so we just tell the parser to skip + // it. + if (e[Permissions].toString().startsWith(QLatin1Char('l'))) { + m_remainingIgnoredDetailsLines = 1; + } else { + m_remainingIgnoredDetailsLines = 0; + } + emit entry(e); // #243273: unrar-free does not output the third file entry line, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.12.2/plugins/clirarplugin/cliplugin.h new/ark-4.12.90/plugins/clirarplugin/cliplugin.h --- old/ark-4.12.2/plugins/clirarplugin/cliplugin.h 2014-01-13 07:37:01.000000000 +0100 +++ new/ark-4.12.90/plugins/clirarplugin/cliplugin.h 2014-02-13 00:07:26.000000000 +0100 @@ -56,6 +56,7 @@ bool m_isPasswordProtected; int m_remainingIgnoredSubHeaderLines; + int m_remainingIgnoredDetailsLines; bool m_isUnrarFree; bool m_isUnrarVersion5; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.12.2/plugins/clirarplugin/tests/clirartest.cpp new/ark-4.12.90/plugins/clirarplugin/tests/clirartest.cpp --- old/ark-4.12.2/plugins/clirarplugin/tests/clirartest.cpp 2014-01-13 07:37:01.000000000 +0100 +++ new/ark-4.12.90/plugins/clirarplugin/tests/clirartest.cpp 2014-02-13 00:07:26.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Raphael Kubo da Costa <[email protected]> + * Copyright (c) 2011,2014 Raphael Kubo da Costa <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -40,7 +40,7 @@ * have lines such as "Unexpected end of archive" or "??? - the file header is * corrupt" instead of a file name and the header string after it. * - * See bug 262857 and commit 1211296. + * See bug 262857 and commit 2042997013432cdc6974f5b26d39893a21e21011. */ void CliRarTest::testReadCorruptedArchive() { @@ -54,6 +54,29 @@ Q_ASSERT(unrarOutput.open(QIODevice::ReadOnly)); QTextStream unrarStream(&unrarOutput); + while (!unrarStream.atEnd()) { + const QString line(unrarStream.readLine()); + Q_ASSERT(rarPlugin->readListLine(line)); + } + + rarPlugin->deleteLater(); +} + +/* + * Bug 314297: do not crash when a RAR archive has a symlink. + */ +void CliRarTest::testParseSymlink() +{ + QVariantList args; + args.append(QLatin1String("DummyArchive.rar")); + + CliPlugin *rarPlugin = new CliPlugin(this, args); + Q_ASSERT(rarPlugin->open()); + + QFile unrarOutput(QLatin1String(KDESRCDIR "data/testReadArchiveWithSymlink.txt")); + Q_ASSERT(unrarOutput.open(QIODevice::ReadOnly)); + + QTextStream unrarStream(&unrarOutput); while (!unrarStream.atEnd()) { const QString line(unrarStream.readLine()); Q_ASSERT(rarPlugin->readListLine(line)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.12.2/plugins/clirarplugin/tests/clirartest.h new/ark-4.12.90/plugins/clirarplugin/tests/clirartest.h --- old/ark-4.12.2/plugins/clirarplugin/tests/clirartest.h 2014-01-13 07:37:01.000000000 +0100 +++ new/ark-4.12.90/plugins/clirarplugin/tests/clirartest.h 2014-02-13 00:07:26.000000000 +0100 @@ -34,6 +34,7 @@ private Q_SLOTS: void testReadCorruptedArchive(); + void testParseSymlink(); }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ark-4.12.2/plugins/clirarplugin/tests/data/testReadArchiveWithSymlink.txt new/ark-4.12.90/plugins/clirarplugin/tests/data/testReadArchiveWithSymlink.txt --- old/ark-4.12.2/plugins/clirarplugin/tests/data/testReadArchiveWithSymlink.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/ark-4.12.90/plugins/clirarplugin/tests/data/testReadArchiveWithSymlink.txt 2014-02-13 00:07:26.000000000 +0100 @@ -0,0 +1,22 @@ + +UNRAR 4.20 (iconv) freeware Copyright (c) 1993-2012 Alexander Roshal + +Archive foo.rar + +Pathname/Comment + Size Packed Ratio Date Time Attr CRC Meth Ver + Host OS Solid Old +------------------------------------------------------------------------------- + foo/hello1 + 6 16 266% 12-02-14 23:15 -rw-r--r-- 363A3020 m3b 2.9 + Unix No No + foo/hello2 + 6 6 100% 12-02-14 23:15 lrwxr-xr-x 8731D904 m0b 2.0 + Unix No No + --> hello1 + foo + 0 0 0% 12-02-14 23:15 drwxr-xr-x 00000000 m0 2.0 + Unix No No +------------------------------------------------------------------------------- + 3 12 22 183% + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
