diff -pruN 1.7.2-1.1/.github/FUNDING.yml 1.8-0.1/.github/FUNDING.yml --- 1.7.2-1.1/.github/FUNDING.yml 1970-01-01 00:00:00.000000000 +0000 +++ 1.8-0.1/.github/FUNDING.yml 2025-01-11 18:08:08.000000000 +0000 @@ -0,0 +1,4 @@ +# These are supported funding model platforms + +patreon: LINUXABI +custom: https://abi-laboratory.pro/?view=donate diff -pruN 1.7.2-1.1/INSTALL 1.8-0.1/INSTALL --- 1.7.2-1.1/INSTALL 2016-03-18 12:29:58.000000000 +0000 +++ 1.8-0.1/INSTALL 2025-01-11 18:08:08.000000000 +0000 @@ -1,13 +1,13 @@ -Copyright (C) 2012-2016 Andrey Ponomarenko's ABI Laboratory +Copyright (C) 2012-2025 Andrey Ponomarenko's ABI Laboratory All rights reserved. RELEASE INFORMATION Project: Package Changes Analyzer (pkgdiff) -Version: 1.7.2 -Date: 2016-03-18 +Version: 1.8 +Date: 2025-01-11 This file explains how to install and setup environment @@ -30,6 +30,7 @@ Content: 3. GNU Wdiff 4. GNU Awk 5. GNU Binutils (readelf) + 6. Perl-File-LibMagic 1.1 Analysis of RPM packages diff -pruN 1.7.2-1.1/README 1.8-0.1/README --- 1.7.2-1.1/README 2016-03-18 12:29:58.000000000 +0000 +++ 1.8-0.1/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -NAME: - Package Changes Analyzer (pkgdiff) - a tool for visualizing changes in Linux software packages (RPM, DEB, TAR.GZ, etc). The tool is intended for Linux maintainers who are interested in ensuring compatibility of old and new versions of packages. - - Sample report: http://abi-laboratory.pro/tracker/package_diff/libssh/0.6.5/0.7.0/report.html - - The tool is developed by Andrey Ponomarenko: http://abi-laboratory.pro/ - -INSTALL: - sudo make install prefix=/usr - -REQUIRES: - Perl 5 - GNU Diff - GNU Wdiff - GNU Awk - GNU Binutils - -USAGE: - pkgdiff PKG1 PKG2 - -EXAMPLE: - pkgdiff libssh-0.6.5.tar.xz libssh-0.7.0.tar.xz - -ADV. USAGE: - For advanced usage, see output of --help option - -SUGGESTS: - ABI Compliance Checker 1.99.1 or newer: https://github.com/lvc/abi-compliance-checker/ - ABI Dumper 0.97 or newer: https://github.com/lvc/abi-dumper diff -pruN 1.7.2-1.1/README.md 1.8-0.1/README.md --- 1.7.2-1.1/README.md 1970-01-01 00:00:00.000000000 +0000 +++ 1.8-0.1/README.md 2025-01-11 18:08:08.000000000 +0000 @@ -0,0 +1,66 @@ +PkgDiff 1.8 +=========== + +Package Changes Analyzer (pkgdiff) — a tool for visualizing changes in Linux software packages (RPM, DEB, TAR.GZ, etc). + +Contents +-------- + +1. [ About ](#about) +2. [ Install ](#install) +3. [ Usage ](#usage) + +About +----- + +The tool is intended for Linux maintainers who are interested in ensuring compatibility of old and new versions of packages. The tool can compare directories as well (with the help of the -d option). + +Sample report: https://abi-laboratory.pro/tracker/package_diff/libssh/0.6.5/0.7.0/report.html + +The tool is developed by Andrey Ponomarenko. + +Install +------- + + sudo make install prefix=/usr + +###### Requires + +* Perl 5 +* GNU Diff +* GNU Wdiff +* GNU Awk +* GNU Binutils +* Perl-File-LibMagic + +###### Suggests + +* ABI Compliance Checker 1.99.1 or newer: https://github.com/lvc/abi-compliance-checker/ +* ABI Dumper 0.97 or newer: https://github.com/lvc/abi-dumper + +Usage +----- + + pkgdiff PKG1 PKG2 [options] + +###### Example + + pkgdiff libssh-0.6.5.tar.xz libssh-0.7.0.tar.xz + +###### Compare directories + + pkgdiff -d DIR1/ DIR2/ [options] + +###### Useful options + +| Option | Meaning | +|---------------------|----------------------------------------------| +| -c/-hide-unchanged | Don't show unchanged files in the report | +| -list-added-removed | Show content of added and removed text files | +| -skip-pattern REGEX | Don't check files matching REGEX | +| -tmp-dir DIR | Use custom temp directory | +| -d/-directories | Compare directories instead of packages | + +###### Adv. usage + +For advanced usage, see output of -help option. diff -pruN 1.7.2-1.1/debian/changelog 1.8-0.1/debian/changelog --- 1.7.2-1.1/debian/changelog 2022-06-14 13:16:00.000000000 +0000 +++ 1.8-0.1/debian/changelog 2025-08-24 06:32:29.000000000 +0000 @@ -1,3 +1,16 @@ +pkgdiff (1.8-0.1) unstable; urgency=medium + + * Non-maintainer upload. + * New upstream version + Closes: #947345 + * Point Vcs fields to Salsa + * Fix watch file + * Standards-Version: 4.7.2 (routine-update) + * debhelper-compat 13 (routine-update) + * Add debian/upstream/metadata + + -- Andreas Tille Sun, 24 Aug 2025 08:32:29 +0200 + pkgdiff (1.7.2-1.1) unstable; urgency=medium * Non maintainer upload by the Reproducible Builds team. diff -pruN 1.7.2-1.1/debian/compat 1.8-0.1/debian/compat --- 1.7.2-1.1/debian/compat 2016-03-21 16:02:42.000000000 +0000 +++ 1.8-0.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -pruN 1.7.2-1.1/debian/control 1.8-0.1/debian/control --- 1.7.2-1.1/debian/control 2016-03-22 11:52:38.000000000 +0000 +++ 1.8-0.1/debian/control 2025-08-24 06:32:29.000000000 +0000 @@ -2,11 +2,11 @@ Source: pkgdiff Section: devel Priority: optional Maintainer: Peter Spiess-Knafl -Build-Depends: debhelper (>= 9), help2man -Standards-Version: 3.9.7 +Build-Depends: debhelper-compat (= 13), help2man +Standards-Version: 4.7.2 +Vcs-Browser: https://salsa.debian.org/debian/pkgdiff +Vcs-Git: https://salsa.debian.org/debian/pkgdiff.git Homepage: https://github.com/lvc/pkgdiff -Vcs-Git: https://anonscm.debian.org/git/collab-maint/pkgdiff.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/pkgdiff.git/ Package: pkgdiff Architecture: all diff -pruN 1.7.2-1.1/debian/upstream/metadata 1.8-0.1/debian/upstream/metadata --- 1.7.2-1.1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ 1.8-0.1/debian/upstream/metadata 2025-08-24 06:32:29.000000000 +0000 @@ -0,0 +1,4 @@ +--- +Bug-Database: https://github.com/lvc/pkgdiff/issues +Repository: https://github.com/lvc/pkgdiff.git +Repository-Browse: https://github.com/lvc/pkgdiff diff -pruN 1.7.2-1.1/debian/watch 1.8-0.1/debian/watch --- 1.7.2-1.1/debian/watch 2016-03-21 16:02:42.000000000 +0000 +++ 1.8-0.1/debian/watch 2025-08-24 06:32:29.000000000 +0000 @@ -1,3 +1,4 @@ -version=3 -https://github.com/lvc/pkgdiff/releases \ -.*/archive/(.+)\.tar\.gz +version=4 + +opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \ + https://github.com/lvc/pkgdiff/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz diff -pruN 1.7.2-1.1/doc/Readme.html 1.8-0.1/doc/Readme.html --- 1.7.2-1.1/doc/Readme.html 2016-03-18 12:29:58.000000000 +0000 +++ 1.8-0.1/doc/Readme.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,478 +0,0 @@ - - - - - - - pkgdiff - Package Changes Analyzer - - - - - - - - - Fork me on GitHub - -
- -
- - - - -
- -

