From a67203d7745733ea1063712145417a488c240a02 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 29 Jul 2020 11:22:54 +0100 Subject: [PATCH] New upstream version 1.3.19. --- .gitignore | 1 + ...vex-Regedit-Accept-CRLF-line-endings.patch | 24 ------------- 0002-Win-Hivex-Regedit-Ignore-comments.patch | 36 ------------------- hivex.spec | 11 +++--- sources | 4 +-- 5 files changed, 8 insertions(+), 68 deletions(-) delete mode 100644 0001-Win-Hivex-Regedit-Accept-CRLF-line-endings.patch delete mode 100644 0002-Win-Hivex-Regedit-Ignore-comments.patch diff --git a/.gitignore b/.gitignore index 5c3453b..3929073 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /hivex-1.3.16.tar.gz.sig /hivex-1.3.17.tar.gz.sig /hivex-1.3.18.tar.gz.sig +/hivex-1.3.19.tar.gz.sig diff --git a/0001-Win-Hivex-Regedit-Accept-CRLF-line-endings.patch b/0001-Win-Hivex-Regedit-Accept-CRLF-line-endings.patch deleted file mode 100644 index f810c40..0000000 --- a/0001-Win-Hivex-Regedit-Accept-CRLF-line-endings.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 564a923a91d042e24e9259d86f69e0061f28ef4f Mon Sep 17 00:00:00 2001 -From: Vladimir Panteleev -Date: Thu, 16 Jan 2020 12:11:20 +0000 -Subject: [PATCH 1/2] Win::Hivex::Regedit: Accept CRLF line endings - ---- - perl/lib/Win/Hivex/Regedit.pm | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/perl/lib/Win/Hivex/Regedit.pm b/perl/lib/Win/Hivex/Regedit.pm -index 34426f1..2b17036 100644 ---- a/perl/lib/Win/Hivex/Regedit.pm -+++ b/perl/lib/Win/Hivex/Regedit.pm -@@ -144,6 +144,7 @@ sub reg_import - # this is fairly common in pasted regedit files. - $lineno++; - chomp; -+ s/\r$//; - if (s/\\\s*$//) { - $_ .= <$fh>; - redo unless eof ($fh); --- -2.24.1 - diff --git a/0002-Win-Hivex-Regedit-Ignore-comments.patch b/0002-Win-Hivex-Regedit-Ignore-comments.patch deleted file mode 100644 index 8ba089f..0000000 --- a/0002-Win-Hivex-Regedit-Ignore-comments.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 003028c3c0d33e952430d3f4e1a987a777674eb3 Mon Sep 17 00:00:00 2001 -From: Vladimir Panteleev -Date: Thu, 16 Jan 2020 12:11:21 +0000 -Subject: [PATCH 2/2] Win::Hivex::Regedit: Ignore comments - ---- - perl/lib/Win/Hivex/Regedit.pm | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/perl/lib/Win/Hivex/Regedit.pm b/perl/lib/Win/Hivex/Regedit.pm -index 2b17036..f0dbb50 100644 ---- a/perl/lib/Win/Hivex/Regedit.pm -+++ b/perl/lib/Win/Hivex/Regedit.pm -@@ -153,8 +153,8 @@ sub reg_import - #print STDERR "reg_import: parsing <<<$_>>>\n"; - - if ($state eq "outer") { -- # Ignore blank lines, headers. -- next if /^\s*$/; -+ # Ignore blank lines, headers, comments. -+ next if /^\s*(;.*)?$/; - - # .* is needed before Windows Registry Editor Version.. in - # order to eat a possible Unicode BOM which regedit writes -@@ -193,7 +193,7 @@ sub reg_import - my $value = _parse_value ("", $1, $encoding); - croak (_parse_error ($_, $lineno)) unless defined $value; - push @newvalues, $value; -- } elsif (/^\s*$/) { # blank line after values -+ } elsif (/^\s*(;.*)?$/) { # blank line after values - _merge_node ($hmap, \%params, $newnode, \@newvalues, \@delvalues); - $state = "outer"; - } else { --- -2.24.1 - diff --git a/hivex.spec b/hivex.spec index 2ecf153..67ee196 100644 --- a/hivex.spec +++ b/hivex.spec @@ -9,8 +9,8 @@ %global verify_tarball_signature 1 Name: hivex -Version: 1.3.18 -Release: 28%{?dist} +Version: 1.3.19 +Release: 1%{?dist} Summary: Read and write Windows Registry binary hive files License: LGPLv2 @@ -26,10 +26,6 @@ Source1: http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz.s Source2: libguestfs.keyring %endif -# Patches - all upstream since 1.3.18. -Patch0001: 0001-Win-Hivex-Regedit-Accept-CRLF-line-endings.patch -Patch0002: 0002-Win-Hivex-Regedit-Ignore-comments.patch - BuildRequires: perl-interpreter BuildRequires: perl-devel BuildRequires: perl-generators @@ -287,6 +283,9 @@ fi %changelog +* Wed Jul 29 2020 Richard W.M. Jones - 1.3.19-1 +- New upstream version 1.3.19. + * Tue Jul 28 2020 Fedora Release Engineering - 1.3.18-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 96a4ede..35aa274 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (hivex-1.3.18.tar.gz) = 1851351118921e81df9e505f90d00048a178572c2edd3de40194a69915176bdb615e2eb5afea408d57063e98257c8d1e3d0cd6730407153892cc9e3befc4aa3a -SHA512 (hivex-1.3.18.tar.gz.sig) = 3b35181ed780456e21da48ef4c1ad630adf6e4db56a88711c0e9fe189806932d0bfcfde40d037488c7e512a8bc515c258c11e09853e448cae09e6bc8b9635341 +SHA512 (hivex-1.3.19.tar.gz) = dc271349c6efa7b55ba144617e57fe4e7ce855ec1f4ef9f84ee86eeefd3a34cb6b26078786e1568f3008b922a31b758ff2c2734e599b67e0e210aa72e9f41177 +SHA512 (hivex-1.3.19.tar.gz.sig) = 8b9c8c9b6cef47036df70f79219ed91d592dbc8ae1de8f1378cdd0f18ab043fb2d16c6907d05240cb3d015360c721c922df198bd383e79e54b83c218c8c565fb