pkgdiff

- -
- A tool for visualizing changes in Linux software packages -
- - -

Package Changes Analyzer (pkgdiff) is a tool for visualizing changes in Linux software packages (RPM, DEB, TAR.GZ, etc). The tool is intended for Linux maintainers who are interested in ensuring compatibility of old and new versions of packages.

- -

- The tool is developed by Andrey Ponomarenko: http://abi-laboratory.pro/ - -
-
Table of Contents
- -
- - -

Downloads

-

All releases can be downloaded from this page.

- -

Latest release: pkgdiff-1.7.2.tar.gz

- -

Read-only access to the latest development version:

- - git clone git://github.com/lvc/pkgdiff  - - -

License

-

This program is free software. You may use, redistribute and/or modify it under the terms of the GNU GPL

- - -

Supported Platforms

-GNU/Linux, FreeBSD, Mac OS X - - -

Dependencies

-Requires: - - -Suggests: - - - -

Installation

-

The tool is ready-to-use after extracting the archive.

- -

You can also use a Makefile to install the tool into the system:

- sudo make install prefix=PREFIX [/usr, /usr/local]  -

This command will install a pkgdiff program to the PREFIX/bin system directory and private modules into the PREFIX/share.

- - -

Usage

- pkgdiff PKG1 PKG2  -

The HTML report will be generated to:

- - pkgdiff_reports/<pkg>/<v1>_to_<v2>/changes_report.html  - - -

Examples

-

Compare 0.4.1 and 0.8.1 versions of libqb SRPM-packages:

- pkgdiff libqb-0.4.1-2.fc15.src.rpm libqb-0.8.1-2.fc16.src.rpm  -

The HTML report will be generated to:

- pkgdiff_reports/libqb/0.4.1_to_0.8.1/changes_report.html  - -

-

Compare 0.10.23 and 0.10.32 versions of gstreamer TXZ-packages:

- pkgdiff gstreamer-0.10.23-i486-1.txz gstreamer-0.10.32-i486-1.txz  -

The HTML report will be generated to:

- pkgdiff_reports/gstreamer/0.10.23-i486-1_to_0.10.32-i486-1/changes_report.html  - -

-

Compare 0.3.4 and 0.4.0 versions of libssh TAR.GZ-packages:

- pkgdiff libssh-0.3.4.tar.gz libssh-0.4.0.tar.gz  -

The HTML report will be generated to:

- pkgdiff_reports/libssh/0.3.4_to_0.4.0/changes_report.html  - -

-

Compare 1.10.2 and 1.12.2 versions of cairo DEB-packages:

- pkgdiff libcairo2-dev_1.10.2-6.1_i386.deb libcairo2-dev_1.12.2-1_i386.deb  -

The HTML report will be generated to:

- pkgdiff_reports/libcairo2-dev/1.10.2-6.1_to_1.12.2-1/changes_report.html  - -

-

Compare 2.24.1 and 2.28.8 versions of glib RPM-packages:

- pkgdiff libglib2.0-devel-2.24.1.i586.rpm libglib2.0-devel-2.28.8.i586.rpm  -

The HTML report will be generated to:

- pkgdiff_reports/libglib2.0-devel/2.24.1_to_2.28.8/changes_report.html  - - -

Adv. Usage

-

For advanced usage, see output of --help option:

- pkgdiff --help  -

If you need to analyze a group of packages then you can create an XML-descriptor of this group (OLD.xml file):

- -
- <version>
-     2.24.1
- </version>

- - <group>
-     libglib
- </group>

- - <packages>
-     libglib2.0-devel-2.24.1-1mdv2010.1.i586.rpm
-     libglib2.0_0-2.24.1-1mdv2010.1.i586.rpm
- </packages>
-
- -

And then pass XML-descriptors of old and new versions of a group to the tool:

- - pkgdiff OLD.xml NEW.xml  - -

The HTML report will be generated to:

- - pkgdiff_reports/<group>/<v1>_to_<v2>/changes_report.html  - - -

Adv. Examples

-

Compare 2.3.12 and 2.4.5 versions of libfreetype6 group of RPM-packages:

- pkgdiff 2.3.12.xml 2.4.5.xml  - -

File 2.3.12.xml:

-
- <version>
-     2.3.12
- </version>

- - <group>
-     libfreetype6
- </group>

- - <packages>
-     libfreetype6-2.3.12-1mdv2010.1.i586.rpm
-     libfreetype6-devel-2.3.12-1mdv2010.1.i586.rpm
- </packages>
-
- -

File 2.4.5.xml:

-
- <version>
-     2.4.5
- </version>

- - <group>
-     libfreetype6
- </group>

- - <packages>
-     libfreetype6-2.4.5-2-mdv2011.0.i586.rpm
-     libfreetype6-devel-2.4.5-2-mdv2011.0.i586.rpm
- </packages>
-
- -

The HTML report will be generated to:

- pkgdiff_reports/libfreetype6/2.3.12_to_2.4.5/changes_report.html  - - -

Bugs

-

Please post your bug reports, feature requests and questions to the issue tracker.

- - -

Maintainers

-The tool is developed by Andrey Ponomarenko. - - -

Changes

- -Version 1.7.2 (March 18, 2016)
-New Features -
    -
  • - Ability to download plain-text added/removed patches from the report -
    • -
-Bug Fixes -
    -
  • - Do not show time stamp in the report -
    • -
  • - Fixed removal of tmp directory in the rfcdiff-1.41-CUSTOM.sh -
    • -
-
- -Version 1.7.1 (December 11, 2015)
-New Features -
    -
  • - Added -skip-pattern option: skip checking of paths within archives matching a regex -
    • -
-Bug Fixes -
    -
  • - Fixed incompatibility with the latest versions of the ABICC tool -
    • -
  • - Fixed comparison of the RPM/Deb packages info -
    • -
-
- -Version 1.7.0 (October 18, 2015)
-New Features -
    -
  • - Added -d option: compare directories instead of packages -
    • -
  • - Added -list-added-removed option: show content of added/removed text files -
    • -
  • - Added -vnum1 and -vnum2 options: set version numbers of input packages -
    • -
  • - Added -title option: set name of the package in the title of the report -
    • -
  • - Added -skip-subarchives option: skip checking of archives inside packages -
    • -
-
- -Version 1.6.4 (September 08, 2015)
-Bug Fixes -
    -
  • - Fixed style of the report -
    • -
  • - Fixed install permissions -
    • -
  • - Fixed errors when comparing man pages -
    • -
  • - Added check for wdiff -
    • -
  • - Simplified Makefile -
    • -
- -
- -Version 1.6.3 (November 05, 2014)
-New Features -
    -
  • - Added -hide-unchanged option: don't show unchanged files in the report -
    • -
  • - Show change rate in the extra info files.xml (moved, changed, renamed) -
    • -
  • - Check if we can remove a common prefix from files of both packages -
    • -
  • - Encoding of diff reports has been changed to utf-8 -
    • -
-Bug Fixes -
    -
  • - Fixed a problem with spaces in package name -
    • -
  • - Added -o option to unzip command -
    • -
  • - Fixed -tmp-dir option -
    • -
- -
- -Version 1.6 (June 07, 2013)
-New Features -
    -
  • - ABI compatibility check for shared objects and kernel modules containing DWARF debugging information (in -details mode) -
    • -
  • - ABI status section in the report for debuginfo-packages -
    • -
  • - Suggests ABI Compliance Checker 1.99.1 -
    • -
  • - Suggests ABI Dumper 0.97 -
    • -
- -
- -Version 1.5 (April 04, 2013)
-New Features -
    -
  • - Added -extra-info option to dump extra analysis information -
    • -
  • - Improved identification of moved files -
    • -
  • - Classifying files by magic bytes -
    • -
  • - Compare public symbols in shared objects before detailed comparison -
    • -
  • - Added statistics comment line in the report -
    • -
  • - Support for more file types -
    • -
-Bug Fixes -
    -
  • - Corrected Makefile -
    • -
  • - Corrected parser of package version -
    • -
- -
- -Version 1.4.1 (December 14, 2012)
-Bug Fixes -
    -
  • - Corrected parser of package version -
    • -
  • - Opening file diffs in a separate window -
    • -
- -
- -Version 1.4 (October 25, 2012)
-New Features -
    -
  • - Sorting by status, delta and file name in the report -
    • -
  • - New -open option to open report in the default browser -
    • -
  • - Printing of estimated change rate to the console -
    • -
  • - Simplified usage: pkgdiff PKG1 PKG2 -
    • -
  • - Support for Mac OS X -
    • -
  • - Support for more file formats -
    • -
- -
- get the source code on GitHub : lvc/pkgdiff -
-
- -
- - diff -pruN 1.7.2-1.1/doc/index.html 1.8-0.1/doc/index.html --- 1.7.2-1.1/doc/index.html 1970-01-01 00:00:00.000000000 +0000 +++ 1.8-0.1/doc/index.html 2025-01-11 18:08:08.000000000 +0000 @@ -0,0 +1,502 @@ + + + + + + + pkgdiff - Package Changes Analyzer + + + + + + + + + Fork me on GitHub + +
+ +
+ + + + +
+ +

pkgdiff

+ +
+ A tool for visualizing changes in Linux software packages +
+ + +

Package Changes Analyzer (pkgdiff) is a tool for visualizing changes in Linux software packages (RPM, DEB, TAR.GZ, etc). The tool is intended for Linux maintainers who are interested in ensuring compatibility of old and new versions of packages.

+ +

+ The tool is developed by Andrey Ponomarenko: https://abi-laboratory.pro/ + +
+
Table of Contents
+ +
+ + +

Downloads

+

All releases can be downloaded from this page.

+ +

Latest release: pkgdiff-1.7.2.tar.gz

+ +

Read-only access to the latest development version:

+ + git clone git://github.com/lvc/pkgdiff  + + +

License

+

This program is free software. You may use, redistribute and/or modify it under the terms of the GNU GPL

+ + +

Supported Platforms

+GNU/Linux, FreeBSD, Mac OS X + + +

Dependencies

+Requires: + + +Suggests: + + + +

Installation

+

The tool is ready-to-use after extracting the archive.

+ +

You can also use a Makefile to install the tool into the system:

+ sudo make install prefix=PREFIX [/usr, /usr/local]  +

This command will install a pkgdiff program to the PREFIX/bin system directory and private modules into the PREFIX/share.

+ + +

Usage

+ pkgdiff PKG1 PKG2  +

The HTML report will be generated to:

+ + pkgdiff_reports/<pkg>/<v1>_to_<v2>/changes_report.html  + + +

Examples

+

Compare 0.4.1 and 0.8.1 versions of libqb SRPM-packages:

+ pkgdiff libqb-0.4.1-2.fc15.src.rpm libqb-0.8.1-2.fc16.src.rpm  +

The HTML report will be generated to:

+ pkgdiff_reports/libqb/0.4.1_to_0.8.1/changes_report.html  + +

+

Compare 0.10.23 and 0.10.32 versions of gstreamer TXZ-packages:

+ pkgdiff gstreamer-0.10.23-i486-1.txz gstreamer-0.10.32-i486-1.txz  +

The HTML report will be generated to:

+ pkgdiff_reports/gstreamer/0.10.23-i486-1_to_0.10.32-i486-1/changes_report.html  + +

+

Compare 0.3.4 and 0.4.0 versions of libssh TAR.GZ-packages:

+ pkgdiff libssh-0.3.4.tar.gz libssh-0.4.0.tar.gz  +

The HTML report will be generated to:

+ pkgdiff_reports/libssh/0.3.4_to_0.4.0/changes_report.html  + +

+

Compare 1.10.2 and 1.12.2 versions of cairo DEB-packages:

+ pkgdiff libcairo2-dev_1.10.2-6.1_i386.deb libcairo2-dev_1.12.2-1_i386.deb  +

The HTML report will be generated to:

+ pkgdiff_reports/libcairo2-dev/1.10.2-6.1_to_1.12.2-1/changes_report.html  + +

+

Compare 2.24.1 and 2.28.8 versions of glib RPM-packages:

+ pkgdiff libglib2.0-devel-2.24.1.i586.rpm libglib2.0-devel-2.28.8.i586.rpm  +

The HTML report will be generated to:

+ pkgdiff_reports/libglib2.0-devel/2.24.1_to_2.28.8/changes_report.html  + + +

Adv. Usage

+

For advanced usage, see output of --help option:

+ pkgdiff --help  +

If you need to analyze a group of packages then you can create an XML-descriptor of this group (OLD.xml file):

+ +
+ <version>
+     2.24.1
+ </version>

+ + <group>
+     libglib
+ </group>

+ + <packages>
+     libglib2.0-devel-2.24.1-1mdv2010.1.i586.rpm
+     libglib2.0_0-2.24.1-1mdv2010.1.i586.rpm
+ </packages>
+
+ +

And then pass XML-descriptors of old and new versions of a group to the tool:

+ + pkgdiff OLD.xml NEW.xml  + +

The HTML report will be generated to:

+ + pkgdiff_reports/<group>/<v1>_to_<v2>/changes_report.html  + + +

Adv. Examples

+

Compare 2.3.12 and 2.4.5 versions of libfreetype6 group of RPM-packages:

+ pkgdiff 2.3.12.xml 2.4.5.xml  + +

File 2.3.12.xml:

+
+ <version>
+     2.3.12
+ </version>

+ + <group>
+     libfreetype6
+ </group>

+ + <packages>
+     libfreetype6-2.3.12-1mdv2010.1.i586.rpm
+     libfreetype6-devel-2.3.12-1mdv2010.1.i586.rpm
+ </packages>
+
+ +

File 2.4.5.xml:

+
+ <version>
+     2.4.5
+ </version>

+ + <group>
+     libfreetype6
+ </group>

+ + <packages>
+     libfreetype6-2.4.5-2-mdv2011.0.i586.rpm
+     libfreetype6-devel-2.4.5-2-mdv2011.0.i586.rpm
+ </packages>
+
+ +

The HTML report will be generated to:

+ pkgdiff_reports/libfreetype6/2.3.12_to_2.4.5/changes_report.html  + + +

Bugs

+

Please post your bug reports, feature requests and questions to the issue tracker.

+ + +

Maintainers

+The tool is developed by Andrey Ponomarenko. + + +

Changes

+ +Version 1.8 (January 28, 2017)
+Bug Fixes +
    +
  • + Fixed -d option to compare large directories +
    • +
  • + Added more file classes +
    • +
  • + 5% performance improvement +
    • +
  • + Omit *.N suffix when determining the file format +
    • +
  • + Do not print warning about missed wdiff into the report +
    • +
  • + Increased default width of the report to 80 chars +
    • +
+
+ +Version 1.7.2 (March 18, 2016)
+New Features +
    +
  • + Ability to download plain-text added/removed patches from the report +
    • +
+Bug Fixes +
    +
  • + Do not show time stamp in the report +
    • +
  • + Fixed removal of tmp directory in the rfcdiff-1.41-CUSTOM.sh +
    • +
+
+ +Version 1.7.1 (December 11, 2015)
+New Features +
    +
  • + Added -skip-pattern option: skip checking of paths within archives matching a regex +
    • +
+Bug Fixes +
    +
  • + Fixed incompatibility with the latest versions of the ABICC tool +
    • +
  • + Fixed comparison of the RPM/Deb packages info +
    • +
+
+ +Version 1.7.0 (October 18, 2015)
+New Features +
    +
  • + Added -d option: compare directories instead of packages +
    • +
  • + Added -list-added-removed option: show content of added/removed text files +
    • +
  • + Added -vnum1 and -vnum2 options: set version numbers of input packages +
    • +
  • + Added -title option: set name of the package in the title of the report +
    • +
  • + Added -skip-subarchives option: skip checking of archives inside packages +
    • +
+
+ +Version 1.6.4 (September 08, 2015)
+Bug Fixes +
    +
  • + Fixed style of the report +
    • +
  • + Fixed install permissions +
    • +
  • + Fixed errors when comparing man pages +
    • +
  • + Added check for wdiff +
    • +
  • + Simplified Makefile +
    • +
+ +
+ +Version 1.6.3 (November 05, 2014)
+New Features +
    +
  • + Added -hide-unchanged option: don't show unchanged files in the report +
    • +
  • + Show change rate in the extra info files.xml (moved, changed, renamed) +
    • +
  • + Check if we can remove a common prefix from files of both packages +
    • +
  • + Encoding of diff reports has been changed to utf-8 +
    • +
+Bug Fixes +
    +
  • + Fixed a problem with spaces in package name +
    • +
  • + Added -o option to unzip command +
    • +
  • + Fixed -tmp-dir option +
    • +
+ +
+ +Version 1.6 (June 07, 2013)
+New Features +
    +
  • + ABI compatibility check for shared objects and kernel modules containing DWARF debugging information (in -details mode) +
    • +
  • + ABI status section in the report for debuginfo-packages +
    • +
  • + Suggests ABI Compliance Checker 1.99.1 +
    • +
  • + Suggests ABI Dumper 0.97 +
    • +
+ +
+ +Version 1.5 (April 04, 2013)
+New Features +
    +
  • + Added -extra-info option to dump extra analysis information +
    • +
  • + Improved identification of moved files +
    • +
  • + Classifying files by magic bytes +
    • +
  • + Compare public symbols in shared objects before detailed comparison +
    • +
  • + Added statistics comment line in the report +
    • +
  • + Support for more file types +
    • +
+Bug Fixes +
    +
  • + Corrected Makefile +
    • +
  • + Corrected parser of package version +
    • +
+ +
+ +Version 1.4.1 (December 14, 2012)
+Bug Fixes +
    +
  • + Corrected parser of package version +
    • +
  • + Opening file diffs in a separate window +
    • +
+ +
+ +Version 1.4 (October 25, 2012)
+New Features +
    +
  • + Sorting by status, delta and file name in the report +
    • +
  • + New -open option to open report in the default browser +
    • +
  • + Printing of estimated change rate to the console +
    • +
  • + Simplified usage: pkgdiff PKG1 PKG2 +
    • +
  • + Support for Mac OS X +
    • +
  • + Support for more file formats +
    • +
+ +
+ get the source code on GitHub : lvc/pkgdiff +
+
+ +
+ + diff -pruN 1.7.2-1.1/modules/FileType.xml 1.8-0.1/modules/FileType.xml --- 1.7.2-1.1/modules/FileType.xml 2016-03-18 12:29:58.000000000 +0000 +++ 1.8-0.1/modules/FileType.xml 2025-01-11 18:08:08.000000000 +0000 @@ -407,7 +407,7 @@ log, log.1 - logs + logs, log 40 @@ -1666,13 +1666,31 @@ - QT_TS + QT_QPH Qt Translation file - ts, qph + qph + + + 40 + + + Text + + + + + + QT_MS_TS + + + Qt Translation or MS TypeScript file + + + ts 40 @@ -1959,6 +1977,96 @@ + SEED7_INCLUDE + + + Seed7 include/library + + + s7i + + + 50 + + + Text + + + + + + SEED7_PROGRAM + + + Seed7 program + + + sd7 + + + 50 + + + Text + + + + + + HASKELL_SOURCE + + + Haskell program + + + hs + + + 50 + + + Text + + + + + + HASKELL_CABAL + + + Haskell metadata + + + cabal + + + 50 + + + Text + + + + + + RUST + + + Rust program + + + rs + + + 50 + + + Text + + + + + PASCAL @@ -2021,6 +2129,21 @@ 50 + + + + + COFFEESCRIPT + + + CoffeeScript file + + + coffee + + + 50 + Text @@ -2695,7 +2818,7 @@ Shell program - sh, SH, csh, ksh, bash + sh, SH, csh, ksh, bash, tcsh, zsh 70 @@ -2877,6 +3000,9 @@ 40 + + Text + @@ -2923,7 +3049,25 @@ Gettext file - gmo, po, mo, pot + po, pot + + + 40 + + + Text + + + + + + GETTEXT_MO + + + Gettext object + + + gmo, mo 40 @@ -3379,6 +3523,24 @@ + SCSS + + + Sass CSS style sheet + + + scss + + + 40 + + + Text + + + + + DATA @@ -3556,13 +3718,115 @@ + CACHE + + + Cache file + + + cache + + + 40 + + + Text + + + + + + HIDDEN + + + Hidden file + + + 40 + + + Text + + + + + + BACKUP + + + Backup file + + + bak + + + 40 + + + Text + + + + + + SERVICE + + + Service file + + + service + + + 40 + + + Text + + + + + + YUM_DB + + + Yum DB file + + + yumdb + + + 40 + + + + + + FIRMWARE + + + Firmware file + + + fw + + + 40 + + + Binary + + + + + CONFIGURATION Configuration file - conf, config, cfg, cnf, inf, INF, sysconf, sysconfig + conf, config, cfg, cnf, inf, INF, sysconf, sysconfig, rules Config, config @@ -3779,7 +4043,7 @@ tar.bz2, tbz2, tbz, tb2, tar.lzma, tlzma tar.lz, tlz, zip, zae, tar, lzma, gz jar, war, ear, xz, 7z, rar, sfx, ace - bz, bz2, zipx + bz, bz2, zipx, apk 10 Binary files 1.7.2-1.1/modules/Internals/Fonts/OpenSans.ttf and 1.8-0.1/modules/Internals/Fonts/OpenSans.ttf differ Binary files 1.7.2-1.1/modules/Internals/Fonts/VeraMono.ttf and 1.8-0.1/modules/Internals/Fonts/VeraMono.ttf differ diff -pruN 1.7.2-1.1/modules/Internals/Styles/Index.css 1.8-0.1/modules/Internals/Styles/Index.css --- 1.7.2-1.1/modules/Internals/Styles/Index.css 2016-03-18 12:29:58.000000000 +0000 +++ 1.8-0.1/modules/Internals/Styles/Index.css 2025-01-11 18:08:08.000000000 +0000 @@ -1,43 +1,51 @@ +@font-face { + font-family:"Open Sans"; + src:url("../fonts/OpenSans.ttf") format("truetype"); +} + +@font-face { + font-family:"VeraMono"; + src:url("../fonts/VeraMono.ttf") format("truetype"); +} + body { - font-family:Arial, sans-serif; + font-family:'Open Sans', Arial, sans-serif; background-color:White; color:Black; } hr { - color:Black; - background-color:Black; - height:1px; + color:#ececec; + background-color:#ececec; + height:3px; border:0; } h1 { - margin-bottom:0px; - padding-bottom:0px; font-size:1.625em; + text-decoration:underline; } h2 { - margin-bottom:0px; - padding-bottom:0px; font-size:1.25em; white-space:nowrap; + text-decoration:underline; } table.summary { border-collapse:collapse; - border:1px outset black; + border:1px solid Gray; +} +table.summary td, table.summary th { + border:1px solid Gray; + white-space:nowrap; } table.summary th { - background-color:#eeeeee; + background-color:#EEEEEE; font-weight:bold; text-align:left; - font-size:0.94em; - white-space:nowrap; - border:1px inset gray; padding: 3px; } table.summary td { text-align:right; - white-space:nowrap; - border:1px inset gray; padding: 3px 5px 3px 5px; + font-family:'VeraMono', Consolas, 'DejaVu Sans Mono', 'Droid Sans Mono', Monaco, Monospace; } table.summary td.left { text-align:left; @@ -47,8 +55,6 @@ table.summary th.left { font-weight:100; } table.summary td.f_path { - font-size:0.875em; - font-family:Consolas, 'DejaVu Sans Mono', 'Droid Sans Mono', Monaco, Monospace; white-space:normal; word-wrap:break-word; max-width:57em; @@ -56,6 +62,9 @@ table.summary td.f_path { table.summary td.value { padding-left:10px; } +table.highlight tr:hover { + background-color:#E0E0E0; +} td.passed, tr.passed { background-color:#CCFFCC; } @@ -86,5 +95,6 @@ div.p_list { font-size:0.69em; } .footer { - font-size:0.75em; + font-size:1.2em; + margin-top:23px; } diff -pruN 1.7.2-1.1/modules/Internals/Styles/View.css 1.8-0.1/modules/Internals/Styles/View.css --- 1.7.2-1.1/modules/Internals/Styles/View.css 2016-03-18 12:29:58.000000000 +0000 +++ 1.8-0.1/modules/Internals/Styles/View.css 2025-01-11 18:08:08.000000000 +0000 @@ -1,6 +1,5 @@ body { margin:0.4em; - font-size:0.86em; } .view { @@ -10,7 +9,7 @@ body { background-color:White; word-wrap:break-word; background-color: #FFF; - max-width:41.5em; + max-width:100em; display: inline-block; text-align:left; white-space:pre-wrap; diff -pruN 1.7.2-1.1/modules/Internals/Tools/java-dump.sh 1.8-0.1/modules/Internals/Tools/java-dump.sh --- 1.7.2-1.1/modules/Internals/Tools/java-dump.sh 1970-01-01 00:00:00.000000000 +0000 +++ 1.8-0.1/modules/Internals/Tools/java-dump.sh 2025-01-11 18:08:08.000000000 +0000 @@ -0,0 +1,31 @@ +#!/bin/bash + +function decompile { + # Decompile class and include private members. In preparation for the + # hashing below, strip references on the form #[0-9]+. + javap -c -p "$1" \ + | sed '/^Compiled from /d' \ + | sed '/^[ ]*}[ ]*$/d' \ + | sed 's/[ ]\(#[1-9][0-9]*\)[ ,]/ /' \ + | sed 's/[ ]\([0-9]*[:]\)//' \ + | sed 's/[ ][ ]*/ /g' \ + | sed '/Code:$/,/^$/s/^[ ]*\([^ ]\)/ \1/g' \ + | sed '/Code:$/d' \ + | sed 's/ *{$//' +} + +function hash_bodies { + # Generate hashes of the instructions making up the method bodies; Yields + # more concise summaries. + awk '/^[ ]{0,3}[^ ]/{if (x)print x"\n";x="";}{x=(!x)?$0"\n--":x" "$0;}END{print x;}' \ + | sed '/^--[ ]*$/d' \ + | awk "{ if(/^--/) system(\"printf ' '; (echo '\"\$0\"' | shasum --algorithm 256)\"); else print }" \ + | sed 's/[ ][ ]*-$//' +} + +if [[ "$1" == "-s" ]]; then + shift 1 + decompile "$1" | hash_bodies +else + javap -c -s -p -verbose "$1" +fi diff -pruN 1.7.2-1.1/modules/Internals/Tools/rfcdiff-1.41-CUSTOM.sh 1.8-0.1/modules/Internals/Tools/rfcdiff-1.41-CUSTOM.sh --- 1.7.2-1.1/modules/Internals/Tools/rfcdiff-1.41-CUSTOM.sh 2016-03-18 12:29:58.000000000 +0000 +++ 1.8-0.1/modules/Internals/Tools/rfcdiff-1.41-CUSTOM.sh 2025-01-11 18:08:08.000000000 +0000 @@ -29,8 +29,6 @@ # --newcolor COLORNAME Color for new file in hwdiff (default is "green") # # --larger Make difference text in hwdiff slightly larger -# -# --browse Show html output in browser # # --keep Don't delete temporary workfiles # @@ -139,7 +137,7 @@ lookfor() { done } -AWK=$(lookfor gawk nawk awk) +AWK=awk # ---------------------------------------------------------------------- # Strip headers footers and formfeeds from infile to stdout @@ -294,9 +292,6 @@ BEGIN { optwidth = ENVIRON["optwidth"] optnums = ENVIRON["optnums"] optlinks = ENVIRON["optlinks"] - cmdline = ENVIRON["cmdline"] - gsub("--", "- -", cmdline) - ENVIRON["cmdline"] = cmdline header(base1, base2) difflines1 = 0 @@ -314,21 +309,17 @@ function header(file1, file2) { } printf "" \ " \n" \ -" \n" \ "\n" \ -" \n" \ -" \n" \ -" \n" \ -" \n" \ " \n" \ " \n" \ " \n" \ " \n" \ " Diff: %s - %s \n" \ " - "; } -sub get_Title() +sub getTitle() { if($TargetTitle) { return $TargetTitle; @@ -3119,39 +3321,39 @@ sub get_Title() return $Group{"Name"}; } -sub get_Header() +sub getHeader() { my $Header = ""; if($CompareDirs and not $TargetName) { - $Header = "Changes report between ".$Group{"Name1"}."/ and ".$Group{"Name2"}."/ directories"; + $Header = "Changes report between ".$Group{"Name1"}." and ".$Group{"Name2"}.""; } elsif($CheckMode eq "Group") { - $Header = "Changes report for the ".get_Title()." group of packages between ".$Group{"V1"}." and ".$Group{"V2"}." versions"; + $Header = "Changes report for ".getTitle()." group of packages between ".$Group{"V1"}." and ".$Group{"V2"}." versions"; } else { # single package - $Header = "Changes report for the ".get_Title()." package between ".$Group{"V1"}." and ".$Group{"V2"}." versions"; + $Header = "Changes report for ".getTitle()." package between ".$Group{"V1"}." and ".$Group{"V2"}." versions"; } - if($HideUnchanged) { - $Header .= " (hidden unchanged files)"; - } + #if($HideUnchanged) { + # $Header .= " (hidden unchanged files)"; + #} return "

".$Header."

"; } -sub show_number($) +sub showNumber($) { if($_[0]) { - my $Num = cut_off_number($_[0], 2, 0); + my $Num = cutNumber($_[0], 2, 0); if($Num eq "0") { foreach my $P (3 .. 7) { - $Num = cut_off_number($_[0], $P, 1); + $Num = cutNumber($_[0], $P, 1); if($Num ne "0") { last; } @@ -3165,7 +3367,7 @@ sub show_number($) return $_[0]; } -sub cut_off_number($$$) +sub cutNumber($$$) { my ($num, $digs_to_cut, $z) = @_; if($num!~/\./) @@ -3191,10 +3393,10 @@ sub cut_off_number($$$) return $num; } -sub get_Summary() +sub getSummary() { - my $TestInfo = "

Test Info

\n"; - $TestInfo .= "\n"; + my $TestInfo = "

Test Info

\n"; + $TestInfo .= "
\n"; if(not $CompareDirs or $TargetName) { @@ -3202,7 +3404,7 @@ sub get_Summary() $TestInfo .= "\n"; } else { - $TestInfo .= "\n"; + $TestInfo .= "\n"; } } @@ -3222,8 +3424,8 @@ sub get_Summary() } $TestInfo .= "
Group Name".$Group{"Name"}."
Package Name".get_Title()."
Package Name".getTitle()."
\n"; - my $TestResults = "

Test Results

\n"; - $TestResults .= "\n"; + my $TestResults = "

Test Results

\n"; + $TestResults .= "
\n"; if(not $CompareDirs) { @@ -3256,7 +3458,7 @@ sub get_Summary() my ($TotalChanged, $Total) = (0, 0); # Files - foreach my $Format (keys(%FileChanges)) + foreach my $Format (sort keys(%FileChanges)) { $TotalChanged += $FileChanges{$Format}{"SizeDelta"}; $Total += $FileChanges{$Format}{"Size"}; @@ -3275,7 +3477,7 @@ sub get_Summary() if($Total) { $Affected = 100*$TotalChanged/$Total; } - $Affected = show_number($Affected); + $Affected = showNumber($Affected); if($Affected>=100) { $Affected = 100; } @@ -3297,24 +3499,24 @@ sub get_Summary() if(defined $ABI_Change{"Total"}) { - $TestResults .= "

ABI Status

\n"; - $TestResults .= "
\n"; + $TestResults .= "

ABI Status

\n"; + $TestResults .= "
\n"; $TestResults .= "\n"; my $Status = $ABI_Change{"Bin"}/$ABI_Change{"Total"}; if($Status==100) { $TestResults .= "\n"; } else { - $TestResults .= "\n"; + $TestResults .= "\n"; } $TestResults .= "
Total Objects
(with debug-info)		".$ABI_Change{"Total"}."
ABI Compatibility100%
ABI Compatibility".show_number(100-$Status)."%
ABI Compatibility".showNumber(100-$Status)."%
\n"; } - my $FileChgs = "

Changes In Files

\n"; + my $FileChgs = "

Changes In Files

\n"; if(keys(%TotalFiles)) { - $FileChgs .= "\n"; + $FileChgs .= "
\n"; $FileChgs .= ""; $FileChgs .= ""; $FileChgs .= ""; @@ -3378,14 +3580,14 @@ sub get_Summary() $FileChgs .= "No files\n"; } - return $TestInfo.$TestResults.get_Report_Headers().get_Report_Deps().$FileChgs; + return $TestInfo.$TestResults.getReportHeaders().getReportDeps().$FileChgs; } -sub get_Source() +sub getSource() { my $Packages = "\n"; my %Pkgs = map {$_=>1} (keys(%{$TargetPackages{1}}), keys(%{$TargetPackages{2}})); - $Packages .= "

Packages (".keys(%Pkgs).")

\n"; + $Packages .= "

Packages (".keys(%Pkgs).")

\n"; $Packages .= "
\n"; foreach my $Name (sort keys(%Pkgs)) { $Packages .= $Name."
\n"; @@ -3397,8 +3599,32 @@ sub get_Source() sub createReport($) { my $Path = $_[0]; - my $CssStyles = readModule("Styles", "Index.css"); - my $JScripts = readModule("Scripts", "Sort.js"); + + my $CssStyles = getModulePath("Styles", "Index.css"); + my $JScripts = getModulePath("Scripts", "Sort.js"); + my $VeraMono = getModulePath("Fonts", "VeraMono.ttf"); + my $OpenSans = getModulePath("Fonts", "OpenSans.ttf"); + + my $StuffDir = getDirname($Path); + my $SuffixDir = ""; + if($MoveStyles) { + $SuffixDir = $MoveStyles; + } + + my $EmbedStyles = $StuffDir."/".$SuffixDir."css/Index.css"; + my $EmbedJS = $StuffDir."/".$SuffixDir."js/Sort.js"; + my $EmbedVeraMono = $StuffDir."/".$SuffixDir."fonts/VeraMono.ttf"; + my $EmbedOpenSans = $StuffDir."/".$SuffixDir."fonts/OpenSans.ttf"; + + mkpath(getDirname($EmbedStyles)); + mkpath(getDirname($EmbedJS)); + mkpath(getDirname($EmbedVeraMono)); + + copy($CssStyles, $EmbedStyles); + copy($JScripts, $EmbedJS); + copy($VeraMono, $EmbedVeraMono); + copy($OpenSans, $EmbedOpenSans); + printMsg("INFO", "creating report ..."); my $Title = undef; @@ -3411,42 +3637,39 @@ sub createReport($) } else { - $Title = get_Title().": ".$Group{"V1"}." to ".$Group{"V2"}." changes report"; - $Keywords = get_Title().", changes, report"; + $Title = getTitle().": ".$Group{"V1"}." to ".$Group{"V2"}." changes report"; + $Keywords = getTitle().", changes, report"; } - my $Header = get_Header(); + my $Header = getHeader(); my $Description = $Header; $Description=~s/<[^<>]+>//g; my $Report = $Header."\n"; - my $MainReport = get_Report_Files(); + my $MainReport = getReportFiles(); - my $Legend = "
File TypeTotal
+ my $Legend = "
addedunchanged
changedremoved
\n"; $Report .= $Legend; - $Report .= get_Summary(); + $Report .= getSummary(); $Report .= $MainReport; if(not $CompareDirs) { - $Report .= get_Report_Usage(); - $Report .= get_Source(); + $Report .= getReportUsage(); + $Report .= getSource(); } $Report .= "
to the top
\n"; $STAT_LINE = "changed:".$RESULT{"affected"}.";".$STAT_LINE."tool_version:".$TOOL_VERSION; - $Report = "\n".composeHTML_Head($Title, $Keywords, $Description, $CssStyles, $JScripts)."\n\n
\n".$Report; - $Report .= "
\n


\n"; + $Report = "\n".composeHTMLHead($Title, $Keywords, $Description, $SuffixDir."css/Index.css", $SuffixDir."js/Sort.js", "")."\n\n
\n".$Report; + $Report .= "
\n
\n"; # footer - $Report .= "
Generated"; - $Report .= " by PkgDiff"; - $Report .= " $TOOL_VERSION  "; - $Report .= "

\n"; + $Report .= "
github.com/lvc/pkgdiff

\n"; $Report .= ""; writeFile($Path, $Report); @@ -3461,20 +3684,20 @@ sub createReport($) printMsg("INFO", "report: $Path"); } -sub check_Cmd($) +sub checkCmd($) { my $Cmd = $_[0]; - return "" if(not $Cmd); - if(defined $Cache{"check_Cmd"}{$Cmd}) { - return $Cache{"check_Cmd"}{$Cmd}; + + if(defined $Cache{"checkCmd"}{$Cmd}) { + return $Cache{"checkCmd"}{$Cmd}; } foreach my $Path (sort {length($a)<=>length($b)} split(/:/, $ENV{"PATH"})) { if(-x $Path."/".$Cmd) { - return ($Cache{"check_Cmd"}{$Cmd} = 1); + return ($Cache{"checkCmd"}{$Cmd} = 1); } } - return ($Cache{"check_Cmd"}{$Cmd} = 0); + return ($Cache{"checkCmd"}{$Cmd} = 0); } sub readFileTypes() @@ -3580,7 +3803,7 @@ sub autoAnchor($) return $Anchor; } -sub get_dumpversion($) +sub getDumpversion($) { my $Cmd = $_[0]; return `$Cmd -dumpversion 2>$TMP_DIR/null`; @@ -3616,16 +3839,23 @@ sub getArchivePattern() return join("|", @Groups); } +sub encodeUrl($) +{ + my $Url = $_[0]; + $Url=~s/#/\%23/g; + return $Url; +} + sub scenario() { if($Help) { - HELP_MESSAGE(); + helpMsg(); exit(0); } if($ShowVersion) { - printMsg("INFO", "Package Changes Analyzer (PkgDiff) $TOOL_VERSION\nCopyright (C) 2016 Andrey Ponomarenko's ABI Laboratory\nLicense: GNU GPL \nThis program is free software: you can redistribute it and/or modify it.\n\nWritten by Andrey Ponomarenko."); + printMsg("INFO", "Package Changes Analyzer (PkgDiff) $TOOL_VERSION\nCopyright (C) 2022 Andrey Ponomarenko's ABI Laboratory\nLicense: GNU GPL \nThis program is free software: you can redistribute it and/or modify it.\n\nWritten by Andrey Ponomarenko."); exit(0); } if($DumpVersion) @@ -3638,6 +3868,16 @@ sub scenario() generateTemplate(); exit(0); } + + if(checkModule("File/LibMagic.pm")) + { + $USE_LIBMAGIC = 1; + require File::LibMagic; + } + else { + printMsg("WARNING", "perl-File-LibMagic is not installed"); + } + if(not $DiffWidth) { $DiffWidth = $DEFAULT_WIDTH; } @@ -3654,13 +3894,13 @@ sub scenario() exitStatus("Not_Found", "can't access \"$DIFF\""); } - if(not check_Cmd("wdiff")) { + if(not checkCmd("wdiff")) { print STDERR "WARNING: wdiff is not installed\n"; } if(not $LinksTarget) { - $LinksTarget = "_blank"; + $LinksTarget = "_self"; } else { @@ -3672,7 +3912,7 @@ sub scenario() if($ShowDetails) { - if(my $V = get_dumpversion($ACC)) + if(my $V = getDumpversion($ACC)) { if(cmpVersions($V, $ACC_VER)==-1) { @@ -3686,7 +3926,7 @@ sub scenario() $ACC = undef; } - if(my $V = get_dumpversion($ABI_DUMPER)) + if(my $V = getDumpversion($ABI_DUMPER)) { if(cmpVersions($V, $ABI_DUMPER_VER)==-1) { @@ -3717,6 +3957,8 @@ sub scenario() if(not -d $Descriptor{2}) { exitStatus("Access_Error", "can't access directory \'".$Descriptor{2}."\'"); } + $Descriptor{1} = getAbsPath($Descriptor{1}); + $Descriptor{2} = getAbsPath($Descriptor{2}); } else { @@ -3731,10 +3973,10 @@ sub scenario() readFileTypes(); if($CompareDirs) { - printMsg("INFO", "reading directories ..."); + printMsg("INFO", "Reading directories ..."); } else { - printMsg("INFO", "reading packages ..."); + printMsg("INFO", "Reading packages ..."); } my $Fmt1 = getFormat($Descriptor{1}); @@ -3744,8 +3986,8 @@ sub scenario() if($CompareDirs and $Fmt1 eq "DIR") { - $RemovePrefix{1} = get_dirname($Descriptor{1}); - $RemovePrefix{2} = get_dirname($Descriptor{2}); + $RemovePrefix{1} = getDirname($Descriptor{1}); + $RemovePrefix{2} = getDirname($Descriptor{2}); } elsif($Fmt1 eq "ARCHIVE" and $Fmt2 eq "ARCHIVE") { # check if we can remove a common prefix from files of BOTH packages @@ -3767,7 +4009,7 @@ sub scenario() if($CompareDirs and $Fmt1 eq "DIR") { registerPackage($Descriptor{1}, 1); - $Group{"Name1"} = get_filename($Descriptor{1}); + $Group{"Name1"} = getFilename($Descriptor{1}); if($TargetVersion{1}) { $Group{"V1"} = $TargetVersion{1}; } @@ -3800,7 +4042,7 @@ sub scenario() if($CompareDirs and $Fmt1 eq "DIR") { registerPackage($Descriptor{2}, 2); - $Group{"Name2"} = get_filename($Descriptor{2}); + $Group{"Name2"} = getFilename($Descriptor{2}); if($TargetVersion{2}) { $Group{"V2"} = $TargetVersion{2}; } @@ -3871,7 +4113,7 @@ sub scenario() if($OutputReportPath) { # user-defined path $REPORT_PATH = $OutputReportPath; - $REPORT_DIR = get_dirname($REPORT_PATH); + $REPORT_DIR = getDirname($REPORT_PATH); if(not $REPORT_DIR) { $REPORT_DIR = "."; } @@ -3889,16 +4131,29 @@ sub scenario() $REPORT_PATH = $REPORT_DIR."/changes_report.html"; if(-d $REPORT_DIR) { - rmtree($REPORT_DIR."/info-diffs"); - rmtree($REPORT_DIR."/diffs"); - rmtree($REPORT_DIR."/details"); + foreach my $E ("info-diffs", "diffs", "details") { + rmtree($REPORT_DIR."/".$E); + } } } - printMsg("INFO", "comparing packages ..."); + + if($CompareDirs) { + printMsg("INFO", "Comparing directories ..."); + } + else { + printMsg("INFO", "Comparing packages ..."); + } detectChanges(); createReport($REPORT_PATH); + foreach my $E ("info-diffs", "diffs", "details") + { + if(not listDir($REPORT_DIR."/".$E)) { + rmtree($REPORT_DIR."/".$E); + } + } + if($ExtraInfo) { writeExtraInfo(); } @@ -3906,6 +4161,7 @@ sub scenario() if($CustomTmpDir) { cleanTmp(); } + exit($ERROR_CODE{$RESULT{"status"}}); }